~ljy/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	*/
..	..	@@ -2745,7 +3077,7 @@
2745	3077	void netif_schedule_queue(struct netdev_queue *txq)
2746	3078	{
2747	3079	rcu_read_lock();
2748		- if (!(txq->state & QUEUE_STATE_ANY_XOFF)) {
	3080	+ if (!netif_xmit_stopped(txq)) {
2749	3081	struct Qdisc *q = rcu_dereference(txq->qdisc);
2750	3082
2751	3083	__netif_schedule(q);
..	..	@@ -2883,12 +3215,10 @@
2883	3215	else
2884	3216	name = netdev_name(dev);
2885	3217	}
2886		- WARN(1, "%s: caps=(%pNF, %pNF) len=%d data_len=%d gso_size=%d "
2887		- "gso_type=%d ip_summed=%d\n",
	3218	+ skb_dump(KERN_WARNING, skb, false);
	3219	+ WARN(1, "%s: caps=(%pNF, %pNF)\n",
2888	3220	name, dev ? &dev->features : &null_features,
2889		- skb->sk ? &skb->sk->sk_route_caps : &null_features,
2890		- skb->len, skb->data_len, skb_shinfo(skb)->gso_size,
2891		- skb_shinfo(skb)->gso_type, skb->ip_summed);
	3221	+ skb->sk ? &skb->sk->sk_route_caps : &null_features);
2892	3222	}
2893	3223
2894	3224	/*
..	..	@@ -2918,18 +3248,19 @@
2918	3248	}
2919	3249
2920	3250	offset = skb_checksum_start_offset(skb);
2921		- BUG_ON(offset >= skb_headlen(skb));
	3251	+ ret = -EINVAL;
	3252	+ if (WARN_ON_ONCE(offset >= skb_headlen(skb)))
	3253	+ goto out;
	3254	+
2922	3255	csum = skb_checksum(skb, offset, skb->len - offset, 0);
2923	3256
2924	3257	offset += skb->csum_offset;
2925		- BUG_ON(offset + sizeof(__sum16) > skb_headlen(skb));
	3258	+ if (WARN_ON_ONCE(offset + sizeof(__sum16) > skb_headlen(skb)))
	3259	+ goto out;
2926	3260
2927		- if (skb_cloned(skb) &&
2928		- !skb_clone_writable(skb, offset + sizeof(__sum16))) {
2929		- ret = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
2930		- if (ret)
2931		- goto out;
2932		- }
	3261	+ ret = skb_ensure_writable(skb, offset + sizeof(__sum16));
	3262	+ if (ret)
	3263	+ goto out;
2933	3264
2934	3265	(__sum16 )(skb->data + offset) = csum_fold(csum) ?: CSUM_MANGLED_0;
2935	3266	out_set_summed:
..	..	@@ -2964,12 +3295,11 @@
2964	3295	ret = -EINVAL;
2965	3296	goto out;
2966	3297	}
2967		- if (skb_cloned(skb) &&
2968		- !skb_clone_writable(skb, offset + sizeof(__le32))) {
2969		- ret = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
2970		- if (ret)
2971		- goto out;
2972		- }
	3298	+
	3299	+ ret = skb_ensure_writable(skb, offset + sizeof(__le32));
	3300	+ if (ret)
	3301	+ goto out;
	3302	+
2973	3303	crc32c_csum = cpu_to_le32(~__skb_checksum(skb, start,
2974	3304	skb->len - start, ~(__u32)0,
2975	3305	crc32c_csum_stub));
..	..	@@ -3054,7 +3384,7 @@
3054	3384	* It may return NULL if the skb requires no segmentation. This is
3055	3385	* only possible when GSO is used for verifying header integrity.
3056	3386	*
3057		- * Segmentation preserves SKB_SGO_CB_OFFSET bytes of previous skb cb.
	3387	+ * Segmentation preserves SKB_GSO_CB_OFFSET bytes of previous skb cb.
3058	3388	*/
3059	3389	struct sk_buff __skb_gso_segment(struct sk_buff skb,
3060	3390	netdev_features_t features, bool tx_path)
..	..	@@ -3083,7 +3413,7 @@
3083	3413	features &= ~NETIF_F_GSO_PARTIAL;
3084	3414	}
3085	3415
3086		- BUILD_BUG_ON(SKB_SGO_CB_OFFSET +
	3416	+ BUILD_BUG_ON(SKB_GSO_CB_OFFSET +
3087	3417	sizeof(*SKB_GSO_CB(skb)) > sizeof(skb->cb));
3088	3418
3089	3419	SKB_GSO_CB(skb)->mac_offset = skb_headroom(skb);
..	..	@@ -3094,7 +3424,7 @@
3094	3424
3095	3425	segs = skb_mac_gso_segment(skb, features);
3096	3426
3097		- if (unlikely(skb_needs_check(skb, tx_path) && !IS_ERR(segs)))
	3427	+ if (segs != skb && unlikely(skb_needs_check(skb, tx_path) && !IS_ERR(segs)))
3098	3428	skb_warn_bad_offload(skb);
3099	3429
3100	3430	return segs;
..	..	@@ -3103,10 +3433,11 @@
3103	3433
3104	3434	/* Take action when hardware reception checksum errors are detected. */
3105	3435	#ifdef CONFIG_BUG
3106		-void netdev_rx_csum_fault(struct net_device *dev)
	3436	+void netdev_rx_csum_fault(struct net_device dev, struct sk_buff skb)
3107	3437	{
3108	3438	if (net_ratelimit()) {
3109	3439	pr_err("%s: hw csum failure\n", dev ? dev->name : "<unknown>");
	3440	+ skb_dump(KERN_ERR, skb, true);
3110	3441	dump_stack();
3111	3442	}
3112	3443	}
..	..	@@ -3156,10 +3487,9 @@
3156	3487	static netdev_features_t harmonize_features(struct sk_buff *skb,
3157	3488	netdev_features_t features)
3158	3489	{
3159		- int tmp;
3160	3490	__be16 type;
3161	3491
3162		- type = skb_network_protocol(skb, &tmp);
	3492	+ type = skb_network_protocol(skb, NULL);
3163	3493	features = net_mpls_features(skb, features, type);
3164	3494
3165	3495	if (skb->ip_summed != CHECKSUM_NONE &&
..	..	@@ -3256,10 +3586,11 @@
3256	3586	unsigned int len;
3257	3587	int rc;
3258	3588
3259		- if (!list_empty(&ptype_all) \|\| !list_empty(&dev->ptype_all))
	3589	+ if (dev_nit_active(dev))
3260	3590	dev_queue_xmit_nit(skb, dev);
3261	3591
3262	3592	len = skb->len;
	3593	+ PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies);
3263	3594	trace_net_dev_start_xmit(skb, dev);
3264	3595	rc = netdev_start_xmit(skb, dev, txq, more);
3265	3596	trace_net_dev_xmit(skb, rc, dev, len);
..	..	@@ -3276,7 +3607,7 @@
3276	3607	while (skb) {
3277	3608	struct sk_buff *next = skb->next;
3278	3609
3279		- skb->next = NULL;
	3610	+ skb_mark_not_on_list(skb);
3280	3611	rc = xmit_one(skb, dev, txq, next != NULL);
3281	3612	if (unlikely(!dev_xmit_complete(rc))) {
3282	3613	skb->next = next;
..	..	@@ -3376,7 +3707,7 @@
3376	3707
3377	3708	for (; skb != NULL; skb = next) {
3378	3709	next = skb->next;
3379		- skb->next = NULL;
	3710	+ skb_mark_not_on_list(skb);
3380	3711
3381	3712	/* in case skb wont be segmented, point to itself */
3382	3713	skb->prev = skb;
..	..	@@ -3407,7 +3738,7 @@
3407	3738	/* To get more precise estimation of bytes sent on wire,
3408	3739	* we add to pkt_len the headers size of all segments
3409	3740	*/
3410		- if (shinfo->gso_size) {
	3741	+ if (shinfo->gso_size && skb_transport_header_was_set(skb)) {
3411	3742	unsigned int hdr_len;
3412	3743	u16 gso_segs = shinfo->gso_segs;
3413	3744
..	..	@@ -3451,13 +3782,9 @@
3451	3782	qdisc_calculate_pkt_len(skb, q);
3452	3783
3453	3784	if (q->flags & TCQ_F_NOLOCK) {
3454		- if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) {
3455		- __qdisc_drop(skb, &to_free);
3456		- rc = NET_XMIT_DROP;
3457		- } else {
3458		- rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK;
	3785	+ rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK;
	3786	+ if (likely(!netif_xmit_frozen_or_stopped(txq)))
3459	3787	qdisc_run(q);
3460		- }
3461	3788
3462	3789	if (unlikely(to_free))
3463	3790	kfree_skb_list(to_free);
..	..	@@ -3470,7 +3797,7 @@
3470	3797	* This permits qdisc->running owner to get the lock more
3471	3798	* often and dequeue packets faster.
3472	3799	*/
3473		-#ifdef CONFIG_PREEMPT_RT_FULL
	3800	+#ifdef CONFIG_PREEMPT_RT
3474	3801	contended = true;
3475	3802	#else
3476	3803	contended = qdisc_is_running(q);
..	..	@@ -3557,7 +3884,8 @@
3557	3884	skb_reset_mac_header(skb);
3558	3885	__skb_pull(skb, skb_network_offset(skb));
3559	3886	skb->pkt_type = PACKET_LOOPBACK;
3560		- skb->ip_summed = CHECKSUM_UNNECESSARY;
	3887	+ if (skb->ip_summed == CHECKSUM_NONE)
	3888	+ skb->ip_summed = CHECKSUM_UNNECESSARY;
3561	3889	WARN_ON(!skb_dst(skb));
3562	3890	skb_dst_force(skb);
3563	3891	netif_rx_ni(skb);
..	..	@@ -3576,6 +3904,7 @@
3576	3904	return skb;
3577	3905
3578	3906	/* qdisc_skb_cb(skb)->pkt_len was already set by the caller. */
	3907	+ qdisc_skb_cb(skb)->mru = 0;
3579	3908	mini_qdisc_bstats_cpu_update(miniq, skb);
3580	3909
3581	3910	switch (tcf_classify(skb, miniq->filter_list, &cl_res, false)) {
..	..	@@ -3676,23 +4005,21 @@
3676	4005	}
3677	4006
3678	4007	u16 dev_pick_tx_zero(struct net_device dev, struct sk_buff skb,
3679		- struct net_device *sb_dev,
3680		- select_queue_fallback_t fallback)
	4008	+ struct net_device *sb_dev)
3681	4009	{
3682	4010	return 0;
3683	4011	}
3684	4012	EXPORT_SYMBOL(dev_pick_tx_zero);
3685	4013
3686	4014	u16 dev_pick_tx_cpu_id(struct net_device dev, struct sk_buff skb,
3687		- struct net_device *sb_dev,
3688		- select_queue_fallback_t fallback)
	4015	+ struct net_device *sb_dev)
3689	4016	{
3690	4017	return (u16)raw_smp_processor_id() % dev->real_num_tx_queues;
3691	4018	}
3692	4019	EXPORT_SYMBOL(dev_pick_tx_cpu_id);
3693	4020
3694		-static u16 __netdev_pick_tx(struct net_device dev, struct sk_buff skb,
3695		- struct net_device *sb_dev)
	4021	+u16 netdev_pick_tx(struct net_device dev, struct sk_buff skb,
	4022	+ struct net_device *sb_dev)
3696	4023	{
3697	4024	struct sock *sk = skb->sk;
3698	4025	int queue_index = sk_tx_queue_get(sk);
..	..	@@ -3716,10 +4043,11 @@
3716	4043
3717	4044	return queue_index;
3718	4045	}
	4046	+EXPORT_SYMBOL(netdev_pick_tx);
3719	4047
3720		-struct netdev_queue netdev_pick_tx(struct net_device dev,
3721		- struct sk_buff *skb,
3722		- struct net_device *sb_dev)
	4048	+struct netdev_queue netdev_core_pick_tx(struct net_device dev,
	4049	+ struct sk_buff *skb,
	4050	+ struct net_device *sb_dev)
3723	4051	{
3724	4052	int queue_index = 0;
3725	4053
..	..	@@ -3734,10 +4062,9 @@
3734	4062	const struct net_device_ops *ops = dev->netdev_ops;
3735	4063
3736	4064	if (ops->ndo_select_queue)
3737		- queue_index = ops->ndo_select_queue(dev, skb, sb_dev,
3738		- __netdev_pick_tx);
	4065	+ queue_index = ops->ndo_select_queue(dev, skb, sb_dev);
3739	4066	else
3740		- queue_index = __netdev_pick_tx(dev, skb, sb_dev);
	4067	+ queue_index = netdev_pick_tx(dev, skb, sb_dev);
3741	4068
3742	4069	queue_index = netdev_cap_txqueue(dev, queue_index);
3743	4070	}
..	..	@@ -3781,6 +4108,7 @@
3781	4108	bool again = false;
3782	4109
3783	4110	skb_reset_mac_header(skb);
	4111	+ skb_assert_len(skb);
3784	4112
3785	4113	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_SCHED_TSTAMP))
3786	4114	__skb_tstamp_tx(skb, NULL, skb->sk, SCM_TSTAMP_SCHED);
..	..	@@ -3811,7 +4139,7 @@
3811	4139	else
3812	4140	skb_dst_force(skb);
3813	4141
3814		- txq = netdev_pick_tx(dev, skb, sb_dev);
	4142	+ txq = netdev_core_pick_tx(dev, skb, sb_dev);
3815	4143	q = rcu_dereference_bh(txq->qdisc);
3816	4144
3817	4145	trace_net_dev_queue(skb);
..	..	@@ -3835,14 +4163,10 @@
3835	4163	if (dev->flags & IFF_UP) {
3836	4164	int cpu = smp_processor_id(); /* ok because BHs are off */
3837	4165
3838		-#ifdef CONFIG_PREEMPT_RT_FULL
3839		- if (READ_ONCE(txq->xmit_lock_owner) != current) {
3840		-#else
3841	4166	/* Other cpus might concurrently change txq->xmit_lock_owner
3842	4167	* to -1 or to their cpu id, but not to our id.
3843	4168	*/
3844	4169	if (READ_ONCE(txq->xmit_lock_owner) != cpu) {
3845		-#endif
3846	4170	if (dev_xmit_recursion())
3847	4171	goto recursion_alert;
3848	4172
..	..	@@ -3850,6 +4174,7 @@
3850	4174	if (!skb)
3851	4175	goto out;
3852	4176
	4177	+ PRANDOM_ADD_NOISE(skb, dev, txq, jiffies);
3853	4178	HARD_TX_LOCK(dev, txq, cpu);
3854	4179
3855	4180	if (!netif_xmit_stopped(txq)) {
..	..	@@ -3897,7 +4222,7 @@
3897	4222	}
3898	4223	EXPORT_SYMBOL(dev_queue_xmit_accel);
3899	4224
3900		-int dev_direct_xmit(struct sk_buff *skb, u16 queue_id)
	4225	+int __dev_direct_xmit(struct sk_buff *skb, u16 queue_id)
3901	4226	{
3902	4227	struct net_device *dev = skb->dev;
3903	4228	struct sk_buff *orig_skb = skb;
..	..	@@ -3915,6 +4240,7 @@
3915	4240
3916	4241	skb_set_queue_mapping(skb, queue_id);
3917	4242	txq = skb_get_tx_queue(dev, skb);
	4243	+ PRANDOM_ADD_NOISE(skb, dev, txq, jiffies);
3918	4244
3919	4245	local_bh_disable();
3920	4246
..	..	@@ -3926,17 +4252,13 @@
3926	4252	dev_xmit_recursion_dec();
3927	4253
3928	4254	local_bh_enable();
3929		-
3930		- if (!dev_xmit_complete(ret))
3931		- kfree_skb(skb);
3932		-
3933	4255	return ret;
3934	4256	drop:
3935	4257	atomic_long_inc(&dev->tx_dropped);
3936	4258	kfree_skb_list(skb);
3937	4259	return NET_XMIT_DROP;
3938	4260	}
3939		-EXPORT_SYMBOL(dev_direct_xmit);
	4261	+EXPORT_SYMBOL(__dev_direct_xmit);
3940	4262
3941	4263	/*************************************************************************
3942	4264	* Receiver routines
..	..	@@ -3954,6 +4276,8 @@
3954	4276	int dev_weight_tx_bias __read_mostly = 1; /* bias for output_queue quota */
3955	4277	int dev_rx_weight __read_mostly = 64;
3956	4278	int dev_tx_weight __read_mostly = 64;
	4279	+/* Maximum number of GRO_NORMAL skbs to batch up for list-RX */
	4280	+int gro_normal_batch __read_mostly = 8;
3957	4281
3958	4282	/* Called with irq disabled */
3959	4283	static inline void ____napi_schedule(struct softnet_data *sd,
..	..	@@ -3971,9 +4295,9 @@
3971	4295	u32 rps_cpu_mask __read_mostly;
3972	4296	EXPORT_SYMBOL(rps_cpu_mask);
3973	4297
3974		-struct static_key rps_needed __read_mostly;
	4298	+struct static_key_false rps_needed __read_mostly;
3975	4299	EXPORT_SYMBOL(rps_needed);
3976		-struct static_key rfs_needed __read_mostly;
	4300	+struct static_key_false rfs_needed __read_mostly;
3977	4301	EXPORT_SYMBOL(rfs_needed);
3978	4302
3979	4303	static struct rps_dev_flow *
..	..	@@ -4204,7 +4528,7 @@
4204	4528	struct softnet_data *sd;
4205	4529	unsigned int old_flow, new_flow;
4206	4530
4207		- if (qlen < (netdev_max_backlog >> 1))
	4531	+ if (qlen < (READ_ONCE(netdev_max_backlog) >> 1))
4208	4532	return false;
4209	4533
4210	4534	sd = this_cpu_ptr(&softnet_data);
..	..	@@ -4252,7 +4576,7 @@
4252	4576	if (!netif_running(skb->dev))
4253	4577	goto drop;
4254	4578	qlen = skb_queue_len(&sd->input_pkt_queue);
4255		- if (qlen <= netdev_max_backlog && !skb_flow_limit(skb, qlen)) {
	4579	+ if (qlen <= READ_ONCE(netdev_max_backlog) && !skb_flow_limit(skb, qlen)) {
4256	4580	if (qlen) {
4257	4581	enqueue:
4258	4582	__skb_queue_tail(&sd->input_pkt_queue, skb);
..	..	@@ -4323,7 +4647,7 @@
4323	4647	/* Reinjected packets coming from act_mirred or similar should
4324	4648	* not get XDP generic processing.
4325	4649	*/
4326		- if (skb_is_tc_redirected(skb))
	4650	+ if (skb_is_redirected(skb))
4327	4651	return XDP_PASS;
4328	4652
4329	4653	/* XDP packets must be linear and must have sufficient headroom
..	..	@@ -4355,6 +4679,11 @@
4355	4679	xdp->data_meta = xdp->data;
4356	4680	xdp->data_end = xdp->data + hlen;
4357	4681	xdp->data_hard_start = skb->data - skb_headroom(skb);
	4682	+
	4683	+ /* SKB "head" area always have tailroom for skb_shared_info */
	4684	+ xdp->frame_sz = (void *)skb_end_pointer(skb) - xdp->data_hard_start;
	4685	+ xdp->frame_sz += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
	4686	+
4358	4687	orig_data_end = xdp->data_end;
4359	4688	orig_data = xdp->data;
4360	4689	eth = (struct ethhdr *)xdp->data;
..	..	@@ -4378,14 +4707,11 @@
4378	4707	skb_reset_network_header(skb);
4379	4708	}
4380	4709
4381		- /* check if bpf_xdp_adjust_tail was used. it can only "shrink"
4382		- * pckt.
4383		- */
4384		- off = orig_data_end - xdp->data_end;
	4710	+ /* check if bpf_xdp_adjust_tail was used */
	4711	+ off = xdp->data_end - orig_data_end;
4385	4712	if (off != 0) {
4386	4713	skb_set_tail_pointer(skb, xdp->data_end - xdp->data);
4387		- skb->len -= off;
4388		-
	4714	+ skb->len += off; /* positive on grow, negative on shrink */
4389	4715	}
4390	4716
4391	4717	/* check if XDP changed eth hdr such SKB needs update */
..	..	@@ -4408,10 +4734,10 @@
4408	4734	break;
4409	4735	default:
4410	4736	bpf_warn_invalid_xdp_action(act);
4411		- /* fall through */
	4737	+ fallthrough;
4412	4738	case XDP_ABORTED:
4413	4739	trace_xdp_exception(skb->dev, xdp_prog, act);
4414		- /* fall through */
	4740	+ fallthrough;
4415	4741	case XDP_DROP:
4416	4742	do_drop:
4417	4743	kfree_skb(skb);
..	..	@@ -4431,7 +4757,7 @@
4431	4757	bool free_skb = true;
4432	4758	int cpu, rc;
4433	4759
4434		- txq = netdev_pick_tx(dev, skb, NULL);
	4760	+ txq = netdev_core_pick_tx(dev, skb, NULL);
4435	4761	cpu = smp_processor_id();
4436	4762	HARD_TX_LOCK(dev, txq, cpu);
4437	4763	if (!netif_xmit_stopped(txq)) {
..	..	@@ -4445,7 +4771,6 @@
4445	4771	kfree_skb(skb);
4446	4772	}
4447	4773	}
4448		-EXPORT_SYMBOL_GPL(generic_xdp_tx);
4449	4774
4450	4775	static DEFINE_STATIC_KEY_FALSE(generic_xdp_needed_key);
4451	4776
..	..	@@ -4483,12 +4808,12 @@
4483	4808	{
4484	4809	int ret;
4485	4810
4486		- net_timestamp_check(netdev_tstamp_prequeue, skb);
	4811	+ net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb);
4487	4812
4488	4813	trace_netif_rx(skb);
4489	4814
4490	4815	#ifdef CONFIG_RPS
4491		- if (static_key_false(&rps_needed)) {
	4816	+ if (static_branch_unlikely(&rps_needed)) {
4492	4817	struct rps_dev_flow voidflow, *rflow = &voidflow;
4493	4818	int cpu;
4494	4819
..	..	@@ -4531,9 +4856,14 @@
4531	4856
4532	4857	int netif_rx(struct sk_buff *skb)
4533	4858	{
	4859	+ int ret;
	4860	+
4534	4861	trace_netif_rx_entry(skb);
4535	4862
4536		- return netif_rx_internal(skb);
	4863	+ ret = netif_rx_internal(skb);
	4864	+ trace_netif_rx_exit(ret);
	4865	+
	4866	+ return ret;
4537	4867	}
4538	4868	EXPORT_SYMBOL(netif_rx);
4539	4869
..	..	@@ -4546,10 +4876,26 @@
4546	4876	local_bh_disable();
4547	4877	err = netif_rx_internal(skb);
4548	4878	local_bh_enable();
	4879	+ trace_netif_rx_ni_exit(err);
4549	4880
4550	4881	return err;
4551	4882	}
4552	4883	EXPORT_SYMBOL(netif_rx_ni);
	4884	+
	4885	+int netif_rx_any_context(struct sk_buff *skb)
	4886	+{
	4887	+ /*
	4888	+ * If invoked from contexts which do not invoke bottom half
	4889	+ * processing either at return from interrupt or when softrqs are
	4890	+ * reenabled, use netif_rx_ni() which invokes bottomhalf processing
	4891	+ * directly.
	4892	+ */
	4893	+ if (in_interrupt())
	4894	+ return netif_rx(skb);
	4895	+ else
	4896	+ return netif_rx_ni(skb);
	4897	+}
	4898	+EXPORT_SYMBOL(netif_rx_any_context);
4553	4899
4554	4900	static __latent_entropy void net_tx_action(struct softirq_action *h)
4555	4901	{
..	..	@@ -4592,25 +4938,43 @@
4592	4938	sd->output_queue_tailp = &sd->output_queue;
4593	4939	local_irq_enable();
4594	4940
	4941	+ rcu_read_lock();
	4942	+
4595	4943	while (head) {
4596	4944	struct Qdisc *q = head;
4597	4945	spinlock_t *root_lock = NULL;
4598	4946
4599	4947	head = head->next_sched;
4600	4948
4601		- if (!(q->flags & TCQ_F_NOLOCK)) {
4602		- root_lock = qdisc_lock(q);
4603		- spin_lock(root_lock);
4604		- }
4605	4949	/* We need to make sure head->next_sched is read
4606	4950	* before clearing __QDISC_STATE_SCHED
4607	4951	*/
4608	4952	smp_mb__before_atomic();
	4953	+
	4954	+ if (!(q->flags & TCQ_F_NOLOCK)) {
	4955	+ root_lock = qdisc_lock(q);
	4956	+ spin_lock(root_lock);
	4957	+ } else if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED,
	4958	+ &q->state))) {
	4959	+ /* There is a synchronize_net() between
	4960	+ * STATE_DEACTIVATED flag being set and
	4961	+ * qdisc_reset()/some_qdisc_is_busy() in
	4962	+ * dev_deactivate(), so we can safely bail out
	4963	+ * early here to avoid data race between
	4964	+ * qdisc_deactivate() and some_qdisc_is_busy()
	4965	+ * for lockless qdisc.
	4966	+ */
	4967	+ clear_bit(__QDISC_STATE_SCHED, &q->state);
	4968	+ continue;
	4969	+ }
	4970	+
4609	4971	clear_bit(__QDISC_STATE_SCHED, &q->state);
4610	4972	qdisc_run(q);
4611	4973	if (root_lock)
4612	4974	spin_unlock(root_lock);
4613	4975	}
	4976	+
	4977	+ rcu_read_unlock();
4614	4978	}
4615	4979
4616	4980	xfrm_dev_backlog(sd);
..	..	@@ -4625,7 +4989,7 @@
4625	4989
4626	4990	static inline struct sk_buff *
4627	4991	sch_handle_ingress(struct sk_buff skb, struct packet_type pt_prev, int ret,
4628		- struct net_device *orig_dev)
	4992	+ struct net_device orig_dev, bool another)
4629	4993	{
4630	4994	#ifdef CONFIG_NET_CLS_ACT
4631	4995	struct mini_Qdisc *miniq = rcu_dereference_bh(skb->dev->miniq_ingress);
..	..	@@ -4645,10 +5009,12 @@
4645	5009	}
4646	5010
4647	5011	qdisc_skb_cb(skb)->pkt_len = skb->len;
	5012	+ qdisc_skb_cb(skb)->mru = 0;
4648	5013	skb->tc_at_ingress = 1;
4649	5014	mini_qdisc_bstats_cpu_update(miniq, skb);
4650	5015
4651		- switch (tcf_classify(skb, miniq->filter_list, &cl_res, false)) {
	5016	+ switch (tcf_classify_ingress(skb, miniq->block, miniq->filter_list,
	5017	+ &cl_res, false)) {
4652	5018	case TC_ACT_OK:
4653	5019	case TC_ACT_RECLASSIFY:
4654	5020	skb->tc_index = TC_H_MIN(cl_res.classid);
..	..	@@ -4668,11 +5034,13 @@
4668	5034	* redirecting to another netdev
4669	5035	*/
4670	5036	__skb_push(skb, skb->mac_len);
4671		- skb_do_redirect(skb);
	5037	+ if (skb_do_redirect(skb) == -EAGAIN) {
	5038	+ __skb_pull(skb, skb->mac_len);
	5039	+ *another = true;
	5040	+ break;
	5041	+ }
4672	5042	return NULL;
4673		- case TC_ACT_REINSERT:
4674		- /* this does not scrub the packet, and updates stats on error */
4675		- skb_tc_reinsert(skb, &cl_res);
	5043	+ case TC_ACT_CONSUMED:
4676	5044	return NULL;
4677	5045	default:
4678	5046	break;
..	..	@@ -4772,7 +5140,6 @@
4772	5140	static inline int nf_ingress(struct sk_buff skb, struct packet_type *pt_prev,
4773	5141	int ret, struct net_device orig_dev)
4774	5142	{
4775		-#ifdef CONFIG_NETFILTER_INGRESS
4776	5143	if (nf_hook_ingress_active(skb)) {
4777	5144	int ingress_retval;
4778	5145
..	..	@@ -4786,7 +5153,6 @@
4786	5153	rcu_read_unlock();
4787	5154	return ingress_retval;
4788	5155	}
4789		-#endif /* CONFIG_NETFILTER_INGRESS */
4790	5156	return 0;
4791	5157	}
4792	5158
..	..	@@ -4801,7 +5167,7 @@
4801	5167	int ret = NET_RX_DROP;
4802	5168	__be16 type;
4803	5169
4804		- net_timestamp_check(!netdev_tstamp_prequeue, skb);
	5170	+ net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
4805	5171
4806	5172	trace_netif_receive_skb(skb);
4807	5173
..	..	@@ -4861,7 +5227,12 @@
4861	5227	skip_taps:
4862	5228	#ifdef CONFIG_NET_INGRESS
4863	5229	if (static_branch_unlikely(&ingress_needed_key)) {
4864		- skb = sch_handle_ingress(skb, &pt_prev, &ret, orig_dev);
	5230	+ bool another = false;
	5231	+
	5232	+ skb = sch_handle_ingress(skb, &pt_prev, &ret, orig_dev,
	5233	+ &another);
	5234	+ if (another)
	5235	+ goto another_round;
4865	5236	if (!skb)
4866	5237	goto out;
4867	5238
..	..	@@ -4869,7 +5240,7 @@
4869	5240	goto out;
4870	5241	}
4871	5242	#endif
4872		- skb_reset_tc(skb);
	5243	+ skb_reset_redirect(skb);
4873	5244	skip_classify:
4874	5245	if (pfmemalloc && !skb_pfmemalloc_protocol(skb))
4875	5246	goto drop;
..	..	@@ -4906,14 +5277,42 @@
4906	5277	}
4907	5278	}
4908	5279
4909		- if (unlikely(skb_vlan_tag_present(skb))) {
4910		- if (skb_vlan_tag_get_id(skb))
	5280	+ if (unlikely(skb_vlan_tag_present(skb)) && !netdev_uses_dsa(skb->dev)) {
	5281	+check_vlan_id:
	5282	+ if (skb_vlan_tag_get_id(skb)) {
	5283	+ /* Vlan id is non 0 and vlan_do_receive() above couldn't
	5284	+ * find vlan device.
	5285	+ */
4911	5286	skb->pkt_type = PACKET_OTHERHOST;
	5287	+ } else if (skb->protocol == cpu_to_be16(ETH_P_8021Q) \|\|
	5288	+ skb->protocol == cpu_to_be16(ETH_P_8021AD)) {
	5289	+ /* Outer header is 802.1P with vlan 0, inner header is
	5290	+ * 802.1Q or 802.1AD and vlan_do_receive() above could
	5291	+ * not find vlan dev for vlan id 0.
	5292	+ */
	5293	+ __vlan_hwaccel_clear_tag(skb);
	5294	+ skb = skb_vlan_untag(skb);
	5295	+ if (unlikely(!skb))
	5296	+ goto out;
	5297	+ if (vlan_do_receive(&skb))
	5298	+ /* After stripping off 802.1P header with vlan 0
	5299	+ * vlan dev is found for inner header.
	5300	+ */
	5301	+ goto another_round;
	5302	+ else if (unlikely(!skb))
	5303	+ goto out;
	5304	+ else
	5305	+ /* We have stripped outer 802.1P vlan 0 header.
	5306	+ * But could not find vlan dev.
	5307	+ * check again for vlan id to set OTHERHOST.
	5308	+ */
	5309	+ goto check_vlan_id;
	5310	+ }
4912	5311	/* Note: we might in the future use prio bits
4913	5312	* and set skb->priority like in vlan_do_receive()
4914	5313	* For the time being, just ignore Priority Code Point
4915	5314	*/
4916		- skb->vlan_tci = 0;
	5315	+ __vlan_hwaccel_clear_tag(skb);
4917	5316	}
4918	5317
4919	5318	type = skb->protocol;
..	..	@@ -4969,7 +5368,8 @@
4969	5368
4970	5369	ret = __netif_receive_skb_core(&skb, pfmemalloc, &pt_prev);
4971	5370	if (pt_prev)
4972		- ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
	5371	+ ret = INDIRECT_CALL_INET(pt_prev->func, ipv6_rcv, ip_rcv, skb,
	5372	+ skb->dev, pt_prev, orig_dev);
4973	5373	return ret;
4974	5374	}
4975	5375
..	..	@@ -4979,7 +5379,7 @@
4979	5379	*
4980	5380	* More direct receive version of netif_receive_skb(). It should
4981	5381	* only be used by callers that have a need to skip RPS and Generic XDP.
4982		- * Caller must also take care of handling if (page_is_)pfmemalloc.
	5382	+ * Caller must also take care of handling if ``(page_is_)pfmemalloc``.
4983	5383	*
4984	5384	* This function may only be called from softirq context and interrupts
4985	5385	* should be enabled.
..	..	@@ -5011,7 +5411,8 @@
5011	5411	if (list_empty(head))
5012	5412	return;
5013	5413	if (pt_prev->list_func != NULL)
5014		- pt_prev->list_func(head, pt_prev, orig_dev);
	5414	+ INDIRECT_CALL_INET(pt_prev->list_func, ipv6_list_rcv,
	5415	+ ip_list_rcv, head, pt_prev, orig_dev);
5015	5416	else
5016	5417	list_for_each_entry_safe(skb, next, head, list) {
5017	5418	skb_list_del_init(skb);
..	..	@@ -5122,6 +5523,25 @@
5122	5523	struct bpf_prog *new = xdp->prog;
5123	5524	int ret = 0;
5124	5525
	5526	+ if (new) {
	5527	+ u32 i;
	5528	+
	5529	+ mutex_lock(&new->aux->used_maps_mutex);
	5530	+
	5531	+ /* generic XDP does not work with DEVMAPs that can
	5532	+ * have a bpf_prog installed on an entry
	5533	+ */
	5534	+ for (i = 0; i < new->aux->used_map_cnt; i++) {
	5535	+ if (dev_map_can_have_prog(new->aux->used_maps[i]) \|\|
	5536	+ cpu_map_prog_allowed(new->aux->used_maps[i])) {
	5537	+ mutex_unlock(&new->aux->used_maps_mutex);
	5538	+ return -EINVAL;
	5539	+ }
	5540	+ }
	5541	+
	5542	+ mutex_unlock(&new->aux->used_maps_mutex);
	5543	+ }
	5544	+
5125	5545	switch (xdp->command) {
5126	5546	case XDP_SETUP_PROG:
5127	5547	rcu_assign_pointer(dev->xdp_prog, new);
..	..	@@ -5137,10 +5557,6 @@
5137	5557	}
5138	5558	break;
5139	5559
5140		- case XDP_QUERY_PROG:
5141		- xdp->prog_id = old ? old->aux->id : 0;
5142		- break;
5143		-
5144	5560	default:
5145	5561	ret = -EINVAL;
5146	5562	break;
..	..	@@ -5153,14 +5569,14 @@
5153	5569	{
5154	5570	int ret;
5155	5571
5156		- net_timestamp_check(netdev_tstamp_prequeue, skb);
	5572	+ net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb);
5157	5573
5158	5574	if (skb_defer_rx_timestamp(skb))
5159	5575	return NET_RX_SUCCESS;
5160	5576
5161	5577	rcu_read_lock();
5162	5578	#ifdef CONFIG_RPS
5163		- if (static_key_false(&rps_needed)) {
	5579	+ if (static_branch_unlikely(&rps_needed)) {
5164	5580	struct rps_dev_flow voidflow, *rflow = &voidflow;
5165	5581	int cpu = get_rps_cpu(skb->dev, skb, &rflow);
5166	5582
..	..	@@ -5183,7 +5599,7 @@
5183	5599
5184	5600	INIT_LIST_HEAD(&sublist);
5185	5601	list_for_each_entry_safe(skb, next, head, list) {
5186		- net_timestamp_check(netdev_tstamp_prequeue, skb);
	5602	+ net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb);
5187	5603	skb_list_del_init(skb);
5188	5604	if (!skb_defer_rx_timestamp(skb))
5189	5605	list_add_tail(&skb->list, &sublist);
..	..	@@ -5192,7 +5608,7 @@
5192	5608
5193	5609	rcu_read_lock();
5194	5610	#ifdef CONFIG_RPS
5195		- if (static_key_false(&rps_needed)) {
	5611	+ if (static_branch_unlikely(&rps_needed)) {
5196	5612	list_for_each_entry_safe(skb, next, head, list) {
5197	5613	struct rps_dev_flow voidflow, *rflow = &voidflow;
5198	5614	int cpu = get_rps_cpu(skb->dev, skb, &rflow);
..	..	@@ -5226,9 +5642,14 @@
5226	5642	*/
5227	5643	int netif_receive_skb(struct sk_buff *skb)
5228	5644	{
	5645	+ int ret;
	5646	+
5229	5647	trace_netif_receive_skb_entry(skb);
5230	5648
5231		- return netif_receive_skb_internal(skb);
	5649	+ ret = netif_receive_skb_internal(skb);
	5650	+ trace_netif_receive_skb_exit(ret);
	5651	+
	5652	+ return ret;
5232	5653	}
5233	5654	EXPORT_SYMBOL(netif_receive_skb);
5234	5655
..	..	@@ -5248,13 +5669,16 @@
5248	5669
5249	5670	if (list_empty(head))
5250	5671	return;
5251		- list_for_each_entry(skb, head, list)
5252		- trace_netif_receive_skb_list_entry(skb);
	5672	+ if (trace_netif_receive_skb_list_entry_enabled()) {
	5673	+ list_for_each_entry(skb, head, list)
	5674	+ trace_netif_receive_skb_list_entry(skb);
	5675	+ }
5253	5676	netif_receive_skb_list_internal(head);
	5677	+ trace_netif_receive_skb_list_exit(0);
5254	5678	}
5255	5679	EXPORT_SYMBOL(netif_receive_skb_list);
5256	5680
5257		-DEFINE_PER_CPU(struct work_struct, flush_works);
	5681	+static DEFINE_PER_CPU(struct work_struct, flush_works);
5258	5682
5259	5683	/* Network device is going away, flush any packets still pending */
5260	5684	static void flush_backlog(struct work_struct *work)
..	..	@@ -5287,23 +5711,89 @@
5287	5711	local_bh_enable();
5288	5712	}
5289	5713
	5714	+static bool flush_required(int cpu)
	5715	+{
	5716	+#if IS_ENABLED(CONFIG_RPS)
	5717	+ struct softnet_data *sd = &per_cpu(softnet_data, cpu);
	5718	+ bool do_flush;
	5719	+
	5720	+ local_irq_disable();
	5721	+ rps_lock(sd);
	5722	+
	5723	+ /* as insertion into process_queue happens with the rps lock held,
	5724	+ * process_queue access may race only with dequeue
	5725	+ */
	5726	+ do_flush = !skb_queue_empty(&sd->input_pkt_queue) \|\|
	5727	+ !skb_queue_empty_lockless(&sd->process_queue);
	5728	+ rps_unlock(sd);
	5729	+ local_irq_enable();
	5730	+
	5731	+ return do_flush;
	5732	+#endif
	5733	+ /* without RPS we can't safely check input_pkt_queue: during a
	5734	+ * concurrent remote skb_queue_splice() we can detect as empty both
	5735	+ * input_pkt_queue and process_queue even if the latter could end-up
	5736	+ * containing a lot of packets.
	5737	+ */
	5738	+ return true;
	5739	+}
	5740	+
5290	5741	static void flush_all_backlogs(void)
5291	5742	{
	5743	+ static cpumask_t flush_cpus;
5292	5744	unsigned int cpu;
	5745	+
	5746	+ /* since we are under rtnl lock protection we can use static data
	5747	+ * for the cpumask and avoid allocating on stack the possibly
	5748	+ * large mask
	5749	+ */
	5750	+ ASSERT_RTNL();
5293	5751
5294	5752	get_online_cpus();
5295	5753
5296		- for_each_online_cpu(cpu)
5297		- queue_work_on(cpu, system_highpri_wq,
5298		- per_cpu_ptr(&flush_works, cpu));
	5754	+ cpumask_clear(&flush_cpus);
	5755	+ for_each_online_cpu(cpu) {
	5756	+ if (flush_required(cpu)) {
	5757	+ queue_work_on(cpu, system_highpri_wq,
	5758	+ per_cpu_ptr(&flush_works, cpu));
	5759	+ cpumask_set_cpu(cpu, &flush_cpus);
	5760	+ }
	5761	+ }
5299	5762
5300		- for_each_online_cpu(cpu)
	5763	+ /* we can have in flight packet[s] on the cpus we are not flushing,
	5764	+ * synchronize_net() in unregister_netdevice_many() will take care of
	5765	+ * them
	5766	+ */
	5767	+ for_each_cpu(cpu, &flush_cpus)
5301	5768	flush_work(per_cpu_ptr(&flush_works, cpu));
5302	5769
5303	5770	put_online_cpus();
5304	5771	}
5305	5772
5306		-static int napi_gro_complete(struct sk_buff *skb)
	5773	+/* Pass the currently batched GRO_NORMAL SKBs up to the stack. */
	5774	+static void gro_normal_list(struct napi_struct *napi)
	5775	+{
	5776	+ if (!napi->rx_count)
	5777	+ return;
	5778	+ netif_receive_skb_list_internal(&napi->rx_list);
	5779	+ INIT_LIST_HEAD(&napi->rx_list);
	5780	+ napi->rx_count = 0;
	5781	+}
	5782	+
	5783	+/* Queue one GRO_NORMAL SKB up for list processing. If batch size exceeded,
	5784	+ * pass the whole batch up to the stack.
	5785	+ */
	5786	+static void gro_normal_one(struct napi_struct napi, struct sk_buff skb, int segs)
	5787	+{
	5788	+ list_add_tail(&skb->list, &napi->rx_list);
	5789	+ napi->rx_count += segs;
	5790	+ if (napi->rx_count >= gro_normal_batch)
	5791	+ gro_normal_list(napi);
	5792	+}
	5793	+
	5794	+INDIRECT_CALLABLE_DECLARE(int inet_gro_complete(struct sk_buff *, int));
	5795	+INDIRECT_CALLABLE_DECLARE(int ipv6_gro_complete(struct sk_buff *, int));
	5796	+static int napi_gro_complete(struct napi_struct napi, struct sk_buff skb)
5307	5797	{
5308	5798	struct packet_offload *ptype;
5309	5799	__be16 type = skb->protocol;
..	..	@@ -5322,7 +5812,9 @@
5322	5812	if (ptype->type != type \|\| !ptype->callbacks.gro_complete)
5323	5813	continue;
5324	5814
5325		- err = ptype->callbacks.gro_complete(skb, 0);
	5815	+ err = INDIRECT_CALL_INET(ptype->callbacks.gro_complete,
	5816	+ ipv6_gro_complete, inet_gro_complete,
	5817	+ skb, 0);
5326	5818	break;
5327	5819	}
5328	5820	rcu_read_unlock();
..	..	@@ -5334,7 +5826,8 @@
5334	5826	}
5335	5827
5336	5828	out:
5337		- return netif_receive_skb_internal(skb);
	5829	+ gro_normal_one(napi, skb, NAPI_GRO_CB(skb)->count);
	5830	+ return NET_RX_SUCCESS;
5338	5831	}
5339	5832
5340	5833	static void __napi_gro_flush_chain(struct napi_struct *napi, u32 index,
..	..	@@ -5346,9 +5839,8 @@
5346	5839	list_for_each_entry_safe_reverse(skb, p, head, list) {
5347	5840	if (flush_old && NAPI_GRO_CB(skb)->age == jiffies)
5348	5841	return;
5349		- list_del(&skb->list);
5350		- skb->next = NULL;
5351		- napi_gro_complete(skb);
	5842	+ skb_list_del_init(skb);
	5843	+ napi_gro_complete(napi, skb);
5352	5844	napi->gro_hash[index].count--;
5353	5845	}
5354	5846
..	..	@@ -5362,11 +5854,13 @@
5362	5854	*/
5363	5855	void napi_gro_flush(struct napi_struct *napi, bool flush_old)
5364	5856	{
5365		- u32 i;
	5857	+ unsigned long bitmask = napi->gro_bitmask;
	5858	+ unsigned int i, base = ~0U;
5366	5859
5367		- for (i = 0; i < GRO_HASH_BUCKETS; i++) {
5368		- if (test_bit(i, &napi->gro_bitmask))
5369		- __napi_gro_flush_chain(napi, i, flush_old);
	5860	+ while ((i = ffs(bitmask)) != 0) {
	5861	+ bitmask >>= i;
	5862	+ base += i;
	5863	+ __napi_gro_flush_chain(napi, base, flush_old);
5370	5864	}
5371	5865	}
5372	5866	EXPORT_SYMBOL(napi_gro_flush);
..	..	@@ -5391,7 +5885,9 @@
5391	5885	}
5392	5886
5393	5887	diffs = (unsigned long)p->dev ^ (unsigned long)skb->dev;
5394		- diffs \|= p->vlan_tci ^ skb->vlan_tci;
	5888	+ diffs \|= skb_vlan_tag_present(p) ^ skb_vlan_tag_present(skb);
	5889	+ if (skb_vlan_tag_present(p))
	5890	+ diffs \|= skb_vlan_tag_get(p) ^ skb_vlan_tag_get(skb);
5395	5891	diffs \|= skb_metadata_dst_cmp(p, skb);
5396	5892	diffs \|= skb_metadata_differs(p, skb);
5397	5893	if (maclen == ETH_HLEN)
..	..	@@ -5401,13 +5897,26 @@
5401	5897	diffs = memcmp(skb_mac_header(p),
5402	5898	skb_mac_header(skb),
5403	5899	maclen);
	5900	+
	5901	+ diffs \|= skb_get_nfct(p) ^ skb_get_nfct(skb);
	5902	+#if IS_ENABLED(CONFIG_SKB_EXTENSIONS) && IS_ENABLED(CONFIG_NET_TC_SKB_EXT)
	5903	+ if (!diffs) {
	5904	+ struct tc_skb_ext *skb_ext = skb_ext_find(skb, TC_SKB_EXT);
	5905	+ struct tc_skb_ext *p_ext = skb_ext_find(p, TC_SKB_EXT);
	5906	+
	5907	+ diffs \|= (!!p_ext) ^ (!!skb_ext);
	5908	+ if (!diffs && unlikely(skb_ext))
	5909	+ diffs \|= p_ext->chain ^ skb_ext->chain;
	5910	+ }
	5911	+#endif
	5912	+
5404	5913	NAPI_GRO_CB(p)->same_flow = !diffs;
5405	5914	}
5406	5915
5407	5916	return head;
5408	5917	}
5409	5918
5410		-static void skb_gro_reset_offset(struct sk_buff *skb)
	5919	+static inline void skb_gro_reset_offset(struct sk_buff *skb, u32 nhoff)
5411	5920	{
5412	5921	const struct skb_shared_info *pinfo = skb_shinfo(skb);
5413	5922	const skb_frag_t *frag0 = &pinfo->frags[0];
..	..	@@ -5416,10 +5925,9 @@
5416	5925	NAPI_GRO_CB(skb)->frag0 = NULL;
5417	5926	NAPI_GRO_CB(skb)->frag0_len = 0;
5418	5927
5419		- if (skb_mac_header(skb) == skb_tail_pointer(skb) &&
5420		- pinfo->nr_frags &&
	5928	+ if (!skb_headlen(skb) && pinfo->nr_frags &&
5421	5929	!PageHighMem(skb_frag_page(frag0)) &&
5422		- (!NET_IP_ALIGN \|\| !(skb_frag_off(frag0) & 3))) {
	5930	+ (!NET_IP_ALIGN \|\| !((skb_frag_off(frag0) + nhoff) & 3))) {
5423	5931	NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0);
5424	5932	NAPI_GRO_CB(skb)->frag0_len = min_t(unsigned int,
5425	5933	skb_frag_size(frag0),
..	..	@@ -5438,7 +5946,7 @@
5438	5946	skb->data_len -= grow;
5439	5947	skb->tail += grow;
5440	5948
5441		- pinfo->frags[0].page_offset += grow;
	5949	+ skb_frag_off_add(&pinfo->frags[0], grow);
5442	5950	skb_frag_size_sub(&pinfo->frags[0], grow);
5443	5951
5444	5952	if (unlikely(!skb_frag_size(&pinfo->frags[0]))) {
..	..	@@ -5448,7 +5956,7 @@
5448	5956	}
5449	5957	}
5450	5958
5451		-static void gro_flush_oldest(struct list_head *head)
	5959	+static void gro_flush_oldest(struct napi_struct napi, struct list_head head)
5452	5960	{
5453	5961	struct sk_buff *oldest;
5454	5962
..	..	@@ -5463,11 +5971,14 @@
5463	5971	/* Do not adjust napi->gro_hash[].count, caller is adding a new
5464	5972	* SKB to the chain.
5465	5973	*/
5466		- list_del(&oldest->list);
5467		- oldest->next = NULL;
5468		- napi_gro_complete(oldest);
	5974	+ skb_list_del_init(oldest);
	5975	+ napi_gro_complete(napi, oldest);
5469	5976	}
5470	5977
	5978	+INDIRECT_CALLABLE_DECLARE(struct sk_buff inet_gro_receive(struct list_head ,
	5979	+ struct sk_buff *));
	5980	+INDIRECT_CALLABLE_DECLARE(struct sk_buff ipv6_gro_receive(struct list_head ,
	5981	+ struct sk_buff *));
5471	5982	static enum gro_result dev_gro_receive(struct napi_struct napi, struct sk_buff skb)
5472	5983	{
5473	5984	u32 hash = skb_get_hash_raw(skb) & (GRO_HASH_BUCKETS - 1);
..	..	@@ -5517,7 +6028,9 @@
5517	6028	NAPI_GRO_CB(skb)->csum_valid = 0;
5518	6029	}
5519	6030
5520		- pp = ptype->callbacks.gro_receive(gro_head, skb);
	6031	+ pp = INDIRECT_CALL_INET(ptype->callbacks.gro_receive,
	6032	+ ipv6_gro_receive, inet_gro_receive,
	6033	+ gro_head, skb);
5521	6034	break;
5522	6035	}
5523	6036	rcu_read_unlock();
..	..	@@ -5525,7 +6038,7 @@
5525	6038	if (&ptype->list == head)
5526	6039	goto normal;
5527	6040
5528		- if (IS_ERR(pp) && PTR_ERR(pp) == -EINPROGRESS) {
	6041	+ if (PTR_ERR(pp) == -EINPROGRESS) {
5529	6042	ret = GRO_CONSUMED;
5530	6043	goto ok;
5531	6044	}
..	..	@@ -5534,9 +6047,8 @@
5534	6047	ret = NAPI_GRO_CB(skb)->free ? GRO_MERGED_FREE : GRO_MERGED;
5535	6048
5536	6049	if (pp) {
5537		- list_del(&pp->list);
5538		- pp->next = NULL;
5539		- napi_gro_complete(pp);
	6050	+ skb_list_del_init(pp);
	6051	+ napi_gro_complete(napi, pp);
5540	6052	napi->gro_hash[hash].count--;
5541	6053	}
5542	6054
..	..	@@ -5547,7 +6059,7 @@
5547	6059	goto normal;
5548	6060
5549	6061	if (unlikely(napi->gro_hash[hash].count >= MAX_GRO_SKBS)) {
5550		- gro_flush_oldest(gro_head);
	6062	+ gro_flush_oldest(napi, gro_head);
5551	6063	} else {
5552	6064	napi->gro_hash[hash].count++;
5553	6065	}
..	..	@@ -5608,16 +6120,17 @@
5608	6120	static void napi_skb_free_stolen_head(struct sk_buff *skb)
5609	6121	{
5610	6122	skb_dst_drop(skb);
5611		- secpath_reset(skb);
	6123	+ skb_ext_put(skb);
5612	6124	kmem_cache_free(skbuff_head_cache, skb);
5613	6125	}
5614	6126
5615		-static gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)
	6127	+static gro_result_t napi_skb_finish(struct napi_struct *napi,
	6128	+ struct sk_buff *skb,
	6129	+ gro_result_t ret)
5616	6130	{
5617	6131	switch (ret) {
5618	6132	case GRO_NORMAL:
5619		- if (netif_receive_skb_internal(skb))
5620		- ret = GRO_DROP;
	6133	+ gro_normal_one(napi, skb, 1);
5621	6134	break;
5622	6135
5623	6136	case GRO_DROP:
..	..	@@ -5642,12 +6155,17 @@
5642	6155
5643	6156	gro_result_t napi_gro_receive(struct napi_struct napi, struct sk_buff skb)
5644	6157	{
	6158	+ gro_result_t ret;
	6159	+
5645	6160	skb_mark_napi_id(skb, napi);
5646	6161	trace_napi_gro_receive_entry(skb);
5647	6162
5648		- skb_gro_reset_offset(skb);
	6163	+ skb_gro_reset_offset(skb, 0);
5649	6164
5650		- return napi_skb_finish(dev_gro_receive(napi, skb), skb);
	6165	+ ret = napi_skb_finish(napi, skb, dev_gro_receive(napi, skb));
	6166	+ trace_napi_gro_receive_exit(ret);
	6167	+
	6168	+ return ret;
5651	6169	}
5652	6170	EXPORT_SYMBOL(napi_gro_receive);
5653	6171
..	..	@@ -5660,7 +6178,7 @@
5660	6178	__skb_pull(skb, skb_headlen(skb));
5661	6179	/* restore the reserve we had after netdev_alloc_skb_ip_align() */
5662	6180	skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN - skb_headroom(skb));
5663		- skb->vlan_tci = 0;
	6181	+ __vlan_hwaccel_clear_tag(skb);
5664	6182	skb->dev = napi->dev;
5665	6183	skb->skb_iif = 0;
5666	6184
..	..	@@ -5670,7 +6188,8 @@
5670	6188	skb->encapsulation = 0;
5671	6189	skb_shinfo(skb)->gso_type = 0;
5672	6190	skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));
5673		- secpath_reset(skb);
	6191	+ skb_ext_reset(skb);
	6192	+ nf_reset_ct(skb);
5674	6193
5675	6194	napi->skb = skb;
5676	6195	}
..	..	@@ -5699,8 +6218,8 @@
5699	6218	case GRO_HELD:
5700	6219	__skb_push(skb, ETH_HLEN);
5701	6220	skb->protocol = eth_type_trans(skb, skb->dev);
5702		- if (ret == GRO_NORMAL && netif_receive_skb_internal(skb))
5703		- ret = GRO_DROP;
	6221	+ if (ret == GRO_NORMAL)
	6222	+ gro_normal_one(napi, skb, 1);
5704	6223	break;
5705	6224
5706	6225	case GRO_DROP:
..	..	@@ -5735,7 +6254,7 @@
5735	6254	napi->skb = NULL;
5736	6255
5737	6256	skb_reset_mac_header(skb);
5738		- skb_gro_reset_offset(skb);
	6257	+ skb_gro_reset_offset(skb, hlen);
5739	6258
5740	6259	if (unlikely(skb_gro_header_hard(skb, hlen))) {
5741	6260	eth = skb_gro_header_slow(skb, hlen, 0);
..	..	@@ -5765,6 +6284,7 @@
5765	6284
5766	6285	gro_result_t napi_gro_frags(struct napi_struct *napi)
5767	6286	{
	6287	+ gro_result_t ret;
5768	6288	struct sk_buff *skb = napi_frags_skb(napi);
5769	6289
5770	6290	if (!skb)
..	..	@@ -5772,7 +6292,10 @@
5772	6292
5773	6293	trace_napi_gro_frags_entry(skb);
5774	6294
5775		- return napi_frags_finish(napi, skb, dev_gro_receive(napi, skb));
	6295	+ ret = napi_frags_finish(napi, skb, dev_gro_receive(napi, skb));
	6296	+ trace_napi_gro_frags_exit(ret);
	6297	+
	6298	+ return ret;
5776	6299	}
5777	6300	EXPORT_SYMBOL(napi_gro_frags);
5778	6301
..	..	@@ -5788,10 +6311,11 @@
5788	6311
5789	6312	/* NAPI_GRO_CB(skb)->csum holds pseudo checksum */
5790	6313	sum = csum_fold(csum_add(NAPI_GRO_CB(skb)->csum, wsum));
	6314	+ /* See comments in __skb_checksum_complete(). */
5791	6315	if (likely(!sum)) {
5792	6316	if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE) &&
5793	6317	!skb->csum_complete_sw)
5794		- netdev_rx_csum_fault(skb->dev);
	6318	+ netdev_rx_csum_fault(skb->dev, skb);
5795	6319	}
5796	6320
5797	6321	NAPI_GRO_CB(skb)->csum = wsum;
..	..	@@ -5860,22 +6384,21 @@
5860	6384	net_rps_action_and_irq_enable(sd);
5861	6385	}
5862	6386
5863		- napi->weight = dev_rx_weight;
	6387	+ napi->weight = READ_ONCE(dev_rx_weight);
5864	6388	while (again) {
5865	6389	struct sk_buff *skb;
5866	6390
5867		- local_irq_disable();
5868	6391	while ((skb = __skb_dequeue(&sd->process_queue))) {
5869		- local_irq_enable();
5870	6392	rcu_read_lock();
5871	6393	__netif_receive_skb(skb);
5872	6394	rcu_read_unlock();
5873	6395	input_queue_head_incr(sd);
5874	6396	if (++work >= quota)
5875		- goto state_changed;
5876		- local_irq_disable();
	6397	+ return work;
	6398	+
5877	6399	}
5878	6400
	6401	+ local_irq_disable();
5879	6402	rps_lock(sd);
5880	6403	if (skb_queue_empty(&sd->input_pkt_queue)) {
5881	6404	/*
..	..	@@ -5895,10 +6418,6 @@
5895	6418	rps_unlock(sd);
5896	6419	local_irq_enable();
5897	6420	}
5898		-
5899		-state_changed:
5900		- napi_gro_flush(napi, false);
5901		- sd->current_napi = NULL;
5902	6421
5903	6422	return work;
5904	6423	}
..	..	@@ -5926,7 +6445,7 @@
5926	6445	* @n: napi context
5927	6446	*
5928	6447	* Test if NAPI routine is already running, and if not mark
5929		- * it as running. This is used as a condition variable
	6448	+ * it as running. This is used as a condition variable to
5930	6449	* insure only one NAPI poll instance runs. We also make
5931	6450	* sure there is no pending NAPI disable.
5932	6451	*/
..	..	@@ -5954,7 +6473,6 @@
5954	6473	}
5955	6474	EXPORT_SYMBOL(napi_schedule_prep);
5956	6475
5957		-#ifndef CONFIG_PREEMPT_RT_FULL
5958	6476	/**
5959	6477	* __napi_schedule_irqoff - schedule for receive
5960	6478	* @n: entry to schedule
..	..	@@ -5973,11 +6491,11 @@
5973	6491	__napi_schedule(n);
5974	6492	}
5975	6493	EXPORT_SYMBOL(__napi_schedule_irqoff);
5976		-#endif
5977	6494
5978	6495	bool napi_complete_done(struct napi_struct *n, int work_done)
5979	6496	{
5980		- unsigned long flags, val, new;
	6497	+ unsigned long flags, val, new, timeout = 0;
	6498	+ bool ret = true;
5981	6499
5982	6500	/*
5983	6501	* 1) Don't let napi dequeue from the cpu poll list
..	..	@@ -5989,28 +6507,31 @@
5989	6507	NAPIF_STATE_IN_BUSY_POLL)))
5990	6508	return false;
5991	6509
	6510	+ if (work_done) {
	6511	+ if (n->gro_bitmask)
	6512	+ timeout = READ_ONCE(n->dev->gro_flush_timeout);
	6513	+ n->defer_hard_irqs_count = READ_ONCE(n->dev->napi_defer_hard_irqs);
	6514	+ }
	6515	+ if (n->defer_hard_irqs_count > 0) {
	6516	+ n->defer_hard_irqs_count--;
	6517	+ timeout = READ_ONCE(n->dev->gro_flush_timeout);
	6518	+ if (timeout)
	6519	+ ret = false;
	6520	+ }
5992	6521	if (n->gro_bitmask) {
5993		- unsigned long timeout = 0;
5994		-
5995		- if (work_done)
5996		- timeout = n->dev->gro_flush_timeout;
5997		-
5998	6522	/* When the NAPI instance uses a timeout and keeps postponing
5999	6523	* it, we need to bound somehow the time packets are kept in
6000	6524	* the GRO layer
6001	6525	*/
6002	6526	napi_gro_flush(n, !!timeout);
6003		- if (timeout)
6004		- hrtimer_start(&n->timer, ns_to_ktime(timeout),
6005		- HRTIMER_MODE_REL_PINNED);
6006	6527	}
6007		- if (unlikely(!list_empty(&n->poll_list))) {
6008		- struct softnet_data *sd = this_cpu_ptr(&softnet_data);
6009	6528
	6529	+ gro_normal_list(n);
	6530	+
	6531	+ if (unlikely(!list_empty(&n->poll_list))) {
6010	6532	/* If n->poll_list is not empty, we need to mask irqs */
6011	6533	local_irq_save(flags);
6012	6534	list_del_init(&n->poll_list);
6013		- sd->current_napi = NULL;
6014	6535	local_irq_restore(flags);
6015	6536	}
6016	6537
..	..	@@ -6034,7 +6555,10 @@
6034	6555	return false;
6035	6556	}
6036	6557
6037		- return true;
	6558	+ if (timeout)
	6559	+ hrtimer_start(&n->timer, ns_to_ktime(timeout),
	6560	+ HRTIMER_MODE_REL_PINNED);
	6561	+ return ret;
6038	6562	}
6039	6563	EXPORT_SYMBOL(napi_complete_done);
6040	6564
..	..	@@ -6077,10 +6601,19 @@
6077	6601	* Ideally, a new ndo_busy_poll_stop() could avoid another round.
6078	6602	*/
6079	6603	rc = napi->poll(napi, BUSY_POLL_BUDGET);
	6604	+ /* We can't gro_normal_list() here, because napi->poll() might have
	6605	+ * rearmed the napi (napi_complete_done()) in which case it could
	6606	+ * already be running on another CPU.
	6607	+ */
6080	6608	trace_napi_poll(napi, rc, BUSY_POLL_BUDGET);
6081	6609	netpoll_poll_unlock(have_poll_lock);
6082		- if (rc == BUSY_POLL_BUDGET)
	6610	+ if (rc == BUSY_POLL_BUDGET) {
	6611	+ /* As the whole budget was spent, we still own the napi so can
	6612	+ * safely handle the rx_list.
	6613	+ */
	6614	+ gro_normal_list(napi);
6083	6615	__napi_schedule(napi);
	6616	+ }
6084	6617	local_bh_enable();
6085	6618	}
6086	6619
..	..	@@ -6125,6 +6658,7 @@
6125	6658	}
6126	6659	work = napi_poll(napi, BUSY_POLL_BUDGET);
6127	6660	trace_napi_poll(napi, work, BUSY_POLL_BUDGET);
	6661	+ gro_normal_list(napi);
