~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,10 +1,6 @@
	1	+// SPDX-License-Identifier: GPL-2.0-or-later
1	2	/*
2	3	* NET3 Protocol independent device support routines.
3		- *
4		- * This program is free software; you can redistribute it and/or
5		- * modify it under the terms of the GNU General Public License
6		- * as published by the Free Software Foundation; either version
7		- * 2 of the License, or (at your option) any later version.
8	4	*
9	5	* Derived from the non IP parts of dev.c 1.0.19
10	6	* Authors: Ross Biro
..	..	@@ -102,6 +98,7 @@
102	98	#include <net/busy_poll.h>
103	99	#include <linux/rtnetlink.h>
104	100	#include <linux/stat.h>
	101	+#include <net/dsa.h>
105	102	#include <net/dst.h>
106	103	#include <net/dst_metadata.h>
107	104	#include <net/pkt_sched.h>
..	..	@@ -132,7 +129,6 @@
132	129	#include <trace/events/napi.h>
133	130	#include <trace/events/net.h>
134	131	#include <trace/events/skb.h>
135		-#include <linux/pci.h>
136	132	#include <linux/inetdevice.h>
137	133	#include <linux/cpu_rmap.h>
138	134	#include <linux/static_key.h>
..	..	@@ -146,11 +142,15 @@
146	142	#include <linux/sctp.h>
147	143	#include <net/udp_tunnel.h>
148	144	#include <linux/net_namespace.h>
	145	+#include <linux/indirect_call_wrapper.h>
	146	+#include <net/devlink.h>
	147	+#include <linux/pm_runtime.h>
	148	+#include <linux/prandom.h>
	149	+#include <trace/hooks/net.h>
149	150
150	151	#include "net-sysfs.h"
151	152
152	153	#define MAX_GRO_SKBS 8
153		-#define MAX_NEST_DEV 8
154	154
155	155	/* This should be increased if a protocol with a bigger head is added. */
156	156	#define GRO_MAX_HEAD (MAX_HEADER + 128)
..	..	@@ -164,6 +164,9 @@
164	164	static int netif_rx_internal(struct sk_buff *skb);
165	165	static int call_netdevice_notifiers_info(unsigned long val,
166	166	struct netdev_notifier_info *info);
	167	+static int call_netdevice_notifiers_extack(unsigned long val,
	168	+ struct net_device *dev,
	169	+ struct netlink_ext_ack *extack);
167	170	static struct napi_struct *napi_by_id(unsigned int napi_id);
168	171
169	172	/*
..	..	@@ -230,6 +233,128 @@
230	233	#endif
231	234	}
232	235
	236	+static struct netdev_name_node netdev_name_node_alloc(struct net_device dev,
	237	+ const char *name)
	238	+{
	239	+ struct netdev_name_node *name_node;
	240	+
	241	+ name_node = kmalloc(sizeof(*name_node), GFP_KERNEL);
	242	+ if (!name_node)
	243	+ return NULL;
	244	+ INIT_HLIST_NODE(&name_node->hlist);
	245	+ name_node->dev = dev;
	246	+ name_node->name = name;
	247	+ return name_node;
	248	+}
	249	+
	250	+static struct netdev_name_node *
	251	+netdev_name_node_head_alloc(struct net_device *dev)
	252	+{
	253	+ struct netdev_name_node *name_node;
	254	+
	255	+ name_node = netdev_name_node_alloc(dev, dev->name);
	256	+ if (!name_node)
	257	+ return NULL;
	258	+ INIT_LIST_HEAD(&name_node->list);
	259	+ return name_node;
	260	+}
	261	+
	262	+static void netdev_name_node_free(struct netdev_name_node *name_node)
	263	+{
	264	+ kfree(name_node);
	265	+}
	266	+
	267	+static void netdev_name_node_add(struct net *net,
	268	+ struct netdev_name_node *name_node)
	269	+{
	270	+ hlist_add_head_rcu(&name_node->hlist,
	271	+ dev_name_hash(net, name_node->name));
	272	+}
	273	+
	274	+static void netdev_name_node_del(struct netdev_name_node *name_node)
	275	+{
	276	+ hlist_del_rcu(&name_node->hlist);
	277	+}
	278	+
	279	+static struct netdev_name_node netdev_name_node_lookup(struct net net,
	280	+ const char *name)
	281	+{
	282	+ struct hlist_head *head = dev_name_hash(net, name);
	283	+ struct netdev_name_node *name_node;
	284	+
	285	+ hlist_for_each_entry(name_node, head, hlist)
	286	+ if (!strcmp(name_node->name, name))
	287	+ return name_node;
	288	+ return NULL;
	289	+}
	290	+
	291	+static struct netdev_name_node netdev_name_node_lookup_rcu(struct net net,
	292	+ const char *name)
	293	+{
	294	+ struct hlist_head *head = dev_name_hash(net, name);
	295	+ struct netdev_name_node *name_node;
	296	+
	297	+ hlist_for_each_entry_rcu(name_node, head, hlist)
	298	+ if (!strcmp(name_node->name, name))
	299	+ return name_node;
	300	+ return NULL;
	301	+}
	302	+
	303	+int netdev_name_node_alt_create(struct net_device dev, const char name)
	304	+{
	305	+ struct netdev_name_node *name_node;
	306	+ struct net *net = dev_net(dev);
	307	+
	308	+ name_node = netdev_name_node_lookup(net, name);
	309	+ if (name_node)
	310	+ return -EEXIST;
	311	+ name_node = netdev_name_node_alloc(dev, name);
	312	+ if (!name_node)
	313	+ return -ENOMEM;
	314	+ netdev_name_node_add(net, name_node);
	315	+ /* The node that holds dev->name acts as a head of per-device list. */
	316	+ list_add_tail(&name_node->list, &dev->name_node->list);
	317	+
	318	+ return 0;
	319	+}
	320	+EXPORT_SYMBOL(netdev_name_node_alt_create);
	321	+
	322	+static void __netdev_name_node_alt_destroy(struct netdev_name_node *name_node)
	323	+{
	324	+ list_del(&name_node->list);
	325	+ netdev_name_node_del(name_node);
	326	+ kfree(name_node->name);
	327	+ netdev_name_node_free(name_node);
	328	+}
	329	+
	330	+int netdev_name_node_alt_destroy(struct net_device dev, const char name)
	331	+{
	332	+ struct netdev_name_node *name_node;
	333	+ struct net *net = dev_net(dev);
	334	+
	335	+ name_node = netdev_name_node_lookup(net, name);
	336	+ if (!name_node)
	337	+ return -ENOENT;
	338	+ /* lookup might have found our primary name or a name belonging
	339	+ * to another device.
	340	+ */
	341	+ if (name_node == dev->name_node \|\| name_node->dev != dev)
	342	+ return -EINVAL;
	343	+
	344	+ __netdev_name_node_alt_destroy(name_node);
	345	+
	346	+ return 0;
	347	+}
	348	+EXPORT_SYMBOL(netdev_name_node_alt_destroy);
	349	+
	350	+static void netdev_name_node_alt_flush(struct net_device *dev)
	351	+{
	352	+ struct netdev_name_node name_node, tmp;
	353	+
	354	+ list_for_each_entry_safe(name_node, tmp, &dev->name_node->list, list)
	355	+ __netdev_name_node_alt_destroy(name_node);
	356	+}
	357	+
233	358	/* Device list insertion */
234	359	static void list_netdevice(struct net_device *dev)
235	360	{
..	..	@@ -239,7 +364,7 @@
239	364
240	365	write_lock_bh(&dev_base_lock);
241	366	list_add_tail_rcu(&dev->dev_list, &net->dev_base_head);
242		- hlist_add_head_rcu(&dev->name_hlist, dev_name_hash(net, dev->name));
	367	+ netdev_name_node_add(net, dev->name_node);
243	368	hlist_add_head_rcu(&dev->index_hlist,
244	369	dev_index_hash(net, dev->ifindex));
245	370	write_unlock_bh(&dev_base_lock);
..	..	@@ -257,7 +382,7 @@
257	382	/* Unlink dev from the device chain */
258	383	write_lock_bh(&dev_base_lock);
259	384	list_del_rcu(&dev->dev_list);
260		- hlist_del_rcu(&dev->name_hlist);
	385	+ netdev_name_node_del(dev->name_node);
261	386	hlist_del_rcu(&dev->index_hlist);
262	387	write_unlock_bh(&dev_base_lock);
263	388
..	..	@@ -355,6 +480,7 @@
355	480	unsigned short dev_type)
356	481	{
357	482	}
	483	+
358	484	static inline void netdev_set_addr_lockdep_class(struct net_device *dev)
359	485	{
360	486	}
..	..	@@ -385,6 +511,12 @@
385	511
386	512	static inline struct list_head ptype_head(const struct packet_type pt)
387	513	{
	514	+ struct list_head vendor_pt = { .next = NULL, };
	515	+
	516	+ trace_android_vh_ptype_head(pt, &vendor_pt);
	517	+ if (vendor_pt.next)
	518	+ return vendor_pt.next;
	519	+
388	520	if (pt->type == htons(ETH_P_ALL))
389	521	return pt->dev ? &pt->dev->ptype_all : &ptype_all;
390	522	else
..	..	@@ -735,14 +867,10 @@
735	867
736	868	struct net_device __dev_get_by_name(struct net net, const char *name)
737	869	{
738		- struct net_device *dev;
739		- struct hlist_head *head = dev_name_hash(net, name);
	870	+ struct netdev_name_node *node_name;
740	871
741		- hlist_for_each_entry(dev, head, name_hlist)
742		- if (!strncmp(dev->name, name, IFNAMSIZ))
743		- return dev;
744		-
745		- return NULL;
	872	+ node_name = netdev_name_node_lookup(net, name);
	873	+ return node_name ? node_name->dev : NULL;
746	874	}
747	875	EXPORT_SYMBOL(__dev_get_by_name);
748	876
..	..	@@ -760,14 +888,10 @@
760	888
761	889	struct net_device dev_get_by_name_rcu(struct net net, const char *name)
762	890	{
763		- struct net_device *dev;
764		- struct hlist_head *head = dev_name_hash(net, name);
	891	+ struct netdev_name_node *node_name;
765	892
766		- hlist_for_each_entry_rcu(dev, head, name_hlist)
767		- if (!strncmp(dev->name, name, IFNAMSIZ))
768		- return dev;
769		-
770		- return NULL;
	893	+ node_name = netdev_name_node_lookup_rcu(net, name);
	894	+ return node_name ? node_name->dev : NULL;
771	895	}
772	896	EXPORT_SYMBOL(dev_get_by_name_rcu);
773	897
..	..	@@ -1015,7 +1139,7 @@
1015	1139	* @name: name string
1016	1140	*
1017	1141	* Network device names need to be valid file names to
1018		- * to allow sysfs to work. We also disallow any kind of
	1142	+ * allow sysfs to work. We also disallow any kind of
1019	1143	* whitespace.
1020	1144	*/
1021	1145	bool dev_valid_name(const char *name)
..	..	@@ -1078,6 +1202,18 @@
1078	1202	return -ENOMEM;
1079	1203
1080	1204	for_each_netdev(net, d) {
	1205	+ struct netdev_name_node *name_node;
	1206	+ list_for_each_entry(name_node, &d->name_node->list, list) {
	1207	+ if (!sscanf(name_node->name, name, &i))
	1208	+ continue;
	1209	+ if (i < 0 \|\| i >= max_netdevices)
	1210	+ continue;
	1211	+
	1212	+ /* avoid cases where sscanf is not exact inverse of printf */
	1213	+ snprintf(buf, IFNAMSIZ, name, i);
	1214	+ if (!strncmp(buf, name_node->name, IFNAMSIZ))
	1215	+ set_bit(i, inuse);
	1216	+ }
1081	1217	if (!sscanf(d->name, name, &i))
1082	1218	continue;
1083	1219	if (i < 0 \|\| i >= max_netdevices)
..	..	@@ -1138,8 +1274,8 @@
1138	1274	}
1139	1275	EXPORT_SYMBOL(dev_alloc_name);
1140	1276
1141		-int dev_get_valid_name(struct net net, struct net_device dev,
1142		- const char *name)
	1277	+static int dev_get_valid_name(struct net net, struct net_device dev,
	1278	+ const char *name)
1143	1279	{
1144	1280	BUG_ON(!net);
1145	1281
..	..	@@ -1155,7 +1291,6 @@
1155	1291
1156	1292	return 0;
1157	1293	}
1158		-EXPORT_SYMBOL(dev_get_valid_name);
1159	1294
1160	1295	/**
1161	1296	* dev_change_name - change name of a device
..	..	@@ -1229,13 +1364,13 @@
1229	1364	netdev_adjacent_rename_links(dev, oldname);
1230	1365
1231	1366	write_lock_bh(&dev_base_lock);
1232		- hlist_del_rcu(&dev->name_hlist);
	1367	+ netdev_name_node_del(dev->name_node);
1233	1368	write_unlock_bh(&dev_base_lock);
1234	1369
1235	1370	synchronize_rcu();
1236	1371
1237	1372	write_lock_bh(&dev_base_lock);
1238		- hlist_add_head_rcu(&dev->name_hlist, dev_name_hash(net, dev->name));
	1373	+ netdev_name_node_add(net, dev->name_node);
1239	1374	write_unlock_bh(&dev_base_lock);
1240	1375
1241	1376	ret = call_netdevice_notifiers(NETDEV_CHANGENAME, dev);
..	..	@@ -1285,8 +1420,8 @@
1285	1420	}
1286	1421
1287	1422	mutex_lock(&ifalias_mutex);
1288		- rcu_swap_protected(dev->ifalias, new_alias,
1289		- mutex_is_locked(&ifalias_mutex));
	1423	+ new_alias = rcu_replace_pointer(dev->ifalias, new_alias,
	1424	+ mutex_is_locked(&ifalias_mutex));
1290	1425	mutex_unlock(&ifalias_mutex);
1291	1426
1292	1427	if (new_alias)
..	..	@@ -1372,15 +1507,20 @@
1372	1507	}
1373	1508	EXPORT_SYMBOL(netdev_notify_peers);
1374	1509
1375		-static int __dev_open(struct net_device *dev)
	1510	+static int __dev_open(struct net_device dev, struct netlink_ext_ack extack)
1376	1511	{
1377	1512	const struct net_device_ops *ops = dev->netdev_ops;
1378	1513	int ret;
1379	1514
1380	1515	ASSERT_RTNL();
1381	1516
1382		- if (!netif_device_present(dev))
1383		- return -ENODEV;
	1517	+ if (!netif_device_present(dev)) {
	1518	+ /* may be detached because parent is runtime-suspended */
	1519	+ if (dev->dev.parent)
	1520	+ pm_runtime_resume(dev->dev.parent);
	1521	+ if (!netif_device_present(dev))
	1522	+ return -ENODEV;
	1523	+ }
1384	1524
1385	1525	/* Block netpoll from trying to do any rx path servicing.
1386	1526	* If we don't do this there is a chance ndo_poll_controller
..	..	@@ -1388,7 +1528,7 @@
1388	1528	*/
1389	1529	netpoll_poll_disable(dev);
1390	1530
1391		- ret = call_netdevice_notifiers(NETDEV_PRE_UP, dev);
	1531	+ ret = call_netdevice_notifiers_extack(NETDEV_PRE_UP, dev, extack);
1392	1532	ret = notifier_to_errno(ret);
1393	1533	if (ret)
1394	1534	return ret;
..	..	@@ -1417,7 +1557,8 @@
1417	1557
1418	1558	/**
1419	1559	* dev_open - prepare an interface for use.
1420		- * @dev: device to open
	1560	+ * @dev: device to open
	1561	+ * @extack: netlink extended ack
1421	1562	*
1422	1563	* Takes a device from down to up state. The device's private open
1423	1564	* function is invoked and then the multicast lists are loaded. Finally
..	..	@@ -1427,14 +1568,14 @@
1427	1568	* Calling this function on an active interface is a nop. On a failure
1428	1569	* a negative errno code is returned.
1429	1570	*/
1430		-int dev_open(struct net_device *dev)
	1571	+int dev_open(struct net_device dev, struct netlink_ext_ack extack)
1431	1572	{
1432	1573	int ret;
1433	1574
1434	1575	if (dev->flags & IFF_UP)
1435	1576	return 0;
1436	1577
1437		- ret = __dev_open(dev);
	1578	+ ret = __dev_open(dev, extack);
1438	1579	if (ret < 0)
1439	1580	return ret;
1440	1581
..	..	@@ -1596,6 +1737,7 @@
1596	1737	N(UDP_TUNNEL_DROP_INFO) N(CHANGE_TX_QUEUE_LEN)
1597	1738	N(CVLAN_FILTER_PUSH_INFO) N(CVLAN_FILTER_DROP_INFO)
1598	1739	N(SVLAN_FILTER_PUSH_INFO) N(SVLAN_FILTER_DROP_INFO)
	1740	+ N(PRE_CHANGEADDR)
1599	1741	}
1600	1742	#undef N
1601	1743	return "UNKNOWN_NETDEV_EVENT";
..	..	@@ -1610,6 +1752,62 @@
1610	1752	};
1611	1753
1612	1754	return nb->notifier_call(nb, val, &info);
	1755	+}
	1756	+
	1757	+static int call_netdevice_register_notifiers(struct notifier_block *nb,
	1758	+ struct net_device *dev)
	1759	+{
	1760	+ int err;
	1761	+
	1762	+ err = call_netdevice_notifier(nb, NETDEV_REGISTER, dev);
	1763	+ err = notifier_to_errno(err);
	1764	+ if (err)
	1765	+ return err;
	1766	+
	1767	+ if (!(dev->flags & IFF_UP))
	1768	+ return 0;
	1769	+
	1770	+ call_netdevice_notifier(nb, NETDEV_UP, dev);
	1771	+ return 0;
	1772	+}
	1773	+
	1774	+static void call_netdevice_unregister_notifiers(struct notifier_block *nb,
	1775	+ struct net_device *dev)
	1776	+{
	1777	+ if (dev->flags & IFF_UP) {
	1778	+ call_netdevice_notifier(nb, NETDEV_GOING_DOWN,
	1779	+ dev);
	1780	+ call_netdevice_notifier(nb, NETDEV_DOWN, dev);
	1781	+ }
	1782	+ call_netdevice_notifier(nb, NETDEV_UNREGISTER, dev);
	1783	+}
	1784	+
	1785	+static int call_netdevice_register_net_notifiers(struct notifier_block *nb,
	1786	+ struct net *net)
	1787	+{
	1788	+ struct net_device *dev;
	1789	+ int err;
	1790	+
	1791	+ for_each_netdev(net, dev) {
	1792	+ err = call_netdevice_register_notifiers(nb, dev);
	1793	+ if (err)
	1794	+ goto rollback;
	1795	+ }
	1796	+ return 0;
	1797	+
	1798	+rollback:
	1799	+ for_each_netdev_continue_reverse(net, dev)
	1800	+ call_netdevice_unregister_notifiers(nb, dev);
	1801	+ return err;
	1802	+}
	1803	+
	1804	+static void call_netdevice_unregister_net_notifiers(struct notifier_block *nb,
	1805	+ struct net *net)
	1806	+{
	1807	+ struct net_device *dev;
	1808	+
	1809	+ for_each_netdev(net, dev)
	1810	+ call_netdevice_unregister_notifiers(nb, dev);
1613	1811	}
1614	1812
1615	1813	static int dev_boot_phase = 1;
..	..	@@ -1630,8 +1828,6 @@
1630	1828
1631	1829	int register_netdevice_notifier(struct notifier_block *nb)
1632	1830	{
1633		- struct net_device *dev;
1634		- struct net_device *last;
1635	1831	struct net *net;
1636	1832	int err;
1637	1833
..	..	@@ -1644,17 +1840,9 @@
1644	1840	if (dev_boot_phase)
1645	1841	goto unlock;
1646	1842	for_each_net(net) {
1647		- for_each_netdev(net, dev) {
1648		- err = call_netdevice_notifier(nb, NETDEV_REGISTER, dev);
1649		- err = notifier_to_errno(err);
1650		- if (err)
1651		- goto rollback;
1652		-
1653		- if (!(dev->flags & IFF_UP))
1654		- continue;
1655		-
1656		- call_netdevice_notifier(nb, NETDEV_UP, dev);
1657		- }
	1843	+ err = call_netdevice_register_net_notifiers(nb, net);
	1844	+ if (err)
	1845	+ goto rollback;
1658	1846	}
1659	1847
1660	1848	unlock:
..	..	@@ -1663,22 +1851,9 @@
1663	1851	return err;
1664	1852
1665	1853	rollback:
1666		- last = dev;
1667		- for_each_net(net) {
1668		- for_each_netdev(net, dev) {
1669		- if (dev == last)
1670		- goto outroll;
	1854	+ for_each_net_continue_reverse(net)
	1855	+ call_netdevice_unregister_net_notifiers(nb, net);
1671	1856
1672		- if (dev->flags & IFF_UP) {
1673		- call_netdevice_notifier(nb, NETDEV_GOING_DOWN,
1674		- dev);
1675		- call_netdevice_notifier(nb, NETDEV_DOWN, dev);
1676		- }
1677		- call_netdevice_notifier(nb, NETDEV_UNREGISTER, dev);
1678		- }
1679		- }
1680		-
1681		-outroll:
1682	1857	raw_notifier_chain_unregister(&netdev_chain, nb);
1683	1858	goto unlock;
1684	1859	}
..	..	@@ -1700,7 +1875,6 @@
1700	1875
1701	1876	int unregister_netdevice_notifier(struct notifier_block *nb)
1702	1877	{
1703		- struct net_device *dev;
1704	1878	struct net *net;
1705	1879	int err;
1706	1880
..	..	@@ -1711,22 +1885,147 @@
1711	1885	if (err)
1712	1886	goto unlock;
1713	1887
1714		- for_each_net(net) {
1715		- for_each_netdev(net, dev) {
1716		- if (dev->flags & IFF_UP) {
1717		- call_netdevice_notifier(nb, NETDEV_GOING_DOWN,
1718		- dev);
1719		- call_netdevice_notifier(nb, NETDEV_DOWN, dev);
1720		- }
1721		- call_netdevice_notifier(nb, NETDEV_UNREGISTER, dev);
1722		- }
1723		- }
	1888	+ for_each_net(net)
	1889	+ call_netdevice_unregister_net_notifiers(nb, net);
	1890	+
1724	1891	unlock:
1725	1892	rtnl_unlock();
1726	1893	up_write(&pernet_ops_rwsem);
1727	1894	return err;
1728	1895	}
1729	1896	EXPORT_SYMBOL(unregister_netdevice_notifier);
	1897	+
	1898	+static int __register_netdevice_notifier_net(struct net *net,
	1899	+ struct notifier_block *nb,
	1900	+ bool ignore_call_fail)
	1901	+{
	1902	+ int err;
	1903	+
	1904	+ err = raw_notifier_chain_register(&net->netdev_chain, nb);
	1905	+ if (err)
	1906	+ return err;
	1907	+ if (dev_boot_phase)
	1908	+ return 0;
	1909	+
	1910	+ err = call_netdevice_register_net_notifiers(nb, net);
	1911	+ if (err && !ignore_call_fail)
	1912	+ goto chain_unregister;
	1913	+
	1914	+ return 0;
	1915	+
	1916	+chain_unregister:
	1917	+ raw_notifier_chain_unregister(&net->netdev_chain, nb);
	1918	+ return err;
	1919	+}
	1920	+
	1921	+static int __unregister_netdevice_notifier_net(struct net *net,
	1922	+ struct notifier_block *nb)
	1923	+{
	1924	+ int err;
	1925	+
	1926	+ err = raw_notifier_chain_unregister(&net->netdev_chain, nb);
	1927	+ if (err)
	1928	+ return err;
	1929	+
	1930	+ call_netdevice_unregister_net_notifiers(nb, net);
	1931	+ return 0;
	1932	+}
	1933	+
	1934	+/**
	1935	+ * register_netdevice_notifier_net - register a per-netns network notifier block
	1936	+ * @net: network namespace
	1937	+ * @nb: notifier
	1938	+ *
	1939	+ * Register a notifier to be called when network device events occur.
	1940	+ * The notifier passed is linked into the kernel structures and must
	1941	+ * not be reused until it has been unregistered. A negative errno code
	1942	+ * is returned on a failure.
	1943	+ *
	1944	+ * When registered all registration and up events are replayed
	1945	+ * to the new notifier to allow device to have a race free
	1946	+ * view of the network device list.
	1947	+ */
	1948	+
	1949	+int register_netdevice_notifier_net(struct net net, struct notifier_block nb)
	1950	+{
	1951	+ int err;
	1952	+
	1953	+ rtnl_lock();
	1954	+ err = __register_netdevice_notifier_net(net, nb, false);
	1955	+ rtnl_unlock();
	1956	+ return err;
	1957	+}
	1958	+EXPORT_SYMBOL(register_netdevice_notifier_net);
	1959	+
	1960	+/**
	1961	+ * unregister_netdevice_notifier_net - unregister a per-netns
	1962	+ * network notifier block
	1963	+ * @net: network namespace
	1964	+ * @nb: notifier
	1965	+ *
	1966	+ * Unregister a notifier previously registered by
	1967	+ * register_netdevice_notifier(). The notifier is unlinked into the
	1968	+ * kernel structures and may then be reused. A negative errno code
	1969	+ * is returned on a failure.
	1970	+ *
	1971	+ * After unregistering unregister and down device events are synthesized
	1972	+ * for all devices on the device list to the removed notifier to remove
	1973	+ * the need for special case cleanup code.
	1974	+ */
	1975	+
	1976	+int unregister_netdevice_notifier_net(struct net *net,
	1977	+ struct notifier_block *nb)
	1978	+{
	1979	+ int err;
	1980	+
	1981	+ rtnl_lock();
	1982	+ err = __unregister_netdevice_notifier_net(net, nb);
	1983	+ rtnl_unlock();
	1984	+ return err;
	1985	+}
	1986	+EXPORT_SYMBOL(unregister_netdevice_notifier_net);
	1987	+
	1988	+int register_netdevice_notifier_dev_net(struct net_device *dev,
	1989	+ struct notifier_block *nb,
	1990	+ struct netdev_net_notifier *nn)
	1991	+{
	1992	+ int err;
	1993	+
	1994	+ rtnl_lock();
	1995	+ err = __register_netdevice_notifier_net(dev_net(dev), nb, false);
	1996	+ if (!err) {
	1997	+ nn->nb = nb;
	1998	+ list_add(&nn->list, &dev->net_notifier_list);
	1999	+ }
	2000	+ rtnl_unlock();
	2001	+ return err;
	2002	+}
	2003	+EXPORT_SYMBOL(register_netdevice_notifier_dev_net);
	2004	+
	2005	+int unregister_netdevice_notifier_dev_net(struct net_device *dev,
	2006	+ struct notifier_block *nb,
	2007	+ struct netdev_net_notifier *nn)
	2008	+{
	2009	+ int err;
	2010	+
	2011	+ rtnl_lock();
	2012	+ list_del(&nn->list);
	2013	+ err = __unregister_netdevice_notifier_net(dev_net(dev), nb);
	2014	+ rtnl_unlock();
	2015	+ return err;
	2016	+}
	2017	+EXPORT_SYMBOL(unregister_netdevice_notifier_dev_net);
	2018	+
	2019	+static void move_netdevice_notifiers_dev_net(struct net_device *dev,
	2020	+ struct net *net)
	2021	+{
	2022	+ struct netdev_net_notifier *nn;
	2023	+
	2024	+ list_for_each_entry(nn, &dev->net_notifier_list, list) {
	2025	+ __unregister_netdevice_notifier_net(dev_net(dev), nn->nb);
	2026	+ __register_netdevice_notifier_net(net, nn->nb, true);
	2027	+ }
	2028	+}
