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

Pull networking fixes from Paolo Abeni: "Including fixes from bluetooth and wireless. Current release - regressions: - bridge: fix use-after-free during router port configuration Current release - new code bugs: - eth: wangxun: fix the creation of page_pool Previous releases - regressions: - netpoll: initialize UDP checksum field before checksumming - wifi: mac80211: finish link init before RCU publish - bluetooth: fix use-after-free in vhci_flush() - eth: - ionic: fix DMA mapping test - bnxt: properly flush XDP redirect lists Previous releases - always broken: - netlink: specs: enforce strict naming of properties - unix: don't leave consecutive consumed OOB skbs. - vsock: fix linux/vm_sockets.h userspace compilation errors - selftests: fix TCP packet checksum" * tag 'net-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (38 commits) net: libwx: fix the creation of page_pool net: selftests: fix TCP packet checksum atm: Release atm_dev_mutex after removing procfs in atm_dev_deregister(). netlink: specs: enforce strict naming of properties netlink: specs: tc: replace underscores with dashes in names netlink: specs: rt-link: replace underscores with dashes in names netlink: specs: mptcp: replace underscores with dashes in names netlink: specs: ovs_flow: replace underscores with dashes in names netlink: specs: devlink: replace underscores with dashes in names netlink: specs: dpll: replace underscores with dashes in names netlink: specs: ethtool: replace underscores with dashes in names netlink: specs: fou: replace underscores with dashes in names netlink: specs: nfsd: replace underscores with dashes in names net: enetc: Correct endianness handling in _enetc_rd_reg64 atm: idt77252: Add missing `dma_map_error()` bnxt: properly flush XDP redirect lists vsock/uapi: fix linux/vm_sockets.h userspace compilation errors wifi: mac80211: finish link init before RCU publish wifi: iwlwifi: mvm: assume '1' as the default mac_config_cmd version selftest: af_unix: Add tests for -ECONNRESET. ...

Linus Torvalds committed 1 year ago

Commit e34a79b2 parents ee88bdd 85720e041 files · +378 −116Browse files

Unified · Split

41 files

CREDITS +5 −0
Documentation/netlink/genetlink-legacy.yaml +9 −6
Documentation/netlink/genetlink.yaml +10 −7
Documentation/netlink/netlink-raw.yaml +12 −6
Documentation/netlink/specs/devlink.yaml +4 −4
Documentation/netlink/specs/dpll.yaml +1 −1
Documentation/netlink/specs/ethtool.yaml +3 −3
Documentation/netlink/specs/fou.yaml +18 −18
Documentation/netlink/specs/mptcp_pm.yaml +4 −4
Documentation/netlink/specs/nfsd.yaml +2 −2
Documentation/netlink/specs/ovs_flow.yaml +3 −3
Documentation/netlink/specs/rt-link.yaml +2 −2
Documentation/netlink/specs/tc.yaml +2 −2
Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst +1 −1
drivers/atm/idt77252.c +5 −0
drivers/bluetooth/btintel_pcie.c +31 −2
drivers/bluetooth/hci_qca.c +10 −3
drivers/net/ethernet/broadcom/bnxt/bnxt.c +4 −1
drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 −1
drivers/net/ethernet/microsoft/mana/gdma_main.c +3 −0
drivers/net/ethernet/pensando/ionic/ionic_txrx.c +6 −6
drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c +4 −4
drivers/net/ethernet/wangxun/libwx/wx_lib.c +1 −1
drivers/net/usb/qmi_wwan.c +1 −0
drivers/net/wireless/intel/iwlegacy/4965-rs.c +2 −1
drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c +2 −2
include/net/bluetooth/hci_core.h +2 −0
include/uapi/linux/mptcp_pm.h +3 −3
include/uapi/linux/vm_sockets.h +4 −0
net/atm/clip.c +5 −6
net/atm/resources.c +1 −2
net/bluetooth/hci_core.c +30 −4
net/bluetooth/l2cap_core.c +8 −1
net/bridge/br_multicast.c +9 −0
net/core/netpoll.c +1 −1
net/core/selftests.c +3 −2
net/mac80211/link.c +3 −3
net/mac80211/util.c +1 −1
net/unix/af_unix.c +23 −8
tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py +1 −1
tools/testing/selftests/net/af_unix/msg_oob.c +138 −4

CREDITS+5−0

@@ -2981,6 +2981,11 @@ S: 521 Pleasant Valley Road · 2980 unmodified lines
2981	S: Potsdam, New York 13676	2981	S: Potsdam, New York 13676
2982	S: USA	2982	S: USA
2983		2983
		2984	N: Shannon Nelson
		2985	E: sln@onemain.com
		2986	D: Worked on several network drivers including
		2987	D: ixgbe, i40e, ionic, pds_core, pds_vdpa, pds_fwctl
		2988
2984	N: Dave Neuer	2989	N: Dave Neuer
2985	E: dave.neuer@pobox.com	2990	E: dave.neuer@pobox.com
2986	D: Helped implement support for Compaq's H31xx series iPAQs	2991	D: Helped implement support for Compaq's H31xx series iPAQs

Documentation/netlink/genetlink-legacy.yaml+9−6

 # Common defines
 $defs:
+  name:
+    type: string
+    pattern: ^[0-9a-z-]+$
   uint:
     type: integer
     minimum: 0
       additionalProperties: False
       properties:
         name:
-          type: string
+          $ref: '#/$defs/name'
         header:
           description: For C-compatible languages, header which already defines this value.
           type: string
                 additionalProperties: False
                 properties:
                   name:
-                    type: string
+                    $ref: '#/$defs/name'
                   value:
                     type: integer
                   doc:
             additionalProperties: False
             properties:
               name:
-                type: string
+                $ref: '#/$defs/name'
               type:
                 description: The netlink attribute type
                 enum: [ u8, u16, u32, u64, s8, s16, s32, s64, string, binary ]
         name:
           description: |
             Name used when referring to this space in other definitions, not used outside of the spec.
-          type: string
+          $ref: '#/$defs/name'
         name-prefix:
           description: |
             Prefix for the C enum name of the attributes. Default family[name]-set[name]-a-
             additionalProperties: False
             properties:
               name:
-                type: string
+                $ref: '#/$defs/name'
               type: &attr-type
                 description: The netlink attribute type
                 enum: [ unused, pad, flag, binary, bitfield32,
           properties:
             name:
               description: Name of the operation, also defining its C enum value in uAPI.
-              type: string
+              $ref: '#/$defs/name'
             doc:
               description: Documentation for the command.
               type: string

Documentation/netlink/genetlink.yaml+10−7

 # Common defines
 $defs:
+  name:
+    type: string
+    pattern: ^[0-9a-z-]+$
   uint:
     type: integer
     minimum: 0
 properties:
   name:
     description: Name of the genetlink family.
-    type: string
+    $ref: '#/$defs/name'
   doc:
     type: string
   protocol:
       additionalProperties: False
       properties:
         name:
-          type: string
+          $ref: '#/$defs/name'
         header:
           description: For C-compatible languages, header which already defines this value.
           type: string
                 additionalProperties: False
                 properties:
                   name:
-                    type: string
+                    $ref: '#/$defs/name'
                   value:
                     type: integer
                   doc:
         name:
           description: |
             Name used when referring to this space in other definitions, not used outside of the spec.
-          type: string
+          $ref: '#/$defs/name'
         name-prefix:
           description: |
             Prefix for the C enum name of the attributes. Default family[name]-set[name]-a-
             additionalProperties: False
             properties:
               name:
-                type: string
+                $ref: '#/$defs/name'
               type: &attr-type
                 enum: [ unused, pad, flag, binary,
                         uint, sint, u8, u16, u32, u64, s8, s16, s32, s64,
           properties:
             name:
               description: Name of the operation, also defining its C enum value in uAPI.
-              type: string
+              $ref: '#/$defs/name'
             doc:
               description: Documentation for the command.
               type: string
             name:
               description: |
                 The name for the group, used to form the define and the value of the define.
-              type: string
+              $ref: '#/$defs/name'
             flags: *cmd_flags
   kernel-family:

Documentation/netlink/netlink-raw.yaml+12−6

 # Common defines
 $defs:
+  name:
+    type: string
+    pattern: ^[0-9a-z-]+$
+  name-cap:
+    type: string
+    pattern: ^[0-9a-zA-Z-]+$
   uint:
     type: integer
     minimum: 0
       additionalProperties: False
       properties:
         name:
-          type: string
+          $ref: '#/$defs/name'
         header:
           description: For C-compatible languages, header which already defines this value.
           type: string
                 additionalProperties: False
                 properties:
                   name:
-                    type: string
+                    $ref: '#/$defs/name'
                   value:
                     type: integer
                   doc:
             additionalProperties: False
             properties:
               name:
-                type: string
+                $ref: '#/$defs/name-cap'
               type:
                 description: |
                   The netlink attribute type. Members of type 'binary' or 'pad'
         name:
           description: |
             Name used when referring to this space in other definitions, not used outside of the spec.
-          type: string
+          $ref: '#/$defs/name'
         name-prefix:
           description: |
             Prefix for the C enum name of the attributes. Default family[name]-set[name]-a-
             additionalProperties: False
             properties:
               name:
-                type: string
+                $ref: '#/$defs/name'
               type: &attr-type
                 description: The netlink attribute type
                 enum: [ unused, pad, flag, binary, bitfield32,
           properties:
             name:
               description: Name of the operation, also defining its C enum value in uAPI.
-              type: string
+              $ref: '#/$defs/name'
             doc:
               description: Documentation for the command.
               type: string

Documentation/netlink/specs/devlink.yaml+4−4

@@ -38,15 +38,15 @@ definitions: · 37 unmodified lines
38	-	38	-
39	name: dsa	39	name: dsa
40	-	40	-
41	name: pci_pf	41	name: pci-pf
42	-	42	-
43	name: pci_vf	43	name: pci-vf
44	-	44	-
45	name: virtual	45	name: virtual
46	-	46	-
47	name: unused	47	name: unused
48	-	48	-
49	name: pci_sf	49	name: pci-sf
50	-	50	-
51	type: enum	51	type: enum
52	name: port-fn-state	52	name: port-fn-state
@@ -220,7 +220,7 @@ definitions: · 167 unmodified lines
220	-	220	-
221	name: flag	221	name: flag
222	-	222	-
223	name: nul_string	223	name: nul-string
224	value: 10	224	value: 10
225	-	225	-
226	name: binary	226	name: binary

Documentation/netlink/specs/dpll.yaml+1−1

@@ -188,7 +188,7 @@ definitions: · 187 unmodified lines
188	value: 10000	188	value: 10000
189	-	189	-
190	type: const	190	type: const
191	name: pin-frequency-77_5-khz	191	name: pin-frequency-77-5-khz
192	value: 77500	192	value: 77500
193	-	193	-
194	type: const	194	type: const

Documentation/netlink/specs/ethtool.yaml+3−3

@@ -48,7 +48,7 @@ definitions: · 47 unmodified lines
48	name: started	48	name: started
49	doc: The firmware flashing process has started.	49	doc: The firmware flashing process has started.
50	-	50	-
51	name: in_progress	51	name: in-progress
52	doc: The firmware flashing process is in progress.	52	doc: The firmware flashing process is in progress.
53	-	53	-
54	name: completed	54	name: completed
@@ -1422,7 +1422,7 @@ attribute-sets: · 1367 unmodified lines
1422	name: hkey	1422	name: hkey
1423	type: binary	1423	type: binary
1424	-	1424	-
1425	name: input_xfrm	1425	name: input-xfrm
1426	type: u32	1426	type: u32
1427	-	1427	-
1428	name: start-context	1428	name: start-context
@@ -2238,7 +2238,7 @@ operations: · 809 unmodified lines
2238	- hfunc	2238	- hfunc
2239	- indir	2239	- indir
2240	- hkey	2240	- hkey
2241	- input_xfrm	2241	- input-xfrm
2242	dump:	2242	dump:
2243	request:	2243	request:
2244	attributes:	2244	attributes:

Documentation/netlink/specs/fou.yaml+18−18

@@ -15,7 +15,7 @@ kernel-policy: global · 14 unmodified lines
15	definitions:	15	definitions:
16	-	16	-
17	type: enum	17	type: enum
18	name: encap_type	18	name: encap-type
19	name-prefix: fou-encap-	19	name-prefix: fou-encap-
20	enum-name:	20	enum-name:
21	entries: [ unspec, direct, gue ]	21	entries: [ unspec, direct, gue ]
@@ -43,26 +43,26 @@ attribute-sets: · 21 unmodified lines
43	name: type	43	name: type
44	type: u8	44	type: u8
45	-	45	-
46	name: remcsum_nopartial	46	name: remcsum-nopartial
47	type: flag	47	type: flag
48	-	48	-
49	name: local_v4	49	name: local-v4
50	type: u32	50	type: u32
51	-	51	-
52	name: local_v6	52	name: local-v6
53	type: binary	53	type: binary
54	checks:	54	checks:
55	min-len: 16	55	min-len: 16
56	-	56	-
57	name: peer_v4	57	name: peer-v4
58	type: u32	58	type: u32
59	-	59	-
60	name: peer_v6	60	name: peer-v6
61	type: binary	61	type: binary
62	checks:	62	checks:
63	min-len: 16	63	min-len: 16
64	-	64	-
65	name: peer_port	65	name: peer-port
66	type: u16	66	type: u16
67	byte-order: big-endian	67	byte-order: big-endian
68	-	68	-
@@ -90,12 +90,12 @@ operations: · 21 unmodified lines
90	- port	90	- port
91	- ipproto	91	- ipproto
92	- type	92	- type
93	- remcsum_nopartial	93	- remcsum-nopartial
94	- local_v4	94	- local-v4
95	- peer_v4	95	- peer-v4
96	- local_v6	96	- local-v6
97	- peer_v6	97	- peer-v6
98	- peer_port	98	- peer-port
99	- ifindex	99	- ifindex
100		100
101	-	101	-
@@ -112,11 +112,11 @@ operations: · 10 unmodified lines
112	- af	112	- af
113	- ifindex	113	- ifindex
114	- port	114	- port
115	- peer_port	115	- peer-port
116	- local_v4	116	- local-v4
117	- peer_v4	117	- peer-v4
118	- local_v6	118	- local-v6
119	- peer_v6	119	- peer-v6
120		120
121	-	121	-
122	name: get	122	name: get

Documentation/netlink/specs/mptcp_pm.yaml+4−4

@@ -57,21 +57,21 @@ definitions: · 56 unmodified lines
57	doc: >-	57	doc: >-
58	A new subflow has been established. 'error' should not be set.	58	A new subflow has been established. 'error' should not be set.
59	Attributes: token, family, loc_id, rem_id, saddr4 \| saddr6, daddr4 \|	59	Attributes: token, family, loc_id, rem_id, saddr4 \| saddr6, daddr4 \|
60	daddr6, sport, dport, backup, if_idx [, error].	60	daddr6, sport, dport, backup, if-idx [, error].
61	-	61	-
62	name: sub-closed	62	name: sub-closed
63	doc: >-	63	doc: >-
64	A subflow has been closed. An error (copy of sk_err) could be set if an	64	A subflow has been closed. An error (copy of sk_err) could be set if an
65	error has been detected for this subflow.	65	error has been detected for this subflow.
66	Attributes: token, family, loc_id, rem_id, saddr4 \| saddr6, daddr4 \|	66	Attributes: token, family, loc_id, rem_id, saddr4 \| saddr6, daddr4 \|
67	daddr6, sport, dport, backup, if_idx [, error].	67	daddr6, sport, dport, backup, if-idx [, error].
68	-	68	-
69	name: sub-priority	69	name: sub-priority
70	value: 13	70	value: 13
71	doc: >-	71	doc: >-
72	The priority of a subflow has changed. 'error' should not be set.	72	The priority of a subflow has changed. 'error' should not be set.
73	Attributes: token, family, loc_id, rem_id, saddr4 \| saddr6, daddr4 \|	73	Attributes: token, family, loc_id, rem_id, saddr4 \| saddr6, daddr4 \|
74	daddr6, sport, dport, backup, if_idx [, error].	74	daddr6, sport, dport, backup, if-idx [, error].
75	-	75	-
76	name: listener-created	76	name: listener-created
77	value: 15	77	value: 15
@@ -255,7 +255,7 @@ attribute-sets: · 177 unmodified lines
255	name: timeout	255	name: timeout
256	type: u32	256	type: u32
257	-	257	-
258	name: if_idx	258	name: if-idx
259	type: u32	259	type: u32
260	-	260	-
261	name: reset-reason	261	name: reset-reason

Documentation/netlink/specs/nfsd.yaml+2−2

@@ -27,7 +27,7 @@ attribute-sets: · 26 unmodified lines
27	name: proc	27	name: proc
28	type: u32	28	type: u32
29	-	29	-
30	name: service_time	30	name: service-time
31	type: s64	31	type: s64
32	-	32	-
33	name: pad	33	name: pad
@@ -139,7 +139,7 @@ operations: · 105 unmodified lines
139	- prog	139	- prog
140	- version	140	- version
141	- proc	141	- proc
142	- service_time	142	- service-time
143	- saddr4	143	- saddr4
144	- daddr4	144	- daddr4
145	- saddr6	145	- saddr6

Documentation/netlink/specs/ovs_flow.yaml+3−3

@@ -216,7 +216,7 @@ definitions: · 215 unmodified lines
216	type: struct	216	type: struct
217	members:	217	members:
218	-	218	-
219	name: nd_target	219	name: nd-target
220	type: binary	220	type: binary
221	len: 16	221	len: 16
222	byte-order: big-endian	222	byte-order: big-endian
@@ -258,12 +258,12 @@ definitions: · 35 unmodified lines
258	type: struct	258	type: struct
259	members:	259	members:
260	-	260	-
261	name: vlan_tpid	261	name: vlan-tpid
262	type: u16	262	type: u16
263	byte-order: big-endian	263	byte-order: big-endian
264	doc: Tag protocol identifier (TPID) to push.	264	doc: Tag protocol identifier (TPID) to push.
265	-	265	-
266	name: vlan_tci	266	name: vlan-tci
267	type: u16	267	type: u16
268	byte-order: big-endian	268	byte-order: big-endian
269	doc: Tag control identifier (TCI) to push.	269	doc: Tag control identifier (TCI) to push.

Documentation/netlink/specs/rt-link.yaml+2−2

@@ -603,7 +603,7 @@ definitions: · 602 unmodified lines
603	name: optmask	603	name: optmask
604	type: u32	604	type: u32
605	-	605	-
606	name: if_stats_msg	606	name: if-stats-msg
607	type: struct	607	type: struct
608	members:	608	members:
609	-	609	-
@@ -2486,7 +2486,7 @@ operations: · 1876 unmodified lines
2486	name: getstats	2486	name: getstats
2487	doc: Get / dump link stats.	2487	doc: Get / dump link stats.
2488	attribute-set: stats-attrs	2488	attribute-set: stats-attrs
2489	fixed-header: if_stats_msg	2489	fixed-header: if-stats-msg
2490	do:	2490	do:
2491	request:	2491	request:
2492	value: 94	2492	value: 94

Documentation/netlink/specs/tc.yaml+2−2

@@ -232,7 +232,7 @@ definitions: · 231 unmodified lines
232	type: u8	232	type: u8
233	doc: log(P_max / (qth-max - qth-min))	233	doc: log(P_max / (qth-max - qth-min))
234	-	234	-
235	name: Scell_log	235	name: Scell-log
236	type: u8	236	type: u8
237	doc: cell size for idle damping	237	doc: cell size for idle damping
238	-	238	-
@@ -253,7 +253,7 @@ definitions: · 14 unmodified lines
253	name: DPs	253	name: DPs
254	type: u32	254	type: u32
255	-	255	-
256	name: def_DP	256	name: def-DP
257	type: u32	257	type: u32
258	-	258	-
259	name: grio	259	name: grio

Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst+1−1

@@ -66,7 +66,7 @@ Admin Function driver · 65 unmodified lines
66	As mentioned above RVU PF0 is called the admin function (AF), this driver	66	As mentioned above RVU PF0 is called the admin function (AF), this driver
67	supports resource provisioning and configuration of functional blocks.	67	supports resource provisioning and configuration of functional blocks.
68	Doesn't handle any I/O. It sets up few basic stuff but most of the	68	Doesn't handle any I/O. It sets up few basic stuff but most of the
69	funcionality is achieved via configuration requests from PFs and VFs.	69	functionality is achieved via configuration requests from PFs and VFs.
70		70
71	PF/VFs communicates with AF via a shared memory region (mailbox). Upon	71	PF/VFs communicates with AF via a shared memory region (mailbox). Upon
72	receiving requests AF does resource provisioning and other HW configuration.	72	receiving requests AF does resource provisioning and other HW configuration.

drivers/atm/idt77252.c+5−0

 	IDT77252_PRV_PADDR(skb) = dma_map_single(&card->pcidev->dev, skb->data,
 						 skb->len, DMA_TO_DEVICE);
+	if (dma_mapping_error(&card->pcidev->dev, IDT77252_PRV_PADDR(skb)))
+		return -ENOMEM;
 	error = -EINVAL;
 		paddr = dma_map_single(&card->pcidev->dev, skb->data,
 				       skb_end_pointer(skb) - skb->data,
 				       DMA_FROM_DEVICE);
+		if (dma_mapping_error(&card->pcidev->dev, paddr))
+			goto outpoolrm;
 		IDT77252_PRV_PADDR(skb) = paddr;
 		if (push_rx_skb(card, skb, queue)) {
 	dma_unmap_single(&card->pcidev->dev, IDT77252_PRV_PADDR(skb),
 			 skb_end_pointer(skb) - skb->data, DMA_FROM_DEVICE);
+outpoolrm:
 	handle = IDT77252_PRV_POOL(skb);
 	card->sbpool[POOL_QUEUE(handle)].skb[POOL_INDEX(handle)] = NULL;

drivers/bluetooth/btintel_pcie.c+31−2

 	data->hdev = NULL;
 }
+static void btintel_pcie_disable_interrupts(struct btintel_pcie_data *data)
+{
+	spin_lock(&data->irq_lock);
+	btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_MSIX_FH_INT_MASK, data->fh_init_mask);
+	btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_MSIX_HW_INT_MASK, data->hw_init_mask);
+	spin_unlock(&data->irq_lock);
+}
+static void btintel_pcie_enable_interrupts(struct btintel_pcie_data *data)
+{
+	spin_lock(&data->irq_lock);
+	btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_MSIX_FH_INT_MASK, ~data->fh_init_mask);
+	btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_MSIX_HW_INT_MASK, ~data->hw_init_mask);
+	spin_unlock(&data->irq_lock);
+}
+static void btintel_pcie_synchronize_irqs(struct btintel_pcie_data *data)
+{
+	for (int i = 0; i < data->alloc_vecs; i++)
+		synchronize_irq(data->msix_entries[i].vector);
+}
 static int btintel_pcie_setup_internal(struct hci_dev *hdev)
 {
 	struct btintel_pcie_data *data = hci_get_drvdata(hdev);
 		bt_dev_err(hdev, "Firmware download retry count: %d",
 			   fw_dl_retry);
 		btintel_pcie_dump_debug_registers(hdev);
+		btintel_pcie_disable_interrupts(data);
+		btintel_pcie_synchronize_irqs(data);
 		err = btintel_pcie_reset_bt(data);
 		if (err) {
 			bt_dev_err(hdev, "Failed to do shr reset: %d", err);
 		}
 		usleep_range(10000, 12000);
 		btintel_pcie_reset_ia(data);
+		btintel_pcie_enable_interrupts(data);
 		btintel_pcie_config_msix(data);
 		err = btintel_pcie_enable_bt(data);
 		if (err) {
 	data = pci_get_drvdata(pdev);
+	btintel_pcie_disable_interrupts(data);
+	btintel_pcie_synchronize_irqs(data);
+	flush_work(&data->rx_work);
 	btintel_pcie_reset_bt(data);
 	for (int i = 0; i < data->alloc_vecs; i++) {
 		struct msix_entry *msix_entry;
 	btintel_pcie_release_hdev(data);
-	flush_work(&data->rx_work);
 	destroy_workqueue(data->workqueue);
 	btintel_pcie_free(data);

drivers/bluetooth/hci_qca.c+10−3

 			 */
 			qcadev->bt_power->pwrseq = devm_pwrseq_get(&serdev->dev,
 								   "bluetooth");
-			if (IS_ERR(qcadev->bt_power->pwrseq))
-				return PTR_ERR(qcadev->bt_power->pwrseq);
-			break;
+			/*
+			 * Some modules have BT_EN enabled via a hardware pull-up,
+			 * meaning it is not defined in the DTS and is not controlled
+			 * through the power sequence. In such cases, fall through
+			 * to follow the legacy flow.
+			 */
+			if (IS_ERR(qcadev->bt_power->pwrseq))
+				qcadev->bt_power->pwrseq = NULL;
+			else
+				break;
 		}
 		fallthrough;
 	case QCA_WCN3950:

drivers/net/ethernet/broadcom/bnxt/bnxt.c+4−1

 {
 	struct bnxt_napi *bnapi = cpr->bnapi;
 	u32 raw_cons = cpr->cp_raw_cons;
+	bool flush_xdp = false;
 	u32 cons;
 	int rx_pkts = 0;
 	u8 event = 0;
 			else
 				rc = bnxt_force_rx_discard(bp, cpr, &raw_cons,
 							   &event);
+			if (event & BNXT_REDIRECT_EVENT)
+				flush_xdp = true;
 			if (likely(rc >= 0))
 				rx_pkts += rc;
 			/* Increment rx_pkts when rc is -ENOMEM to count towards
 		}
 	}
-	if (event & BNXT_REDIRECT_EVENT) {
+	if (flush_xdp) {
 		xdp_do_flush();
 		event &= ~BNXT_REDIRECT_EVENT;
 	}

drivers/net/ethernet/freescale/enetc/enetc_hw.h+1−1

@@ -507,7 +507,7 @@ static inline u64 _enetc_rd_reg64(void __iomem *reg) · 506 unmodified lines
507	tmp = ioread32(reg + 4);	507	tmp = ioread32(reg + 4);
508	} while (high != tmp);	508	} while (high != tmp);
509		509
510	return le64_to_cpu((__le64)high << 32 \| low);	510	return (u64)high << 32 \| low;
511	}	511	}
512	#endif	512	#endif
513		513

drivers/net/ethernet/microsoft/mana/gdma_main.c+3−0

@@ -31,6 +31,9 @@ static void mana_gd_init_pf_regs(struct pci_dev *pdev) · 30 unmodified lines
31	gc->db_page_base = gc->bar0_va +	31	gc->db_page_base = gc->bar0_va +
32	mana_gd_r64(gc, GDMA_PF_REG_DB_PAGE_OFF);	32	mana_gd_r64(gc, GDMA_PF_REG_DB_PAGE_OFF);
33		33
		34	gc->phys_db_page_base = gc->bar0_pa +
		35	mana_gd_r64(gc, GDMA_PF_REG_DB_PAGE_OFF);
		36
34	sriov_base_off = mana_gd_r64(gc, GDMA_SRIOV_REG_CFG_BASE_OFF);	37	sriov_base_off = mana_gd_r64(gc, GDMA_SRIOV_REG_CFG_BASE_OFF);
35		38
36	sriov_base_va = gc->bar0_va + sriov_base_off;	39	sriov_base_va = gc->bar0_va + sriov_base_off;

drivers/net/ethernet/pensando/ionic/ionic_txrx.c+6−6

@@ -321,7 +321,7 @@ static int ionic_xdp_post_frame(struct ionic_queue q, struct xdp_frame frame, · 320 unmodified lines
321	len, DMA_TO_DEVICE);	321	len, DMA_TO_DEVICE);
322	} else /* XDP_REDIRECT */ {	322	} else /* XDP_REDIRECT */ {
323	dma_addr = ionic_tx_map_single(q, frame->data, len);	323	dma_addr = ionic_tx_map_single(q, frame->data, len);
324	if (!dma_addr)	324	if (dma_addr == DMA_MAPPING_ERROR)
325	return -EIO;	325	return -EIO;
326	}	326	}
327		327
@@ -357,7 +357,7 @@ static int ionic_xdp_post_frame(struct ionic_queue q, struct xdp_frame frame, · 29 unmodified lines
357	} else {	357	} else {
358	dma_addr = ionic_tx_map_frag(q, frag, 0,	358	dma_addr = ionic_tx_map_frag(q, frag, 0,
359	skb_frag_size(frag));	359	skb_frag_size(frag));
360	if (dma_mapping_error(q->dev, dma_addr)) {	360	if (dma_addr == DMA_MAPPING_ERROR) {
361	ionic_tx_desc_unmap_bufs(q, desc_info);	361	ionic_tx_desc_unmap_bufs(q, desc_info);
362	return -EIO;	362	return -EIO;
363	}	363	}
@@ -1083,7 +1083,7 @@ static dma_addr_t ionic_tx_map_single(struct ionic_queue *q, · 719 unmodified lines
1083	net_warn_ratelimited("%s: DMA single map failed on %s!\n",	1083	net_warn_ratelimited("%s: DMA single map failed on %s!\n",
1084	dev_name(dev), q->name);	1084	dev_name(dev), q->name);
1085	q_to_tx_stats(q)->dma_map_err++;	1085	q_to_tx_stats(q)->dma_map_err++;
1086	return 0;	1086	return DMA_MAPPING_ERROR;
1087	}	1087	}
1088	return dma_addr;	1088	return dma_addr;
1089	}	1089	}
@@ -1100,7 +1100,7 @@ static dma_addr_t ionic_tx_map_frag(struct ionic_queue *q, · 10 unmodified lines
1100	net_warn_ratelimited("%s: DMA frag map failed on %s!\n",	1100	net_warn_ratelimited("%s: DMA frag map failed on %s!\n",
1101	dev_name(dev), q->name);	1101	dev_name(dev), q->name);
1102	q_to_tx_stats(q)->dma_map_err++;	1102	q_to_tx_stats(q)->dma_map_err++;
1103	return 0;	1103	return DMA_MAPPING_ERROR;
1104	}	1104	}
1105	return dma_addr;	1105	return dma_addr;
1106	}	1106	}
@@ -1116,7 +1116,7 @@ static int ionic_tx_map_skb(struct ionic_queue q, struct sk_buff skb, · 9 unmodified lines
1116	int frag_idx;	1116	int frag_idx;
1117		1117
1118	dma_addr = ionic_tx_map_single(q, skb->data, skb_headlen(skb));	1118	dma_addr = ionic_tx_map_single(q, skb->data, skb_headlen(skb));
1119	if (!dma_addr)	1119	if (dma_addr == DMA_MAPPING_ERROR)
1120	return -EIO;	1120	return -EIO;
1121	buf_info->dma_addr = dma_addr;	1121	buf_info->dma_addr = dma_addr;
1122	buf_info->len = skb_headlen(skb);	1122	buf_info->len = skb_headlen(skb);
@@ -1126,7 +1126,7 @@ static int ionic_tx_map_skb(struct ionic_queue q, struct sk_buff skb, · 3 unmodified lines
1126	nfrags = skb_shinfo(skb)->nr_frags;	1126	nfrags = skb_shinfo(skb)->nr_frags;
1127	for (frag_idx = 0; frag_idx < nfrags; frag_idx++, frag++) {	1127	for (frag_idx = 0; frag_idx < nfrags; frag_idx++, frag++) {
1128	dma_addr = ionic_tx_map_frag(q, frag, 0, skb_frag_size(frag));	1128	dma_addr = ionic_tx_map_frag(q, frag, 0, skb_frag_size(frag));
1129	if (!dma_addr)	1129	if (dma_addr == DMA_MAPPING_ERROR)
1130	goto dma_fail;	1130	goto dma_fail;
1131	buf_info->dma_addr = dma_addr;	1131	buf_info->dma_addr = dma_addr;
1132	buf_info->len = skb_frag_size(frag);	1132	buf_info->len = skb_frag_size(frag);

drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c+4−4

@@ -242,7 +242,7 @@ static int qed_mfw_get_tlv_group(u8 tlv_type, u8 *tlv_group) · 241 unmodified lines
242	}	242	}
243		243
244	/* Returns size of the data buffer or, -1 in case TLV data is not available. */	244	/* Returns size of the data buffer or, -1 in case TLV data is not available. */
245	static int	245	static noinline_for_stack int
246	qed_mfw_get_gen_tlv_value(struct qed_drv_tlv_hdr *p_tlv,	246	qed_mfw_get_gen_tlv_value(struct qed_drv_tlv_hdr *p_tlv,
247	struct qed_mfw_tlv_generic *p_drv_buf,	247	struct qed_mfw_tlv_generic *p_drv_buf,
248	struct qed_tlv_parsed_buf *p_buf)	248	struct qed_tlv_parsed_buf *p_buf)
@@ -304,7 +304,7 @@ qed_mfw_get_gen_tlv_value(struct qed_drv_tlv_hdr *p_tlv, · 55 unmodified lines
304	return -1;	304	return -1;
305	}	305	}
306		306
307	static int	307	static noinline_for_stack int
308	qed_mfw_get_eth_tlv_value(struct qed_drv_tlv_hdr *p_tlv,	308	qed_mfw_get_eth_tlv_value(struct qed_drv_tlv_hdr *p_tlv,
309	struct qed_mfw_tlv_eth *p_drv_buf,	309	struct qed_mfw_tlv_eth *p_drv_buf,
310	struct qed_tlv_parsed_buf *p_buf)	310	struct qed_tlv_parsed_buf *p_buf)
@@ -438,7 +438,7 @@ qed_mfw_get_tlv_time_value(struct qed_mfw_tlv_time *p_time, · 127 unmodified lines
438	return QED_MFW_TLV_TIME_SIZE;	438	return QED_MFW_TLV_TIME_SIZE;
439	}	439	}
440		440
441	static int	441	static noinline_for_stack int
442	qed_mfw_get_fcoe_tlv_value(struct qed_drv_tlv_hdr *p_tlv,	442	qed_mfw_get_fcoe_tlv_value(struct qed_drv_tlv_hdr *p_tlv,
443	struct qed_mfw_tlv_fcoe *p_drv_buf,	443	struct qed_mfw_tlv_fcoe *p_drv_buf,
444	struct qed_tlv_parsed_buf *p_buf)	444	struct qed_tlv_parsed_buf *p_buf)
@@ -1073,7 +1073,7 @@ qed_mfw_get_fcoe_tlv_value(struct qed_drv_tlv_hdr *p_tlv, · 628 unmodified lines
1073	return -1;	1073	return -1;
1074	}	1074	}
1075		1075
1076	static int	1076	static noinline_for_stack int
1077	qed_mfw_get_iscsi_tlv_value(struct qed_drv_tlv_hdr *p_tlv,	1077	qed_mfw_get_iscsi_tlv_value(struct qed_drv_tlv_hdr *p_tlv,
1078	struct qed_mfw_tlv_iscsi *p_drv_buf,	1078	struct qed_mfw_tlv_iscsi *p_drv_buf,
1079	struct qed_tlv_parsed_buf *p_buf)	1079	struct qed_tlv_parsed_buf *p_buf)