6128	6662	count:
6129	6663	if (work > 0)
6130	6664	__NET_ADD_STATS(dev_net(napi->dev),
..	..	@@ -6158,8 +6692,7 @@
6158	6692
6159	6693	static void napi_hash_add(struct napi_struct *napi)
6160	6694	{
6161		- if (test_bit(NAPI_STATE_NO_BUSY_POLL, &napi->state) \|\|
6162		- test_and_set_bit(NAPI_STATE_HASHED, &napi->state))
	6695	+ if (test_bit(NAPI_STATE_NO_BUSY_POLL, &napi->state))
6163	6696	return;
6164	6697
6165	6698	spin_lock(&napi_hash_lock);
..	..	@@ -6180,20 +6713,14 @@
6180	6713	/* Warning : caller is responsible to make sure rcu grace period
6181	6714	* is respected before freeing memory containing @napi
6182	6715	*/
6183		-bool napi_hash_del(struct napi_struct *napi)
	6716	+static void napi_hash_del(struct napi_struct *napi)
6184	6717	{
6185		- bool rcu_sync_needed = false;
6186		-
6187	6718	spin_lock(&napi_hash_lock);
6188	6719
6189		- if (test_and_clear_bit(NAPI_STATE_HASHED, &napi->state)) {
6190		- rcu_sync_needed = true;
6191		- hlist_del_rcu(&napi->napi_hash_node);
6192		- }
	6720	+ hlist_del_init_rcu(&napi->napi_hash_node);
	6721	+
6193	6722	spin_unlock(&napi_hash_lock);
6194		- return rcu_sync_needed;
6195	6723	}
6196		-EXPORT_SYMBOL_GPL(napi_hash_del);
6197	6724
6198	6725	static enum hrtimer_restart napi_watchdog(struct hrtimer *timer)
6199	6726	{
..	..	@@ -6204,7 +6731,7 @@
6204	6731	/* Note : we use a relaxed variant of napi_schedule_prep() not setting
6205	6732	* NAPI_STATE_MISSED, since we do not react to a device IRQ.
6206	6733	*/
6207		- if (napi->gro_bitmask && !napi_disable_pending(napi) &&
	6734	+ if (!napi_disable_pending(napi) &&
6208	6735	!test_and_set_bit(NAPI_STATE_SCHED, &napi->state))
6209	6736	__napi_schedule_irqoff(napi);
6210	6737
..	..	@@ -6225,15 +6752,21 @@
6225	6752	void netif_napi_add(struct net_device dev, struct napi_struct napi,
6226	6753	int (poll)(struct napi_struct , int), int weight)
6227	6754	{
	6755	+ if (WARN_ON(test_and_set_bit(NAPI_STATE_LISTED, &napi->state)))
	6756	+ return;
	6757	+
6228	6758	INIT_LIST_HEAD(&napi->poll_list);
	6759	+ INIT_HLIST_NODE(&napi->napi_hash_node);
6229	6760	hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
6230	6761	napi->timer.function = napi_watchdog;
6231	6762	init_gro_hash(napi);
6232	6763	napi->skb = NULL;
	6764	+ INIT_LIST_HEAD(&napi->rx_list);
	6765	+ napi->rx_count = 0;
6233	6766	napi->poll = poll;
6234	6767	if (weight > NAPI_POLL_WEIGHT)
6235		- pr_err_once("netif_napi_add() called with weight %d on device %s\n",
6236		- weight, dev->name);
	6768	+ netdev_err_once(dev, "%s() called with weight %d\n", __func__,
	6769	+ weight);
6237	6770	napi->weight = weight;
6238	6771	napi->dev = dev;
6239	6772	#ifdef CONFIG_NETPOLL
..	..	@@ -6276,26 +6809,19 @@
6276	6809	}
6277	6810
6278	6811	/* Must be called in process context */
6279		-void netif_napi_del(struct napi_struct *napi)
	6812	+void __netif_napi_del(struct napi_struct *napi)
6280	6813	{
6281		- might_sleep();
6282		- if (napi_hash_del(napi))
6283		- synchronize_net();
6284		- list_del_init(&napi->dev_list);
	6814	+ if (!test_and_clear_bit(NAPI_STATE_LISTED, &napi->state))
	6815	+ return;
	6816	+
	6817	+ napi_hash_del(napi);
	6818	+ list_del_rcu(&napi->dev_list);
6285	6819	napi_free_frags(napi);
6286	6820
6287	6821	flush_gro_hash(napi);
6288	6822	napi->gro_bitmask = 0;
6289	6823	}
6290		-EXPORT_SYMBOL(netif_napi_del);
6291		-
6292		-struct napi_struct *get_current_napi_context(void)
6293		-{
6294		- struct softnet_data *sd = this_cpu_ptr(&softnet_data);
6295		-
6296		- return sd->current_napi;
6297		-}
6298		-EXPORT_SYMBOL(get_current_napi_context);
	6824	+EXPORT_SYMBOL(__netif_napi_del);
6299	6825
6300	6826	static int napi_poll(struct napi_struct n, struct list_head repoll)
6301	6827	{
..	..	@@ -6316,14 +6842,13 @@
6316	6842	*/
6317	6843	work = 0;
6318	6844	if (test_bit(NAPI_STATE_SCHED, &n->state)) {
6319		- struct softnet_data *sd = this_cpu_ptr(&softnet_data);
6320		-
6321		- sd->current_napi = n;
6322	6845	work = n->poll(n, weight);
6323	6846	trace_napi_poll(n, work, weight);
6324	6847	}
6325	6848
6326		- WARN_ON_ONCE(work > weight);
	6849	+ if (unlikely(work > weight))
	6850	+ pr_err_once("NAPI poll function %pS returned %d, exceeding its budget of %d.\n",
	6851	+ n->poll, work, weight);
6327	6852
6328	6853	if (likely(work < weight))
6329	6854	goto out_unlock;
..	..	@@ -6344,6 +6869,8 @@
6344	6869	*/
6345	6870	napi_gro_flush(n, HZ >= 1000);
6346	6871	}
	6872	+
	6873	+ gro_normal_list(n);
6347	6874
6348	6875	/* Some drivers may have called napi_schedule
6349	6876	* prior to exhausting their budget.
..	..	@@ -6366,22 +6893,14 @@
6366	6893	{
6367	6894	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
6368	6895	unsigned long time_limit = jiffies +
6369		- usecs_to_jiffies(netdev_budget_usecs);
6370		- int budget = netdev_budget;
6371		- struct sk_buff_head tofree_q;
6372		- struct sk_buff *skb;
	6896	+ usecs_to_jiffies(READ_ONCE(netdev_budget_usecs));
	6897	+ int budget = READ_ONCE(netdev_budget);
6373	6898	LIST_HEAD(list);
6374	6899	LIST_HEAD(repoll);
6375	6900
6376		- __skb_queue_head_init(&tofree_q);
6377		-
6378	6901	local_irq_disable();
6379		- skb_queue_splice_init(&sd->tofree_queue, &tofree_q);
6380	6902	list_splice_init(&sd->poll_list, &list);
6381	6903	local_irq_enable();
6382		-
6383		- while ((skb = __skb_dequeue(&tofree_q)))
6384		- kfree_skb(skb);
6385	6904
6386	6905	for (;;) {
6387	6906	struct napi_struct *n;
..	..	@@ -6412,7 +6931,7 @@
6412	6931	list_splice_tail(&repoll, &list);
6413	6932	list_splice(&list, &sd->poll_list);
6414	6933	if (!list_empty(&sd->poll_list))
6415		- __raise_softirq_irqoff_ksoft(NET_RX_SOFTIRQ);
	6934	+ __raise_softirq_irqoff(NET_RX_SOFTIRQ);
6416	6935
6417	6936	net_rps_action_and_irq_enable(sd);
6418	6937	out:
..	..	@@ -6424,6 +6943,9 @@
6424	6943
6425	6944	/* upper master flag, there can only be one master device per list */
6426	6945	bool master;
	6946	+
	6947	+ /* lookup ignore flag */
	6948	+ bool ignore;
6427	6949
6428	6950	/* counter for the number of times this device was added to us */
6429	6951	u16 ref_nr;
..	..	@@ -6447,9 +6969,10 @@
6447	6969	return NULL;
6448	6970	}
6449	6971
6450		-static int __netdev_has_upper_dev(struct net_device upper_dev, void data)
	6972	+static int ____netdev_has_upper_dev(struct net_device *upper_dev,
	6973	+ struct netdev_nested_priv *priv)
6451	6974	{
6452		- struct net_device *dev = data;
	6975	+ struct net_device dev = (struct net_device )priv->data;
6453	6976
6454	6977	return upper_dev == dev;
6455	6978	}
..	..	@@ -6466,10 +6989,14 @@
6466	6989	bool netdev_has_upper_dev(struct net_device *dev,
6467	6990	struct net_device *upper_dev)
6468	6991	{
	6992	+ struct netdev_nested_priv priv = {
	6993	+ .data = (void *)upper_dev,
	6994	+ };
	6995	+
6469	6996	ASSERT_RTNL();
6470	6997
6471		- return netdev_walk_all_upper_dev_rcu(dev, __netdev_has_upper_dev,
6472		- upper_dev);
	6998	+ return netdev_walk_all_upper_dev_rcu(dev, ____netdev_has_upper_dev,
	6999	+ &priv);
6473	7000	}
6474	7001	EXPORT_SYMBOL(netdev_has_upper_dev);
6475	7002
..	..	@@ -6486,8 +7013,12 @@
6486	7013	bool netdev_has_upper_dev_all_rcu(struct net_device *dev,
6487	7014	struct net_device *upper_dev)
6488	7015	{
6489		- return !!netdev_walk_all_upper_dev_rcu(dev, __netdev_has_upper_dev,
6490		- upper_dev);
	7016	+ struct netdev_nested_priv priv = {
	7017	+ .data = (void *)upper_dev,
	7018	+ };
	7019	+
	7020	+ return !!netdev_walk_all_upper_dev_rcu(dev, ____netdev_has_upper_dev,
	7021	+ &priv);
6491	7022	}
6492	7023	EXPORT_SYMBOL(netdev_has_upper_dev_all_rcu);
6493	7024
..	..	@@ -6529,6 +7060,22 @@
6529	7060	return NULL;
6530	7061	}
6531	7062	EXPORT_SYMBOL(netdev_master_upper_dev_get);
	7063	+
	7064	+static struct net_device __netdev_master_upper_dev_get(struct net_device dev)
	7065	+{
	7066	+ struct netdev_adjacent *upper;
	7067	+
	7068	+ ASSERT_RTNL();
	7069	+
	7070	+ if (list_empty(&dev->adj_list.upper))
	7071	+ return NULL;
	7072	+
	7073	+ upper = list_first_entry(&dev->adj_list.upper,
	7074	+ struct netdev_adjacent, list);
	7075	+ if (likely(upper->master) && !upper->ignore)
	7076	+ return upper->dev;
	7077	+ return NULL;
	7078	+}
6532	7079
6533	7080	/**
6534	7081	* netdev_has_any_lower_dev - Check if device is linked to some device
..	..	@@ -6580,8 +7127,9 @@
6580	7127	}
6581	7128	EXPORT_SYMBOL(netdev_upper_get_next_dev_rcu);
6582	7129
6583		-static struct net_device netdev_next_upper_dev(struct net_device dev,
6584		- struct list_head **iter)
	7130	+static struct net_device __netdev_next_upper_dev(struct net_device dev,
	7131	+ struct list_head **iter,
	7132	+ bool *ignore)
6585	7133	{
6586	7134	struct netdev_adjacent *upper;
6587	7135
..	..	@@ -6591,6 +7139,7 @@
6591	7139	return NULL;
6592	7140
6593	7141	*iter = &upper->list;
	7142	+ *ignore = upper->ignore;
6594	7143
6595	7144	return upper->dev;
6596	7145	}
..	..	@@ -6612,30 +7161,33 @@
6612	7161	return upper->dev;
6613	7162	}
6614	7163
6615		-static int netdev_walk_all_upper_dev(struct net_device *dev,
6616		- int (fn)(struct net_device dev,
6617		- void *data),
6618		- void *data)
	7164	+static int __netdev_walk_all_upper_dev(struct net_device *dev,
	7165	+ int (fn)(struct net_device dev,
	7166	+ struct netdev_nested_priv *priv),
	7167	+ struct netdev_nested_priv *priv)
6619	7168	{
6620	7169	struct net_device udev, next, now, dev_stack[MAX_NEST_DEV + 1];
6621	7170	struct list_head niter, iter, *iter_stack[MAX_NEST_DEV + 1];
6622	7171	int ret, cur = 0;
	7172	+ bool ignore;
6623	7173
6624	7174	now = dev;
6625	7175	iter = &dev->adj_list.upper;
6626	7176
6627	7177	while (1) {
6628	7178	if (now != dev) {
6629		- ret = fn(now, data);
	7179	+ ret = fn(now, priv);
6630	7180	if (ret)
6631	7181	return ret;
6632	7182	}
6633	7183
6634	7184	next = NULL;
6635	7185	while (1) {
6636		- udev = netdev_next_upper_dev(now, &iter);
	7186	+ udev = __netdev_next_upper_dev(now, &iter, &ignore);
6637	7187	if (!udev)
6638	7188	break;
	7189	+ if (ignore)
	7190	+ continue;
6639	7191
6640	7192	next = udev;
6641	7193	niter = &udev->adj_list.upper;
..	..	@@ -6660,8 +7212,8 @@
6660	7212
6661	7213	int netdev_walk_all_upper_dev_rcu(struct net_device *dev,
6662	7214	int (fn)(struct net_device dev,
6663		- void *data),
6664		- void *data)
	7215	+ struct netdev_nested_priv *priv),
	7216	+ struct netdev_nested_priv *priv)
6665	7217	{
6666	7218	struct net_device udev, next, now, dev_stack[MAX_NEST_DEV + 1];
6667	7219	struct list_head niter, iter, *iter_stack[MAX_NEST_DEV + 1];
..	..	@@ -6672,7 +7224,7 @@
6672	7224
6673	7225	while (1) {
6674	7226	if (now != dev) {
6675		- ret = fn(now, data);
	7227	+ ret = fn(now, priv);
6676	7228	if (ret)
6677	7229	return ret;
6678	7230	}
..	..	@@ -6704,6 +7256,20 @@
6704	7256	return 0;
6705	7257	}
6706	7258	EXPORT_SYMBOL_GPL(netdev_walk_all_upper_dev_rcu);
	7259	+
	7260	+static bool __netdev_has_upper_dev(struct net_device *dev,
	7261	+ struct net_device *upper_dev)
	7262	+{
	7263	+ struct netdev_nested_priv priv = {
	7264	+ .flags = 0,
	7265	+ .data = (void *)upper_dev,
	7266	+ };
	7267	+
	7268	+ ASSERT_RTNL();
	7269	+
	7270	+ return __netdev_walk_all_upper_dev(dev, ____netdev_has_upper_dev,
	7271	+ &priv);
	7272	+}
6707	7273
6708	7274	/**
6709	7275	* netdev_lower_get_next_private - Get the next ->private from the
..	..	@@ -6801,10 +7367,27 @@
6801	7367	return lower->dev;
6802	7368	}
6803	7369
	7370	+static struct net_device __netdev_next_lower_dev(struct net_device dev,
	7371	+ struct list_head **iter,
	7372	+ bool *ignore)
	7373	+{
	7374	+ struct netdev_adjacent *lower;
	7375	+
	7376	+ lower = list_entry((*iter)->next, struct netdev_adjacent, list);
	7377	+
	7378	+ if (&lower->list == &dev->adj_list.lower)
	7379	+ return NULL;
	7380	+
	7381	+ *iter = &lower->list;
	7382	+ *ignore = lower->ignore;
	7383	+
	7384	+ return lower->dev;
	7385	+}
	7386	+
6804	7387	int netdev_walk_all_lower_dev(struct net_device *dev,
6805	7388	int (fn)(struct net_device dev,
6806		- void *data),
6807		- void *data)
	7389	+ struct netdev_nested_priv *priv),
	7390	+ struct netdev_nested_priv *priv)
6808	7391	{
6809	7392	struct net_device ldev, next, now, dev_stack[MAX_NEST_DEV + 1];
6810	7393	struct list_head niter, iter, *iter_stack[MAX_NEST_DEV + 1];
..	..	@@ -6815,7 +7398,7 @@
6815	7398
6816	7399	while (1) {
6817	7400	if (now != dev) {
6818		- ret = fn(now, data);
	7401	+ ret = fn(now, priv);
6819	7402	if (ret)
6820	7403	return ret;
6821	7404	}
..	..	@@ -6848,8 +7431,57 @@
6848	7431	}
6849	7432	EXPORT_SYMBOL_GPL(netdev_walk_all_lower_dev);
6850	7433
6851		-static struct net_device netdev_next_lower_dev_rcu(struct net_device dev,
6852		- struct list_head **iter)
	7434	+static int __netdev_walk_all_lower_dev(struct net_device *dev,
	7435	+ int (fn)(struct net_device dev,
	7436	+ struct netdev_nested_priv *priv),
	7437	+ struct netdev_nested_priv *priv)
	7438	+{
	7439	+ struct net_device ldev, next, now, dev_stack[MAX_NEST_DEV + 1];
	7440	+ struct list_head niter, iter, *iter_stack[MAX_NEST_DEV + 1];
	7441	+ int ret, cur = 0;
	7442	+ bool ignore;
	7443	+
	7444	+ now = dev;
	7445	+ iter = &dev->adj_list.lower;
	7446	+
	7447	+ while (1) {
	7448	+ if (now != dev) {
	7449	+ ret = fn(now, priv);
	7450	+ if (ret)
	7451	+ return ret;
	7452	+ }
	7453	+
	7454	+ next = NULL;
	7455	+ while (1) {
	7456	+ ldev = __netdev_next_lower_dev(now, &iter, &ignore);
	7457	+ if (!ldev)
	7458	+ break;
	7459	+ if (ignore)
	7460	+ continue;
	7461	+
	7462	+ next = ldev;
	7463	+ niter = &ldev->adj_list.lower;
	7464	+ dev_stack[cur] = now;
	7465	+ iter_stack[cur++] = iter;
	7466	+ break;
	7467	+ }
	7468	+
	7469	+ if (!next) {
	7470	+ if (!cur)
	7471	+ return 0;
	7472	+ next = dev_stack[--cur];
	7473	+ niter = iter_stack[cur];
	7474	+ }
	7475	+
	7476	+ now = next;
	7477	+ iter = niter;
	7478	+ }
	7479	+
	7480	+ return 0;
	7481	+}
	7482	+
	7483	+struct net_device netdev_next_lower_dev_rcu(struct net_device dev,
	7484	+ struct list_head **iter)
6853	7485	{
6854	7486	struct netdev_adjacent *lower;
6855	7487
..	..	@@ -6861,17 +7493,21 @@
6861	7493
6862	7494	return lower->dev;
6863	7495	}
	7496	+EXPORT_SYMBOL(netdev_next_lower_dev_rcu);
6864	7497
6865	7498	static u8 __netdev_upper_depth(struct net_device *dev)
6866	7499	{
6867	7500	struct net_device *udev;
6868	7501	struct list_head *iter;
6869	7502	u8 max_depth = 0;
	7503	+ bool ignore;
6870	7504
6871	7505	for (iter = &dev->adj_list.upper,
6872		- udev = netdev_next_upper_dev(dev, &iter);
	7506	+ udev = __netdev_next_upper_dev(dev, &iter, &ignore);
6873	7507	udev;
6874		- udev = netdev_next_upper_dev(dev, &iter)) {
	7508	+ udev = __netdev_next_upper_dev(dev, &iter, &ignore)) {
	7509	+ if (ignore)
	7510	+ continue;
6875	7511	if (max_depth < udev->upper_level)
6876	7512	max_depth = udev->upper_level;
6877	7513	}
..	..	@@ -6884,11 +7520,14 @@
6884	7520	struct net_device *ldev;
6885	7521	struct list_head *iter;
6886	7522	u8 max_depth = 0;
	7523	+ bool ignore;
6887	7524
6888	7525	for (iter = &dev->adj_list.lower,
6889		- ldev = netdev_next_lower_dev(dev, &iter);
	7526	+ ldev = __netdev_next_lower_dev(dev, &iter, &ignore);
6890	7527	ldev;
6891		- ldev = netdev_next_lower_dev(dev, &iter)) {
	7528	+ ldev = __netdev_next_lower_dev(dev, &iter, &ignore)) {
	7529	+ if (ignore)
	7530	+ continue;
6892	7531	if (max_depth < ldev->lower_level)
6893	7532	max_depth = ldev->lower_level;
6894	7533	}
..	..	@@ -6896,22 +7535,34 @@
6896	7535	return max_depth;
6897	7536	}
6898	7537
6899		-static int __netdev_update_upper_level(struct net_device dev, void data)
	7538	+static int __netdev_update_upper_level(struct net_device *dev,
	7539	+ struct netdev_nested_priv *__unused)
6900	7540	{
6901	7541	dev->upper_level = __netdev_upper_depth(dev) + 1;
6902	7542	return 0;
6903	7543	}
6904	7544
6905		-static int __netdev_update_lower_level(struct net_device dev, void data)
	7545	+static int __netdev_update_lower_level(struct net_device *dev,
	7546	+ struct netdev_nested_priv *priv)
6906	7547	{
6907	7548	dev->lower_level = __netdev_lower_depth(dev) + 1;
	7549	+
	7550	+#ifdef CONFIG_LOCKDEP
	7551	+ if (!priv)
	7552	+ return 0;
	7553	+
	7554	+ if (priv->flags & NESTED_SYNC_IMM)
	7555	+ dev->nested_level = dev->lower_level - 1;
	7556	+ if (priv->flags & NESTED_SYNC_TODO)
	7557	+ net_unlink_todo(dev);
	7558	+#endif
6908	7559	return 0;
6909	7560	}
6910	7561
6911	7562	int netdev_walk_all_lower_dev_rcu(struct net_device *dev,
6912	7563	int (fn)(struct net_device dev,
6913		- void *data),
6914		- void *data)
	7564	+ struct netdev_nested_priv *priv),
	7565	+ struct netdev_nested_priv *priv)
6915	7566	{
6916	7567	struct net_device ldev, next, now, dev_stack[MAX_NEST_DEV + 1];
6917	7568	struct list_head niter, iter, *iter_stack[MAX_NEST_DEV + 1];
..	..	@@ -6922,7 +7573,7 @@
6922	7573
6923	7574	while (1) {
6924	7575	if (now != dev) {
6925		- ret = fn(now, data);
	7576	+ ret = fn(now, priv);
6926	7577	if (ret)
6927	7578	return ret;
6928	7579	}
..	..	@@ -7052,6 +7703,7 @@
7052	7703	adj->master = master;
7053	7704	adj->ref_nr = 1;
7054	7705	adj->private = private;
	7706	+ adj->ignore = false;
7055	7707	dev_hold(adj_dev);
7056	7708
7057	7709	pr_debug("Insert adjacency: dev %s adj_dev %s adj->ref_nr %d; dev_hold on %s\n",
..	..	@@ -7181,6 +7833,7 @@
7181	7833	static int __netdev_upper_dev_link(struct net_device *dev,
7182	7834	struct net_device *upper_dev, bool master,
7183	7835	void upper_priv, void upper_info,
	7836	+ struct netdev_nested_priv *priv,
7184	7837	struct netlink_ext_ack *extack)
7185	7838	{
7186	7839	struct netdev_notifier_changeupper_info changeupper_info = {
..	..	@@ -7202,17 +7855,17 @@
7202	7855	return -EBUSY;
7203	7856
7204	7857	/* To prevent loops, check if dev is not upper device to upper_dev. */
7205		- if (netdev_has_upper_dev(upper_dev, dev))
	7858	+ if (__netdev_has_upper_dev(upper_dev, dev))
7206	7859	return -EBUSY;
7207	7860
7208	7861	if ((dev->lower_level + upper_dev->upper_level) > MAX_NEST_DEV)
7209	7862	return -EMLINK;
7210	7863
7211	7864	if (!master) {
7212		- if (netdev_has_upper_dev(dev, upper_dev))
	7865	+ if (__netdev_has_upper_dev(dev, upper_dev))
7213	7866	return -EEXIST;
7214	7867	} else {
7215		- master_dev = netdev_master_upper_dev_get(dev);
	7868	+ master_dev = __netdev_master_upper_dev_get(dev);
7216	7869	if (master_dev)
7217	7870	return master_dev == upper_dev ? -EEXIST : -EBUSY;
7218	7871	}
..	..	@@ -7235,10 +7888,11 @@
7235	7888	goto rollback;
7236	7889
7237	7890	__netdev_update_upper_level(dev, NULL);
7238		- netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL);
	7891	+ __netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL);