1730	2029
1731	2030	/**
1732	2031	* call_netdevice_notifiers_info - call all network notifier blocks
..	..	@@ -1740,8 +2039,31 @@
1740	2039	static int call_netdevice_notifiers_info(unsigned long val,
1741	2040	struct netdev_notifier_info *info)
1742	2041	{
	2042	+ struct net *net = dev_net(info->dev);
	2043	+ int ret;
	2044	+
1743	2045	ASSERT_RTNL();
	2046	+
	2047	+ /* Run per-netns notifier block chain first, then run the global one.
	2048	+ * Hopefully, one day, the global one is going to be removed after
	2049	+ * all notifier block registrators get converted to be per-netns.
	2050	+ */
	2051	+ ret = raw_notifier_call_chain(&net->netdev_chain, val, info);
	2052	+ if (ret & NOTIFY_STOP_MASK)
	2053	+ return ret;
1744	2054	return raw_notifier_call_chain(&netdev_chain, val, info);
	2055	+}
	2056	+
	2057	+static int call_netdevice_notifiers_extack(unsigned long val,
	2058	+ struct net_device *dev,
	2059	+ struct netlink_ext_ack *extack)
	2060	+{
	2061	+ struct netdev_notifier_info info = {
	2062	+ .dev = dev,
	2063	+ .extack = extack,
	2064	+ };
	2065	+
	2066	+ return call_netdevice_notifiers_info(val, &info);
1745	2067	}
1746	2068
1747	2069	/**
..	..	@@ -1755,11 +2077,7 @@
1755	2077
1756	2078	int call_netdevice_notifiers(unsigned long val, struct net_device *dev)
1757	2079	{
1758		- struct netdev_notifier_info info = {
1759		- .dev = dev,
1760		- };
1761		-
1762		- return call_netdevice_notifiers_info(val, &info);
	2080	+ return call_netdevice_notifiers_extack(val, dev, NULL);
1763	2081	}
1764	2082	EXPORT_SYMBOL(call_netdevice_notifiers);
1765	2083
..	..	@@ -1987,6 +2305,17 @@
1987	2305	return false;
1988	2306	}
1989	2307
	2308	+/**
	2309	+ * dev_nit_active - return true if any network interface taps are in use
	2310	+ *
	2311	+ * @dev: network device to check for the presence of taps
	2312	+ */
	2313	+bool dev_nit_active(struct net_device *dev)
	2314	+{
	2315	+ return !list_empty(&ptype_all) \|\| !list_empty(&dev->ptype_all);
	2316	+}
	2317	+EXPORT_SYMBOL_GPL(dev_nit_active);
	2318	+
1990	2319	/*
1991	2320	* Support routine. Sends outgoing frames to any network
1992	2321	* taps currently in use.
..	..	@@ -2002,6 +2331,9 @@
2002	2331	rcu_read_lock();
2003	2332	again:
2004	2333	list_for_each_entry_rcu(ptype, ptype_list, list) {
	2334	+ if (ptype->ignore_outgoing)
	2335	+ continue;
	2336	+
2005	2337	/* Never send packets back to the socket
2006	2338	* they originated from - MvS (miquels@drinkel.ow.org)
2007	2339	*/
..	..	@@ -2302,6 +2634,8 @@
2302	2634	struct xps_map map, new_map;
2303	2635	bool active = false;
2304	2636	unsigned int nr_ids;
	2637	+
	2638	+ WARN_ON_ONCE(index >= dev->num_tx_queues);
