Merge tag 'net-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from Jakub Kicinski: "Including fixes from CAN, netfilter, wireguard and IPsec. I'd like to highlight [ lowlight? - Linus ] Florian W stepping down as a netfilter maintainer due to constant stream of bug reports. Not sure what we can do but IIUC this is not the first such case. Current release - regressions: - rxrpc: fix use of page_frag_alloc_align(), it changed semantics and we added a new caller in a different subtree - xfrm: allow UDP encapsulation only in offload modes Current release - new code bugs: - tcp: fix refcnt handling in __inet_hash_connect() - Revert "net: Re-use and set mono_delivery_time bit for userspace tstamp packets", conflicted with some expectations in BPF uAPI Previous releases - regressions: - ipv4: raw: fix sending packets from raw sockets via IPsec tunnels - devlink: fix devlink's parallel command processing - veth: do not manipulate GRO when using XDP - esp: fix bad handling of pages from page_pool Previous releases - always broken: - report RCU QS for busy network kthreads (with Paul McK's blessing) - tcp/rds: fix use-after-free on netns with kernel TCP reqsk - virt: vmxnet3: fix missing reserved tailroom with XDP Misc: - couple of build fixes for Documentation" * tag 'net-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (59 commits) selftests: forwarding: Fix ping failure due to short timeout MAINTAINERS: step down as netfilter maintainer netfilter: nf_tables: Fix a memory leak in nf_tables_updchain net: dsa: mt7530: fix handling of all link-local frames net: dsa: mt7530: fix link-local frames that ingress vlan filtering ports bpf: report RCU QS in cpumap kthread net: report RCU QS on threaded NAPI repolling rcu: add a helper to report consolidated flavor QS ionic: update documentation for XDP support lib/bitmap: Fix bitmap_scatter() and bitmap_gather() kernel doc netfilter: nf_tables: do not compare internal table flags on updates netfilter: nft_set_pipapo: release elements in clone only from destroy path octeontx2-af: Use separate handlers for interrupts octeontx2-pf: Send UP messages to VF only when VF is up. octeontx2-pf: Use default max_active works instead of one octeontx2-pf: Wait till detach_resources msg is complete octeontx2: Detect the mbox up or down message via register devlink: fix port new reply cmd type tcp: Clear req->syncookie in reqsk_alloc(). net/bnx2x: Prevent access to a freed page in page_pool ...

Linus Torvalds committed 2 years ago

Commit cba9ffd2 parents 1d35aae f99c5f571 files · +610 −346Browse files

Unified · Split

71 files

Documentation/networking/device_drivers/ethernet/pensando/ionic.rst +22 −0
Documentation/networking/multi-pf-netdev.rst +29 −29
Documentation/networking/net_cachelines/net_device.rst +1 −1
MAINTAINERS +0 −1
drivers/net/can/kvaser_pciefd.c +2 −2
drivers/net/dsa/mt7530.c +48 −18
drivers/net/dsa/mt7530.h +21 −1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +3 −3
drivers/net/ethernet/marvell/octeontx2/af/cgx.c +1 −1
drivers/net/ethernet/marvell/octeontx2/af/mbox.c +41 −2
drivers/net/ethernet/marvell/octeontx2/af/mbox.h +6 −0
drivers/net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c +11 −6
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +25 −6
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +2 −0
drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c +13 −7
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +1 −1
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h +1 −1
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +82 −37
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +43 −28
drivers/net/ethernet/mediatek/mtk_eth_soc.c +3 −4
drivers/net/ethernet/mediatek/mtk_ppe.c +11 −7
drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c +1 −1
drivers/net/phy/phy_device.c +2 −2
drivers/net/veth.c +0 −18
drivers/net/vmxnet3/vmxnet3_xdp.c +3 −3
drivers/net/wan/fsl_qmc_hdlc.c +1 −1
drivers/net/wireguard/device.c +2 −9
drivers/net/wireguard/netlink.c +5 −5
drivers/net/wireguard/receive.c +3 −3
drivers/soc/fsl/qbman/qman.c +14 −11
include/linux/bitmap.h +23 −21
include/linux/netdevice.h +1 −1
include/linux/rcupdate.h +31 −0
include/linux/skbuff.h +13 −3
include/linux/socket.h +0 −7
include/net/request_sock.h +6 −1
kernel/bpf/cpumap.c +3 −0
net/core/dev.c +6 −2
net/devlink/netlink.c +7 −6
net/devlink/port.c +1 −1
net/hsr/hsr_framereg.c +4 −0
net/hsr/hsr_main.c +11 −4
net/ipv4/esp4.c +4 −4
net/ipv4/inet_hashtables.c +1 −1
net/ipv4/inet_timewait_sock.c +19 −22
net/ipv4/ip_output.c +0 −1
net/ipv4/raw.c +1 −1
net/ipv4/syncookies.c +3 −0
net/ipv4/tcp_minisocks.c +0 −4
net/ipv6/esp6.c +4 −4
net/ipv6/ip6_output.c +1 −1
net/ipv6/raw.c +1 −1
net/ipv6/syncookies.c +3 −0
net/netfilter/nf_tables_api.c +15 −14
net/netfilter/nft_set_pipapo.c +1 −4
net/packet/af_packet.c +3 −5
net/rds/send.c +2 −3
net/rxrpc/sendmsg.c +2 −2
net/rxrpc/txbuf.c +2 −2
net/sched/sch_fq_pie.c +2 −0
net/sched/sch_taprio.c +2 −1
net/socket.c +7 −7
net/xfrm/xfrm_device.c +2 −1
tools/net/ynl/Makefile.deps +1 −0
tools/perf/trace/beauty/include/linux/socket.h +0 −7
tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh +2 −2
tools/testing/selftests/net/forwarding/vxlan_bridge_1q_ipv6.sh +2 −2
tools/testing/selftests/net/udpgro_fwd.sh +4 −0
tools/testing/selftests/net/veth.sh +21 −3
tools/testing/selftests/wireguard/qemu/arch/riscv32.config +1 −0
tools/testing/selftests/wireguard/qemu/arch/riscv64.config +1 −0

Documentation/networking/device_drivers/ethernet/pensando/ionic.rst+22−0

@@ -99,6 +99,12 @@ Minimal SR-IOV support is currently offered and can be enabled by setting · 98 unmodified lines
99	99	the sysfs 'sriov_numvfs' value, if supported by your particular firmware
100	100	configuration.
101	101
	102	+XDP
	103	+---
	104	+
	105	+Support for XDP includes the basics, plus Jumbo frames, Redirect and
	106	+ndo_xmit. There is no current support for zero-copy sockets or HW offload.
	107	+
102	108	Statistics
103	109	==========
104	110
@@ -138,6 +144,12 @@ Driver port specific:: · 33 unmodified lines
138	144	rx_csum_none: 0
139	145	rx_csum_complete: 3
140	146	rx_csum_error: 0
	147	+ xdp_drop: 0
	148	+ xdp_aborted: 0
	149	+ xdp_pass: 0
	150	+ xdp_tx: 0
	151	+ xdp_redirect: 0
	152	+ xdp_frames: 0
141	153
142	154	Driver queue specific::
143	155
@@ -149,9 +161,12 @@ Driver queue specific:: · 5 unmodified lines
149	161	tx_0_frags: 0
150	162	tx_0_tso: 0
151	163	tx_0_tso_bytes: 0
	164	+ tx_0_hwstamp_valid: 0
	165	+ tx_0_hwstamp_invalid: 0
152	166	tx_0_csum_none: 3
153	167	tx_0_csum: 0
154	168	tx_0_vlan_inserted: 0
	169	+ tx_0_xdp_frames: 0
155	170	rx_0_pkts: 2
156	171	rx_0_bytes: 120
157	172	rx_0_dma_map_err: 0
@@ -159,8 +174,15 @@ Driver queue specific:: · 1 unmodified line
159	174	rx_0_csum_none: 0
160	175	rx_0_csum_complete: 0
161	176	rx_0_csum_error: 0
	177	+ rx_0_hwstamp_valid: 0
	178	+ rx_0_hwstamp_invalid: 0
162	179	rx_0_dropped: 0
163	180	rx_0_vlan_stripped: 0
	181	+ rx_0_xdp_drop: 0
	182	+ rx_0_xdp_aborted: 0
	183	+ rx_0_xdp_pass: 0
	184	+ rx_0_xdp_tx: 0
	185	+ rx_0_xdp_redirect: 0
164	186
165	187	Firmware port specific::
166	188

Documentation/networking/multi-pf-netdev.rst+29−29

@@ -87,35 +87,35 @@ all using the same instance under "priv->mdev". · 86 unmodified lines
87	87
88	88	Observability
89	89	=============
90		−The relation between PF, irq, napi, and queue can be observed via netlink spec:
91		−
92		−$ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml --dump queue-get --json='{"ifindex": 13}'
93		−[{'id': 0, 'ifindex': 13, 'napi-id': 539, 'type': 'rx'},
94		− {'id': 1, 'ifindex': 13, 'napi-id': 540, 'type': 'rx'},
95		− {'id': 2, 'ifindex': 13, 'napi-id': 541, 'type': 'rx'},
96		− {'id': 3, 'ifindex': 13, 'napi-id': 542, 'type': 'rx'},
97		− {'id': 4, 'ifindex': 13, 'napi-id': 543, 'type': 'rx'},
98		− {'id': 0, 'ifindex': 13, 'napi-id': 539, 'type': 'tx'},
99		− {'id': 1, 'ifindex': 13, 'napi-id': 540, 'type': 'tx'},
100		− {'id': 2, 'ifindex': 13, 'napi-id': 541, 'type': 'tx'},
101		− {'id': 3, 'ifindex': 13, 'napi-id': 542, 'type': 'tx'},
102		− {'id': 4, 'ifindex': 13, 'napi-id': 543, 'type': 'tx'}]
103		−
104		−$ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml --dump napi-get --json='{"ifindex": 13}'
105		−[{'id': 543, 'ifindex': 13, 'irq': 42},
106		− {'id': 542, 'ifindex': 13, 'irq': 41},
107		− {'id': 541, 'ifindex': 13, 'irq': 40},
108		− {'id': 540, 'ifindex': 13, 'irq': 39},
109		− {'id': 539, 'ifindex': 13, 'irq': 36}]
110		−
111		−Here you can clearly observe our channels distribution policy:
112		−
113		−$ ls /proc/irq/{36,39,40,41,42}/mlx5* -d -1
114		−/proc/irq/36/mlx5_comp1@pci:0000:08:00.0
115		−/proc/irq/39/mlx5_comp1@pci:0000:09:00.0
116		−/proc/irq/40/mlx5_comp2@pci:0000:08:00.0
117		−/proc/irq/41/mlx5_comp2@pci:0000:09:00.0
118		−/proc/irq/42/mlx5_comp3@pci:0000:08:00.0
	90	+The relation between PF, irq, napi, and queue can be observed via netlink spec::
	91	+
	92	+ $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml --dump queue-get --json='{"ifindex": 13}'
	93	+ [{'id': 0, 'ifindex': 13, 'napi-id': 539, 'type': 'rx'},
	94	+ {'id': 1, 'ifindex': 13, 'napi-id': 540, 'type': 'rx'},
	95	+ {'id': 2, 'ifindex': 13, 'napi-id': 541, 'type': 'rx'},
	96	+ {'id': 3, 'ifindex': 13, 'napi-id': 542, 'type': 'rx'},
	97	+ {'id': 4, 'ifindex': 13, 'napi-id': 543, 'type': 'rx'},
	98	+ {'id': 0, 'ifindex': 13, 'napi-id': 539, 'type': 'tx'},
	99	+ {'id': 1, 'ifindex': 13, 'napi-id': 540, 'type': 'tx'},
	100	+ {'id': 2, 'ifindex': 13, 'napi-id': 541, 'type': 'tx'},
	101	+ {'id': 3, 'ifindex': 13, 'napi-id': 542, 'type': 'tx'},
	102	+ {'id': 4, 'ifindex': 13, 'napi-id': 543, 'type': 'tx'}]
	103	+
	104	+ $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml --dump napi-get --json='{"ifindex": 13}'
	105	+ [{'id': 543, 'ifindex': 13, 'irq': 42},
	106	+ {'id': 542, 'ifindex': 13, 'irq': 41},
	107	+ {'id': 541, 'ifindex': 13, 'irq': 40},
	108	+ {'id': 540, 'ifindex': 13, 'irq': 39},
	109	+ {'id': 539, 'ifindex': 13, 'irq': 36}]
	110	+
	111	+Here you can clearly observe our channels distribution policy::
	112	+
	113	+ $ ls /proc/irq/{36,39,40,41,42}/mlx5* -d -1
	114	+ /proc/irq/36/mlx5_comp1@pci:0000:08:00.0
	115	+ /proc/irq/39/mlx5_comp1@pci:0000:09:00.0
	116	+ /proc/irq/40/mlx5_comp2@pci:0000:08:00.0
	117	+ /proc/irq/41/mlx5_comp2@pci:0000:09:00.0
	118	+ /proc/irq/42/mlx5_comp3@pci:0000:08:00.0
119	119
120	120	Steering
121	121	========

Documentation/networking/net_cachelines/net_device.rst+1−1

@@ -13,7 +13,7 @@ struct_dev_ifalias* ifalias · 12 unmodified lines
13	13	unsigned_long mem_end
14	14	unsigned_long mem_start
15	15	unsigned_long base_addr
16		−unsigned_long state
	16	+unsigned_long state read_mostly read_mostly netif_running(dev)
17	17	struct_list_head dev_list
18	18	struct_list_head napi_list
19	19	struct_list_head unreg_list

MAINTAINERS+0−1

@@ -15237,7 +15237,6 @@ F: drivers/net/ethernet/neterion/ · 15236 unmodified lines
15237	15237	NETFILTER
15238	15238	M: Pablo Neira Ayuso <pablo@netfilter.org>
15239	15239	M: Jozsef Kadlecsik <kadlec@netfilter.org>
15240		−M: Florian Westphal <fw@strlen.de>
15241	15240	L: netfilter-devel@vger.kernel.org
15242	15241	L: coreteam@netfilter.org
15243	15242	S: Maintained

drivers/net/can/kvaser_pciefd.c+2−2

@@ -370,8 +370,8 @@ static const struct kvaser_pciefd_irq_mask kvaser_pciefd_sf2_irq_mask = { · 369 unmodified lines
370	370
371	371	static const struct kvaser_pciefd_irq_mask kvaser_pciefd_xilinx_irq_mask = {
372	372	.kcan_rx0 = BIT(4),
373		− .kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19) },
374		− .all = GENMASK(19, 16) \| BIT(4),
	373	+ .kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19), BIT(20), BIT(21), BIT(22), BIT(23) },
	374	+ .all = GENMASK(23, 16) \| BIT(4),
375	375	};
376	376
377	377	static const struct kvaser_pciefd_dev_ops kvaser_pciefd_altera_dev_ops = {

drivers/net/dsa/mt7530.c+48−18

@@ -950,20 +950,56 @@ static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface) · 949 unmodified lines
950	950	mutex_unlock(&priv->reg_mutex);
951	951	}
952	952
	953	+/* On page 205, section "8.6.3 Frame filtering" of the active standard, IEEE Std
	954	+ * 802.1Q™-2022, it is stated that frames with 01:80:C2:00:00:00-0F as MAC DA
	955	+ * must only be propagated to C-VLAN and MAC Bridge components. That means
	956	+ * VLAN-aware and VLAN-unaware bridges. On the switch designs with CPU ports,
	957	+ * these frames are supposed to be processed by the CPU (software). So we make
	958	+ * the switch only forward them to the CPU port. And if received from a CPU
	959	+ * port, forward to a single port. The software is responsible of making the
	960	+ * switch conform to the latter by setting a single port as destination port on
	961	+ * the special tag.
	962	+ *
	963	+ * This switch intellectual property cannot conform to this part of the standard
	964	+ * fully. Whilst the REV_UN frame tag covers the remaining :04-0D and :0F MAC
	965	+ * DAs, it also includes :22-FF which the scope of propagation is not supposed
	966	+ * to be restricted for these MAC DAs.
	967	+ */