drivers/net/ethernet/wangxun/libwx/wx_lib.c+1−1

@@ -2623,7 +2623,7 @@ static int wx_alloc_page_pool(struct wx_ring *rx_ring) · 2622 unmodified lines
2623	struct page_pool_params pp_params = {	2623	struct page_pool_params pp_params = {
2624	.flags = PP_FLAG_DMA_MAP \| PP_FLAG_DMA_SYNC_DEV,	2624	.flags = PP_FLAG_DMA_MAP \| PP_FLAG_DMA_SYNC_DEV,
2625	.order = 0,	2625	.order = 0,
2626	.pool_size = rx_ring->size,	2626	.pool_size = rx_ring->count,
2627	.nid = dev_to_node(rx_ring->dev),	2627	.nid = dev_to_node(rx_ring->dev),
2628	.dev = rx_ring->dev,	2628	.dev = rx_ring->dev,
2629	.dma_dir = DMA_FROM_DEVICE,	2629	.dma_dir = DMA_FROM_DEVICE,

drivers/net/usb/qmi_wwan.c+1−0

@@ -1426,6 +1426,7 @@ static const struct usb_device_id products[] = { · 1425 unmodified lines
1426	{QMI_QUIRK_SET_DTR(0x22de, 0x9051, 2)}, /* Hucom Wireless HM-211S/K */	1426	{QMI_QUIRK_SET_DTR(0x22de, 0x9051, 2)}, /* Hucom Wireless HM-211S/K */
1427	{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */	1427	{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
1428	{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */	1428	{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */
		1429	{QMI_QUIRK_SET_DTR(0x1e0e, 0x9071, 3)}, /* SIMCom 8230C ++ */
1429	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */	1430	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */
1430	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */	1431	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */
1431	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */	1432	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */

drivers/net/wireless/intel/iwlegacy/4965-rs.c+2−1

@@ -203,7 +203,8 @@ il4965_rs_extract_rate(u32 rate_n_flags) · 202 unmodified lines
203	return (u8) (rate_n_flags & 0xFF);	203	return (u8) (rate_n_flags & 0xFF);
204	}	204	}
205		205
206	static void	206	/* noinline works around https://github.com/llvm/llvm-project/issues/143908 */
		207	static noinline_for_stack void
207	il4965_rs_rate_scale_clear_win(struct il_rate_scale_data *win)	208	il4965_rs_rate_scale_clear_win(struct il_rate_scale_data *win)
208	{	209	{
209	win->data = 0;	210	win->data = 0;

drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c+2−2

@@ -32,9 +32,9 @@ static void iwl_mvm_mld_mac_ctxt_cmd_common(struct iwl_mvm *mvm, · 31 unmodified lines
32	unsigned int link_id;	32	unsigned int link_id;
33	int cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,	33	int cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,
34	WIDE_ID(MAC_CONF_GROUP,	34	WIDE_ID(MAC_CONF_GROUP,
35	MAC_CONFIG_CMD), 0);	35	MAC_CONFIG_CMD), 1);
36		36
37	if (WARN_ON(cmd_ver < 1 \|\| cmd_ver > 3))	37	if (WARN_ON(cmd_ver > 3))
38	return;	38	return;
39		39
40	cmd->id_and_color = cpu_to_le32(mvmvif->id);	40	cmd->id_and_color = cpu_to_le32(mvmvif->id);

include/net/bluetooth/hci_core.h+2−0

 #include <linux/idr.h>
 #include <linux/leds.h>
 #include <linux/rculist.h>
+#include <linux/srcu.h>
 #include <net/bluetooth/hci.h>
 #include <net/bluetooth/hci_drv.h>
 struct hci_dev {
 	struct list_head list;
+	struct srcu_struct srcu;
 	struct mutex	lock;
 	struct ida	unset_handle_ida;

include/uapi/linux/mptcp_pm.h+3−3

include/uapi/linux/vm_sockets.h+4−0

@@ -17,6 +17,10 @@ · 16 unmodified lines
17	#ifndef _UAPI_VM_SOCKETS_H	17	#ifndef _UAPI_VM_SOCKETS_H
18	#define _UAPI_VM_SOCKETS_H	18	#define _UAPI_VM_SOCKETS_H
19		19
		20	#ifndef __KERNEL__
		21	#include <sys/socket.h> /* for struct sockaddr and sa_family_t */
		22	#endif
		23
20	#include <linux/socket.h>	24	#include <linux/socket.h>
21	#include <linux/types.h>	25	#include <linux/types.h>
22		26

net/atm/clip.c+5−6

 	pr_debug("\n");
-	if (!clip_devs) {
-		atm_return(vcc, skb->truesize);
-		kfree_skb(skb);
-		return;
-	}
 	if (!skb) {
 		pr_debug("removing VCC %p\n", clip_vcc);
 		if (clip_vcc->entry)
 		return;
 	}
 	atm_return(vcc, skb->truesize);
+	if (!clip_devs) {
+		kfree_skb(skb);
+		return;
+	}
 	skb->dev = clip_vcc->entry ? clip_vcc->entry->neigh->dev : clip_devs;
 	/* clip_vcc->entry == NULL if we don't have an IP address yet */
 	if (!skb->dev) {

net/atm/resources.c+1−2

 	 */
 	mutex_lock(&atm_dev_mutex);
 	list_del(&dev->dev_list);
-	mutex_unlock(&atm_dev_mutex);
 	atm_dev_release_vccs(dev);
 	atm_unregister_sysfs(dev);
 	atm_proc_dev_deregister(dev);
+	mutex_unlock(&atm_dev_mutex);
 	atm_dev_put(dev);
 }

net/bluetooth/hci_core.c+30−4

 /* Get HCI device by index.
  * Device is held on return. */
-struct hci_dev *hci_dev_get(int index)
+static struct hci_dev *__hci_dev_get(int index, int *srcu_index)
 {
 	struct hci_dev *hdev = NULL, *d;
 	list_for_each_entry(d, &hci_dev_list, list) {
 		if (d->id == index) {
 			hdev = hci_dev_hold(d);
+			if (srcu_index)
+				*srcu_index = srcu_read_lock(&d->srcu);
 			break;
 		}
 	}
 	return hdev;
 }
+struct hci_dev *hci_dev_get(int index)
+{
+	return __hci_dev_get(index, NULL);
+}
+static struct hci_dev *hci_dev_get_srcu(int index, int *srcu_index)
+{
+	return __hci_dev_get(index, srcu_index);
+}
+static void hci_dev_put_srcu(struct hci_dev *hdev, int srcu_index)
+{
+	srcu_read_unlock(&hdev->srcu, srcu_index);
+	hci_dev_put(hdev);
+}
 /* ---- Inquiry support ---- */
 bool hci_discovery_active(struct hci_dev *hdev)
 int hci_dev_reset(__u16 dev)
 {
 	struct hci_dev *hdev;
-	int err;
+	int err, srcu_index;
-	hdev = hci_dev_get(dev);
+	hdev = hci_dev_get_srcu(dev, &srcu_index);
 	if (!hdev)
 		return -ENODEV;
 	err = hci_dev_do_reset(hdev);
 done:
-	hci_dev_put(hdev);
+	hci_dev_put_srcu(hdev, srcu_index);
 	return err;
 }
 	if (!hdev)
 		return NULL;
+	if (init_srcu_struct(&hdev->srcu)) {
+		kfree(hdev);
+		return NULL;
+	}
 	hdev->pkt_type  = (HCI_DM1 | HCI_DH1 | HCI_HV1);
 	hdev->esco_type = (ESCO_HV1);
 	hdev->link_mode = (HCI_LM_ACCEPT);
 	list_del(&hdev->list);
 	write_unlock(&hci_dev_list_lock);
+	synchronize_srcu(&hdev->srcu);
+	cleanup_srcu_struct(&hdev->srcu);
 	disable_work_sync(&hdev->rx_work);
 	disable_work_sync(&hdev->cmd_work);
 	disable_work_sync(&hdev->tx_work);

net/bluetooth/l2cap_core.c+8−1

 	struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };
 	struct l2cap_conf_efs efs;
 	u8 remote_efs = 0;
-	u16 mtu = L2CAP_DEFAULT_MTU;
+	u16 mtu = 0;
 	u16 result = L2CAP_CONF_SUCCESS;
 	u16 size;
 		/* Configure output options and let the other side know
 		 * which ones we don't like. */
+		/* If MTU is not provided in configure request, use the most recently
+		 * explicitly or implicitly accepted value for the other direction,
+		 * or the default value.
+		 */
+		if (mtu == 0)
+			mtu = chan->imtu ? chan->imtu : L2CAP_DEFAULT_MTU;
 		if (mtu < L2CAP_DEFAULT_MIN_MTU)
 			result = L2CAP_CONF_UNACCEPT;
 		else {

net/bridge/br_multicast.c+9−0

 void br_multicast_port_ctx_deinit(struct net_bridge_mcast_port *pmctx)
 {
+	struct net_bridge *br = pmctx->port->br;
+	bool del = false;
 #if IS_ENABLED(CONFIG_IPV6)
 	timer_delete_sync(&pmctx->ip6_mc_router_timer);
 #endif
 	timer_delete_sync(&pmctx->ip4_mc_router_timer);
+	spin_lock_bh(&br->multicast_lock);
+	del |= br_ip6_multicast_rport_del(pmctx);
+	del |= br_ip4_multicast_rport_del(pmctx);
+	br_multicast_rport_del_notify(pmctx, del);
+	spin_unlock_bh(&br->multicast_lock);
 }
 int br_multicast_add_port(struct net_bridge_port *port)

net/core/netpoll.c+1−1

 	udph->dest = htons(np->remote_port);
 	udph->len = htons(udp_len);
+	udph->check = 0;
 	if (np->ipv6) {
 		udph->check = csum_ipv6_magic(&np->local_ip.in6,
 					      &np->remote_ip.in6,
 		skb_reset_mac_header(skb);
 		skb->protocol = eth->h_proto = htons(ETH_P_IPV6);
 	} else {
-		udph->check = 0;
 		udph->check = csum_tcpudp_magic(np->local_ip.ip,
 						np->remote_ip.ip,
 						udp_len, IPPROTO_UDP,

net/core/selftests.c+3−2

@@ -160,8 +160,9 @@ static struct sk_buff net_test_get_skb(struct net_device ndev, · 159 unmodified lines
160	skb->csum = 0;	160	skb->csum = 0;
161	skb->ip_summed = CHECKSUM_PARTIAL;	161	skb->ip_summed = CHECKSUM_PARTIAL;
162	if (attr->tcp) {	162	if (attr->tcp) {
163	thdr->check = ~tcp_v4_check(skb->len, ihdr->saddr,	163	int l4len = skb->len - skb_transport_offset(skb);
164	ihdr->daddr, 0);	164
		165	thdr->check = ~tcp_v4_check(l4len, ihdr->saddr, ihdr->daddr, 0);
165	skb->csum_start = skb_transport_header(skb) - skb->head;	166	skb->csum_start = skb_transport_header(skb) - skb->head;
166	skb->csum_offset = offsetof(struct tcphdr, check);	167	skb->csum_offset = offsetof(struct tcphdr, check);
167	} else {	168	} else {

net/mac80211/link.c+3−3

 	if (link_id < 0)
 		link_id = 0;
-	rcu_assign_pointer(sdata->vif.link_conf[link_id], link_conf);
-	rcu_assign_pointer(sdata->link[link_id], link);
 	if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
 		struct ieee80211_sub_if_data *ap_bss;
 		struct ieee80211_bss_conf *ap_bss_conf;
 		ieee80211_link_debugfs_add(link);
 	}
+	rcu_assign_pointer(sdata->vif.link_conf[link_id], link_conf);
+	rcu_assign_pointer(sdata->link[link_id], link);
 }
 void ieee80211_link_stop(struct ieee80211_link_data *link)

net/mac80211/util.c+1−1

@@ -3884,7 +3884,7 @@ void ieee80211_recalc_dtim(struct ieee80211_local *local, · 3883 unmodified lines
3884	{	3884	{
3885	u64 tsf = drv_get_tsf(local, sdata);	3885	u64 tsf = drv_get_tsf(local, sdata);
3886	u64 dtim_count = 0;	3886	u64 dtim_count = 0;
3887	u16 beacon_int = sdata->vif.bss_conf.beacon_int * 1024;	3887	u32 beacon_int = sdata->vif.bss_conf.beacon_int * 1024;
3888	u8 dtim_period = sdata->vif.bss_conf.dtim_period;	3888	u8 dtim_period = sdata->vif.bss_conf.dtim_period;
3889	struct ps_data *ps;	3889	struct ps_data *ps;
3890	u8 bcns_from_dtim;	3890	u8 bcns_from_dtim;

net/unix/af_unix.c+23−8

 #endif
 }
+static unsigned int unix_skb_len(const struct sk_buff *skb)
+{
+	return skb->len - UNIXCB(skb).consumed;
+}
 static void unix_release_sock(struct sock *sk, int embrion)
 {
 	struct unix_sock *u = unix_sk(sk);
 	if (skpair != NULL) {
 		if (sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET) {
+			struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
+#if IS_ENABLED(CONFIG_AF_UNIX_OOB)
+			if (skb && !unix_skb_len(skb))
+				skb = skb_peek_next(skb, &sk->sk_receive_queue);
+#endif
 			unix_state_lock(skpair);
 			/* No more writes */
 			WRITE_ONCE(skpair->sk_shutdown, SHUTDOWN_MASK);
-			if (!skb_queue_empty_lockless(&sk->sk_receive_queue) || embrion)
+			if (skb || embrion)
 				WRITE_ONCE(skpair->sk_err, ECONNRESET);
 			unix_state_unlock(skpair);
 			skpair->sk_state_change(skpair);
 	return timeo;
 }
-static unsigned int unix_skb_len(const struct sk_buff *skb)
-{
-	return skb->len - UNIXCB(skb).consumed;
-}
 struct unix_stream_read_state {
 	int (*recv_actor)(struct sk_buff *, int, int,
 			  struct unix_stream_read_state *);
 #if IS_ENABLED(CONFIG_AF_UNIX_OOB)
 static int unix_stream_recv_urg(struct unix_stream_read_state *state)
 {
+	struct sk_buff *oob_skb, *read_skb = NULL;
 	struct socket *sock = state->socket;
 	struct sock *sk = sock->sk;
 	struct unix_sock *u = unix_sk(sk);
 	int chunk = 1;
-	struct sk_buff *oob_skb;
 	mutex_lock(&u->iolock);
 	unix_state_lock(sk);
 	oob_skb = u->oob_skb;
-	if (!(state->flags & MSG_PEEK))
+	if (!(state->flags & MSG_PEEK)) {
 		WRITE_ONCE(u->oob_skb, NULL);
+		if (oob_skb->prev != (struct sk_buff *)&sk->sk_receive_queue &&
+		    !unix_skb_len(oob_skb->prev)) {
+			read_skb = oob_skb->prev;
+			__skb_unlink(read_skb, &sk->sk_receive_queue);
+		}
+	}
 	spin_unlock(&sk->sk_receive_queue.lock);
 	unix_state_unlock(sk);
 	mutex_unlock(&u->iolock);
+	consume_skb(read_skb);
 	if (chunk < 0)
 		return -EFAULT;

tools/testing/selftests/drivers/net/hw/rss_input_xfrm.py+1−1

@@ -38,7 +38,7 @@ def test_rss_input_xfrm(cfg, ipver): · 37 unmodified lines
38	raise KsftSkipEx("socket.SO_INCOMING_CPU was added in Python 3.11")	38	raise KsftSkipEx("socket.SO_INCOMING_CPU was added in Python 3.11")
39		39
40	input_xfrm = cfg.ethnl.rss_get(	40	input_xfrm = cfg.ethnl.rss_get(
41	{'header': {'dev-name': cfg.ifname}}).get('input_xfrm')	41	{'header': {'dev-name': cfg.ifname}}).get('input-xfrm')
42		42
43	# Check for symmetric xor/or-xor	43	# Check for symmetric xor/or-xor
44	if not input_xfrm or (input_xfrm != 1 and input_xfrm != 2):	44	if not input_xfrm or (input_xfrm != 1 and input_xfrm != 2):

tools/testing/selftests/net/af_unix/msg_oob.c+138−4

 static void __recvpair(struct __test_metadata *_metadata,
 		       FIXTURE_DATA(msg_oob) *self,
 		       const char *expected_buf, int expected_len,
-		       int buf_len, int flags)
+		       int buf_len, int flags, bool is_sender)
 {
 	int i, ret[2], recv_errno[2], expected_errno = 0;
 	char recv_buf[2][BUF_SZ] = {};
 	errno = 0;
 	for (i = 0; i < 2; i++) {
-		ret[i] = recv(self->fd[i * 2 + 1], recv_buf[i], buf_len, flags);
+		int index = is_sender ? i * 2 : i * 2 + 1;
+		ret[i] = recv(self->fd[index], recv_buf[i], buf_len, flags);
 		recv_errno[i] = errno;
 	}
 		ASSERT_EQ(answ[0], answ[1]);
 }
+static void __resetpair(struct __test_metadata *_metadata,
+			FIXTURE_DATA(msg_oob) *self,
+			const FIXTURE_VARIANT(msg_oob) *variant,
+			bool reset)
+{
+	int i;
+	for (i = 0; i < 2; i++)
+		close(self->fd[i * 2 + 1]);
+	__recvpair(_metadata, self, "", reset ? -ECONNRESET : 0, 1,
+		   variant->peek ? MSG_PEEK : 0, true);
+}
 #define sendpair(buf, len, flags)					\
 	__sendpair(_metadata, self, buf, len, flags)
 		if (variant->peek)					\
 			__recvpair(_metadata, self,			\
 				   expected_buf, expected_len,		\
-				   buf_len, (flags) | MSG_PEEK);	\
+				   buf_len, (flags) | MSG_PEEK, false);	\
 		__recvpair(_metadata, self,				\
-			   expected_buf, expected_len, buf_len, flags);	\
+			   expected_buf, expected_len,			\
+			   buf_len, flags, false);			\
 	} while (0)
 #define epollpair(oob_remaining)					\
 #define setinlinepair()							\
 	__setinlinepair(_metadata, self)
+#define resetpair(reset)						\
+	__resetpair(_metadata, self, variant, reset)
 #define tcp_incompliant							\
 	for (self->tcp_compliant = false;				\
 	     self->tcp_compliant == false;				\
 	recvpair("", -EINVAL, 1, MSG_OOB);
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(true);
+}
+TEST_F(msg_oob, non_oob_no_reset)
+{
+	sendpair("x", 1, 0);
+	epollpair(false);
+	siocatmarkpair(false);
+	recvpair("x", 1, 1, 0);
+	epollpair(false);
+	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, oob)
 	recvpair("x", 1, 1, MSG_OOB);
 	epollpair(false);
 	siocatmarkpair(true);
+	tcp_incompliant {
+		resetpair(false);		/* TCP sets -ECONNRESET for ex-OOB. */
+	}
+}
+TEST_F(msg_oob, oob_reset)
+{
+	sendpair("x", 1, MSG_OOB);
+	epollpair(true);
+	siocatmarkpair(true);
+	resetpair(true);
 }
 TEST_F(msg_oob, oob_drop)
 	recvpair("", -EINVAL, 1, MSG_OOB);
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, oob_ahead)
 	recvpair("hell", 4, 4, 0);
 	epollpair(false);
 	siocatmarkpair(true);
+	tcp_incompliant {
+		resetpair(false);		/* TCP sets -ECONNRESET for ex-OOB. */
+	}
 }
 TEST_F(msg_oob, oob_break)
 	recvpair("", -EAGAIN, 1, 0);
 	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, oob_ahead_break)
 	recvpair("world", 5, 5, 0);
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, oob_break_drop)
 	recvpair("", -EINVAL, 1, MSG_OOB);
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, ex_oob_break)
 	recvpair("ld", 2, 2, 0);
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, ex_oob_drop)
 		epollpair(false);
 		siocatmarkpair(true);
 	}
+	resetpair(false);
 }
 TEST_F(msg_oob, ex_oob_drop_2)
 		epollpair(false);
 		siocatmarkpair(true);
 	}
+	resetpair(false);
 }
 TEST_F(msg_oob, ex_oob_oob)
 	recvpair("", -EINVAL, 1, MSG_OOB);
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(false);
+}
+TEST_F(msg_oob, ex_oob_ex_oob)
+{
+	sendpair("x", 1, MSG_OOB);
+	epollpair(true);
+	siocatmarkpair(true);
+	recvpair("x", 1, 1, MSG_OOB);
+	epollpair(false);
+	siocatmarkpair(true);
+	sendpair("y", 1, MSG_OOB);
+	epollpair(true);
+	siocatmarkpair(true);
+	recvpair("y", 1, 1, MSG_OOB);
+	epollpair(false);
+	siocatmarkpair(true);
+	tcp_incompliant {
+		resetpair(false);		/* TCP sets -ECONNRESET for ex-OOB. */
+	}
+}
+TEST_F(msg_oob, ex_oob_ex_oob_oob)
+{
+	sendpair("x", 1, MSG_OOB);
+	epollpair(true);
+	siocatmarkpair(true);
+	recvpair("x", 1, 1, MSG_OOB);
+	epollpair(false);
+	siocatmarkpair(true);
+	sendpair("y", 1, MSG_OOB);
+	epollpair(true);
+	siocatmarkpair(true);
+	recvpair("y", 1, 1, MSG_OOB);
+	epollpair(false);
+	siocatmarkpair(true);
+	sendpair("z", 1, MSG_OOB);
+	epollpair(true);
+	siocatmarkpair(true);
 }
 TEST_F(msg_oob, ex_oob_ahead_break)
 	recvpair("d", 1, 1, MSG_OOB);
 	epollpair(false);
 	siocatmarkpair(true);
+	tcp_incompliant {
+		resetpair(false);		/* TCP sets -ECONNRESET for ex-OOB. */
+	}
 }
 TEST_F(msg_oob, ex_oob_siocatmark)
 	recvpair("hell", 4, 4, 0);		/* Intentionally stop at ex-OOB. */
 	epollpair(true);
 	siocatmarkpair(false);