2305	2639
2306	2640	if (dev->num_tc) {
2307	2641	/* Do not allow XPS on subordinate device directly */
..	..	@@ -2744,7 +3078,7 @@
2744	3078	void netif_schedule_queue(struct netdev_queue *txq)
2745	3079	{
2746	3080	rcu_read_lock();
2747		- if (!(txq->state & QUEUE_STATE_ANY_XOFF)) {
	3081	+ if (!netif_xmit_stopped(txq)) {
2748	3082	struct Qdisc *q = rcu_dereference(txq->qdisc);
2749	3083
2750	3084	__netif_schedule(q);
..	..	@@ -2792,8 +3126,10 @@
2792	3126	{
2793	3127	if (in_irq() \|\| irqs_disabled())
2794	3128	__dev_kfree_skb_irq(skb, reason);
	3129	+ else if (unlikely(reason == SKB_REASON_DROPPED))
	3130	+ kfree_skb(skb);
2795	3131	else
2796		- dev_kfree_skb(skb);
	3132	+ consume_skb(skb);
2797	3133	}
2798	3134	EXPORT_SYMBOL(__dev_kfree_skb_any);
2799	3135
..	..	@@ -2881,12 +3217,10 @@
2881	3217	else
2882	3218	name = netdev_name(dev);
2883	3219	}
2884		- WARN(1, "%s: caps=(%pNF, %pNF) len=%d data_len=%d gso_size=%d "
2885		- "gso_type=%d ip_summed=%d\n",
	3220	+ skb_dump(KERN_WARNING, skb, false);
	3221	+ WARN(1, "%s: caps=(%pNF, %pNF)\n",
2886	3222	name, dev ? &dev->features : &null_features,
2887		- skb->sk ? &skb->sk->sk_route_caps : &null_features,
2888		- skb->len, skb->data_len, skb_shinfo(skb)->gso_size,
2889		- skb_shinfo(skb)->gso_type, skb->ip_summed);
	3223	+ skb->sk ? &skb->sk->sk_route_caps : &null_features);
2890	3224	}
2891	3225
2892	3226	/*
..	..	@@ -2916,18 +3250,19 @@
2916	3250	}
2917	3251
2918	3252	offset = skb_checksum_start_offset(skb);
2919		- BUG_ON(offset >= skb_headlen(skb));
	3253	+ ret = -EINVAL;
	3254	+ if (WARN_ON_ONCE(offset >= skb_headlen(skb)))
	3255	+ goto out;
	3256	+
2920	3257	csum = skb_checksum(skb, offset, skb->len - offset, 0);
2921	3258
2922	3259	offset += skb->csum_offset;
2923		- BUG_ON(offset + sizeof(__sum16) > skb_headlen(skb));
	3260	+ if (WARN_ON_ONCE(offset + sizeof(__sum16) > skb_headlen(skb)))
	3261	+ goto out;
2924	3262
2925		- if (skb_cloned(skb) &&
2926		- !skb_clone_writable(skb, offset + sizeof(__sum16))) {
2927		- ret = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
2928		- if (ret)
2929		- goto out;
2930		- }
	3263	+ ret = skb_ensure_writable(skb, offset + sizeof(__sum16));
	3264	+ if (ret)
	3265	+ goto out;
2931	3266
2932	3267	(__sum16 )(skb->data + offset) = csum_fold(csum) ?: CSUM_MANGLED_0;
2933	3268	out_set_summed:
..	..	@@ -2962,12 +3297,11 @@
2962	3297	ret = -EINVAL;
2963	3298	goto out;
2964	3299	}
2965		- if (skb_cloned(skb) &&
2966		- !skb_clone_writable(skb, offset + sizeof(__le32))) {
2967		- ret = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
2968		- if (ret)
2969		- goto out;
2970		- }
	3300	+
	3301	+ ret = skb_ensure_writable(skb, offset + sizeof(__le32));
	3302	+ if (ret)
	3303	+ goto out;
	3304	+
2971	3305	crc32c_csum = cpu_to_le32(~__skb_checksum(skb, start,
2972	3306	skb->len - start, ~(__u32)0,
2973	3307	crc32c_csum_stub));
..	..	@@ -2993,7 +3327,7 @@
2993	3327	type = eth->h_proto;
2994	3328	}
2995	3329
2996		- return __vlan_get_protocol(skb, type, depth);
	3330	+ return vlan_get_protocol_and_depth(skb, type, depth);
2997	3331	}
2998	3332
2999	3333	/**
..	..	@@ -3052,7 +3386,7 @@
3052	3386	* It may return NULL if the skb requires no segmentation. This is
3053	3387	* only possible when GSO is used for verifying header integrity.
3054	3388	*
3055		- * Segmentation preserves SKB_SGO_CB_OFFSET bytes of previous skb cb.
	3389	+ * Segmentation preserves SKB_GSO_CB_OFFSET bytes of previous skb cb.
3056	3390	*/
3057	3391	struct sk_buff __skb_gso_segment(struct sk_buff skb,
3058	3392	netdev_features_t features, bool tx_path)
..	..	@@ -3081,7 +3415,7 @@
3081	3415	features &= ~NETIF_F_GSO_PARTIAL;
3082	3416	}
3083	3417
3084		- BUILD_BUG_ON(SKB_SGO_CB_OFFSET +
	3418	+ BUILD_BUG_ON(SKB_GSO_CB_OFFSET +
3085	3419	sizeof(*SKB_GSO_CB(skb)) > sizeof(skb->cb));
3086	3420
3087	3421	SKB_GSO_CB(skb)->mac_offset = skb_headroom(skb);
..	..	@@ -3092,7 +3426,7 @@
3092	3426
3093	3427	segs = skb_mac_gso_segment(skb, features);
3094	3428
3095		- if (unlikely(skb_needs_check(skb, tx_path) && !IS_ERR(segs)))
	3429	+ if (segs != skb && unlikely(skb_needs_check(skb, tx_path) && !IS_ERR(segs)))
3096	3430	skb_warn_bad_offload(skb);
3097	3431
3098	3432	return segs;
..	..	@@ -3101,10 +3435,11 @@
3101	3435
3102	3436	/* Take action when hardware reception checksum errors are detected. */
3103	3437	#ifdef CONFIG_BUG
3104		-void netdev_rx_csum_fault(struct net_device *dev)
	3438	+void netdev_rx_csum_fault(struct net_device dev, struct sk_buff skb)
3105	3439	{
3106	3440	if (net_ratelimit()) {
3107	3441	pr_err("%s: hw csum failure\n", dev ? dev->name : "<unknown>");
	3442	+ skb_dump(KERN_ERR, skb, true);
3108	3443	dump_stack();
3109	3444	}
3110	3445	}
..	..	@@ -3154,10 +3489,9 @@
3154	3489	static netdev_features_t harmonize_features(struct sk_buff *skb,
3155	3490	netdev_features_t features)
3156	3491	{
3157		- int tmp;
3158	3492	__be16 type;
3159	3493
3160		- type = skb_network_protocol(skb, &tmp);
	3494	+ type = skb_network_protocol(skb, NULL);
3161	3495	features = net_mpls_features(skb, features, type);
3162	3496
3163	3497	if (skb->ip_summed != CHECKSUM_NONE &&
..	..	@@ -3254,10 +3588,11 @@
3254	3588	unsigned int len;
3255	3589	int rc;
3256	3590
3257		- if (!list_empty(&ptype_all) \|\| !list_empty(&dev->ptype_all))
	3591	+ if (dev_nit_active(dev))
3258	3592	dev_queue_xmit_nit(skb, dev);
3259	3593
3260	3594	len = skb->len;
	3595	+ PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies);
3261	3596	trace_net_dev_start_xmit(skb, dev);
3262	3597	rc = netdev_start_xmit(skb, dev, txq, more);
3263	3598	trace_net_dev_xmit(skb, rc, dev, len);
..	..	@@ -3274,7 +3609,7 @@
3274	3609	while (skb) {
3275	3610	struct sk_buff *next = skb->next;
3276	3611
3277		- skb->next = NULL;
	3612	+ skb_mark_not_on_list(skb);
3278	3613	rc = xmit_one(skb, dev, txq, next != NULL);
3279	3614	if (unlikely(!dev_xmit_complete(rc))) {
3280	3615	skb->next = next;
..	..	@@ -3305,7 +3640,7 @@
3305	3640	int skb_csum_hwoffload_help(struct sk_buff *skb,
3306	3641	const netdev_features_t features)
3307	3642	{
3308		- if (unlikely(skb->csum_not_inet))
	3643	+ if (unlikely(skb_csum_is_sctp(skb)))
3309	3644	return !!(features & NETIF_F_SCTP_CRC) ? 0 :
3310	3645	skb_crc32c_csum_help(skb);
3311	3646
..	..	@@ -3374,7 +3709,7 @@
3374	3709
3375	3710	for (; skb != NULL; skb = next) {
3376	3711	next = skb->next;
3377		- skb->next = NULL;
	3712	+ skb_mark_not_on_list(skb);
3378	3713
3379	3714	/* in case skb wont be segmented, point to itself */
3380	3715	skb->prev = skb;
..	..	@@ -3405,7 +3740,7 @@
3405	3740	/* To get more precise estimation of bytes sent on wire,
3406	3741	* we add to pkt_len the headers size of all segments
3407	3742	*/
3408		- if (shinfo->gso_size) {
	3743	+ if (shinfo->gso_size && skb_transport_header_was_set(skb)) {
3409	3744	unsigned int hdr_len;
3410	3745	u16 gso_segs = shinfo->gso_segs;
3411	3746
..	..	@@ -3449,13 +3784,9 @@
3449	3784	qdisc_calculate_pkt_len(skb, q);
3450	3785
3451	3786	if (q->flags & TCQ_F_NOLOCK) {
3452		- if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) {
3453		- __qdisc_drop(skb, &to_free);
3454		- rc = NET_XMIT_DROP;
3455		- } else {
3456		- rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK;
	3787	+ rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK;
	3788	+ if (likely(!netif_xmit_frozen_or_stopped(txq)))
3457	3789	qdisc_run(q);
3458		- }
3459	3790
3460	3791	if (unlikely(to_free))
3461	3792	kfree_skb_list(to_free);
..	..	@@ -3551,7 +3882,8 @@
3551	3882	skb_reset_mac_header(skb);
3552	3883	__skb_pull(skb, skb_network_offset(skb));
3553	3884	skb->pkt_type = PACKET_LOOPBACK;
3554		- skb->ip_summed = CHECKSUM_UNNECESSARY;
	3885	+ if (skb->ip_summed == CHECKSUM_NONE)
	3886	+ skb->ip_summed = CHECKSUM_UNNECESSARY;
3555	3887	WARN_ON(!skb_dst(skb));
3556	3888	skb_dst_force(skb);
3557	3889	netif_rx_ni(skb);
..	..	@@ -3570,6 +3902,7 @@
3570	3902	return skb;
3571	3903
3572	3904	/* qdisc_skb_cb(skb)->pkt_len was already set by the caller. */
	3905	+ qdisc_skb_cb(skb)->mru = 0;
3573	3906	mini_qdisc_bstats_cpu_update(miniq, skb);
3574	3907
3575	3908	switch (tcf_classify(skb, miniq->filter_list, &cl_res, false)) {
..	..	@@ -3670,23 +4003,21 @@
3670	4003	}
3671	4004
3672	4005	u16 dev_pick_tx_zero(struct net_device dev, struct sk_buff skb,
3673		- struct net_device *sb_dev,
3674		- select_queue_fallback_t fallback)
	4006	+ struct net_device *sb_dev)
3675	4007	{
3676	4008	return 0;
3677	4009	}
3678	4010	EXPORT_SYMBOL(dev_pick_tx_zero);
3679	4011
3680	4012	u16 dev_pick_tx_cpu_id(struct net_device dev, struct sk_buff skb,
3681		- struct net_device *sb_dev,
3682		- select_queue_fallback_t fallback)
	4013	+ struct net_device *sb_dev)
3683	4014	{
3684	4015	return (u16)raw_smp_processor_id() % dev->real_num_tx_queues;
3685	4016	}
3686	4017	EXPORT_SYMBOL(dev_pick_tx_cpu_id);
3687	4018
3688		-static u16 __netdev_pick_tx(struct net_device dev, struct sk_buff skb,
3689		- struct net_device *sb_dev)
	4019	+u16 netdev_pick_tx(struct net_device dev, struct sk_buff skb,
	4020	+ struct net_device *sb_dev)
3690	4021	{
3691	4022	struct sock *sk = skb->sk;
3692	4023	int queue_index = sk_tx_queue_get(sk);
..	..	@@ -3710,10 +4041,11 @@
3710	4041
3711	4042	return queue_index;
3712	4043	}
	4044	+EXPORT_SYMBOL(netdev_pick_tx);
3713	4045
3714		-struct netdev_queue netdev_pick_tx(struct net_device dev,
3715		- struct sk_buff *skb,
3716		- struct net_device *sb_dev)
	4046	+struct netdev_queue netdev_core_pick_tx(struct net_device dev,
	4047	+ struct sk_buff *skb,
	4048	+ struct net_device *sb_dev)
3717	4049	{
3718	4050	int queue_index = 0;
3719	4051
..	..	@@ -3728,10 +4060,9 @@
3728	4060	const struct net_device_ops *ops = dev->netdev_ops;
3729	4061
3730	4062	if (ops->ndo_select_queue)
3731		- queue_index = ops->ndo_select_queue(dev, skb, sb_dev,
3732		- __netdev_pick_tx);
	4063	+ queue_index = ops->ndo_select_queue(dev, skb, sb_dev);
3733	4064	else
3734		- queue_index = __netdev_pick_tx(dev, skb, sb_dev);
	4065	+ queue_index = netdev_pick_tx(dev, skb, sb_dev);
3735	4066
3736	4067	queue_index = netdev_cap_txqueue(dev, queue_index);
3737	4068	}
..	..	@@ -3775,6 +4106,7 @@
3775	4106	bool again = false;
3776	4107
3777	4108	skb_reset_mac_header(skb);
	4109	+ skb_assert_len(skb);
3778	4110
3779	4111	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_SCHED_TSTAMP))
3780	4112	__skb_tstamp_tx(skb, NULL, skb->sk, SCM_TSTAMP_SCHED);
..	..	@@ -3805,7 +4137,7 @@
3805	4137	else
3806	4138	skb_dst_force(skb);
3807	4139
3808		- txq = netdev_pick_tx(dev, skb, sb_dev);
	4140	+ txq = netdev_core_pick_tx(dev, skb, sb_dev);
3809	4141	q = rcu_dereference_bh(txq->qdisc);
3810	4142
3811	4143	trace_net_dev_queue(skb);
..	..	@@ -3840,6 +4172,7 @@
3840	4172	if (!skb)
3841	4173	goto out;
3842	4174
	4175	+ PRANDOM_ADD_NOISE(skb, dev, txq, jiffies);
3843	4176	HARD_TX_LOCK(dev, txq, cpu);
3844	4177
3845	4178	if (!netif_xmit_stopped(txq)) {
..	..	@@ -3887,7 +4220,7 @@
3887	4220	}
3888	4221	EXPORT_SYMBOL(dev_queue_xmit_accel);
3889	4222
3890		-int dev_direct_xmit(struct sk_buff *skb, u16 queue_id)
	4223	+int __dev_direct_xmit(struct sk_buff *skb, u16 queue_id)
3891	4224	{
3892	4225	struct net_device *dev = skb->dev;
3893	4226	struct sk_buff *orig_skb = skb;
..	..	@@ -3905,6 +4238,7 @@
3905	4238
3906	4239	skb_set_queue_mapping(skb, queue_id);
3907	4240	txq = skb_get_tx_queue(dev, skb);
	4241	+ PRANDOM_ADD_NOISE(skb, dev, txq, jiffies);
3908	4242
3909	4243	local_bh_disable();
3910	4244
..	..	@@ -3916,17 +4250,13 @@
3916	4250	dev_xmit_recursion_dec();
3917	4251
3918	4252	local_bh_enable();
3919		-
3920		- if (!dev_xmit_complete(ret))
3921		- kfree_skb(skb);
3922		-
3923	4253	return ret;
3924	4254	drop:
3925	4255	atomic_long_inc(&dev->tx_dropped);
3926	4256	kfree_skb_list(skb);
3927	4257	return NET_XMIT_DROP;
3928	4258	}
3929		-EXPORT_SYMBOL(dev_direct_xmit);
	4259	+EXPORT_SYMBOL(__dev_direct_xmit);
3930	4260
3931	4261	/*************************************************************************
3932	4262	* Receiver routines
..	..	@@ -3944,6 +4274,8 @@
3944	4274	int dev_weight_tx_bias __read_mostly = 1; /* bias for output_queue quota */
3945	4275	int dev_rx_weight __read_mostly = 64;
3946	4276	int dev_tx_weight __read_mostly = 64;
	4277	+/* Maximum number of GRO_NORMAL skbs to batch up for list-RX */
	4278	+int gro_normal_batch __read_mostly = 8;
3947	4279
3948	4280	/* Called with irq disabled */
3949	4281	static inline void ____napi_schedule(struct softnet_data *sd,
..	..	@@ -3961,9 +4293,9 @@
3961	4293	u32 rps_cpu_mask __read_mostly;
3962	4294	EXPORT_SYMBOL(rps_cpu_mask);
3963	4295
3964		-struct static_key rps_needed __read_mostly;
	4296	+struct static_key_false rps_needed __read_mostly;
3965	4297	EXPORT_SYMBOL(rps_needed);
3966		-struct static_key rfs_needed __read_mostly;
	4298	+struct static_key_false rfs_needed __read_mostly;
3967	4299	EXPORT_SYMBOL(rfs_needed);
3968	4300
3969	4301	static struct rps_dev_flow *
..	..	@@ -4058,8 +4390,10 @@
4058	4390	u32 next_cpu;
4059	4391	u32 ident;
4060	4392
4061		- /* First check into global flow table if there is a match */
4062		- ident = sock_flow_table->ents[hash & sock_flow_table->mask];
	4393	+ /* First check into global flow table if there is a match.
	4394	+ * This READ_ONCE() pairs with WRITE_ONCE() from rps_record_sock_flow().
	4395	+ */
	4396	+ ident = READ_ONCE(sock_flow_table->ents[hash & sock_flow_table->mask]);
4063	4397	if ((ident ^ hash) & ~rps_cpu_mask)
4064	4398	goto try_rps;
4065	4399
..	..	@@ -4194,7 +4528,7 @@
4194	4528	struct softnet_data *sd;
4195	4529	unsigned int old_flow, new_flow;
4196	4530
4197		- if (qlen < (netdev_max_backlog >> 1))
	4531	+ if (qlen < (READ_ONCE(netdev_max_backlog) >> 1))
4198	4532	return false;
4199	4533
4200	4534	sd = this_cpu_ptr(&softnet_data);
..	..	@@ -4242,7 +4576,7 @@
4242	4576	if (!netif_running(skb->dev))
4243	4577	goto drop;
4244	4578	qlen = skb_queue_len(&sd->input_pkt_queue);
4245		- if (qlen <= netdev_max_backlog && !skb_flow_limit(skb, qlen)) {
	4579	+ if (qlen <= READ_ONCE(netdev_max_backlog) && !skb_flow_limit(skb, qlen)) {
4246	4580	if (qlen) {
4247	4581	enqueue:
4248	4582	__skb_queue_tail(&sd->input_pkt_queue, skb);
..	..	@@ -4312,7 +4646,7 @@
4312	4646	/* Reinjected packets coming from act_mirred or similar should
4313	4647	* not get XDP generic processing.
4314	4648	*/
4315		- if (skb_is_tc_redirected(skb))
	4649	+ if (skb_is_redirected(skb))
4316	4650	return XDP_PASS;
4317	4651
4318	4652	/* XDP packets must be linear and must have sufficient headroom
..	..	@@ -4344,6 +4678,11 @@
4344	4678	xdp->data_meta = xdp->data;
4345	4679	xdp->data_end = xdp->data + hlen;
4346	4680	xdp->data_hard_start = skb->data - skb_headroom(skb);
	4681	+
	4682	+ /* SKB "head" area always have tailroom for skb_shared_info */
	4683	+ xdp->frame_sz = (void *)skb_end_pointer(skb) - xdp->data_hard_start;
	4684	+ xdp->frame_sz += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
	4685	+
4347	4686	orig_data_end = xdp->data_end;
4348	4687	orig_data = xdp->data;
4349	4688	eth = (struct ethhdr *)xdp->data;
..	..	@@ -4367,14 +4706,11 @@
4367	4706	skb_reset_network_header(skb);
4368	4707	}
4369	4708
4370		- /* check if bpf_xdp_adjust_tail was used. it can only "shrink"
4371		- * pckt.
4372		- */
4373		- off = orig_data_end - xdp->data_end;
	4709	+ /* check if bpf_xdp_adjust_tail was used */
	4710	+ off = xdp->data_end - orig_data_end;
4374	4711	if (off != 0) {
4375	4712	skb_set_tail_pointer(skb, xdp->data_end - xdp->data);
4376		- skb->len -= off;
4377		-
	4713	+ skb->len += off; /* positive on grow, negative on shrink */
4378	4714	}
4379	4715
4380	4716	/* check if XDP changed eth hdr such SKB needs update */
..	..	@@ -4397,10 +4733,10 @@
4397	4733	break;
4398	4734	default:
4399	4735	bpf_warn_invalid_xdp_action(act);
4400		- /* fall through */
	4736	+ fallthrough;
4401	4737	case XDP_ABORTED:
4402	4738	trace_xdp_exception(skb->dev, xdp_prog, act);
4403		- /* fall through */
	4739	+ fallthrough;
4404	4740	case XDP_DROP:
4405	4741	do_drop:
4406	4742	kfree_skb(skb);
..	..	@@ -4420,7 +4756,7 @@
4420	4756	bool free_skb = true;
4421	4757	int cpu, rc;
4422	4758
4423		- txq = netdev_pick_tx(dev, skb, NULL);
	4759	+ txq = netdev_core_pick_tx(dev, skb, NULL);
4424	4760	cpu = smp_processor_id();
4425	4761	HARD_TX_LOCK(dev, txq, cpu);
4426	4762	if (!netif_xmit_stopped(txq)) {
..	..	@@ -4434,7 +4770,6 @@
4434	4770	kfree_skb(skb);
4435	4771	}
4436	4772	}
4437		-EXPORT_SYMBOL_GPL(generic_xdp_tx);
4438	4773
4439	4774	static DEFINE_STATIC_KEY_FALSE(generic_xdp_needed_key);
4440	4775
..	..	@@ -4472,12 +4807,12 @@
4472	4807	{
4473	4808	int ret;
4474	4809
4475		- net_timestamp_check(netdev_tstamp_prequeue, skb);
	4810	+ net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb);
4476	4811
4477	4812	trace_netif_rx(skb);
4478	4813
4479	4814	#ifdef CONFIG_RPS
4480		- if (static_key_false(&rps_needed)) {
	4815	+ if (static_branch_unlikely(&rps_needed)) {
4481	4816	struct rps_dev_flow voidflow, *rflow = &voidflow;
4482	4817	int cpu;
4483	4818
..	..	@@ -4520,9 +4855,14 @@
4520	4855
4521	4856	int netif_rx(struct sk_buff *skb)
4522	4857	{
	4858	+ int ret;
	4859	+
4523	4860	trace_netif_rx_entry(skb);
4524	4861
4525		- return netif_rx_internal(skb);
	4862	+ ret = netif_rx_internal(skb);
	4863	+ trace_netif_rx_exit(ret);
	4864	+
	4865	+ return ret;
4526	4866	}
4527	4867	EXPORT_SYMBOL(netif_rx);
4528	4868
..	..	@@ -4537,10 +4877,26 @@
4537	4877	if (local_softirq_pending())
4538	4878	do_softirq();
4539	4879	preempt_enable();
	4880	+ trace_netif_rx_ni_exit(err);
4540	4881
4541	4882	return err;
4542	4883	}
4543	4884	EXPORT_SYMBOL(netif_rx_ni);
	4885	+
	4886	+int netif_rx_any_context(struct sk_buff *skb)
	4887	+{
	4888	+ /*
	4889	+ * If invoked from contexts which do not invoke bottom half
	4890	+ * processing either at return from interrupt or when softrqs are
	4891	+ * reenabled, use netif_rx_ni() which invokes bottomhalf processing
	4892	+ * directly.
	4893	+ */
	4894	+ if (in_interrupt())
	4895	+ return netif_rx(skb);
	4896	+ else
	4897	+ return netif_rx_ni(skb);
	4898	+}
	4899	+EXPORT_SYMBOL(netif_rx_any_context);
4544	4900
4545	4901	static __latent_entropy void net_tx_action(struct softirq_action *h)
4546	4902	{
..	..	@@ -4583,25 +4939,43 @@
4583	4939	sd->output_queue_tailp = &sd->output_queue;
4584	4940	local_irq_enable();
4585	4941
	4942	+ rcu_read_lock();
	4943	+
4586	4944	while (head) {
4587	4945	struct Qdisc *q = head;
4588	4946	spinlock_t *root_lock = NULL;
4589	4947
4590	4948	head = head->next_sched;
4591	4949
4592		- if (!(q->flags & TCQ_F_NOLOCK)) {
4593		- root_lock = qdisc_lock(q);
4594		- spin_lock(root_lock);
4595		- }
4596	4950	/* We need to make sure head->next_sched is read
4597	4951	* before clearing __QDISC_STATE_SCHED
4598	4952	*/
4599	4953	smp_mb__before_atomic();
	4954	+
	4955	+ if (!(q->flags & TCQ_F_NOLOCK)) {
	4956	+ root_lock = qdisc_lock(q);
	4957	+ spin_lock(root_lock);
	4958	+ } else if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED,
	4959	+ &q->state))) {
	4960	+ /* There is a synchronize_net() between
	4961	+ * STATE_DEACTIVATED flag being set and
	4962	+ * qdisc_reset()/some_qdisc_is_busy() in
	4963	+ * dev_deactivate(), so we can safely bail out
	4964	+ * early here to avoid data race between
	4965	+ * qdisc_deactivate() and some_qdisc_is_busy()
	4966	+ * for lockless qdisc.
	4967	+ */
	4968	+ clear_bit(__QDISC_STATE_SCHED, &q->state);
	4969	+ continue;
	4970	+ }
	4971	+
4600	4972	clear_bit(__QDISC_STATE_SCHED, &q->state);
4601	4973	qdisc_run(q);
4602	4974	if (root_lock)
4603	4975	spin_unlock(root_lock);
4604	4976	}
	4977	+
	4978	+ rcu_read_unlock();
4605	4979	}
4606	4980
4607	4981	xfrm_dev_backlog(sd);
..	..	@@ -4616,7 +4990,7 @@
4616	4990
4617	4991	static inline struct sk_buff *
4618	4992	sch_handle_ingress(struct sk_buff skb, struct packet_type pt_prev, int ret,
4619		- struct net_device *orig_dev)
	4993	+ struct net_device orig_dev, bool another)
4620	4994	{
4621	4995	#ifdef CONFIG_NET_CLS_ACT
4622	4996	struct mini_Qdisc *miniq = rcu_dereference_bh(skb->dev->miniq_ingress);
..	..	@@ -4636,10 +5010,12 @@
4636	5010	}
4637	5011
4638	5012	qdisc_skb_cb(skb)->pkt_len = skb->len;
	5013	+ qdisc_skb_cb(skb)->mru = 0;
4639	5014	skb->tc_at_ingress = 1;
4640	5015	mini_qdisc_bstats_cpu_update(miniq, skb);
4641	5016
4642		- switch (tcf_classify(skb, miniq->filter_list, &cl_res, false)) {
	5017	+ switch (tcf_classify_ingress(skb, miniq->block, miniq->filter_list,
	5018	+ &cl_res, false)) {
4643	5019	case TC_ACT_OK:
4644	5020	case TC_ACT_RECLASSIFY:
4645	5021	skb->tc_index = TC_H_MIN(cl_res.classid);
..	..	@@ -4659,11 +5035,13 @@
4659	5035	* redirecting to another netdev
4660	5036	*/
4661	5037	__skb_push(skb, skb->mac_len);
4662		- skb_do_redirect(skb);
	5038	+ if (skb_do_redirect(skb) == -EAGAIN) {
	5039	+ __skb_pull(skb, skb->mac_len);
	5040	+ *another = true;
	5041	+ break;
	5042	+ }
4663	5043	return NULL;
4664		- case TC_ACT_REINSERT:
4665		- /* this does not scrub the packet, and updates stats on error */
4666		- skb_tc_reinsert(skb, &cl_res);
	5044	+ case TC_ACT_CONSUMED:
4667	5045	return NULL;
4668	5046	default:
4669	5047	break;
..	..	@@ -4763,7 +5141,6 @@
4763	5141	static inline int nf_ingress(struct sk_buff skb, struct packet_type *pt_prev,
4764	5142	int ret, struct net_device orig_dev)
4765	5143	{
4766		-#ifdef CONFIG_NETFILTER_INGRESS
4767	5144	if (nf_hook_ingress_active(skb)) {
4768	5145	int ingress_retval;
4769	5146
..	..	@@ -4777,7 +5154,6 @@
4777	5154	rcu_read_unlock();
4778	5155	return ingress_retval;
4779	5156	}
4780		-#endif /* CONFIG_NETFILTER_INGRESS */
4781	5157	return 0;
4782	5158	}
4783	5159
..	..	@@ -4792,7 +5168,7 @@
4792	5168	int ret = NET_RX_DROP;
4793	5169	__be16 type;
4794	5170
4795		- net_timestamp_check(!netdev_tstamp_prequeue, skb);
	5171	+ net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
4796	5172
4797	5173	trace_netif_receive_skb(skb);
4798	5174
..	..	@@ -4852,7 +5228,12 @@
4852	5228	skip_taps:
4853	5229	#ifdef CONFIG_NET_INGRESS
4854	5230	if (static_branch_unlikely(&ingress_needed_key)) {
4855		- skb = sch_handle_ingress(skb, &pt_prev, &ret, orig_dev);
	5231	+ bool another = false;
	5232	+
	5233	+ skb = sch_handle_ingress(skb, &pt_prev, &ret, orig_dev,
	5234	+ &another);
	5235	+ if (another)
	5236	+ goto another_round;
4856	5237	if (!skb)
4857	5238	goto out;
4858	5239
..	..	@@ -4860,7 +5241,7 @@
4860	5241	goto out;
4861	5242	}
4862	5243	#endif
4863		- skb_reset_tc(skb);
	5244	+ skb_reset_redirect(skb);
4864	5245	skip_classify:
4865	5246	if (pfmemalloc && !skb_pfmemalloc_protocol(skb))
4866	5247	goto drop;
..	..	@@ -4897,14 +5278,42 @@
4897	5278	}
4898	5279	}
4899	5280
4900		- if (unlikely(skb_vlan_tag_present(skb))) {
4901		- if (skb_vlan_tag_get_id(skb))
	5281	+ if (unlikely(skb_vlan_tag_present(skb)) && !netdev_uses_dsa(skb->dev)) {
	5282	+check_vlan_id:
	5283	+ if (skb_vlan_tag_get_id(skb)) {
	5284	+ /* Vlan id is non 0 and vlan_do_receive() above couldn't
	5285	+ * find vlan device.
	5286	+ */
4902	5287	skb->pkt_type = PACKET_OTHERHOST;
	5288	+ } else if (skb->protocol == cpu_to_be16(ETH_P_8021Q) \|\|
	5289	+ skb->protocol == cpu_to_be16(ETH_P_8021AD)) {
	5290	+ /* Outer header is 802.1P with vlan 0, inner header is
	5291	+ * 802.1Q or 802.1AD and vlan_do_receive() above could
	5292	+ * not find vlan dev for vlan id 0.
	5293	+ */
	5294	+ __vlan_hwaccel_clear_tag(skb);
	5295	+ skb = skb_vlan_untag(skb);
	5296	+ if (unlikely(!skb))
	5297	+ goto out;
	5298	+ if (vlan_do_receive(&skb))
	5299	+ /* After stripping off 802.1P header with vlan 0
	5300	+ * vlan dev is found for inner header.
	5301	+ */
	5302	+ goto another_round;
	5303	+ else if (unlikely(!skb))
	5304	+ goto out;
	5305	+ else
	5306	+ /* We have stripped outer 802.1P vlan 0 header.
	5307	+ * But could not find vlan dev.
	5308	+ * check again for vlan id to set OTHERHOST.
	5309	+ */
	5310	+ goto check_vlan_id;
	5311	+ }
4903	5312	/* Note: we might in the future use prio bits
4904	5313	* and set skb->priority like in vlan_do_receive()
4905	5314	* For the time being, just ignore Priority Code Point
4906	5315	*/
4907		- skb->vlan_tci = 0;
	5316	+ __vlan_hwaccel_clear_tag(skb);
4908	5317	}
4909	5318
4910	5319	type = skb->protocol;
..	..	@@ -4960,7 +5369,8 @@
4960	5369
4961	5370	ret = __netif_receive_skb_core(&skb, pfmemalloc, &pt_prev);
4962	5371	if (pt_prev)
4963		- ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
	5372	+ ret = INDIRECT_CALL_INET(pt_prev->func, ipv6_rcv, ip_rcv, skb,
	5373	+ skb->dev, pt_prev, orig_dev);
4964	5374	return ret;
4965	5375	}
4966	5376
..	..	@@ -4970,7 +5380,7 @@
4970	5380	*
4971	5381	* More direct receive version of netif_receive_skb(). It should
4972	5382	* only be used by callers that have a need to skip RPS and Generic XDP.
4973		- * Caller must also take care of handling if (page_is_)pfmemalloc.
	5383	+ * Caller must also take care of handling if ``(page_is_)pfmemalloc``.
4974	5384	*
4975	5385	* This function may only be called from softirq context and interrupts
4976	5386	* should be enabled.
..	..	@@ -5002,7 +5412,8 @@
5002	5412	if (list_empty(head))
5003	5413	return;
5004	5414	if (pt_prev->list_func != NULL)
5005		- pt_prev->list_func(head, pt_prev, orig_dev);
	5415	+ INDIRECT_CALL_INET(pt_prev->list_func, ipv6_list_rcv,
	5416	+ ip_list_rcv, head, pt_prev, orig_dev);
5006	5417	else
5007	5418	list_for_each_entry_safe(skb, next, head, list) {
5008	5419	skb_list_del_init(skb);
..	..	@@ -5113,6 +5524,25 @@
5113	5524	struct bpf_prog *new = xdp->prog;
5114	5525	int ret = 0;
5115	5526
	5527	+ if (new) {
	5528	+ u32 i;
	5529	+
	5530	+ mutex_lock(&new->aux->used_maps_mutex);
	5531	+
	5532	+ /* generic XDP does not work with DEVMAPs that can
	5533	+ * have a bpf_prog installed on an entry
	5534	+ */
	5535	+ for (i = 0; i < new->aux->used_map_cnt; i++) {
	5536	+ if (dev_map_can_have_prog(new->aux->used_maps[i]) \|\|
	5537	+ cpu_map_prog_allowed(new->aux->used_maps[i])) {
	5538	+ mutex_unlock(&new->aux->used_maps_mutex);
	5539	+ return -EINVAL;
	5540	+ }
	5541	+ }
	5542	+
	5543	+ mutex_unlock(&new->aux->used_maps_mutex);
	5544	+ }
	5545	+
5116	5546	switch (xdp->command) {
5117	5547	case XDP_SETUP_PROG:
5118	5548	rcu_assign_pointer(dev->xdp_prog, new);
..	..	@@ -5128,10 +5558,6 @@
5128	5558	}
5129	5559	break;
5130	5560
5131		- case XDP_QUERY_PROG:
5132		- xdp->prog_id = old ? old->aux->id : 0;
5133		- break;
5134		-
5135	5561	default:
5136	5562	ret = -EINVAL;
5137	5563	break;
..	..	@@ -5144,14 +5570,14 @@
5144	5570	{
5145	5571	int ret;
5146	5572
5147		- net_timestamp_check(netdev_tstamp_prequeue, skb);
	5573	+ net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb);
5148	5574
5149	5575	if (skb_defer_rx_timestamp(skb))
5150	5576	return NET_RX_SUCCESS;
5151	5577
5152	5578	rcu_read_lock();
5153	5579	#ifdef CONFIG_RPS
5154		- if (static_key_false(&rps_needed)) {
	5580	+ if (static_branch_unlikely(&rps_needed)) {
5155	5581	struct rps_dev_flow voidflow, *rflow = &voidflow;
5156	5582	int cpu = get_rps_cpu(skb->dev, skb, &rflow);
5157	5583
..	..	@@ -5174,7 +5600,7 @@
5174	5600
5175	5601	INIT_LIST_HEAD(&sublist);
5176	5602	list_for_each_entry_safe(skb, next, head, list) {
5177		- net_timestamp_check(netdev_tstamp_prequeue, skb);
	5603	+ net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb);
5178	5604	skb_list_del_init(skb);
5179	5605	if (!skb_defer_rx_timestamp(skb))
5180	5606	list_add_tail(&skb->list, &sublist);
..	..	@@ -5183,7 +5609,7 @@
5183	5609
5184	5610	rcu_read_lock();
5185	5611	#ifdef CONFIG_RPS
5186		- if (static_key_false(&rps_needed)) {
	5612	+ if (static_branch_unlikely(&rps_needed)) {
5187	5613	list_for_each_entry_safe(skb, next, head, list) {
5188	5614	struct rps_dev_flow voidflow, *rflow = &voidflow;
5189	5615	int cpu = get_rps_cpu(skb->dev, skb, &rflow);
..	..	@@ -5217,9 +5643,14 @@
5217	5643	*/
5218	5644	int netif_receive_skb(struct sk_buff *skb)
5219	5645	{
	5646	+ int ret;
	5647	+
5220	5648	trace_netif_receive_skb_entry(skb);
5221	5649
5222		- return netif_receive_skb_internal(skb);
	5650	+ ret = netif_receive_skb_internal(skb);
	5651	+ trace_netif_receive_skb_exit(ret);
	5652	+
	5653	+ return ret;
5223	5654	}
5224	5655	EXPORT_SYMBOL(netif_receive_skb);
5225	5656
..	..	@@ -5239,13 +5670,16 @@
5239	5670
5240	5671	if (list_empty(head))
5241	5672	return;
5242		- list_for_each_entry(skb, head, list)
5243		- trace_netif_receive_skb_list_entry(skb);
	5673	+ if (trace_netif_receive_skb_list_entry_enabled()) {
	5674	+ list_for_each_entry(skb, head, list)
	5675	+ trace_netif_receive_skb_list_entry(skb);
	5676	+ }
5244	5677	netif_receive_skb_list_internal(head);
	5678	+ trace_netif_receive_skb_list_exit(0);
5245	5679	}
5246	5680	EXPORT_SYMBOL(netif_receive_skb_list);
5247	5681
5248		-DEFINE_PER_CPU(struct work_struct, flush_works);
	5682	+static DEFINE_PER_CPU(struct work_struct, flush_works);
5249	5683
5250	5684	/* Network device is going away, flush any packets still pending */
5251	5685	static void flush_backlog(struct work_struct *work)
..	..	@@ -5278,23 +5712,89 @@
5278	5712	local_bh_enable();
5279	5713	}
5280	5714
	5715	+static bool flush_required(int cpu)
	5716	+{
	5717	+#if IS_ENABLED(CONFIG_RPS)
	5718	+ struct softnet_data *sd = &per_cpu(softnet_data, cpu);
	5719	+ bool do_flush;
	5720	+
	5721	+ local_irq_disable();
	5722	+ rps_lock(sd);
	5723	+
	5724	+ /* as insertion into process_queue happens with the rps lock held,
	5725	+ * process_queue access may race only with dequeue
	5726	+ */
	5727	+ do_flush = !skb_queue_empty(&sd->input_pkt_queue) \|\|
	5728	+ !skb_queue_empty_lockless(&sd->process_queue);
	5729	+ rps_unlock(sd);
	5730	+ local_irq_enable();
	5731	+
	5732	+ return do_flush;
	5733	+#endif
	5734	+ /* without RPS we can't safely check input_pkt_queue: during a
	5735	+ * concurrent remote skb_queue_splice() we can detect as empty both
	5736	+ * input_pkt_queue and process_queue even if the latter could end-up
	5737	+ * containing a lot of packets.
	5738	+ */
	5739	+ return true;
	5740	+}
	5741	+
5281	5742	static void flush_all_backlogs(void)
5282	5743	{
	5744	+ static cpumask_t flush_cpus;
5283	5745	unsigned int cpu;
	5746	+
	5747	+ /* since we are under rtnl lock protection we can use static data
	5748	+ * for the cpumask and avoid allocating on stack the possibly
	5749	+ * large mask
	5750	+ */
	5751	+ ASSERT_RTNL();
5284	5752
5285	5753	get_online_cpus();
5286	5754
5287		- for_each_online_cpu(cpu)
5288		- queue_work_on(cpu, system_highpri_wq,
5289		- per_cpu_ptr(&flush_works, cpu));
	5755	+ cpumask_clear(&flush_cpus);
	5756	+ for_each_online_cpu(cpu) {
	5757	+ if (flush_required(cpu)) {
	5758	+ queue_work_on(cpu, system_highpri_wq,
	5759	+ per_cpu_ptr(&flush_works, cpu));
	5760	+ cpumask_set_cpu(cpu, &flush_cpus);
	5761	+ }
	5762	+ }
5290	5763
5291		- for_each_online_cpu(cpu)
	5764	+ /* we can have in flight packet[s] on the cpus we are not flushing,
	5765	+ * synchronize_net() in unregister_netdevice_many() will take care of
	5766	+ * them
	5767	+ */
	5768	+ for_each_cpu(cpu, &flush_cpus)
5292	5769	flush_work(per_cpu_ptr(&flush_works, cpu));
5293	5770
5294	5771	put_online_cpus();
5295	5772	}
5296	5773
5297		-static int napi_gro_complete(struct sk_buff *skb)
	5774	+/* Pass the currently batched GRO_NORMAL SKBs up to the stack. */
	5775	+static void gro_normal_list(struct napi_struct *napi)
	5776	+{
	5777	+ if (!napi->rx_count)
	5778	+ return;
	5779	+ netif_receive_skb_list_internal(&napi->rx_list);
	5780	+ INIT_LIST_HEAD(&napi->rx_list);
	5781	+ napi->rx_count = 0;
	5782	+}
	5783	+
	5784	+/* Queue one GRO_NORMAL SKB up for list processing. If batch size exceeded,
	5785	+ * pass the whole batch up to the stack.
	5786	+ */
	5787	+static void gro_normal_one(struct napi_struct napi, struct sk_buff skb, int segs)
	5788	+{
	5789	+ list_add_tail(&skb->list, &napi->rx_list);
	5790	+ napi->rx_count += segs;
	5791	+ if (napi->rx_count >= gro_normal_batch)
	5792	+ gro_normal_list(napi);
	5793	+}
	5794	+
	5795	+INDIRECT_CALLABLE_DECLARE(int inet_gro_complete(struct sk_buff *, int));
	5796	+INDIRECT_CALLABLE_DECLARE(int ipv6_gro_complete(struct sk_buff *, int));
	5797	+static int napi_gro_complete(struct napi_struct napi, struct sk_buff skb)
5298	5798	{
5299	5799	struct packet_offload *ptype;
5300	5800	__be16 type = skb->protocol;
..	..	@@ -5313,7 +5813,9 @@
5313	5813	if (ptype->type != type \|\| !ptype->callbacks.gro_complete)
5314	5814	continue;
5315	5815
5316		- err = ptype->callbacks.gro_complete(skb, 0);
	5816	+ err = INDIRECT_CALL_INET(ptype->callbacks.gro_complete,
	5817	+ ipv6_gro_complete, inet_gro_complete,
	5818	+ skb, 0);
5317	5819	break;
5318	5820	}
5319	5821	rcu_read_unlock();
..	..	@@ -5325,7 +5827,8 @@
5325	5827	}
5326	5828
5327	5829	out:
5328		- return netif_receive_skb_internal(skb);
	5830	+ gro_normal_one(napi, skb, NAPI_GRO_CB(skb)->count);
	5831	+ return NET_RX_SUCCESS;
5329	5832	}
5330	5833
5331	5834	static void __napi_gro_flush_chain(struct napi_struct *napi, u32 index,
..	..	@@ -5337,9 +5840,8 @@
5337	5840	list_for_each_entry_safe_reverse(skb, p, head, list) {
5338	5841	if (flush_old && NAPI_GRO_CB(skb)->age == jiffies)
5339	5842	return;
5340		- list_del(&skb->list);
5341		- skb->next = NULL;
5342		- napi_gro_complete(skb);
	5843	+ skb_list_del_init(skb);
	5844	+ napi_gro_complete(napi, skb);
5343	5845	napi->gro_hash[index].count--;
5344	5846	}
5345	5847
..	..	@@ -5353,11 +5855,13 @@
5353	5855	*/
5354	5856	void napi_gro_flush(struct napi_struct *napi, bool flush_old)
5355	5857	{
5356		- u32 i;
	5858	+ unsigned long bitmask = napi->gro_bitmask;
	5859	+ unsigned int i, base = ~0U;
5357	5860
5358		- for (i = 0; i < GRO_HASH_BUCKETS; i++) {
5359		- if (test_bit(i, &napi->gro_bitmask))
5360		- __napi_gro_flush_chain(napi, i, flush_old);
	5861	+ while ((i = ffs(bitmask)) != 0) {
	5862	+ bitmask >>= i;
	5863	+ base += i;
	5864	+ __napi_gro_flush_chain(napi, base, flush_old);
5361	5865	}
5362	5866	}
5363	5867	EXPORT_SYMBOL(napi_gro_flush);
..	..	@@ -5382,7 +5886,9 @@
5382	5886	}
5383	5887
5384	5888	diffs = (unsigned long)p->dev ^ (unsigned long)skb->dev;
5385		- diffs \|= p->vlan_tci ^ skb->vlan_tci;
	5889	+ diffs \|= skb_vlan_tag_present(p) ^ skb_vlan_tag_present(skb);
	5890	+ if (skb_vlan_tag_present(p))
	5891	+ diffs \|= skb_vlan_tag_get(p) ^ skb_vlan_tag_get(skb);
5386	5892	diffs \|= skb_metadata_dst_cmp(p, skb);
5387	5893	diffs \|= skb_metadata_differs(p, skb);
5388	5894	if (maclen == ETH_HLEN)
..	..	@@ -5392,13 +5898,26 @@
5392	5898	diffs = memcmp(skb_mac_header(p),
5393	5899	skb_mac_header(skb),
5394	5900	maclen);
	5901	+
	5902	+ diffs \|= skb_get_nfct(p) ^ skb_get_nfct(skb);
	5903	+#if IS_ENABLED(CONFIG_SKB_EXTENSIONS) && IS_ENABLED(CONFIG_NET_TC_SKB_EXT)
	5904	+ if (!diffs) {
	5905	+ struct tc_skb_ext *skb_ext = skb_ext_find(skb, TC_SKB_EXT);
	5906	+ struct tc_skb_ext *p_ext = skb_ext_find(p, TC_SKB_EXT);
	5907	+
	5908	+ diffs \|= (!!p_ext) ^ (!!skb_ext);
	5909	+ if (!diffs && unlikely(skb_ext))
	5910	+ diffs \|= p_ext->chain ^ skb_ext->chain;
	5911	+ }
	5912	+#endif
	5913	+
5395	5914	NAPI_GRO_CB(p)->same_flow = !diffs;
5396	5915	}
5397	5916
5398	5917	return head;
5399	5918	}
5400	5919
5401		-static void skb_gro_reset_offset(struct sk_buff *skb)
	5920	+static inline void skb_gro_reset_offset(struct sk_buff *skb, u32 nhoff)
5402	5921	{
5403	5922	const struct skb_shared_info *pinfo = skb_shinfo(skb);
5404	5923	const skb_frag_t *frag0 = &pinfo->frags[0];
..	..	@@ -5407,10 +5926,9 @@
5407	5926	NAPI_GRO_CB(skb)->frag0 = NULL;
5408	5927	NAPI_GRO_CB(skb)->frag0_len = 0;
5409	5928
5410		- if (skb_mac_header(skb) == skb_tail_pointer(skb) &&
5411		- pinfo->nr_frags &&
	5929	+ if (!skb_headlen(skb) && pinfo->nr_frags &&
5412	5930	!PageHighMem(skb_frag_page(frag0)) &&
5413		- (!NET_IP_ALIGN \|\| !(skb_frag_off(frag0) & 3))) {
	5931	+ (!NET_IP_ALIGN \|\| !((skb_frag_off(frag0) + nhoff) & 3))) {
5414	5932	NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0);
5415	5933	NAPI_GRO_CB(skb)->frag0_len = min_t(unsigned int,
5416	5934	skb_frag_size(frag0),
..	..	@@ -5429,7 +5947,7 @@
5429	5947	skb->data_len -= grow;
5430	5948	skb->tail += grow;
5431	5949
5432		- pinfo->frags[0].page_offset += grow;
	5950	+ skb_frag_off_add(&pinfo->frags[0], grow);
5433	5951	skb_frag_size_sub(&pinfo->frags[0], grow);
5434	5952
5435	5953	if (unlikely(!skb_frag_size(&pinfo->frags[0]))) {
..	..	@@ -5439,7 +5957,7 @@
5439	5957	}
5440	5958	}
5441	5959
5442		-static void gro_flush_oldest(struct list_head *head)
	5960	+static void gro_flush_oldest(struct napi_struct napi, struct list_head head)
5443	5961	{
5444	5962	struct sk_buff *oldest;
5445	5963
..	..	@@ -5454,11 +5972,14 @@
5454	5972	/* Do not adjust napi->gro_hash[].count, caller is adding a new
5455	5973	* SKB to the chain.
5456	5974	*/
5457		- list_del(&oldest->list);
5458		- oldest->next = NULL;
5459		- napi_gro_complete(oldest);
	5975	+ skb_list_del_init(oldest);
	5976	+ napi_gro_complete(napi, oldest);
5460	5977	}
5461	5978
	5979	+INDIRECT_CALLABLE_DECLARE(struct sk_buff inet_gro_receive(struct list_head ,
	5980	+ struct sk_buff *));
	5981	+INDIRECT_CALLABLE_DECLARE(struct sk_buff ipv6_gro_receive(struct list_head ,
	5982	+ struct sk_buff *));
5462	5983	static enum gro_result dev_gro_receive(struct napi_struct napi, struct sk_buff skb)
5463	5984	{
5464	5985	u32 hash = skb_get_hash_raw(skb) & (GRO_HASH_BUCKETS - 1);
..	..	@@ -5508,7 +6029,9 @@
5508	6029	NAPI_GRO_CB(skb)->csum_valid = 0;
5509	6030	}
5510	6031
5511		- pp = ptype->callbacks.gro_receive(gro_head, skb);
	6032	+ pp = INDIRECT_CALL_INET(ptype->callbacks.gro_receive,
	6033	+ ipv6_gro_receive, inet_gro_receive,
	6034	+ gro_head, skb);
5512	6035	break;
5513	6036	}
5514	6037	rcu_read_unlock();
..	..	@@ -5516,7 +6039,7 @@
5516	6039	if (&ptype->list == head)
5517	6040	goto normal;
5518	6041
5519		- if (IS_ERR(pp) && PTR_ERR(pp) == -EINPROGRESS) {
	6042	+ if (PTR_ERR(pp) == -EINPROGRESS) {
5520	6043	ret = GRO_CONSUMED;
5521	6044	goto ok;
5522	6045	}
..	..	@@ -5525,9 +6048,8 @@
5525	6048	ret = NAPI_GRO_CB(skb)->free ? GRO_MERGED_FREE : GRO_MERGED;
5526	6049
5527	6050	if (pp) {
5528		- list_del(&pp->list);
5529		- pp->next = NULL;
5530		- napi_gro_complete(pp);
	6051	+ skb_list_del_init(pp);
	6052	+ napi_gro_complete(napi, pp);
5531	6053	napi->gro_hash[hash].count--;
5532	6054	}
5533	6055
..	..	@@ -5538,7 +6060,7 @@
5538	6060	goto normal;
5539	6061
5540	6062	if (unlikely(napi->gro_hash[hash].count >= MAX_GRO_SKBS)) {
5541		- gro_flush_oldest(gro_head);
	6063	+ gro_flush_oldest(napi, gro_head);
5542	6064	} else {
5543	6065	napi->gro_hash[hash].count++;
5544	6066	}
..	..	@@ -5598,17 +6120,19 @@
5598	6120
5599	6121	static void napi_skb_free_stolen_head(struct sk_buff *skb)
5600	6122	{
	6123	+ nf_reset_ct(skb);
5601	6124	skb_dst_drop(skb);
5602		- secpath_reset(skb);
	6125	+ skb_ext_put(skb);
5603	6126	kmem_cache_free(skbuff_head_cache, skb);
5604	6127	}
5605	6128
5606		-static gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)
	6129	+static gro_result_t napi_skb_finish(struct napi_struct *napi,
	6130	+ struct sk_buff *skb,
	6131	+ gro_result_t ret)
5607	6132	{
5608	6133	switch (ret) {
5609	6134	case GRO_NORMAL:
5610		- if (netif_receive_skb_internal(skb))
5611		- ret = GRO_DROP;
	6135	+ gro_normal_one(napi, skb, 1);
5612	6136	break;
5613	6137
5614	6138	case GRO_DROP:
..	..	@@ -5633,12 +6157,17 @@
5633	6157
5634	6158	gro_result_t napi_gro_receive(struct napi_struct napi, struct sk_buff skb)
5635	6159	{
	6160	+ gro_result_t ret;
	6161	+
5636	6162	skb_mark_napi_id(skb, napi);
5637	6163	trace_napi_gro_receive_entry(skb);
5638	6164
5639		- skb_gro_reset_offset(skb);
	6165	+ skb_gro_reset_offset(skb, 0);
5640	6166
5641		- return napi_skb_finish(dev_gro_receive(napi, skb), skb);
	6167	+ ret = napi_skb_finish(napi, skb, dev_gro_receive(napi, skb));
	6168	+ trace_napi_gro_receive_exit(ret);
	6169	+
	6170	+ return ret;
5642	6171	}
5643	6172	EXPORT_SYMBOL(napi_gro_receive);
5644	6173
..	..	@@ -5651,7 +6180,7 @@
5651	6180	__skb_pull(skb, skb_headlen(skb));
5652	6181	/* restore the reserve we had after netdev_alloc_skb_ip_align() */
5653	6182	skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN - skb_headroom(skb));
5654		- skb->vlan_tci = 0;
	6183	+ __vlan_hwaccel_clear_tag(skb);
5655	6184	skb->dev = napi->dev;
5656	6185	skb->skb_iif = 0;
5657	6186
..	..	@@ -5661,7 +6190,8 @@
5661	6190	skb->encapsulation = 0;
5662	6191	skb_shinfo(skb)->gso_type = 0;
5663	6192	skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));
5664		- secpath_reset(skb);
	6193	+ skb_ext_reset(skb);
	6194	+ nf_reset_ct(skb);
5665	6195
5666	6196	napi->skb = skb;
5667	6197	}
..	..	@@ -5690,8 +6220,8 @@
5690	6220	case GRO_HELD:
5691	6221	__skb_push(skb, ETH_HLEN);
5692	6222	skb->protocol = eth_type_trans(skb, skb->dev);
5693		- if (ret == GRO_NORMAL && netif_receive_skb_internal(skb))
5694		- ret = GRO_DROP;
	6223	+ if (ret == GRO_NORMAL)
	6224	+ gro_normal_one(napi, skb, 1);
5695	6225	break;
5696	6226
5697	6227	case GRO_DROP:
..	..	@@ -5726,7 +6256,7 @@
5726	6256	napi->skb = NULL;
5727	6257
5728	6258	skb_reset_mac_header(skb);
5729		- skb_gro_reset_offset(skb);
	6259	+ skb_gro_reset_offset(skb, hlen);
5730	6260
5731	6261	if (unlikely(skb_gro_header_hard(skb, hlen))) {
5732	6262	eth = skb_gro_header_slow(skb, hlen, 0);
..	..	@@ -5756,6 +6286,7 @@
5756	6286
5757	6287	gro_result_t napi_gro_frags(struct napi_struct *napi)
5758	6288	{
	6289	+ gro_result_t ret;
5759	6290	struct sk_buff *skb = napi_frags_skb(napi);
5760	6291
5761	6292	if (!skb)
..	..	@@ -5763,7 +6294,10 @@
5763	6294
5764	6295	trace_napi_gro_frags_entry(skb);
5765	6296
5766		- return napi_frags_finish(napi, skb, dev_gro_receive(napi, skb));
	6297	+ ret = napi_frags_finish(napi, skb, dev_gro_receive(napi, skb));
	6298	+ trace_napi_gro_frags_exit(ret);
	6299	+
	6300	+ return ret;
5767	6301	}
5768	6302	EXPORT_SYMBOL(napi_gro_frags);
5769	6303
..	..	@@ -5779,10 +6313,11 @@
5779	6313
5780	6314	/* NAPI_GRO_CB(skb)->csum holds pseudo checksum */
5781	6315	sum = csum_fold(csum_add(NAPI_GRO_CB(skb)->csum, wsum));
	6316	+ /* See comments in __skb_checksum_complete(). */
5782	6317	if (likely(!sum)) {
5783	6318	if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE) &&
5784	6319	!skb->csum_complete_sw)
5785		- netdev_rx_csum_fault(skb->dev);
	6320	+ netdev_rx_csum_fault(skb->dev, skb);
5786	6321	}
5787	6322
5788	6323	NAPI_GRO_CB(skb)->csum = wsum;
..	..	@@ -5849,7 +6384,7 @@
5849	6384	net_rps_action_and_irq_enable(sd);
5850	6385	}
5851	6386
5852		- napi->weight = dev_rx_weight;
	6387	+ napi->weight = READ_ONCE(dev_rx_weight);
5853	6388	while (again) {
5854	6389	struct sk_buff *skb;
5855	6390
..	..	@@ -5859,7 +6394,8 @@
5859	6394	rcu_read_unlock();
5860	6395	input_queue_head_incr(sd);
5861	6396	if (++work >= quota)
5862		- goto state_changed;
	6397	+ return work;
	6398	+
5863	6399	}
5864	6400
5865	6401	local_irq_disable();
..	..	@@ -5882,10 +6418,6 @@
5882	6418	rps_unlock(sd);
5883	6419	local_irq_enable();
5884	6420	}
5885		-
5886		-state_changed:
5887		- napi_gro_flush(napi, false);
5888		- sd->current_napi = NULL;
5889	6421
5890	6422	return work;
5891	6423	}
..	..	@@ -5912,7 +6444,7 @@
5912	6444	* @n: napi context
5913	6445	*
5914	6446	* Test if NAPI routine is already running, and if not mark
5915		- * it as running. This is used as a condition variable
	6447	+ * it as running. This is used as a condition variable to