953	968	static void
954	969	mt753x_trap_frames(struct mt7530_priv *priv)
955	970	{
956		− /* Trap BPDUs to the CPU port(s) */
957		− mt7530_rmw(priv, MT753X_BPC, MT753X_BPDU_PORT_FW_MASK,
	971	+ /* Trap 802.1X PAE frames and BPDUs to the CPU port(s) and egress them
	972	+ * VLAN-untagged.
	973	+ */
	974	+ mt7530_rmw(priv, MT753X_BPC, MT753X_PAE_EG_TAG_MASK \|
	975	+ MT753X_PAE_PORT_FW_MASK \| MT753X_BPDU_EG_TAG_MASK \|
	976	+ MT753X_BPDU_PORT_FW_MASK,
	977	+ MT753X_PAE_EG_TAG(MT7530_VLAN_EG_UNTAGGED) \|
	978	+ MT753X_PAE_PORT_FW(MT753X_BPDU_CPU_ONLY) \|
	979	+ MT753X_BPDU_EG_TAG(MT7530_VLAN_EG_UNTAGGED) \|
958	980	MT753X_BPDU_CPU_ONLY);
959	981
960		− /* Trap 802.1X PAE frames to the CPU port(s) */
961		− mt7530_rmw(priv, MT753X_BPC, MT753X_PAE_PORT_FW_MASK,
962		− MT753X_PAE_PORT_FW(MT753X_BPDU_CPU_ONLY));
	982	+ /* Trap frames with :01 and :02 MAC DAs to the CPU port(s) and egress
	983	+ * them VLAN-untagged.
	984	+ */
	985	+ mt7530_rmw(priv, MT753X_RGAC1, MT753X_R02_EG_TAG_MASK \|
	986	+ MT753X_R02_PORT_FW_MASK \| MT753X_R01_EG_TAG_MASK \|
	987	+ MT753X_R01_PORT_FW_MASK,
	988	+ MT753X_R02_EG_TAG(MT7530_VLAN_EG_UNTAGGED) \|
	989	+ MT753X_R02_PORT_FW(MT753X_BPDU_CPU_ONLY) \|
	990	+ MT753X_R01_EG_TAG(MT7530_VLAN_EG_UNTAGGED) \|
	991	+ MT753X_BPDU_CPU_ONLY);
963	992
964		− /* Trap LLDP frames with :0E MAC DA to the CPU port(s) */
965		− mt7530_rmw(priv, MT753X_RGAC2, MT753X_R0E_PORT_FW_MASK,
966		− MT753X_R0E_PORT_FW(MT753X_BPDU_CPU_ONLY));
	993	+ /* Trap frames with :03 and :0E MAC DAs to the CPU port(s) and egress
	994	+ * them VLAN-untagged.
	995	+ */
	996	+ mt7530_rmw(priv, MT753X_RGAC2, MT753X_R0E_EG_TAG_MASK \|
	997	+ MT753X_R0E_PORT_FW_MASK \| MT753X_R03_EG_TAG_MASK \|
	998	+ MT753X_R03_PORT_FW_MASK,
	999	+ MT753X_R0E_EG_TAG(MT7530_VLAN_EG_UNTAGGED) \|
	1000	+ MT753X_R0E_PORT_FW(MT753X_BPDU_CPU_ONLY) \|
	1001	+ MT753X_R03_EG_TAG(MT7530_VLAN_EG_UNTAGGED) \|
	1002	+ MT753X_BPDU_CPU_ONLY);
967	1003	}
968	1004
969	1005	static void
@@ -2192,22 +2228,16 @@ mt7530_setup(struct dsa_switch *ds) · 1222 unmodified lines
2192	2228	}
2193	2229	}
2194	2230
2195		− /* Disable LEDs before reset to prevent the MT7530 sampling a
2196		− * potentially incorrect HT_XTAL_FSEL value.
2197		− */
2198		− mt7530_write(priv, MT7530_LED_EN, 0);
2199		− usleep_range(1000, 1100);
2200		−
2201	2231	/* Reset whole chip through gpio pin or memory-mapped registers for
2202	2232	* different type of hardware
2203	2233	*/
2204	2234	if (priv->mcm) {
2205	2235	reset_control_assert(priv->rstc);
2206		− usleep_range(1000, 1100);
	2236	+ usleep_range(5000, 5100);
2207	2237	reset_control_deassert(priv->rstc);
2208	2238	} else {
2209	2239	gpiod_set_value_cansleep(priv->reset, 0);
2210		− usleep_range(1000, 1100);
	2240	+ usleep_range(5000, 5100);
2211	2241	gpiod_set_value_cansleep(priv->reset, 1);
2212	2242	}
2213	2243
@@ -2420,11 +2450,11 @@ mt7531_setup(struct dsa_switch *ds) · 206 unmodified lines
2420	2450	*/
2421	2451	if (priv->mcm) {
2422	2452	reset_control_assert(priv->rstc);
2423		− usleep_range(1000, 1100);
	2453	+ usleep_range(5000, 5100);
2424	2454	reset_control_deassert(priv->rstc);
2425	2455	} else {
2426	2456	gpiod_set_value_cansleep(priv->reset, 0);
2427		− usleep_range(1000, 1100);
	2457	+ usleep_range(5000, 5100);
2428	2458	gpiod_set_value_cansleep(priv->reset, 1);
2429	2459	}
2430	2460

drivers/net/dsa/mt7530.h+21−1