+	resetpair(true);
 }
 TEST_F(msg_oob, inline_oob)
 	recvpair("x", 1, 1, 0);
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, inline_oob_break)
 	recvpair("o", 1, 1, 0);
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, inline_oob_ahead_break)
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, inline_ex_oob_break)
 	recvpair("rld", 3, 3, 0);
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, inline_ex_oob_no_drop)
 	recvpair("y", 1, 1, 0);
 	epollpair(false);
 	siocatmarkpair(false);
+	resetpair(false);
 }
 TEST_F(msg_oob, inline_ex_oob_drop)
 		epollpair(false);
 		siocatmarkpair(false);
 	}
+	resetpair(false);
 }
 TEST_F(msg_oob, inline_ex_oob_siocatmark)
 	recvpair("hell", 4, 4, 0);		/* Intentionally stop at ex-OOB. */
 	epollpair(true);
 	siocatmarkpair(false);
+	resetpair(true);
 }
 TEST_HARNESS_MAIN

Merge tag 'net-6.16-rc4' 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

@@ -27,14 +27,14 @@ · 26 unmodified lines
27	* token, rem_id.	27	* token, rem_id.
28	* @MPTCP_EVENT_SUB_ESTABLISHED: A new subflow has been established. 'error'	28	* @MPTCP_EVENT_SUB_ESTABLISHED: A new subflow has been established. 'error'
29	* should not be set. Attributes: token, family, loc_id, rem_id, saddr4 \|	29	* should not be set. Attributes: token, family, loc_id, rem_id, saddr4 \|
30	* saddr6, daddr4 \| daddr6, sport, dport, backup, if_idx [, error].	30	* saddr6, daddr4 \| daddr6, sport, dport, backup, if-idx [, error].
31	* @MPTCP_EVENT_SUB_CLOSED: A subflow has been closed. An error (copy of	31	* @MPTCP_EVENT_SUB_CLOSED: A subflow has been closed. An error (copy of
32	* sk_err) could be set if an error has been detected for this subflow.	32	* sk_err) could be set if an error has been detected for this subflow.
33	* Attributes: token, family, loc_id, rem_id, saddr4 \| saddr6, daddr4 \|	33	* Attributes: token, family, loc_id, rem_id, saddr4 \| saddr6, daddr4 \|
34	* daddr6, sport, dport, backup, if_idx [, error].	34	* daddr6, sport, dport, backup, if-idx [, error].
35	* @MPTCP_EVENT_SUB_PRIORITY: The priority of a subflow has changed. 'error'	35	* @MPTCP_EVENT_SUB_PRIORITY: The priority of a subflow has changed. 'error'
36	* should not be set. Attributes: token, family, loc_id, rem_id, saddr4 \|	36	* should not be set. Attributes: token, family, loc_id, rem_id, saddr4 \|
37	* saddr6, daddr4 \| daddr6, sport, dport, backup, if_idx [, error].	37	* saddr6, daddr4 \| daddr6, sport, dport, backup, if-idx [, error].
38	* @MPTCP_EVENT_LISTENER_CREATED: A new PM listener is created. Attributes:	38	* @MPTCP_EVENT_LISTENER_CREATED: A new PM listener is created. Attributes:
39	* family, sport, saddr4 \| saddr6.	39	* family, sport, saddr4 \| saddr6.
40	* @MPTCP_EVENT_LISTENER_CLOSED: A PM listener is closed. Attributes: family,	40	* @MPTCP_EVENT_LISTENER_CLOSED: A PM listener is closed. Attributes: family,