5916	6448	* insure only one NAPI poll instance runs. We also make
5917	6449	* sure there is no pending NAPI disable.
5918	6450	*/
..	..	@@ -5961,7 +6493,8 @@
5961	6493
5962	6494	bool napi_complete_done(struct napi_struct *n, int work_done)
5963	6495	{
5964		- unsigned long flags, val, new;
	6496	+ unsigned long flags, val, new, timeout = 0;
	6497	+ bool ret = true;
5965	6498
5966	6499	/*
5967	6500	* 1) Don't let napi dequeue from the cpu poll list
..	..	@@ -5973,28 +6506,31 @@
5973	6506	NAPIF_STATE_IN_BUSY_POLL)))
5974	6507	return false;
5975	6508
	6509	+ if (work_done) {
	6510	+ if (n->gro_bitmask)
	6511	+ timeout = READ_ONCE(n->dev->gro_flush_timeout);
	6512	+ n->defer_hard_irqs_count = READ_ONCE(n->dev->napi_defer_hard_irqs);
	6513	+ }
	6514	+ if (n->defer_hard_irqs_count > 0) {
	6515	+ n->defer_hard_irqs_count--;
	6516	+ timeout = READ_ONCE(n->dev->gro_flush_timeout);
	6517	+ if (timeout)
	6518	+ ret = false;
	6519	+ }
5976	6520	if (n->gro_bitmask) {
5977		- unsigned long timeout = 0;
5978		-
5979		- if (work_done)
5980		- timeout = n->dev->gro_flush_timeout;
5981		-
5982	6521	/* When the NAPI instance uses a timeout and keeps postponing
5983	6522	* it, we need to bound somehow the time packets are kept in
5984	6523	* the GRO layer
5985	6524	*/
5986	6525	napi_gro_flush(n, !!timeout);
5987		- if (timeout)
5988		- hrtimer_start(&n->timer, ns_to_ktime(timeout),
5989		- HRTIMER_MODE_REL_PINNED);
5990	6526	}
5991		- if (unlikely(!list_empty(&n->poll_list))) {
5992		- struct softnet_data *sd = this_cpu_ptr(&softnet_data);
5993	6527
	6528	+ gro_normal_list(n);
	6529	+
	6530	+ if (unlikely(!list_empty(&n->poll_list))) {
5994	6531	/* If n->poll_list is not empty, we need to mask irqs */
5995	6532	local_irq_save(flags);
5996	6533	list_del_init(&n->poll_list);
5997		- sd->current_napi = NULL;
5998	6534	local_irq_restore(flags);
5999	6535	}
6000	6536
..	..	@@ -6018,7 +6554,10 @@
6018	6554	return false;
6019	6555	}
6020	6556
6021		- return true;
	6557	+ if (timeout)
	6558	+ hrtimer_start(&n->timer, ns_to_ktime(timeout),
	6559	+ HRTIMER_MODE_REL_PINNED);
	6560	+ return ret;
6022	6561	}
6023	6562	EXPORT_SYMBOL(napi_complete_done);
6024	6563
..	..	@@ -6061,10 +6600,19 @@
6061	6600	* Ideally, a new ndo_busy_poll_stop() could avoid another round.
6062	6601	*/
6063	6602	rc = napi->poll(napi, BUSY_POLL_BUDGET);
	6603	+ /* We can't gro_normal_list() here, because napi->poll() might have
	6604	+ * rearmed the napi (napi_complete_done()) in which case it could
	6605	+ * already be running on another CPU.
	6606	+ */