7239	7892
7240		- __netdev_update_lower_level(upper_dev, NULL);
7241		- netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level, NULL);
	7893	+ __netdev_update_lower_level(upper_dev, priv);
	7894	+ __netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level,
	7895	+ priv);
7242	7896
7243	7897	return 0;
7244	7898
..	..	@@ -7263,8 +7917,13 @@
7263	7917	struct net_device *upper_dev,
7264	7918	struct netlink_ext_ack *extack)
7265	7919	{
	7920	+ struct netdev_nested_priv priv = {
	7921	+ .flags = NESTED_SYNC_IMM \| NESTED_SYNC_TODO,
	7922	+ .data = NULL,
	7923	+ };
	7924	+
7266	7925	return __netdev_upper_dev_link(dev, upper_dev, false,
7267		- NULL, NULL, extack);
	7926	+ NULL, NULL, &priv, extack);
7268	7927	}
7269	7928	EXPORT_SYMBOL(netdev_upper_dev_link);
7270	7929
..	..	@@ -7287,21 +7946,19 @@
7287	7946	void upper_priv, void upper_info,
7288	7947	struct netlink_ext_ack *extack)
7289	7948	{
	7949	+ struct netdev_nested_priv priv = {
	7950	+ .flags = NESTED_SYNC_IMM \| NESTED_SYNC_TODO,
	7951	+ .data = NULL,
	7952	+ };
	7953	+
7290	7954	return __netdev_upper_dev_link(dev, upper_dev, true,
7291		- upper_priv, upper_info, extack);
	7955	+ upper_priv, upper_info, &priv, extack);