@@ -65,14 +65,33 @@ enum mt753x_id { · 64 unmodified lines
65	65
66	66	/* Registers for BPDU and PAE frame control*/
67	67	#define MT753X_BPC 0x24
68		−#define MT753X_BPDU_PORT_FW_MASK GENMASK(2, 0)
	68	+#define MT753X_PAE_EG_TAG_MASK GENMASK(24, 22)
	69	+#define MT753X_PAE_EG_TAG(x) FIELD_PREP(MT753X_PAE_EG_TAG_MASK, x)
69	70	#define MT753X_PAE_PORT_FW_MASK GENMASK(18, 16)
70	71	#define MT753X_PAE_PORT_FW(x) FIELD_PREP(MT753X_PAE_PORT_FW_MASK, x)
	72	+#define MT753X_BPDU_EG_TAG_MASK GENMASK(8, 6)
	73	+#define MT753X_BPDU_EG_TAG(x) FIELD_PREP(MT753X_BPDU_EG_TAG_MASK, x)
	74	+#define MT753X_BPDU_PORT_FW_MASK GENMASK(2, 0)
	75	+
	76	+/* Register for :01 and :02 MAC DA frame control */
	77	+#define MT753X_RGAC1 0x28
	78	+#define MT753X_R02_EG_TAG_MASK GENMASK(24, 22)
	79	+#define MT753X_R02_EG_TAG(x) FIELD_PREP(MT753X_R02_EG_TAG_MASK, x)
	80	+#define MT753X_R02_PORT_FW_MASK GENMASK(18, 16)
	81	+#define MT753X_R02_PORT_FW(x) FIELD_PREP(MT753X_R02_PORT_FW_MASK, x)
	82	+#define MT753X_R01_EG_TAG_MASK GENMASK(8, 6)
	83	+#define MT753X_R01_EG_TAG(x) FIELD_PREP(MT753X_R01_EG_TAG_MASK, x)
	84	+#define MT753X_R01_PORT_FW_MASK GENMASK(2, 0)
71	85
72	86	/* Register for :03 and :0E MAC DA frame control */
73	87	#define MT753X_RGAC2 0x2c
	88	+#define MT753X_R0E_EG_TAG_MASK GENMASK(24, 22)
	89	+#define MT753X_R0E_EG_TAG(x) FIELD_PREP(MT753X_R0E_EG_TAG_MASK, x)
74	90	#define MT753X_R0E_PORT_FW_MASK GENMASK(18, 16)
75	91	#define MT753X_R0E_PORT_FW(x) FIELD_PREP(MT753X_R0E_PORT_FW_MASK, x)
	92	+#define MT753X_R03_EG_TAG_MASK GENMASK(8, 6)
	93	+#define MT753X_R03_EG_TAG(x) FIELD_PREP(MT753X_R03_EG_TAG_MASK, x)
	94	+#define MT753X_R03_PORT_FW_MASK GENMASK(2, 0)
76	95
77	96	enum mt753x_bpdu_port_fw {
78	97	MT753X_BPDU_FOLLOW_MFC,
@@ -253,6 +272,7 @@ enum mt7530_port_mode { · 174 unmodified lines
253	272	enum mt7530_vlan_port_eg_tag {
254	273	MT7530_VLAN_EG_DISABLED = 0,
255	274	MT7530_VLAN_EG_CONSISTENT = 1,
	275	+ MT7530_VLAN_EG_UNTAGGED = 4,
256	276	};
257	277
258	278	enum mt7530_vlan_port_attr {

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h+3−3

@@ -1002,9 +1002,6 @@ static inline void bnx2x_set_fw_mac_addr(__le16 fw_hi, __le16 fw_mid, · 1001 unmodified lines
1002	1002	static inline void bnx2x_free_rx_mem_pool(struct bnx2x *bp,
1003	1003	struct bnx2x_alloc_pool *pool)
1004	1004	{
1005		− if (!pool->page)
1006		− return;
1007		−
1008	1005	put_page(pool->page);
1009	1006
1010	1007	pool->page = NULL;
@@ -1015,6 +1012,9 @@ static inline void bnx2x_free_rx_sge_range(struct bnx2x *bp, · 4 unmodified lines
1015	1012	{
1016	1013	int i;
1017	1014
	1015	+ if (!fp->page_pool.page)
	1016	+ return;
	1017	+
1018	1018	if (fp->mode == TPA_MODE_DISABLED)
1019	1019	return;
1020	1020

drivers/net/ethernet/marvell/octeontx2/af/cgx.c+1−1

@@ -1338,7 +1338,7 @@ static irqreturn_t cgx_fwi_event_handler(int irq, void *data) · 1337 unmodified lines
1338	1338
1339	1339	/* Release thread waiting for completion */
1340	1340	lmac->cmd_pend = false;
1341		− wake_up_interruptible(&lmac->wq_cmd_cmplt);
	1341	+ wake_up(&lmac->wq_cmd_cmplt);
1342	1342	break;
1343	1343	case CGX_EVT_ASYNC:
1344	1344	if (cgx_event_is_linkevent(event))

drivers/net/ethernet/marvell/octeontx2/af/mbox.c+41−2

@@ -214,11 +214,12 @@ int otx2_mbox_busy_poll_for_rsp(struct otx2_mbox *mbox, int devid) · 213 unmodified lines
214	214	}
215	215	EXPORT_SYMBOL(otx2_mbox_busy_poll_for_rsp);
216	216
217		−void otx2_mbox_msg_send(struct otx2_mbox *mbox, int devid)
	217	+static void otx2_mbox_msg_send_data(struct otx2_mbox *mbox, int devid, u64 data)
218	218	{
219	219	struct otx2_mbox_dev *mdev = &mbox->dev[devid];
220	220	struct mbox_hdr tx_hdr, rx_hdr;
221	221	void *hw_mbase = mdev->hwbase;
	222	+ u64 intr_val;
222	223
223	224	tx_hdr = hw_mbase + mbox->tx_start;
224	225	rx_hdr = hw_mbase + mbox->rx_start;
@@ -254,14 +255,52 @@ void otx2_mbox_msg_send(struct otx2_mbox *mbox, int devid) · 29 unmodified lines
254	255
255	256	spin_unlock(&mdev->mbox_lock);
256	257
	258	+ /* Check if interrupt pending */
	259	+ intr_val = readq((void __iomem *)mbox->reg_base +
	260	+ (mbox->trigger \| (devid << mbox->tr_shift)));
	261	+
	262	+ intr_val \|= data;
257	263	/* The interrupt should be fired after num_msgs is written
258	264	* to the shared memory
259	265	*/
260		− writeq(1, (void __iomem *)mbox->reg_base +
	266	+ writeq(intr_val, (void __iomem *)mbox->reg_base +
261	267	(mbox->trigger \| (devid << mbox->tr_shift)));
262	268	}
	269	+
	270	+void otx2_mbox_msg_send(struct otx2_mbox *mbox, int devid)
	271	+{
	272	+ otx2_mbox_msg_send_data(mbox, devid, MBOX_DOWN_MSG);
	273	+}
263	274	EXPORT_SYMBOL(otx2_mbox_msg_send);
264	275
	276	+void otx2_mbox_msg_send_up(struct otx2_mbox *mbox, int devid)
	277	+{
	278	+ otx2_mbox_msg_send_data(mbox, devid, MBOX_UP_MSG);
	279	+}
	280	+EXPORT_SYMBOL(otx2_mbox_msg_send_up);
	281	+
	282	+bool otx2_mbox_wait_for_zero(struct otx2_mbox *mbox, int devid)
	283	+{
	284	+ u64 data;
	285	+
	286	+ data = readq((void __iomem *)mbox->reg_base +
	287	+ (mbox->trigger \| (devid << mbox->tr_shift)));
	288	+
	289	+ /* If data is non-zero wait for ~1ms and return to caller
	290	+ * whether data has changed to zero or not after the wait.
	291	+ */
	292	+ if (!data)
	293	+ return true;
	294	+
	295	+ usleep_range(950, 1000);
	296	+
	297	+ data = readq((void __iomem *)mbox->reg_base +
	298	+ (mbox->trigger \| (devid << mbox->tr_shift)));
	299	+
	300	+ return data == 0;
	301	+}
	302	+EXPORT_SYMBOL(otx2_mbox_wait_for_zero);
	303	+
265	304	struct mbox_msghdr otx2_mbox_alloc_msg_rsp(struct otx2_mbox mbox, int devid,
266	305	int size, int size_rsp)
267	306	{

drivers/net/ethernet/marvell/octeontx2/af/mbox.h+6−0

@@ -16,6 +16,9 @@ · 15 unmodified lines
16	16
17	17	#define MBOX_SIZE SZ_64K
18	18
	19	+#define MBOX_DOWN_MSG 1
	20	+#define MBOX_UP_MSG 2
	21	+
19	22	/* AF/PF: PF initiated, PF/VF VF initiated */
20	23	#define MBOX_DOWN_RX_START 0
21	24	#define MBOX_DOWN_RX_SIZE (46 * SZ_1K)
@@ -101,6 +104,7 @@ int otx2_mbox_regions_init(struct otx2_mbox mbox, void __force *hwbase, · 79 unmodified lines
101	104	struct pci_dev pdev, void __force reg_base,
102	105	int direction, int ndevs, unsigned long *bmap);
103	106	void otx2_mbox_msg_send(struct otx2_mbox *mbox, int devid);
	107	+void otx2_mbox_msg_send_up(struct otx2_mbox *mbox, int devid);
104	108	int otx2_mbox_wait_for_rsp(struct otx2_mbox *mbox, int devid);
105	109	int otx2_mbox_busy_poll_for_rsp(struct otx2_mbox *mbox, int devid);
106	110	struct mbox_msghdr otx2_mbox_alloc_msg_rsp(struct otx2_mbox mbox, int devid,
@@ -118,6 +122,8 @@ static inline struct mbox_msghdr otx2_mbox_alloc_msg(struct otx2_mbox mbox, · 11 unmodified lines
118	122	return otx2_mbox_alloc_msg_rsp(mbox, devid, size, 0);
119	123	}
120	124
	125	+bool otx2_mbox_wait_for_zero(struct otx2_mbox *mbox, int devid);
	126	+
121	127	/* Mailbox message types */
122	128	#define MBOX_MSG_MASK 0xFFFF
123	129	#define MBOX_MSG_INVALID 0xFFFE

drivers/net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c+11−6

@@ -121,13 +121,17 @@ int mcs_add_intr_wq_entry(struct mcs mcs, struct mcs_intr_event event) · 120 unmodified lines
121	121	static int mcs_notify_pfvf(struct mcs_intr_event event, struct rvu rvu)
122	122	{
123	123	struct mcs_intr_info *req;
124		− int err, pf;
	124	+ int pf;
125	125
126	126	pf = rvu_get_pf(event->pcifunc);
127	127
	128	+ mutex_lock(&rvu->mbox_lock);
	129	+
128	130	req = otx2_mbox_alloc_msg_mcs_intr_notify(rvu, pf);
129		− if (!req)
	131	+ if (!req) {
	132	+ mutex_unlock(&rvu->mbox_lock);
130	133	return -ENOMEM;
	134	+ }
131	135
132	136	req->mcs_id = event->mcs_id;
133	137	req->intr_mask = event->intr_mask;
@@ -135,10 +139,11 @@ static int mcs_notify_pfvf(struct mcs_intr_event event, struct rvu rvu) · 1 unmodified line
135	139	req->hdr.pcifunc = event->pcifunc;
136	140	req->lmac_id = event->lmac_id;
137	141
138		− otx2_mbox_msg_send(&rvu->afpf_wq_info.mbox_up, pf);
139		− err = otx2_mbox_wait_for_rsp(&rvu->afpf_wq_info.mbox_up, pf);
140		− if (err)
141		− dev_warn(rvu->dev, "MCS notification to pf %d failed\n", pf);
	142	+ otx2_mbox_wait_for_zero(&rvu->afpf_wq_info.mbox_up, pf);
	143	+
	144	+ otx2_mbox_msg_send_up(&rvu->afpf_wq_info.mbox_up, pf);
	145	+
	146	+ mutex_unlock(&rvu->mbox_lock);
142	147
143	148	return 0;
144	149	}

drivers/net/ethernet/marvell/octeontx2/af/rvu.c+25−6

@@ -2119,7 +2119,7 @@ bad_message: · 2118 unmodified lines
2119	2119	}
2120	2120	}
2121	2121
2122		−static void __rvu_mbox_handler(struct rvu_work *mwork, int type)
	2122	+static void __rvu_mbox_handler(struct rvu_work *mwork, int type, bool poll)
2123	2123	{
2124	2124	struct rvu *rvu = mwork->rvu;
2125	2125	int offset, err, id, devid;
@@ -2186,6 +2186,9 @@ static void __rvu_mbox_handler(struct rvu_work *mwork, int type) · 60 unmodified lines
2186	2186	}
2187	2187	mw->mbox_wrk[devid].num_msgs = 0;
2188	2188
	2189	+ if (poll)
	2190	+ otx2_mbox_wait_for_zero(mbox, devid);
	2191	+
2189	2192	/* Send mbox responses to VF/PF */
2190	2193	otx2_mbox_msg_send(mbox, devid);
2191	2194	}
@@ -2193,15 +2196,18 @@ static void __rvu_mbox_handler(struct rvu_work *mwork, int type) · 1 unmodified line
2193	2196	static inline void rvu_afpf_mbox_handler(struct work_struct *work)
2194	2197	{
2195	2198	struct rvu_work *mwork = container_of(work, struct rvu_work, work);
	2199	+ struct rvu *rvu = mwork->rvu;
2196	2200
2197		− __rvu_mbox_handler(mwork, TYPE_AFPF);
	2201	+ mutex_lock(&rvu->mbox_lock);
	2202	+ __rvu_mbox_handler(mwork, TYPE_AFPF, true);
	2203	+ mutex_unlock(&rvu->mbox_lock);
2198	2204	}
2199	2205
2200	2206	static inline void rvu_afvf_mbox_handler(struct work_struct *work)
2201	2207	{
2202	2208	struct rvu_work *mwork = container_of(work, struct rvu_work, work);
2203	2209
2204		− __rvu_mbox_handler(mwork, TYPE_AFVF);
	2210	+ __rvu_mbox_handler(mwork, TYPE_AFVF, false);
2205	2211	}
2206	2212
2207	2213	static void __rvu_mbox_up_handler(struct rvu_work *mwork, int type)
@@ -2376,6 +2382,8 @@ static int rvu_mbox_init(struct rvu rvu, struct mbox_wq_info mw, · 168 unmodified lines
2376	2382	}
2377	2383	}
2378	2384
	2385	+ mutex_init(&rvu->mbox_lock);
	2386	+
2379	2387	mbox_regions = kcalloc(num, sizeof(void *), GFP_KERNEL);
2380	2388	if (!mbox_regions) {
2381	2389	err = -ENOMEM;
@@ -2525,10 +2533,9 @@ static void rvu_queue_work(struct mbox_wq_info *mw, int first, · 143 unmodified lines
2525	2533	}
2526	2534	}
2527	2535
2528		−static irqreturn_t rvu_mbox_intr_handler(int irq, void *rvu_irq)
	2536	+static irqreturn_t rvu_mbox_pf_intr_handler(int irq, void *rvu_irq)
2529	2537	{
2530	2538	struct rvu rvu = (struct rvu )rvu_irq;
2531		− int vfs = rvu->vfs;
2532	2539	u64 intr;
2533	2540
2534	2541	intr = rvu_read64(rvu, BLKADDR_RVUM, RVU_AF_PFAF_MBOX_INT);
@@ -2542,6 +2549,18 @@ static irqreturn_t rvu_mbox_intr_handler(int irq, void *rvu_irq) · 7 unmodified lines
2542	2549
2543	2550	rvu_queue_work(&rvu->afpf_wq_info, 0, rvu->hw->total_pfs, intr);
2544	2551
	2552	+ return IRQ_HANDLED;
	2553	+}
	2554	+
	2555	+static irqreturn_t rvu_mbox_intr_handler(int irq, void *rvu_irq)
	2556	+{
	2557	+ struct rvu rvu = (struct rvu )rvu_irq;
	2558	+ int vfs = rvu->vfs;
	2559	+ u64 intr;
	2560	+
	2561	+ /* Sync with mbox memory region */
	2562	+ rmb();
	2563	+
2545	2564	/* Handle VF interrupts */
2546	2565	if (vfs > 64) {
2547	2566	intr = rvupf_read64(rvu, RVU_PF_VFPF_MBOX_INTX(1));
@@ -2886,7 +2905,7 @@ static int rvu_register_interrupts(struct rvu *rvu) · 338 unmodified lines
2886	2905	/* Register mailbox interrupt handler */
2887	2906	sprintf(&rvu->irq_name[RVU_AF_INT_VEC_MBOX * NAME_SIZE], "RVUAF Mbox");
2888	2907	ret = request_irq(pci_irq_vector(rvu->pdev, RVU_AF_INT_VEC_MBOX),
2889		− rvu_mbox_intr_handler, 0,
	2908	+ rvu_mbox_pf_intr_handler, 0,
2890	2909	&rvu->irq_name[RVU_AF_INT_VEC_MBOX * NAME_SIZE], rvu);
2891	2910	if (ret) {
2892	2911	dev_err(rvu->dev,

drivers/net/ethernet/marvell/octeontx2/af/rvu.h+2−0

@@ -591,6 +591,8 @@ struct rvu { · 590 unmodified lines
591	591	spinlock_t mcs_intrq_lock;
592	592	/* CPT interrupt lock */
593	593	spinlock_t cpt_intr_lock;
	594	+
	595	+ struct mutex mbox_lock; /* Serialize mbox up and down msgs */
594	596	};
595	597
596	598	static inline void rvu_write64(struct rvu *rvu, u64 block, u64 offset, u64 val)

drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c+13−7

@@ -232,7 +232,7 @@ static void cgx_notify_pfs(struct cgx_link_event event, struct rvu rvu) · 231 unmodified lines
232	232	struct cgx_link_user_info *linfo;
233	233	struct cgx_link_info_msg *msg;
234	234	unsigned long pfmap;
235		− int err, pfid;
	235	+ int pfid;
236	236
237	237	linfo = &event->link_uinfo;
238	238	pfmap = cgxlmac_to_pfmap(rvu, event->cgx_id, event->lmac_id);
@@ -255,16 +255,22 @@ static void cgx_notify_pfs(struct cgx_link_event event, struct rvu rvu) · 16 unmodified lines
255	255	continue;
256	256	}
257	257
	258	+ mutex_lock(&rvu->mbox_lock);
	259	+
258	260	/* Send mbox message to PF */
259	261	msg = otx2_mbox_alloc_msg_cgx_link_event(rvu, pfid);
260		− if (!msg)
	262	+ if (!msg) {
	263	+ mutex_unlock(&rvu->mbox_lock);
261	264	continue;
	265	+ }
	266	+
262	267	msg->link_info = *linfo;
263		− otx2_mbox_msg_send(&rvu->afpf_wq_info.mbox_up, pfid);
264		− err = otx2_mbox_wait_for_rsp(&rvu->afpf_wq_info.mbox_up, pfid);
265		− if (err)
266		− dev_warn(rvu->dev, "notification to pf %d failed\n",
267		− pfid);
	268	+
	269	+ otx2_mbox_wait_for_zero(&rvu->afpf_wq_info.mbox_up, pfid);
	270	+
	271	+ otx2_mbox_msg_send_up(&rvu->afpf_wq_info.mbox_up, pfid);
	272	+
	273	+ mutex_unlock(&rvu->mbox_lock);
268	274	} while (pfmap);
269	275	}
270	276

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c+1−1

@@ -1592,7 +1592,7 @@ int otx2_detach_resources(struct mbox *mbox) · 1591 unmodified lines
1592	1592	detach->partial = false;
1593	1593
1594	1594	/* Send detach request to AF */
1595		− otx2_mbox_msg_send(&mbox->mbox, 0);
	1595	+ otx2_sync_mbox_msg(mbox);
1596	1596	mutex_unlock(&mbox->lock);
1597	1597	return 0;
1598	1598	}

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h+1−1

@@ -815,7 +815,7 @@ static inline int otx2_sync_mbox_up_msg(struct mbox *mbox, int devid) · 814 unmodified lines
815	815
816	816	if (!otx2_mbox_nonempty(&mbox->mbox_up, devid))
817	817	return 0;
818		− otx2_mbox_msg_send(&mbox->mbox_up, devid);
	818	+ otx2_mbox_msg_send_up(&mbox->mbox_up, devid);
819	819	err = otx2_mbox_wait_for_rsp(&mbox->mbox_up, devid);
820	820	if (err)
821	821	return err;

drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c+82−37

@@ -292,8 +292,8 @@ static int otx2_pf_flr_init(struct otx2_nic *pf, int num_vfs) · 291 unmodified lines
292	292	return 0;
293	293	}
294	294
295		−static void otx2_queue_work(struct mbox mw, struct workqueue_struct mbox_wq,
296		− int first, int mdevs, u64 intr, int type)
	295	+static void otx2_queue_vf_work(struct mbox mw, struct workqueue_struct mbox_wq,
	296	+ int first, int mdevs, u64 intr)
297	297	{
298	298	struct otx2_mbox_dev *mdev;
299	299	struct otx2_mbox *mbox;
@@ -307,40 +307,26 @@ static void otx2_queue_work(struct mbox mw, struct workqueue_struct mbox_wq, · 7 unmodified lines
307	307
308	308	mbox = &mw->mbox;
309	309	mdev = &mbox->dev[i];
310		− if (type == TYPE_PFAF)
311		− otx2_sync_mbox_bbuf(mbox, i);
312	310	hdr = mdev->mbase + mbox->rx_start;
313	311	/* The hdr->num_msgs is set to zero immediately in the interrupt
314		− * handler to ensure that it holds a correct value next time
315		− * when the interrupt handler is called.
316		− * pf->mbox.num_msgs holds the data for use in pfaf_mbox_handler
317		− * pf>mbox.up_num_msgs holds the data for use in
318		− * pfaf_mbox_up_handler.
	312	+ * handler to ensure that it holds a correct value next time
	313	+ * when the interrupt handler is called. pf->mw[i].num_msgs
	314	+ * holds the data for use in otx2_pfvf_mbox_handler and
	315	+ * pf->mw[i].up_num_msgs holds the data for use in
	316	+ * otx2_pfvf_mbox_up_handler.
319	317	*/
320	318	if (hdr->num_msgs) {
321	319	mw[i].num_msgs = hdr->num_msgs;
322	320	hdr->num_msgs = 0;
323		− if (type == TYPE_PFAF)
324		− memset(mbox->hwbase + mbox->rx_start, 0,
325		− ALIGN(sizeof(struct mbox_hdr),
326		− sizeof(u64)));
327		−
328	321	queue_work(mbox_wq, &mw[i].mbox_wrk);
329	322	}
330	323
331	324	mbox = &mw->mbox_up;
332	325	mdev = &mbox->dev[i];
333		− if (type == TYPE_PFAF)
334		− otx2_sync_mbox_bbuf(mbox, i);
335	326	hdr = mdev->mbase + mbox->rx_start;
336	327	if (hdr->num_msgs) {
337	328	mw[i].up_num_msgs = hdr->num_msgs;
338	329	hdr->num_msgs = 0;
339		− if (type == TYPE_PFAF)
340		− memset(mbox->hwbase + mbox->rx_start, 0,
341		− ALIGN(sizeof(struct mbox_hdr),
342		− sizeof(u64)));
343		−
344	330	queue_work(mbox_wq, &mw[i].mbox_up_wrk);
345	331	}
346	332	}
@@ -356,8 +342,10 @@ static void otx2_forward_msg_pfvf(struct otx2_mbox_dev *mdev, · 9 unmodified lines
356	342	/* Msgs are already copied, trigger VF's mbox irq */
357	343	smp_wmb();
358	344
	345	+ otx2_mbox_wait_for_zero(pfvf_mbox, devid);
	346	+
359	347	offset = pfvf_mbox->trigger \| (devid << pfvf_mbox->tr_shift);
360		− writeq(1, (void __iomem *)pfvf_mbox->reg_base + offset);
	348	+ writeq(MBOX_DOWN_MSG, (void __iomem *)pfvf_mbox->reg_base + offset);
361	349
362	350	/* Restore VF's mbox bounce buffer region address */
363	351	src_mdev->mbase = bbuf_base;
@@ -547,7 +535,7 @@ static void otx2_pfvf_mbox_up_handler(struct work_struct *work) · 183 unmodified lines
547	535	end:
548	536	offset = mbox->rx_start + msg->next_msgoff;
549	537	if (mdev->msgs_acked == (vf_mbox->up_num_msgs - 1))
550		− __otx2_mbox_reset(mbox, 0);
	538	+ __otx2_mbox_reset(mbox, vf_idx);
551	539	mdev->msgs_acked++;
552	540	}
553	541	}
@@ -564,8 +552,7 @@ static irqreturn_t otx2_pfvf_mbox_intr_handler(int irq, void *pf_irq) · 10 unmodified lines
564	552	if (vfs > 64) {
565	553	intr = otx2_read64(pf, RVU_PF_VFPF_MBOX_INTX(1));
566	554	otx2_write64(pf, RVU_PF_VFPF_MBOX_INTX(1), intr);
567		− otx2_queue_work(mbox, pf->mbox_pfvf_wq, 64, vfs, intr,
568		− TYPE_PFVF);
	555	+ otx2_queue_vf_work(mbox, pf->mbox_pfvf_wq, 64, vfs, intr);
569	556	if (intr)
570	557	trace_otx2_msg_interrupt(mbox->mbox.pdev, "VF(s) to PF", intr);
571	558	vfs = 64;
@@ -574,7 +561,7 @@ static irqreturn_t otx2_pfvf_mbox_intr_handler(int irq, void *pf_irq) · 2 unmodified lines
574	561	intr = otx2_read64(pf, RVU_PF_VFPF_MBOX_INTX(0));
575	562	otx2_write64(pf, RVU_PF_VFPF_MBOX_INTX(0), intr);
576	563
577		− otx2_queue_work(mbox, pf->mbox_pfvf_wq, 0, vfs, intr, TYPE_PFVF);
	564	+ otx2_queue_vf_work(mbox, pf->mbox_pfvf_wq, 0, vfs, intr);
578	565
579	566	if (intr)
580	567	trace_otx2_msg_interrupt(mbox->mbox.pdev, "VF(s) to PF", intr);
@@ -597,8 +584,9 @@ static int otx2_pfvf_mbox_init(struct otx2_nic *pf, int numvfs) · 16 unmodified lines
597	584	if (!pf->mbox_pfvf)
598	585	return -ENOMEM;
599	586
600		− pf->mbox_pfvf_wq = alloc_ordered_workqueue("otx2_pfvf_mailbox",
601		− WQ_HIGHPRI \| WQ_MEM_RECLAIM);
	587	+ pf->mbox_pfvf_wq = alloc_workqueue("otx2_pfvf_mailbox",
	588	+ WQ_UNBOUND \| WQ_HIGHPRI \|
	589	+ WQ_MEM_RECLAIM, 0);
602	590	if (!pf->mbox_pfvf_wq)
603	591	return -ENOMEM;
604	592
@@ -821,20 +809,22 @@ static void otx2_pfaf_mbox_handler(struct work_struct *work) · 216 unmodified lines
821	809	struct mbox *af_mbox;
822	810	struct otx2_nic *pf;
823	811	int offset, id;
	812	+ u16 num_msgs;
824	813
825	814	af_mbox = container_of(work, struct mbox, mbox_wrk);
826	815	mbox = &af_mbox->mbox;
827	816	mdev = &mbox->dev[0];
828	817	rsp_hdr = (struct mbox_hdr *)(mdev->mbase + mbox->rx_start);
	818	+ num_msgs = rsp_hdr->num_msgs;
829	819
830	820	offset = mbox->rx_start + ALIGN(sizeof(*rsp_hdr), MBOX_MSG_ALIGN);
831	821	pf = af_mbox->pfvf;
832	822
833		− for (id = 0; id < af_mbox->num_msgs; id++) {
	823	+ for (id = 0; id < num_msgs; id++) {
834	824	msg = (struct mbox_msghdr *)(mdev->mbase + offset);
835	825	otx2_process_pfaf_mbox_msg(pf, msg);
836	826	offset = mbox->rx_start + msg->next_msgoff;
837		− if (mdev->msgs_acked == (af_mbox->num_msgs - 1))
	827	+ if (mdev->msgs_acked == (num_msgs - 1))
838	828	__otx2_mbox_reset(mbox, 0);
839	829	mdev->msgs_acked++;
840	830	}
@@ -945,12 +935,14 @@ static void otx2_pfaf_mbox_up_handler(struct work_struct *work) · 104 unmodified lines
945	935	int offset, id, devid = 0;
946	936	struct mbox_hdr *rsp_hdr;
947	937	struct mbox_msghdr *msg;
	938	+ u16 num_msgs;
948	939
949	940	rsp_hdr = (struct mbox_hdr *)(mdev->mbase + mbox->rx_start);
	941	+ num_msgs = rsp_hdr->num_msgs;
950	942
951	943	offset = mbox->rx_start + ALIGN(sizeof(*rsp_hdr), MBOX_MSG_ALIGN);
952	944
953		− for (id = 0; id < af_mbox->up_num_msgs; id++) {
	945	+ for (id = 0; id < num_msgs; id++) {
954	946	msg = (struct mbox_msghdr *)(mdev->mbase + offset);
955	947
956	948	devid = msg->pcifunc & RVU_PFVF_FUNC_MASK;
@@ -959,10 +951,11 @@ static void otx2_pfaf_mbox_up_handler(struct work_struct *work) · 2 unmodified lines
959	951	otx2_process_mbox_msg_up(pf, msg);
960	952	offset = mbox->rx_start + msg->next_msgoff;
961	953	}
962		− if (devid) {
	954	+ /* Forward to VF iff VFs are really present */
	955	+ if (devid && pci_num_vf(pf->pdev)) {
963	956	otx2_forward_vf_mbox_msgs(pf, &pf->mbox.mbox_up,
964	957	MBOX_DIR_PFVF_UP, devid - 1,
965		− af_mbox->up_num_msgs);
	958	+ num_msgs);
966	959	return;
967	960	}
968	961
@@ -972,16 +965,49 @@ static void otx2_pfaf_mbox_up_handler(struct work_struct *work) · 3 unmodified lines
972	965	static irqreturn_t otx2_pfaf_mbox_intr_handler(int irq, void *pf_irq)
973	966	{
974	967	struct otx2_nic pf = (struct otx2_nic )pf_irq;
975		− struct mbox *mbox;
	968	+ struct mbox *mw = &pf->mbox;
	969	+ struct otx2_mbox_dev *mdev;
	970	+ struct otx2_mbox *mbox;
	971	+ struct mbox_hdr *hdr;
	972	+ u64 mbox_data;
976	973
977	974	/* Clear the IRQ */
978	975	otx2_write64(pf, RVU_PF_INT, BIT_ULL(0));
979	976
980		− mbox = &pf->mbox;
981	977
982		− trace_otx2_msg_interrupt(mbox->mbox.pdev, "AF to PF", BIT_ULL(0));
	978	+ mbox_data = otx2_read64(pf, RVU_PF_PFAF_MBOX0);
	979	+
	980	+ if (mbox_data & MBOX_UP_MSG) {
	981	+ mbox_data &= ~MBOX_UP_MSG;
	982	+ otx2_write64(pf, RVU_PF_PFAF_MBOX0, mbox_data);
	983	+
	984	+ mbox = &mw->mbox_up;
	985	+ mdev = &mbox->dev[0];
	986	+ otx2_sync_mbox_bbuf(mbox, 0);
	987	+
	988	+ hdr = (struct mbox_hdr *)(mdev->mbase + mbox->rx_start);
	989	+ if (hdr->num_msgs)
	990	+ queue_work(pf->mbox_wq, &mw->mbox_up_wrk);
	991	+
	992	+ trace_otx2_msg_interrupt(pf->pdev, "UP message from AF to PF",
	993	+ BIT_ULL(0));
	994	+ }
	995	+
	996	+ if (mbox_data & MBOX_DOWN_MSG) {
	997	+ mbox_data &= ~MBOX_DOWN_MSG;
	998	+ otx2_write64(pf, RVU_PF_PFAF_MBOX0, mbox_data);
	999	+
	1000	+ mbox = &mw->mbox;
	1001	+ mdev = &mbox->dev[0];
	1002	+ otx2_sync_mbox_bbuf(mbox, 0);
	1003	+
	1004	+ hdr = (struct mbox_hdr *)(mdev->mbase + mbox->rx_start);
	1005	+ if (hdr->num_msgs)
	1006	+ queue_work(pf->mbox_wq, &mw->mbox_wrk);
983	1007
984		− otx2_queue_work(mbox, pf->mbox_wq, 0, 1, 1, TYPE_PFAF);
	1008	+ trace_otx2_msg_interrupt(pf->pdev, "DOWN reply from AF to PF",
	1009	+ BIT_ULL(0));
	1010	+ }
985	1011
986	1012	return IRQ_HANDLED;
987	1013	}
@@ -3087,6 +3113,7 @@ static void otx2_vf_link_event_task(struct work_struct *work) · 2099 unmodified lines
3087	3113	struct otx2_vf_config *config;
3088	3114	struct cgx_link_info_msg *req;
3089	3115	struct mbox_msghdr *msghdr;
	3116	+ struct delayed_work *dwork;
3090	3117	struct otx2_nic *pf;
3091	3118	int vf_idx;
3092	3119
@@ -3095,10 +3122,24 @@ static void otx2_vf_link_event_task(struct work_struct *work) · 2 unmodified lines
3095	3122	vf_idx = config - config->pf->vf_configs;
3096	3123	pf = config->pf;
3097	3124
	3125	+ if (config->intf_down)
	3126	+ return;
	3127	+
	3128	+ mutex_lock(&pf->mbox.lock);
	3129	+
	3130	+ dwork = &config->link_event_work;
	3131	+
	3132	+ if (!otx2_mbox_wait_for_zero(&pf->mbox_pfvf[0].mbox_up, vf_idx)) {
	3133	+ schedule_delayed_work(dwork, msecs_to_jiffies(100));
	3134	+ mutex_unlock(&pf->mbox.lock);
	3135	+ return;
	3136	+ }
	3137	+
3098	3138	msghdr = otx2_mbox_alloc_msg_rsp(&pf->mbox_pfvf[0].mbox_up, vf_idx,
3099	3139	sizeof(*req), sizeof(struct msg_rsp));
3100	3140	if (!msghdr) {
3101	3141	dev_err(pf->dev, "Failed to create VF%d link event\n", vf_idx);
	3142	+ mutex_unlock(&pf->mbox.lock);
3102	3143	return;
3103	3144	}
3104	3145
@@ -3107,7 +3148,11 @@ static void otx2_vf_link_event_task(struct work_struct *work) · 2 unmodified lines
3107	3148	req->hdr.sig = OTX2_MBOX_REQ_SIG;
3108	3149	memcpy(&req->link_info, &pf->linfo, sizeof(req->link_info));
3109	3150
	3151	+ otx2_mbox_wait_for_zero(&pf->mbox_pfvf[0].mbox_up, vf_idx);
	3152	+
3110	3153	otx2_sync_mbox_up_msg(&pf->mbox_pfvf[0], vf_idx);
	3154	+
	3155	+ mutex_unlock(&pf->mbox.lock);
3111	3156	}
3112	3157
3113	3158	static int otx2_sriov_enable(struct pci_dev *pdev, int numvfs)

drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c+43−28

@@ -89,16 +89,20 @@ static void otx2vf_vfaf_mbox_handler(struct work_struct *work) · 88 unmodified lines
89	89	struct otx2_mbox *mbox;
90	90	struct mbox *af_mbox;
91	91	int offset, id;
	92	+ u16 num_msgs;
92	93
93	94	af_mbox = container_of(work, struct mbox, mbox_wrk);
94	95	mbox = &af_mbox->mbox;
95	96	mdev = &mbox->dev[0];
96	97	rsp_hdr = (struct mbox_hdr *)(mdev->mbase + mbox->rx_start);
97		− if (af_mbox->num_msgs == 0)
	98	+ num_msgs = rsp_hdr->num_msgs;
	99	+
	100	+ if (num_msgs == 0)
98	101	return;
	102	+
99	103	offset = mbox->rx_start + ALIGN(sizeof(*rsp_hdr), MBOX_MSG_ALIGN);
100	104
101		− for (id = 0; id < af_mbox->num_msgs; id++) {
	105	+ for (id = 0; id < num_msgs; id++) {
102	106	msg = (struct mbox_msghdr *)(mdev->mbase + offset);
103	107	otx2vf_process_vfaf_mbox_msg(af_mbox->pfvf, msg);
104	108	offset = mbox->rx_start + msg->next_msgoff;
@@ -151,6 +155,7 @@ static void otx2vf_vfaf_mbox_up_handler(struct work_struct *work) · 46 unmodified lines
151	155	struct mbox *vf_mbox;
152	156	struct otx2_nic *vf;
153	157	int offset, id;
	158	+ u16 num_msgs;
154	159
155	160	vf_mbox = container_of(work, struct mbox, mbox_up_wrk);
156	161	vf = vf_mbox->pfvf;
@@ -158,12 +163,14 @@ static void otx2vf_vfaf_mbox_up_handler(struct work_struct *work) · 1 unmodified line
158	163	mdev = &mbox->dev[0];
159	164
160	165	rsp_hdr = (struct mbox_hdr *)(mdev->mbase + mbox->rx_start);
161		− if (vf_mbox->up_num_msgs == 0)
	166	+ num_msgs = rsp_hdr->num_msgs;
	167	+
	168	+ if (num_msgs == 0)
162	169	return;
163	170
164	171	offset = mbox->rx_start + ALIGN(sizeof(*rsp_hdr), MBOX_MSG_ALIGN);
165	172
166		− for (id = 0; id < vf_mbox->up_num_msgs; id++) {
	173	+ for (id = 0; id < num_msgs; id++) {
167	174	msg = (struct mbox_msghdr *)(mdev->mbase + offset);
168	175	otx2vf_process_mbox_msg_up(vf, msg);
169	176	offset = mbox->rx_start + msg->next_msgoff;
@@ -178,40 +185,48 @@ static irqreturn_t otx2vf_vfaf_mbox_intr_handler(int irq, void *vf_irq) · 8 unmodified lines
178	185	struct otx2_mbox_dev *mdev;
179	186	struct otx2_mbox *mbox;
180	187	struct mbox_hdr *hdr;
	188	+ u64 mbox_data;
181	189
182	190	/* Clear the IRQ */
183	191	otx2_write64(vf, RVU_VF_INT, BIT_ULL(0));
184	192
	193	+ mbox_data = otx2_read64(vf, RVU_VF_VFPF_MBOX0);
	194	+
185	195	/* Read latest mbox data */
186	196	smp_rmb();
187	197
188		− /* Check for PF => VF response messages */
189		− mbox = &vf->mbox.mbox;
190		− mdev = &mbox->dev[0];
191		− otx2_sync_mbox_bbuf(mbox, 0);
	198	+ if (mbox_data & MBOX_DOWN_MSG) {
	199	+ mbox_data &= ~MBOX_DOWN_MSG;
	200	+ otx2_write64(vf, RVU_VF_VFPF_MBOX0, mbox_data);
	201	+
	202	+ /* Check for PF => VF response messages */
	203	+ mbox = &vf->mbox.mbox;
	204	+ mdev = &mbox->dev[0];
	205	+ otx2_sync_mbox_bbuf(mbox, 0);
192	206
193		− trace_otx2_msg_interrupt(mbox->pdev, "PF to VF", BIT_ULL(0));
	207	+ hdr = (struct mbox_hdr *)(mdev->mbase + mbox->rx_start);
	208	+ if (hdr->num_msgs)
	209	+ queue_work(vf->mbox_wq, &vf->mbox.mbox_wrk);
194	210
195		− hdr = (struct mbox_hdr *)(mdev->mbase + mbox->rx_start);
196		− if (hdr->num_msgs) {
197		− vf->mbox.num_msgs = hdr->num_msgs;
198		− hdr->num_msgs = 0;
199		− memset(mbox->hwbase + mbox->rx_start, 0,
200		− ALIGN(sizeof(struct mbox_hdr), sizeof(u64)));
201		− queue_work(vf->mbox_wq, &vf->mbox.mbox_wrk);
	211	+ trace_otx2_msg_interrupt(mbox->pdev, "DOWN reply from PF to VF",
	212	+ BIT_ULL(0));
202	213	}
203		− /* Check for PF => VF notification messages */
204		− mbox = &vf->mbox.mbox_up;
205		− mdev = &mbox->dev[0];
206		− otx2_sync_mbox_bbuf(mbox, 0);
207	214
208		− hdr = (struct mbox_hdr *)(mdev->mbase + mbox->rx_start);
209		− if (hdr->num_msgs) {
210		− vf->mbox.up_num_msgs = hdr->num_msgs;
211		− hdr->num_msgs = 0;
212		− memset(mbox->hwbase + mbox->rx_start, 0,
213		− ALIGN(sizeof(struct mbox_hdr), sizeof(u64)));
214		− queue_work(vf->mbox_wq, &vf->mbox.mbox_up_wrk);
	215	+ if (mbox_data & MBOX_UP_MSG) {
	216	+ mbox_data &= ~MBOX_UP_MSG;
	217	+ otx2_write64(vf, RVU_VF_VFPF_MBOX0, mbox_data);
	218	+
	219	+ /* Check for PF => VF notification messages */
	220	+ mbox = &vf->mbox.mbox_up;
	221	+ mdev = &mbox->dev[0];
	222	+ otx2_sync_mbox_bbuf(mbox, 0);
	223	+
	224	+ hdr = (struct mbox_hdr *)(mdev->mbase + mbox->rx_start);
	225	+ if (hdr->num_msgs)
	226	+ queue_work(vf->mbox_wq, &vf->mbox.mbox_up_wrk);
	227	+
	228	+ trace_otx2_msg_interrupt(mbox->pdev, "UP message from PF to VF",
	229	+ BIT_ULL(0));
215	230	}
216	231
217	232	return IRQ_HANDLED;
@@ -760,8 +775,8 @@ static void otx2vf_remove(struct pci_dev *pdev) · 542 unmodified lines
760	775	otx2_mcam_flow_del(vf);
761	776	otx2_shutdown_tc(vf);
762	777	otx2_shutdown_qos(vf);
763		− otx2vf_disable_mbox_intr(vf);
764	778	otx2_detach_resources(&vf->mbox);
	779	+ otx2vf_disable_mbox_intr(vf);
765	780	free_percpu(vf->hw.lmt_info);
766	781	if (test_bit(CN10K_LMTST, &vf->hw.cap_flag))
767	782	qmem_free(vf->dev, vf->dync_lmt);

drivers/net/ethernet/mediatek/mtk_eth_soc.c+3−4

@@ -677,8 +677,7 @@ static int mtk_mac_finish(struct phylink_config *config, unsigned int mode, · 676 unmodified lines
677	677	mcr_cur = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
678	678	mcr_new = mcr_cur;
679	679	mcr_new \|= MAC_MCR_IPG_CFG \| MAC_MCR_FORCE_MODE \|
680		− MAC_MCR_BACKOFF_EN \| MAC_MCR_BACKPR_EN \| MAC_MCR_FORCE_LINK \|
681		− MAC_MCR_RX_FIFO_CLR_DIS;
	680	+ MAC_MCR_BACKOFF_EN \| MAC_MCR_BACKPR_EN \| MAC_MCR_RX_FIFO_CLR_DIS;
682	681
683	682	/* Only update control register when needed! */
684	683	if (mcr_new != mcr_cur)
@@ -694,7 +693,7 @@ static void mtk_mac_link_down(struct phylink_config *config, unsigned int mode, · 9 unmodified lines
694	693	phylink_config);
695	694	u32 mcr = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
696	695
697		− mcr &= ~(MAC_MCR_TX_EN \| MAC_MCR_RX_EN);
	696	+ mcr &= ~(MAC_MCR_TX_EN \| MAC_MCR_RX_EN \| MAC_MCR_FORCE_LINK);
698	697	mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
699	698	}
700	699
@@ -803,7 +802,7 @@ static void mtk_mac_link_up(struct phylink_config *config, · 102 unmodified lines
803	802	if (rx_pause)
804	803	mcr \|= MAC_MCR_FORCE_RX_FC;
805	804
806		− mcr \|= MAC_MCR_TX_EN \| MAC_MCR_RX_EN;
	805	+ mcr \|= MAC_MCR_TX_EN \| MAC_MCR_RX_EN \| MAC_MCR_FORCE_LINK;
807	806	mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
808	807	}
809	808

drivers/net/ethernet/mediatek/mtk_ppe.c+11−7

@@ -994,7 +994,7 @@ void mtk_ppe_start(struct mtk_ppe *ppe) · 993 unmodified lines
994	994	MTK_PPE_KEEPALIVE_DISABLE) \|
995	995	FIELD_PREP(MTK_PPE_TB_CFG_HASH_MODE, 1) \|
996	996	FIELD_PREP(MTK_PPE_TB_CFG_SCAN_MODE,
997		− MTK_PPE_SCAN_MODE_KEEPALIVE_AGE) \|
	997	+ MTK_PPE_SCAN_MODE_CHECK_AGE) \|
998	998	FIELD_PREP(MTK_PPE_TB_CFG_ENTRY_NUM,
999	999	MTK_PPE_ENTRIES_SHIFT);
1000	1000	if (mtk_is_netsys_v2_or_greater(ppe->eth))
@@ -1090,17 +1090,21 @@ int mtk_ppe_stop(struct mtk_ppe *ppe) · 89 unmodified lines
1090	1090
1091	1091	mtk_ppe_cache_enable(ppe, false);
1092	1092
1093		− /* disable offload engine */
1094		− ppe_clear(ppe, MTK_PPE_GLO_CFG, MTK_PPE_GLO_CFG_EN);
1095		− ppe_w32(ppe, MTK_PPE_FLOW_CFG, 0);
1096		−
1097	1093	/* disable aging */
1098	1094	val = MTK_PPE_TB_CFG_AGE_NON_L4 \|
1099	1095	MTK_PPE_TB_CFG_AGE_UNBIND \|
1100	1096	MTK_PPE_TB_CFG_AGE_TCP \|
1101	1097	MTK_PPE_TB_CFG_AGE_UDP \|
1102		− MTK_PPE_TB_CFG_AGE_TCP_FIN;
	1098	+ MTK_PPE_TB_CFG_AGE_TCP_FIN \|
	1099	+ MTK_PPE_TB_CFG_SCAN_MODE;
1103	1100	ppe_clear(ppe, MTK_PPE_TB_CFG, val);
1104	1101
1105		− return mtk_ppe_wait_busy(ppe);
	1102	+ if (mtk_ppe_wait_busy(ppe))
	1103	+ return -ETIMEDOUT;
	1104	+
	1105	+ /* disable offload engine */
	1106	+ ppe_clear(ppe, MTK_PPE_GLO_CFG, MTK_PPE_GLO_CFG_EN);
	1107	+ ppe_w32(ppe, MTK_PPE_FLOW_CFG, 0);
	1108	+
	1109	+ return 0;
1106	1110	}

drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c+1−1

@@ -571,7 +571,7 @@ static int txgbe_clock_register(struct txgbe *txgbe) · 570 unmodified lines
571	571	char clk_name[32];
572	572	struct clk *clk;
573	573
574		− snprintf(clk_name, sizeof(clk_name), "i2c_designware.%d",
	574	+ snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d",
575	575	pci_dev_id(pdev));
576	576
577	577	clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000);

drivers/net/phy/phy_device.c+2−2

@@ -2831,8 +2831,8 @@ EXPORT_SYMBOL(genphy_resume); · 2830 unmodified lines
2831	2831	int genphy_loopback(struct phy_device *phydev, bool enable)
2832	2832	{
2833	2833	if (enable) {
2834		− u16 val, ctl = BMCR_LOOPBACK;
2835		− int ret;
	2834	+ u16 ctl = BMCR_LOOPBACK;
	2835	+ int ret, val;
2836	2836
2837	2837	ctl \|= mii_bmcr_encode_fixed(phydev->speed, phydev->duplex);
2838	2838

drivers/net/veth.c+0−18

@@ -1464,8 +1464,6 @@ static netdev_features_t veth_fix_features(struct net_device *dev, · 1463 unmodified lines
1464	1464	if (peer_priv->_xdp_prog)
1465	1465	features &= ~NETIF_F_GSO_SOFTWARE;
1466	1466	}
1467		− if (priv->_xdp_prog)
1468		− features \|= NETIF_F_GRO;
1469	1467
1470	1468	return features;
1471	1469	}
@@ -1569,14 +1567,6 @@ static int veth_xdp_set(struct net_device dev, struct bpf_prog prog, · 97 unmodified lines
1569	1567	}
1570	1568
1571	1569	if (!old_prog) {
1572		− if (!veth_gro_requested(dev)) {
1573		− /* user-space did not require GRO, but adding
1574		− * XDP is supposed to get GRO working
1575		− */
1576		− dev->features \|= NETIF_F_GRO;
1577		− netdev_features_change(dev);
1578		− }
1579		−
1580	1570	peer->hw_features &= ~NETIF_F_GSO_SOFTWARE;
1581	1571	peer->max_mtu = max_mtu;
1582	1572	}
@@ -1592,14 +1582,6 @@ static int veth_xdp_set(struct net_device dev, struct bpf_prog prog, · 9 unmodified lines
1592	1582	if (dev->flags & IFF_UP)
1593	1583	veth_disable_xdp(dev);
1594	1584
1595		− /* if user-space did not require GRO, since adding XDP
1596		− * enabled it, clear it now
1597		− */
1598		− if (!veth_gro_requested(dev)) {
1599		− dev->features &= ~NETIF_F_GRO;
1600		− netdev_features_change(dev);
1601		− }
1602		−
1603	1585	if (peer) {
1604	1586	peer->hw_features \|= NETIF_F_GSO_SOFTWARE;
1605	1587	peer->max_mtu = ETH_MAX_MTU;

drivers/net/vmxnet3/vmxnet3_xdp.c+3−3

@@ -382,12 +382,12 @@ vmxnet3_process_xdp(struct vmxnet3_adapter *adapter, · 381 unmodified lines
382	382	page = rbi->page;
383	383	dma_sync_single_for_cpu(&adapter->pdev->dev,
384	384	page_pool_get_dma_addr(page) +
385		− rq->page_pool->p.offset, rcd->len,
	385	+ rq->page_pool->p.offset, rbi->len,
386	386	page_pool_get_dma_dir(rq->page_pool));
387	387
388		− xdp_init_buff(&xdp, rbi->len, &rq->xdp_rxq);
	388	+ xdp_init_buff(&xdp, PAGE_SIZE, &rq->xdp_rxq);
389	389	xdp_prepare_buff(&xdp, page_address(page), rq->page_pool->p.offset,
390		− rcd->len, false);
	390	+ rbi->len, false);
391	391	xdp_buff_clear_frags_flag(&xdp);
392	392
393	393	xdp_prog = rcu_dereference(rq->adapter->xdp_bpf_prog);

drivers/net/wan/fsl_qmc_hdlc.c+1−1

@@ -780,7 +780,7 @@ static const struct of_device_id qmc_hdlc_id_table[] = { · 779 unmodified lines
780	780	{ .compatible = "fsl,qmc-hdlc" },
781	781	{} /* sentinel */
782	782	};
783		−MODULE_DEVICE_TABLE(of, qmc_hdlc_driver);
	783	+MODULE_DEVICE_TABLE(of, qmc_hdlc_id_table);
784	784
785	785	static struct platform_driver qmc_hdlc_driver = {
786	786	.driver = {

drivers/net/wireguard/device.c+2−9

@@ -237,7 +237,6 @@ static const struct net_device_ops netdev_ops = { · 236 unmodified lines
237	237	.ndo_open = wg_open,
238	238	.ndo_stop = wg_stop,
239	239	.ndo_start_xmit = wg_xmit,
240		− .ndo_get_stats64 = dev_get_tstats64
241	240	};
242	241
243	242	static void wg_destruct(struct net_device *dev)
@@ -262,7 +261,6 @@ static void wg_destruct(struct net_device *dev) · 18 unmodified lines
262	261	rcu_barrier(); /* Wait for all the peers to be actually freed. */
263	262	wg_ratelimiter_uninit();
264	263	memzero_explicit(&wg->static_identity, sizeof(wg->static_identity));
265		− free_percpu(dev->tstats);
266	264	kvfree(wg->index_hashtable);
267	265	kvfree(wg->peer_hashtable);
268	266	mutex_unlock(&wg->device_update_lock);
@@ -297,6 +295,7 @@ static void wg_setup(struct net_device *dev) · 28 unmodified lines
297	295	dev->hw_enc_features \|= WG_NETDEV_FEATURES;
298	296	dev->mtu = ETH_DATA_LEN - overhead;
299	297	dev->max_mtu = round_down(INT_MAX, MESSAGE_PADDING_MULTIPLE) - overhead;
	298	+ dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
300	299
301	300	SET_NETDEV_DEVTYPE(dev, &device_type);
302	301
@@ -331,14 +330,10 @@ static int wg_newlink(struct net src_net, struct net_device dev, · 28 unmodified lines
331	330	if (!wg->index_hashtable)
332	331	goto err_free_peer_hashtable;
333	332
334		− dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
335		− if (!dev->tstats)
336		− goto err_free_index_hashtable;
337		−
338	333	wg->handshake_receive_wq = alloc_workqueue("wg-kex-%s",
339	334	WQ_CPU_INTENSIVE \| WQ_FREEZABLE, 0, dev->name);
340	335	if (!wg->handshake_receive_wq)
341		− goto err_free_tstats;
	336	+ goto err_free_index_hashtable;
342	337
343	338	wg->handshake_send_wq = alloc_workqueue("wg-kex-%s",
344	339	WQ_UNBOUND \| WQ_FREEZABLE, 0, dev->name);
@@ -397,8 +392,6 @@ err_destroy_handshake_send: · 52 unmodified lines
397	392	destroy_workqueue(wg->handshake_send_wq);
398	393	err_destroy_handshake_receive:
399	394	destroy_workqueue(wg->handshake_receive_wq);
400		−err_free_tstats:
401		− free_percpu(dev->tstats);
402	395	err_free_index_hashtable:
403	396	kvfree(wg->index_hashtable);
404	397	err_free_peer_hashtable:

drivers/net/wireguard/netlink.c+5−5

@@ -164,8 +164,8 @@ get_peer(struct wg_peer peer, struct sk_buff skb, struct dump_ctx *ctx) · 163 unmodified lines
164	164	if (!allowedips_node)
165	165	goto no_allowedips;
166	166	if (!ctx->allowedips_seq)
167		− ctx->allowedips_seq = peer->device->peer_allowedips.seq;
168		− else if (ctx->allowedips_seq != peer->device->peer_allowedips.seq)
	167	+ ctx->allowedips_seq = ctx->wg->peer_allowedips.seq;
	168	+ else if (ctx->allowedips_seq != ctx->wg->peer_allowedips.seq)
169	169	goto no_allowedips;
170	170
171	171	allowedips_nest = nla_nest_start(skb, WGPEER_A_ALLOWEDIPS);
@@ -255,17 +255,17 @@ static int wg_get_device_dump(struct sk_buff skb, struct netlink_callback cb) · 83 unmodified lines
255	255	if (!peers_nest)
256	256	goto out;
257	257	ret = 0;
258		− /* If the last cursor was removed via list_del_init in peer_remove, then
	258	+ lockdep_assert_held(&wg->device_update_lock);
	259	+ /* If the last cursor was removed in peer_remove or peer_remove_all, then
259	260	* we just treat this the same as there being no more peers left. The
260	261	* reason is that seq_nr should indicate to userspace that this isn't a
261	262	* coherent dump anyway, so they'll try again.
262	263	*/
263	264	if (list_empty(&wg->peer_list) \|\|
264		− (ctx->next_peer && list_empty(&ctx->next_peer->peer_list))) {
	265	+ (ctx->next_peer && ctx->next_peer->is_dead)) {
265	266	nla_nest_cancel(skb, peers_nest);
266	267	goto out;
267	268	}
268		− lockdep_assert_held(&wg->device_update_lock);
269	269	peer = list_prepare_entry(ctx->next_peer, &wg->peer_list, peer_list);
270	270	list_for_each_entry_continue(peer, &wg->peer_list, peer_list) {
271	271	if (get_peer(peer, skb, ctx)) {

drivers/net/wireguard/receive.c+3−3

@@ -251,7 +251,7 @@ static bool decrypt_packet(struct sk_buff skb, struct noise_keypair keypair) · 250 unmodified lines
251	251
252	252	if (unlikely(!READ_ONCE(keypair->receiving.is_valid) \|\|
253	253	wg_birthdate_has_expired(keypair->receiving.birthdate, REJECT_AFTER_TIME) \|\|
254		− keypair->receiving_counter.counter >= REJECT_AFTER_MESSAGES)) {
	254	+ READ_ONCE(keypair->receiving_counter.counter) >= REJECT_AFTER_MESSAGES)) {
255	255	WRITE_ONCE(keypair->receiving.is_valid, false);
256	256	return false;
257	257	}
@@ -318,7 +318,7 @@ static bool counter_validate(struct noise_replay_counter *counter, u64 their_cou · 60 unmodified lines
318	318	for (i = 1; i <= top; ++i)
319	319	counter->backtrack[(i + index_current) &
320	320	((COUNTER_BITS_TOTAL / BITS_PER_LONG) - 1)] = 0;
321		− counter->counter = their_counter;
	321	+ WRITE_ONCE(counter->counter, their_counter);
322	322	}
323	323
324	324	index &= (COUNTER_BITS_TOTAL / BITS_PER_LONG) - 1;
@@ -463,7 +463,7 @@ int wg_packet_rx_poll(struct napi_struct *napi, int budget) · 138 unmodified lines
463	463	net_dbg_ratelimited("%s: Packet has invalid nonce %llu (max %llu)\n",
464	464	peer->device->dev->name,
465	465	PACKET_CB(skb)->nonce,
466		− keypair->receiving_counter.counter);
	466	+ READ_ONCE(keypair->receiving_counter.counter));
467	467	goto next;
468	468	}
469	469

drivers/soc/fsl/qbman/qman.c+14−11

@@ -991,7 +991,7 @@ struct qman_portal { · 990 unmodified lines
991	991	/* linked-list of CSCN handlers. */
992	992	struct list_head cgr_cbs;
993	993	/* list lock */
994		− spinlock_t cgr_lock;
	994	+ raw_spinlock_t cgr_lock;
995	995	struct work_struct congestion_work;
996	996	struct work_struct mr_work;
997	997	char irqname[MAX_IRQNAME];
@@ -1281,7 +1281,7 @@ static int qman_create_portal(struct qman_portal *portal, · 283 unmodified lines
1281	1281	/* if the given mask is NULL, assume all CGRs can be seen */
1282	1282	qman_cgrs_fill(&portal->cgrs[0]);
1283	1283	INIT_LIST_HEAD(&portal->cgr_cbs);
1284		− spin_lock_init(&portal->cgr_lock);
	1284	+ raw_spin_lock_init(&portal->cgr_lock);
1285	1285	INIT_WORK(&portal->congestion_work, qm_congestion_task);
1286	1286	INIT_WORK(&portal->mr_work, qm_mr_process_task);
1287	1287	portal->bits = 0;
@@ -1456,11 +1456,14 @@ static void qm_congestion_task(struct work_struct *work) · 168 unmodified lines
1456	1456	union qm_mc_result *mcr;
1457	1457	struct qman_cgr *cgr;
1458	1458
1459		− spin_lock(&p->cgr_lock);
	1459	+ /*
	1460	+ * FIXME: QM_MCR_TIMEOUT is 10ms, which is too long for a raw spinlock!
	1461	+ */
	1462	+ raw_spin_lock_irq(&p->cgr_lock);
1460	1463	qm_mc_start(&p->p);
1461	1464	qm_mc_commit(&p->p, QM_MCC_VERB_QUERYCONGESTION);
1462	1465	if (!qm_mc_result_timeout(&p->p, &mcr)) {
1463		− spin_unlock(&p->cgr_lock);
	1466	+ raw_spin_unlock_irq(&p->cgr_lock);
1464	1467	dev_crit(p->config->dev, "QUERYCONGESTION timeout\n");
1465	1468	qman_p_irqsource_add(p, QM_PIRQ_CSCI);
1466	1469	return;
@@ -1476,7 +1479,7 @@ static void qm_congestion_task(struct work_struct *work) · 9 unmodified lines
1476	1479	list_for_each_entry(cgr, &p->cgr_cbs, node)
1477	1480	if (cgr->cb && qman_cgrs_get(&c, cgr->cgrid))
1478	1481	cgr->cb(p, cgr, qman_cgrs_get(&rr, cgr->cgrid));
1479		− spin_unlock(&p->cgr_lock);
	1482	+ raw_spin_unlock_irq(&p->cgr_lock);
1480	1483	qman_p_irqsource_add(p, QM_PIRQ_CSCI);
1481	1484	}
1482	1485
@@ -2440,7 +2443,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, · 957 unmodified lines
2440	2443	preempt_enable();
2441	2444
2442	2445	cgr->chan = p->config->channel;
2443		− spin_lock(&p->cgr_lock);
	2446	+ raw_spin_lock_irq(&p->cgr_lock);
2444	2447
2445	2448	if (opts) {
2446	2449	struct qm_mcc_initcgr local_opts = *opts;
@@ -2477,7 +2480,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, · 30 unmodified lines
2477	2480	qman_cgrs_get(&p->cgrs[1], cgr->cgrid))
2478	2481	cgr->cb(p, cgr, 1);
2479	2482	out:
2480		− spin_unlock(&p->cgr_lock);
	2483	+ raw_spin_unlock_irq(&p->cgr_lock);
2481	2484	put_affine_portal();
2482	2485	return ret;
2483	2486	}
@@ -2512,7 +2515,7 @@ int qman_delete_cgr(struct qman_cgr *cgr) · 28 unmodified lines
2512	2515	return -EINVAL;
2513	2516
2514	2517	memset(&local_opts, 0, sizeof(struct qm_mcc_initcgr));
2515		− spin_lock_irqsave(&p->cgr_lock, irqflags);
	2518	+ raw_spin_lock_irqsave(&p->cgr_lock, irqflags);
2516	2519	list_del(&cgr->node);
2517	2520	/*
2518	2521	* If there are no other CGR objects for this CGRID in the list,
@@ -2537,7 +2540,7 @@ int qman_delete_cgr(struct qman_cgr *cgr) · 18 unmodified lines
2537	2540	/* add back to the list */
2538	2541	list_add(&cgr->node, &p->cgr_cbs);
2539	2542	release_lock:
2540		− spin_unlock_irqrestore(&p->cgr_lock, irqflags);
	2543	+ raw_spin_unlock_irqrestore(&p->cgr_lock, irqflags);
2541	2544	put_affine_portal();
2542	2545	return ret;
2543	2546	}
@@ -2577,9 +2580,9 @@ static int qman_update_cgr(struct qman_cgr cgr, struct qm_mcc_initcgr opts) · 33 unmodified lines
2577	2580	if (!p)
2578	2581	return -EINVAL;
2579	2582
2580		− spin_lock_irqsave(&p->cgr_lock, irqflags);
	2583	+ raw_spin_lock_irqsave(&p->cgr_lock, irqflags);
2581	2584	ret = qm_modify_cgr(cgr, 0, opts);
2582		− spin_unlock_irqrestore(&p->cgr_lock, irqflags);
	2585	+ raw_spin_unlock_irqrestore(&p->cgr_lock, irqflags);
2583	2586	put_affine_portal();
2584	2587	return ret;
2585	2588	}

include/linux/bitmap.h+23−21

@@ -522,17 +522,18 @@ static inline void bitmap_replace(unsigned long *dst, · 521 unmodified lines
522	522	*
523	523	* (Bits 0, 1, 2, 3, 4, 5 are copied to the bits 0, 1, 4, 8, 9, 12)
524	524	*
525		− * A more 'visual' description of the operation:
526		− * src: 0000000001011010
527		− * \|\|\|\|\|\|
528		− * +------+\|\|\|\|\|
529		− * \| +----+\|\|\|\|
530		− * \| \|+----+\|\|\|
531		− * \| \|\| +-+\|\|
532		− * \| \|\| \| \|\|
533		− * mask: ...v..vv...v..vv
534		− * ...0..11...0..10
535		− * dst: 0000001100000010
	525	+ * A more 'visual' description of the operation::
	526	+ *
	527	+ * src: 0000000001011010
	528	+ * \|\|\|\|\|\|
	529	+ * +------+\|\|\|\|\|
	530	+ * \| +----+\|\|\|\|
	531	+ * \| \|+----+\|\|\|
	532	+ * \| \|\| +-+\|\|
	533	+ * \| \|\| \| \|\|
	534	+ * mask: ...v..vv...v..vv
	535	+ * ...0..11...0..10
	536	+ * dst: 0000001100000010
536	537	*
537	538	* A relationship exists between bitmap_scatter() and bitmap_gather().
538	539	* bitmap_gather() can be seen as the 'reverse' bitmap_scatter() operation.
@@ -568,16 +569,17 @@ static inline void bitmap_scatter(unsigned long dst, const unsigned long src, · 29 unmodified lines
568	569	*
569	570	* (Bits 0, 1, 4, 8, 9, 12 are copied to the bits 0, 1, 2, 3, 4, 5)
570	571	*
571		− * A more 'visual' description of the operation:
572		− * mask: ...v..vv...v..vv
573		− * src: 0000001100000010
574		− * ^ ^^ ^ 0
575		− * \| \|\| \| 10
576		− * \| \|\| > 010
577		− * \| \|+--> 1010
578		− * \| +--> 11010
579		− * +----> 011010
580		− * dst: 0000000000011010
	572	+ * A more 'visual' description of the operation::
	573	+ *
	574	+ * mask: ...v..vv...v..vv
	575	+ * src: 0000001100000010
	576	+ * ^ ^^ ^ 0
	577	+ * \| \|\| \| 10
	578	+ * \| \|\| > 010
	579	+ * \| \|+--> 1010
	580	+ * \| +--> 11010
	581	+ * +----> 011010
	582	+ * dst: 0000000000011010
581	583	*
582	584	* A relationship exists between bitmap_gather() and bitmap_scatter(). See
583	585	* bitmap_scatter() for the bitmap scatter detailed operations.

include/linux/netdevice.h+1−1

@@ -2072,6 +2072,7 @@ struct net_device { · 2071 unmodified lines
2072	2072	struct pcpu_sw_netstats __percpu *tstats;
2073	2073	struct pcpu_dstats __percpu *dstats;
2074	2074	};
	2075	+ unsigned long state;
2075	2076	unsigned int flags;
2076	2077	unsigned short hard_header_len;
2077	2078	netdev_features_t features;
@@ -2117,7 +2118,6 @@ struct net_device { · 39 unmodified lines
2117	2118	* part of the usual set specified in Space.c.
2118	2119	*/
2119	2120
2120		− unsigned long state;
2121	2121
2122	2122	struct list_head dev_list;
2123	2123	struct list_head napi_list;

include/linux/rcupdate.h+31−0

@@ -247,6 +247,37 @@ do { \ · 246 unmodified lines
247	247	cond_resched(); \
248	248	} while (0)
249	249
	250	+/**
	251	+ * rcu_softirq_qs_periodic - Report RCU and RCU-Tasks quiescent states
	252	+ * @old_ts: jiffies at start of processing.
	253	+ *
	254	+ * This helper is for long-running softirq handlers, such as NAPI threads in
	255	+ * networking. The caller should initialize the variable passed in as @old_ts
	256	+ * at the beginning of the softirq handler. When invoked frequently, this macro
	257	+ * will invoke rcu_softirq_qs() every 100 milliseconds thereafter, which will
	258	+ * provide both RCU and RCU-Tasks quiescent states. Note that this macro
	259	+ * modifies its old_ts argument.
	260	+ *
	261	+ * Because regions of code that have disabled softirq act as RCU read-side
	262	+ * critical sections, this macro should be invoked with softirq (and
	263	+ * preemption) enabled.
	264	+ *
	265	+ * The macro is not needed when CONFIG_PREEMPT_RT is defined. RT kernels would
	266	+ * have more chance to invoke schedule() calls and provide necessary quiescent
	267	+ * states. As a contrast, calling cond_resched() only won't achieve the same
	268	+ * effect because cond_resched() does not provide RCU-Tasks quiescent states.
	269	+ */
	270	+#define rcu_softirq_qs_periodic(old_ts) \
	271	+do { \
	272	+ if (!IS_ENABLED(CONFIG_PREEMPT_RT) && \
	273	+ time_after(jiffies, (old_ts) + HZ / 10)) { \
	274	+ preempt_disable(); \
	275	+ rcu_softirq_qs(); \
	276	+ preempt_enable(); \
	277	+ (old_ts) = jiffies; \
	278	+ } \
	279	+} while (0)
	280	+
250	281	/*
251	282	* Infrastructure to implement the synchronize_() primitives in
252	283	* TREE_RCU and rcu_barrier_() primitives in TINY_RCU.

include/linux/skbuff.h+13−3

@@ -822,9 +822,9 @@ typedef unsigned char *sk_buff_data_t; · 821 unmodified lines
822	822	* @decrypted: Decrypted SKB
823	823	* @slow_gro: state present at GRO time, slower prepare step required
824	824	* @mono_delivery_time: When set, skb->tstamp has the
825		− * delivery_time in mono clock base (i.e., EDT) or a clock base chosen
826		− * by SO_TXTIME. If zero, skb->tstamp has the (rcv) timestamp at
827		− * ingress.
	825	+ * delivery_time in mono clock base (i.e. EDT). Otherwise, the
	826	+ * skb->tstamp has the (rcv) timestamp at ingress and
	827	+ * delivery_time at egress.
828	828	* @napi_id: id of the NAPI struct this skb came from
829	829	* @sender_cpu: (aka @napi_id) source CPU in XPS
830	830	* @alloc_cpu: CPU which did the skb allocation.
@@ -3523,6 +3523,16 @@ int skb_cow_data_for_xdp(struct page_pool pool, struct sk_buff *pskb, · 2692 unmodified lines
3523	3523	struct bpf_prog *prog);
3524	3524	bool napi_pp_put_page(struct page *page, bool napi_safe);
3525	3525
	3526	+static inline void
	3527	+skb_page_unref(const struct sk_buff skb, struct page page, bool napi_safe)
	3528	+{
	3529	+#ifdef CONFIG_PAGE_POOL
	3530	+ if (skb->pp_recycle && napi_pp_put_page(page, napi_safe))
	3531	+ return;
	3532	+#endif
	3533	+ put_page(page);
	3534	+}
	3535	+
3526	3536	static inline void
3527	3537	napi_frag_unref(skb_frag_t *frag, bool recycle, bool napi_safe)
3528	3538	{

include/linux/socket.h+0−7

@@ -422,13 +422,6 @@ extern long __sys_recvmsg_sock(struct socket sock, struct msghdr msg, · 421 unmodified lines
422	422	struct user_msghdr __user *umsg,
423	423	struct sockaddr __user *uaddr,
424	424	unsigned int flags);
425		−extern int sendmsg_copy_msghdr(struct msghdr *msg,
426		− struct user_msghdr __user *umsg, unsigned flags,
427		− struct iovec **iov);
428		−extern int recvmsg_copy_msghdr(struct msghdr *msg,
429		− struct user_msghdr __user *umsg, unsigned flags,
430		− struct sockaddr __user **uaddr,
431		− struct iovec **iov);
432	425	extern int __copy_msghdr(struct msghdr *kmsg,
433	426	struct user_msghdr *umsg,
434	427	struct sockaddr __user **save_addr);

include/net/request_sock.h+6−1

@@ -61,7 +61,11 @@ struct request_sock { · 60 unmodified lines
61	61	struct request_sock *dl_next;
62	62	u16 mss;
63	63	u8 num_retrans; /* number of retransmits */
64		− u8 syncookie:1; /* syncookie: encode tcpopts in timestamp */
	64	+ u8 syncookie:1; /* True if
	65	+ * 1) tcpopts needs to be encoded in
	66	+ * TS of SYN+ACK
	67	+ * 2) ACK is validated by BPF kfunc.
	68	+ */
65	69	u8 num_timeout:7; /* number of timeouts */
66	70	u32 ts_recent;
67	71	struct timer_list rsk_timer;
@@ -144,6 +148,7 @@ reqsk_alloc(const struct request_sock_ops ops, struct sock sk_listener, · 76 unmodified lines
144	148	sk_node_init(&req_to_sk(req)->sk_node);
145	149	sk_tx_queue_clear(req_to_sk(req));
146	150	req->saved_syn = NULL;
	151	+ req->syncookie = 0;
147	152	req->timeout = 0;
148	153	req->num_timeout = 0;
149	154	req->num_retrans = 0;

kernel/bpf/cpumap.c+3−0

@@ -263,6 +263,7 @@ static int cpu_map_bpf_prog_run(struct bpf_cpu_map_entry rcpu, void *frames, · 262 unmodified lines
263	263	static int cpu_map_kthread_run(void *data)
264	264	{
265	265	struct bpf_cpu_map_entry *rcpu = data;
	266	+ unsigned long last_qs = jiffies;
266	267
267	268	complete(&rcpu->kthread_running);
268	269	set_current_state(TASK_INTERRUPTIBLE);
@@ -288,10 +289,12 @@ static int cpu_map_kthread_run(void *data) · 19 unmodified lines
288	289	if (__ptr_ring_empty(rcpu->queue)) {
289	290	schedule();
290	291	sched = 1;
	292	+ last_qs = jiffies;
291	293	} else {
292	294	__set_current_state(TASK_RUNNING);
293	295	}
294	296	} else {
	297	+ rcu_softirq_qs_periodic(last_qs);
295	298	sched = cond_resched();
296	299	}
297	300

net/core/dev.c+6−2

@@ -2245,7 +2245,7 @@ void dev_queue_xmit_nit(struct sk_buff skb, struct net_device dev) · 2244 unmodified lines
2245	2245	rcu_read_lock();
2246	2246	again:
2247	2247	list_for_each_entry_rcu(ptype, ptype_list, list) {
2248		− if (ptype->ignore_outgoing)
	2248	+ if (READ_ONCE(ptype->ignore_outgoing))
2249	2249	continue;
2250	2250
2251	2251	/* Never send packets back to the socket
@@ -6743,6 +6743,8 @@ static int napi_threaded_poll(void *data) · 4491 unmodified lines
6743	6743	void *have;
6744	6744
6745	6745	while (!napi_thread_wait(napi)) {
	6746	+ unsigned long last_qs = jiffies;
	6747	+
6746	6748	for (;;) {
6747	6749	bool repoll = false;
6748	6750
@@ -6767,6 +6769,7 @@ static int napi_threaded_poll(void *data) · 18 unmodified lines
6767	6769	if (!repoll)
6768	6770	break;
6769	6771
	6772	+ rcu_softirq_qs_periodic(last_qs);
6770	6773	cond_resched();
6771	6774	}
6772	6775	}
@@ -11665,11 +11668,12 @@ static void __init net_dev_struct_check(void) · 4892 unmodified lines
11665	11668
11666	11669	/* TXRX read-mostly hotpath */
11667	11670	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, lstats);
	11671	+ CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, state);
11668	11672	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, flags);
11669	11673	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, hard_header_len);
11670	11674	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, features);
11671	11675	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_txrx, ip6_ptr);
11672		− CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_txrx, 38);
	11676	+ CACHELINE_ASSERT_GROUP_SIZE(struct net_device, net_device_read_txrx, 46);
11673	11677
11674	11678	/* RX read-mostly hotpath */
11675	11679	CACHELINE_ASSERT_GROUP_MEMBER(struct net_device, net_device_read_rx, ptype_specific);

net/devlink/netlink.c+7−6

@@ -193,12 +193,13 @@ devlink_get_from_attrs_lock(struct net net, struct nlattr *attrs, · 192 unmodified lines
193	193	devname = nla_data(attrs[DEVLINK_ATTR_DEV_NAME]);
194	194
195	195	devlinks_xa_for_each_registered_get(net, index, devlink) {
196		− devl_dev_lock(devlink, dev_lock);
197		− if (devl_is_registered(devlink) &&
198		− strcmp(devlink->dev->bus->name, busname) == 0 &&
199		− strcmp(dev_name(devlink->dev), devname) == 0)
200		− return devlink;
201		− devl_dev_unlock(devlink, dev_lock);
	196	+ if (strcmp(devlink->dev->bus->name, busname) == 0 &&
	197	+ strcmp(dev_name(devlink->dev), devname) == 0) {
	198	+ devl_dev_lock(devlink, dev_lock);
	199	+ if (devl_is_registered(devlink))
	200	+ return devlink;
	201	+ devl_dev_unlock(devlink, dev_lock);
	202	+ }
202	203	devlink_put(devlink);
203	204	}
204	205

net/devlink/port.c+1−1

@@ -889,7 +889,7 @@ int devlink_nl_port_new_doit(struct sk_buff skb, struct genl_info info) · 888 unmodified lines
889	889	err = -ENOMEM;
890	890	goto err_out_port_del;
891	891	}
892		− err = devlink_nl_port_fill(msg, devlink_port, DEVLINK_CMD_NEW,
	892	+ err = devlink_nl_port_fill(msg, devlink_port, DEVLINK_CMD_PORT_NEW,
893	893	info->snd_portid, info->snd_seq, 0, NULL);
894	894	if (WARN_ON_ONCE(err))
895	895	goto err_out_msg_free;

net/hsr/hsr_framereg.c+4−0

@@ -228,6 +228,10 @@ struct hsr_node hsr_get_node(struct hsr_port port, struct list_head *node_db, · 227 unmodified lines
228	228	*/
229	229	if (ethhdr->h_proto == htons(ETH_P_PRP) \|\|
230	230	ethhdr->h_proto == htons(ETH_P_HSR)) {
	231	+ /* Check if skb contains hsr_ethhdr */
	232	+ if (skb->mac_len < sizeof(struct hsr_ethhdr))
	233	+ return NULL;
	234	+
231	235	/* Use the existing sequence_nr from the tag as starting point
232	236	* for filtering duplicate frames.
233	237	*/

net/hsr/hsr_main.c+11−4

@@ -148,14 +148,21 @@ static struct notifier_block hsr_nb = { · 147 unmodified lines
148	148
149	149	static int __init hsr_init(void)
150	150	{
151		− int res;
	151	+ int err;
152	152
153	153	BUILD_BUG_ON(sizeof(struct hsr_tag) != HSR_HLEN);
154	154
155		− register_netdevice_notifier(&hsr_nb);
156		− res = hsr_netlink_init();
	155	+ err = register_netdevice_notifier(&hsr_nb);
	156	+ if (err)
	157	+ return err;
	158	+
	159	+ err = hsr_netlink_init();
	160	+ if (err) {
	161	+ unregister_netdevice_notifier(&hsr_nb);
	162	+ return err;
	163	+ }
157	164
158		− return res;
	165	+ return 0;
159	166	}
160	167
161	168	static void __exit hsr_exit(void)

net/ipv4/esp4.c+4−4

@@ -95,7 +95,7 @@ static inline struct scatterlist esp_req_sg(struct crypto_aead aead, · 94 unmodified lines
95	95	__alignof__(struct scatterlist));
96	96	}
97	97
98		−static void esp_ssg_unref(struct xfrm_state x, void tmp)
	98	+static void esp_ssg_unref(struct xfrm_state x, void tmp, struct sk_buff *skb)
99	99	{
100	100	struct crypto_aead *aead = x->data;
101	101	int extralen = 0;
@@ -114,7 +114,7 @@ static void esp_ssg_unref(struct xfrm_state x, void tmp) · 12 unmodified lines
114	114	*/
115	115	if (req->src != req->dst)
116	116	for (sg = sg_next(req->src); sg; sg = sg_next(sg))
117		− put_page(sg_page(sg));
	117	+ skb_page_unref(skb, sg_page(sg), false);
118	118	}
119	119
120	120	#ifdef CONFIG_INET_ESPINTCP
@@ -260,7 +260,7 @@ static void esp_output_done(void *data, int err) · 139 unmodified lines
260	260	}
261	261
262	262	tmp = ESP_SKB_CB(skb)->tmp;
263		− esp_ssg_unref(x, tmp);
	263	+ esp_ssg_unref(x, tmp, skb);
264	264	kfree(tmp);
265	265
266	266	if (xo && (xo->flags & XFRM_DEV_RESUME)) {
@@ -639,7 +639,7 @@ int esp_output_tail(struct xfrm_state x, struct sk_buff skb, struct esp_info * · 372 unmodified lines
639	639	}
640	640
641	641	if (sg != dsg)
642		− esp_ssg_unref(x, tmp);
	642	+ esp_ssg_unref(x, tmp, skb);
643	643
644	644	if (!err && x->encap && x->encap->encap_type == TCP_ENCAP_ESPINTCP)
645	645	err = esp_output_tail_tcp(x, skb);

net/ipv4/inet_hashtables.c+1−1

@@ -1135,7 +1135,7 @@ error: · 1134 unmodified lines
1135	1135	sock_prot_inuse_add(net, sk->sk_prot, -1);
1136	1136
1137	1137	spin_lock(lock);
1138		− sk_nulls_del_node_init_rcu(sk);
	1138	+ __sk_nulls_del_node_init_rcu(sk);
1139	1139	spin_unlock(lock);
1140	1140
1141	1141	sk->sk_hash = 0;

net/ipv4/inet_timewait_sock.c+19−22

@@ -263,12 +263,12 @@ void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo, bool rearm) · 262 unmodified lines
263	263	}
264	264	EXPORT_SYMBOL_GPL(__inet_twsk_schedule);
265	265
	266	+/* Remove all non full sockets (TIME_WAIT and NEW_SYN_RECV) for dead netns */
266	267	void inet_twsk_purge(struct inet_hashinfo *hashinfo, int family)
267	268	{
268		− struct inet_timewait_sock *tw;
269		− struct sock *sk;
270	269	struct hlist_nulls_node *node;
271	270	unsigned int slot;
	271	+ struct sock *sk;
272	272
273	273	for (slot = 0; slot <= hashinfo->ehash_mask; slot++) {
274	274	struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
@@ -277,38 +277,35 @@ restart_rcu: · 2 unmodified lines
277	277	rcu_read_lock();
278	278	restart:
279	279	sk_nulls_for_each_rcu(sk, node, &head->chain) {
280		− if (sk->sk_state != TCP_TIME_WAIT) {
281		− /* A kernel listener socket might not hold refcnt for net,
282		− * so reqsk_timer_handler() could be fired after net is
283		− * freed. Userspace listener and reqsk never exist here.
284		− */
285		− if (unlikely(sk->sk_state == TCP_NEW_SYN_RECV &&
286		− hashinfo->pernet)) {
287		− struct request_sock *req = inet_reqsk(sk);
288		−
289		− inet_csk_reqsk_queue_drop_and_put(req->rsk_listener, req);
290		− }
	280	+ int state = inet_sk_state_load(sk);
291	281
	282	+ if ((1 << state) & ~(TCPF_TIME_WAIT \|
	283	+ TCPF_NEW_SYN_RECV))
292	284	continue;
293		− }
294	285
295		− tw = inet_twsk(sk);
296		− if ((tw->tw_family != family) \|\|
297		− refcount_read(&twsk_net(tw)->ns.count))
	286	+ if (sk->sk_family != family \|\|
	287	+ refcount_read(&sock_net(sk)->ns.count))
298	288	continue;
299	289
300		− if (unlikely(!refcount_inc_not_zero(&tw->tw_refcnt)))
	290	+ if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt)))
301	291	continue;
302	292
303		− if (unlikely((tw->tw_family != family) \|\|
304		− refcount_read(&twsk_net(tw)->ns.count))) {
305		− inet_twsk_put(tw);
	293	+ if (unlikely(sk->sk_family != family \|\|
	294	+ refcount_read(&sock_net(sk)->ns.count))) {
	295	+ sock_gen_put(sk);
306	296	goto restart;
307	297	}
308	298
309	299	rcu_read_unlock();
310	300	local_bh_disable();
311		− inet_twsk_deschedule_put(tw);
	301	+ if (state == TCP_TIME_WAIT) {
	302	+ inet_twsk_deschedule_put(inet_twsk(sk));
	303	+ } else {
	304	+ struct request_sock *req = inet_reqsk(sk);
	305	+
	306	+ inet_csk_reqsk_queue_drop_and_put(req->rsk_listener,
	307	+ req);
	308	+ }
312	309	local_bh_enable();
313	310	goto restart_rcu;
314	311	}

net/ipv4/ip_output.c+0−1

@@ -1458,7 +1458,6 @@ struct sk_buff __ip_make_skb(struct sock sk, · 1457 unmodified lines
1458	1458	skb->priority = (cork->tos != -1) ? cork->priority: READ_ONCE(sk->sk_priority);
1459	1459	skb->mark = cork->mark;
1460	1460	skb->tstamp = cork->transmit_time;
1461		− skb->mono_delivery_time = !!skb->tstamp;
1462	1461	/*
1463	1462	* Steal rt from cork.dst to avoid a pair of atomic_inc/atomic_dec
1464	1463	* on dst refcount

net/ipv4/raw.c+1−1

@@ -357,10 +357,10 @@ static int raw_send_hdrinc(struct sock sk, struct flowi4 fl4, · 356 unmodified lines
357	357	goto error;
358	358	skb_reserve(skb, hlen);
359	359
	360	+ skb->protocol = htons(ETH_P_IP);
360	361	skb->priority = READ_ONCE(sk->sk_priority);
361	362	skb->mark = sockc->mark;
362	363	skb->tstamp = sockc->transmit_time;
363		− skb->mono_delivery_time = !!skb->tstamp;
364	364	skb_dst_set(skb, &rt->dst);
365	365	*rtp = NULL;
366	366

net/ipv4/syncookies.c+3−0

@@ -474,6 +474,9 @@ struct sock cookie_v4_check(struct sock sk, struct sk_buff *skb) · 473 unmodified lines
474	474	ireq->wscale_ok, &rcv_wscale,
475	475	dst_metric(&rt->dst, RTAX_INITRWND));
476	476
	477	+ /* req->syncookie is set true only if ACK is validated
	478	+ * by BPF kfunc, then, rcv_wscale is already configured.
	479	+ */
477	480	if (!req->syncookie)
478	481	ireq->rcv_wscale = rcv_wscale;
479	482	ireq->ecn_ok &= cookie_ecn_ok(net, &rt->dst);

net/ipv4/tcp_minisocks.c+0−4

@@ -398,10 +398,6 @@ void tcp_twsk_purge(struct list_head *net_exit_list, int family) · 397 unmodified lines
398	398	/* Even if tw_refcount == 1, we must clean up kernel reqsk */
399	399	inet_twsk_purge(net->ipv4.tcp_death_row.hashinfo, family);
400	400	} else if (!purged_once) {
401		− /* The last refcount is decremented in tcp_sk_exit_batch() */
402		− if (refcount_read(&net->ipv4.tcp_death_row.tw_refcount) == 1)
403		− continue;
404		−
405	401	inet_twsk_purge(&tcp_hashinfo, family);
406	402	purged_once = true;
407	403	}

net/ipv6/esp6.c+4−4

@@ -112,7 +112,7 @@ static inline struct scatterlist esp_req_sg(struct crypto_aead aead, · 111 unmodified lines
112	112	__alignof__(struct scatterlist));
113	113	}
114	114
115		−static void esp_ssg_unref(struct xfrm_state x, void tmp)
	115	+static void esp_ssg_unref(struct xfrm_state x, void tmp, struct sk_buff *skb)
116	116	{
117	117	struct crypto_aead *aead = x->data;
118	118	int extralen = 0;
@@ -131,7 +131,7 @@ static void esp_ssg_unref(struct xfrm_state x, void tmp) · 12 unmodified lines
131	131	*/
132	132	if (req->src != req->dst)
133	133	for (sg = sg_next(req->src); sg; sg = sg_next(sg))
134		− put_page(sg_page(sg));
	134	+ skb_page_unref(skb, sg_page(sg), false);
135	135	}
136	136
137	137	#ifdef CONFIG_INET6_ESPINTCP
@@ -294,7 +294,7 @@ static void esp_output_done(void *data, int err) · 156 unmodified lines
294	294	}
295	295
296	296	tmp = ESP_SKB_CB(skb)->tmp;
297		− esp_ssg_unref(x, tmp);
	297	+ esp_ssg_unref(x, tmp, skb);
298	298	kfree(tmp);
299	299
300	300	esp_output_encap_csum(skb);
@@ -677,7 +677,7 @@ int esp6_output_tail(struct xfrm_state x, struct sk_buff skb, struct esp_info · 376 unmodified lines
677	677	}
678	678
679	679	if (sg != dsg)
680		− esp_ssg_unref(x, tmp);
	680	+ esp_ssg_unref(x, tmp, skb);
681	681
682	682	if (!err && x->encap && x->encap->encap_type == TCP_ENCAP_ESPINTCP)
683	683	err = esp_output_tail_tcp(x, skb);

net/ipv6/ip6_output.c+1−1

@@ -1925,7 +1925,7 @@ struct sk_buff __ip6_make_skb(struct sock sk, · 1924 unmodified lines
1925	1925	skb->priority = READ_ONCE(sk->sk_priority);
1926	1926	skb->mark = cork->base.mark;
1927	1927	skb->tstamp = cork->base.transmit_time;
1928		− skb->mono_delivery_time = !!skb->tstamp;
	1928	+
1929	1929	ip6_cork_steal_dst(skb, cork);
1930	1930	IP6_INC_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUTREQUESTS);
1931	1931	if (proto == IPPROTO_ICMPV6) {

net/ipv6/raw.c+1−1

@@ -622,7 +622,7 @@ static int rawv6_send_hdrinc(struct sock sk, struct msghdr msg, int length, · 621 unmodified lines
622	622	skb->priority = READ_ONCE(sk->sk_priority);
623	623	skb->mark = sockc->mark;
624	624	skb->tstamp = sockc->transmit_time;
625		− skb->mono_delivery_time = !!skb->tstamp;
	625	+
626	626	skb_put(skb, length);
627	627	skb_reset_network_header(skb);
628	628	iph = ipv6_hdr(skb);

net/ipv6/syncookies.c+3−0

@@ -258,6 +258,9 @@ struct sock cookie_v6_check(struct sock sk, struct sk_buff *skb) · 257 unmodified lines
258	258	ireq->wscale_ok, &rcv_wscale,
259	259	dst_metric(dst, RTAX_INITRWND));
260	260
	261	+ /* req->syncookie is set true only if ACK is validated
	262	+ * by BPF kfunc, then, rcv_wscale is already configured.
	263	+ */
261	264	if (!req->syncookie)
262	265	ireq->rcv_wscale = rcv_wscale;
263	266	ireq->ecn_ok &= cookie_ecn_ok(net, dst);

net/netfilter/nf_tables_api.c+15−14

@@ -1213,7 +1213,7 @@ static int nf_tables_updtable(struct nft_ctx *ctx) · 1212 unmodified lines
1213	1213	if (flags & ~NFT_TABLE_F_MASK)
1214	1214	return -EOPNOTSUPP;
1215	1215
1216		− if (flags == ctx->table->flags)
	1216	+ if (flags == (ctx->table->flags & NFT_TABLE_F_MASK))
1217	1217	return 0;
1218	1218
1219	1219	if ((nft_table_has_owner(ctx->table) &&
@@ -2631,19 +2631,6 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy, · 1411 unmodified lines
2631	2631	}
2632	2632	}
2633	2633
2634		− if (nla[NFTA_CHAIN_COUNTERS]) {
2635		− if (!nft_is_base_chain(chain)) {
2636		− err = -EOPNOTSUPP;
2637		− goto err_hooks;
2638		− }
2639		−
2640		− stats = nft_stats_alloc(nla[NFTA_CHAIN_COUNTERS]);
2641		− if (IS_ERR(stats)) {
2642		− err = PTR_ERR(stats);
2643		− goto err_hooks;
2644		− }
2645		− }
2646		−
2647	2634	if (!(table->flags & NFT_TABLE_F_DORMANT) &&
2648	2635	nft_is_base_chain(chain) &&
2649	2636	!list_empty(&hook.list)) {
@@ -2658,6 +2645,20 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy, · 8 unmodified lines
2658	2645	}
2659	2646
2660	2647	unregister = true;
	2648	+
	2649	+ if (nla[NFTA_CHAIN_COUNTERS]) {
	2650	+ if (!nft_is_base_chain(chain)) {
	2651	+ err = -EOPNOTSUPP;
	2652	+ goto err_hooks;
	2653	+ }
	2654	+
	2655	+ stats = nft_stats_alloc(nla[NFTA_CHAIN_COUNTERS]);
	2656	+ if (IS_ERR(stats)) {
	2657	+ err = PTR_ERR(stats);
	2658	+ goto err_hooks;
	2659	+ }
	2660	+ }
	2661	+
2661	2662	err = -ENOMEM;
2662	2663	trans = nft_trans_alloc(ctx, NFT_MSG_NEWCHAIN,
2663	2664	sizeof(struct nft_trans_chain));

net/netfilter/nft_set_pipapo.c+1−4

@@ -2329,8 +2329,6 @@ static void nft_pipapo_destroy(const struct nft_ctx *ctx, · 2328 unmodified lines
2329	2329	if (m) {
2330	2330	rcu_barrier();
2331	2331
2332		− nft_set_pipapo_match_destroy(ctx, set, m);
2333		−
2334	2332	for_each_possible_cpu(cpu)
2335	2333	pipapo_free_scratch(m, cpu);
2336	2334	free_percpu(m->scratch);
@@ -2342,8 +2340,7 @@ static void nft_pipapo_destroy(const struct nft_ctx *ctx, · 5 unmodified lines
2342	2340	if (priv->clone) {
2343	2341	m = priv->clone;
2344	2342
2345		− if (priv->dirty)
2346		− nft_set_pipapo_match_destroy(ctx, set, m);
	2343	+ nft_set_pipapo_match_destroy(ctx, set, m);
2347	2344
2348	2345	for_each_possible_cpu(cpu)
2349	2346	pipapo_free_scratch(priv->clone, cpu);

net/packet/af_packet.c+3−5

@@ -2057,7 +2057,7 @@ retry: · 2056 unmodified lines
2057	2057	skb->priority = READ_ONCE(sk->sk_priority);
2058	2058	skb->mark = READ_ONCE(sk->sk_mark);
2059	2059	skb->tstamp = sockc.transmit_time;
2060		− skb->mono_delivery_time = !!skb->tstamp;
	2060	+
2061	2061	skb_setup_tx_timestamp(skb, sockc.tsflags);
2062	2062
2063	2063	if (unlikely(extra_len == 4))
@@ -2586,7 +2586,6 @@ static int tpacket_fill_skb(struct packet_sock po, struct sk_buff skb, · 522 unmodified lines
2586	2586	skb->priority = READ_ONCE(po->sk.sk_priority);
2587	2587	skb->mark = READ_ONCE(po->sk.sk_mark);
2588	2588	skb->tstamp = sockc->transmit_time;
2589		− skb->mono_delivery_time = !!skb->tstamp;
2590	2589	skb_setup_tx_timestamp(skb, sockc->tsflags);
2591	2590	skb_zcopy_set_nouarg(skb, ph.raw);
2592	2591
@@ -3065,7 +3064,6 @@ static int packet_snd(struct socket sock, struct msghdr msg, size_t len) · 472 unmodified lines
3065	3064	skb->priority = READ_ONCE(sk->sk_priority);
3066	3065	skb->mark = sockc.mark;
3067	3066	skb->tstamp = sockc.transmit_time;
3068		− skb->mono_delivery_time = !!skb->tstamp;
3069	3067
3070	3068	if (unlikely(extra_len == 4))
3071	3069	skb->no_fcs = 1;
@@ -4000,7 +3998,7 @@ packet_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval, · 928 unmodified lines
4000	3998	if (val < 0 \|\| val > 1)
4001	3999	return -EINVAL;
4002	4000
4003		− po->prot_hook.ignore_outgoing = !!val;
	4001	+ WRITE_ONCE(po->prot_hook.ignore_outgoing, !!val);
4004	4002	return 0;
4005	4003	}
4006	4004	case PACKET_TX_HAS_OFF:
@@ -4134,7 +4132,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, · 127 unmodified lines
4134	4132	0);
4135	4133	break;
4136	4134	case PACKET_IGNORE_OUTGOING:
4137		− val = po->prot_hook.ignore_outgoing;
	4135	+ val = READ_ONCE(po->prot_hook.ignore_outgoing);
4138	4136	break;
4139	4137	case PACKET_ROLLOVER_STATS:
4140	4138	if (!po->rollover)

net/rds/send.c+2−3

@@ -103,13 +103,12 @@ EXPORT_SYMBOL_GPL(rds_send_path_reset); · 102 unmodified lines
103	103
104	104	static int acquire_in_xmit(struct rds_conn_path *cp)
105	105	{
106		− return test_and_set_bit(RDS_IN_XMIT, &cp->cp_flags) == 0;
	106	+ return test_and_set_bit_lock(RDS_IN_XMIT, &cp->cp_flags) == 0;
107	107	}
108	108
109	109	static void release_in_xmit(struct rds_conn_path *cp)
110	110	{
111		− clear_bit(RDS_IN_XMIT, &cp->cp_flags);
112		− smp_mb__after_atomic();
	111	+ clear_bit_unlock(RDS_IN_XMIT, &cp->cp_flags);
113	112	/*
114	113	* We don't use wait_on_bit()/wake_up_bit() because our waking is in a
115	114	* hot path and finding waiters is very rare. We don't want to walk

net/rxrpc/sendmsg.c+2−2

@@ -349,8 +349,8 @@ reload: · 348 unmodified lines
349	349	*/
350	350	remain = more ? INT_MAX : msg_data_left(msg);
351	351	txb = call->conn->security->alloc_txbuf(call, remain, sk->sk_allocation);
352		− if (IS_ERR(txb)) {
353		− ret = PTR_ERR(txb);
	352	+ if (!txb) {
	353	+ ret = -ENOMEM;
354	354	goto maybe_error;
355	355	}
356	356	}

net/rxrpc/txbuf.c+2−2

@@ -33,8 +33,8 @@ struct rxrpc_txbuf rxrpc_alloc_data_txbuf(struct rxrpc_call call, size_t data_ · 32 unmodified lines
33	33	total = hoff + sizeof(*whdr) + data_size;
34	34
35	35	mutex_lock(&call->conn->tx_data_alloc_lock);
36		− buf = page_frag_alloc_align(&call->conn->tx_data_alloc, total, gfp,
37		− ~(data_align - 1) & ~(L1_CACHE_BYTES - 1));
	36	+ buf = __page_frag_alloc_align(&call->conn->tx_data_alloc, total, gfp,
	37	+ ~(data_align - 1) & ~(L1_CACHE_BYTES - 1));
38	38	mutex_unlock(&call->conn->tx_data_alloc_lock);
39	39	if (!buf) {
40	40	kfree(txb);

net/sched/sch_fq_pie.c+2−0

@@ -10,6 +10,7 @@ · 9 unmodified lines
10	10	*/
11	11
12	12	#include <linux/jhash.h>
	13	+#include <linux/module.h>
13	14	#include <linux/sizes.h>
14	15	#include <linux/vmalloc.h>
15	16	#include <net/pkt_cls.h>
@@ -563,6 +564,7 @@ static struct Qdisc_ops fq_pie_qdisc_ops __read_mostly = { · 547 unmodified lines
563	564	.dump_stats = fq_pie_dump_stats,
564	565	.owner = THIS_MODULE,
565	566	};
	567	+MODULE_ALIAS_NET_SCH("fq_pie");
566	568
567	569	static int __init fq_pie_module_init(void)
568	570	{

net/sched/sch_taprio.c+2−1

@@ -997,7 +997,8 @@ static const struct nla_policy entry_policy[TCA_TAPRIO_SCHED_ENTRY_MAX + 1] = { · 996 unmodified lines
997	997	};
998	998
999	999	static const struct nla_policy taprio_tc_policy[TCA_TAPRIO_TC_ENTRY_MAX + 1] = {
1000		− [TCA_TAPRIO_TC_ENTRY_INDEX] = { .type = NLA_U32 },
	1000	+ [TCA_TAPRIO_TC_ENTRY_INDEX] = NLA_POLICY_MAX(NLA_U32,
	1001	+ TC_QOPT_MAX_QUEUE),
1001	1002	[TCA_TAPRIO_TC_ENTRY_MAX_SDU] = { .type = NLA_U32 },
1002	1003	[TCA_TAPRIO_TC_ENTRY_FP] = NLA_POLICY_RANGE(NLA_U32,
1003	1004	TC_FP_EXPRESS,

net/socket.c+7−7

@@ -2600,9 +2600,9 @@ out: · 2599 unmodified lines
2600	2600	return err;
2601	2601	}
2602	2602
2603		−int sendmsg_copy_msghdr(struct msghdr *msg,
2604		− struct user_msghdr __user *umsg, unsigned flags,
2605		− struct iovec **iov)
	2603	+static int sendmsg_copy_msghdr(struct msghdr *msg,
	2604	+ struct user_msghdr __user *umsg, unsigned flags,
	2605	+ struct iovec **iov)
2606	2606	{
2607	2607	int err;
2608	2608
@@ -2753,10 +2753,10 @@ SYSCALL_DEFINE4(sendmmsg, int, fd, struct mmsghdr __user *, mmsg, · 144 unmodified lines
2753	2753	return __sys_sendmmsg(fd, mmsg, vlen, flags, true);
2754	2754	}
2755	2755
2756		−int recvmsg_copy_msghdr(struct msghdr *msg,
2757		− struct user_msghdr __user *umsg, unsigned flags,
2758		− struct sockaddr __user **uaddr,
2759		− struct iovec **iov)
	2756	+static int recvmsg_copy_msghdr(struct msghdr *msg,
	2757	+ struct user_msghdr __user *umsg, unsigned flags,
	2758	+ struct sockaddr __user **uaddr,
	2759	+ struct iovec **iov)
2760	2760	{
2761	2761	ssize_t err;
2762	2762

net/xfrm/xfrm_device.c+2−1

@@ -407,7 +407,8 @@ bool xfrm_dev_offload_ok(struct sk_buff skb, struct xfrm_state x) · 406 unmodified lines
407	407	struct xfrm_dst xdst = (struct xfrm_dst )dst;
408	408	struct net_device *dev = x->xso.dev;
409	409
410		− if (!x->type_offload)
	410	+ if (!x->type_offload \|\|
	411	+ (x->xso.type == XFRM_DEV_OFFLOAD_UNSPECIFIED && x->encap))
411	412	return false;
412	413
413	414	if (x->xso.type == XFRM_DEV_OFFLOAD_PACKET \|\|

tools/net/ynl/Makefile.deps+1−0

@@ -20,6 +20,7 @@ CFLAGS_ethtool:=$(call get_hdr_inc,_LINUX_ETHTOOL_NETLINK_H_,ethtool_netlink.h) · 19 unmodified lines
20	20	CFLAGS_handshake:=$(call get_hdr_inc,_LINUX_HANDSHAKE_H,handshake.h)
21	21	CFLAGS_mptcp_pm:=$(call get_hdr_inc,_LINUX_MPTCP_PM_H,mptcp_pm.h)
22	22	CFLAGS_netdev:=$(call get_hdr_inc,_LINUX_NETDEV_H,netdev.h)
	23	+CFLAGS_nlctrl:=$(call get_hdr_inc,__LINUX_GENERIC_NETLINK_H,genetlink.h)
23	24	CFLAGS_nfsd:=$(call get_hdr_inc,_LINUX_NFSD_NETLINK_H,nfsd_netlink.h)
24	25	CFLAGS_ovs_datapath:=$(call get_hdr_inc,__LINUX_OPENVSWITCH_H,openvswitch.h)
25	26	CFLAGS_ovs_flow:=$(call get_hdr_inc,__LINUX_OPENVSWITCH_H,openvswitch.h)

tools/perf/trace/beauty/include/linux/socket.h+0−7

@@ -422,13 +422,6 @@ extern long __sys_recvmsg_sock(struct socket sock, struct msghdr msg, · 421 unmodified lines
422	422	struct user_msghdr __user *umsg,
423	423	struct sockaddr __user *uaddr,
424	424	unsigned int flags);
425		−extern int sendmsg_copy_msghdr(struct msghdr *msg,
426		− struct user_msghdr __user *umsg, unsigned flags,
427		− struct iovec **iov);
428		−extern int recvmsg_copy_msghdr(struct msghdr *msg,
429		− struct user_msghdr __user *umsg, unsigned flags,
430		− struct sockaddr __user **uaddr,
431		− struct iovec **iov);
432	425	extern int __copy_msghdr(struct msghdr *kmsg,
433	426	struct user_msghdr *umsg,
434	427	struct sockaddr __user **save_addr);

tools/testing/selftests/net/forwarding/vxlan_bridge_1d_ipv6.sh+2−2

@@ -354,7 +354,7 @@ __ping_ipv4() · 353 unmodified lines
354	354
355	355	# Send 100 packets and verify that at least 100 packets hit the rule,
356	356	# to overcome ARP noise.
357		− PING_COUNT=100 PING_TIMEOUT=11 ping_do $dev $dst_ip
	357	+ PING_COUNT=100 PING_TIMEOUT=20 ping_do $dev $dst_ip
358	358	check_err $? "Ping failed"
359	359
360	360	tc_check_at_least_x_packets "dev $rp1 egress" 101 10 100
@@ -410,7 +410,7 @@ __ping_ipv6() · 49 unmodified lines
410	410
411	411	# Send 100 packets and verify that at least 100 packets hit the rule,
412	412	# to overcome neighbor discovery noise.
413		− PING_COUNT=100 PING_TIMEOUT=11 ping6_do $dev $dst_ip
	413	+ PING_COUNT=100 PING_TIMEOUT=20 ping6_do $dev $dst_ip
414	414	check_err $? "Ping failed"
415	415
416	416	tc_check_at_least_x_packets "dev $rp1 egress" 101 100

tools/testing/selftests/net/forwarding/vxlan_bridge_1q_ipv6.sh+2−2

@@ -457,7 +457,7 @@ __ping_ipv4() · 456 unmodified lines
457	457
458	458	# Send 100 packets and verify that at least 100 packets hit the rule,
459	459	# to overcome ARP noise.
460		− PING_COUNT=100 PING_TIMEOUT=11 ping_do $dev $dst_ip
	460	+ PING_COUNT=100 PING_TIMEOUT=20 ping_do $dev $dst_ip
461	461	check_err $? "Ping failed"
462	462
463	463	tc_check_at_least_x_packets "dev $rp1 egress" 101 10 100
@@ -522,7 +522,7 @@ __ping_ipv6() · 58 unmodified lines
522	522
523	523	# Send 100 packets and verify that at least 100 packets hit the rule,
524	524	# to overcome neighbor discovery noise.
525		− PING_COUNT=100 PING_TIMEOUT=11 ping6_do $dev $dst_ip
	525	+ PING_COUNT=100 PING_TIMEOUT=20 ping6_do $dev $dst_ip
526	526	check_err $? "Ping failed"
527	527
528	528	tc_check_at_least_x_packets "dev $rp1 egress" 101 100

tools/testing/selftests/net/udpgro_fwd.sh+4−0

@@ -217,6 +217,7 @@ for family in 4 6; do · 216 unmodified lines
217	217	cleanup
218	218
219	219	create_ns
	220	+ ip netns exec $NS_DST ethtool -K veth$DST generic-receive-offload on
220	221	ip netns exec $NS_DST ethtool -K veth$DST rx-gro-list on
221	222	run_test "GRO frag list" $BM_NET$DST 1 0
222	223	cleanup
@@ -227,6 +228,7 @@ for family in 4 6; do · 4 unmodified lines
227	228	# use NAT to circumvent GRO FWD check
228	229	create_ns
229	230	ip -n $NS_DST addr add dev veth$DST $BM_NET$DST_NAT/$SUFFIX
	231	+ ip netns exec $NS_DST ethtool -K veth$DST generic-receive-offload on
230	232	ip netns exec $NS_DST ethtool -K veth$DST rx-udp-gro-forwarding on
231	233	ip netns exec $NS_DST $IPT -t nat -I PREROUTING -d $BM_NET$DST_NAT \
232	234	-j DNAT --to-destination $BM_NET$DST
@@ -240,6 +242,7 @@ for family in 4 6; do · 7 unmodified lines
240	242	cleanup
241	243
242	244	create_vxlan_pair
	245	+ ip netns exec $NS_DST ethtool -K veth$DST generic-receive-offload on
243	246	ip netns exec $NS_DST ethtool -K veth$DST rx-gro-list on
244	247	run_test "GRO frag list over UDP tunnel" $OL_NET$DST 1 1
245	248	cleanup
@@ -247,6 +250,7 @@ for family in 4 6; do · 1 unmodified line
247	250	# use NAT to circumvent GRO FWD check
248	251	create_vxlan_pair
249	252	ip -n $NS_DST addr add dev $VXDEV$DST $OL_NET$DST_NAT/$SUFFIX
	253	+ ip netns exec $NS_DST ethtool -K veth$DST generic-receive-offload on
250	254	ip netns exec $NS_DST ethtool -K veth$DST rx-udp-gro-forwarding on
251	255	ip netns exec $NS_DST $IPT -t nat -I PREROUTING -d $OL_NET$DST_NAT \
252	256	-j DNAT --to-destination $OL_NET$DST

tools/testing/selftests/net/veth.sh+21−3

@@ -249,9 +249,9 @@ cleanup · 248 unmodified lines
249	249	create_ns
250	250	ip -n $NS_DST link set dev veth$DST up
251	251	ip -n $NS_DST link set dev veth$DST xdp object ${BPF_FILE} section xdp
252		−chk_gro_flag "gro vs xdp while down - gro flag on" $DST on
	252	+chk_gro_flag "gro vs xdp while down - gro flag off" $DST off
253	253	ip -n $NS_DST link set dev veth$DST down
254		−chk_gro_flag " - after down" $DST on
	254	+chk_gro_flag " - after down" $DST off
255	255	ip -n $NS_DST link set dev veth$DST xdp off
256	256	chk_gro_flag " - after xdp off" $DST off
257	257	ip -n $NS_DST link set dev veth$DST up
@@ -260,6 +260,21 @@ ip -n $NS_SRC link set dev veth$SRC xdp object ${BPF_FILE} section xdp · 2 unmodified lines
260	260	chk_gro_flag " - after peer xdp" $DST off
261	261	cleanup
262	262
	263	+create_ns
	264	+ip -n $NS_DST link set dev veth$DST up
	265	+ip -n $NS_DST link set dev veth$DST xdp object ${BPF_FILE} section xdp
	266	+ip netns exec $NS_DST ethtool -K veth$DST generic-receive-offload on
	267	+chk_gro_flag "gro vs xdp while down - gro flag on" $DST on
	268	+ip -n $NS_DST link set dev veth$DST down
	269	+chk_gro_flag " - after down" $DST on
	270	+ip -n $NS_DST link set dev veth$DST xdp off
	271	+chk_gro_flag " - after xdp off" $DST on
	272	+ip -n $NS_DST link set dev veth$DST up
	273	+chk_gro_flag " - after up" $DST on
	274	+ip -n $NS_SRC link set dev veth$SRC xdp object ${BPF_FILE} section xdp
	275	+chk_gro_flag " - after peer xdp" $DST on
	276	+cleanup
	277	+
263	278	create_ns
264	279	chk_channels "default channels" $DST 1 1
265	280
@@ -327,11 +342,14 @@ if [ $CPUS -gt 2 ]; then · 61 unmodified lines
327	342	fi
328	343
329	344	ip -n $NS_DST link set dev veth$DST xdp object ${BPF_FILE} section xdp 2>/dev/null
330		−chk_gro_flag "with xdp attached - gro flag" $DST on
	345	+chk_gro_flag "with xdp attached - gro flag" $DST off
331	346	chk_gro_flag " - peer gro flag" $SRC off
332	347	chk_tso_flag " - tso flag" $SRC off
333	348	chk_tso_flag " - peer tso flag" $DST on
334	349	ip netns exec $NS_DST ethtool -K veth$DST rx-udp-gro-forwarding on
	350	+chk_gro " - no aggregation" 10
	351	+ip netns exec $NS_DST ethtool -K veth$DST generic-receive-offload on
	352	+chk_gro_flag " - gro flag with GRO on" $DST on
335	353	chk_gro " - aggregation" 1
336	354
337	355

tools/testing/selftests/wireguard/qemu/arch/riscv32.config+1−0

@@ -3,6 +3,7 @@ CONFIG_ARCH_RV32I=y · 2 unmodified lines
3	3	CONFIG_MMU=y
4	4	CONFIG_FPU=y
5	5	CONFIG_SOC_VIRT=y
	6	+CONFIG_RISCV_ISA_FALLBACK=y
6	7	CONFIG_SERIAL_8250=y
7	8	CONFIG_SERIAL_8250_CONSOLE=y
8	9	CONFIG_SERIAL_OF_PLATFORM=y

tools/testing/selftests/wireguard/qemu/arch/riscv64.config+1−0

@@ -2,6 +2,7 @@ CONFIG_ARCH_RV64I=y · 1 unmodified line
2	2	CONFIG_MMU=y
3	3	CONFIG_FPU=y
4	4	CONFIG_SOC_VIRT=y
	5	+CONFIG_RISCV_ISA_FALLBACK=y
5	6	CONFIG_SERIAL_8250=y
6	7	CONFIG_SERIAL_8250_CONSOLE=y
7	8	CONFIG_SERIAL_OF_PLATFORM=y

Merge tag 'net-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code