6064	6607	trace_napi_poll(napi, rc, BUSY_POLL_BUDGET);
6065	6608	netpoll_poll_unlock(have_poll_lock);
6066		- if (rc == BUSY_POLL_BUDGET)
	6609	+ if (rc == BUSY_POLL_BUDGET) {
	6610	+ /* As the whole budget was spent, we still own the napi so can
	6611	+ * safely handle the rx_list.
	6612	+ */
	6613	+ gro_normal_list(napi);
6067	6614	__napi_schedule(napi);
	6615	+ }
6068	6616	local_bh_enable();
6069	6617	}
6070	6618
..	..	@@ -6109,6 +6657,7 @@
6109	6657	}
6110	6658	work = napi_poll(napi, BUSY_POLL_BUDGET);
6111	6659	trace_napi_poll(napi, work, BUSY_POLL_BUDGET);
	6660	+ gro_normal_list(napi);
6112	6661	count:
6113	6662	if (work > 0)
6114	6663	__NET_ADD_STATS(dev_net(napi->dev),
..	..	@@ -6142,8 +6691,7 @@
6142	6691
6143	6692	static void napi_hash_add(struct napi_struct *napi)
6144	6693	{
6145		- if (test_bit(NAPI_STATE_NO_BUSY_POLL, &napi->state) \|\|
6146		- test_and_set_bit(NAPI_STATE_HASHED, &napi->state))
	6694	+ if (test_bit(NAPI_STATE_NO_BUSY_POLL, &napi->state))
6147	6695	return;
6148	6696
6149	6697	spin_lock(&napi_hash_lock);
..	..	@@ -6164,20 +6712,14 @@
6164	6712	/* Warning : caller is responsible to make sure rcu grace period
6165	6713	* is respected before freeing memory containing @napi
6166	6714	*/
6167		-bool napi_hash_del(struct napi_struct *napi)
	6715	+static void napi_hash_del(struct napi_struct *napi)
6168	6716	{
6169		- bool rcu_sync_needed = false;
6170		-
6171	6717	spin_lock(&napi_hash_lock);
6172	6718
6173		- if (test_and_clear_bit(NAPI_STATE_HASHED, &napi->state)) {
6174		- rcu_sync_needed = true;
6175		- hlist_del_rcu(&napi->napi_hash_node);
6176		- }
	6719	+ hlist_del_init_rcu(&napi->napi_hash_node);
	6720	+
6177	6721	spin_unlock(&napi_hash_lock);
6178		- return rcu_sync_needed;
6179	6722	}
6180		-EXPORT_SYMBOL_GPL(napi_hash_del);
6181	6723
6182	6724	static enum hrtimer_restart napi_watchdog(struct hrtimer *timer)
6183	6725	{
..	..	@@ -6188,7 +6730,7 @@
6188	6730	/* Note : we use a relaxed variant of napi_schedule_prep() not setting
6189	6731	* NAPI_STATE_MISSED, since we do not react to a device IRQ.
6190	6732	*/
6191		- if (napi->gro_bitmask && !napi_disable_pending(napi) &&
	6733	+ if (!napi_disable_pending(napi) &&
6192	6734	!test_and_set_bit(NAPI_STATE_SCHED, &napi->state))
6193	6735	__napi_schedule_irqoff(napi);
6194	6736
..	..	@@ -6209,15 +6751,21 @@
6209	6751	void netif_napi_add(struct net_device dev, struct napi_struct napi,
6210	6752	int (poll)(struct napi_struct , int), int weight)
6211	6753	{
	6754	+ if (WARN_ON(test_and_set_bit(NAPI_STATE_LISTED, &napi->state)))
	6755	+ return;
	6756	+
6212	6757	INIT_LIST_HEAD(&napi->poll_list);
	6758	+ INIT_HLIST_NODE(&napi->napi_hash_node);
6213	6759	hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
6214	6760	napi->timer.function = napi_watchdog;
6215	6761	init_gro_hash(napi);
6216	6762	napi->skb = NULL;
	6763	+ INIT_LIST_HEAD(&napi->rx_list);
	6764	+ napi->rx_count = 0;
6217	6765	napi->poll = poll;
6218	6766	if (weight > NAPI_POLL_WEIGHT)
6219		- pr_err_once("netif_napi_add() called with weight %d on device %s\n",
6220		- weight, dev->name);
	6767	+ netdev_err_once(dev, "%s() called with weight %d\n", __func__,
	6768	+ weight);
6221	6769	napi->weight = weight;
6222	6770	napi->dev = dev;
6223	6771	#ifdef CONFIG_NETPOLL
..	..	@@ -6260,26 +6808,19 @@
6260	6808	}
6261	6809
6262	6810	/* Must be called in process context */
6263		-void netif_napi_del(struct napi_struct *napi)
	6811	+void __netif_napi_del(struct napi_struct *napi)
6264	6812	{
6265		- might_sleep();
6266		- if (napi_hash_del(napi))
6267		- synchronize_net();
6268		- list_del_init(&napi->dev_list);
	6813	+ if (!test_and_clear_bit(NAPI_STATE_LISTED, &napi->state))
	6814	+ return;
	6815	+
	6816	+ napi_hash_del(napi);
	6817	+ list_del_rcu(&napi->dev_list);
6269	6818	napi_free_frags(napi);
6270	6819
6271	6820	flush_gro_hash(napi);
6272	6821	napi->gro_bitmask = 0;
6273	6822	}
6274		-EXPORT_SYMBOL(netif_napi_del);
6275		-
6276		-struct napi_struct *get_current_napi_context(void)
6277		-{
6278		- struct softnet_data *sd = this_cpu_ptr(&softnet_data);
6279		-
6280		- return sd->current_napi;
6281		-}
6282		-EXPORT_SYMBOL(get_current_napi_context);
	6823	+EXPORT_SYMBOL(__netif_napi_del);
6283	6824
6284	6825	static int napi_poll(struct napi_struct n, struct list_head repoll)
6285	6826	{
..	..	@@ -6300,14 +6841,13 @@
6300	6841	*/
6301	6842	work = 0;
6302	6843	if (test_bit(NAPI_STATE_SCHED, &n->state)) {
6303		- struct softnet_data *sd = this_cpu_ptr(&softnet_data);
6304		-
6305		- sd->current_napi = n;
6306	6844	work = n->poll(n, weight);
6307	6845	trace_napi_poll(n, work, weight);
6308	6846	}
6309	6847
6310		- WARN_ON_ONCE(work > weight);
	6848	+ if (unlikely(work > weight))
	6849	+ pr_err_once("NAPI poll function %pS returned %d, exceeding its budget of %d.\n",
	6850	+ n->poll, work, weight);
6311	6851
6312	6852	if (likely(work < weight))
6313	6853	goto out_unlock;
..	..	@@ -6328,6 +6868,8 @@
6328	6868	*/
6329	6869	napi_gro_flush(n, HZ >= 1000);
6330	6870	}
	6871	+
	6872	+ gro_normal_list(n);
6331	6873
6332	6874	/* Some drivers may have called napi_schedule
6333	6875	* prior to exhausting their budget.
..	..	@@ -6350,8 +6892,8 @@
6350	6892	{
6351	6893	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
6352	6894	unsigned long time_limit = jiffies +
6353		- usecs_to_jiffies(netdev_budget_usecs);
6354		- int budget = netdev_budget;
	6895	+ usecs_to_jiffies(READ_ONCE(netdev_budget_usecs));
	6896	+ int budget = READ_ONCE(netdev_budget);
6355	6897	LIST_HEAD(list);
6356	6898	LIST_HEAD(repoll);
6357	6899
..	..	@@ -6401,6 +6943,9 @@
6401	6943	/* upper master flag, there can only be one master device per list */
6402	6944	bool master;
6403	6945
	6946	+ /* lookup ignore flag */
	6947	+ bool ignore;
	6948	+
6404	6949	/* counter for the number of times this device was added to us */
6405	6950	u16 ref_nr;
6406	6951
..	..	@@ -6423,9 +6968,10 @@
6423	6968	return NULL;
6424	6969	}
6425	6970
6426		-static int __netdev_has_upper_dev(struct net_device upper_dev, void data)
	6971	+static int ____netdev_has_upper_dev(struct net_device *upper_dev,
	6972	+ struct netdev_nested_priv *priv)
6427	6973	{
6428		- struct net_device *dev = data;
	6974	+ struct net_device dev = (struct net_device )priv->data;
6429	6975
6430	6976	return upper_dev == dev;
6431	6977	}
..	..	@@ -6442,10 +6988,14 @@
6442	6988	bool netdev_has_upper_dev(struct net_device *dev,
6443	6989	struct net_device *upper_dev)
6444	6990	{
	6991	+ struct netdev_nested_priv priv = {
	6992	+ .data = (void *)upper_dev,
	6993	+ };
	6994	+
6445	6995	ASSERT_RTNL();
6446	6996
6447		- return netdev_walk_all_upper_dev_rcu(dev, __netdev_has_upper_dev,
6448		- upper_dev);
	6997	+ return netdev_walk_all_upper_dev_rcu(dev, ____netdev_has_upper_dev,
	6998	+ &priv);
6449	6999	}
6450	7000	EXPORT_SYMBOL(netdev_has_upper_dev);
6451	7001
..	..	@@ -6462,8 +7012,12 @@
6462	7012	bool netdev_has_upper_dev_all_rcu(struct net_device *dev,
6463	7013	struct net_device *upper_dev)
6464	7014	{
6465		- return !!netdev_walk_all_upper_dev_rcu(dev, __netdev_has_upper_dev,
6466		- upper_dev);
	7015	+ struct netdev_nested_priv priv = {
	7016	+ .data = (void *)upper_dev,
	7017	+ };
	7018	+
	7019	+ return !!netdev_walk_all_upper_dev_rcu(dev, ____netdev_has_upper_dev,
	7020	+ &priv);
6467	7021	}
6468	7022	EXPORT_SYMBOL(netdev_has_upper_dev_all_rcu);
6469	7023
..	..	@@ -6505,6 +7059,22 @@
6505	7059	return NULL;
6506	7060	}
6507	7061	EXPORT_SYMBOL(netdev_master_upper_dev_get);
	7062	+
	7063	+static struct net_device __netdev_master_upper_dev_get(struct net_device dev)
	7064	+{
	7065	+ struct netdev_adjacent *upper;
	7066	+
	7067	+ ASSERT_RTNL();
	7068	+
	7069	+ if (list_empty(&dev->adj_list.upper))
	7070	+ return NULL;
	7071	+
	7072	+ upper = list_first_entry(&dev->adj_list.upper,
	7073	+ struct netdev_adjacent, list);
	7074	+ if (likely(upper->master) && !upper->ignore)
	7075	+ return upper->dev;
	7076	+ return NULL;
	7077	+}
6508	7078
6509	7079	/**
6510	7080	* netdev_has_any_lower_dev - Check if device is linked to some device
..	..	@@ -6556,8 +7126,9 @@
6556	7126	}
6557	7127	EXPORT_SYMBOL(netdev_upper_get_next_dev_rcu);
6558	7128
6559		-static struct net_device netdev_next_upper_dev(struct net_device dev,
6560		- struct list_head **iter)
	7129	+static struct net_device __netdev_next_upper_dev(struct net_device dev,
	7130	+ struct list_head **iter,
	7131	+ bool *ignore)
6561	7132	{
6562	7133	struct netdev_adjacent *upper;
6563	7134
..	..	@@ -6567,6 +7138,7 @@
6567	7138	return NULL;
6568	7139
6569	7140	*iter = &upper->list;
	7141	+ *ignore = upper->ignore;
6570	7142
6571	7143	return upper->dev;
6572	7144	}
..	..	@@ -6588,30 +7160,33 @@
6588	7160	return upper->dev;
6589	7161	}
6590	7162
6591		-static int netdev_walk_all_upper_dev(struct net_device *dev,
6592		- int (fn)(struct net_device dev,
6593		- void *data),
6594		- void *data)
	7163	+static int __netdev_walk_all_upper_dev(struct net_device *dev,
	7164	+ int (fn)(struct net_device dev,
	7165	+ struct netdev_nested_priv *priv),
	7166	+ struct netdev_nested_priv *priv)
6595	7167	{
6596	7168	struct net_device udev, next, now, dev_stack[MAX_NEST_DEV + 1];
6597	7169	struct list_head niter, iter, *iter_stack[MAX_NEST_DEV + 1];
6598	7170	int ret, cur = 0;
	7171	+ bool ignore;
6599	7172
6600	7173	now = dev;
6601	7174	iter = &dev->adj_list.upper;
6602	7175
6603	7176	while (1) {
6604	7177	if (now != dev) {
6605		- ret = fn(now, data);
	7178	+ ret = fn(now, priv);
6606	7179	if (ret)
6607	7180	return ret;
6608	7181	}
6609	7182
6610	7183	next = NULL;
6611	7184	while (1) {
6612		- udev = netdev_next_upper_dev(now, &iter);
	7185	+ udev = __netdev_next_upper_dev(now, &iter, &ignore);
6613	7186	if (!udev)
6614	7187	break;
	7188	+ if (ignore)
	7189	+ continue;
6615	7190
6616	7191	next = udev;
6617	7192	niter = &udev->adj_list.upper;
..	..	@@ -6636,8 +7211,8 @@
6636	7211
6637	7212	int netdev_walk_all_upper_dev_rcu(struct net_device *dev,
6638	7213	int (fn)(struct net_device dev,
6639		- void *data),
6640		- void *data)
	7214	+ struct netdev_nested_priv *priv),
	7215	+ struct netdev_nested_priv *priv)
6641	7216	{
6642	7217	struct net_device udev, next, now, dev_stack[MAX_NEST_DEV + 1];
6643	7218	struct list_head niter, iter, *iter_stack[MAX_NEST_DEV + 1];
..	..	@@ -6648,7 +7223,7 @@
6648	7223
6649	7224	while (1) {
6650	7225	if (now != dev) {
6651		- ret = fn(now, data);
	7226	+ ret = fn(now, priv);
6652	7227	if (ret)
6653	7228	return ret;
6654	7229	}
..	..	@@ -6680,6 +7255,20 @@
6680	7255	return 0;
6681	7256	}
6682	7257	EXPORT_SYMBOL_GPL(netdev_walk_all_upper_dev_rcu);
	7258	+
	7259	+static bool __netdev_has_upper_dev(struct net_device *dev,
	7260	+ struct net_device *upper_dev)
	7261	+{
	7262	+ struct netdev_nested_priv priv = {
	7263	+ .flags = 0,
	7264	+ .data = (void *)upper_dev,
	7265	+ };
	7266	+
	7267	+ ASSERT_RTNL();
	7268	+
	7269	+ return __netdev_walk_all_upper_dev(dev, ____netdev_has_upper_dev,
	7270	+ &priv);
	7271	+}
6683	7272
6684	7273	/**
6685	7274	* netdev_lower_get_next_private - Get the next ->private from the
..	..	@@ -6777,10 +7366,27 @@
6777	7366	return lower->dev;
6778	7367	}
6779	7368
	7369	+static struct net_device __netdev_next_lower_dev(struct net_device dev,
	7370	+ struct list_head **iter,
	7371	+ bool *ignore)
	7372	+{
	7373	+ struct netdev_adjacent *lower;
	7374	+
	7375	+ lower = list_entry((*iter)->next, struct netdev_adjacent, list);
	7376	+
	7377	+ if (&lower->list == &dev->adj_list.lower)
	7378	+ return NULL;
	7379	+
	7380	+ *iter = &lower->list;
	7381	+ *ignore = lower->ignore;
	7382	+
	7383	+ return lower->dev;
	7384	+}
	7385	+
6780	7386	int netdev_walk_all_lower_dev(struct net_device *dev,
6781	7387	int (fn)(struct net_device dev,
6782		- void *data),
6783		- void *data)
	7388	+ struct netdev_nested_priv *priv),
	7389	+ struct netdev_nested_priv *priv)
6784	7390	{
6785	7391	struct net_device ldev, next, now, dev_stack[MAX_NEST_DEV + 1];
6786	7392	struct list_head niter, iter, *iter_stack[MAX_NEST_DEV + 1];
..	..	@@ -6791,7 +7397,7 @@
6791	7397
6792	7398	while (1) {
6793	7399	if (now != dev) {
6794		- ret = fn(now, data);
	7400	+ ret = fn(now, priv);
6795	7401	if (ret)
6796	7402	return ret;
6797	7403	}
..	..	@@ -6824,8 +7430,57 @@
6824	7430	}
6825	7431	EXPORT_SYMBOL_GPL(netdev_walk_all_lower_dev);
6826	7432
6827		-static struct net_device netdev_next_lower_dev_rcu(struct net_device dev,
6828		- struct list_head **iter)
	7433	+static int __netdev_walk_all_lower_dev(struct net_device *dev,
	7434	+ int (fn)(struct net_device dev,
	7435	+ struct netdev_nested_priv *priv),
	7436	+ struct netdev_nested_priv *priv)
	7437	+{
	7438	+ struct net_device ldev, next, now, dev_stack[MAX_NEST_DEV + 1];
	7439	+ struct list_head niter, iter, *iter_stack[MAX_NEST_DEV + 1];
	7440	+ int ret, cur = 0;
	7441	+ bool ignore;
	7442	+
	7443	+ now = dev;
	7444	+ iter = &dev->adj_list.lower;
	7445	+
	7446	+ while (1) {
	7447	+ if (now != dev) {
	7448	+ ret = fn(now, priv);
	7449	+ if (ret)
	7450	+ return ret;
	7451	+ }
	7452	+
	7453	+ next = NULL;
	7454	+ while (1) {
	7455	+ ldev = __netdev_next_lower_dev(now, &iter, &ignore);
	7456	+ if (!ldev)
	7457	+ break;
	7458	+ if (ignore)
	7459	+ continue;
	7460	+
	7461	+ next = ldev;
	7462	+ niter = &ldev->adj_list.lower;
	7463	+ dev_stack[cur] = now;
	7464	+ iter_stack[cur++] = iter;
	7465	+ break;
	7466	+ }
	7467	+
	7468	+ if (!next) {
	7469	+ if (!cur)
	7470	+ return 0;
	7471	+ next = dev_stack[--cur];
	7472	+ niter = iter_stack[cur];
	7473	+ }
	7474	+
	7475	+ now = next;
	7476	+ iter = niter;
	7477	+ }
	7478	+
	7479	+ return 0;
	7480	+}
	7481	+
	7482	+struct net_device netdev_next_lower_dev_rcu(struct net_device dev,
	7483	+ struct list_head **iter)
6829	7484	{
6830	7485	struct netdev_adjacent *lower;
6831	7486
..	..	@@ -6837,17 +7492,21 @@
6837	7492
6838	7493	return lower->dev;
6839	7494	}
	7495	+EXPORT_SYMBOL(netdev_next_lower_dev_rcu);
6840	7496
6841	7497	static u8 __netdev_upper_depth(struct net_device *dev)
6842	7498	{
6843	7499	struct net_device *udev;
6844	7500	struct list_head *iter;
6845	7501	u8 max_depth = 0;
	7502	+ bool ignore;
6846	7503
6847	7504	for (iter = &dev->adj_list.upper,
6848		- udev = netdev_next_upper_dev(dev, &iter);
	7505	+ udev = __netdev_next_upper_dev(dev, &iter, &ignore);
6849	7506	udev;
6850		- udev = netdev_next_upper_dev(dev, &iter)) {
	7507	+ udev = __netdev_next_upper_dev(dev, &iter, &ignore)) {
	7508	+ if (ignore)
	7509	+ continue;
6851	7510	if (max_depth < udev->upper_level)
6852	7511	max_depth = udev->upper_level;
6853	7512	}
..	..	@@ -6860,11 +7519,14 @@
6860	7519	struct net_device *ldev;
6861	7520	struct list_head *iter;
6862	7521	u8 max_depth = 0;
	7522	+ bool ignore;
6863	7523
6864	7524	for (iter = &dev->adj_list.lower,
6865		- ldev = netdev_next_lower_dev(dev, &iter);
	7525	+ ldev = __netdev_next_lower_dev(dev, &iter, &ignore);
6866	7526	ldev;
6867		- ldev = netdev_next_lower_dev(dev, &iter)) {
	7527	+ ldev = __netdev_next_lower_dev(dev, &iter, &ignore)) {
	7528	+ if (ignore)
	7529	+ continue;
6868	7530	if (max_depth < ldev->lower_level)
6869	7531	max_depth = ldev->lower_level;
6870	7532	}
..	..	@@ -6872,22 +7534,34 @@
6872	7534	return max_depth;
6873	7535	}
6874	7536
6875		-static int __netdev_update_upper_level(struct net_device dev, void data)
	7537	+static int __netdev_update_upper_level(struct net_device *dev,
	7538	+ struct netdev_nested_priv *__unused)
6876	7539	{
6877	7540	dev->upper_level = __netdev_upper_depth(dev) + 1;
6878	7541	return 0;
6879	7542	}
6880	7543
6881		-static int __netdev_update_lower_level(struct net_device dev, void data)
	7544	+static int __netdev_update_lower_level(struct net_device *dev,
	7545	+ struct netdev_nested_priv *priv)
6882	7546	{
6883	7547	dev->lower_level = __netdev_lower_depth(dev) + 1;
	7548	+
	7549	+#ifdef CONFIG_LOCKDEP
	7550	+ if (!priv)
	7551	+ return 0;
	7552	+
	7553	+ if (priv->flags & NESTED_SYNC_IMM)
	7554	+ dev->nested_level = dev->lower_level - 1;
	7555	+ if (priv->flags & NESTED_SYNC_TODO)
	7556	+ net_unlink_todo(dev);
	7557	+#endif
6884	7558	return 0;
6885	7559	}
6886	7560
6887	7561	int netdev_walk_all_lower_dev_rcu(struct net_device *dev,
6888	7562	int (fn)(struct net_device dev,
6889		- void *data),
6890		- void *data)
	7563	+ struct netdev_nested_priv *priv),
	7564	+ struct netdev_nested_priv *priv)
6891	7565	{
6892	7566	struct net_device ldev, next, now, dev_stack[MAX_NEST_DEV + 1];
6893	7567	struct list_head niter, iter, *iter_stack[MAX_NEST_DEV + 1];
..	..	@@ -6898,7 +7572,7 @@
6898	7572
6899	7573	while (1) {
6900	7574	if (now != dev) {
6901		- ret = fn(now, data);
	7575	+ ret = fn(now, priv);
6902	7576	if (ret)
6903	7577	return ret;
6904	7578	}
..	..	@@ -7028,6 +7702,7 @@
7028	7702	adj->master = master;
7029	7703	adj->ref_nr = 1;
7030	7704	adj->private = private;
	7705	+ adj->ignore = false;
7031	7706	dev_hold(adj_dev);
7032	7707
7033	7708	pr_debug("Insert adjacency: dev %s adj_dev %s adj->ref_nr %d; dev_hold on %s\n",
..	..	@@ -7157,6 +7832,7 @@
7157	7832	static int __netdev_upper_dev_link(struct net_device *dev,
7158	7833	struct net_device *upper_dev, bool master,
7159	7834	void upper_priv, void upper_info,
	7835	+ struct netdev_nested_priv *priv,
7160	7836	struct netlink_ext_ack *extack)
7161	7837	{
7162	7838	struct netdev_notifier_changeupper_info changeupper_info = {
..	..	@@ -7178,17 +7854,17 @@
7178	7854	return -EBUSY;
7179	7855
7180	7856	/* To prevent loops, check if dev is not upper device to upper_dev. */
7181		- if (netdev_has_upper_dev(upper_dev, dev))
	7857	+ if (__netdev_has_upper_dev(upper_dev, dev))
7182	7858	return -EBUSY;
7183	7859
7184	7860	if ((dev->lower_level + upper_dev->upper_level) > MAX_NEST_DEV)
7185	7861	return -EMLINK;
7186	7862
7187	7863	if (!master) {
7188		- if (netdev_has_upper_dev(dev, upper_dev))
	7864	+ if (__netdev_has_upper_dev(dev, upper_dev))
7189	7865	return -EEXIST;
7190	7866	} else {
7191		- master_dev = netdev_master_upper_dev_get(dev);
	7867	+ master_dev = __netdev_master_upper_dev_get(dev);
7192	7868	if (master_dev)
7193	7869	return master_dev == upper_dev ? -EEXIST : -EBUSY;
7194	7870	}
..	..	@@ -7211,10 +7887,11 @@
7211	7887	goto rollback;
7212	7888
7213	7889	__netdev_update_upper_level(dev, NULL);
7214		- netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL);
	7890	+ __netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL);