7292	7956	}
7293	7957	EXPORT_SYMBOL(netdev_master_upper_dev_link);
7294	7958
7295		-/**
7296		- * netdev_upper_dev_unlink - Removes a link to upper device
7297		- * @dev: device
7298		- * @upper_dev: new upper device
7299		- *
7300		- * Removes a link to device which is upper to this one. The caller must hold
7301		- * the RTNL lock.
7302		- */
7303		-void netdev_upper_dev_unlink(struct net_device *dev,
7304		- struct net_device *upper_dev)
	7959	+static void __netdev_upper_dev_unlink(struct net_device *dev,
	7960	+ struct net_device *upper_dev,
	7961	+ struct netdev_nested_priv *priv)
7305	7962	{
7306	7963	struct netdev_notifier_changeupper_info changeupper_info = {
7307	7964	.info = {
..	..	@@ -7324,12 +7981,126 @@
7324	7981	&changeupper_info.info);
7325	7982
7326	7983	__netdev_update_upper_level(dev, NULL);
7327		- netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL);
	7984	+ __netdev_walk_all_lower_dev(dev, __netdev_update_upper_level, NULL);
7328	7985
7329		- __netdev_update_lower_level(upper_dev, NULL);
7330		- netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level, NULL);
	7986	+ __netdev_update_lower_level(upper_dev, priv);
	7987	+ __netdev_walk_all_upper_dev(upper_dev, __netdev_update_lower_level,
	7988	+ priv);
	7989	+}
	7990	+
	7991	+/**
	7992	+ * netdev_upper_dev_unlink - Removes a link to upper device
	7993	+ * @dev: device
	7994	+ * @upper_dev: new upper device
	7995	+ *
	7996	+ * Removes a link to device which is upper to this one. The caller must hold
	7997	+ * the RTNL lock.
	7998	+ */
	7999	+void netdev_upper_dev_unlink(struct net_device *dev,
	8000	+ struct net_device *upper_dev)
	8001	+{
	8002	+ struct netdev_nested_priv priv = {
	8003	+ .flags = NESTED_SYNC_TODO,
	8004	+ .data = NULL,
	8005	+ };
	8006	+
	8007	+ __netdev_upper_dev_unlink(dev, upper_dev, &priv);
7331	8008	}
7332	8009	EXPORT_SYMBOL(netdev_upper_dev_unlink);
	8010	+
	8011	+static void __netdev_adjacent_dev_set(struct net_device *upper_dev,
	8012	+ struct net_device *lower_dev,
	8013	+ bool val)
	8014	+{
	8015	+ struct netdev_adjacent *adj;
	8016	+
	8017	+ adj = __netdev_find_adj(lower_dev, &upper_dev->adj_list.lower);
	8018	+ if (adj)
	8019	+ adj->ignore = val;
	8020	+
	8021	+ adj = __netdev_find_adj(upper_dev, &lower_dev->adj_list.upper);
	8022	+ if (adj)
	8023	+ adj->ignore = val;
	8024	+}
	8025	+
	8026	+static void netdev_adjacent_dev_disable(struct net_device *upper_dev,
	8027	+ struct net_device *lower_dev)
	8028	+{
	8029	+ __netdev_adjacent_dev_set(upper_dev, lower_dev, true);
	8030	+}
	8031	+
	8032	+static void netdev_adjacent_dev_enable(struct net_device *upper_dev,
	8033	+ struct net_device *lower_dev)
	8034	+{
	8035	+ __netdev_adjacent_dev_set(upper_dev, lower_dev, false);
	8036	+}
	8037	+
	8038	+int netdev_adjacent_change_prepare(struct net_device *old_dev,
	8039	+ struct net_device *new_dev,
	8040	+ struct net_device *dev,
	8041	+ struct netlink_ext_ack *extack)
	8042	+{
	8043	+ struct netdev_nested_priv priv = {
	8044	+ .flags = 0,
	8045	+ .data = NULL,
	8046	+ };
	8047	+ int err;
	8048	+
	8049	+ if (!new_dev)
	8050	+ return 0;
	8051	+
	8052	+ if (old_dev && new_dev != old_dev)
	8053	+ netdev_adjacent_dev_disable(dev, old_dev);
	8054	+ err = __netdev_upper_dev_link(new_dev, dev, false, NULL, NULL, &priv,
	8055	+ extack);
	8056	+ if (err) {
	8057	+ if (old_dev && new_dev != old_dev)
	8058	+ netdev_adjacent_dev_enable(dev, old_dev);
	8059	+ return err;
	8060	+ }
	8061	+
	8062	+ return 0;
	8063	+}
	8064	+EXPORT_SYMBOL(netdev_adjacent_change_prepare);
	8065	+
	8066	+void netdev_adjacent_change_commit(struct net_device *old_dev,
	8067	+ struct net_device *new_dev,
	8068	+ struct net_device *dev)
	8069	+{
	8070	+ struct netdev_nested_priv priv = {
	8071	+ .flags = NESTED_SYNC_IMM \| NESTED_SYNC_TODO,
	8072	+ .data = NULL,
	8073	+ };
	8074	+
	8075	+ if (!new_dev \|\| !old_dev)
	8076	+ return;
	8077	+
	8078	+ if (new_dev == old_dev)
	8079	+ return;
	8080	+
	8081	+ netdev_adjacent_dev_enable(dev, old_dev);
	8082	+ __netdev_upper_dev_unlink(old_dev, dev, &priv);
	8083	+}
	8084	+EXPORT_SYMBOL(netdev_adjacent_change_commit);
	8085	+
	8086	+void netdev_adjacent_change_abort(struct net_device *old_dev,
	8087	+ struct net_device *new_dev,
	8088	+ struct net_device *dev)
	8089	+{
	8090	+ struct netdev_nested_priv priv = {
	8091	+ .flags = 0,
	8092	+ .data = NULL,
	8093	+ };
	8094	+
	8095	+ if (!new_dev)
	8096	+ return;
	8097	+
	8098	+ if (old_dev && new_dev != old_dev)
	8099	+ netdev_adjacent_dev_enable(dev, old_dev);
	8100	+
	8101	+ __netdev_upper_dev_unlink(new_dev, dev, &priv);
	8102	+}
	8103	+EXPORT_SYMBOL(netdev_adjacent_change_abort);