7215	7891
7216		- __netdev_update_lower_level(upper_dev, NULL);
7217		- netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level, NULL);
	7892	+ __netdev_update_lower_level(upper_dev, priv);
	7893	+ __netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level,
	7894	+ priv);
7218	7895
7219	7896	return 0;
7220	7897
..	..	@@ -7239,8 +7916,13 @@
7239	7916	struct net_device *upper_dev,
7240	7917	struct netlink_ext_ack *extack)
7241	7918	{
	7919	+ struct netdev_nested_priv priv = {
	7920	+ .flags = NESTED_SYNC_IMM \| NESTED_SYNC_TODO,
	7921	+ .data = NULL,
	7922	+ };
	7923	+
7242	7924	return __netdev_upper_dev_link(dev, upper_dev, false,
7243		- NULL, NULL, extack);
	7925	+ NULL, NULL, &priv, extack);
7244	7926	}
7245	7927	EXPORT_SYMBOL(netdev_upper_dev_link);
7246	7928
..	..	@@ -7263,21 +7945,19 @@
7263	7945	void upper_priv, void upper_info,
7264	7946	struct netlink_ext_ack *extack)
7265	7947	{
	7948	+ struct netdev_nested_priv priv = {
	7949	+ .flags = NESTED_SYNC_IMM \| NESTED_SYNC_TODO,
	7950	+ .data = NULL,
	7951	+ };
	7952	+
7266	7953	return __netdev_upper_dev_link(dev, upper_dev, true,
7267		- upper_priv, upper_info, extack);
	7954	+ upper_priv, upper_info, &priv, extack);
7268	7955	}
7269	7956	EXPORT_SYMBOL(netdev_master_upper_dev_link);
7270	7957
7271		-/**
7272		- * netdev_upper_dev_unlink - Removes a link to upper device
7273		- * @dev: device
7274		- * @upper_dev: new upper device
7275		- *
7276		- * Removes a link to device which is upper to this one. The caller must hold
7277		- * the RTNL lock.
7278		- */
7279		-void netdev_upper_dev_unlink(struct net_device *dev,
7280		- struct net_device *upper_dev)
	7958	+static void __netdev_upper_dev_unlink(struct net_device *dev,
	7959	+ struct net_device *upper_dev,
	7960	+ struct netdev_nested_priv *priv)
7281	7961	{
7282	7962	struct netdev_notifier_changeupper_info changeupper_info = {
7283	7963	.info = {
..	..	@@ -7300,12 +7980,126 @@
7300	7980	&changeupper_info.info);
7301	7981
7302	7982	__netdev_update_upper_level(dev, NULL);
7303		- netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL);
	7983	+ __netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL);
7304	7984
7305		- __netdev_update_lower_level(upper_dev, NULL);
7306		- netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level, NULL);
	7985	+ __netdev_update_lower_level(upper_dev, priv);
	7986	+ __netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level,
	7987	+ priv);
	7988	+}
	7989	+
	7990	+/**
	7991	+ * netdev_upper_dev_unlink - Removes a link to upper device
	7992	+ * @dev: device
	7993	+ * @upper_dev: new upper device
	7994	+ *
	7995	+ * Removes a link to device which is upper to this one. The caller must hold
	7996	+ * the RTNL lock.
	7997	+ */
	7998	+void netdev_upper_dev_unlink(struct net_device *dev,
	7999	+ struct net_device *upper_dev)
	8000	+{
	8001	+ struct netdev_nested_priv priv = {
	8002	+ .flags = NESTED_SYNC_TODO,
	8003	+ .data = NULL,
	8004	+ };
	8005	+
	8006	+ __netdev_upper_dev_unlink(dev, upper_dev, &priv);
7307	8007	}
7308	8008	EXPORT_SYMBOL(netdev_upper_dev_unlink);
	8009	+
	8010	+static void __netdev_adjacent_dev_set(struct net_device *upper_dev,
	8011	+ struct net_device *lower_dev,
	8012	+ bool val)
	8013	+{
	8014	+ struct netdev_adjacent *adj;
	8015	+
	8016	+ adj = __netdev_find_adj(lower_dev, &upper_dev->adj_list.lower);
	8017	+ if (adj)
	8018	+ adj->ignore = val;
	8019	+
	8020	+ adj = __netdev_find_adj(upper_dev, &lower_dev->adj_list.upper);
	8021	+ if (adj)
	8022	+ adj->ignore = val;
	8023	+}
	8024	+
	8025	+static void netdev_adjacent_dev_disable(struct net_device *upper_dev,
	8026	+ struct net_device *lower_dev)
	8027	+{
	8028	+ __netdev_adjacent_dev_set(upper_dev, lower_dev, true);
	8029	+}
	8030	+
	8031	+static void netdev_adjacent_dev_enable(struct net_device *upper_dev,
	8032	+ struct net_device *lower_dev)
	8033	+{
	8034	+ __netdev_adjacent_dev_set(upper_dev, lower_dev, false);
	8035	+}
	8036	+
	8037	+int netdev_adjacent_change_prepare(struct net_device *old_dev,
	8038	+ struct net_device *new_dev,
	8039	+ struct net_device *dev,
	8040	+ struct netlink_ext_ack *extack)
	8041	+{
	8042	+ struct netdev_nested_priv priv = {
	8043	+ .flags = 0,
	8044	+ .data = NULL,
	8045	+ };
	8046	+ int err;
	8047	+
	8048	+ if (!new_dev)
	8049	+ return 0;
	8050	+
	8051	+ if (old_dev && new_dev != old_dev)
	8052	+ netdev_adjacent_dev_disable(dev, old_dev);
	8053	+ err = __netdev_upper_dev_link(new_dev, dev, false, NULL, NULL, &priv,
	8054	+ extack);
	8055	+ if (err) {
	8056	+ if (old_dev && new_dev != old_dev)
	8057	+ netdev_adjacent_dev_enable(dev, old_dev);
	8058	+ return err;
	8059	+ }
	8060	+
	8061	+ return 0;
	8062	+}
	8063	+EXPORT_SYMBOL(netdev_adjacent_change_prepare);
	8064	+
	8065	+void netdev_adjacent_change_commit(struct net_device *old_dev,
	8066	+ struct net_device *new_dev,
	8067	+ struct net_device *dev)
	8068	+{
	8069	+ struct netdev_nested_priv priv = {
	8070	+ .flags = NESTED_SYNC_IMM \| NESTED_SYNC_TODO,
	8071	+ .data = NULL,
	8072	+ };
	8073	+
	8074	+ if (!new_dev \|\| !old_dev)
	8075	+ return;
	8076	+
	8077	+ if (new_dev == old_dev)
	8078	+ return;
	8079	+
	8080	+ netdev_adjacent_dev_enable(dev, old_dev);
	8081	+ __netdev_upper_dev_unlink(old_dev, dev, &priv);
	8082	+}
	8083	+EXPORT_SYMBOL(netdev_adjacent_change_commit);
	8084	+
	8085	+void netdev_adjacent_change_abort(struct net_device *old_dev,
	8086	+ struct net_device *new_dev,
	8087	+ struct net_device *dev)
	8088	+{
	8089	+ struct netdev_nested_priv priv = {
	8090	+ .flags = 0,
	8091	+ .data = NULL,
	8092	+ };
	8093	+
	8094	+ if (!new_dev)
	8095	+ return;
	8096	+
	8097	+ if (old_dev && new_dev != old_dev)
	8098	+ netdev_adjacent_dev_enable(dev, old_dev);
	8099	+
	8100	+ __netdev_upper_dev_unlink(new_dev, dev, &priv);
	8101	+}
	8102	+EXPORT_SYMBOL(netdev_adjacent_change_abort);
7309	8103
7310	8104	/**
7311	8105	* netdev_bonding_info_change - Dispatch event about slave change
..	..	@@ -7328,6 +8122,29 @@
7328	8122	&info.info);
7329	8123	}
7330	8124	EXPORT_SYMBOL(netdev_bonding_info_change);
	8125	+
	8126	+/**
	8127	+ * netdev_get_xmit_slave - Get the xmit slave of master device
	8128	+ * @dev: device
	8129	+ * @skb: The packet
	8130	+ * @all_slaves: assume all the slaves are active
	8131	+ *
	8132	+ * The reference counters are not incremented so the caller must be
	8133	+ * careful with locks. The caller must hold RCU lock.
	8134	+ * %NULL is returned if no slave is found.
	8135	+ */
	8136	+
	8137	+struct net_device netdev_get_xmit_slave(struct net_device dev,
	8138	+ struct sk_buff *skb,
	8139	+ bool all_slaves)
	8140	+{
	8141	+ const struct net_device_ops *ops = dev->netdev_ops;
	8142	+
	8143	+ if (!ops->ndo_get_xmit_slave)
	8144	+ return NULL;
	8145	+ return ops->ndo_get_xmit_slave(dev, skb, all_slaves);
	8146	+}
	8147	+EXPORT_SYMBOL(netdev_get_xmit_slave);
7331	8148
7332	8149	static void netdev_adjacent_add_links(struct net_device *dev)
7333	8150	{
..	..	@@ -7419,25 +8236,6 @@
7419	8236	}
7420	8237	EXPORT_SYMBOL(netdev_lower_dev_get_private);
7421	8238
7422		-
7423		-int dev_get_nest_level(struct net_device *dev)
7424		-{
7425		- struct net_device *lower = NULL;
7426		- struct list_head *iter;
7427		- int max_nest = -1;
7428		- int nest;
7429		-
7430		- ASSERT_RTNL();
7431		-
7432		- netdev_for_each_lower_dev(dev, lower, iter) {
7433		- nest = dev_get_nest_level(lower);
7434		- if (max_nest < nest)
7435		- max_nest = nest;
7436		- }
7437		-
7438		- return max_nest + 1;
7439		-}
7440		-EXPORT_SYMBOL(dev_get_nest_level);
7441	8239
7442	8240	/**
7443	8241	* netdev_lower_change - Dispatch event about lower device state change
..	..	@@ -7665,7 +8463,8 @@
7665	8463	}
7666	8464	EXPORT_SYMBOL(dev_get_flags);
7667	8465
7668		-int __dev_change_flags(struct net_device *dev, unsigned int flags)
	8466	+int __dev_change_flags(struct net_device *dev, unsigned int flags,
	8467	+ struct netlink_ext_ack *extack)
7669	8468	{
7670	8469	unsigned int old_flags = dev->flags;
7671	8470	int ret;
..	..	@@ -7702,7 +8501,7 @@
7702	8501	if (old_flags & IFF_UP)
7703	8502	__dev_close(dev);
7704	8503	else
7705		- ret = __dev_open(dev);
	8504	+ ret = __dev_open(dev, extack);
7706	8505	}
7707	8506
7708	8507	if ((flags ^ dev->gflags) & IFF_PROMISC) {
..	..	@@ -7762,16 +8561,18 @@
7762	8561	* dev_change_flags - change device settings
7763	8562	* @dev: device
7764	8563	* @flags: device state flags
	8564	+ * @extack: netlink extended ack
7765	8565	*
7766	8566	* Change settings on device based state flags. The flags are
7767	8567	* in the userspace exported format.
7768	8568	*/
7769		-int dev_change_flags(struct net_device *dev, unsigned int flags)
	8569	+int dev_change_flags(struct net_device *dev, unsigned int flags,
	8570	+ struct netlink_ext_ack *extack)
7770	8571	{
7771	8572	int ret;
7772	8573	unsigned int changes, old_flags = dev->flags, old_gflags = dev->gflags;
7773	8574
7774		- ret = __dev_change_flags(dev, flags);
	8575	+ ret = __dev_change_flags(dev, flags, extack);
7775	8576	if (ret < 0)
7776	8577	return ret;
7777	8578
..	..	@@ -7914,13 +8715,36 @@
7914	8715	EXPORT_SYMBOL(dev_set_group);
7915	8716
7916	8717	/**
	8718	+ * dev_pre_changeaddr_notify - Call NETDEV_PRE_CHANGEADDR.
	8719	+ * @dev: device
	8720	+ * @addr: new address
	8721	+ * @extack: netlink extended ack
	8722	+ */
	8723	+int dev_pre_changeaddr_notify(struct net_device dev, const char addr,
	8724	+ struct netlink_ext_ack *extack)
	8725	+{
	8726	+ struct netdev_notifier_pre_changeaddr_info info = {
	8727	+ .info.dev = dev,
	8728	+ .info.extack = extack,
	8729	+ .dev_addr = addr,
	8730	+ };
	8731	+ int rc;
	8732	+
	8733	+ rc = call_netdevice_notifiers_info(NETDEV_PRE_CHANGEADDR, &info.info);
	8734	+ return notifier_to_errno(rc);
	8735	+}
	8736	+EXPORT_SYMBOL(dev_pre_changeaddr_notify);
	8737	+
	8738	+/**
7917	8739	* dev_set_mac_address - Change Media Access Control Address
7918	8740	* @dev: device
7919	8741	* @sa: new address
	8742	+ * @extack: netlink extended ack
7920	8743	*
7921	8744	* Change the hardware (MAC) address of the device
7922	8745	*/
7923		-int dev_set_mac_address(struct net_device dev, struct sockaddr sa)
	8746	+int dev_set_mac_address(struct net_device dev, struct sockaddr sa,
	8747	+ struct netlink_ext_ack *extack)
7924	8748	{
7925	8749	const struct net_device_ops *ops = dev->netdev_ops;
7926	8750	int err;
..	..	@@ -7931,6 +8755,9 @@
7931	8755	return -EINVAL;
7932	8756	if (!netif_device_present(dev))
7933	8757	return -ENODEV;
	8758	+ err = dev_pre_changeaddr_notify(dev, sa->sa_data, extack);
	8759	+ if (err)
	8760	+ return err;
7934	8761	err = ops->ndo_set_mac_address(dev, sa);
7935	8762	if (err)
7936	8763	return err;
..	..	@@ -7940,6 +8767,48 @@
7940	8767	return 0;
7941	8768	}
7942	8769	EXPORT_SYMBOL(dev_set_mac_address);
	8770	+
	8771	+static DECLARE_RWSEM(dev_addr_sem);
	8772	+
	8773	+int dev_set_mac_address_user(struct net_device dev, struct sockaddr sa,
	8774	+ struct netlink_ext_ack *extack)
	8775	+{
	8776	+ int ret;
	8777	+
	8778	+ down_write(&dev_addr_sem);
	8779	+ ret = dev_set_mac_address(dev, sa, extack);
	8780	+ up_write(&dev_addr_sem);
	8781	+ return ret;
	8782	+}
	8783	+EXPORT_SYMBOL(dev_set_mac_address_user);
	8784	+
	8785	+int dev_get_mac_address(struct sockaddr sa, struct net net, char *dev_name)
	8786	+{
	8787	+ size_t size = sizeof(sa->sa_data);
	8788	+ struct net_device *dev;
	8789	+ int ret = 0;
	8790	+
	8791	+ down_read(&dev_addr_sem);
	8792	+ rcu_read_lock();
	8793	+
	8794	+ dev = dev_get_by_name_rcu(net, dev_name);
	8795	+ if (!dev) {
	8796	+ ret = -ENODEV;
	8797	+ goto unlock;
	8798	+ }
	8799	+ if (!dev->addr_len)
	8800	+ memset(sa->sa_data, 0, size);
	8801	+ else
	8802	+ memcpy(sa->sa_data, dev->dev_addr,
	8803	+ min_t(size_t, size, dev->addr_len));
	8804	+ sa->sa_family = dev->type;
	8805	+
	8806	+unlock:
	8807	+ rcu_read_unlock();
	8808	+ up_read(&dev_addr_sem);
	8809	+ return ret;
	8810	+}
	8811	+EXPORT_SYMBOL(dev_get_mac_address);
7943	8812
7944	8813	/**
7945	8814	* dev_change_carrier - Change device carrier
..	..	@@ -7990,12 +8859,80 @@
7990	8859	char *name, size_t len)
7991	8860	{
7992	8861	const struct net_device_ops *ops = dev->netdev_ops;
	8862	+ int err;
7993	8863
7994		- if (!ops->ndo_get_phys_port_name)
7995		- return -EOPNOTSUPP;
7996		- return ops->ndo_get_phys_port_name(dev, name, len);
	8864	+ if (ops->ndo_get_phys_port_name) {
	8865	+ err = ops->ndo_get_phys_port_name(dev, name, len);
	8866	+ if (err != -EOPNOTSUPP)
	8867	+ return err;
	8868	+ }
	8869	+ return devlink_compat_phys_port_name_get(dev, name, len);
7997	8870	}
7998	8871	EXPORT_SYMBOL(dev_get_phys_port_name);
	8872	+
	8873	+/**
	8874	+ * dev_get_port_parent_id - Get the device's port parent identifier
	8875	+ * @dev: network device
	8876	+ * @ppid: pointer to a storage for the port's parent identifier
	8877	+ * @recurse: allow/disallow recursion to lower devices
	8878	+ *
	8879	+ * Get the devices's port parent identifier
	8880	+ */
	8881	+int dev_get_port_parent_id(struct net_device *dev,
	8882	+ struct netdev_phys_item_id *ppid,
	8883	+ bool recurse)
	8884	+{
	8885	+ const struct net_device_ops *ops = dev->netdev_ops;
	8886	+ struct netdev_phys_item_id first = { };
	8887	+ struct net_device *lower_dev;
	8888	+ struct list_head *iter;
	8889	+ int err;
	8890	+
	8891	+ if (ops->ndo_get_port_parent_id) {
	8892	+ err = ops->ndo_get_port_parent_id(dev, ppid);
	8893	+ if (err != -EOPNOTSUPP)
	8894	+ return err;
	8895	+ }
	8896	+
	8897	+ err = devlink_compat_switch_id_get(dev, ppid);
	8898	+ if (!err \|\| err != -EOPNOTSUPP)
	8899	+ return err;
	8900	+
	8901	+ if (!recurse)
	8902	+ return -EOPNOTSUPP;
	8903	+
	8904	+ netdev_for_each_lower_dev(dev, lower_dev, iter) {
	8905	+ err = dev_get_port_parent_id(lower_dev, ppid, recurse);
	8906	+ if (err)
	8907	+ break;
	8908	+ if (!first.id_len)
	8909	+ first = *ppid;
	8910	+ else if (memcmp(&first, ppid, sizeof(*ppid)))
	8911	+ return -EOPNOTSUPP;
	8912	+ }
	8913	+
	8914	+ return err;
	8915	+}
	8916	+EXPORT_SYMBOL(dev_get_port_parent_id);
	8917	+
	8918	+/**
	8919	+ * netdev_port_same_parent_id - Indicate if two network devices have
	8920	+ * the same port parent identifier
	8921	+ * @a: first network device
	8922	+ * @b: second network device
	8923	+ */
	8924	+bool netdev_port_same_parent_id(struct net_device a, struct net_device b)
	8925	+{
	8926	+ struct netdev_phys_item_id a_id = { };
	8927	+ struct netdev_phys_item_id b_id = { };
	8928	+
	8929	+ if (dev_get_port_parent_id(a, &a_id, true) \|\|
	8930	+ dev_get_port_parent_id(b, &b_id, true))
	8931	+ return false;
	8932	+
	8933	+ return netdev_phys_item_id_same(&a_id, &b_id);
	8934	+}
	8935	+EXPORT_SYMBOL(netdev_port_same_parent_id);
7999	8936
8000	8937	/**
8001	8938	* dev_change_proto_down - update protocol port state information
..	..	@@ -8017,67 +8954,495 @@
8017	8954	}
8018	8955	EXPORT_SYMBOL(dev_change_proto_down);
8019	8956
8020		-u32 __dev_xdp_query(struct net_device *dev, bpf_op_t bpf_op,
8021		- enum bpf_netdev_command cmd)
	8957	+/**
	8958	+ * dev_change_proto_down_generic - generic implementation for
	8959	+ * ndo_change_proto_down that sets carrier according to
	8960	+ * proto_down.
	8961	+ *
	8962	+ * @dev: device
	8963	+ * @proto_down: new value
	8964	+ */
	8965	+int dev_change_proto_down_generic(struct net_device *dev, bool proto_down)
8022	8966	{
8023		- struct netdev_bpf xdp;
	8967	+ if (proto_down)
	8968	+ netif_carrier_off(dev);
	8969	+ else
	8970	+ netif_carrier_on(dev);
	8971	+ dev->proto_down = proto_down;
	8972	+ return 0;
	8973	+}
	8974	+EXPORT_SYMBOL(dev_change_proto_down_generic);
8024	8975
8025		- if (!bpf_op)
8026		- return 0;
	8976	+/**
	8977	+ * dev_change_proto_down_reason - proto down reason
	8978	+ *
	8979	+ * @dev: device
	8980	+ * @mask: proto down mask
	8981	+ * @value: proto down value
	8982	+ */
	8983	+void dev_change_proto_down_reason(struct net_device *dev, unsigned long mask,
	8984	+ u32 value)
	8985	+{
	8986	+ int b;
8027	8987
8028		- memset(&xdp, 0, sizeof(xdp));
8029		- xdp.command = cmd;
	8988	+ if (!mask) {
	8989	+ dev->proto_down_reason = value;
	8990	+ } else {
	8991	+ for_each_set_bit(b, &mask, 32) {
	8992	+ if (value & (1 << b))
	8993	+ dev->proto_down_reason \|= BIT(b);
	8994	+ else
	8995	+ dev->proto_down_reason &= ~BIT(b);
	8996	+ }
	8997	+ }
	8998	+}
	8999	+EXPORT_SYMBOL(dev_change_proto_down_reason);
8030	9000
8031		- /* Query must always succeed. */
8032		- WARN_ON(bpf_op(dev, &xdp) < 0 && cmd == XDP_QUERY_PROG);
	9001	+struct bpf_xdp_link {
	9002	+ struct bpf_link link;
	9003	+ struct net_device dev; / protected by rtnl_lock, no refcnt held */
	9004	+ int flags;
	9005	+};
8033	9006
8034		- return xdp.prog_id;
	9007	+static enum bpf_xdp_mode dev_xdp_mode(struct net_device *dev, u32 flags)
	9008	+{
	9009	+ if (flags & XDP_FLAGS_HW_MODE)
	9010	+ return XDP_MODE_HW;
	9011	+ if (flags & XDP_FLAGS_DRV_MODE)
	9012	+ return XDP_MODE_DRV;
	9013	+ if (flags & XDP_FLAGS_SKB_MODE)
	9014	+ return XDP_MODE_SKB;
	9015	+ return dev->netdev_ops->ndo_bpf ? XDP_MODE_DRV : XDP_MODE_SKB;
8035	9016	}
8036	9017
8037		-static int dev_xdp_install(struct net_device *dev, bpf_op_t bpf_op,
8038		- struct netlink_ext_ack *extack, u32 flags,
8039		- struct bpf_prog *prog)
	9018	+static bpf_op_t dev_xdp_bpf_op(struct net_device *dev, enum bpf_xdp_mode mode)
	9019	+{
	9020	+ switch (mode) {
	9021	+ case XDP_MODE_SKB:
	9022	+ return generic_xdp_install;
	9023	+ case XDP_MODE_DRV:
	9024	+ case XDP_MODE_HW:
	9025	+ return dev->netdev_ops->ndo_bpf;
	9026	+ default:
	9027	+ return NULL;
	9028	+ };
	9029	+}
	9030	+
	9031	+static struct bpf_xdp_link dev_xdp_link(struct net_device dev,
	9032	+ enum bpf_xdp_mode mode)
	9033	+{
	9034	+ return dev->xdp_state[mode].link;
	9035	+}
	9036	+
	9037	+static struct bpf_prog dev_xdp_prog(struct net_device dev,
	9038	+ enum bpf_xdp_mode mode)
	9039	+{
	9040	+ struct bpf_xdp_link *link = dev_xdp_link(dev, mode);
	9041	+
	9042	+ if (link)
	9043	+ return link->link.prog;
	9044	+ return dev->xdp_state[mode].prog;
	9045	+}
	9046	+
	9047	+static u8 dev_xdp_prog_count(struct net_device *dev)
	9048	+{
	9049	+ u8 count = 0;
	9050	+ int i;
	9051	+
	9052	+ for (i = 0; i < __MAX_XDP_MODE; i++)
	9053	+ if (dev->xdp_state[i].prog \|\| dev->xdp_state[i].link)
	9054	+ count++;
	9055	+ return count;
	9056	+}
	9057	+
	9058	+u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode)
	9059	+{
	9060	+ struct bpf_prog *prog = dev_xdp_prog(dev, mode);
	9061	+
	9062	+ return prog ? prog->aux->id : 0;
	9063	+}
	9064	+
	9065	+static void dev_xdp_set_link(struct net_device *dev, enum bpf_xdp_mode mode,
	9066	+ struct bpf_xdp_link *link)
	9067	+{
	9068	+ dev->xdp_state[mode].link = link;
	9069	+ dev->xdp_state[mode].prog = NULL;
	9070	+}
	9071	+
	9072	+static void dev_xdp_set_prog(struct net_device *dev, enum bpf_xdp_mode mode,
	9073	+ struct bpf_prog *prog)
	9074	+{
	9075	+ dev->xdp_state[mode].link = NULL;
	9076	+ dev->xdp_state[mode].prog = prog;
	9077	+}
	9078	+
	9079	+static int dev_xdp_install(struct net_device *dev, enum bpf_xdp_mode mode,
	9080	+ bpf_op_t bpf_op, struct netlink_ext_ack *extack,
	9081	+ u32 flags, struct bpf_prog *prog)