7333	8104
7334	8105	/**
7335	8106	* netdev_bonding_info_change - Dispatch event about slave change
..	..	@@ -7352,6 +8123,29 @@
7352	8123	&info.info);
7353	8124	}
7354	8125	EXPORT_SYMBOL(netdev_bonding_info_change);
	8126	+
	8127	+/**
	8128	+ * netdev_get_xmit_slave - Get the xmit slave of master device
	8129	+ * @dev: device
	8130	+ * @skb: The packet
	8131	+ * @all_slaves: assume all the slaves are active
	8132	+ *
	8133	+ * The reference counters are not incremented so the caller must be
	8134	+ * careful with locks. The caller must hold RCU lock.
	8135	+ * %NULL is returned if no slave is found.
	8136	+ */
	8137	+
	8138	+struct net_device netdev_get_xmit_slave(struct net_device dev,
	8139	+ struct sk_buff *skb,
	8140	+ bool all_slaves)
	8141	+{
	8142	+ const struct net_device_ops *ops = dev->netdev_ops;
	8143	+
	8144	+ if (!ops->ndo_get_xmit_slave)
	8145	+ return NULL;
	8146	+ return ops->ndo_get_xmit_slave(dev, skb, all_slaves);
	8147	+}
	8148	+EXPORT_SYMBOL(netdev_get_xmit_slave);
7355	8149
7356	8150	static void netdev_adjacent_add_links(struct net_device *dev)
7357	8151	{
..	..	@@ -7443,25 +8237,6 @@
7443	8237	}
7444	8238	EXPORT_SYMBOL(netdev_lower_dev_get_private);
7445	8239
7446		-
7447		-int dev_get_nest_level(struct net_device *dev)
7448		-{
7449		- struct net_device *lower = NULL;
7450		- struct list_head *iter;
7451		- int max_nest = -1;
7452		- int nest;
7453		-
7454		- ASSERT_RTNL();
7455		-
7456		- netdev_for_each_lower_dev(dev, lower, iter) {
7457		- nest = dev_get_nest_level(lower);
7458		- if (max_nest < nest)
7459		- max_nest = nest;
7460		- }
7461		-
7462		- return max_nest + 1;
7463		-}
7464		-EXPORT_SYMBOL(dev_get_nest_level);
7465	8240
7466	8241	/**
7467	8242	* netdev_lower_change - Dispatch event about lower device state change
..	..	@@ -7689,7 +8464,8 @@
7689	8464	}
7690	8465	EXPORT_SYMBOL(dev_get_flags);
7691	8466
7692		-int __dev_change_flags(struct net_device *dev, unsigned int flags)
	8467	+int __dev_change_flags(struct net_device *dev, unsigned int flags,
	8468	+ struct netlink_ext_ack *extack)
7693	8469	{
7694	8470	unsigned int old_flags = dev->flags;
7695	8471	int ret;
..	..	@@ -7726,7 +8502,7 @@
7726	8502	if (old_flags & IFF_UP)
7727	8503	__dev_close(dev);
7728	8504	else
7729		- ret = __dev_open(dev);
	8505	+ ret = __dev_open(dev, extack);
7730	8506	}
7731	8507
7732	8508	if ((flags ^ dev->gflags) & IFF_PROMISC) {
..	..	@@ -7786,16 +8562,18 @@
7786	8562	* dev_change_flags - change device settings
7787	8563	* @dev: device
7788	8564	* @flags: device state flags
	8565	+ * @extack: netlink extended ack
7789	8566	*
7790	8567	* Change settings on device based state flags. The flags are
7791	8568	* in the userspace exported format.
7792	8569	*/
7793		-int dev_change_flags(struct net_device *dev, unsigned int flags)
	8570	+int dev_change_flags(struct net_device *dev, unsigned int flags,
	8571	+ struct netlink_ext_ack *extack)
7794	8572	{
7795	8573	int ret;
7796	8574	unsigned int changes, old_flags = dev->flags, old_gflags = dev->gflags;
7797	8575
7798		- ret = __dev_change_flags(dev, flags);
	8576	+ ret = __dev_change_flags(dev, flags, extack);
7799	8577	if (ret < 0)
7800	8578	return ret;
7801	8579
..	..	@@ -7938,13 +8716,36 @@
7938	8716	EXPORT_SYMBOL(dev_set_group);
7939	8717
7940	8718	/**
	8719	+ * dev_pre_changeaddr_notify - Call NETDEV_PRE_CHANGEADDR.
	8720	+ * @dev: device
	8721	+ * @addr: new address
	8722	+ * @extack: netlink extended ack
	8723	+ */
	8724	+int dev_pre_changeaddr_notify(struct net_device dev, const char addr,
	8725	+ struct netlink_ext_ack *extack)
	8726	+{
	8727	+ struct netdev_notifier_pre_changeaddr_info info = {
	8728	+ .info.dev = dev,
	8729	+ .info.extack = extack,
	8730	+ .dev_addr = addr,
	8731	+ };
	8732	+ int rc;
	8733	+
	8734	+ rc = call_netdevice_notifiers_info(NETDEV_PRE_CHANGEADDR, &info.info);
	8735	+ return notifier_to_errno(rc);
	8736	+}
	8737	+EXPORT_SYMBOL(dev_pre_changeaddr_notify);
	8738	+
	8739	+/**
7941	8740	* dev_set_mac_address - Change Media Access Control Address
7942	8741	* @dev: device
7943	8742	* @sa: new address
	8743	+ * @extack: netlink extended ack
7944	8744	*
7945	8745	* Change the hardware (MAC) address of the device
7946	8746	*/
7947		-int dev_set_mac_address(struct net_device dev, struct sockaddr sa)
	8747	+int dev_set_mac_address(struct net_device dev, struct sockaddr sa,
	8748	+ struct netlink_ext_ack *extack)
7948	8749	{
7949	8750	const struct net_device_ops *ops = dev->netdev_ops;
7950	8751	int err;
..	..	@@ -7955,6 +8756,9 @@
7955	8756	return -EINVAL;
7956	8757	if (!netif_device_present(dev))
7957	8758	return -ENODEV;
	8759	+ err = dev_pre_changeaddr_notify(dev, sa->sa_data, extack);
	8760	+ if (err)
	8761	+ return err;
7958	8762	err = ops->ndo_set_mac_address(dev, sa);
7959	8763	if (err)
7960	8764	return err;
..	..	@@ -7964,6 +8768,48 @@
7964	8768	return 0;
7965	8769	}
7966	8770	EXPORT_SYMBOL(dev_set_mac_address);
	8771	+
	8772	+static DECLARE_RWSEM(dev_addr_sem);
	8773	+
	8774	+int dev_set_mac_address_user(struct net_device dev, struct sockaddr sa,
	8775	+ struct netlink_ext_ack *extack)
	8776	+{
	8777	+ int ret;
	8778	+
	8779	+ down_write(&dev_addr_sem);
	8780	+ ret = dev_set_mac_address(dev, sa, extack);
	8781	+ up_write(&dev_addr_sem);
	8782	+ return ret;
	8783	+}
	8784	+EXPORT_SYMBOL(dev_set_mac_address_user);
	8785	+
	8786	+int dev_get_mac_address(struct sockaddr sa, struct net net, char *dev_name)
	8787	+{
	8788	+ size_t size = sizeof(sa->sa_data);
	8789	+ struct net_device *dev;
	8790	+ int ret = 0;
	8791	+
	8792	+ down_read(&dev_addr_sem);
	8793	+ rcu_read_lock();
	8794	+
	8795	+ dev = dev_get_by_name_rcu(net, dev_name);
	8796	+ if (!dev) {
	8797	+ ret = -ENODEV;
	8798	+ goto unlock;
	8799	+ }
	8800	+ if (!dev->addr_len)
	8801	+ memset(sa->sa_data, 0, size);
	8802	+ else
	8803	+ memcpy(sa->sa_data, dev->dev_addr,
	8804	+ min_t(size_t, size, dev->addr_len));
	8805	+ sa->sa_family = dev->type;
	8806	+
	8807	+unlock:
	8808	+ rcu_read_unlock();
	8809	+ up_read(&dev_addr_sem);
	8810	+ return ret;
	8811	+}
	8812	+EXPORT_SYMBOL(dev_get_mac_address);
7967	8813
7968	8814	/**
7969	8815	* dev_change_carrier - Change device carrier
..	..	@@ -8014,12 +8860,80 @@
8014	8860	char *name, size_t len)
8015	8861	{
8016	8862	const struct net_device_ops *ops = dev->netdev_ops;
	8863	+ int err;
8017	8864
8018		- if (!ops->ndo_get_phys_port_name)
8019		- return -EOPNOTSUPP;
8020		- return ops->ndo_get_phys_port_name(dev, name, len);
	8865	+ if (ops->ndo_get_phys_port_name) {
	8866	+ err = ops->ndo_get_phys_port_name(dev, name, len);
	8867	+ if (err != -EOPNOTSUPP)
	8868	+ return err;
	8869	+ }
	8870	+ return devlink_compat_phys_port_name_get(dev, name, len);
8021	8871	}
8022	8872	EXPORT_SYMBOL(dev_get_phys_port_name);
	8873	+
	8874	+/**
	8875	+ * dev_get_port_parent_id - Get the device's port parent identifier
	8876	+ * @dev: network device
	8877	+ * @ppid: pointer to a storage for the port's parent identifier
	8878	+ * @recurse: allow/disallow recursion to lower devices
	8879	+ *
	8880	+ * Get the devices's port parent identifier
	8881	+ */
	8882	+int dev_get_port_parent_id(struct net_device *dev,
	8883	+ struct netdev_phys_item_id *ppid,
	8884	+ bool recurse)
	8885	+{
	8886	+ const struct net_device_ops *ops = dev->netdev_ops;
	8887	+ struct netdev_phys_item_id first = { };
	8888	+ struct net_device *lower_dev;
	8889	+ struct list_head *iter;
	8890	+ int err;
	8891	+
	8892	+ if (ops->ndo_get_port_parent_id) {
	8893	+ err = ops->ndo_get_port_parent_id(dev, ppid);
	8894	+ if (err != -EOPNOTSUPP)
	8895	+ return err;
	8896	+ }
	8897	+
	8898	+ err = devlink_compat_switch_id_get(dev, ppid);
	8899	+ if (!err \|\| err != -EOPNOTSUPP)
	8900	+ return err;
	8901	+
	8902	+ if (!recurse)
	8903	+ return -EOPNOTSUPP;
	8904	+
	8905	+ netdev_for_each_lower_dev(dev, lower_dev, iter) {
	8906	+ err = dev_get_port_parent_id(lower_dev, ppid, recurse);
	8907	+ if (err)
	8908	+ break;
	8909	+ if (!first.id_len)
	8910	+ first = *ppid;
	8911	+ else if (memcmp(&first, ppid, sizeof(*ppid)))
	8912	+ return -EOPNOTSUPP;
	8913	+ }
	8914	+
	8915	+ return err;
	8916	+}
	8917	+EXPORT_SYMBOL(dev_get_port_parent_id);
	8918	+
	8919	+/**
	8920	+ * netdev_port_same_parent_id - Indicate if two network devices have
	8921	+ * the same port parent identifier
	8922	+ * @a: first network device
	8923	+ * @b: second network device
	8924	+ */
	8925	+bool netdev_port_same_parent_id(struct net_device a, struct net_device b)
	8926	+{
	8927	+ struct netdev_phys_item_id a_id = { };
	8928	+ struct netdev_phys_item_id b_id = { };
	8929	+
	8930	+ if (dev_get_port_parent_id(a, &a_id, true) \|\|
	8931	+ dev_get_port_parent_id(b, &b_id, true))
	8932	+ return false;
	8933	+
	8934	+ return netdev_phys_item_id_same(&a_id, &b_id);
	8935	+}
	8936	+EXPORT_SYMBOL(netdev_port_same_parent_id);
8023	8937
8024	8938	/**
8025	8939	* dev_change_proto_down - update protocol port state information
..	..	@@ -8041,67 +8955,495 @@
8041	8955	}
8042	8956	EXPORT_SYMBOL(dev_change_proto_down);
8043	8957
8044		-u32 __dev_xdp_query(struct net_device *dev, bpf_op_t bpf_op,
8045		- enum bpf_netdev_command cmd)
	8958	+/**
	8959	+ * dev_change_proto_down_generic - generic implementation for
	8960	+ * ndo_change_proto_down that sets carrier according to
	8961	+ * proto_down.
	8962	+ *
	8963	+ * @dev: device
	8964	+ * @proto_down: new value
	8965	+ */
	8966	+int dev_change_proto_down_generic(struct net_device *dev, bool proto_down)
8046	8967	{
8047		- struct netdev_bpf xdp;
	8968	+ if (proto_down)
	8969	+ netif_carrier_off(dev);
	8970	+ else
	8971	+ netif_carrier_on(dev);
	8972	+ dev->proto_down = proto_down;
	8973	+ return 0;
	8974	+}
	8975	+EXPORT_SYMBOL(dev_change_proto_down_generic);
8048	8976
8049		- if (!bpf_op)
8050		- return 0;
	8977	+/**
	8978	+ * dev_change_proto_down_reason - proto down reason
	8979	+ *
	8980	+ * @dev: device
	8981	+ * @mask: proto down mask
	8982	+ * @value: proto down value
	8983	+ */
	8984	+void dev_change_proto_down_reason(struct net_device *dev, unsigned long mask,
	8985	+ u32 value)
	8986	+{
	8987	+ int b;
8051	8988
8052		- memset(&xdp, 0, sizeof(xdp));
8053		- xdp.command = cmd;
	8989	+ if (!mask) {
	8990	+ dev->proto_down_reason = value;
	8991	+ } else {
	8992	+ for_each_set_bit(b, &mask, 32) {
	8993	+ if (value & (1 << b))
	8994	+ dev->proto_down_reason \|= BIT(b);
	8995	+ else
	8996	+ dev->proto_down_reason &= ~BIT(b);
	8997	+ }
	8998	+ }
	8999	+}
	9000	+EXPORT_SYMBOL(dev_change_proto_down_reason);
8054	9001
8055		- /* Query must always succeed. */
8056		- WARN_ON(bpf_op(dev, &xdp) < 0 && cmd == XDP_QUERY_PROG);
	9002	+struct bpf_xdp_link {
	9003	+ struct bpf_link link;
	9004	+ struct net_device dev; / protected by rtnl_lock, no refcnt held */
	9005	+ int flags;
	9006	+};
8057	9007
8058		- return xdp.prog_id;
	9008	+static enum bpf_xdp_mode dev_xdp_mode(struct net_device *dev, u32 flags)
	9009	+{
	9010	+ if (flags & XDP_FLAGS_HW_MODE)
	9011	+ return XDP_MODE_HW;
	9012	+ if (flags & XDP_FLAGS_DRV_MODE)
	9013	+ return XDP_MODE_DRV;
	9014	+ if (flags & XDP_FLAGS_SKB_MODE)
	9015	+ return XDP_MODE_SKB;
	9016	+ return dev->netdev_ops->ndo_bpf ? XDP_MODE_DRV : XDP_MODE_SKB;
8059	9017	}
8060	9018
8061		-static int dev_xdp_install(struct net_device *dev, bpf_op_t bpf_op,
8062		- struct netlink_ext_ack *extack, u32 flags,
8063		- struct bpf_prog *prog)
	9019	+static bpf_op_t dev_xdp_bpf_op(struct net_device *dev, enum bpf_xdp_mode mode)
	9020	+{
	9021	+ switch (mode) {
	9022	+ case XDP_MODE_SKB:
	9023	+ return generic_xdp_install;
	9024	+ case XDP_MODE_DRV:
	9025	+ case XDP_MODE_HW:
	9026	+ return dev->netdev_ops->ndo_bpf;
	9027	+ default:
	9028	+ return NULL;
	9029	+ };
	9030	+}
	9031	+
	9032	+static struct bpf_xdp_link dev_xdp_link(struct net_device dev,
	9033	+ enum bpf_xdp_mode mode)
	9034	+{
	9035	+ return dev->xdp_state[mode].link;
	9036	+}
	9037	+
	9038	+static struct bpf_prog dev_xdp_prog(struct net_device dev,
	9039	+ enum bpf_xdp_mode mode)
	9040	+{
	9041	+ struct bpf_xdp_link *link = dev_xdp_link(dev, mode);
	9042	+
	9043	+ if (link)
	9044	+ return link->link.prog;
	9045	+ return dev->xdp_state[mode].prog;
	9046	+}
	9047	+
	9048	+static u8 dev_xdp_prog_count(struct net_device *dev)
	9049	+{
	9050	+ u8 count = 0;
	9051	+ int i;
	9052	+
	9053	+ for (i = 0; i < __MAX_XDP_MODE; i++)
	9054	+ if (dev->xdp_state[i].prog \|\| dev->xdp_state[i].link)
	9055	+ count++;
	9056	+ return count;
	9057	+}
	9058	+
	9059	+u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode)
	9060	+{
	9061	+ struct bpf_prog *prog = dev_xdp_prog(dev, mode);
	9062	+
	9063	+ return prog ? prog->aux->id : 0;
	9064	+}
	9065	+
	9066	+static void dev_xdp_set_link(struct net_device *dev, enum bpf_xdp_mode mode,
	9067	+ struct bpf_xdp_link *link)
	9068	+{
	9069	+ dev->xdp_state[mode].link = link;
	9070	+ dev->xdp_state[mode].prog = NULL;
	9071	+}
	9072	+
	9073	+static void dev_xdp_set_prog(struct net_device *dev, enum bpf_xdp_mode mode,
	9074	+ struct bpf_prog *prog)
	9075	+{
	9076	+ dev->xdp_state[mode].link = NULL;
	9077	+ dev->xdp_state[mode].prog = prog;
	9078	+}
	9079	+
	9080	+static int dev_xdp_install(struct net_device *dev, enum bpf_xdp_mode mode,
	9081	+ bpf_op_t bpf_op, struct netlink_ext_ack *extack,
	9082	+ u32 flags, struct bpf_prog *prog)