8040	9082	{
8041	9083	struct netdev_bpf xdp;
	9084	+ int err;
8042	9085
8043	9086	memset(&xdp, 0, sizeof(xdp));
8044		- if (flags & XDP_FLAGS_HW_MODE)
8045		- xdp.command = XDP_SETUP_PROG_HW;
8046		- else
8047		- xdp.command = XDP_SETUP_PROG;
	9087	+ xdp.command = mode == XDP_MODE_HW ? XDP_SETUP_PROG_HW : XDP_SETUP_PROG;
8048	9088	xdp.extack = extack;
8049	9089	xdp.flags = flags;
8050	9090	xdp.prog = prog;
8051	9091
8052		- return bpf_op(dev, &xdp);
	9092	+ /* Drivers assume refcnt is already incremented (i.e, prog pointer is
	9093	+ * "moved" into driver), so they don't increment it on their own, but
	9094	+ * they do decrement refcnt when program is detached or replaced.
	9095	+ * Given net_device also owns link/prog, we need to bump refcnt here
	9096	+ * to prevent drivers from underflowing it.
	9097	+ */
	9098	+ if (prog)
	9099	+ bpf_prog_inc(prog);
	9100	+ err = bpf_op(dev, &xdp);
	9101	+ if (err) {
	9102	+ if (prog)
	9103	+ bpf_prog_put(prog);
	9104	+ return err;
	9105	+ }
	9106	+
	9107	+ if (mode != XDP_MODE_HW)
	9108	+ bpf_prog_change_xdp(dev_xdp_prog(dev, mode), prog);
	9109	+
	9110	+ return 0;
8053	9111	}
8054	9112
8055	9113	static void dev_xdp_uninstall(struct net_device *dev)
8056	9114	{
8057		- struct netdev_bpf xdp;
8058		- bpf_op_t ndo_bpf;
	9115	+ struct bpf_xdp_link *link;
	9116	+ struct bpf_prog *prog;
	9117	+ enum bpf_xdp_mode mode;
	9118	+ bpf_op_t bpf_op;
8059	9119
8060		- /* Remove generic XDP */
8061		- WARN_ON(dev_xdp_install(dev, generic_xdp_install, NULL, 0, NULL));
	9120	+ ASSERT_RTNL();
8062	9121
8063		- /* Remove from the driver */
8064		- ndo_bpf = dev->netdev_ops->ndo_bpf;
8065		- if (!ndo_bpf)
8066		- return;
	9122	+ for (mode = XDP_MODE_SKB; mode < __MAX_XDP_MODE; mode++) {
	9123	+ prog = dev_xdp_prog(dev, mode);
	9124	+ if (!prog)
	9125	+ continue;
8067	9126
8068		- memset(&xdp, 0, sizeof(xdp));
8069		- xdp.command = XDP_QUERY_PROG;
8070		- WARN_ON(ndo_bpf(dev, &xdp));
8071		- if (xdp.prog_id)
8072		- WARN_ON(dev_xdp_install(dev, ndo_bpf, NULL, xdp.prog_flags,
8073		- NULL));
	9127	+ bpf_op = dev_xdp_bpf_op(dev, mode);
	9128	+ if (!bpf_op)
	9129	+ continue;
8074	9130
8075		- /* Remove HW offload */
8076		- memset(&xdp, 0, sizeof(xdp));
8077		- xdp.command = XDP_QUERY_PROG_HW;
8078		- if (!ndo_bpf(dev, &xdp) && xdp.prog_id)
8079		- WARN_ON(dev_xdp_install(dev, ndo_bpf, NULL, xdp.prog_flags,
8080		- NULL));
	9131	+ WARN_ON(dev_xdp_install(dev, mode, bpf_op, NULL, 0, NULL));
	9132	+
	9133	+ /* auto-detach link from net device */
	9134	+ link = dev_xdp_link(dev, mode);
	9135	+ if (link)
	9136	+ link->dev = NULL;
	9137	+ else
	9138	+ bpf_prog_put(prog);
	9139	+
	9140	+ dev_xdp_set_link(dev, mode, NULL);
	9141	+ }
	9142	+}
	9143	+
	9144	+static int dev_xdp_attach(struct net_device dev, struct netlink_ext_ack extack,
	9145	+ struct bpf_xdp_link link, struct bpf_prog new_prog,
	9146	+ struct bpf_prog *old_prog, u32 flags)
	9147	+{
	9148	+ unsigned int num_modes = hweight32(flags & XDP_FLAGS_MODES);
	9149	+ struct bpf_prog *cur_prog;
	9150	+ enum bpf_xdp_mode mode;
	9151	+ bpf_op_t bpf_op;
	9152	+ int err;
	9153	+
	9154	+ ASSERT_RTNL();
	9155	+
	9156	+ /* either link or prog attachment, never both */
	9157	+ if (link && (new_prog \|\| old_prog))
	9158	+ return -EINVAL;
	9159	+ /* link supports only XDP mode flags */
	9160	+ if (link && (flags & ~XDP_FLAGS_MODES)) {
	9161	+ NL_SET_ERR_MSG(extack, "Invalid XDP flags for BPF link attachment");
	9162	+ return -EINVAL;
	9163	+ }
	9164	+ /* just one XDP mode bit should be set, zero defaults to drv/skb mode */
	9165	+ if (num_modes > 1) {
	9166	+ NL_SET_ERR_MSG(extack, "Only one XDP mode flag can be set");
	9167	+ return -EINVAL;
	9168	+ }
	9169	+ /* avoid ambiguity if offload + drv/skb mode progs are both loaded */
	9170	+ if (!num_modes && dev_xdp_prog_count(dev) > 1) {
	9171	+ NL_SET_ERR_MSG(extack,
	9172	+ "More than one program loaded, unset mode is ambiguous");
	9173	+ return -EINVAL;
	9174	+ }
	9175	+ /* old_prog != NULL implies XDP_FLAGS_REPLACE is set */
	9176	+ if (old_prog && !(flags & XDP_FLAGS_REPLACE)) {
	9177	+ NL_SET_ERR_MSG(extack, "XDP_FLAGS_REPLACE is not specified");
	9178	+ return -EINVAL;
	9179	+ }
	9180	+
	9181	+ mode = dev_xdp_mode(dev, flags);
	9182	+ /* can't replace attached link */
	9183	+ if (dev_xdp_link(dev, mode)) {
	9184	+ NL_SET_ERR_MSG(extack, "Can't replace active BPF XDP link");
	9185	+ return -EBUSY;
	9186	+ }
	9187	+
	9188	+ cur_prog = dev_xdp_prog(dev, mode);
	9189	+ /* can't replace attached prog with link */
	9190	+ if (link && cur_prog) {
	9191	+ NL_SET_ERR_MSG(extack, "Can't replace active XDP program with BPF link");
	9192	+ return -EBUSY;
	9193	+ }
	9194	+ if ((flags & XDP_FLAGS_REPLACE) && cur_prog != old_prog) {
	9195	+ NL_SET_ERR_MSG(extack, "Active program does not match expected");
	9196	+ return -EEXIST;
	9197	+ }
	9198	+
	9199	+ /* put effective new program into new_prog */
	9200	+ if (link)
	9201	+ new_prog = link->link.prog;
	9202	+
	9203	+ if (new_prog) {
	9204	+ bool offload = mode == XDP_MODE_HW;
	9205	+ enum bpf_xdp_mode other_mode = mode == XDP_MODE_SKB
	9206	+ ? XDP_MODE_DRV : XDP_MODE_SKB;
	9207	+
	9208	+ if ((flags & XDP_FLAGS_UPDATE_IF_NOEXIST) && cur_prog) {
	9209	+ NL_SET_ERR_MSG(extack, "XDP program already attached");
	9210	+ return -EBUSY;
	9211	+ }
	9212	+ if (!offload && dev_xdp_prog(dev, other_mode)) {
	9213	+ NL_SET_ERR_MSG(extack, "Native and generic XDP can't be active at the same time");
	9214	+ return -EEXIST;
	9215	+ }
	9216	+ if (!offload && bpf_prog_is_dev_bound(new_prog->aux)) {
	9217	+ NL_SET_ERR_MSG(extack, "Using device-bound program without HW_MODE flag is not supported");
	9218	+ return -EINVAL;
	9219	+ }
	9220	+ if (new_prog->expected_attach_type == BPF_XDP_DEVMAP) {
	9221	+ NL_SET_ERR_MSG(extack, "BPF_XDP_DEVMAP programs can not be attached to a device");
	9222	+ return -EINVAL;
	9223	+ }
	9224	+ if (new_prog->expected_attach_type == BPF_XDP_CPUMAP) {
	9225	+ NL_SET_ERR_MSG(extack, "BPF_XDP_CPUMAP programs can not be attached to a device");
	9226	+ return -EINVAL;
	9227	+ }
	9228	+ }
	9229	+
	9230	+ /* don't call drivers if the effective program didn't change */
	9231	+ if (new_prog != cur_prog) {
	9232	+ bpf_op = dev_xdp_bpf_op(dev, mode);
	9233	+ if (!bpf_op) {
	9234	+ NL_SET_ERR_MSG(extack, "Underlying driver does not support XDP in native mode");
	9235	+ return -EOPNOTSUPP;
	9236	+ }
	9237	+
	9238	+ err = dev_xdp_install(dev, mode, bpf_op, extack, flags, new_prog);
	9239	+ if (err)
	9240	+ return err;
	9241	+ }
	9242	+
	9243	+ if (link)
	9244	+ dev_xdp_set_link(dev, mode, link);
	9245	+ else
	9246	+ dev_xdp_set_prog(dev, mode, new_prog);
	9247	+ if (cur_prog)
	9248	+ bpf_prog_put(cur_prog);
	9249	+
	9250	+ return 0;
	9251	+}
	9252	+
	9253	+static int dev_xdp_attach_link(struct net_device *dev,
	9254	+ struct netlink_ext_ack *extack,
	9255	+ struct bpf_xdp_link *link)
	9256	+{
	9257	+ return dev_xdp_attach(dev, extack, link, NULL, NULL, link->flags);
	9258	+}
	9259	+
	9260	+static int dev_xdp_detach_link(struct net_device *dev,
	9261	+ struct netlink_ext_ack *extack,
	9262	+ struct bpf_xdp_link *link)
	9263	+{
	9264	+ enum bpf_xdp_mode mode;
	9265	+ bpf_op_t bpf_op;
	9266	+
	9267	+ ASSERT_RTNL();
	9268	+
	9269	+ mode = dev_xdp_mode(dev, link->flags);
	9270	+ if (dev_xdp_link(dev, mode) != link)
	9271	+ return -EINVAL;
	9272	+
	9273	+ bpf_op = dev_xdp_bpf_op(dev, mode);
	9274	+ WARN_ON(dev_xdp_install(dev, mode, bpf_op, NULL, 0, NULL));
	9275	+ dev_xdp_set_link(dev, mode, NULL);
	9276	+ return 0;
	9277	+}
	9278	+
	9279	+static void bpf_xdp_link_release(struct bpf_link *link)
	9280	+{
	9281	+ struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);
	9282	+
	9283	+ rtnl_lock();
	9284	+
	9285	+ /* if racing with net_device's tear down, xdp_link->dev might be
	9286	+ * already NULL, in which case link was already auto-detached
	9287	+ */
	9288	+ if (xdp_link->dev) {
	9289	+ WARN_ON(dev_xdp_detach_link(xdp_link->dev, NULL, xdp_link));
	9290	+ xdp_link->dev = NULL;
	9291	+ }
	9292	+
	9293	+ rtnl_unlock();
	9294	+}
	9295	+
	9296	+static int bpf_xdp_link_detach(struct bpf_link *link)
	9297	+{
	9298	+ bpf_xdp_link_release(link);
	9299	+ return 0;
	9300	+}
	9301	+
	9302	+static void bpf_xdp_link_dealloc(struct bpf_link *link)
	9303	+{
	9304	+ struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);
	9305	+
	9306	+ kfree(xdp_link);
	9307	+}
	9308	+
	9309	+static void bpf_xdp_link_show_fdinfo(const struct bpf_link *link,
	9310	+ struct seq_file *seq)
	9311	+{
	9312	+ struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);
	9313	+ u32 ifindex = 0;
	9314	+
	9315	+ rtnl_lock();
	9316	+ if (xdp_link->dev)
	9317	+ ifindex = xdp_link->dev->ifindex;
	9318	+ rtnl_unlock();
	9319	+
	9320	+ seq_printf(seq, "ifindex:\t%u\n", ifindex);
	9321	+}
	9322	+
	9323	+static int bpf_xdp_link_fill_link_info(const struct bpf_link *link,
	9324	+ struct bpf_link_info *info)
	9325	+{
	9326	+ struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);
	9327	+ u32 ifindex = 0;
	9328	+
	9329	+ rtnl_lock();
	9330	+ if (xdp_link->dev)
	9331	+ ifindex = xdp_link->dev->ifindex;
	9332	+ rtnl_unlock();
	9333	+
	9334	+ info->xdp.ifindex = ifindex;
	9335	+ return 0;
	9336	+}
	9337	+
	9338	+static int bpf_xdp_link_update(struct bpf_link link, struct bpf_prog new_prog,
	9339	+ struct bpf_prog *old_prog)
	9340	+{
	9341	+ struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);
	9342	+ enum bpf_xdp_mode mode;
	9343	+ bpf_op_t bpf_op;
	9344	+ int err = 0;
	9345	+
	9346	+ rtnl_lock();
	9347	+
	9348	+ /* link might have been auto-released already, so fail */
	9349	+ if (!xdp_link->dev) {
	9350	+ err = -ENOLINK;
	9351	+ goto out_unlock;
	9352	+ }
	9353	+
	9354	+ if (old_prog && link->prog != old_prog) {
	9355	+ err = -EPERM;
	9356	+ goto out_unlock;
	9357	+ }
	9358	+ old_prog = link->prog;
	9359	+ if (old_prog->type != new_prog->type \|\|
	9360	+ old_prog->expected_attach_type != new_prog->expected_attach_type) {
	9361	+ err = -EINVAL;
	9362	+ goto out_unlock;
	9363	+ }
	9364	+
	9365	+ if (old_prog == new_prog) {
	9366	+ /* no-op, don't disturb drivers */
	9367	+ bpf_prog_put(new_prog);
	9368	+ goto out_unlock;
	9369	+ }
	9370	+
	9371	+ mode = dev_xdp_mode(xdp_link->dev, xdp_link->flags);
	9372	+ bpf_op = dev_xdp_bpf_op(xdp_link->dev, mode);
	9373	+ err = dev_xdp_install(xdp_link->dev, mode, bpf_op, NULL,
	9374	+ xdp_link->flags, new_prog);
	9375	+ if (err)
	9376	+ goto out_unlock;
	9377	+
	9378	+ old_prog = xchg(&link->prog, new_prog);
	9379	+ bpf_prog_put(old_prog);
	9380	+
	9381	+out_unlock:
	9382	+ rtnl_unlock();
	9383	+ return err;
	9384	+}
	9385	+
	9386	+static const struct bpf_link_ops bpf_xdp_link_lops = {
	9387	+ .release = bpf_xdp_link_release,
	9388	+ .dealloc = bpf_xdp_link_dealloc,
	9389	+ .detach = bpf_xdp_link_detach,
	9390	+ .show_fdinfo = bpf_xdp_link_show_fdinfo,
	9391	+ .fill_link_info = bpf_xdp_link_fill_link_info,
	9392	+ .update_prog = bpf_xdp_link_update,
	9393	+};
	9394	+
	9395	+int bpf_xdp_link_attach(const union bpf_attr attr, struct bpf_prog prog)
	9396	+{
	9397	+ struct net *net = current->nsproxy->net_ns;
	9398	+ struct bpf_link_primer link_primer;
	9399	+ struct bpf_xdp_link *link;
	9400	+ struct net_device *dev;
	9401	+ int err, fd;
	9402	+
	9403	+ rtnl_lock();
	9404	+ dev = dev_get_by_index(net, attr->link_create.target_ifindex);
	9405	+ if (!dev) {
	9406	+ rtnl_unlock();
	9407	+ return -EINVAL;
	9408	+ }
	9409	+
	9410	+ link = kzalloc(sizeof(*link), GFP_USER);
	9411	+ if (!link) {
	9412	+ err = -ENOMEM;
	9413	+ goto unlock;
	9414	+ }
	9415	+
	9416	+ bpf_link_init(&link->link, BPF_LINK_TYPE_XDP, &bpf_xdp_link_lops, prog);
	9417	+ link->dev = dev;
	9418	+ link->flags = attr->link_create.flags;
	9419	+
	9420	+ err = bpf_link_prime(&link->link, &link_primer);
	9421	+ if (err) {
	9422	+ kfree(link);
	9423	+ goto unlock;
	9424	+ }
	9425	+
	9426	+ err = dev_xdp_attach_link(dev, NULL, link);
	9427	+ rtnl_unlock();
	9428	+
	9429	+ if (err) {
	9430	+ link->dev = NULL;
	9431	+ bpf_link_cleanup(&link_primer);
	9432	+ goto out_put_dev;
	9433	+ }
	9434	+
	9435	+ fd = bpf_link_settle(&link_primer);
	9436	+ /* link itself doesn't hold dev's refcnt to not complicate shutdown */
	9437	+ dev_put(dev);
	9438	+ return fd;
	9439	+
	9440	+unlock:
	9441	+ rtnl_unlock();
	9442	+
	9443	+out_put_dev:
	9444	+ dev_put(dev);
	9445	+ return err;
8081	9446	}
8082	9447
8083	9448	/**
..	..	@@ -8085,56 +9450,44 @@
8085	9450	* @dev: device
8086	9451	* @extack: netlink extended ack
8087	9452	* @fd: new program fd or negative value to clear
	9453	+ * @expected_fd: old program fd that userspace expects to replace or clear
8088	9454	* @flags: xdp-related flags
8089	9455	*
8090	9456	* Set or clear a bpf program for a device
8091	9457	*/
8092	9458	int dev_change_xdp_fd(struct net_device dev, struct netlink_ext_ack extack,
8093		- int fd, u32 flags)
	9459	+ int fd, int expected_fd, u32 flags)
8094	9460	{
8095		- const struct net_device_ops *ops = dev->netdev_ops;
8096		- enum bpf_netdev_command query;
8097		- struct bpf_prog *prog = NULL;
8098		- bpf_op_t bpf_op, bpf_chk;
	9461	+ enum bpf_xdp_mode mode = dev_xdp_mode(dev, flags);
	9462	+ struct bpf_prog new_prog = NULL, old_prog = NULL;
8099	9463	int err;
8100	9464
8101	9465	ASSERT_RTNL();
8102	9466
8103		- query = flags & XDP_FLAGS_HW_MODE ? XDP_QUERY_PROG_HW : XDP_QUERY_PROG;
8104		-
8105		- bpf_op = bpf_chk = ops->ndo_bpf;
8106		- if (!bpf_op && (flags & (XDP_FLAGS_DRV_MODE \| XDP_FLAGS_HW_MODE)))
8107		- return -EOPNOTSUPP;
8108		- if (!bpf_op \|\| (flags & XDP_FLAGS_SKB_MODE))
8109		- bpf_op = generic_xdp_install;
8110		- if (bpf_op == bpf_chk)
8111		- bpf_chk = generic_xdp_install;
8112		-
8113	9467	if (fd >= 0) {
8114		- if (__dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG) \|\|
8115		- __dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG_HW))
8116		- return -EEXIST;
8117		- if ((flags & XDP_FLAGS_UPDATE_IF_NOEXIST) &&
8118		- __dev_xdp_query(dev, bpf_op, query))
8119		- return -EBUSY;
	9468	+ new_prog = bpf_prog_get_type_dev(fd, BPF_PROG_TYPE_XDP,
	9469	+ mode != XDP_MODE_SKB);
	9470	+ if (IS_ERR(new_prog))
	9471	+ return PTR_ERR(new_prog);
	9472	+ }