8064	9083	{
8065	9084	struct netdev_bpf xdp;
	9085	+ int err;
8066	9086
8067	9087	memset(&xdp, 0, sizeof(xdp));
8068		- if (flags & XDP_FLAGS_HW_MODE)
8069		- xdp.command = XDP_SETUP_PROG_HW;
8070		- else
8071		- xdp.command = XDP_SETUP_PROG;
	9088	+ xdp.command = mode == XDP_MODE_HW ? XDP_SETUP_PROG_HW : XDP_SETUP_PROG;
8072	9089	xdp.extack = extack;
8073	9090	xdp.flags = flags;
8074	9091	xdp.prog = prog;
8075	9092
8076		- return bpf_op(dev, &xdp);
	9093	+ /* Drivers assume refcnt is already incremented (i.e, prog pointer is
	9094	+ * "moved" into driver), so they don't increment it on their own, but
	9095	+ * they do decrement refcnt when program is detached or replaced.
	9096	+ * Given net_device also owns link/prog, we need to bump refcnt here
	9097	+ * to prevent drivers from underflowing it.
	9098	+ */
	9099	+ if (prog)
	9100	+ bpf_prog_inc(prog);
	9101	+ err = bpf_op(dev, &xdp);
	9102	+ if (err) {
	9103	+ if (prog)
	9104	+ bpf_prog_put(prog);
	9105	+ return err;
	9106	+ }
	9107	+
	9108	+ if (mode != XDP_MODE_HW)
	9109	+ bpf_prog_change_xdp(dev_xdp_prog(dev, mode), prog);
	9110	+
	9111	+ return 0;
8077	9112	}
8078	9113
8079	9114	static void dev_xdp_uninstall(struct net_device *dev)
8080	9115	{
8081		- struct netdev_bpf xdp;
8082		- bpf_op_t ndo_bpf;
	9116	+ struct bpf_xdp_link *link;
	9117	+ struct bpf_prog *prog;
	9118	+ enum bpf_xdp_mode mode;
	9119	+ bpf_op_t bpf_op;
8083	9120
8084		- /* Remove generic XDP */
8085		- WARN_ON(dev_xdp_install(dev, generic_xdp_install, NULL, 0, NULL));
	9121	+ ASSERT_RTNL();
8086	9122
8087		- /* Remove from the driver */
8088		- ndo_bpf = dev->netdev_ops->ndo_bpf;
8089		- if (!ndo_bpf)
8090		- return;
	9123	+ for (mode = XDP_MODE_SKB; mode < __MAX_XDP_MODE; mode++) {
	9124	+ prog = dev_xdp_prog(dev, mode);
	9125	+ if (!prog)
	9126	+ continue;
8091	9127
8092		- memset(&xdp, 0, sizeof(xdp));
8093		- xdp.command = XDP_QUERY_PROG;
8094		- WARN_ON(ndo_bpf(dev, &xdp));
8095		- if (xdp.prog_id)
8096		- WARN_ON(dev_xdp_install(dev, ndo_bpf, NULL, xdp.prog_flags,
8097		- NULL));
	9128	+ bpf_op = dev_xdp_bpf_op(dev, mode);
	9129	+ if (!bpf_op)
	9130	+ continue;
8098	9131
8099		- /* Remove HW offload */
8100		- memset(&xdp, 0, sizeof(xdp));
8101		- xdp.command = XDP_QUERY_PROG_HW;
8102		- if (!ndo_bpf(dev, &xdp) && xdp.prog_id)
8103		- WARN_ON(dev_xdp_install(dev, ndo_bpf, NULL, xdp.prog_flags,
8104		- NULL));
	9132	+ WARN_ON(dev_xdp_install(dev, mode, bpf_op, NULL, 0, NULL));
	9133	+
	9134	+ /* auto-detach link from net device */
	9135	+ link = dev_xdp_link(dev, mode);
	9136	+ if (link)
	9137	+ link->dev = NULL;
	9138	+ else
	9139	+ bpf_prog_put(prog);
	9140	+
	9141	+ dev_xdp_set_link(dev, mode, NULL);
	9142	+ }
	9143	+}
	9144	+
	9145	+static int dev_xdp_attach(struct net_device dev, struct netlink_ext_ack extack,
	9146	+ struct bpf_xdp_link link, struct bpf_prog new_prog,
	9147	+ struct bpf_prog *old_prog, u32 flags)
	9148	+{
	9149	+ unsigned int num_modes = hweight32(flags & XDP_FLAGS_MODES);
	9150	+ struct bpf_prog *cur_prog;
	9151	+ enum bpf_xdp_mode mode;
	9152	+ bpf_op_t bpf_op;
	9153	+ int err;
	9154	+
	9155	+ ASSERT_RTNL();
	9156	+
	9157	+ /* either link or prog attachment, never both */
	9158	+ if (link && (new_prog \|\| old_prog))
	9159	+ return -EINVAL;
	9160	+ /* link supports only XDP mode flags */
	9161	+ if (link && (flags & ~XDP_FLAGS_MODES)) {
	9162	+ NL_SET_ERR_MSG(extack, "Invalid XDP flags for BPF link attachment");
	9163	+ return -EINVAL;
	9164	+ }
	9165	+ /* just one XDP mode bit should be set, zero defaults to drv/skb mode */
	9166	+ if (num_modes > 1) {
	9167	+ NL_SET_ERR_MSG(extack, "Only one XDP mode flag can be set");
	9168	+ return -EINVAL;
	9169	+ }
	9170	+ /* avoid ambiguity if offload + drv/skb mode progs are both loaded */
	9171	+ if (!num_modes && dev_xdp_prog_count(dev) > 1) {
	9172	+ NL_SET_ERR_MSG(extack,
	9173	+ "More than one program loaded, unset mode is ambiguous");
	9174	+ return -EINVAL;
	9175	+ }
	9176	+ /* old_prog != NULL implies XDP_FLAGS_REPLACE is set */
	9177	+ if (old_prog && !(flags & XDP_FLAGS_REPLACE)) {
	9178	+ NL_SET_ERR_MSG(extack, "XDP_FLAGS_REPLACE is not specified");
	9179	+ return -EINVAL;
	9180	+ }
	9181	+
	9182	+ mode = dev_xdp_mode(dev, flags);
	9183	+ /* can't replace attached link */
	9184	+ if (dev_xdp_link(dev, mode)) {
	9185	+ NL_SET_ERR_MSG(extack, "Can't replace active BPF XDP link");
	9186	+ return -EBUSY;
	9187	+ }
	9188	+
	9189	+ cur_prog = dev_xdp_prog(dev, mode);
	9190	+ /* can't replace attached prog with link */
	9191	+ if (link && cur_prog) {
	9192	+ NL_SET_ERR_MSG(extack, "Can't replace active XDP program with BPF link");
	9193	+ return -EBUSY;
	9194	+ }
	9195	+ if ((flags & XDP_FLAGS_REPLACE) && cur_prog != old_prog) {
	9196	+ NL_SET_ERR_MSG(extack, "Active program does not match expected");
	9197	+ return -EEXIST;
	9198	+ }
	9199	+
	9200	+ /* put effective new program into new_prog */
	9201	+ if (link)
	9202	+ new_prog = link->link.prog;
	9203	+
	9204	+ if (new_prog) {
	9205	+ bool offload = mode == XDP_MODE_HW;
	9206	+ enum bpf_xdp_mode other_mode = mode == XDP_MODE_SKB
	9207	+ ? XDP_MODE_DRV : XDP_MODE_SKB;
	9208	+
	9209	+ if ((flags & XDP_FLAGS_UPDATE_IF_NOEXIST) && cur_prog) {
	9210	+ NL_SET_ERR_MSG(extack, "XDP program already attached");
	9211	+ return -EBUSY;
	9212	+ }
	9213	+ if (!offload && dev_xdp_prog(dev, other_mode)) {
	9214	+ NL_SET_ERR_MSG(extack, "Native and generic XDP can't be active at the same time");
	9215	+ return -EEXIST;
	9216	+ }
	9217	+ if (!offload && bpf_prog_is_dev_bound(new_prog->aux)) {
	9218	+ NL_SET_ERR_MSG(extack, "Using device-bound program without HW_MODE flag is not supported");
	9219	+ return -EINVAL;
	9220	+ }
	9221	+ if (new_prog->expected_attach_type == BPF_XDP_DEVMAP) {
	9222	+ NL_SET_ERR_MSG(extack, "BPF_XDP_DEVMAP programs can not be attached to a device");
	9223	+ return -EINVAL;
	9224	+ }
	9225	+ if (new_prog->expected_attach_type == BPF_XDP_CPUMAP) {
	9226	+ NL_SET_ERR_MSG(extack, "BPF_XDP_CPUMAP programs can not be attached to a device");
	9227	+ return -EINVAL;
	9228	+ }
	9229	+ }
	9230	+
	9231	+ /* don't call drivers if the effective program didn't change */
	9232	+ if (new_prog != cur_prog) {
	9233	+ bpf_op = dev_xdp_bpf_op(dev, mode);
	9234	+ if (!bpf_op) {
	9235	+ NL_SET_ERR_MSG(extack, "Underlying driver does not support XDP in native mode");
	9236	+ return -EOPNOTSUPP;
	9237	+ }
	9238	+
	9239	+ err = dev_xdp_install(dev, mode, bpf_op, extack, flags, new_prog);
	9240	+ if (err)
	9241	+ return err;
	9242	+ }
	9243	+
	9244	+ if (link)
	9245	+ dev_xdp_set_link(dev, mode, link);
	9246	+ else
	9247	+ dev_xdp_set_prog(dev, mode, new_prog);
	9248	+ if (cur_prog)
	9249	+ bpf_prog_put(cur_prog);
	9250	+
	9251	+ return 0;
	9252	+}
	9253	+
	9254	+static int dev_xdp_attach_link(struct net_device *dev,
	9255	+ struct netlink_ext_ack *extack,
	9256	+ struct bpf_xdp_link *link)
	9257	+{
	9258	+ return dev_xdp_attach(dev, extack, link, NULL, NULL, link->flags);
	9259	+}
	9260	+
	9261	+static int dev_xdp_detach_link(struct net_device *dev,
	9262	+ struct netlink_ext_ack *extack,
	9263	+ struct bpf_xdp_link *link)
	9264	+{
	9265	+ enum bpf_xdp_mode mode;
	9266	+ bpf_op_t bpf_op;
	9267	+
	9268	+ ASSERT_RTNL();
	9269	+
	9270	+ mode = dev_xdp_mode(dev, link->flags);
	9271	+ if (dev_xdp_link(dev, mode) != link)
	9272	+ return -EINVAL;
	9273	+
	9274	+ bpf_op = dev_xdp_bpf_op(dev, mode);
	9275	+ WARN_ON(dev_xdp_install(dev, mode, bpf_op, NULL, 0, NULL));
	9276	+ dev_xdp_set_link(dev, mode, NULL);
	9277	+ return 0;
	9278	+}
	9279	+
	9280	+static void bpf_xdp_link_release(struct bpf_link *link)
	9281	+{
	9282	+ struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);
	9283	+
	9284	+ rtnl_lock();
	9285	+
	9286	+ /* if racing with net_device's tear down, xdp_link->dev might be
	9287	+ * already NULL, in which case link was already auto-detached
	9288	+ */
	9289	+ if (xdp_link->dev) {
	9290	+ WARN_ON(dev_xdp_detach_link(xdp_link->dev, NULL, xdp_link));
	9291	+ xdp_link->dev = NULL;
	9292	+ }
	9293	+
	9294	+ rtnl_unlock();
	9295	+}
	9296	+
	9297	+static int bpf_xdp_link_detach(struct bpf_link *link)
	9298	+{
	9299	+ bpf_xdp_link_release(link);
	9300	+ return 0;
	9301	+}
	9302	+
	9303	+static void bpf_xdp_link_dealloc(struct bpf_link *link)
	9304	+{
	9305	+ struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);
	9306	+
	9307	+ kfree(xdp_link);
	9308	+}
	9309	+
	9310	+static void bpf_xdp_link_show_fdinfo(const struct bpf_link *link,
	9311	+ struct seq_file *seq)
	9312	+{
	9313	+ struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);
	9314	+ u32 ifindex = 0;
	9315	+
	9316	+ rtnl_lock();
	9317	+ if (xdp_link->dev)
	9318	+ ifindex = xdp_link->dev->ifindex;
	9319	+ rtnl_unlock();
	9320	+
	9321	+ seq_printf(seq, "ifindex:\t%u\n", ifindex);
	9322	+}
	9323	+
	9324	+static int bpf_xdp_link_fill_link_info(const struct bpf_link *link,
	9325	+ struct bpf_link_info *info)
	9326	+{
	9327	+ struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);
	9328	+ u32 ifindex = 0;
	9329	+
	9330	+ rtnl_lock();
	9331	+ if (xdp_link->dev)
	9332	+ ifindex = xdp_link->dev->ifindex;
	9333	+ rtnl_unlock();
	9334	+
	9335	+ info->xdp.ifindex = ifindex;
	9336	+ return 0;
	9337	+}
	9338	+
	9339	+static int bpf_xdp_link_update(struct bpf_link link, struct bpf_prog new_prog,
	9340	+ struct bpf_prog *old_prog)
	9341	+{
	9342	+ struct bpf_xdp_link *xdp_link = container_of(link, struct bpf_xdp_link, link);
	9343	+ enum bpf_xdp_mode mode;
	9344	+ bpf_op_t bpf_op;
	9345	+ int err = 0;
	9346	+
	9347	+ rtnl_lock();
	9348	+
	9349	+ /* link might have been auto-released already, so fail */
	9350	+ if (!xdp_link->dev) {
	9351	+ err = -ENOLINK;
	9352	+ goto out_unlock;
	9353	+ }
	9354	+
	9355	+ if (old_prog && link->prog != old_prog) {
	9356	+ err = -EPERM;
	9357	+ goto out_unlock;
	9358	+ }
	9359	+ old_prog = link->prog;
	9360	+ if (old_prog->type != new_prog->type \|\|
	9361	+ old_prog->expected_attach_type != new_prog->expected_attach_type) {
	9362	+ err = -EINVAL;
	9363	+ goto out_unlock;
	9364	+ }
	9365	+
	9366	+ if (old_prog == new_prog) {
	9367	+ /* no-op, don't disturb drivers */
	9368	+ bpf_prog_put(new_prog);
	9369	+ goto out_unlock;
	9370	+ }
	9371	+
	9372	+ mode = dev_xdp_mode(xdp_link->dev, xdp_link->flags);
	9373	+ bpf_op = dev_xdp_bpf_op(xdp_link->dev, mode);
	9374	+ err = dev_xdp_install(xdp_link->dev, mode, bpf_op, NULL,
	9375	+ xdp_link->flags, new_prog);
	9376	+ if (err)
	9377	+ goto out_unlock;
	9378	+
	9379	+ old_prog = xchg(&link->prog, new_prog);
	9380	+ bpf_prog_put(old_prog);
	9381	+
	9382	+out_unlock:
	9383	+ rtnl_unlock();
	9384	+ return err;
	9385	+}
	9386	+
	9387	+static const struct bpf_link_ops bpf_xdp_link_lops = {
	9388	+ .release = bpf_xdp_link_release,
	9389	+ .dealloc = bpf_xdp_link_dealloc,
	9390	+ .detach = bpf_xdp_link_detach,
	9391	+ .show_fdinfo = bpf_xdp_link_show_fdinfo,
	9392	+ .fill_link_info = bpf_xdp_link_fill_link_info,
	9393	+ .update_prog = bpf_xdp_link_update,
	9394	+};
	9395	+
	9396	+int bpf_xdp_link_attach(const union bpf_attr attr, struct bpf_prog prog)
	9397	+{
	9398	+ struct net *net = current->nsproxy->net_ns;
	9399	+ struct bpf_link_primer link_primer;
	9400	+ struct bpf_xdp_link *link;
	9401	+ struct net_device *dev;
	9402	+ int err, fd;
	9403	+
	9404	+ rtnl_lock();
	9405	+ dev = dev_get_by_index(net, attr->link_create.target_ifindex);
	9406	+ if (!dev) {
	9407	+ rtnl_unlock();
	9408	+ return -EINVAL;
	9409	+ }
	9410	+
	9411	+ link = kzalloc(sizeof(*link), GFP_USER);
	9412	+ if (!link) {
	9413	+ err = -ENOMEM;
	9414	+ goto unlock;
	9415	+ }
	9416	+
	9417	+ bpf_link_init(&link->link, BPF_LINK_TYPE_XDP, &bpf_xdp_link_lops, prog);
	9418	+ link->dev = dev;
	9419	+ link->flags = attr->link_create.flags;
	9420	+
	9421	+ err = bpf_link_prime(&link->link, &link_primer);
	9422	+ if (err) {
	9423	+ kfree(link);
	9424	+ goto unlock;
	9425	+ }
	9426	+
	9427	+ err = dev_xdp_attach_link(dev, NULL, link);
	9428	+ rtnl_unlock();
	9429	+
	9430	+ if (err) {
	9431	+ link->dev = NULL;
	9432	+ bpf_link_cleanup(&link_primer);
	9433	+ goto out_put_dev;
	9434	+ }
	9435	+
	9436	+ fd = bpf_link_settle(&link_primer);
	9437	+ /* link itself doesn't hold dev's refcnt to not complicate shutdown */
	9438	+ dev_put(dev);
	9439	+ return fd;
	9440	+
	9441	+unlock:
	9442	+ rtnl_unlock();
	9443	+
	9444	+out_put_dev:
	9445	+ dev_put(dev);
	9446	+ return err;
8105	9447	}
8106	9448
8107	9449	/**
..	..	@@ -8109,56 +9451,44 @@
8109	9451	* @dev: device
8110	9452	* @extack: netlink extended ack
8111	9453	* @fd: new program fd or negative value to clear
	9454	+ * @expected_fd: old program fd that userspace expects to replace or clear
8112	9455	* @flags: xdp-related flags
8113	9456	*
8114	9457	* Set or clear a bpf program for a device
8115	9458	*/
8116	9459	int dev_change_xdp_fd(struct net_device dev, struct netlink_ext_ack extack,
8117		- int fd, u32 flags)
	9460	+ int fd, int expected_fd, u32 flags)
8118	9461	{
8119		- const struct net_device_ops *ops = dev->netdev_ops;
8120		- enum bpf_netdev_command query;
8121		- struct bpf_prog *prog = NULL;
8122		- bpf_op_t bpf_op, bpf_chk;
	9462	+ enum bpf_xdp_mode mode = dev_xdp_mode(dev, flags);
	9463	+ struct bpf_prog new_prog = NULL, old_prog = NULL;
8123	9464	int err;
8124	9465
8125	9466	ASSERT_RTNL();
8126	9467
8127		- query = flags & XDP_FLAGS_HW_MODE ? XDP_QUERY_PROG_HW : XDP_QUERY_PROG;
8128		-
8129		- bpf_op = bpf_chk = ops->ndo_bpf;
8130		- if (!bpf_op && (flags & (XDP_FLAGS_DRV_MODE \| XDP_FLAGS_HW_MODE)))
8131		- return -EOPNOTSUPP;
8132		- if (!bpf_op \|\| (flags & XDP_FLAGS_SKB_MODE))
8133		- bpf_op = generic_xdp_install;
8134		- if (bpf_op == bpf_chk)
8135		- bpf_chk = generic_xdp_install;
8136		-
8137	9468	if (fd >= 0) {
8138		- if (__dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG) \|\|
8139		- __dev_xdp_query(dev, bpf_chk, XDP_QUERY_PROG_HW))
8140		- return -EEXIST;
8141		- if ((flags & XDP_FLAGS_UPDATE_IF_NOEXIST) &&
8142		- __dev_xdp_query(dev, bpf_op, query))
8143		- return -EBUSY;
	9469	+ new_prog = bpf_prog_get_type_dev(fd, BPF_PROG_TYPE_XDP,
	9470	+ mode != XDP_MODE_SKB);
	9471	+ if (IS_ERR(new_prog))
	9472	+ return PTR_ERR(new_prog);
	9473	+ }
8144	9474
8145		- prog = bpf_prog_get_type_dev(fd, BPF_PROG_TYPE_XDP,
8146		- bpf_op == ops->ndo_bpf);
8147		- if (IS_ERR(prog))
8148		- return PTR_ERR(prog);
8149		-
8150		- if (!(flags & XDP_FLAGS_HW_MODE) &&
8151		- bpf_prog_is_dev_bound(prog->aux)) {
8152		- NL_SET_ERR_MSG(extack, "using device-bound program without HW_MODE flag is not supported");
8153		- bpf_prog_put(prog);
8154		- return -EINVAL;
	9475	+ if (expected_fd >= 0) {
	9476	+ old_prog = bpf_prog_get_type_dev(expected_fd, BPF_PROG_TYPE_XDP,
	9477	+ mode != XDP_MODE_SKB);
	9478	+ if (IS_ERR(old_prog)) {
	9479	+ err = PTR_ERR(old_prog);
	9480	+ old_prog = NULL;
	9481	+ goto err_out;
8155	9482	}
8156	9483	}
8157	9484
8158		- err = dev_xdp_install(dev, bpf_op, extack, flags, prog);
8159		- if (err < 0 && prog)
8160		- bpf_prog_put(prog);
	9485	+ err = dev_xdp_attach(dev, extack, NULL, new_prog, old_prog, flags);
8161	9486
	9487	+err_out:
	9488	+ if (err && new_prog)
	9489	+ bpf_prog_put(new_prog);
	9490	+ if (old_prog)
	9491	+ bpf_prog_put(old_prog);
8162	9492	return err;
8163	9493	}
8164	9494
..	..	@@ -8190,103 +9520,6 @@
8190	9520	{
8191	9521	list_add_tail(&dev->todo_list, &net_todo_list);
8192	9522	dev_net(dev)->dev_unreg_count++;
8193		-}
8194		-
8195		-static void rollback_registered_many(struct list_head *head)
8196		-{
8197		- struct net_device dev, tmp;
8198		- LIST_HEAD(close_head);
8199		-
8200		- BUG_ON(dev_boot_phase);
8201		- ASSERT_RTNL();
8202		-
8203		- list_for_each_entry_safe(dev, tmp, head, unreg_list) {
8204		- /* Some devices call without registering
8205		- * for initialization unwind. Remove those
8206		- * devices and proceed with the remaining.
8207		- */
8208		- if (dev->reg_state == NETREG_UNINITIALIZED) {
8209		- pr_debug("unregister_netdevice: device %s/%p never was registered\n",
8210		- dev->name, dev);
8211		-
8212		- WARN_ON(1);
8213		- list_del(&dev->unreg_list);
8214		- continue;
8215		- }
8216		- dev->dismantle = true;
8217		- BUG_ON(dev->reg_state != NETREG_REGISTERED);
8218		- }
8219		-
8220		- /* If device is running, close it first. */
8221		- list_for_each_entry(dev, head, unreg_list)
8222		- list_add_tail(&dev->close_list, &close_head);
8223		- dev_close_many(&close_head, true);
8224		-
8225		- list_for_each_entry(dev, head, unreg_list) {
8226		- /* And unlink it from device chain. */
8227		- unlist_netdevice(dev);
8228		-
8229		- dev->reg_state = NETREG_UNREGISTERING;
8230		- }
8231		- flush_all_backlogs();
8232		-
8233		- synchronize_net();
8234		-
8235		- list_for_each_entry(dev, head, unreg_list) {
8236		- struct sk_buff *skb = NULL;
8237		-
8238		- /* Shutdown queueing discipline. */
8239		- dev_shutdown(dev);
8240		-
8241		- dev_xdp_uninstall(dev);
8242		-
8243		- /* Notify protocols, that we are about to destroy
8244		- * this device. They should clean all the things.
8245		- */
8246		- call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
8247		-
8248		- if (!dev->rtnl_link_ops \|\|
8249		- dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
8250		- skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U, 0,
8251		- GFP_KERNEL, NULL, 0);
8252		-
8253		- /*
8254		- * Flush the unicast and multicast chains
8255		- */
8256		- dev_uc_flush(dev);
8257		- dev_mc_flush(dev);
8258		-
8259		- if (dev->netdev_ops->ndo_uninit)
8260		- dev->netdev_ops->ndo_uninit(dev);
8261		-
8262		- if (skb)
8263		- rtmsg_ifinfo_send(skb, dev, GFP_KERNEL);
8264		-
8265		- /* Notifier chain MUST detach us all upper devices. */
8266		- WARN_ON(netdev_has_any_upper_dev(dev));
8267		- WARN_ON(netdev_has_any_lower_dev(dev));
8268		-
8269		- /* Remove entries from kobject tree */
8270		- netdev_unregister_kobject(dev);
8271		-#ifdef CONFIG_XPS
8272		- /* Remove XPS queueing entries */
8273		- netif_reset_xps_queues_gt(dev, 0);
8274		-#endif
8275		- }
8276		-
8277		- synchronize_net();
8278		-
8279		- list_for_each_entry(dev, head, unreg_list)
8280		- dev_put(dev);
8281		-}
8282		-
8283		-static void rollback_registered(struct net_device *dev)
8284		-{
8285		- LIST_HEAD(single);
8286		-
8287		- list_add(&dev->unreg_list, &single);
8288		- rollback_registered_many(&single);
8289		- list_del(&single);
8290	9523	}
8291	9524
8292	9525	static netdev_features_t netdev_sync_upper_features(struct net_device *lower,
..	..	@@ -8434,7 +9667,7 @@
8434	9667	/* driver might be less strict about feature dependencies */
8435	9668	features = netdev_fix_features(dev, features);
8436	9669
8437		- /* some features can't be enabled if they're off an an upper device */
	9670	+ /* some features can't be enabled if they're off on an upper device */
8438	9671	netdev_for_each_upper_dev_rcu(dev, upper, iter)
8439	9672	features = netdev_sync_upper_features(dev, upper, features);
8440	9673
..	..	@@ -8558,6 +9791,11 @@
8558	9791	else
8559	9792	netif_dormant_off(dev);
8560	9793
	9794	+ if (rootdev->operstate == IF_OPER_TESTING)
	9795	+ netif_testing_on(dev);
	9796	+ else
	9797	+ netif_testing_off(dev);
	9798	+
8561	9799	if (netif_carrier_ok(rootdev))
8562	9800	netif_carrier_on(dev);
8563	9801	else
..	..	@@ -8619,7 +9857,7 @@
8619	9857	/* Initialize queue lock */
8620	9858	spin_lock_init(&queue->_xmit_lock);
8621	9859	netdev_set_xmit_lockdep_class(&queue->_xmit_lock, dev->type);
8622		- netdev_queue_clear_owner(queue);
	9860	+ queue->xmit_lock_owner = -1;
8623	9861	netdev_queue_numa_node_write(queue, NUMA_NO_NODE);
8624	9862	queue->dev = dev;
8625	9863	#ifdef CONFIG_BQL
..	..	@@ -8698,11 +9936,20 @@
8698	9936	BUG_ON(dev->reg_state != NETREG_UNINITIALIZED);
8699	9937	BUG_ON(!net);
8700	9938
	9939	+ ret = ethtool_check_ops(dev->ethtool_ops);
	9940	+ if (ret)
	9941	+ return ret;
	9942	+
8701	9943	spin_lock_init(&dev->addr_list_lock);
8702	9944	netdev_set_addr_lockdep_class(dev);
8703	9945
8704	9946	ret = dev_get_valid_name(net, dev, dev->name);
8705	9947	if (ret < 0)
	9948	+ goto out;
	9949	+
	9950	+ ret = -ENOMEM;
	9951	+ dev->name_node = netdev_name_node_head_alloc(dev);
	9952	+ if (!dev->name_node)
8706	9953	goto out;
8707	9954
8708	9955	/* Init, if this function is available */
..	..	@@ -8711,7 +9958,7 @@
8711	9958	if (ret) {
8712	9959	if (ret > 0)
8713	9960	ret = -EIO;
8714		- goto out;
	9961	+ goto err_free_name;
8715	9962	}
8716	9963	}
8717	9964
..	..	@@ -8733,7 +9980,7 @@
8733	9980	/* Transfer changeable features to wanted_features and enable
8734	9981	* software offloads (GSO and GRO).
8735	9982	*/
8736		- dev->hw_features \|= NETIF_F_SOFT_FEATURES;
	9983	+ dev->hw_features \|= (NETIF_F_SOFT_FEATURES \| NETIF_F_SOFT_FEATURES_OFF);
8737	9984	dev->features \|= NETIF_F_SOFT_FEATURES;
8738	9985
8739	9986	if (dev->netdev_ops->ndo_udp_tunnel_add) {
..	..	@@ -8811,17 +10058,10 @@
8811	10058	ret = call_netdevice_notifiers(NETDEV_REGISTER, dev);
8812	10059	ret = notifier_to_errno(ret);
8813	10060	if (ret) {
8814		- rollback_registered(dev);
8815		- rcu_barrier();
8816		-
8817		- dev->reg_state = NETREG_UNREGISTERED;
8818		- /* We should put the kobject that hold in
8819		- * netdev_unregister_kobject(), otherwise
8820		- * the net device cannot be freed when
8821		- * driver calls free_netdev(), because the
8822		- * kobject is being hold.
8823		- */
8824		- kobject_put(&dev->dev.kobj);
	10061	+ /* Expect explicit free_netdev() on failure */
	10062	+ dev->needs_free_netdev = false;
	10063	+ unregister_netdevice_queue(dev, NULL);
	10064	+ goto out;
8825	10065	}
8826	10066	/*
8827	10067	* Prevent userspace races by waiting until the network
..	..	@@ -8839,6 +10079,8 @@
8839	10079	dev->netdev_ops->ndo_uninit(dev);
8840	10080	if (dev->priv_destructor)
8841	10081	dev->priv_destructor(dev);
	10082	+err_free_name:
	10083	+ netdev_name_node_free(dev->name_node);
8842	10084	goto out;
8843	10085	}
8844	10086	EXPORT_SYMBOL(register_netdevice);
..	..	@@ -8922,6 +10164,8 @@
8922	10164	}
8923	10165	EXPORT_SYMBOL(netdev_refcnt_read);
8924	10166
	10167	+#define WAIT_REFS_MIN_MSECS 1
	10168	+#define WAIT_REFS_MAX_MSECS 250
8925	10169	/**
8926	10170	* netdev_wait_allrefs - wait until all references are gone.
8927	10171	* @dev: target net_device
..	..	@@ -8937,7 +10181,7 @@
8937	10181	static void netdev_wait_allrefs(struct net_device *dev)
8938	10182	{
8939	10183	unsigned long rebroadcast_time, warning_time;
8940		- int refcnt;
	10184	+ int wait = 0, refcnt;
8941	10185
8942	10186	linkwatch_forget_dev(dev);
8943	10187
..	..	@@ -8971,7 +10215,13 @@
8971	10215	rebroadcast_time = jiffies;
8972	10216	}
8973	10217
8974		- msleep(250);
	10218	+ if (!wait) {
	10219	+ rcu_barrier();
	10220	+ wait = WAIT_REFS_MIN_MSECS;
	10221	+ } else {
	10222	+ msleep(wait);
	10223	+ wait = min(wait << 1, WAIT_REFS_MAX_MSECS);
	10224	+ }
8975	10225
8976	10226	refcnt = netdev_refcnt_read(dev);
8977	10227
..	..	@@ -9010,6 +10260,19 @@
9010	10260	void netdev_run_todo(void)
9011	10261	{
9012	10262	struct list_head list;
	10263	+#ifdef CONFIG_LOCKDEP
	10264	+ struct list_head unlink_list;
	10265	+
	10266	+ list_replace_init(&net_unlink_list, &unlink_list);
	10267	+
	10268	+ while (!list_empty(&unlink_list)) {
	10269	+ struct net_device *dev = list_first_entry(&unlink_list,
	10270	+ struct net_device,
	10271	+ unlink_list);
	10272	+ list_del_init(&dev->unlink_list);
	10273	+ dev->nested_level = dev->lower_level - 1;
	10274	+ }
	10275	+#endif
9013	10276
9014	10277	/* Snapshot list, allow later requests */
9015	10278	list_replace_init(&net_todo_list, &list);
..	..	@@ -9121,6 +10384,40 @@
9121	10384	}
9122	10385	EXPORT_SYMBOL(dev_get_stats);
9123	10386
	10387	+/**
	10388	+ * dev_fetch_sw_netstats - get per-cpu network device statistics
	10389	+ * @s: place to store stats
	10390	+ * @netstats: per-cpu network stats to read from
	10391	+ *
	10392	+ * Read per-cpu network statistics and populate the related fields in @s.
	10393	+ */
	10394	+void dev_fetch_sw_netstats(struct rtnl_link_stats64 *s,
	10395	+ const struct pcpu_sw_netstats __percpu *netstats)
	10396	+{
	10397	+ int cpu;
	10398	+
	10399	+ for_each_possible_cpu(cpu) {
	10400	+ const struct pcpu_sw_netstats *stats;
	10401	+ struct pcpu_sw_netstats tmp;
	10402	+ unsigned int start;
	10403	+
	10404	+ stats = per_cpu_ptr(netstats, cpu);
	10405	+ do {
	10406	+ start = u64_stats_fetch_begin_irq(&stats->syncp);
	10407	+ tmp.rx_packets = stats->rx_packets;
	10408	+ tmp.rx_bytes = stats->rx_bytes;
	10409	+ tmp.tx_packets = stats->tx_packets;
	10410	+ tmp.tx_bytes = stats->tx_bytes;
	10411	+ } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
	10412	+
	10413	+ s->rx_packets += tmp.rx_packets;
	10414	+ s->rx_bytes += tmp.rx_bytes;
	10415	+ s->tx_packets += tmp.tx_packets;
	10416	+ s->tx_bytes += tmp.tx_bytes;
	10417	+ }
	10418	+}
	10419	+EXPORT_SYMBOL_GPL(dev_fetch_sw_netstats);
	10420	+
9124	10421	struct netdev_queue dev_ingress_queue_create(struct net_device dev)
9125	10422	{
9126	10423	struct netdev_queue *queue = dev_ingress_queue(dev);
..	..	@@ -9222,6 +10519,10 @@
9222	10519	dev->gso_max_segs = GSO_MAX_SEGS;
9223	10520	dev->upper_level = 1;
9224	10521	dev->lower_level = 1;
	10522	+#ifdef CONFIG_LOCKDEP
	10523	+ dev->nested_level = 0;
	10524	+ INIT_LIST_HEAD(&dev->unlink_list);
	10525	+#endif
9225	10526
9226	10527	INIT_LIST_HEAD(&dev->napi_list);
9227	10528	INIT_LIST_HEAD(&dev->unreg_list);
..	..	@@ -9231,6 +10532,7 @@
9231	10532	INIT_LIST_HEAD(&dev->adj_list.lower);
9232	10533	INIT_LIST_HEAD(&dev->ptype_all);
9233	10534	INIT_LIST_HEAD(&dev->ptype_specific);
	10535	+ INIT_LIST_HEAD(&dev->net_notifier_list);
9234	10536	#ifdef CONFIG_NET_SCHED
9235	10537	hash_init(dev->qdisc_hash);
9236	10538	#endif
..	..	@@ -9288,6 +10590,17 @@
9288	10590	struct napi_struct p, n;
9289	10591
9290	10592	might_sleep();
	10593	+
	10594	+ /* When called immediately after register_netdevice() failed the unwind
	10595	+ * handling may still be dismantling the device. Handle that case by
	10596	+ * deferring the free.
	10597	+ */
	10598	+ if (dev->reg_state == NETREG_UNREGISTERING) {
	10599	+ ASSERT_RTNL();
	10600	+ dev->needs_free_netdev = true;
	10601	+ return;
	10602	+ }
	10603	+
9291	10604	netif_free_tx_queues(dev);
9292	10605	netif_free_rx_queues(dev);
9293	10606
..	..	@@ -9301,6 +10614,8 @@
9301	10614
9302	10615	free_percpu(dev->pcpu_refcnt);
9303	10616	dev->pcpu_refcnt = NULL;
	10617	+ free_percpu(dev->xdp_bulkq);
	10618	+ dev->xdp_bulkq = NULL;
9304	10619
9305	10620	/* Compatibility with error handling in drivers */
9306	10621	if (dev->reg_state == NETREG_UNINITIALIZED) {
..	..	@@ -9352,9 +10667,10 @@
9352	10667	if (head) {
9353	10668	list_move_tail(&dev->unreg_list, head);
9354	10669	} else {
9355		- rollback_registered(dev);
9356		- /* Finish processing unregister after unlock */
9357		- net_set_todo(dev);
	10670	+ LIST_HEAD(single);
	10671	+
	10672	+ list_add(&dev->unreg_list, &single);
	10673	+ unregister_netdevice_many(&single);
9358	10674	}
9359	10675	}
9360	10676	EXPORT_SYMBOL(unregister_netdevice_queue);
..	..	@@ -9368,14 +10684,100 @@
9368	10684	*/
9369	10685	void unregister_netdevice_many(struct list_head *head)
9370	10686	{
9371		- struct net_device *dev;
	10687	+ struct net_device dev, tmp;
	10688	+ LIST_HEAD(close_head);
9372	10689
9373		- if (!list_empty(head)) {
9374		- rollback_registered_many(head);
9375		- list_for_each_entry(dev, head, unreg_list)
9376		- net_set_todo(dev);
9377		- list_del(head);
	10690	+ BUG_ON(dev_boot_phase);
	10691	+ ASSERT_RTNL();
	10692	+
	10693	+ if (list_empty(head))
	10694	+ return;
	10695	+
	10696	+ list_for_each_entry_safe(dev, tmp, head, unreg_list) {
	10697	+ /* Some devices call without registering
	10698	+ * for initialization unwind. Remove those
	10699	+ * devices and proceed with the remaining.
	10700	+ */
	10701	+ if (dev->reg_state == NETREG_UNINITIALIZED) {
	10702	+ pr_debug("unregister_netdevice: device %s/%p never was registered\n",
	10703	+ dev->name, dev);
	10704	+
	10705	+ WARN_ON(1);
	10706	+ list_del(&dev->unreg_list);
	10707	+ continue;
	10708	+ }
	10709	+ dev->dismantle = true;
	10710	+ BUG_ON(dev->reg_state != NETREG_REGISTERED);
9378	10711	}
	10712	+
	10713	+ /* If device is running, close it first. */
	10714	+ list_for_each_entry(dev, head, unreg_list)
	10715	+ list_add_tail(&dev->close_list, &close_head);
	10716	+ dev_close_many(&close_head, true);
	10717	+
	10718	+ list_for_each_entry(dev, head, unreg_list) {
	10719	+ /* And unlink it from device chain. */
	10720	+ unlist_netdevice(dev);
	10721	+
	10722	+ dev->reg_state = NETREG_UNREGISTERING;
	10723	+ }
	10724	+ flush_all_backlogs();
	10725	+
	10726	+ synchronize_net();
	10727	+
	10728	+ list_for_each_entry(dev, head, unreg_list) {
	10729	+ struct sk_buff *skb = NULL;
	10730	+
	10731	+ /* Shutdown queueing discipline. */
	10732	+ dev_shutdown(dev);
	10733	+
	10734	+ dev_xdp_uninstall(dev);
	10735	+
	10736	+ /* Notify protocols, that we are about to destroy
	10737	+ * this device. They should clean all the things.
	10738	+ */
	10739	+ call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
	10740	+
	10741	+ if (!dev->rtnl_link_ops \|\|
	10742	+ dev->rtnl_link_state == RTNL_LINK_INITIALIZED)
	10743	+ skb = rtmsg_ifinfo_build_skb(RTM_DELLINK, dev, ~0U, 0,
	10744	+ GFP_KERNEL, NULL, 0);
	10745	+
	10746	+ /*
	10747	+ * Flush the unicast and multicast chains
	10748	+ */
	10749	+ dev_uc_flush(dev);
	10750	+ dev_mc_flush(dev);
	10751	+
	10752	+ netdev_name_node_alt_flush(dev);
	10753	+ netdev_name_node_free(dev->name_node);
	10754	+
	10755	+ if (dev->netdev_ops->ndo_uninit)
	10756	+ dev->netdev_ops->ndo_uninit(dev);
	10757	+
	10758	+ if (skb)
	10759	+ rtmsg_ifinfo_send(skb, dev, GFP_KERNEL);
	10760	+
	10761	+ /* Notifier chain MUST detach us all upper devices. */
	10762	+ WARN_ON(netdev_has_any_upper_dev(dev));
	10763	+ WARN_ON(netdev_has_any_lower_dev(dev));
	10764	+
	10765	+ /* Remove entries from kobject tree */
	10766	+ netdev_unregister_kobject(dev);
	10767	+#ifdef CONFIG_XPS
	10768	+ /* Remove XPS queueing entries */
	10769	+ netif_reset_xps_queues_gt(dev, 0);
	10770	+#endif
	10771	+ }
	10772	+
	10773	+ synchronize_net();
	10774	+
	10775	+ list_for_each_entry(dev, head, unreg_list) {
	10776	+ dev_put(dev);
	10777	+ net_set_todo(dev);
	10778	+ }
	10779	+
	10780	+ list_del(head);
9379	10781	}
9380	10782	EXPORT_SYMBOL(unregister_netdevice_many);
9381	10783
..	..	@@ -9414,6 +10816,7 @@
9414	10816
9415	10817	int dev_change_net_namespace(struct net_device dev, struct net net, const char *pat)
9416	10818	{
	10819	+ struct net *net_old = dev_net(dev);
9417	10820	int err, new_nsid, new_ifindex;
9418	10821
9419	10822	ASSERT_RTNL();
..	..	@@ -9429,7 +10832,7 @@
9429	10832
9430	10833	/* Get out if there is nothing todo */
9431	10834	err = 0;
9432		- if (net_eq(dev_net(dev), net))
	10835	+ if (net_eq(net_old, net))
9433	10836	goto out;
9434	10837
9435	10838	/* Pick the destination device name, and ensure
..	..	@@ -9490,6 +10893,9 @@
9490	10893	kobject_uevent(&dev->dev.kobj, KOBJ_REMOVE);
9491	10894	netdev_adjacent_del_links(dev);
9492	10895
	10896	+ /* Move per-net netdevice notifiers that are following the netdevice */
	10897	+ move_netdevice_notifiers_dev_net(dev, net);
	10898	+
9493	10899	/* Actually switch the network namespace */
9494	10900	dev_net_set(dev, net);
9495	10901	dev->ifindex = new_ifindex;
..	..	@@ -9500,6 +10906,12 @@
9500	10906
9501	10907	/* Fixup kobjects */
9502	10908	err = device_rename(&dev->dev, dev->name);
	10909	+ WARN_ON(err);
	10910	+
	10911	+ /* Adapt owner in case owning user namespace of target network
	10912	+ * namespace is different from the original one.
	10913	+ */
	10914	+ err = netdev_change_owner(dev, net_old, net);
9503	10915	WARN_ON(err);
9504	10916
9505	10917	/* Add the device back in the hashes */
..	..	@@ -9584,9 +10996,6 @@
9584	10996	netif_rx_ni(skb);
9585	10997	input_queue_head_incr(oldsd);
9586	10998	}
9587		- while ((skb = __skb_dequeue(&oldsd->tofree_queue))) {
9588		- kfree_skb(skb);
9589		- }
9590	10999
9591	11000	return 0;
9592	11001	}
..	..	@@ -9636,7 +11045,7 @@
9636	11045	static int __net_init netdev_init(struct net *net)
9637	11046	{
9638	11047	BUILD_BUG_ON(GRO_HASH_BUCKETS >
9639		- 8 * FIELD_SIZEOF(struct napi_struct, gro_bitmask));
	11048	+ 8 * sizeof_field(struct napi_struct, gro_bitmask));
9640	11049
9641	11050	if (net != &init_net)
9642	11051	INIT_LIST_HEAD(&net->dev_base_head);
..	..	@@ -9648,6 +11057,8 @@
9648	11057	net->dev_index_head = netdev_create_hash();
9649	11058	if (net->dev_index_head == NULL)
9650	11059	goto err_idx;
	11060	+
	11061	+ RAW_INIT_NOTIFIER_HEAD(&net->netdev_chain);
9651	11062
9652	11063	return 0;
9653	11064
..	..	@@ -9770,7 +11181,7 @@
9770	11181	continue;
9771	11182
9772	11183	/* Leave virtual devices for the generic cleanup */
9773		- if (dev->rtnl_link_ops)
	11184	+ if (dev->rtnl_link_ops && !dev->rtnl_link_ops->netns_refund)
9774	11185	continue;
9775	11186
9776	11187	/* Push remaining network devices to init_net */
..	..	@@ -9898,8 +11309,7 @@
9898	11309	INIT_WORK(flush, flush_backlog);
9899	11310
9900	11311	skb_queue_head_init_raw(&sd->input_pkt_queue);
9901		- skb_queue_head_init_raw(&sd->process_queue);
9902		- skb_queue_head_init_raw(&sd->tofree_queue);
	11312	+ skb_queue_head_init(&sd->process_queue);
9903	11313	#ifdef CONFIG_XFRM_OFFLOAD
9904	11314	skb_queue_head_init(&sd->xfrm_backlog);
9905	11315	#endif