8120	9473
8121		- prog = bpf_prog_get_type_dev(fd, BPF_PROG_TYPE_XDP,
8122		- bpf_op == ops->ndo_bpf);
8123		- if (IS_ERR(prog))
8124		- return PTR_ERR(prog);
8125		-
8126		- if (!(flags & XDP_FLAGS_HW_MODE) &&
8127		- bpf_prog_is_dev_bound(prog->aux)) {
8128		- NL_SET_ERR_MSG(extack, "using device-bound program without HW_MODE flag is not supported");
8129		- bpf_prog_put(prog);
8130		- return -EINVAL;
	9474	+ if (expected_fd >= 0) {
	9475	+ old_prog = bpf_prog_get_type_dev(expected_fd, BPF_PROG_TYPE_XDP,
	9476	+ mode != XDP_MODE_SKB);
	9477	+ if (IS_ERR(old_prog)) {
	9478	+ err = PTR_ERR(old_prog);
	9479	+ old_prog = NULL;
	9480	+ goto err_out;
8131	9481	}
8132	9482	}
8133	9483
8134		- err = dev_xdp_install(dev, bpf_op, extack, flags, prog);
8135		- if (err < 0 && prog)
8136		- bpf_prog_put(prog);
	9484	+ err = dev_xdp_attach(dev, extack, NULL, new_prog, old_prog, flags);
8137	9485
	9486	+err_out:
	9487	+ if (err && new_prog)
	9488	+ bpf_prog_put(new_prog);
	9489	+ if (old_prog)
	9490	+ bpf_prog_put(old_prog);
8138	9491	return err;
8139	9492	}
8140	9493
..	..	@@ -8166,103 +9519,6 @@
8166	9519	{
8167	9520	list_add_tail(&dev->todo_list, &net_todo_list);
8168	9521	dev_net(dev)->dev_unreg_count++;
8169		-}
8170		-
8171		-static void rollback_registered_many(struct list_head *head)
8172		-{
8173		- struct net_device dev, tmp;
8174		- LIST_HEAD(close_head);
8175		-
8176		- BUG_ON(dev_boot_phase);
8177		- ASSERT_RTNL();
8178		-
8179		- list_for_each_entry_safe(dev, tmp, head, unreg_list) {
8180		- /* Some devices call without registering
8181		- * for initialization unwind. Remove those
8182		- * devices and proceed with the remaining.
8183		- */
8184		- if (dev->reg_state == NETREG_UNINITIALIZED) {
8185		- pr_debug("unregister_netdevice: device %s/%p never was registered\n",
8186		- dev->name, dev);
8187		-
8188		- WARN_ON(1);
8189		- list_del(&dev->unreg_list);
8190		- continue;
8191		- }
8192		- dev->dismantle = true;
8193		- BUG_ON(dev->reg_state != NETREG_REGISTERED);
8194		- }
8195		-
8196		- /* If device is running, close it first. */
8197		- list_for_each_entry(dev, head, unreg_list)
8198		- list_add_tail(&dev->close_list, &close_head);
8199		- dev_close_many(&close_head, true);
8200		-
8201		- list_for_each_entry(dev, head, unreg_list) {
8202		- /* And unlink it from device chain. */
8203		- unlist_netdevice(dev);
8204		-
8205		- dev->reg_state = NETREG_UNREGISTERING;
8206		- }
8207		- flush_all_backlogs();
8208		-
8209		- synchronize_net();
8210		-
8211		- list_for_each_entry(dev, head, unreg_list) {
8212		- struct sk_buff *skb = NULL;
8213		-
8214		- /* Shutdown queueing discipline. */
8215		- dev_shutdown(dev);
8216		-
8217		- dev_xdp_uninstall(dev);
8218		-
8219		- /* Notify protocols, that we are about to destroy
8220		- * this device. They should clean all the things.
8221		- */
8222		- call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
8223		-
8224		- if (!dev->rtnl_link_ops \|\|
8225		- dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
8226		- skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U, 0,
8227		- GFP_KERNEL, NULL, 0);
8228		-
8229		- /*
8230		- * Flush the unicast and multicast chains
8231		- */
8232		- dev_uc_flush(dev);
8233		- dev_mc_flush(dev);
8234		-
8235		- if (dev->netdev_ops->ndo_uninit)
8236		- dev->netdev_ops->ndo_uninit(dev);
8237		-
8238		- if (skb)
8239		- rtmsg_ifinfo_send(skb, dev, GFP_KERNEL);
8240		-
8241		- /* Notifier chain MUST detach us all upper devices. */
8242		- WARN_ON(netdev_has_any_upper_dev(dev));
8243		- WARN_ON(netdev_has_any_lower_dev(dev));
8244		-
8245		- /* Remove entries from kobject tree */
8246		- netdev_unregister_kobject(dev);
8247		-#ifdef CONFIG_XPS
8248		- /* Remove XPS queueing entries */
8249		- netif_reset_xps_queues_gt(dev, 0);
8250		-#endif
8251		- }
8252		-
8253		- synchronize_net();
8254		-
8255		- list_for_each_entry(dev, head, unreg_list)
8256		- dev_put(dev);
8257		-}
8258		-
8259		-static void rollback_registered(struct net_device *dev)
8260		-{
8261		- LIST_HEAD(single);
8262		-
8263		- list_add(&dev->unreg_list, &single);
8264		- rollback_registered_many(&single);
8265		- list_del(&single);
8266	9522	}
8267	9523
8268	9524	static netdev_features_t netdev_sync_upper_features(struct net_device *lower,
..	..	@@ -8410,7 +9666,7 @@
8410	9666	/* driver might be less strict about feature dependencies */
8411	9667	features = netdev_fix_features(dev, features);
8412	9668
8413		- /* some features can't be enabled if they're off an an upper device */
	9669	+ /* some features can't be enabled if they're off on an upper device */
8414	9670	netdev_for_each_upper_dev_rcu(dev, upper, iter)
8415	9671	features = netdev_sync_upper_features(dev, upper, features);
8416	9672
..	..	@@ -8533,6 +9789,11 @@
8533	9789	netif_dormant_on(dev);
8534	9790	else
8535	9791	netif_dormant_off(dev);
	9792	+
	9793	+ if (rootdev->operstate == IF_OPER_TESTING)
	9794	+ netif_testing_on(dev);
	9795	+ else
	9796	+ netif_testing_off(dev);
8536	9797
8537	9798	if (netif_carrier_ok(rootdev))
8538	9799	netif_carrier_on(dev);
..	..	@@ -8674,11 +9935,20 @@
8674	9935	BUG_ON(dev->reg_state != NETREG_UNINITIALIZED);
8675	9936	BUG_ON(!net);
8676	9937
	9938	+ ret = ethtool_check_ops(dev->ethtool_ops);
	9939	+ if (ret)
	9940	+ return ret;
	9941	+
8677	9942	spin_lock_init(&dev->addr_list_lock);
8678	9943	netdev_set_addr_lockdep_class(dev);
8679	9944
8680	9945	ret = dev_get_valid_name(net, dev, dev->name);
8681	9946	if (ret < 0)
	9947	+ goto out;
	9948	+
	9949	+ ret = -ENOMEM;
	9950	+ dev->name_node = netdev_name_node_head_alloc(dev);
	9951	+ if (!dev->name_node)
8682	9952	goto out;
8683	9953
8684	9954	/* Init, if this function is available */
..	..	@@ -8687,7 +9957,7 @@
8687	9957	if (ret) {
8688	9958	if (ret > 0)
8689	9959	ret = -EIO;
8690		- goto out;
	9960	+ goto err_free_name;
8691	9961	}
8692	9962	}
8693	9963
..	..	@@ -8709,7 +9979,7 @@
8709	9979	/* Transfer changeable features to wanted_features and enable
8710	9980	* software offloads (GSO and GRO).
8711	9981	*/
8712		- dev->hw_features \|= NETIF_F_SOFT_FEATURES;
	9982	+ dev->hw_features \|= (NETIF_F_SOFT_FEATURES \| NETIF_F_SOFT_FEATURES_OFF);
8713	9983	dev->features \|= NETIF_F_SOFT_FEATURES;
8714	9984
8715	9985	if (dev->netdev_ops->ndo_udp_tunnel_add) {
..	..	@@ -8787,17 +10057,10 @@
8787	10057	ret = call_netdevice_notifiers(NETDEV_REGISTER, dev);
8788	10058	ret = notifier_to_errno(ret);
8789	10059	if (ret) {
8790		- rollback_registered(dev);
8791		- rcu_barrier();
8792		-
8793		- dev->reg_state = NETREG_UNREGISTERED;
8794		- /* We should put the kobject that hold in
8795		- * netdev_unregister_kobject(), otherwise
8796		- * the net device cannot be freed when
8797		- * driver calls free_netdev(), because the
8798		- * kobject is being hold.
8799		- */
8800		- kobject_put(&dev->dev.kobj);
	10060	+ /* Expect explicit free_netdev() on failure */
	10061	+ dev->needs_free_netdev = false;
	10062	+ unregister_netdevice_queue(dev, NULL);
	10063	+ goto out;
8801	10064	}
8802	10065	/*
8803	10066	* Prevent userspace races by waiting until the network
..	..	@@ -8815,6 +10078,8 @@
8815	10078	dev->netdev_ops->ndo_uninit(dev);
8816	10079	if (dev->priv_destructor)
8817	10080	dev->priv_destructor(dev);
	10081	+err_free_name:
	10082	+ netdev_name_node_free(dev->name_node);
8818	10083	goto out;
8819	10084	}
8820	10085	EXPORT_SYMBOL(register_netdevice);
..	..	@@ -8898,6 +10163,8 @@
8898	10163	}
8899	10164	EXPORT_SYMBOL(netdev_refcnt_read);
8900	10165
	10166	+#define WAIT_REFS_MIN_MSECS 1
	10167	+#define WAIT_REFS_MAX_MSECS 250
8901	10168	/**
8902	10169	* netdev_wait_allrefs - wait until all references are gone.
8903	10170	* @dev: target net_device
..	..	@@ -8913,7 +10180,7 @@
8913	10180	static void netdev_wait_allrefs(struct net_device *dev)
8914	10181	{
8915	10182	unsigned long rebroadcast_time, warning_time;
8916		- int refcnt;
	10183	+ int wait = 0, refcnt;
8917	10184
8918	10185	linkwatch_forget_dev(dev);
8919	10186
..	..	@@ -8947,7 +10214,13 @@
8947	10214	rebroadcast_time = jiffies;
8948	10215	}
8949	10216
8950		- msleep(250);
	10217	+ if (!wait) {
	10218	+ rcu_barrier();
	10219	+ wait = WAIT_REFS_MIN_MSECS;
	10220	+ } else {
	10221	+ msleep(wait);
	10222	+ wait = min(wait << 1, WAIT_REFS_MAX_MSECS);
	10223	+ }
8951	10224
8952	10225	refcnt = netdev_refcnt_read(dev);
8953	10226
..	..	@@ -8986,6 +10259,19 @@
8986	10259	void netdev_run_todo(void)
8987	10260	{
8988	10261	struct list_head list;
	10262	+#ifdef CONFIG_LOCKDEP
	10263	+ struct list_head unlink_list;
	10264	+
	10265	+ list_replace_init(&net_unlink_list, &unlink_list);
	10266	+
	10267	+ while (!list_empty(&unlink_list)) {
	10268	+ struct net_device *dev = list_first_entry(&unlink_list,
	10269	+ struct net_device,
	10270	+ unlink_list);
	10271	+ list_del_init(&dev->unlink_list);
	10272	+ dev->nested_level = dev->lower_level - 1;
	10273	+ }
	10274	+#endif
8989	10275
8990	10276	/* Snapshot list, allow later requests */
8991	10277	list_replace_init(&net_todo_list, &list);
..	..	@@ -9019,9 +10305,7 @@
9019	10305	BUG_ON(!list_empty(&dev->ptype_specific));
9020	10306	WARN_ON(rcu_access_pointer(dev->ip_ptr));
9021	10307	WARN_ON(rcu_access_pointer(dev->ip6_ptr));
9022		-#if IS_ENABLED(CONFIG_DECNET)
9023		- WARN_ON(dev->dn_ptr);
9024		-#endif
	10308	+
9025	10309	if (dev->priv_destructor)
9026	10310	dev->priv_destructor(dev);
9027	10311	if (dev->needs_free_netdev)
..	..	@@ -9096,6 +10380,40 @@
9096	10380	return storage;
9097	10381	}
9098	10382	EXPORT_SYMBOL(dev_get_stats);
	10383	+
	10384	+/**
	10385	+ * dev_fetch_sw_netstats - get per-cpu network device statistics
	10386	+ * @s: place to store stats
	10387	+ * @netstats: per-cpu network stats to read from
	10388	+ *
	10389	+ * Read per-cpu network statistics and populate the related fields in @s.
	10390	+ */
	10391	+void dev_fetch_sw_netstats(struct rtnl_link_stats64 *s,
	10392	+ const struct pcpu_sw_netstats __percpu *netstats)
	10393	+{
	10394	+ int cpu;
	10395	+
	10396	+ for_each_possible_cpu(cpu) {
	10397	+ const struct pcpu_sw_netstats *stats;
	10398	+ struct pcpu_sw_netstats tmp;
	10399	+ unsigned int start;
	10400	+
	10401	+ stats = per_cpu_ptr(netstats, cpu);
	10402	+ do {
	10403	+ start = u64_stats_fetch_begin_irq(&stats->syncp);
	10404	+ tmp.rx_packets = stats->rx_packets;
	10405	+ tmp.rx_bytes = stats->rx_bytes;
	10406	+ tmp.tx_packets = stats->tx_packets;
	10407	+ tmp.tx_bytes = stats->tx_bytes;
	10408	+ } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
	10409	+
	10410	+ s->rx_packets += tmp.rx_packets;
	10411	+ s->rx_bytes += tmp.rx_bytes;
	10412	+ s->tx_packets += tmp.tx_packets;
	10413	+ s->tx_bytes += tmp.tx_bytes;
	10414	+ }
	10415	+}
	10416	+EXPORT_SYMBOL_GPL(dev_fetch_sw_netstats);
9099	10417
9100	10418	struct netdev_queue dev_ingress_queue_create(struct net_device dev)
9101	10419	{
..	..	@@ -9198,6 +10516,10 @@
9198	10516	dev->gso_max_segs = GSO_MAX_SEGS;
9199	10517	dev->upper_level = 1;
9200	10518	dev->lower_level = 1;
	10519	+#ifdef CONFIG_LOCKDEP
	10520	+ dev->nested_level = 0;
	10521	+ INIT_LIST_HEAD(&dev->unlink_list);
	10522	+#endif
9201	10523
9202	10524	INIT_LIST_HEAD(&dev->napi_list);
9203	10525	INIT_LIST_HEAD(&dev->unreg_list);
..	..	@@ -9207,6 +10529,7 @@
9207	10529	INIT_LIST_HEAD(&dev->adj_list.lower);
9208	10530	INIT_LIST_HEAD(&dev->ptype_all);
9209	10531	INIT_LIST_HEAD(&dev->ptype_specific);
	10532	+ INIT_LIST_HEAD(&dev->net_notifier_list);
9210	10533	#ifdef CONFIG_NET_SCHED
9211	10534	hash_init(dev->qdisc_hash);
9212	10535	#endif
..	..	@@ -9264,6 +10587,17 @@
9264	10587	struct napi_struct p, n;
9265	10588
9266	10589	might_sleep();
	10590	+
	10591	+ /* When called immediately after register_netdevice() failed the unwind
	10592	+ * handling may still be dismantling the device. Handle that case by
	10593	+ * deferring the free.
	10594	+ */
	10595	+ if (dev->reg_state == NETREG_UNREGISTERING) {
	10596	+ ASSERT_RTNL();
	10597	+ dev->needs_free_netdev = true;
	10598	+ return;
	10599	+ }
	10600	+
9267	10601	netif_free_tx_queues(dev);
9268	10602	netif_free_rx_queues(dev);
9269	10603
..	..	@@ -9277,6 +10611,8 @@
9277	10611
9278	10612	free_percpu(dev->pcpu_refcnt);
9279	10613	dev->pcpu_refcnt = NULL;
	10614	+ free_percpu(dev->xdp_bulkq);
	10615	+ dev->xdp_bulkq = NULL;
9280	10616
9281	10617	/* Compatibility with error handling in drivers */
9282	10618	if (dev->reg_state == NETREG_UNINITIALIZED) {
..	..	@@ -9328,9 +10664,10 @@
9328	10664	if (head) {
9329	10665	list_move_tail(&dev->unreg_list, head);
9330	10666	} else {
9331		- rollback_registered(dev);
9332		- /* Finish processing unregister after unlock */
9333		- net_set_todo(dev);
	10667	+ LIST_HEAD(single);
	10668	+
	10669	+ list_add(&dev->unreg_list, &single);
	10670	+ unregister_netdevice_many(&single);
9334	10671	}
9335	10672	}
9336	10673	EXPORT_SYMBOL(unregister_netdevice_queue);
..	..	@@ -9344,14 +10681,100 @@
9344	10681	*/
9345	10682	void unregister_netdevice_many(struct list_head *head)
9346	10683	{
9347		- struct net_device *dev;
	10684	+ struct net_device dev, tmp;
	10685	+ LIST_HEAD(close_head);
9348	10686
9349		- if (!list_empty(head)) {
9350		- rollback_registered_many(head);
9351		- list_for_each_entry(dev, head, unreg_list)
9352		- net_set_todo(dev);
9353		- list_del(head);
	10687	+ BUG_ON(dev_boot_phase);
	10688	+ ASSERT_RTNL();
	10689	+
	10690	+ if (list_empty(head))
	10691	+ return;
	10692	+
	10693	+ list_for_each_entry_safe(dev, tmp, head, unreg_list) {
	10694	+ /* Some devices call without registering
	10695	+ * for initialization unwind. Remove those
	10696	+ * devices and proceed with the remaining.
	10697	+ */
	10698	+ if (dev->reg_state == NETREG_UNINITIALIZED) {
	10699	+ pr_debug("unregister_netdevice: device %s/%p never was registered\n",
	10700	+ dev->name, dev);
	10701	+
	10702	+ WARN_ON(1);
	10703	+ list_del(&dev->unreg_list);
	10704	+ continue;
	10705	+ }
	10706	+ dev->dismantle = true;
	10707	+ BUG_ON(dev->reg_state != NETREG_REGISTERED);
9354	10708	}
	10709	+
	10710	+ /* If device is running, close it first. */
	10711	+ list_for_each_entry(dev, head, unreg_list)
	10712	+ list_add_tail(&dev->close_list, &close_head);
	10713	+ dev_close_many(&close_head, true);
	10714	+
	10715	+ list_for_each_entry(dev, head, unreg_list) {
	10716	+ /* And unlink it from device chain. */
	10717	+ unlist_netdevice(dev);
	10718	+
	10719	+ dev->reg_state = NETREG_UNREGISTERING;
	10720	+ }
	10721	+ flush_all_backlogs();
	10722	+
	10723	+ synchronize_net();
	10724	+
	10725	+ list_for_each_entry(dev, head, unreg_list) {
	10726	+ struct sk_buff *skb = NULL;
	10727	+
	10728	+ /* Shutdown queueing discipline. */
	10729	+ dev_shutdown(dev);
	10730	+
	10731	+ dev_xdp_uninstall(dev);
	10732	+
	10733	+ /* Notify protocols, that we are about to destroy
	10734	+ * this device. They should clean all the things.
	10735	+ */
	10736	+ call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
	10737	+
	10738	+ if (!dev->rtnl_link_ops \|\|
	10739	+ dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
	10740	+ skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U, 0,
	10741	+ GFP_KERNEL, NULL, 0);
	10742	+
	10743	+ /*
	10744	+ * Flush the unicast and multicast chains
	10745	+ */
	10746	+ dev_uc_flush(dev);
	10747	+ dev_mc_flush(dev);
	10748	+
	10749	+ netdev_name_node_alt_flush(dev);
	10750	+ netdev_name_node_free(dev->name_node);
	10751	+
	10752	+ if (dev->netdev_ops->ndo_uninit)
	10753	+ dev->netdev_ops->ndo_uninit(dev);
	10754	+
	10755	+ if (skb)
	10756	+ rtmsg_ifinfo_send(skb, dev, GFP_KERNEL);
	10757	+
	10758	+ /* Notifier chain MUST detach us all upper devices. */
	10759	+ WARN_ON(netdev_has_any_upper_dev(dev));
	10760	+ WARN_ON(netdev_has_any_lower_dev(dev));
	10761	+
	10762	+ /* Remove entries from kobject tree */
	10763	+ netdev_unregister_kobject(dev);
	10764	+#ifdef CONFIG_XPS
	10765	+ /* Remove XPS queueing entries */
	10766	+ netif_reset_xps_queues_gt(dev, 0);
	10767	+#endif
	10768	+ }
	10769	+
	10770	+ synchronize_net();
	10771	+
	10772	+ list_for_each_entry(dev, head, unreg_list) {
	10773	+ dev_put(dev);
	10774	+ net_set_todo(dev);
	10775	+ }
	10776	+
	10777	+ list_del(head);
9355	10778	}
9356	10779	EXPORT_SYMBOL(unregister_netdevice_many);
9357	10780
..	..	@@ -9390,6 +10813,7 @@
9390	10813
9391	10814	int dev_change_net_namespace(struct net_device dev, struct net net, const char *pat)
9392	10815	{
	10816	+ struct net *net_old = dev_net(dev);
9393	10817	int err, new_nsid, new_ifindex;
9394	10818
9395	10819	ASSERT_RTNL();
..	..	@@ -9405,7 +10829,7 @@
9405	10829
9406	10830	/* Get out if there is nothing todo */
9407	10831	err = 0;
9408		- if (net_eq(dev_net(dev), net))
	10832	+ if (net_eq(net_old, net))
9409	10833	goto out;
9410	10834
9411	10835	/* Pick the destination device name, and ensure
..	..	@@ -9466,6 +10890,9 @@
9466	10890	kobject_uevent(&dev->dev.kobj, KOBJ_REMOVE);
9467	10891	netdev_adjacent_del_links(dev);
9468	10892
	10893	+ /* Move per-net netdevice notifiers that are following the netdevice */
	10894	+ move_netdevice_notifiers_dev_net(dev, net);
	10895	+
9469	10896	/* Actually switch the network namespace */
9470	10897	dev_net_set(dev, net);
9471	10898	dev->ifindex = new_ifindex;
..	..	@@ -9476,6 +10903,12 @@
9476	10903
9477	10904	/* Fixup kobjects */
9478	10905	err = device_rename(&dev->dev, dev->name);
	10906	+ WARN_ON(err);
	10907	+
	10908	+ /* Adapt owner in case owning user namespace of target network
	10909	+ * namespace is different from the original one.
	10910	+ */
	10911	+ err = netdev_change_owner(dev, net_old, net);
9479	10912	WARN_ON(err);
9480	10913
9481	10914	/* Add the device back in the hashes */
..	..	@@ -9608,7 +11041,7 @@
9608	11041	static int __net_init netdev_init(struct net *net)
9609	11042	{
9610	11043	BUILD_BUG_ON(GRO_HASH_BUCKETS >
9611		- 8 * FIELD_SIZEOF(struct napi_struct, gro_bitmask));
	11044	+ 8 * sizeof_field(struct napi_struct, gro_bitmask));
9612	11045
9613	11046	if (net != &init_net)
9614	11047	INIT_LIST_HEAD(&net->dev_base_head);
..	..	@@ -9620,6 +11053,8 @@
9620	11053	net->dev_index_head = netdev_create_hash();
9621	11054	if (net->dev_index_head == NULL)
9622	11055	goto err_idx;
	11056	+
	11057	+ RAW_INIT_NOTIFIER_HEAD(&net->netdev_chain);
9623	11058
9624	11059	return 0;
9625	11060
..	..	@@ -9742,7 +11177,7 @@
9742	11177	continue;
9743	11178
9744	11179	/* Leave virtual devices for the generic cleanup */
9745		- if (dev->rtnl_link_ops)
	11180	+ if (dev->rtnl_link_ops && !dev->rtnl_link_ops->netns_refund)
9746	11181	continue;
9747	11182
9748	11183	/* Push remaining network devices to init_net */