lael-labs/linux

CREDITS+13−0

@@ -2161,6 +2161,19 @@ N: Mike Kravetz · 2160 unmodified lines
2161	E: mike.kravetz@oracle.com	2161	E: mike.kravetz@oracle.com
2162	D: Maintenance and development of the hugetlb subsystem	2162	D: Maintenance and development of the hugetlb subsystem
2163		2163
		2164	N: Seth Jennings
		2165	E: sjenning@redhat.com
		2166	D: Creation and maintenance of zswap
		2167
		2168	N: Dan Streetman
		2169	E: ddstreet@ieee.org
		2170	D: Maintenance and development of zswap
		2171	D: Creation and maintenance of the zpool API
		2172
		2173	N: Vitaly Wool
		2174	E: vitaly.wool@konsulko.com
		2175	D: Maintenance and development of zswap
		2176
2164	N: Andreas S. Krebs	2177	N: Andreas S. Krebs
2165	E: akrebs@altavista.net	2178	E: akrebs@altavista.net
2166	D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards	2179	D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards

Documentation/ABI/testing/sysfs-class-net-queues+11−11

@@ -1,4 +1,4 @@
1	What: /sys/class/<iface>/queues/rx-<queue>/rps_cpus	1	What: /sys/class/net/<iface>/queues/rx-<queue>/rps_cpus
2	Date: March 2010	2	Date: March 2010
3	KernelVersion: 2.6.35	3	KernelVersion: 2.6.35
4	Contact: netdev@vger.kernel.org	4	Contact: netdev@vger.kernel.org
@@ -8,7 +8,7 @@ Description: · 3 unmodified lines
8	network device queue. Possible values depend on the number	8	network device queue. Possible values depend on the number
9	of available CPU(s) in the system.	9	of available CPU(s) in the system.
10		10
11	What: /sys/class/<iface>/queues/rx-<queue>/rps_flow_cnt	11	What: /sys/class/net/<iface>/queues/rx-<queue>/rps_flow_cnt
12	Date: April 2010	12	Date: April 2010
13	KernelVersion: 2.6.35	13	KernelVersion: 2.6.35
14	Contact: netdev@vger.kernel.org	14	Contact: netdev@vger.kernel.org
@@ -16,7 +16,7 @@ Description: · 1 unmodified line
16	Number of Receive Packet Steering flows being currently	16	Number of Receive Packet Steering flows being currently
17	processed by this particular network device receive queue.	17	processed by this particular network device receive queue.
18		18
19	What: /sys/class/<iface>/queues/tx-<queue>/tx_timeout	19	What: /sys/class/net/<iface>/queues/tx-<queue>/tx_timeout
20	Date: November 2011	20	Date: November 2011
21	KernelVersion: 3.3	21	KernelVersion: 3.3
22	Contact: netdev@vger.kernel.org	22	Contact: netdev@vger.kernel.org
@@ -24,7 +24,7 @@ Description: · 1 unmodified line
24	Indicates the number of transmit timeout events seen by this	24	Indicates the number of transmit timeout events seen by this
25	network interface transmit queue.	25	network interface transmit queue.
26		26
27	What: /sys/class/<iface>/queues/tx-<queue>/tx_maxrate	27	What: /sys/class/net/<iface>/queues/tx-<queue>/tx_maxrate
28	Date: March 2015	28	Date: March 2015
29	KernelVersion: 4.1	29	KernelVersion: 4.1
30	Contact: netdev@vger.kernel.org	30	Contact: netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description: · 1 unmodified line
32	A Mbps max-rate set for the queue, a value of zero means disabled,	32	A Mbps max-rate set for the queue, a value of zero means disabled,
33	default is disabled.	33	default is disabled.
34		34
35	What: /sys/class/<iface>/queues/tx-<queue>/xps_cpus	35	What: /sys/class/net/<iface>/queues/tx-<queue>/xps_cpus
36	Date: November 2010	36	Date: November 2010
37	KernelVersion: 2.6.38	37	KernelVersion: 2.6.38
38	Contact: netdev@vger.kernel.org	38	Contact: netdev@vger.kernel.org
@@ -42,7 +42,7 @@ Description: · 3 unmodified lines
42	network device transmit queue. Possible values depend on the	42	network device transmit queue. Possible values depend on the
43	number of available CPU(s) in the system.	43	number of available CPU(s) in the system.
44		44
45	What: /sys/class/<iface>/queues/tx-<queue>/xps_rxqs	45	What: /sys/class/net/<iface>/queues/tx-<queue>/xps_rxqs
46	Date: June 2018	46	Date: June 2018
47	KernelVersion: 4.18.0	47	KernelVersion: 4.18.0
48	Contact: netdev@vger.kernel.org	48	Contact: netdev@vger.kernel.org
@@ -53,7 +53,7 @@ Description: · 4 unmodified lines
53	number of available receive queue(s) in the network device.	53	number of available receive queue(s) in the network device.
54	Default is disabled.	54	Default is disabled.
55		55
56	What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time	56	What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time
57	Date: November 2011	57	Date: November 2011
58	KernelVersion: 3.3	58	KernelVersion: 3.3
59	Contact: netdev@vger.kernel.org	59	Contact: netdev@vger.kernel.org
@@ -62,7 +62,7 @@ Description: · 2 unmodified lines
62	of this particular network device transmit queue.	62	of this particular network device transmit queue.
63	Default value is 1000.	63	Default value is 1000.
64		64
65	What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/inflight	65	What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/inflight
66	Date: November 2011	66	Date: November 2011
67	KernelVersion: 3.3	67	KernelVersion: 3.3
68	Contact: netdev@vger.kernel.org	68	Contact: netdev@vger.kernel.org
@@ -70,7 +70,7 @@ Description: · 1 unmodified line
70	Indicates the number of bytes (objects) in flight on this	70	Indicates the number of bytes (objects) in flight on this
71	network device transmit queue.	71	network device transmit queue.
72		72
73	What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit	73	What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit
74	Date: November 2011	74	Date: November 2011
75	KernelVersion: 3.3	75	KernelVersion: 3.3
76	Contact: netdev@vger.kernel.org	76	Contact: netdev@vger.kernel.org
@@ -79,7 +79,7 @@ Description: · 2 unmodified lines
79	on this network device transmit queue. This value is clamped	79	on this network device transmit queue. This value is clamped
80	to be within the bounds defined by limit_max and limit_min.	80	to be within the bounds defined by limit_max and limit_min.
81		81
82	What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max	82	What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max
83	Date: November 2011	83	Date: November 2011
84	KernelVersion: 3.3	84	KernelVersion: 3.3
85	Contact: netdev@vger.kernel.org	85	Contact: netdev@vger.kernel.org
@@ -88,7 +88,7 @@ Description: · 2 unmodified lines
88	queued on this network device transmit queue. See	88	queued on this network device transmit queue. See
89	include/linux/dynamic_queue_limits.h for the default value.	89	include/linux/dynamic_queue_limits.h for the default value.
90		90
91	What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min	91	What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min
92	Date: November 2011	92	Date: November 2011
93	KernelVersion: 3.3	93	KernelVersion: 3.3
94	Contact: netdev@vger.kernel.org	94	Contact: netdev@vger.kernel.org

Documentation/ABI/testing/sysfs-platform-silicom+1−0

@@ -10,6 +10,7 @@ What: /sys/devices/platform/silicom-platform/power_cycle · 9 unmodified lines
10	Date: November 2023	10	Date: November 2023
11	KernelVersion: 6.7	11	KernelVersion: 6.7
12	Contact: Henry Shi <henrys@silicom-usa.com>	12	Contact: Henry Shi <henrys@silicom-usa.com>
		13	Description:
13	This file allow user to power cycle the platform.	14	This file allow user to power cycle the platform.
14	Default value is 0; when set to 1, it powers down	15	Default value is 0; when set to 1, it powers down
15	the platform, waits 5 seconds, then powers on the	16	the platform, waits 5 seconds, then powers on the

Documentation/accel/introduction.rst+2−2

@@ -101,8 +101,8 @@ External References · 100 unmodified lines
101	email threads	101	email threads
102	-------------	102	-------------
103		103
104	* `Initial discussion on the New subsystem for acceleration devices <https://lkml.org/lkml/2022/7/31/83>`_ - Oded Gabbay (2022)	104	* `Initial discussion on the New subsystem for acceleration devices <https://lore.kernel.org/lkml/CAFCwf11=9qpNAepL7NL+YAV_QO=Wv6pnWPhKHKAepK3fNn+2Dg@mail.gmail.com/>`_ - Oded Gabbay (2022)
105	* `patch-set to add the new subsystem <https://lkml.org/lkml/2022/10/22/544>`_ - Oded Gabbay (2022)	105	* `patch-set to add the new subsystem <https://lore.kernel.org/lkml/20221022214622.18042-1-ogabbay@kernel.org/>`_ - Oded Gabbay (2022)
106		106
107	Conference talks	107	Conference talks
108	----------------	108	----------------

Documentation/admin-guide/kernel-parameters.rst+0−5

@@ -218,8 +218,3 @@ bytes respectively. Such letter suffixes can also be entirely omitted: · 217 unmodified lines
218		218
219	.. include:: kernel-parameters.txt	219	.. include:: kernel-parameters.txt
220	:literal:	220	:literal:
221
222	Todo
223	----
224
225	Add more DRM drivers.

Documentation/admin-guide/kernel-per-CPU-kthreads.rst+6−10

 3.	Do any of the following needed to avoid jitter that your
 	application cannot tolerate:
-	a.	Build your kernel with CONFIG_SLUB=y rather than
+	a.	Avoid using oprofile, thus avoiding OS jitter from
-		CONFIG_SLAB=y, thus avoiding the slab allocator's periodic
-		use of each CPU's workqueues to run its cache_reap()
-		function.
-	b.	Avoid using oprofile, thus avoiding OS jitter from
 		wq_sync_buffer().
-	c.	Limit your CPU frequency so that a CPU-frequency
+	b.	Limit your CPU frequency so that a CPU-frequency
 		governor is not required, possibly enlisting the aid of
 		special heatsinks or other cooling technologies.  If done
 		correctly, and if you CPU architecture permits, you should
 		WARNING:  Please check your CPU specifications to
 		make sure that this is safe on your particular system.
-	d.	As of v3.18, Christoph Lameter's on-demand vmstat workers
+	c.	As of v3.18, Christoph Lameter's on-demand vmstat workers
 		commit prevents OS jitter due to vmstat_update() on
 		CONFIG_SMP=y systems.  Before v3.18, is not possible
 		to entirely get rid of the OS jitter, but you can
 		(based on an earlier one from Gilad Ben-Yossef) that
 		reduces or even eliminates vmstat overhead for some
 		workloads at https://lore.kernel.org/r/00000140e9dfd6bd-40db3d4f-c1be-434f-8132-7820f81bb586-000000@email.amazonses.com.
-	e.	If running on high-end powerpc servers, build with
+	d.	If running on high-end powerpc servers, build with
 		CONFIG_PPC_RTAS_DAEMON=n.  This prevents the RTAS
 		daemon from running on each CPU every second or so.
 		(This will require editing Kconfig files and will defeat
 		due to the rtas_event_scan() function.
 		WARNING:  Please check your CPU specifications to
 		make sure that this is safe on your particular system.
-	f.	If running on Cell Processor, build your kernel with
+	e.	If running on Cell Processor, build your kernel with
 		CBE_CPUFREQ_SPU_GOVERNOR=n to avoid OS jitter from
 		spu_gov_work().
 		WARNING:  Please check your CPU specifications to
 		make sure that this is safe on your particular system.
-	g.	If running on PowerMAC, build your kernel with
+	f.	If running on PowerMAC, build your kernel with
 		CONFIG_PMAC_RACKMETER=n to disable the CPU-meter,
 		avoiding OS jitter from rackmeter_do_timer().

Documentation/dev-tools/kunit/usage.rst+17−2

@@ -671,8 +671,23 @@ Testing Static Functions · 670 unmodified lines
671	------------------------	671	------------------------
672		672
673	If we do not want to expose functions or variables for testing, one option is to	673	If we do not want to expose functions or variables for testing, one option is to
674	conditionally ``#include`` the test file at the end of your .c file. For	674	conditionally export the used symbol. For example:
675	example:	675
		676	.. code-block:: c
		677
		678	/* In my_file.c */
		679
		680	VISIBLE_IF_KUNIT int do_interesting_thing();
		681	EXPORT_SYMBOL_IF_KUNIT(do_interesting_thing);
		682
		683	/* In my_file.h */
		684
		685	#if IS_ENABLED(CONFIG_KUNIT)
		686	int do_interesting_thing(void);
		687	#endif
		688
		689	Alternatively, you could conditionally ``#include`` the test file at the end of
		690	your .c file. For example:
676		691
677	.. code-block:: c	692	.. code-block:: c
678		693

Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml+3−3

@@ -85,7 +85,7 @@ allOf: · 84 unmodified lines
85	clocks:	85	clocks:
86	minItems: 6	86	minItems: 6
87	maxItems: 6	87	maxItems: 6
88	regs:	88	reg:
89	minItems: 2	89	minItems: 2
90	maxItems: 2	90	maxItems: 2
91		91
@@ -99,7 +99,7 @@ allOf: · 7 unmodified lines
99	clocks:	99	clocks:
100	minItems: 4	100	minItems: 4
101	maxItems: 4	101	maxItems: 4
102	regs:	102	reg:
103	minItems: 2	103	minItems: 2
104	maxItems: 2	104	maxItems: 2
105		105
@@ -116,7 +116,7 @@ allOf: · 10 unmodified lines
116	clocks:	116	clocks:
117	minItems: 3	117	minItems: 3
118	maxItems: 3	118	maxItems: 3
119	regs:	119	reg:
120	minItems: 1	120	minItems: 1
121	maxItems: 1	121	maxItems: 1
122		122

Documentation/devicetree/bindings/media/cnm,wave521c.yaml+2−2

@@ -17,7 +17,7 @@ properties: · 16 unmodified lines
17	compatible:	17	compatible:
18	items:	18	items:
19	- enum:	19	- enum:
20	- ti,k3-j721s2-wave521c	20	- ti,j721s2-wave521c
21	- const: cnm,wave521c	21	- const: cnm,wave521c
22		22
23	reg:	23	reg:
@@ -53,7 +53,7 @@ additionalProperties: false · 29 unmodified lines
53	examples:	53	examples:
54	- \|	54	- \|
55	vpu: video-codec@12345678 {	55	vpu: video-codec@12345678 {
56	compatible = "ti,k3-j721s2-wave521c", "cnm,wave521c";	56	compatible = "ti,j721s2-wave521c", "cnm,wave521c";
57	reg = <0x12345678 0x1000>;	57	reg = <0x12345678 0x1000>;
58	clocks = <&clks 42>;	58	clocks = <&clks 42>;
59	interrupts = <42>;	59	interrupts = <42>;

Documentation/netlink/specs/rt_link.yaml+10−0

       -
         name: gro-ipv4-max-size
         type: u32
+      -
+        name: dpll-pin
+        type: nest
+        nested-attributes: link-dpll-pin-attrs
   -
     name: af-spec-attrs
     attributes:
       -
         name: used
         type: u8
+  -
+    name: link-dpll-pin-attrs
+    attributes:
+      -
+        name: id
+        type: u32
 sub-messages:
   -

Documentation/sphinx/templates/kernel-toc.html+3−1

@@ -12,5 +12,7 @@ · 11 unmodified lines
12	<script type="text/javascript"> <!--	12	<script type="text/javascript"> <!--
13	var sbar = document.getElementsByClassName("sphinxsidebar")[0];	13	var sbar = document.getElementsByClassName("sphinxsidebar")[0];
14	let currents = document.getElementsByClassName("current")	14	let currents = document.getElementsByClassName("current")
15	sbar.scrollTop = currents[currents.length - 1].offsetTop;	15	if (currents.length) {
		16	sbar.scrollTop = currents[currents.length - 1].offsetTop;
		17	}
16	--> </script>	18	--> </script>

MAINTAINERS+11−12

@@ -3168,10 +3168,10 @@ F: drivers/hwmon/asus-ec-sensors.c · 3167 unmodified lines
3168		3168
3169	ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS	3169	ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
3170	M: Corentin Chary <corentin.chary@gmail.com>	3170	M: Corentin Chary <corentin.chary@gmail.com>
3171	L: acpi4asus-user@lists.sourceforge.net	3171	M: Luke D. Jones <luke@ljones.dev>
3172	L: platform-driver-x86@vger.kernel.org	3172	L: platform-driver-x86@vger.kernel.org
3173	S: Maintained	3173	S: Maintained
3174	W: http://acpi4asus.sf.net	3174	W: https://asus-linux.org/
3175	F: drivers/platform/x86/asus*.c	3175	F: drivers/platform/x86/asus*.c
3176	F: drivers/platform/x86/eeepc*.c	3176	F: drivers/platform/x86/eeepc*.c
3177		3177
@@ -5961,7 +5961,6 @@ S: Maintained · 2783 unmodified lines
5961	F: drivers/platform/x86/dell/dell-wmi-descriptor.c	5961	F: drivers/platform/x86/dell/dell-wmi-descriptor.c
5962		5962
5963	DELL WMI HARDWARE PRIVACY SUPPORT	5963	DELL WMI HARDWARE PRIVACY SUPPORT
5964	M: Perry Yuan <Perry.Yuan@dell.com>
5965	L: Dell.Client.Kernel@dell.com	5964	L: Dell.Client.Kernel@dell.com
5966	L: platform-driver-x86@vger.kernel.org	5965	L: platform-driver-x86@vger.kernel.org
5967	S: Maintained	5966	S: Maintained
@@ -10287,7 +10286,7 @@ F: drivers/scsi/ibmvscsi/ibmvscsi* · 4319 unmodified lines
10287	F: include/scsi/viosrp.h	10286	F: include/scsi/viosrp.h
10288		10287
10289	IBM Power Virtual SCSI Device Target Driver	10288	IBM Power Virtual SCSI Device Target Driver
10290	M: Michael Cyr <mikecyr@linux.ibm.com>	10289	M: Tyrel Datwyler <tyreld@linux.ibm.com>
10291	L: linux-scsi@vger.kernel.org	10290	L: linux-scsi@vger.kernel.org
10292	L: target-devel@vger.kernel.org	10291	L: target-devel@vger.kernel.org
10293	S: Supported	10292	S: Supported
@@ -11729,6 +11728,7 @@ F: fs/smb/server/ · 1435 unmodified lines
11729	KERNEL UNIT TESTING FRAMEWORK (KUnit)	11728	KERNEL UNIT TESTING FRAMEWORK (KUnit)
11730	M: Brendan Higgins <brendanhiggins@google.com>	11729	M: Brendan Higgins <brendanhiggins@google.com>
11731	M: David Gow <davidgow@google.com>	11730	M: David Gow <davidgow@google.com>
		11731	R: Rae Moar <rmoar@google.com>
11732	L: linux-kselftest@vger.kernel.org	11732	L: linux-kselftest@vger.kernel.org
11733	L: kunit-dev@googlegroups.com	11733	L: kunit-dev@googlegroups.com
11734	S: Maintained	11734	S: Maintained
@@ -12907,6 +12907,8 @@ M: Alejandro Colomar <alx@kernel.org> · 1172 unmodified lines
12907	L: linux-man@vger.kernel.org	12907	L: linux-man@vger.kernel.org
12908	S: Maintained	12908	S: Maintained
12909	W: http://www.kernel.org/doc/man-pages	12909	W: http://www.kernel.org/doc/man-pages
		12910	T: git git://git.kernel.org/pub/scm/docs/man-pages/man-pages.git
		12911	T: git git://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git
12910		12912
12911	MANAGEMENT COMPONENT TRANSPORT PROTOCOL (MCTP)	12913	MANAGEMENT COMPONENT TRANSPORT PROTOCOL (MCTP)
12912	M: Jeremy Kerr <jk@codeconstruct.com.au>	12914	M: Jeremy Kerr <jk@codeconstruct.com.au>
@@ -15182,6 +15184,7 @@ F: Documentation/networking/net_cachelines/net_device.rst · 2269 unmodified lines
15182	F: drivers/connector/	15184	F: drivers/connector/
15183	F: drivers/net/	15185	F: drivers/net/
15184	F: include/dt-bindings/net/	15186	F: include/dt-bindings/net/
		15187	F: include/linux/cn_proc.h
15185	F: include/linux/etherdevice.h	15188	F: include/linux/etherdevice.h
15186	F: include/linux/fcdevice.h	15189	F: include/linux/fcdevice.h
15187	F: include/linux/fddidevice.h	15190	F: include/linux/fddidevice.h
@@ -15189,6 +15192,7 @@ F: include/linux/hippidevice.h · 1 unmodified line
15189	F: include/linux/if_*	15192	F: include/linux/if_*
15190	F: include/linux/inetdevice.h	15193	F: include/linux/inetdevice.h
15191	F: include/linux/netdevice.h	15194	F: include/linux/netdevice.h
		15195	F: include/uapi/linux/cn_proc.h
15192	F: include/uapi/linux/if_*	15196	F: include/uapi/linux/if_*
15193	F: include/uapi/linux/netdevice.h	15197	F: include/uapi/linux/netdevice.h
15194	X: drivers/net/wireless/	15198	X: drivers/net/wireless/
@@ -18093,7 +18097,6 @@ F: drivers/net/ethernet/qualcomm/emac/ · 2898 unmodified lines
18093		18097
18094	QUALCOMM ETHQOS ETHERNET DRIVER	18098	QUALCOMM ETHQOS ETHERNET DRIVER
18095	M: Vinod Koul <vkoul@kernel.org>	18099	M: Vinod Koul <vkoul@kernel.org>
18096	R: Bhupesh Sharma <bhupesh.sharma@linaro.org>
18097	L: netdev@vger.kernel.org	18100	L: netdev@vger.kernel.org
18098	L: linux-arm-msm@vger.kernel.org	18101	L: linux-arm-msm@vger.kernel.org
18099	S: Maintained	18102	S: Maintained
@@ -20561,6 +20564,7 @@ F: Documentation/translations/sp_SP/ · 2461 unmodified lines
20561		20564
20562	SPARC + UltraSPARC (sparc/sparc64)	20565	SPARC + UltraSPARC (sparc/sparc64)
20563	M: "David S. Miller" <davem@davemloft.net>	20566	M: "David S. Miller" <davem@davemloft.net>
		20567	M: Andreas Larsson <andreas@gaisler.com>
20564	L: sparclinux@vger.kernel.org	20568	L: sparclinux@vger.kernel.org
20565	S: Maintained	20569	S: Maintained
20566	Q: http://patchwork.ozlabs.org/project/sparclinux/list/	20570	Q: http://patchwork.ozlabs.org/project/sparclinux/list/
@@ -24351,13 +24355,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git · 3784 unmodified lines
24351	F: Documentation/filesystems/zonefs.rst	24355	F: Documentation/filesystems/zonefs.rst
24352	F: fs/zonefs/	24356	F: fs/zonefs/
24353		24357
24354	ZPOOL COMPRESSED PAGE STORAGE API
24355	M: Dan Streetman <ddstreet@ieee.org>
24356	L: linux-mm@kvack.org
24357	S: Maintained
24358	F: include/linux/zpool.h
24359	F: mm/zpool.c
24360
24361	ZR36067 VIDEO FOR LINUX DRIVER	24358	ZR36067 VIDEO FOR LINUX DRIVER
24362	M: Corentin Labbe <clabbe@baylibre.com>	24359	M: Corentin Labbe <clabbe@baylibre.com>
24363	L: mjpeg-users@lists.sourceforge.net	24360	L: mjpeg-users@lists.sourceforge.net
@@ -24409,7 +24406,9 @@ M: Nhat Pham <nphamcs@gmail.com> · 45 unmodified lines
24409	L: linux-mm@kvack.org	24406	L: linux-mm@kvack.org
24410	S: Maintained	24407	S: Maintained
24411	F: Documentation/admin-guide/mm/zswap.rst	24408	F: Documentation/admin-guide/mm/zswap.rst
		24409	F: include/linux/zpool.h
24412	F: include/linux/zswap.h	24410	F: include/linux/zswap.h
		24411	F: mm/zpool.c
24413	F: mm/zswap.c	24412	F: mm/zswap.c
24414		24413
24415	THE REST	24414	THE REST

Makefile+8−8

@@ -2,7 +2,7 @@ · 1 unmodified line
2	VERSION = 6	2	VERSION = 6
3	PATCHLEVEL = 8	3	PATCHLEVEL = 8
4	SUBLEVEL = 0	4	SUBLEVEL = 0
5	EXTRAVERSION = -rc1	5	EXTRAVERSION = -rc2
6	NAME = Hurr durr I'ma ninja sloth	6	NAME = Hurr durr I'ma ninja sloth
7		7
8	# DOCUMENTATION	8	# DOCUMENTATION
@@ -294,15 +294,15 @@ may-sync-config := 1 · 285 unmodified lines
294	single-build :=	294	single-build :=
295		295
296	ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),)	296	ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),)
297	ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),)	297	ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),)
298	need-config :=	298	need-config :=
299	endif	299	endif
300	endif	300	endif
301		301
302	ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),)	302	ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),)
303	ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),)	303	ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),)
304	may-sync-config :=	304	may-sync-config :=
305	endif	305	endif
306	endif	306	endif
307		307
308	need-compiler := $(may-sync-config)	308	need-compiler := $(may-sync-config)
@@ -323,9 +323,9 @@ endif · 14 unmodified lines
323	# We cannot build single targets and the others at the same time	323	# We cannot build single targets and the others at the same time
324	ifneq ($(filter $(single-targets), $(MAKECMDGOALS)),)	324	ifneq ($(filter $(single-targets), $(MAKECMDGOALS)),)
325	single-build := 1	325	single-build := 1
326	ifneq ($(filter-out $(single-targets), $(MAKECMDGOALS)),)	326	ifneq ($(filter-out $(single-targets), $(MAKECMDGOALS)),)
327	mixed-build := 1	327	mixed-build := 1
328	endif	328	endif
329	endif	329	endif
330		330
331	# For "make -j clean all", "make -j mrproper defconfig all", etc.	331	# For "make -j clean all", "make -j mrproper defconfig all", etc.
@@ -1666,7 +1666,7 @@ help: · 1334 unmodified lines
1666	@echo ' (sparse by default)'	1666	@echo ' (sparse by default)'
1667	@echo ' make C=2 [targets] Force check of all c source with $$CHECK'	1667	@echo ' make C=2 [targets] Force check of all c source with $$CHECK'
1668	@echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'	1668	@echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
1669	@echo ' make W=n [targets] Enable extra build checks, n=1,2,3 where'	1669	@echo ' make W=n [targets] Enable extra build checks, n=1,2,3,c,e where'
1670	@echo ' 1: warnings which may be relevant and do not occur too often'	1670	@echo ' 1: warnings which may be relevant and do not occur too often'
1671	@echo ' 2: warnings which occur quite often but may still be relevant'	1671	@echo ' 2: warnings which occur quite often but may still be relevant'
1672	@echo ' 3: more obscure warnings, can most likely be ignored'	1672	@echo ' 3: more obscure warnings, can most likely be ignored'

arch/Kconfig+1−0

@@ -673,6 +673,7 @@ config SHADOW_CALL_STACK · 672 unmodified lines
673	bool "Shadow Call Stack"	673	bool "Shadow Call Stack"
674	depends on ARCH_SUPPORTS_SHADOW_CALL_STACK	674	depends on ARCH_SUPPORTS_SHADOW_CALL_STACK
675	depends on DYNAMIC_FTRACE_WITH_ARGS \|\| DYNAMIC_FTRACE_WITH_REGS \|\| !FUNCTION_GRAPH_TRACER	675	depends on DYNAMIC_FTRACE_WITH_ARGS \|\| DYNAMIC_FTRACE_WITH_REGS \|\| !FUNCTION_GRAPH_TRACER
		676	depends on MMU
676	help	677	help
677	This option enables the compiler's Shadow Call Stack, which	678	This option enables the compiler's Shadow Call Stack, which
678	uses a shadow stack to protect function return addresses from	679	uses a shadow stack to protect function return addresses from

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts+2−2

@@ -45,8 +45,8 @@ · 44 unmodified lines
45	num-chipselects = <1>;	45	num-chipselects = <1>;
46	cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;	46	cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;
47		47
48	tpmdev@0 {	48	tpm@0 {
49	compatible = "tcg,tpm_tis-spi";	49	compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
50	spi-max-frequency = <33000000>;	50	spi-max-frequency = <33000000>;
51	reg = <0>;	51	reg = <0>;
52	};	52	};

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400.dts+2−2

@@ -80,8 +80,8 @@ · 79 unmodified lines
80	gpio-miso = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_HIGH>;	80	gpio-miso = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_HIGH>;
81	num-chipselects = <1>;	81	num-chipselects = <1>;
82		82
83	tpmdev@0 {	83	tpm@0 {
84	compatible = "tcg,tpm_tis-spi";	84	compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
85	spi-max-frequency = <33000000>;	85	spi-max-frequency = <33000000>;
86	reg = <0>;	86	reg = <0>;
87	};	87	};

arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts+1−1

@@ -456,7 +456,7 @@ · 455 unmodified lines
456	status = "okay";	456	status = "okay";
457		457
458	tpm: tpm@2e {	458	tpm: tpm@2e {
459	compatible = "tcg,tpm-tis-i2c";	459	compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c";
460	reg = <0x2e>;	460	reg = <0x2e>;
461	};	461	};
462	};	462	};

arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi+2−2

@@ -35,8 +35,8 @@ · 34 unmodified lines
35	gpio-mosi = <&gpio0 ASPEED_GPIO(X, 4) GPIO_ACTIVE_HIGH>;	35	gpio-mosi = <&gpio0 ASPEED_GPIO(X, 4) GPIO_ACTIVE_HIGH>;
36	gpio-miso = <&gpio0 ASPEED_GPIO(X, 5) GPIO_ACTIVE_HIGH>;	36	gpio-miso = <&gpio0 ASPEED_GPIO(X, 5) GPIO_ACTIVE_HIGH>;
37		37
38	tpmdev@0 {	38	tpm@0 {
39	compatible = "tcg,tpm_tis-spi";	39	compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
40	spi-max-frequency = <33000000>;	40	spi-max-frequency = <33000000>;
41	reg = <0>;	41	reg = <0>;
42	};	42	};

arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi+1−1

@@ -116,7 +116,7 @@ · 115 unmodified lines
116	tpm_tis: tpm@1 {	116	tpm_tis: tpm@1 {
117	pinctrl-names = "default";	117	pinctrl-names = "default";
118	pinctrl-0 = <&pinctrl_tpm>;	118	pinctrl-0 = <&pinctrl_tpm>;
119	compatible = "tcg,tpm_tis-spi";	119	compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
120	reg = <1>;	120	reg = <1>;
121	spi-max-frequency = <20000000>;	121	spi-max-frequency = <20000000>;
122	interrupt-parent = <&gpio5>;	122	interrupt-parent = <&gpio5>;

arch/arm/boot/dts/nxp/imx/imx7d-flex-concentrator.dts+1−1

@@ -130,7 +130,7 @@ · 129 unmodified lines
130	* TCG specification - Section 6.4.1 Clocking:	130	* TCG specification - Section 6.4.1 Clocking:
131	* TPM shall support a SPI clock frequency range of 10-24 MHz.	131	* TPM shall support a SPI clock frequency range of 10-24 MHz.
132	*/	132	*/
133	st33htph: tpm-tis@0 {	133	st33htph: tpm@0 {
134	compatible = "st,st33htpm-spi", "tcg,tpm_tis-spi";	134	compatible = "st,st33htpm-spi", "tcg,tpm_tis-spi";
135	reg = <0>;	135	reg = <0>;
136	spi-max-frequency = <24000000>;	136	spi-max-frequency = <24000000>;

arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi+1−0

@@ -434,6 +434,7 @@ · 433 unmodified lines
434	};	434	};
435		435
436	&fimd {	436	&fimd {
		437	samsung,invert-vclk;
437	status = "okay";	438	status = "okay";
438	};	439	};
439		440

arch/arm/boot/dts/ti/omap/am335x-moxa-uc-2100-common.dtsi+1−1

@@ -217,7 +217,7 @@ · 216 unmodified lines
217	pinctrl-names = "default";	217	pinctrl-names = "default";
218	pinctrl-0 = <&spi1_pins>;	218	pinctrl-0 = <&spi1_pins>;
219		219
220	tpm_spi_tis@0 {	220	tpm@0 {
221	compatible = "tcg,tpm_tis-spi";	221	compatible = "tcg,tpm_tis-spi";
222	reg = <0>;	222	reg = <0>;
223	spi-max-frequency = <500000>;	223	spi-max-frequency = <500000>;

arch/arm64/boot/dts/exynos/google/gs101.dtsi+1−1

@@ -289,7 +289,7 @@ · 288 unmodified lines
289	#clock-cells = <1>;	289	#clock-cells = <1>;
290	clocks = <&cmu_top CLK_DOUT_CMU_MISC_BUS>,	290	clocks = <&cmu_top CLK_DOUT_CMU_MISC_BUS>,
291	<&cmu_top CLK_DOUT_CMU_MISC_SSS>;	291	<&cmu_top CLK_DOUT_CMU_MISC_SSS>;
292	clock-names = "dout_cmu_misc_bus", "dout_cmu_misc_sss";	292	clock-names = "bus", "sss";
293	};	293	};
294		294
295	watchdog_cl0: watchdog@10060000 {	295	watchdog_cl0: watchdog@10060000 {

arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l.dts+1−1

@@ -120,7 +120,7 @@ · 119 unmodified lines
120	};	120	};
121		121
122	tpm: tpm@1 {	122	tpm: tpm@1 {
123	compatible = "tcg,tpm_tis-spi";	123	compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
124	interrupts = <11 IRQ_TYPE_LEVEL_LOW>;	124	interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
125	interrupt-parent = <&gpio2>;	125	interrupt-parent = <&gpio2>;
126	pinctrl-names = "default";	126	pinctrl-names = "default";

arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi+1−1

@@ -89,7 +89,7 @@ · 88 unmodified lines
89	status = "okay";	89	status = "okay";
90		90
91	tpm@1 {	91	tpm@1 {
92	compatible = "tcg,tpm_tis-spi";	92	compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
93	reg = <0x1>;	93	reg = <0x1>;
94	spi-max-frequency = <36000000>;	94	spi-max-frequency = <36000000>;
95	};	95	};

arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi+1−1

@@ -109,7 +109,7 @@ · 108 unmodified lines
109	status = "okay";	109	status = "okay";
110		110
111	tpm@1 {	111	tpm@1 {
112	compatible = "tcg,tpm_tis-spi";	112	compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
113	reg = <0x1>;	113	reg = <0x1>;
114	spi-max-frequency = <36000000>;	114	spi-max-frequency = <36000000>;
115	};	115	};

arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts+1−1

@@ -234,7 +234,7 @@ · 233 unmodified lines
234	status = "okay";	234	status = "okay";
235		235
236	tpm: tpm@0 {	236	tpm: tpm@0 {
237	compatible = "infineon,slb9670";	237	compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
238	reg = <0>;	238	reg = <0>;
239	pinctrl-names = "default";	239	pinctrl-names = "default";
240	pinctrl-0 = <&pinctrl_tpm>;	240	pinctrl-0 = <&pinctrl_tpm>;

arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi+1−1

@@ -103,7 +103,7 @@ · 102 unmodified lines
103	status = "okay";	103	status = "okay";
104		104
105	tpm@1 {	105	tpm@1 {
106	compatible = "tcg,tpm_tis-spi";	106	compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
107	reg = <0x1>;	107	reg = <0x1>;
108	spi-max-frequency = <36000000>;	108	spi-max-frequency = <36000000>;
109	};	109	};

arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi+1−1

@@ -115,7 +115,7 @@ · 114 unmodified lines
115	status = "okay";	115	status = "okay";
116		116
117	tpm@1 {	117	tpm@1 {
118	compatible = "tcg,tpm_tis-spi";	118	compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
119	reg = <0x1>;	119	reg = <0x1>;
120	spi-max-frequency = <36000000>;	120	spi-max-frequency = <36000000>;
121	};	121	};

arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx.dts+1−1

@@ -196,7 +196,7 @@ · 195 unmodified lines
196	status = "okay";	196	status = "okay";
197		197
198	tpm@0 {	198	tpm@0 {
199	compatible = "tcg,tpm_tis-spi";	199	compatible = "atmel,attpm20p", "tcg,tpm_tis-spi";
200	reg = <0x0>;	200	reg = <0x0>;
201	spi-max-frequency = <36000000>;	201	spi-max-frequency = <36000000>;
202	};	202	};

arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts+1−1

@@ -65,7 +65,7 @@ · 64 unmodified lines
65	status = "okay";	65	status = "okay";
66		66
67	tpm@0 {	67	tpm@0 {
68	compatible = "infineon,slb9670";	68	compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
69	reg = <0>;	69	reg = <0>;
70	spi-max-frequency = <43000000>;	70	spi-max-frequency = <43000000>;
71	};	71	};

arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi+1−1

@@ -888,7 +888,7 @@ · 887 unmodified lines
888	status = "okay";	888	status = "okay";
889	cs-gpios = <&pio 86 GPIO_ACTIVE_LOW>;	889	cs-gpios = <&pio 86 GPIO_ACTIVE_LOW>;
890		890
891	cr50@0 {	891	tpm@0 {
892	compatible = "google,cr50";	892	compatible = "google,cr50";
893	reg = <0>;	893	reg = <0>;
894	spi-max-frequency = <1000000>;	894	spi-max-frequency = <1000000>;

arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi+1−1

@@ -1402,7 +1402,7 @@ · 1401 unmodified lines
1402	pinctrl-names = "default";	1402	pinctrl-names = "default";
1403	pinctrl-0 = <&spi5_pins>;	1403	pinctrl-0 = <&spi5_pins>;
1404		1404
1405	cr50@0 {	1405	tpm@0 {
1406	compatible = "google,cr50";	1406	compatible = "google,cr50";
1407	reg = <0>;	1407	reg = <0>;
1408	interrupts-extended = <&pio 171 IRQ_TYPE_EDGE_RISING>;	1408	interrupts-extended = <&pio 171 IRQ_TYPE_EDGE_RISING>;

arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts+1−1

@@ -70,7 +70,7 @@ · 69 unmodified lines
70	&spi0 {	70	&spi0 {
71	status = "okay";	71	status = "okay";
72		72
73	cr50@0 {	73	tpm@0 {
74	compatible = "google,cr50";	74	compatible = "google,cr50";
75	reg = <0>;	75	reg = <0>;
76	interrupt-parent = <&gpio0>;	76	interrupt-parent = <&gpio0>;

arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi+1−1

@@ -706,7 +706,7 @@ camera: &i2c7 { · 705 unmodified lines
706	&spi2 {	706	&spi2 {
707	status = "okay";	707	status = "okay";
708		708
709	cr50@0 {	709	tpm@0 {
710	compatible = "google,cr50";	710	compatible = "google,cr50";
711	reg = <0>;	711	reg = <0>;
712	interrupt-parent = <&gpio1>;	712	interrupt-parent = <&gpio1>;

arch/loongarch/include/asm/kvm_vcpu.h+2−2

arch/loongarch/kernel/smp.c+0−1

@@ -509,7 +509,6 @@ asmlinkage void start_secondary(void) · 508 unmodified lines
509	sync_counter();	509	sync_counter();
510	cpu = raw_smp_processor_id();	510	cpu = raw_smp_processor_id();
511	set_my_cpu_offset(per_cpu_offset(cpu));	511	set_my_cpu_offset(per_cpu_offset(cpu));
512	rcutree_report_cpu_starting(cpu);
513		512
514	cpu_probe();	513	cpu_probe();
515	constant_clockevent_init();	514	constant_clockevent_init();

arch/loongarch/kvm/mmu.c+2−2

@@ -675,7 +675,7 @@ static bool fault_supports_huge_mapping(struct kvm_memory_slot *memslot, · 674 unmodified lines
675	*	675	*
676	* There are several ways to safely use this helper:	676	* There are several ways to safely use this helper:
677	*	677	*
678	* - Check mmu_invalidate_retry_hva() after grabbing the mapping level, before	678	* - Check mmu_invalidate_retry_gfn() after grabbing the mapping level, before
679	* consuming it. In this case, mmu_lock doesn't need to be held during the	679	* consuming it. In this case, mmu_lock doesn't need to be held during the
680	* lookup, but it does need to be held while checking the MMU notifier.	680	* lookup, but it does need to be held while checking the MMU notifier.
681	*	681	*
@@ -855,7 +855,7 @@ retry: · 173 unmodified lines
855		855
856	/* Check if an invalidation has taken place since we got pfn */	856	/* Check if an invalidation has taken place since we got pfn */
857	spin_lock(&kvm->mmu_lock);	857	spin_lock(&kvm->mmu_lock);
858	if (mmu_invalidate_retry_hva(kvm, mmu_seq, hva)) {	858	if (mmu_invalidate_retry_gfn(kvm, mmu_seq, gfn)) {
859	/*	859	/*
860	* This can happen when mappings are changed asynchronously, but	860	* This can happen when mappings are changed asynchronously, but
861	* also synchronously if a COW is triggered by	861	* also synchronously if a COW is triggered by

arch/loongarch/mm/tlb.c+10−6

 		set_handler(EXCCODE_TLBNR * VECSIZE, handle_tlb_protect, VECSIZE);
 		set_handler(EXCCODE_TLBNX * VECSIZE, handle_tlb_protect, VECSIZE);
 		set_handler(EXCCODE_TLBPE * VECSIZE, handle_tlb_protect, VECSIZE);
-	}
+	} else {
+		int vec_sz __maybe_unused;
+		void *addr __maybe_unused;
+		struct page *page __maybe_unused;
+		/* Avoid lockdep warning */
+		rcutree_report_cpu_starting(cpu);
 #ifdef CONFIG_NUMA
-	else {
+		vec_sz = sizeof(exception_handlers);
-		void *addr;
-		struct page *page;
-		const int vec_sz = sizeof(exception_handlers);
 		if (pcpu_handlers[cpu])
 			return;
 		csr_write64(pcpu_handlers[cpu], LOONGARCH_CSR_EENTRY);
 		csr_write64(pcpu_handlers[cpu], LOONGARCH_CSR_MERRENTRY);
 		csr_write64(pcpu_handlers[cpu] + 80*VECSIZE, LOONGARCH_CSR_TLBRENTRY);
-	}
 #endif
+	}
 }
 void tlb_init(int cpu)

arch/m68k/Makefile+2−2

@@ -15,10 +15,10 @@ · 14 unmodified lines
15	KBUILD_DEFCONFIG := multi_defconfig	15	KBUILD_DEFCONFIG := multi_defconfig
16		16
17	ifdef cross_compiling	17	ifdef cross_compiling
18	ifeq ($(CROSS_COMPILE),)	18	ifeq ($(CROSS_COMPILE),)
19	CROSS_COMPILE := $(call cc-cross-prefix, \	19	CROSS_COMPILE := $(call cc-cross-prefix, \
20	m68k-linux-gnu- m68k-linux- m68k-unknown-linux-gnu-)	20	m68k-linux-gnu- m68k-linux- m68k-unknown-linux-gnu-)
21	endif	21	endif
22	endif	22	endif
23		23
24	#	24	#

arch/mips/alchemy/common/prom.c+1−0

@@ -40,6 +40,7 @@ · 39 unmodified lines
40	#include <linux/string.h>	40	#include <linux/string.h>
41		41
42	#include <asm/bootinfo.h>	42	#include <asm/bootinfo.h>
		43	#include <prom.h>
43		44
44	int prom_argc;	45	int prom_argc;
45	char **prom_argv;	46	char **prom_argv;

arch/mips/alchemy/common/setup.c+1−3

 #include <linux/mm.h>
 #include <linux/dma-map-ops.h> /* for dma_default_coherent */
+#include <asm/bootinfo.h>
 #include <asm/mipsregs.h>
 #include <au1000.h>
-extern void __init board_setup(void);
-extern void __init alchemy_set_lpj(void);
 static bool alchemy_dma_coherent(void)
 {
 	switch (alchemy_get_cputype()) {

arch/mips/bcm63xx/boards/board_bcm963xx.c+1−1

@@ -702,7 +702,7 @@ static struct ssb_sprom bcm63xx_sprom = { · 701 unmodified lines
702	.boardflags_hi = 0x0000,	702	.boardflags_hi = 0x0000,
703	};	703	};
704		704
705	int bcm63xx_get_fallback_sprom(struct ssb_bus bus, struct ssb_sprom out)	705	static int bcm63xx_get_fallback_sprom(struct ssb_bus bus, struct ssb_sprom out)
706	{	706	{
707	if (bus->bustype == SSB_BUSTYPE_PCI) {	707	if (bus->bustype == SSB_BUSTYPE_PCI) {
708	memcpy(out, &bcm63xx_sprom, sizeof(struct ssb_sprom));	708	memcpy(out, &bcm63xx_sprom, sizeof(struct ssb_sprom));

arch/mips/bcm63xx/dev-rng.c+1−1

@@ -26,7 +26,7 @@ static struct platform_device bcm63xx_rng_device = { · 25 unmodified lines
26	.resource = rng_resources,	26	.resource = rng_resources,
27	};	27	};
28		28
29	int __init bcm63xx_rng_register(void)	29	static int __init bcm63xx_rng_register(void)
30	{	30	{
31	if (!BCMCPU_IS_6368())	31	if (!BCMCPU_IS_6368())
32	return -ENODEV;	32	return -ENODEV;

arch/mips/bcm63xx/dev-uart.c+1−0

@@ -10,6 +10,7 @@ · 9 unmodified lines
10	#include <linux/kernel.h>	10	#include <linux/kernel.h>
11	#include <linux/platform_device.h>	11	#include <linux/platform_device.h>
12	#include <bcm63xx_cpu.h>	12	#include <bcm63xx_cpu.h>
		13	#include <bcm63xx_dev_uart.h>
13		14
14	static struct resource uart0_resources[] = {	15	static struct resource uart0_resources[] = {
15	{	16	{

arch/mips/bcm63xx/dev-wdt.c+1−1

@@ -34,7 +34,7 @@ static struct platform_device bcm63xx_wdt_device = { · 33 unmodified lines
34	},	34	},
35	};	35	};
36		36
37	int __init bcm63xx_wdt_register(void)	37	static int __init bcm63xx_wdt_register(void)
38	{	38	{
39	wdt_resources[0].start = bcm63xx_regset_address(RSET_WDT);	39	wdt_resources[0].start = bcm63xx_regset_address(RSET_WDT);
40	wdt_resources[0].end = wdt_resources[0].start;	40	wdt_resources[0].end = wdt_resources[0].start;

arch/mips/bcm63xx/irq.c+1−1

@@ -72,7 +72,7 @@ static inline int enable_irq_for_cpu(int cpu, struct irq_data *d, · 71 unmodified lines
72	*/	72	*/
73		73
74	#define BUILD_IPIC_INTERNAL(width) \	74	#define BUILD_IPIC_INTERNAL(width) \
75	void __dispatch_internal_##width(int cpu) \	75	static void __dispatch_internal_##width(int cpu) \
76	{ \	76	{ \
77	u32 pending[width / 32]; \	77	u32 pending[width / 32]; \
78	unsigned int src, tgt; \	78	unsigned int src, tgt; \

arch/mips/bcm63xx/setup.c+1−1

@@ -159,7 +159,7 @@ void __init plat_mem_setup(void) · 158 unmodified lines
159	board_setup();	159	board_setup();
160	}	160	}
161		161
162	int __init bcm63xx_register_devices(void)	162	static int __init bcm63xx_register_devices(void)
163	{	163	{
164	/* register gpiochip */	164	/* register gpiochip */
165	bcm63xx_gpio_init();	165	bcm63xx_gpio_init();

arch/mips/bcm63xx/timer.c+1−1

@@ -178,7 +178,7 @@ int bcm63xx_timer_set(int id, int monotonic, unsigned int countdown_us) · 177 unmodified lines
178		178
179	EXPORT_SYMBOL(bcm63xx_timer_set);	179	EXPORT_SYMBOL(bcm63xx_timer_set);
180		180
181	int bcm63xx_timer_init(void)	181	static int bcm63xx_timer_init(void)
182	{	182	{
183	int ret, irq;	183	int ret, irq;
184	u32 reg;	184	u32 reg;

arch/mips/cobalt/setup.c+0−3

@@ -23,9 +23,6 @@ · 22 unmodified lines
23		23
24	#include <cobalt.h>	24	#include <cobalt.h>
25		25
26	extern void cobalt_machine_restart(char *command);
27	extern void cobalt_machine_halt(void);
28
29	const char *get_system_type(void)	26	const char *get_system_type(void)
30	{	27	{
31	switch (cobalt_board_id) {	28	switch (cobalt_board_id) {

arch/mips/fw/arc/memory.c+1−1

@@ -37,7 +37,7 @@ static unsigned int nr_prom_mem __initdata; · 36 unmodified lines
37	*/	37	*/
38	#define ARC_PAGE_SHIFT 12	38	#define ARC_PAGE_SHIFT 12
39		39
40	struct linux_mdesc * __init ArcGetMemoryDescriptor(struct linux_mdesc *Current)	40	static struct linux_mdesc * __init ArcGetMemoryDescriptor(struct linux_mdesc *Current)
41	{	41	{
42	return (struct linux_mdesc *) ARC_CALL1(get_mdesc, Current);	42	return (struct linux_mdesc *) ARC_CALL1(get_mdesc, Current);
43	}	43	}

arch/mips/include/asm/mach-au1x00/au1000.h+3−0

@@ -597,6 +597,9 @@ · 596 unmodified lines
597		597
598	#include <asm/cpu.h>	598	#include <asm/cpu.h>
599		599
		600	void alchemy_set_lpj(void);
		601	void board_setup(void);
		602
600	/* helpers to access the SYS_* registers */	603	/* helpers to access the SYS_* registers */
601	static inline unsigned long alchemy_rdsys(int regofs)	604	static inline unsigned long alchemy_rdsys(int regofs)
602	{	605	{

arch/mips/include/asm/mach-cobalt/cobalt.h+3−0

@@ -19,4 +19,7 @@ extern int cobalt_board_id; · 18 unmodified lines
19	#define COBALT_BRD_ID_QUBE2 0x5	19	#define COBALT_BRD_ID_QUBE2 0x5
20	#define COBALT_BRD_ID_RAQ2 0x6	20	#define COBALT_BRD_ID_RAQ2 0x6
21		21
		22	void cobalt_machine_halt(void);
		23	void cobalt_machine_restart(char *command);
		24
22	#endif /* __ASM_COBALT_H */	25	#endif /* __ASM_COBALT_H */

arch/mips/kernel/elf.c+6−0

 #include <asm/cpu-features.h>
 #include <asm/cpu-info.h>
+#include <asm/fpu.h>
 #ifdef CONFIG_MIPS_FP_SUPPORT
 	struct cpuinfo_mips *c = &boot_cpu_data;
 	struct task_struct *t = current;
+	/* Do this early so t->thread.fpu.fcr31 won't be clobbered in case
+	 * we are preempted before the lose_fpu(0) in start_thread.
+	 */
+	lose_fpu(0);
 	t->thread.fpu.fcr31 = c->fpu_csr31;
 	switch (state->nan_2008) {
 	case 0:

arch/mips/kernel/traps.c+7−1

 void reserve_exception_space(phys_addr_t addr, unsigned long size)
 {
-	memblock_reserve(addr, size);
+	/*
+	 * reserve exception space on CPUs other than CPU0
+	 * is too late, since memblock is unavailable when APs
+	 * up
+	 */
+	if (smp_processor_id() == 0)
+		memblock_reserve(addr, size);
 }
 void __init *set_except_vector(int n, void *addr)

arch/mips/lantiq/prom.c+3−4

 	prom_init_cmdline();
 #if defined(CONFIG_MIPS_MT_SMP)
-	if (cpu_has_mipsmt) {
+	lantiq_smp_ops = vsmp_smp_ops;
-		lantiq_smp_ops = vsmp_smp_ops;
+	if (cpu_has_mipsmt)
 		lantiq_smp_ops.init_secondary = lantiq_init_secondary;
-		register_smp_ops(&lantiq_smp_ops);
+	register_smp_ops(&lantiq_smp_ops);
-	}
 #endif
 }

arch/mips/loongson64/init.c+3−0

 	if (loongson_sysconf.vgabios_addr)
 		memblock_reserve(virt_to_phys((void *)loongson_sysconf.vgabios_addr),
 				SZ_256K);
+	/* set nid for reserved memory */
+	memblock_set_node((u64)node << 44, (u64)(node + 1) << 44,
+			&memblock.reserved, node);
 }
 #ifndef CONFIG_NUMA

arch/mips/loongson64/numa.c+2−0

@@ -132,6 +132,8 @@ static void __init node_mem_init(unsigned int node) · 131 unmodified lines
132		132
133	/* Reserve pfn range 0~node[0]->node_start_pfn */	133	/* Reserve pfn range 0~node[0]->node_start_pfn */
134	memblock_reserve(0, PAGE_SIZE * start_pfn);	134	memblock_reserve(0, PAGE_SIZE * start_pfn);
		135	/* set nid for reserved memory on node 0 */
		136	memblock_set_node(0, 1ULL << 44, &memblock.reserved, 0);
135	}	137	}
136	}	138	}
137		139

arch/mips/sgi-ip27/Makefile+1−1

@@ -5,7 +5,7 @@ · 4 unmodified lines
5		5
6	obj-y := ip27-berr.o ip27-irq.o ip27-init.o ip27-klconfig.o \	6	obj-y := ip27-berr.o ip27-irq.o ip27-init.o ip27-klconfig.o \
7	ip27-klnuma.o ip27-memory.o ip27-nmi.o ip27-reset.o ip27-timer.o \	7	ip27-klnuma.o ip27-memory.o ip27-nmi.o ip27-reset.o ip27-timer.o \
8	ip27-hubio.o ip27-xtalk.o	8	ip27-xtalk.o
9		9
10	obj-$(CONFIG_EARLY_PRINTK) += ip27-console.o	10	obj-$(CONFIG_EARLY_PRINTK) += ip27-console.o
11	obj-$(CONFIG_SMP) += ip27-smp.o	11	obj-$(CONFIG_SMP) += ip27-smp.o

arch/mips/sgi-ip27/ip27-berr.c+3−1

 #include <asm/traps.h>
 #include <linux/uaccess.h>
+#include "ip27-common.h"
 static void dump_hub_information(unsigned long errst0, unsigned long errst1)
 {
 	static char *err_type[2][8] = {
 	       [st0.pi_stat0_fmt.s0_err_type] ? : "invalid");
 }
-int ip27_be_handler(struct pt_regs *regs, int is_fixup)
+static int ip27_be_handler(struct pt_regs *regs, int is_fixup)
 {
 	unsigned long errst0, errst1;
 	int data = regs->cp0_cause & 4;

arch/mips/sgi-ip27/ip27-common.h+2−0

 extern void hub_rtc_init(nasid_t nasid);
 extern void install_cpu_nmi_handler(int slice);
 extern void install_ipi(void);
+extern void ip27_be_init(void);
 extern void ip27_reboot_setup(void);
 extern const struct plat_smp_ops ip27_smp_ops;
 extern unsigned long node_getfirstfree(nasid_t nasid);
 extern void replicate_kernel_text(void);
 extern void setup_replication_mask(void);
 #endif /* __IP27_COMMON_H */

arch/mips/sgi-ip27/ip27-hubio.c+0−185

@@ -1,185 +0,0 @@
1	// SPDX-License-Identifier: GPL-2.0-only
2	/*
3	* Copyright (C) 1992-1997, 2000-2003 Silicon Graphics, Inc.
4	* Copyright (C) 2004 Christoph Hellwig.
5	*
6	* Support functions for the HUB ASIC - mostly PIO mapping related.
7	*/
8
9	#include <linux/bitops.h>
10	#include <linux/string.h>
11	#include <linux/mmzone.h>
12	#include <asm/sn/addrs.h>
13	#include <asm/sn/arch.h>
14	#include <asm/sn/agent.h>
15	#include <asm/sn/io.h>
16	#include <asm/xtalk/xtalk.h>
17
18
19	static int force_fire_and_forget = 1;
20
21	/**
22	* hub_pio_map - establish a HUB PIO mapping
23	*
24	* @nasid: nasid to perform PIO mapping on
25	* @widget: widget ID to perform PIO mapping for
26	* @xtalk_addr: xtalk_address that needs to be mapped
27	* @size: size of the PIO mapping
28	*
29	**/
30	unsigned long hub_pio_map(nasid_t nasid, xwidgetnum_t widget,
31	unsigned long xtalk_addr, size_t size)
32	{
33	unsigned i;
34
35	/* use small-window mapping if possible */
36	if ((xtalk_addr % SWIN_SIZE) + size <= SWIN_SIZE)
37	return NODE_SWIN_BASE(nasid, widget) + (xtalk_addr % SWIN_SIZE);
38
39	if ((xtalk_addr % BWIN_SIZE) + size > BWIN_SIZE) {
40	printk(KERN_WARNING "PIO mapping at hub %d widget %d addr 0x%lx"
41	" too big (%ld)\n",
42	nasid, widget, xtalk_addr, size);
43	return 0;
44	}
45
46	xtalk_addr &= ~(BWIN_SIZE-1);
47	for (i = 0; i < HUB_NUM_BIG_WINDOW; i++) {
48	if (test_and_set_bit(i, hub_data(nasid)->h_bigwin_used))
49	continue;
50
51	/*
52	* The code below does a PIO write to setup an ITTE entry.
53	*
54	* We need to prevent other CPUs from seeing our updated
55	* memory shadow of the ITTE (in the piomap) until the ITTE
56	* entry is actually set up; otherwise, another CPU might
57	* attempt a PIO prematurely.
58	*
59	* Also, the only way we can know that an entry has been
60	* received by the hub and can be used by future PIO reads/
61	* writes is by reading back the ITTE entry after writing it.
62	*
63	* For these two reasons, we PIO read back the ITTE entry
64	* after we write it.
65	*/
66	IIO_ITTE_PUT(nasid, i, HUB_PIO_MAP_TO_MEM, widget, xtalk_addr);
67	__raw_readq(IIO_ITTE_GET(nasid, i));
68
69	return NODE_BWIN_BASE(nasid, widget) + (xtalk_addr % BWIN_SIZE);
70	}
71
72	printk(KERN_WARNING "unable to establish PIO mapping for at"
73	" hub %d widget %d addr 0x%lx\n",
74	nasid, widget, xtalk_addr);
75	return 0;
76	}
77
78
79	/*
80	* hub_setup_prb(nasid, prbnum, credits, conveyor)
81	*
82	* Put a PRB into fire-and-forget mode if conveyor isn't set. Otherwise,
83	* put it into conveyor belt mode with the specified number of credits.
84	*/
85	static void hub_setup_prb(nasid_t nasid, int prbnum, int credits)
86	{
87	union iprb_u prb;
88	int prb_offset;
89
90	/*
91	* Get the current register value.
92	*/
93	prb_offset = IIO_IOPRB(prbnum);
94	prb.iprb_regval = REMOTE_HUB_L(nasid, prb_offset);
95
96	/*
97	* Clear out some fields.
98	*/
99	prb.iprb_ovflow = 1;
100	prb.iprb_bnakctr = 0;
101	prb.iprb_anakctr = 0;
102
103	/*
104	* Enable or disable fire-and-forget mode.
105	*/
106	prb.iprb_ff = force_fire_and_forget ? 1 : 0;
107
108	/*
109	* Set the appropriate number of PIO credits for the widget.
110	*/
111	prb.iprb_xtalkctr = credits;
112
113	/*
114	* Store the new value to the register.
115	*/
116	REMOTE_HUB_S(nasid, prb_offset, prb.iprb_regval);
117	}
118
119	/**
120	* hub_set_piomode - set pio mode for a given hub
121	*
122	* @nasid: physical node ID for the hub in question
123	*
124	* Put the hub into either "PIO conveyor belt" mode or "fire-and-forget" mode.
125	* To do this, we have to make absolutely sure that no PIOs are in progress
126	* so we turn off access to all widgets for the duration of the function.
127	*
128	* XXX - This code should really check what kind of widget we're talking
129	* to. Bridges can only handle three requests, but XG will do more.
130	* How many can crossbow handle to widget 0? We're assuming 1.
131	*
132	* XXX - There is a bug in the crossbow that link reset PIOs do not
133	* return write responses. The easiest solution to this problem is to
134	* leave widget 0 (xbow) in fire-and-forget mode at all times. This
135	* only affects pio's to xbow registers, which should be rare.
136	**/
137	static void hub_set_piomode(nasid_t nasid)
138	{
139	u64 ii_iowa;
140	union hubii_wcr_u ii_wcr;
141	unsigned i;
142
143	ii_iowa = REMOTE_HUB_L(nasid, IIO_OUTWIDGET_ACCESS);
144	REMOTE_HUB_S(nasid, IIO_OUTWIDGET_ACCESS, 0);
145
146	ii_wcr.wcr_reg_value = REMOTE_HUB_L(nasid, IIO_WCR);
147
148	if (ii_wcr.iwcr_dir_con) {
149	/*
150	* Assume a bridge here.
151	*/
152	hub_setup_prb(nasid, 0, 3);
153	} else {
154	/*
155	* Assume a crossbow here.
156	*/
157	hub_setup_prb(nasid, 0, 1);
158	}
159
160	/*
161	* XXX - Here's where we should take the widget type into
162	* when account assigning credits.
163	*/
164	for (i = HUB_WIDGET_ID_MIN; i <= HUB_WIDGET_ID_MAX; i++)
165	hub_setup_prb(nasid, i, 3);
166
167	REMOTE_HUB_S(nasid, IIO_OUTWIDGET_ACCESS, ii_iowa);
168	}
169
170	/*
171	* hub_pio_init - PIO-related hub initialization
172	*
173	* @hub: hubinfo structure for our hub
174	*/
175	void hub_pio_init(nasid_t nasid)
176	{
177	unsigned i;
178
179	/* initialize big window piomaps for this hub */
180	bitmap_zero(hub_data(nasid)->h_bigwin_used, HUB_NUM_BIG_WINDOW);
181	for (i = 0; i < HUB_NUM_BIG_WINDOW; i++)
182	IIO_ITTE_DISABLE(nasid, i);
183
184	hub_set_piomode(nasid);
185	}

arch/mips/sgi-ip27/ip27-irq.c+2−0

@@ -23,6 +23,8 @@ · 22 unmodified lines
23	#include <asm/sn/intr.h>	23	#include <asm/sn/intr.h>
24	#include <asm/sn/irq_alloc.h>	24	#include <asm/sn/irq_alloc.h>
25		25
		26	#include "ip27-common.h"
		27
26	struct hub_irq_data {	28	struct hub_irq_data {
27	u64 *irq_mask[2];	29	u64 *irq_mask[2];
28	cpuid_t cpu;	30	cpuid_t cpu;

arch/mips/sgi-ip27/ip27-memory.c+1−0

@@ -23,6 +23,7 @@ · 22 unmodified lines
23	#include <asm/page.h>	23	#include <asm/page.h>
24	#include <asm/pgalloc.h>	24	#include <asm/pgalloc.h>
25	#include <asm/sections.h>	25	#include <asm/sections.h>
		26	#include <asm/sgialib.h>
26		27
27	#include <asm/sn/arch.h>	28	#include <asm/sn/arch.h>
28	#include <asm/sn/agent.h>	29	#include <asm/sn/agent.h>

arch/mips/sgi-ip27/ip27-nmi.c+8−17

@@ -11,6 +11,8 @@ · 10 unmodified lines
11	#include <asm/sn/arch.h>	11	#include <asm/sn/arch.h>
12	#include <asm/sn/agent.h>	12	#include <asm/sn/agent.h>
13		13
		14	#include "ip27-common.h"
		15
14	#if 0	16	#if 0
15	#define NODE_NUM_CPUS(n) CNODE_NUM_CPUS(n)	17	#define NODE_NUM_CPUS(n) CNODE_NUM_CPUS(n)
16	#else	18	#else
@@ -23,16 +25,7 @@ · 6 unmodified lines
23	typedef unsigned long machreg_t;	25	typedef unsigned long machreg_t;
24		26
25	static arch_spinlock_t nmi_lock = __ARCH_SPIN_LOCK_UNLOCKED;	27	static arch_spinlock_t nmi_lock = __ARCH_SPIN_LOCK_UNLOCKED;
26		28	static void nmi_dump(void);
27	/*
28	* Let's see what else we need to do here. Set up sp, gp?
29	*/
30	void nmi_dump(void)
31	{
32	void cont_nmi_dump(void);
33
34	cont_nmi_dump();
35	}
36		29
37	void install_cpu_nmi_handler(int slice)	30	void install_cpu_nmi_handler(int slice)
38	{	31	{
@@ -53,7 +46,7 @@ void install_cpu_nmi_handler(int slice) · 14 unmodified lines
53	* into the eframe format for the node under consideration.	46	* into the eframe format for the node under consideration.
54	*/	47	*/
55		48
56	void nmi_cpu_eframe_save(nasid_t nasid, int slice)	49	static void nmi_cpu_eframe_save(nasid_t nasid, int slice)
57	{	50	{
58	struct reg_struct *nr;	51	struct reg_struct *nr;
59	int i;	52	int i;
@@ -129,7 +122,7 @@ void nmi_cpu_eframe_save(nasid_t nasid, int slice) · 69 unmodified lines
129	pr_emerg("\n");	122	pr_emerg("\n");
130	}	123	}
131		124
132	void nmi_dump_hub_irq(nasid_t nasid, int slice)	125	static void nmi_dump_hub_irq(nasid_t nasid, int slice)
133	{	126	{
134	u64 mask0, mask1, pend0, pend1;	127	u64 mask0, mask1, pend0, pend1;
135		128
@@ -153,7 +146,7 @@ void nmi_dump_hub_irq(nasid_t nasid, int slice) · 17 unmodified lines
153	* Copy the cpu registers which have been saved in the IP27prom format	146	* Copy the cpu registers which have been saved in the IP27prom format
154	* into the eframe format for the node under consideration.	147	* into the eframe format for the node under consideration.
155	*/	148	*/
156	void nmi_node_eframe_save(nasid_t nasid)	149	static void nmi_node_eframe_save(nasid_t nasid)
157	{	150	{
158	int slice;	151	int slice;
159		152
@@ -170,8 +163,7 @@ void nmi_node_eframe_save(nasid_t nasid) · 10 unmodified lines
170	/*	163	/*
171	* Save the nmi cpu registers for all cpus in the system.	164	* Save the nmi cpu registers for all cpus in the system.
172	*/	165	*/
173	void	166	static void nmi_eframes_save(void)
174	nmi_eframes_save(void)
175	{	167	{
176	nasid_t nasid;	168	nasid_t nasid;
177		169
@@ -179,8 +171,7 @@ nmi_eframes_save(void) · 1 unmodified line
179	nmi_node_eframe_save(nasid);	171	nmi_node_eframe_save(nasid);
180	}	172	}
181		173
182	void	174	static void nmi_dump(void)
183	cont_nmi_dump(void)
184	{	175	{
185	#ifndef REAL_NMI_SIGNAL	176	#ifndef REAL_NMI_SIGNAL
186	static atomic_t nmied_cpus = ATOMIC_INIT(0);	177	static atomic_t nmied_cpus = ATOMIC_INIT(0);

arch/mips/sgi-ip30/ip30-console.c+1−0

@@ -3,6 +3,7 @@ · 2 unmodified lines
3	#include <linux/io.h>	3	#include <linux/io.h>
4		4
5	#include <asm/sn/ioc3.h>	5	#include <asm/sn/ioc3.h>
		6	#include <asm/setup.h>
6		7
7	static inline struct ioc3_uartregs *console_uart(void)	8	static inline struct ioc3_uartregs *console_uart(void)
8	{	9	{

arch/mips/sgi-ip30/ip30-setup.c+1−0

@@ -14,6 +14,7 @@ · 13 unmodified lines
14	#include <linux/percpu.h>	14	#include <linux/percpu.h>
15	#include <linux/memblock.h>	15	#include <linux/memblock.h>
16		16
		17	#include <asm/bootinfo.h>
17	#include <asm/smp-ops.h>	18	#include <asm/smp-ops.h>
18	#include <asm/sgialib.h>	19	#include <asm/sgialib.h>
19	#include <asm/time.h>	20	#include <asm/time.h>

arch/mips/sgi-ip32/crime.c+4−2

 #include <asm/ip32/crime.h>
 #include <asm/ip32/mace.h>
+#include "ip32-common.h"
 struct sgi_crime __iomem *crime;
 struct sgi_mace __iomem *mace;
 	       id, rev, field, (unsigned long) CRIME_BASE);
 }
-irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id)
+irqreturn_t crime_memerr_intr(int irq, void *dev_id)
 {
 	unsigned long stat, addr;
 	int fatal = 0;
 	return IRQ_HANDLED;
 }
-irqreturn_t crime_cpuerr_intr(unsigned int irq, void *dev_id)
+irqreturn_t crime_cpuerr_intr(int irq, void *dev_id)
 {
 	unsigned long stat = crime->cpu_error_stat & CRIME_CPU_ERROR_MASK;
 	unsigned long addr = crime->cpu_error_addr & CRIME_CPU_ERROR_ADDR_MASK;

arch/mips/sgi-ip32/ip32-berr.c+2−0

@@ -18,6 +18,8 @@ · 17 unmodified lines
18	#include <asm/ptrace.h>	18	#include <asm/ptrace.h>
19	#include <asm/tlbdebug.h>	19	#include <asm/tlbdebug.h>
20		20
		21	#include "ip32-common.h"
		22
21	static int ip32_be_handler(struct pt_regs *regs, int is_fixup)	23	static int ip32_be_handler(struct pt_regs *regs, int is_fixup)
22	{	24	{
23	int data = regs->cp0_cause & 4;	25	int data = regs->cp0_cause & 4;

arch/mips/sgi-ip32/ip32-common.h+15−0

@@ -0,0 +1,15 @@
	1	/* SPDX-License-Identifier: GPL-2.0-only */
	2
	3	#ifndef __IP32_COMMON_H
	4	#define __IP32_COMMON_H
	5
	6	#include <linux/init.h>
	7	#include <linux/interrupt.h>
	8
	9	void __init crime_init(void);
	10	irqreturn_t crime_memerr_intr(int irq, void *dev_id);
	11	irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);
	12	void __init ip32_be_init(void);
	13	void ip32_prepare_poweroff(void);
	14
	15	#endif /* __IP32_COMMON_H */

arch/mips/sgi-ip32/ip32-irq.c+2−4

 #include <asm/ip32/mace.h>
 #include <asm/ip32/ip32_ints.h>
+#include "ip32-common.h"
 /* issue a PIO read to make sure no PIO writes are pending */
 static inline void flush_crime_bus(void)
 {
  * is quite different anyway.
  */
-/* Some initial interrupts to set up */
-extern irqreturn_t crime_memerr_intr(int irq, void *dev_id);
-extern irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);
 /*
  * This is for pure CRIME interrupts - ie not MACE.  The advantage?
  * We get to split the register in half and do faster lookups.

arch/mips/sgi-ip32/ip32-memory.c+1−0

@@ -15,6 +15,7 @@ · 14 unmodified lines
15	#include <asm/ip32/crime.h>	15	#include <asm/ip32/crime.h>
16	#include <asm/bootinfo.h>	16	#include <asm/bootinfo.h>
17	#include <asm/page.h>	17	#include <asm/page.h>
		18	#include <asm/sgialib.h>
18		19
19	extern void crime_init(void);	20	extern void crime_init(void);
20		21

arch/mips/sgi-ip32/ip32-reset.c+2−0

@@ -29,6 +29,8 @@ · 28 unmodified lines
29	#include <asm/ip32/crime.h>	29	#include <asm/ip32/crime.h>
30	#include <asm/ip32/ip32_ints.h>	30	#include <asm/ip32/ip32_ints.h>
31		31
		32	#include "ip32-common.h"
		33
32	#define POWERDOWN_TIMEOUT 120	34	#define POWERDOWN_TIMEOUT 120
33	/*	35	/*
34	* Blink frequency during reboot grace period and when panicked.	36	* Blink frequency during reboot grace period and when panicked.

arch/mips/sgi-ip32/ip32-setup.c+1−2

@@ -26,8 +26,7 @@ · 25 unmodified lines
26	#include <asm/ip32/mace.h>	26	#include <asm/ip32/mace.h>
27	#include <asm/ip32/ip32_ints.h>	27	#include <asm/ip32/ip32_ints.h>
28		28
29	extern void ip32_be_init(void);	29	#include "ip32-common.h"
30	extern void crime_init(void);
31		30
32	#ifdef CONFIG_SGI_O2MACE_ETH	31	#ifdef CONFIG_SGI_O2MACE_ETH
33	/*	32	/*

arch/parisc/Kconfig+0−1

@@ -25,7 +25,6 @@ config PARISC · 24 unmodified lines
25	select RTC_DRV_GENERIC	25	select RTC_DRV_GENERIC
26	select INIT_ALL_POSSIBLE	26	select INIT_ALL_POSSIBLE
27	select BUG	27	select BUG
28	select BUILDTIME_TABLE_SORT
29	select HAVE_KERNEL_UNCOMPRESSED	28	select HAVE_KERNEL_UNCOMPRESSED
30	select HAVE_PCI	29	select HAVE_PCI
31	select HAVE_PERF_EVENTS	30	select HAVE_PERF_EVENTS

arch/parisc/Makefile+2−2

@@ -50,12 +50,12 @@ export CROSS32CC · 49 unmodified lines
50		50
51	# Set default cross compiler for kernel build	51	# Set default cross compiler for kernel build
52	ifdef cross_compiling	52	ifdef cross_compiling
53	ifeq ($(CROSS_COMPILE),)	53	ifeq ($(CROSS_COMPILE),)
54	CC_SUFFIXES = linux linux-gnu unknown-linux-gnu suse-linux	54	CC_SUFFIXES = linux linux-gnu unknown-linux-gnu suse-linux
55	CROSS_COMPILE := $(call cc-cross-prefix, \	55	CROSS_COMPILE := $(call cc-cross-prefix, \
56	$(foreach a,$(CC_ARCHES), \	56	$(foreach a,$(CC_ARCHES), \
57	$(foreach s,$(CC_SUFFIXES),$(a)-$(s)-)))	57	$(foreach s,$(CC_SUFFIXES),$(a)-$(s)-)))
58	endif	58	endif
59	endif	59	endif
60		60
61	ifdef CONFIG_DYNAMIC_FTRACE	61	ifdef CONFIG_DYNAMIC_FTRACE

arch/parisc/include/asm/assembly.h+1−0

@@ -576,6 +576,7 @@ · 575 unmodified lines
576	.section __ex_table,"aw" ! \	576	.section __ex_table,"aw" ! \
577	.align 4 ! \	577	.align 4 ! \
578	.word (fault_addr - .), (except_addr - .) ! \	578	.word (fault_addr - .), (except_addr - .) ! \
		579	or %r0,%r0,%r0 ! \
579	.previous	580	.previous
580		581
581		582

arch/parisc/include/asm/extable.h+64−0

@@ -0,0 +1,64 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2	#ifndef __PARISC_EXTABLE_H
	3	#define __PARISC_EXTABLE_H
	4
	5	#include <asm/ptrace.h>
	6	#include <linux/compiler.h>
	7
	8	/*
	9	* The exception table consists of three addresses:
	10	*
	11	* - A relative address to the instruction that is allowed to fault.
	12	* - A relative address at which the program should continue (fixup routine)
	13	* - An asm statement which specifies which CPU register will
	14	* receive -EFAULT when an exception happens if the lowest bit in
	15	* the fixup address is set.
	16	*
	17	* Note: The register specified in the err_opcode instruction will be
	18	* modified at runtime if a fault happens. Register %r0 will be ignored.
	19	*
	20	* Since relative addresses are used, 32bit values are sufficient even on
	21	* 64bit kernel.
	22	*/
	23
	24	struct pt_regs;
	25	int fixup_exception(struct pt_regs *regs);
	26
	27	#define ARCH_HAS_RELATIVE_EXTABLE
	28	struct exception_table_entry {
	29	int insn; /* relative address of insn that is allowed to fault. */
	30	int fixup; /* relative address of fixup routine */
	31	int err_opcode; /* sample opcode with register which holds error code */
	32	};
	33
	34	#define ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr, opcode )\
	35	".section __ex_table,\"aw\"\n" \
	36	".align 4\n" \
	37	".word (" #fault_addr " - .), (" #except_addr " - .)\n" \
	38	opcode "\n" \
	39	".previous\n"
	40
	41	/*
	42	* ASM_EXCEPTIONTABLE_ENTRY_EFAULT() creates a special exception table entry
	43	* (with lowest bit set) for which the fault handler in fixup_exception() will
	44	* load -EFAULT on fault into the register specified by the err_opcode instruction,
	45	* and zeroes the target register in case of a read fault in get_user().
	46	*/
	47	#define ASM_EXCEPTIONTABLE_VAR(__err_var) \
	48	int __err_var = 0
	49	#define ASM_EXCEPTIONTABLE_ENTRY_EFAULT( fault_addr, except_addr, register )\
	50	ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr + 1, "or %%r0,%%r0," register)
	51
	52	static inline void swap_ex_entry_fixup(struct exception_table_entry *a,
	53	struct exception_table_entry *b,
	54	struct exception_table_entry tmp,
	55	int delta)
	56	{
	57	a->fixup = b->fixup + delta;
	58	b->fixup = tmp.fixup - delta;
	59	a->err_opcode = b->err_opcode;
	60	b->err_opcode = tmp.err_opcode;
	61	}
	62	#define swap_ex_entry_fixup swap_ex_entry_fixup
	63
	64	#endif

arch/parisc/include/asm/special_insns.h+4−2

 		"copy %%r0,%0\n"			\
 		"8:\tlpa %%r0(%1),%0\n"			\
 		"9:\n"					\
-		ASM_EXCEPTIONTABLE_ENTRY(8b, 9b)	\
+		ASM_EXCEPTIONTABLE_ENTRY(8b, 9b,	\
+				"or %%r0,%%r0,%%r0")	\
 		: "=&r" (pa)				\
 		: "r" (va)				\
 		: "memory"				\
 		"copy %%r0,%0\n"			\
 		"8:\tlpa %%r0(%%sr3,%1),%0\n"		\
 		"9:\n"					\
-		ASM_EXCEPTIONTABLE_ENTRY(8b, 9b)	\
+		ASM_EXCEPTIONTABLE_ENTRY(8b, 9b,	\
+				"or %%r0,%%r0,%%r0")	\
 		: "=&r" (pa)				\
 		: "r" (va)				\
 		: "memory"				\

arch/parisc/include/asm/uaccess.h+7−41

  */
 #include <asm/page.h>
 #include <asm/cache.h>
+#include <asm/extable.h>
 #include <linux/bug.h>
 #include <linux/string.h>
 #define STD_USER(sr, x, ptr)	__put_user_asm(sr, "std", x, ptr)
 #endif
-/*
- * The exception table contains two values: the first is the relative offset to
- * the address of the instruction that is allowed to fault, and the second is
- * the relative offset to the address of the fixup routine. Since relative
- * addresses are used, 32bit values are sufficient even on 64bit kernel.
- */
-#define ARCH_HAS_RELATIVE_EXTABLE
-struct exception_table_entry {
-	int insn;	/* relative address of insn that is allowed to fault. */
-	int fixup;	/* relative address of fixup routine */
-};
-#define ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr )\
-	".section __ex_table,\"aw\"\n"			   \
-	".align 4\n"					   \
-	".word (" #fault_addr " - .), (" #except_addr " - .)\n\t" \
-	".previous\n"
-/*
- * ASM_EXCEPTIONTABLE_ENTRY_EFAULT() creates a special exception table entry
- * (with lowest bit set) for which the fault handler in fixup_exception() will
- * load -EFAULT into %r29 for a read or write fault, and zeroes the target
- * register in case of a read fault in get_user().
- */
-#define ASM_EXCEPTIONTABLE_REG	29
-#define ASM_EXCEPTIONTABLE_VAR(__variable)		\
-	register long __variable __asm__ ("r29") = 0
-#define ASM_EXCEPTIONTABLE_ENTRY_EFAULT( fault_addr, except_addr )\
-	ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr + 1)
 #define __get_user_internal(sr, val, ptr)		\
 ({							\
 	ASM_EXCEPTIONTABLE_VAR(__gu_err);		\
 							\
 	__asm__("1: " ldx " 0(%%sr%2,%3),%0\n"		\
 		"9:\n"					\
-		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b)	\
+		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b, "%1")	\
 		: "=r"(__gu_val), "+r"(__gu_err)        \
 		: "i"(sr), "r"(ptr));			\
 							\
 		"1: ldw 0(%%sr%2,%3),%0\n"		\
 		"2: ldw 4(%%sr%2,%3),%R0\n"		\
 		"9:\n"					\
-		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b)	\
+		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b, "%1")	\
-		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 9b)	\
+		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 9b, "%1")	\
 		: "=&r"(__gu_tmp.l), "+r"(__gu_err)	\
 		: "i"(sr), "r"(ptr));			\
 							\
 	__asm__ __volatile__ (					\
 		"1: " stx " %1,0(%%sr%2,%3)\n"			\
 		"9:\n"						\
-		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b)		\
+		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b, "%0")	\
 		: "+r"(__pu_err)				\
 		: "r"(x), "i"(sr), "r"(ptr))
 		"1: stw %1,0(%%sr%2,%3)\n"			\
 		"2: stw %R1,4(%%sr%2,%3)\n"			\
 		"9:\n"						\
-		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b)		\
+		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b, "%0")	\
-		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 9b)		\
+		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 9b, "%0")	\
 		: "+r"(__pu_err)				\
 		: "r"(__val), "i"(sr), "r"(ptr));		\
 } while (0)
 #endif /* !defined(CONFIG_64BIT) */
 /*
  * Complex access routines -- external declarations
  */
 #define INLINE_COPY_TO_USER
 #define INLINE_COPY_FROM_USER
-struct pt_regs;
-int fixup_exception(struct pt_regs *regs);
 #endif /* __PARISC_UACCESS_H */

arch/parisc/kernel/cache.c+7−3

 struct pdc_cache_info cache_info __ro_after_init;
 #ifndef CONFIG_PA20
-struct pdc_btlb_info btlb_info __ro_after_init;
+struct pdc_btlb_info btlb_info;
 #endif
 DEFINE_STATIC_KEY_TRUE(parisc_has_cache);
 	icache_stride = CAFL_STRIDE(cache_info.ic_conf);
 #undef CAFL_STRIDE
+	/* stride needs to be non-zero, otherwise cache flushes will not work */
+	WARN_ON(cache_info.dc_size && dcache_stride == 0);
+	WARN_ON(cache_info.ic_size && icache_stride == 0);
 	if ((boot_cpu_data.pdc.capabilities & PDC_MODEL_NVA_MASK) ==
 						PDC_MODEL_NVA_UNSUPPORTED) {
 		printk(KERN_WARNING "parisc_cache_init: Only equivalent aliasing supported!\n");
 #endif
 			"   fic,m	%3(%4,%0)\n"
 			"2: sync\n"
-			ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 2b)
+			ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 2b, "%1")
 			: "+r" (start), "+r" (error)
 			: "r" (end), "r" (dcache_stride), "i" (SR_USER));
 	}
 #endif
 			"   fdc,m	%3(%4,%0)\n"
 			"2: sync\n"
-			ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 2b)
+			ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 2b, "%1")
 			: "+r" (start), "+r" (error)
 			: "r" (end), "r" (icache_stride), "i" (SR_USER));
 	}

arch/parisc/kernel/drivers.c+4−1

 	};
 	if (device_for_each_child(parent, &recurse_data, descend_children))
-		{ /* nothing */ };
+		{ /* nothing */ }
 	return d.dev;
 }
 	pr_info("\n");
+	/* Prevent hung task messages when printing on serial console */
+	cond_resched();
 	pr_info("#define HPA_%08lx_DESCRIPTION \"%s\"\n",
 		hpa, parisc_hardware_description(&dev->id));

arch/parisc/kernel/unaligned.c+22−22

@@ -120,8 +120,8 @@ static int emulate_ldh(struct pt_regs *regs, int toreg) · 119 unmodified lines
120	"2: ldbs 1(%%sr1,%3), %0\n"	120	"2: ldbs 1(%%sr1,%3), %0\n"
121	" depw %2, 23, 24, %0\n"	121	" depw %2, 23, 24, %0\n"
122	"3: \n"	122	"3: \n"
123	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b)	123	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b, "%1")
124	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b)	124	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b, "%1")
125	: "+r" (val), "+r" (ret), "=&r" (temp1)	125	: "+r" (val), "+r" (ret), "=&r" (temp1)
126	: "r" (saddr), "r" (regs->isr) );	126	: "r" (saddr), "r" (regs->isr) );
127		127
@@ -152,8 +152,8 @@ static int emulate_ldw(struct pt_regs *regs, int toreg, int flop) · 24 unmodified lines
152	" mtctl %2,11\n"	152	" mtctl %2,11\n"
153	" vshd %0,%3,%0\n"	153	" vshd %0,%3,%0\n"
154	"3: \n"	154	"3: \n"
155	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b)	155	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b, "%1")
156	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b)	156	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b, "%1")
157	: "+r" (val), "+r" (ret), "=&r" (temp1), "=&r" (temp2)	157	: "+r" (val), "+r" (ret), "=&r" (temp1), "=&r" (temp2)
158	: "r" (saddr), "r" (regs->isr) );	158	: "r" (saddr), "r" (regs->isr) );
159		159
@@ -189,8 +189,8 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop) · 29 unmodified lines
189	" mtsar %%r19\n"	189	" mtsar %%r19\n"
190	" shrpd %0,%%r20,%%sar,%0\n"	190	" shrpd %0,%%r20,%%sar,%0\n"
191	"3: \n"	191	"3: \n"
192	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b)	192	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b, "%1")
193	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b)	193	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b, "%1")
194	: "=r" (val), "+r" (ret)	194	: "=r" (val), "+r" (ret)
195	: "0" (val), "r" (saddr), "r" (regs->isr)	195	: "0" (val), "r" (saddr), "r" (regs->isr)
196	: "r19", "r20" );	196	: "r19", "r20" );
@@ -209,9 +209,9 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop) · 12 unmodified lines
209	" vshd %0,%R0,%0\n"	209	" vshd %0,%R0,%0\n"
210	" vshd %R0,%4,%R0\n"	210	" vshd %R0,%4,%R0\n"
211	"4: \n"	211	"4: \n"
212	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 4b)	212	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 4b, "%1")
213	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 4b)	213	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 4b, "%1")
214	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(3b, 4b)	214	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(3b, 4b, "%1")
215	: "+r" (val), "+r" (ret), "+r" (saddr), "=&r" (shift), "=&r" (temp1)	215	: "+r" (val), "+r" (ret), "+r" (saddr), "=&r" (shift), "=&r" (temp1)
216	: "r" (regs->isr) );	216	: "r" (regs->isr) );
217	}	217	}
@@ -244,8 +244,8 @@ static int emulate_sth(struct pt_regs *regs, int frreg) · 26 unmodified lines
244	"1: stb %1, 0(%%sr1, %3)\n"	244	"1: stb %1, 0(%%sr1, %3)\n"
245	"2: stb %2, 1(%%sr1, %3)\n"	245	"2: stb %2, 1(%%sr1, %3)\n"
246	"3: \n"	246	"3: \n"
247	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b)	247	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b, "%0")
248	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b)	248	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b, "%0")
249	: "+r" (ret), "=&r" (temp1)	249	: "+r" (ret), "=&r" (temp1)
250	: "r" (val), "r" (regs->ior), "r" (regs->isr) );	250	: "r" (val), "r" (regs->ior), "r" (regs->isr) );
251		251
@@ -285,8 +285,8 @@ static int emulate_stw(struct pt_regs *regs, int frreg, int flop) · 33 unmodified lines
285	" stw %%r20,0(%%sr1,%2)\n"	285	" stw %%r20,0(%%sr1,%2)\n"
286	" stw %%r21,4(%%sr1,%2)\n"	286	" stw %%r21,4(%%sr1,%2)\n"
287	"3: \n"	287	"3: \n"
288	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b)	288	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 3b, "%0")
289	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b)	289	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 3b, "%0")
290	: "+r" (ret)	290	: "+r" (ret)
291	: "r" (val), "r" (regs->ior), "r" (regs->isr)	291	: "r" (val), "r" (regs->ior), "r" (regs->isr)
292	: "r19", "r20", "r21", "r22", "r1" );	292	: "r19", "r20", "r21", "r22", "r1" );
@@ -329,10 +329,10 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop) · 36 unmodified lines
329	"3: std %%r20,0(%%sr1,%2)\n"	329	"3: std %%r20,0(%%sr1,%2)\n"
330	"4: std %%r21,8(%%sr1,%2)\n"	330	"4: std %%r21,8(%%sr1,%2)\n"
331	"5: \n"	331	"5: \n"
332	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 5b)	332	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 5b, "%0")
333	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 5b)	333	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 5b, "%0")
334	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(3b, 5b)	334	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(3b, 5b, "%0")
335	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(4b, 5b)	335	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(4b, 5b, "%0")
336	: "+r" (ret)	336	: "+r" (ret)
337	: "r" (val), "r" (regs->ior), "r" (regs->isr)	337	: "r" (val), "r" (regs->ior), "r" (regs->isr)
338	: "r19", "r20", "r21", "r22", "r1" );	338	: "r19", "r20", "r21", "r22", "r1" );
@@ -357,11 +357,11 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop) · 18 unmodified lines
357	"4: stw %%r1,4(%%sr1,%2)\n"	357	"4: stw %%r1,4(%%sr1,%2)\n"
358	"5: stw %R1,8(%%sr1,%2)\n"	358	"5: stw %R1,8(%%sr1,%2)\n"
359	"6: \n"	359	"6: \n"
360	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 6b)	360	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 6b, "%0")
361	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 6b)	361	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 6b, "%0")
362	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(3b, 6b)	362	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(3b, 6b, "%0")
363	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(4b, 6b)	363	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(4b, 6b, "%0")
364	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(5b, 6b)	364	ASM_EXCEPTIONTABLE_ENTRY_EFAULT(5b, 6b, "%0")
365	: "+r" (ret)	365	: "+r" (ret)
366	: "r" (val), "r" (regs->ior), "r" (regs->isr)	366	: "r" (val), "r" (regs->ior), "r" (regs->isr)
367	: "r19", "r20", "r21", "r1" );	367	: "r19", "r20", "r21", "r1" );

arch/parisc/kernel/vmlinux.lds.S+1−1

@@ -127,7 +127,7 @@ SECTIONS · 126 unmodified lines
127	}	127	}
128	#endif	128	#endif
129		129
130	RO_DATA(8)	130	RO_DATA(PAGE_SIZE)
131		131
132	/* unwind info */	132	/* unwind info */
133	. = ALIGN(4);	133	. = ALIGN(4);

arch/parisc/mm/fault.c+8−3

 		 * Fix up get_user() and put_user().
 		 * ASM_EXCEPTIONTABLE_ENTRY_EFAULT() sets the least-significant
 		 * bit in the relative address of the fixup routine to indicate
-		 * that gr[ASM_EXCEPTIONTABLE_REG] should be loaded with
+		 * that the register encoded in the "or %r0,%r0,register"
-		 * -EFAULT to report a userspace access error.
+		 * opcode should be loaded with -EFAULT to report a userspace
+		 * access error.
 		 */
 		if (fix->fixup & 1) {
-			regs->gr[ASM_EXCEPTIONTABLE_REG] = -EFAULT;
+			int fault_error_reg = fix->err_opcode & 0x1f;
+			if (!WARN_ON(!fault_error_reg))
+				regs->gr[fault_error_reg] = -EFAULT;
+			pr_debug("Unalignment fixup of register %d at %pS\n",
+				fault_error_reg, (void*)regs->iaoq[0]);
 			/* zero target register for get_user() */
 			if (parisc_acctyp(0, regs->iir) == VM_READ) {

arch/riscv/boot/dts/sophgo/sg2042.dtsi+48−32

 					      <&cpu63_intc 3>;
 		};
-		clint_mtimer0: timer@70ac000000 {
+		clint_mtimer0: timer@70ac004000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac000000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac004000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu0_intc 7>,
 					      <&cpu1_intc 7>,
 					      <&cpu2_intc 7>,
 					      <&cpu3_intc 7>;
 		};
-		clint_mtimer1: timer@70ac010000 {
+		clint_mtimer1: timer@70ac014000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac010000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac014000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu4_intc 7>,
 					      <&cpu5_intc 7>,
 					      <&cpu6_intc 7>,
 					      <&cpu7_intc 7>;
 		};
-		clint_mtimer2: timer@70ac020000 {
+		clint_mtimer2: timer@70ac024000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac020000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac024000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu8_intc 7>,
 					      <&cpu9_intc 7>,
 					      <&cpu10_intc 7>,
 					      <&cpu11_intc 7>;
 		};
-		clint_mtimer3: timer@70ac030000 {
+		clint_mtimer3: timer@70ac034000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac030000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac034000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu12_intc 7>,
 					      <&cpu13_intc 7>,
 					      <&cpu14_intc 7>,
 					      <&cpu15_intc 7>;
 		};
-		clint_mtimer4: timer@70ac040000 {
+		clint_mtimer4: timer@70ac044000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac040000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac044000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu16_intc 7>,
 					      <&cpu17_intc 7>,
 					      <&cpu18_intc 7>,
 					      <&cpu19_intc 7>;
 		};
-		clint_mtimer5: timer@70ac050000 {
+		clint_mtimer5: timer@70ac054000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac050000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac054000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu20_intc 7>,
 					      <&cpu21_intc 7>,
 					      <&cpu22_intc 7>,
 					      <&cpu23_intc 7>;
 		};
-		clint_mtimer6: timer@70ac060000 {
+		clint_mtimer6: timer@70ac064000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac060000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac064000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu24_intc 7>,
 					      <&cpu25_intc 7>,
 					      <&cpu26_intc 7>,
 					      <&cpu27_intc 7>;
 		};
-		clint_mtimer7: timer@70ac070000 {
+		clint_mtimer7: timer@70ac074000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac070000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac074000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu28_intc 7>,
 					      <&cpu29_intc 7>,
 					      <&cpu30_intc 7>,
 					      <&cpu31_intc 7>;
 		};
-		clint_mtimer8: timer@70ac080000 {
+		clint_mtimer8: timer@70ac084000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac080000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac084000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu32_intc 7>,
 					      <&cpu33_intc 7>,
 					      <&cpu34_intc 7>,
 					      <&cpu35_intc 7>;
 		};
-		clint_mtimer9: timer@70ac090000 {
+		clint_mtimer9: timer@70ac094000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac090000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac094000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu36_intc 7>,
 					      <&cpu37_intc 7>,
 					      <&cpu38_intc 7>,
 					      <&cpu39_intc 7>;
 		};
-		clint_mtimer10: timer@70ac0a0000 {
+		clint_mtimer10: timer@70ac0a4000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac0a0000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac0a4000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu40_intc 7>,
 					      <&cpu41_intc 7>,
 					      <&cpu42_intc 7>,
 					      <&cpu43_intc 7>;
 		};
-		clint_mtimer11: timer@70ac0b0000 {
+		clint_mtimer11: timer@70ac0b4000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac0b0000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac0b4000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu44_intc 7>,
 					      <&cpu45_intc 7>,
 					      <&cpu46_intc 7>,
 					      <&cpu47_intc 7>;
 		};
-		clint_mtimer12: timer@70ac0c0000 {
+		clint_mtimer12: timer@70ac0c4000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac0c0000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac0c4000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu48_intc 7>,
 					      <&cpu49_intc 7>,
 					      <&cpu50_intc 7>,
 					      <&cpu51_intc 7>;
 		};
-		clint_mtimer13: timer@70ac0d0000 {
+		clint_mtimer13: timer@70ac0d4000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac0d0000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac0d4000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu52_intc 7>,
 					      <&cpu53_intc 7>,
 					      <&cpu54_intc 7>,
 					      <&cpu55_intc 7>;
 		};
-		clint_mtimer14: timer@70ac0e0000 {
+		clint_mtimer14: timer@70ac0e4000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac0e0000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac0e4000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu56_intc 7>,
 					      <&cpu57_intc 7>,
 					      <&cpu58_intc 7>,
 					      <&cpu59_intc 7>;
 		};
-		clint_mtimer15: timer@70ac0f0000 {
+		clint_mtimer15: timer@70ac0f4000 {
 			compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer";
-			reg = <0x00000070 0xac0f0000 0x00000000 0x00007ff8>;
+			reg = <0x00000070 0xac0f4000 0x00000000 0x0000c000>;
+			reg-names = "mtimecmp";
 			interrupts-extended = <&cpu60_intc 7>,
 					      <&cpu61_intc 7>,
 					      <&cpu62_intc 7>,

arch/um/Makefile+3−1

@@ -115,7 +115,9 @@ archprepare: · 114 unmodified lines
115	$(Q)$(MAKE) $(build)=$(HOST_DIR)/um include/generated/user_constants.h	115	$(Q)$(MAKE) $(build)=$(HOST_DIR)/um include/generated/user_constants.h
116		116
117	LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static	117	LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
118	LINK-$(CONFIG_LD_SCRIPT_DYN) += $(call cc-option, -no-pie)	118	ifdef CONFIG_LD_SCRIPT_DYN
		119	LINK-$(call gcc-min-version, 60100)$(CONFIG_CC_IS_CLANG) += -no-pie
		120	endif
119	LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib	121	LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib
120		122
121	CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \	123	CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \

arch/x86/Makefile+5−5

@@ -112,13 +112,13 @@ ifeq ($(CONFIG_X86_32),y) · 111 unmodified lines
112	# temporary until string.h is fixed	112	# temporary until string.h is fixed
113	KBUILD_CFLAGS += -ffreestanding	113	KBUILD_CFLAGS += -ffreestanding
114		114
115	ifeq ($(CONFIG_STACKPROTECTOR),y)	115	ifeq ($(CONFIG_STACKPROTECTOR),y)
116	ifeq ($(CONFIG_SMP),y)	116	ifeq ($(CONFIG_SMP),y)
117	KBUILD_CFLAGS += -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard	117	KBUILD_CFLAGS += -mstack-protector-guard-reg=fs -mstack-protector-guard-symbol=__stack_chk_guard
118	else	118	else
119	KBUILD_CFLAGS += -mstack-protector-guard=global	119	KBUILD_CFLAGS += -mstack-protector-guard=global
120	endif	120	endif
121	endif	121	endif
122	else	122	else
123	BITS := 64	123	BITS := 64
124	UTS_MACHINE := x86_64	124	UTS_MACHINE := x86_64

arch/x86/include/asm/cpufeatures.h+1−3

 #define X86_FEATURE_K6_MTRR		( 3*32+ 1) /* AMD K6 nonstandard MTRRs */
 #define X86_FEATURE_CYRIX_ARR		( 3*32+ 2) /* Cyrix ARRs (= MTRRs) */
 #define X86_FEATURE_CENTAUR_MCR		( 3*32+ 3) /* Centaur MCRs (= MTRRs) */
-/* CPU types for specific tunings: */
 #define X86_FEATURE_K8			( 3*32+ 4) /* "" Opteron, Athlon64 */
-/* FREE, was #define X86_FEATURE_K7			( 3*32+ 5) "" Athlon */
+#define X86_FEATURE_ZEN5		( 3*32+ 5) /* "" CPU based on Zen5 microarchitecture */
 #define X86_FEATURE_P3			( 3*32+ 6) /* "" P3 */
 #define X86_FEATURE_P4			( 3*32+ 7) /* "" P4 */
 #define X86_FEATURE_CONSTANT_TSC	( 3*32+ 8) /* TSC ticks at a constant rate */

arch/x86/include/asm/intel-family.h+2−0

@@ -162,6 +162,8 @@ · 161 unmodified lines
162	#define INTEL_FAM6_ATOM_CRESTMONT_X 0xAF /* Sierra Forest */	162	#define INTEL_FAM6_ATOM_CRESTMONT_X 0xAF /* Sierra Forest */
163	#define INTEL_FAM6_ATOM_CRESTMONT 0xB6 /* Grand Ridge */	163	#define INTEL_FAM6_ATOM_CRESTMONT 0xB6 /* Grand Ridge */
164		164
		165	#define INTEL_FAM6_ATOM_DARKMONT_X 0xDD /* Clearwater Forest */
		166
165	/* Xeon Phi */	167	/* Xeon Phi */
166		168
167	#define INTEL_FAM6_XEON_PHI_KNL 0x57 /* Knights Landing */	169	#define INTEL_FAM6_XEON_PHI_KNL 0x57 /* Knights Landing */

arch/x86/include/asm/kmsan.h+16−1

@@ -64,6 +64,7 @@ static inline bool kmsan_virt_addr_valid(void *addr) · 63 unmodified lines
64	{	64	{
65	unsigned long x = (unsigned long)addr;	65	unsigned long x = (unsigned long)addr;
66	unsigned long y = x - __START_KERNEL_map;	66	unsigned long y = x - __START_KERNEL_map;
		67	bool ret;
67		68
68	/* use the carry flag to determine if x was < __START_KERNEL_map */	69	/* use the carry flag to determine if x was < __START_KERNEL_map */
69	if (unlikely(x > y)) {	70	if (unlikely(x > y)) {
@@ -79,7 +80,21 @@ static inline bool kmsan_virt_addr_valid(void *addr) · 9 unmodified lines
79	return false;	80	return false;
80	}	81	}
81		82
82	return pfn_valid(x >> PAGE_SHIFT);	83	/*
		84	* pfn_valid() relies on RCU, and may call into the scheduler on exiting
		85	* the critical section. However, this would result in recursion with
		86	* KMSAN. Therefore, disable preemption here, and re-enable preemption
		87	* below while suppressing reschedules to avoid recursion.
		88	*
		89	* Note, this sacrifices occasionally breaking scheduling guarantees.
		90	* Although, a kernel compiled with KMSAN has already given up on any
		91	* performance guarantees due to being heavily instrumented.
		92	*/
		93	preempt_disable();
		94	ret = pfn_valid(x >> PAGE_SHIFT);
		95	preempt_enable_no_resched();
		96
		97	return ret;
83	}	98	}
84		99
85	#endif /* !MODULE */	100	#endif /* !MODULE */

arch/x86/include/asm/syscall_wrapper.h+21−4

@@ -58,12 +58,29 @@ extern long __ia32_sys_ni_syscall(const struct pt_regs *regs); · 57 unmodified lines
58	,,regs->di,,regs->si,,regs->dx \	58	,,regs->di,,regs->si,,regs->dx \
59	,,regs->r10,,regs->r8,,regs->r9) \	59	,,regs->r10,,regs->r8,,regs->r9) \
60		60
		61
		62	/* SYSCALL_PT_ARGS is Adapted from s390x */
		63	#define SYSCALL_PT_ARG6(m, t1, t2, t3, t4, t5, t6) \
		64	SYSCALL_PT_ARG5(m, t1, t2, t3, t4, t5), m(t6, (regs->bp))
		65	#define SYSCALL_PT_ARG5(m, t1, t2, t3, t4, t5) \
		66	SYSCALL_PT_ARG4(m, t1, t2, t3, t4), m(t5, (regs->di))
		67	#define SYSCALL_PT_ARG4(m, t1, t2, t3, t4) \
		68	SYSCALL_PT_ARG3(m, t1, t2, t3), m(t4, (regs->si))
		69	#define SYSCALL_PT_ARG3(m, t1, t2, t3) \
		70	SYSCALL_PT_ARG2(m, t1, t2), m(t3, (regs->dx))
		71	#define SYSCALL_PT_ARG2(m, t1, t2) \
		72	SYSCALL_PT_ARG1(m, t1), m(t2, (regs->cx))
		73	#define SYSCALL_PT_ARG1(m, t1) m(t1, (regs->bx))
		74	#define SYSCALL_PT_ARGS(x, ...) SYSCALL_PT_ARG##x(__VA_ARGS__)
		75
		76	#define __SC_COMPAT_CAST(t, a) \
		77	(__typeof(__builtin_choose_expr(__TYPE_IS_L(t), 0, 0U))) \
		78	(unsigned int)a
		79
61	/* Mapping of registers to parameters for syscalls on i386 */	80	/* Mapping of registers to parameters for syscalls on i386 */
62	#define SC_IA32_REGS_TO_ARGS(x, ...) \	81	#define SC_IA32_REGS_TO_ARGS(x, ...) \
63	__MAP(x,__SC_ARGS \	82	SYSCALL_PT_ARGS(x, __SC_COMPAT_CAST, \
64	,,(unsigned int)regs->bx,,(unsigned int)regs->cx \	83	__MAP(x, __SC_TYPE, __VA_ARGS__)) \
65	,,(unsigned int)regs->dx,,(unsigned int)regs->si \
66	,,(unsigned int)regs->di,,(unsigned int)regs->bp)
67		84
68	#define __SYS_STUB0(abi, name) \	85	#define __SYS_STUB0(abi, name) \
69	long __##abi##_##name(const struct pt_regs *regs); \	86	long __##abi##_##name(const struct pt_regs *regs); \

arch/x86/kernel/alternative.c+1−1

@@ -403,7 +403,7 @@ noinstr void BUG_func(void) · 402 unmodified lines
403	{	403	{
404	BUG();	404	BUG();
405	}	405	}
406	EXPORT_SYMBOL_GPL(BUG_func);	406	EXPORT_SYMBOL(BUG_func);
407		407
408	#define CALL_RIP_REL_OPCODE 0xff	408	#define CALL_RIP_REL_OPCODE 0xff
409	#define CALL_RIP_REL_MODRM 0x15	409	#define CALL_RIP_REL_MODRM 0x15

arch/x86/kernel/cpu/amd.c+24−4

@@ -538,7 +538,7 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) · 537 unmodified lines
538		538
539	/* Figure out Zen generations: */	539	/* Figure out Zen generations: */
540	switch (c->x86) {	540	switch (c->x86) {
541	case 0x17: {	541	case 0x17:
542	switch (c->x86_model) {	542	switch (c->x86_model) {
543	case 0x00 ... 0x2f:	543	case 0x00 ... 0x2f:
544	case 0x50 ... 0x5f:	544	case 0x50 ... 0x5f:
@@ -554,8 +554,8 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) · 9 unmodified lines
554	goto warn;	554	goto warn;
555	}	555	}
556	break;	556	break;
557	}	557
558	case 0x19: {	558	case 0x19:
559	switch (c->x86_model) {	559	switch (c->x86_model) {
560	case 0x00 ... 0x0f:	560	case 0x00 ... 0x0f:
561	case 0x20 ... 0x5f:	561	case 0x20 ... 0x5f:
@@ -569,7 +569,20 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) · 7 unmodified lines
569	goto warn;	569	goto warn;
570	}	570	}
571	break;	571	break;
572	}	572
		573	case 0x1a:
		574	switch (c->x86_model) {
		575	case 0x00 ... 0x0f:
		576	case 0x20 ... 0x2f:
		577	case 0x40 ... 0x4f:
		578	case 0x70 ... 0x7f:
		579	setup_force_cpu_cap(X86_FEATURE_ZEN5);
		580	break;
		581	default:
		582	goto warn;
		583	}
		584	break;
		585
573	default:	586	default:
574	break;	587	break;
575	}	588	}
@@ -1039,6 +1052,11 @@ static void init_amd_zen4(struct cpuinfo_x86 *c) · 463 unmodified lines
1039	msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT);	1052	msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT);
1040	}	1053	}
1041		1054
		1055	static void init_amd_zen5(struct cpuinfo_x86 *c)
		1056	{
		1057	init_amd_zen_common();
		1058	}
		1059
1042	static void init_amd(struct cpuinfo_x86 *c)	1060	static void init_amd(struct cpuinfo_x86 *c)
1043	{	1061	{
1044	u64 vm_cr;	1062	u64 vm_cr;
@@ -1084,6 +1102,8 @@ static void init_amd(struct cpuinfo_x86 *c) · 39 unmodified lines
1084	init_amd_zen3(c);	1102	init_amd_zen3(c);
1085	else if (boot_cpu_has(X86_FEATURE_ZEN4))	1103	else if (boot_cpu_has(X86_FEATURE_ZEN4))
1086	init_amd_zen4(c);	1104	init_amd_zen4(c);
		1105	else if (boot_cpu_has(X86_FEATURE_ZEN5))
		1106	init_amd_zen5(c);
1087		1107
1088	/*	1108	/*
1089	* Enable workaround for FXSAVE leak on CPUs	1109	* Enable workaround for FXSAVE leak on CPUs

block/blk-map.c+10−3

 	/*
 	 * success
 	 */
-	if ((iov_iter_rw(iter) == WRITE &&
+	if (iov_iter_rw(iter) == WRITE &&
-	     (!map_data || !map_data->null_mapped)) ||
+	     (!map_data || !map_data->null_mapped)) {
-	    (map_data && map_data->from_user)) {
 		ret = bio_copy_from_iter(bio, iter);
 		if (ret)
 			goto cleanup;
+	} else if (map_data && map_data->from_user) {
+		struct iov_iter iter2 = *iter;
+		/* This is the copy-in part of SG_DXFER_TO_FROM_DEV. */
+		iter2.data_source = ITER_SOURCE;
+		ret = bio_copy_from_iter(bio, &iter2);
+		if (ret)
+			goto cleanup;
 	} else {
 		if (bmd->is_our_pages)
 			zero_fill_bio(bio);

block/ioctl.c+0−2

@@ -20,8 +20,6 @@ static int blkpg_do_ioctl(struct block_device *bdev, · 19 unmodified lines
20	struct blkpg_partition p;	20	struct blkpg_partition p;
21	sector_t start, length;	21	sector_t start, length;
22		22
23	if (disk->flags & GENHD_FL_NO_PART)
24	return -EINVAL;
25	if (!capable(CAP_SYS_ADMIN))	23	if (!capable(CAP_SYS_ADMIN))
26	return -EACCES;	24	return -EACCES;
27	if (copy_from_user(&p, upart, sizeof(struct blkpg_partition)))	25	if (copy_from_user(&p, upart, sizeof(struct blkpg_partition)))

block/partitions/core.c+5−0

 		goto out;
 	}
+	if (disk->flags & GENHD_FL_NO_PART) {
+		ret = -EINVAL;
+		goto out;
+	}
 	if (partition_overlaps(disk, start, length, -1)) {
 		ret = -EBUSY;
 		goto out;

drivers/accel/ivpu/ivpu_debugfs.c+16−4

@@ -102,7 +102,7 @@ static int reset_pending_show(struct seq_file s, void v) · 101 unmodified lines
102	{	102	{
103	struct ivpu_device *vdev = seq_to_ivpu(s);	103	struct ivpu_device *vdev = seq_to_ivpu(s);
104		104
105	seq_printf(s, "%d\n", atomic_read(&vdev->pm->in_reset));	105	seq_printf(s, "%d\n", atomic_read(&vdev->pm->reset_pending));
106	return 0;	106	return 0;
107	}	107	}
108		108
@@ -130,7 +130,9 @@ dvfs_mode_fops_write(struct file file, const char __user user_buf, size_t size · 21 unmodified lines
130		130
131	fw->dvfs_mode = dvfs_mode;	131	fw->dvfs_mode = dvfs_mode;
132		132
133	ivpu_pm_schedule_recovery(vdev);	133	ret = pci_try_reset_function(to_pci_dev(vdev->drm.dev));
		134	if (ret)
		135	return ret;
134		136
135	return size;	137	return size;
136	}	138	}
@@ -190,7 +192,10 @@ fw_profiling_freq_fops_write(struct file file, const char __user user_buf, · 53 unmodified lines
190	return ret;	192	return ret;
191		193
192	ivpu_hw_profiling_freq_drive(vdev, enable);	194	ivpu_hw_profiling_freq_drive(vdev, enable);
193	ivpu_pm_schedule_recovery(vdev);	195
		196	ret = pci_try_reset_function(to_pci_dev(vdev->drm.dev));
		197	if (ret)
		198	return ret;
194		199
195	return size;	200	return size;
196	}	201	}
@@ -301,11 +306,18 @@ static ssize_t · 104 unmodified lines
301	ivpu_force_recovery_fn(struct file file, const char __user user_buf, size_t size, loff_t *pos)	306	ivpu_force_recovery_fn(struct file file, const char __user user_buf, size_t size, loff_t *pos)
302	{	307	{
303	struct ivpu_device *vdev = file->private_data;	308	struct ivpu_device *vdev = file->private_data;
		309	int ret;
304		310
305	if (!size)	311	if (!size)
306	return -EINVAL;	312	return -EINVAL;
307		313
308	ivpu_pm_schedule_recovery(vdev);	314	ret = ivpu_rpm_get(vdev);
		315	if (ret)
		316	return ret;
		317
		318	ivpu_pm_trigger_recovery(vdev, "debugfs");
		319	flush_work(&vdev->pm->recovery_work);
		320	ivpu_rpm_put(vdev);
309	return size;	321	return size;
310	}	322	}
311		323

drivers/accel/ivpu/ivpu_drv.c+71−55

@@ -6,6 +6,7 @@ · 5 unmodified lines
6	#include <linux/firmware.h>	6	#include <linux/firmware.h>
7	#include <linux/module.h>	7	#include <linux/module.h>
8	#include <linux/pci.h>	8	#include <linux/pci.h>
		9	#include <linux/pm_runtime.h>
9		10
10	#include <drm/drm_accel.h>	11	#include <drm/drm_accel.h>
11	#include <drm/drm_file.h>	12	#include <drm/drm_file.h>
@@ -17,6 +18,7 @@ · 5 unmodified lines
17	#include "ivpu_debugfs.h"	18	#include "ivpu_debugfs.h"
18	#include "ivpu_drv.h"	19	#include "ivpu_drv.h"
19	#include "ivpu_fw.h"	20	#include "ivpu_fw.h"
		21	#include "ivpu_fw_log.h"
20	#include "ivpu_gem.h"	22	#include "ivpu_gem.h"
21	#include "ivpu_hw.h"	23	#include "ivpu_hw.h"
22	#include "ivpu_ipc.h"	24	#include "ivpu_ipc.h"
@@ -65,22 +67,20 @@ struct ivpu_file_priv ivpu_file_priv_get(struct ivpu_file_priv file_priv) · 42 unmodified lines
65	return file_priv;	67	return file_priv;
66	}	68	}
67		69
68	struct ivpu_file_priv ivpu_file_priv_get_by_ctx_id(struct ivpu_device vdev, unsigned long id)	70	static void file_priv_unbind(struct ivpu_device vdev, struct ivpu_file_priv file_priv)
69	{	71	{
70	struct ivpu_file_priv *file_priv;	72	mutex_lock(&file_priv->lock);
71		73	if (file_priv->bound) {
72	xa_lock_irq(&vdev->context_xa);	74	ivpu_dbg(vdev, FILE, "file_priv unbind: ctx %u\n", file_priv->ctx.id);
73	file_priv = xa_load(&vdev->context_xa, id);	75
74	/* file_priv may still be in context_xa during file_priv_release() */	76	ivpu_cmdq_release_all_locked(file_priv);
75	if (file_priv && !kref_get_unless_zero(&file_priv->ref))	77	ivpu_jsm_context_release(vdev, file_priv->ctx.id);
76	file_priv = NULL;	78	ivpu_bo_unbind_all_bos_from_context(vdev, &file_priv->ctx);
77	xa_unlock_irq(&vdev->context_xa);	79	ivpu_mmu_user_context_fini(vdev, &file_priv->ctx);
78		80	file_priv->bound = false;
79	if (file_priv)	81	drm_WARN_ON(&vdev->drm, !xa_erase_irq(&vdev->context_xa, file_priv->ctx.id));
80	ivpu_dbg(vdev, KREF, "file_priv get by id: ctx %u refcount %u\n",	82	}
81	file_priv->ctx.id, kref_read(&file_priv->ref));	83	mutex_unlock(&file_priv->lock);
82
83	return file_priv;
84	}	84	}
85		85
86	static void file_priv_release(struct kref *ref)	86	static void file_priv_release(struct kref *ref)
@@ -88,13 +88,15 @@ static void file_priv_release(struct kref *ref) · 1 unmodified line
88	struct ivpu_file_priv *file_priv = container_of(ref, struct ivpu_file_priv, ref);	88	struct ivpu_file_priv *file_priv = container_of(ref, struct ivpu_file_priv, ref);
89	struct ivpu_device *vdev = file_priv->vdev;	89	struct ivpu_device *vdev = file_priv->vdev;
90		90
91	ivpu_dbg(vdev, FILE, "file_priv release: ctx %u\n", file_priv->ctx.id);	91	ivpu_dbg(vdev, FILE, "file_priv release: ctx %u bound %d\n",
		92	file_priv->ctx.id, (bool)file_priv->bound);
		93
		94	pm_runtime_get_sync(vdev->drm.dev);
		95	mutex_lock(&vdev->context_list_lock);
		96	file_priv_unbind(vdev, file_priv);
		97	mutex_unlock(&vdev->context_list_lock);
		98	pm_runtime_put_autosuspend(vdev->drm.dev);
92		99
93	ivpu_cmdq_release_all(file_priv);
94	ivpu_jsm_context_release(vdev, file_priv->ctx.id);
95	ivpu_bo_remove_all_bos_from_context(vdev, &file_priv->ctx);
96	ivpu_mmu_user_context_fini(vdev, &file_priv->ctx);
97	drm_WARN_ON(&vdev->drm, xa_erase_irq(&vdev->context_xa, file_priv->ctx.id) != file_priv);
98	mutex_destroy(&file_priv->lock);	100	mutex_destroy(&file_priv->lock);
99	kfree(file_priv);	101	kfree(file_priv);
100	}	102	}
@@ -176,9 +178,6 @@ static int ivpu_get_param_ioctl(struct drm_device dev, void data, struct drm_f · 75 unmodified lines
176	case DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS:	178	case DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS:
177	args->value = vdev->hw->ranges.user.start;	179	args->value = vdev->hw->ranges.user.start;
178	break;	180	break;
179	case DRM_IVPU_PARAM_CONTEXT_PRIORITY:
180	args->value = file_priv->priority;
181	break;
182	case DRM_IVPU_PARAM_CONTEXT_ID:	181	case DRM_IVPU_PARAM_CONTEXT_ID:
183	args->value = file_priv->ctx.id;	182	args->value = file_priv->ctx.id;
184	break;	183	break;
@@ -218,17 +217,10 @@ static int ivpu_get_param_ioctl(struct drm_device dev, void data, struct drm_f · 33 unmodified lines
218		217
219	static int ivpu_set_param_ioctl(struct drm_device dev, void data, struct drm_file *file)	218	static int ivpu_set_param_ioctl(struct drm_device dev, void data, struct drm_file *file)
220	{	219	{
221	struct ivpu_file_priv *file_priv = file->driver_priv;
222	struct drm_ivpu_param *args = data;	220	struct drm_ivpu_param *args = data;
223	int ret = 0;	221	int ret = 0;
224		222
225	switch (args->param) {	223	switch (args->param) {
226	case DRM_IVPU_PARAM_CONTEXT_PRIORITY:
227	if (args->value <= DRM_IVPU_CONTEXT_PRIORITY_REALTIME)
228	file_priv->priority = args->value;
229	else
230	ret = -EINVAL;
231	break;
232	default:	224	default:
233	ret = -EINVAL;	225	ret = -EINVAL;
234	}	226	}
@@ -241,50 +233,53 @@ static int ivpu_open(struct drm_device dev, struct drm_file file) · 6 unmodified lines
241	struct ivpu_device *vdev = to_ivpu_device(dev);	233	struct ivpu_device *vdev = to_ivpu_device(dev);
242	struct ivpu_file_priv *file_priv;	234	struct ivpu_file_priv *file_priv;
243	u32 ctx_id;	235	u32 ctx_id;
244	void *old;	236	int idx, ret;
245	int ret;
246		237
247	ret = xa_alloc_irq(&vdev->context_xa, &ctx_id, NULL, vdev->context_xa_limit, GFP_KERNEL);	238	if (!drm_dev_enter(dev, &idx))
248	if (ret) {	239	return -ENODEV;
249	ivpu_err(vdev, "Failed to allocate context id: %d\n", ret);
250	return ret;
251	}
252		240
253	file_priv = kzalloc(sizeof(*file_priv), GFP_KERNEL);	241	file_priv = kzalloc(sizeof(*file_priv), GFP_KERNEL);
254	if (!file_priv) {	242	if (!file_priv) {
255	ret = -ENOMEM;	243	ret = -ENOMEM;
256	goto err_xa_erase;	244	goto err_dev_exit;
257	}	245	}
258		246
259	file_priv->vdev = vdev;	247	file_priv->vdev = vdev;
260	file_priv->priority = DRM_IVPU_CONTEXT_PRIORITY_NORMAL;	248	file_priv->bound = true;
261	kref_init(&file_priv->ref);	249	kref_init(&file_priv->ref);
262	mutex_init(&file_priv->lock);	250	mutex_init(&file_priv->lock);
263		251
		252	mutex_lock(&vdev->context_list_lock);
		253
		254	ret = xa_alloc_irq(&vdev->context_xa, &ctx_id, file_priv,
		255	vdev->context_xa_limit, GFP_KERNEL);
		256	if (ret) {
		257	ivpu_err(vdev, "Failed to allocate context id: %d\n", ret);
		258	goto err_unlock;
		259	}
		260
264	ret = ivpu_mmu_user_context_init(vdev, &file_priv->ctx, ctx_id);	261	ret = ivpu_mmu_user_context_init(vdev, &file_priv->ctx, ctx_id);
265	if (ret)	262	if (ret)
266	goto err_mutex_destroy;	263	goto err_xa_erase;
267		264
268	old = xa_store_irq(&vdev->context_xa, ctx_id, file_priv, GFP_KERNEL);	265	mutex_unlock(&vdev->context_list_lock);
269	if (xa_is_err(old)) {	266	drm_dev_exit(idx);
270	ret = xa_err(old);	267
271	ivpu_err(vdev, "Failed to store context %u: %d\n", ctx_id, ret);	268	file->driver_priv = file_priv;
272	goto err_ctx_fini;
273	}
274		269
275	ivpu_dbg(vdev, FILE, "file_priv create: ctx %u process %s pid %d\n",	270	ivpu_dbg(vdev, FILE, "file_priv create: ctx %u process %s pid %d\n",
276	ctx_id, current->comm, task_pid_nr(current));	271	ctx_id, current->comm, task_pid_nr(current));
277		272
278	file->driver_priv = file_priv;
279	return 0;	273	return 0;
280		274
281	err_ctx_fini:
282	ivpu_mmu_user_context_fini(vdev, &file_priv->ctx);
283	err_mutex_destroy:
284	mutex_destroy(&file_priv->lock);
285	kfree(file_priv);
286	err_xa_erase:	275	err_xa_erase:
287	xa_erase_irq(&vdev->context_xa, ctx_id);	276	xa_erase_irq(&vdev->context_xa, ctx_id);
		277	err_unlock:
		278	mutex_unlock(&vdev->context_list_lock);
		279	mutex_destroy(&file_priv->lock);
		280	kfree(file_priv);
		281	err_dev_exit:
		282	drm_dev_exit(idx);
288	return ret;	283	return ret;
289	}	284	}
290		285
@@ -340,8 +335,6 @@ static int ivpu_wait_for_ready(struct ivpu_device *vdev) · 49 unmodified lines
340		335
341	if (!ret)	336	if (!ret)
342	ivpu_dbg(vdev, PM, "VPU ready message received successfully\n");	337	ivpu_dbg(vdev, PM, "VPU ready message received successfully\n");
343	else
344	ivpu_hw_diagnose_failure(vdev);
345		338
346	return ret;	339	return ret;
347	}	340	}
@@ -369,6 +362,9 @@ int ivpu_boot(struct ivpu_device *vdev) · 21 unmodified lines
369	ret = ivpu_wait_for_ready(vdev);	362	ret = ivpu_wait_for_ready(vdev);
370	if (ret) {	363	if (ret) {
371	ivpu_err(vdev, "Failed to boot the firmware: %d\n", ret);	364	ivpu_err(vdev, "Failed to boot the firmware: %d\n", ret);
		365	ivpu_hw_diagnose_failure(vdev);
		366	ivpu_mmu_evtq_dump(vdev);
		367	ivpu_fw_log_dump(vdev);
372	return ret;	368	return ret;
373	}	369	}
374		370
@@ -540,6 +536,10 @@ static int ivpu_dev_init(struct ivpu_device *vdev) · 165 unmodified lines
540	lockdep_set_class(&vdev->submitted_jobs_xa.xa_lock, &submitted_jobs_xa_lock_class_key);	536	lockdep_set_class(&vdev->submitted_jobs_xa.xa_lock, &submitted_jobs_xa_lock_class_key);
541	INIT_LIST_HEAD(&vdev->bo_list);	537	INIT_LIST_HEAD(&vdev->bo_list);
542		538
		539	ret = drmm_mutex_init(&vdev->drm, &vdev->context_list_lock);
		540	if (ret)
		541	goto err_xa_destroy;
		542
543	ret = drmm_mutex_init(&vdev->drm, &vdev->bo_list_lock);	543	ret = drmm_mutex_init(&vdev->drm, &vdev->bo_list_lock);
544	if (ret)	544	if (ret)
545	goto err_xa_destroy;	545	goto err_xa_destroy;
@@ -611,14 +611,30 @@ err_xa_destroy: · 65 unmodified lines
611	return ret;	611	return ret;
612	}	612	}
613		613
		614	static void ivpu_bo_unbind_all_user_contexts(struct ivpu_device *vdev)
		615	{
		616	struct ivpu_file_priv *file_priv;
		617	unsigned long ctx_id;
		618
		619	mutex_lock(&vdev->context_list_lock);
		620
		621	xa_for_each(&vdev->context_xa, ctx_id, file_priv)
		622	file_priv_unbind(vdev, file_priv);
		623
		624	mutex_unlock(&vdev->context_list_lock);
		625	}
		626
614	static void ivpu_dev_fini(struct ivpu_device *vdev)	627	static void ivpu_dev_fini(struct ivpu_device *vdev)
615	{	628	{
616	ivpu_pm_disable(vdev);	629	ivpu_pm_disable(vdev);
617	ivpu_shutdown(vdev);	630	ivpu_shutdown(vdev);
618	if (IVPU_WA(d3hot_after_power_off))	631	if (IVPU_WA(d3hot_after_power_off))
619	pci_set_power_state(to_pci_dev(vdev->drm.dev), PCI_D3hot);	632	pci_set_power_state(to_pci_dev(vdev->drm.dev), PCI_D3hot);
		633
		634	ivpu_jobs_abort_all(vdev);
620	ivpu_job_done_consumer_fini(vdev);	635	ivpu_job_done_consumer_fini(vdev);
621	ivpu_pm_cancel_recovery(vdev);	636	ivpu_pm_cancel_recovery(vdev);
		637	ivpu_bo_unbind_all_user_contexts(vdev);
622		638
623	ivpu_ipc_fini(vdev);	639	ivpu_ipc_fini(vdev);
624	ivpu_fw_fini(vdev);	640	ivpu_fw_fini(vdev);

drivers/accel/ivpu/ivpu_drv.h+3−2

 #define IVPU_DBG_JSM	 BIT(10)
 #define IVPU_DBG_KREF	 BIT(11)
 #define IVPU_DBG_RPM	 BIT(12)
+#define IVPU_DBG_MMU_MAP BIT(13)
 #define ivpu_err(vdev, fmt, ...) \
 	drm_err(&(vdev)->drm, "%s(): " fmt, __func__, ##__VA_ARGS__)
 	struct ivpu_mmu_context gctx;
 	struct ivpu_mmu_context rctx;
+	struct mutex context_list_lock; /* Protects user context addition/removal */
 	struct xarray context_xa;
 	struct xa_limit context_xa_limit;
 	struct mutex lock; /* Protects cmdq */
 	struct ivpu_cmdq *cmdq[IVPU_NUM_ENGINES];
 	struct ivpu_mmu_context ctx;
-	u32 priority;
 	bool has_mmu_faults;
+	bool bound;
 };
 extern int ivpu_dbg_mask;
 extern int ivpu_test_mode;
 struct ivpu_file_priv *ivpu_file_priv_get(struct ivpu_file_priv *file_priv);
-struct ivpu_file_priv *ivpu_file_priv_get_by_ctx_id(struct ivpu_device *vdev, unsigned long id);
 void ivpu_file_priv_put(struct ivpu_file_priv **link);
 int ivpu_boot(struct ivpu_device *vdev);

drivers/accel/ivpu/ivpu_gem.c+52−90

@@ -24,14 +24,11 @@ static const struct drm_gem_object_funcs ivpu_gem_funcs; · 23 unmodified lines
24		24
25	static inline void ivpu_dbg_bo(struct ivpu_device vdev, struct ivpu_bo bo, const char *action)	25	static inline void ivpu_dbg_bo(struct ivpu_device vdev, struct ivpu_bo bo, const char *action)
26	{	26	{
27	if (bo->ctx)	27	ivpu_dbg(vdev, BO,
28	ivpu_dbg(vdev, BO, "%6s: size %zu has_pages %d dma_mapped %d handle %u ctx %d vpu_addr 0x%llx mmu_mapped %d\n",	28	"%6s: bo %8p vpu_addr %9llx size %8zu ctx %d has_pages %d dma_mapped %d mmu_mapped %d wc %d imported %d\n",
29	action, ivpu_bo_size(bo), (bool)bo->base.pages, (bool)bo->base.sgt,	29	action, bo, bo->vpu_addr, ivpu_bo_size(bo), bo->ctx ? bo->ctx->id : 0,
30	bo->handle, bo->ctx->id, bo->vpu_addr, bo->mmu_mapped);	30	(bool)bo->base.pages, (bool)bo->base.sgt, bo->mmu_mapped, bo->base.map_wc,
31	else	31	(bool)bo->base.base.import_attach);
32	ivpu_dbg(vdev, BO, "%6s: size %zu has_pages %d dma_mapped %d handle %u (not added to context)\n",
33	action, ivpu_bo_size(bo), (bool)bo->base.pages, (bool)bo->base.sgt,
34	bo->handle);
35	}	32	}
36		33
37	/*	34	/*
@@ -49,12 +46,7 @@ int __must_check ivpu_bo_pin(struct ivpu_bo *bo) · 11 unmodified lines
49	mutex_lock(&bo->lock);	46	mutex_lock(&bo->lock);
50		47
51	ivpu_dbg_bo(vdev, bo, "pin");	48	ivpu_dbg_bo(vdev, bo, "pin");
52		49	drm_WARN_ON(&vdev->drm, !bo->ctx);
53	if (!bo->ctx) {
54	ivpu_err(vdev, "vpu_addr not allocated for BO %d\n", bo->handle);
55	ret = -EINVAL;
56	goto unlock;
57	}
58		50
59	if (!bo->mmu_mapped) {	51	if (!bo->mmu_mapped) {
60	struct sg_table *sgt = drm_gem_shmem_get_pages_sgt(&bo->base);	52	struct sg_table *sgt = drm_gem_shmem_get_pages_sgt(&bo->base);
@@ -85,7 +77,10 @@ ivpu_bo_alloc_vpu_addr(struct ivpu_bo bo, struct ivpu_mmu_context ctx, · 24 unmodified lines
85	const struct ivpu_addr_range *range)	77	const struct ivpu_addr_range *range)
86	{	78	{
87	struct ivpu_device *vdev = ivpu_bo_to_vdev(bo);	79	struct ivpu_device *vdev = ivpu_bo_to_vdev(bo);
88	int ret;	80	int idx, ret;
		81
		82	if (!drm_dev_enter(&vdev->drm, &idx))
		83	return -ENODEV;
89		84
90	mutex_lock(&bo->lock);	85	mutex_lock(&bo->lock);
91		86
@@ -101,6 +96,8 @@ ivpu_bo_alloc_vpu_addr(struct ivpu_bo bo, struct ivpu_mmu_context ctx, · 9 unmodified lines
101		96
102	mutex_unlock(&bo->lock);	97	mutex_unlock(&bo->lock);
103		98
		99	drm_dev_exit(idx);
		100
104	return ret;	101	return ret;
105	}	102	}
106		103
@@ -108,11 +105,7 @@ static void ivpu_bo_unbind_locked(struct ivpu_bo *bo) · 1 unmodified line
108	{	105	{
109	struct ivpu_device *vdev = ivpu_bo_to_vdev(bo);	106	struct ivpu_device *vdev = ivpu_bo_to_vdev(bo);
110		107
111	lockdep_assert_held(&bo->lock);	108	lockdep_assert(lockdep_is_held(&bo->lock) \|\| !kref_read(&bo->base.base.refcount));
112
113	ivpu_dbg_bo(vdev, bo, "unbind");
114
115	/* TODO: dma_unmap */
116		109
117	if (bo->mmu_mapped) {	110	if (bo->mmu_mapped) {
118	drm_WARN_ON(&vdev->drm, !bo->ctx);	111	drm_WARN_ON(&vdev->drm, !bo->ctx);
@@ -124,19 +117,23 @@ static void ivpu_bo_unbind_locked(struct ivpu_bo *bo) · 5 unmodified lines
124		117
125	if (bo->ctx) {	118	if (bo->ctx) {
126	ivpu_mmu_context_remove_node(bo->ctx, &bo->mm_node);	119	ivpu_mmu_context_remove_node(bo->ctx, &bo->mm_node);
127	bo->vpu_addr = 0;
128	bo->ctx = NULL;	120	bo->ctx = NULL;
129	}	121	}
130	}
131		122
132	static void ivpu_bo_unbind(struct ivpu_bo *bo)	123	if (bo->base.base.import_attach)
133	{	124	return;
134	mutex_lock(&bo->lock);	125
135	ivpu_bo_unbind_locked(bo);	126	dma_resv_lock(bo->base.base.resv, NULL);
136	mutex_unlock(&bo->lock);	127	if (bo->base.sgt) {
		128	dma_unmap_sgtable(vdev->drm.dev, bo->base.sgt, DMA_BIDIRECTIONAL, 0);
		129	sg_free_table(bo->base.sgt);
		130	kfree(bo->base.sgt);
		131	bo->base.sgt = NULL;
		132	}
		133	dma_resv_unlock(bo->base.base.resv);
137	}	134	}
138		135
139	void ivpu_bo_remove_all_bos_from_context(struct ivpu_device vdev, struct ivpu_mmu_context ctx)	136	void ivpu_bo_unbind_all_bos_from_context(struct ivpu_device vdev, struct ivpu_mmu_context ctx)
140	{	137	{
141	struct ivpu_bo *bo;	138	struct ivpu_bo *bo;
142		139
@@ -146,8 +143,10 @@ void ivpu_bo_remove_all_bos_from_context(struct ivpu_device *vdev, struct ivpu_m · 3 unmodified lines
146	mutex_lock(&vdev->bo_list_lock);	143	mutex_lock(&vdev->bo_list_lock);
147	list_for_each_entry(bo, &vdev->bo_list, bo_list_node) {	144	list_for_each_entry(bo, &vdev->bo_list, bo_list_node) {
148	mutex_lock(&bo->lock);	145	mutex_lock(&bo->lock);
149	if (bo->ctx == ctx)	146	if (bo->ctx == ctx) {
		147	ivpu_dbg_bo(vdev, bo, "unbind");
150	ivpu_bo_unbind_locked(bo);	148	ivpu_bo_unbind_locked(bo);
		149	}
151	mutex_unlock(&bo->lock);	150	mutex_unlock(&bo->lock);
152	}	151	}
153	mutex_unlock(&vdev->bo_list_lock);	152	mutex_unlock(&vdev->bo_list_lock);
@@ -199,9 +198,6 @@ ivpu_bo_create(struct ivpu_device *vdev, u64 size, u32 flags) · 45 unmodified lines
199	list_add_tail(&bo->bo_list_node, &vdev->bo_list);	198	list_add_tail(&bo->bo_list_node, &vdev->bo_list);
200	mutex_unlock(&vdev->bo_list_lock);	199	mutex_unlock(&vdev->bo_list_lock);
201		200
202	ivpu_dbg(vdev, BO, "create: vpu_addr 0x%llx size %zu flags 0x%x\n",
203	bo->vpu_addr, bo->base.base.size, flags);
204
205	return bo;	201	return bo;
206	}	202	}
207		203
@@ -212,6 +208,12 @@ static int ivpu_bo_open(struct drm_gem_object obj, struct drm_file file) · 4 unmodified lines
212	struct ivpu_bo *bo = to_ivpu_bo(obj);	208	struct ivpu_bo *bo = to_ivpu_bo(obj);
213	struct ivpu_addr_range *range;	209	struct ivpu_addr_range *range;
214		210
		211	if (bo->ctx) {
		212	ivpu_warn(vdev, "Can't add BO to ctx %u: already in ctx %u\n",
		213	file_priv->ctx.id, bo->ctx->id);
		214	return -EALREADY;
		215	}
		216
215	if (bo->flags & DRM_IVPU_BO_SHAVE_MEM)	217	if (bo->flags & DRM_IVPU_BO_SHAVE_MEM)
216	range = &vdev->hw->ranges.shave;	218	range = &vdev->hw->ranges.shave;
217	else if (bo->flags & DRM_IVPU_BO_DMA_MEM)	219	else if (bo->flags & DRM_IVPU_BO_DMA_MEM)
@@ -227,62 +229,24 @@ static void ivpu_bo_free(struct drm_gem_object *obj) · 9 unmodified lines
227	struct ivpu_device *vdev = to_ivpu_device(obj->dev);	229	struct ivpu_device *vdev = to_ivpu_device(obj->dev);
228	struct ivpu_bo *bo = to_ivpu_bo(obj);	230	struct ivpu_bo *bo = to_ivpu_bo(obj);
229		231
		232	ivpu_dbg_bo(vdev, bo, "free");
		233
230	mutex_lock(&vdev->bo_list_lock);	234	mutex_lock(&vdev->bo_list_lock);
231	list_del(&bo->bo_list_node);	235	list_del(&bo->bo_list_node);
232	mutex_unlock(&vdev->bo_list_lock);	236	mutex_unlock(&vdev->bo_list_lock);
233		237
234	drm_WARN_ON(&vdev->drm, !dma_resv_test_signaled(obj->resv, DMA_RESV_USAGE_READ));	238	drm_WARN_ON(&vdev->drm, !dma_resv_test_signaled(obj->resv, DMA_RESV_USAGE_READ));
235		239
236	ivpu_dbg_bo(vdev, bo, "free");	240	ivpu_bo_unbind_locked(bo);
237
238	ivpu_bo_unbind(bo);
239	mutex_destroy(&bo->lock);	241	mutex_destroy(&bo->lock);
240		242
241	drm_WARN_ON(obj->dev, bo->base.pages_use_count > 1);	243	drm_WARN_ON(obj->dev, bo->base.pages_use_count > 1);
242	drm_gem_shmem_free(&bo->base);	244	drm_gem_shmem_free(&bo->base);
243	}	245	}
244		246
245	static const struct dma_buf_ops ivpu_bo_dmabuf_ops = {
246	.cache_sgt_mapping = true,
247	.attach = drm_gem_map_attach,
248	.detach = drm_gem_map_detach,
249	.map_dma_buf = drm_gem_map_dma_buf,
250	.unmap_dma_buf = drm_gem_unmap_dma_buf,
251	.release = drm_gem_dmabuf_release,
252	.mmap = drm_gem_dmabuf_mmap,
253	.vmap = drm_gem_dmabuf_vmap,
254	.vunmap = drm_gem_dmabuf_vunmap,
255	};
256
257	static struct dma_buf ivpu_bo_export(struct drm_gem_object obj, int flags)
258	{
259	struct drm_device *dev = obj->dev;
260	struct dma_buf_export_info exp_info = {
261	.exp_name = KBUILD_MODNAME,
262	.owner = dev->driver->fops->owner,
263	.ops = &ivpu_bo_dmabuf_ops,
264	.size = obj->size,
265	.flags = flags,
266	.priv = obj,
267	.resv = obj->resv,
268	};
269	void *sgt;
270
271	/*
272	* Make sure that pages are allocated and dma-mapped before exporting the bo.
273	* DMA-mapping is required if the bo will be imported to the same device.
274	*/
275	sgt = drm_gem_shmem_get_pages_sgt(to_drm_gem_shmem_obj(obj));
276	if (IS_ERR(sgt))
277	return sgt;
278
279	return drm_gem_dmabuf_export(dev, &exp_info);
280	}
281
282	static const struct drm_gem_object_funcs ivpu_gem_funcs = {	247	static const struct drm_gem_object_funcs ivpu_gem_funcs = {
283	.free = ivpu_bo_free,	248	.free = ivpu_bo_free,
284	.open = ivpu_bo_open,	249	.open = ivpu_bo_open,
285	.export = ivpu_bo_export,
286	.print_info = drm_gem_shmem_object_print_info,	250	.print_info = drm_gem_shmem_object_print_info,
287	.pin = drm_gem_shmem_object_pin,	251	.pin = drm_gem_shmem_object_pin,
288	.unpin = drm_gem_shmem_object_unpin,	252	.unpin = drm_gem_shmem_object_unpin,
@@ -315,11 +279,9 @@ int ivpu_bo_create_ioctl(struct drm_device dev, void data, struct drm_file *fi · 26 unmodified lines
315	return PTR_ERR(bo);	279	return PTR_ERR(bo);
316	}	280	}
317		281
318	ret = drm_gem_handle_create(file, &bo->base.base, &bo->handle);	282	ret = drm_gem_handle_create(file, &bo->base.base, &args->handle);
319	if (!ret) {	283	if (!ret)
320	args->vpu_addr = bo->vpu_addr;	284	args->vpu_addr = bo->vpu_addr;
321	args->handle = bo->handle;
322	}
323		285
324	drm_gem_object_put(&bo->base.base);	286	drm_gem_object_put(&bo->base.base);
325		287
@@ -361,7 +323,9 @@ ivpu_bo_alloc_internal(struct ivpu_device *vdev, u64 vpu_addr, u64 size, u32 fla · 35 unmodified lines
361	if (ret)	323	if (ret)
362	goto err_put;	324	goto err_put;
363		325
		326	dma_resv_lock(bo->base.base.resv, NULL);
364	ret = drm_gem_shmem_vmap(&bo->base, &map);	327	ret = drm_gem_shmem_vmap(&bo->base, &map);
		328	dma_resv_unlock(bo->base.base.resv);
365	if (ret)	329	if (ret)
366	goto err_put;	330	goto err_put;
367		331
@@ -376,7 +340,10 @@ void ivpu_bo_free_internal(struct ivpu_bo *bo) · 8 unmodified lines
376	{	340	{
377	struct iosys_map map = IOSYS_MAP_INIT_VADDR(bo->base.vaddr);	341	struct iosys_map map = IOSYS_MAP_INIT_VADDR(bo->base.vaddr);
378		342
		343	dma_resv_lock(bo->base.base.resv, NULL);
379	drm_gem_shmem_vunmap(&bo->base, &map);	344	drm_gem_shmem_vunmap(&bo->base, &map);
		345	dma_resv_unlock(bo->base.base.resv);
		346
380	drm_gem_object_put(&bo->base.base);	347	drm_gem_object_put(&bo->base.base);
381	}	348	}
382		349
@@ -432,19 +399,11 @@ int ivpu_bo_wait_ioctl(struct drm_device dev, void data, struct drm_file *file · 49 unmodified lines
432		399
433	static void ivpu_bo_print_info(struct ivpu_bo bo, struct drm_printer p)	400	static void ivpu_bo_print_info(struct ivpu_bo bo, struct drm_printer p)
434	{	401	{
435	unsigned long dma_refcount = 0;
436
437	mutex_lock(&bo->lock);	402	mutex_lock(&bo->lock);
438		403
439	if (bo->base.base.dma_buf && bo->base.base.dma_buf->file)	404	drm_printf(p, "%-9p %-3u 0x%-12llx %-10lu 0x%-8x %-4u",
440	dma_refcount = atomic_long_read(&bo->base.base.dma_buf->file->f_count);	405	bo, bo->ctx->id, bo->vpu_addr, bo->base.base.size,
441		406	bo->flags, kref_read(&bo->base.base.refcount));
442	drm_printf(p, "%-3u %-6d 0x%-12llx %-10lu 0x%-8x %-4u %-8lu",
443	bo->ctx->id, bo->handle, bo->vpu_addr, bo->base.base.size,
444	bo->flags, kref_read(&bo->base.base.refcount), dma_refcount);
445
446	if (bo->base.base.import_attach)
447	drm_printf(p, " imported");
448		407
449	if (bo->base.pages)	408	if (bo->base.pages)
450	drm_printf(p, " has_pages");	409	drm_printf(p, " has_pages");
@@ -452,6 +411,9 @@ static void ivpu_bo_print_info(struct ivpu_bo bo, struct drm_printer p) · 1 unmodified line
452	if (bo->mmu_mapped)	411	if (bo->mmu_mapped)
453	drm_printf(p, " mmu_mapped");	412	drm_printf(p, " mmu_mapped");
454		413
		414	if (bo->base.base.import_attach)
		415	drm_printf(p, " imported");
		416
455	drm_printf(p, "\n");	417	drm_printf(p, "\n");
456		418
457	mutex_unlock(&bo->lock);	419	mutex_unlock(&bo->lock);
@@ -462,8 +424,8 @@ void ivpu_bo_list(struct drm_device dev, struct drm_printer p) · 4 unmodified lines
462	struct ivpu_device *vdev = to_ivpu_device(dev);	424	struct ivpu_device *vdev = to_ivpu_device(dev);
463	struct ivpu_bo *bo;	425	struct ivpu_bo *bo;
464		426
465	drm_printf(p, "%-3s %-6s %-14s %-10s %-10s %-4s %-8s %s\n",	427	drm_printf(p, "%-9s %-3s %-14s %-10s %-10s %-4s %s\n",
466	"ctx", "handle", "vpu_addr", "size", "flags", "refs", "dma_refs", "attribs");	428	"bo", "ctx", "vpu_addr", "size", "flags", "refs", "attribs");
467		429
468	mutex_lock(&vdev->bo_list_lock);	430	mutex_lock(&vdev->bo_list_lock);
469	list_for_each_entry(bo, &vdev->bo_list, bo_list_node)	431	list_for_each_entry(bo, &vdev->bo_list, bo_list_node)

drivers/accel/ivpu/ivpu_gem.h+1−2

 	struct mutex lock; /* Protects: ctx, mmu_mapped, vpu_addr */
 	u64 vpu_addr;
-	u32 handle;
 	u32 flags;
 	u32 job_status; /* Valid only for command buffer */
 	bool mmu_mapped;
 };
 int ivpu_bo_pin(struct ivpu_bo *bo);
-void ivpu_bo_remove_all_bos_from_context(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx);
+void ivpu_bo_unbind_all_bos_from_context(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx);
 struct drm_gem_object *ivpu_gem_create_object(struct drm_device *dev, size_t size);
 struct ivpu_bo *ivpu_bo_alloc_internal(struct ivpu_device *vdev, u64 vpu_addr, u64 size, u32 flags);

drivers/accel/ivpu/ivpu_hw_37xx.c+4−10

 static void ivpu_hw_37xx_irq_wdt_nce_handler(struct ivpu_device *vdev)
 {
-	ivpu_err_ratelimited(vdev, "WDT NCE irq\n");
+	ivpu_pm_trigger_recovery(vdev, "WDT NCE IRQ");
-	ivpu_pm_schedule_recovery(vdev);
 }
 static void ivpu_hw_37xx_irq_wdt_mss_handler(struct ivpu_device *vdev)
 {
-	ivpu_err_ratelimited(vdev, "WDT MSS irq\n");
 	ivpu_hw_wdt_disable(vdev);
-	ivpu_pm_schedule_recovery(vdev);
+	ivpu_pm_trigger_recovery(vdev, "WDT MSS IRQ");
 }
 static void ivpu_hw_37xx_irq_noc_firewall_handler(struct ivpu_device *vdev)
 {
-	ivpu_err_ratelimited(vdev, "NOC Firewall irq\n");
+	ivpu_pm_trigger_recovery(vdev, "NOC Firewall IRQ");
-	ivpu_pm_schedule_recovery(vdev);
 }
 /* Handler for IRQs from VPU core (irqV) */
 		REGB_WR32(VPU_37XX_BUTTRESS_INTERRUPT_STAT, status);
 	if (schedule_recovery)
-		ivpu_pm_schedule_recovery(vdev);
+		ivpu_pm_trigger_recovery(vdev, "Buttress IRQ");
 	return true;
 }

drivers/accel/ivpu/ivpu_hw_40xx.c+23−6

 	return 0;
 }
-static int ivpu_hw_40xx_reset(struct ivpu_device *vdev)
+static int ivpu_hw_40xx_ip_reset(struct ivpu_device *vdev)
 {
 	int ret;
 	u32 val;
 	return ret;
 }
+static int ivpu_hw_40xx_reset(struct ivpu_device *vdev)
+{
+	int ret = 0;
+	if (ivpu_hw_40xx_ip_reset(vdev)) {
+		ivpu_err(vdev, "Failed to reset VPU IP\n");
+		ret = -EIO;
+	}
+	if (ivpu_pll_disable(vdev)) {
+		ivpu_err(vdev, "Failed to disable PLL\n");
+		ret = -EIO;
+	}
+	return ret;
+}
 static int ivpu_hw_40xx_d0i3_enable(struct ivpu_device *vdev)
 {
 	int ret;
 	ivpu_hw_40xx_save_d0i3_entry_timestamp(vdev);
-	if (!ivpu_hw_40xx_is_idle(vdev) && ivpu_hw_40xx_reset(vdev))
+	if (!ivpu_hw_40xx_is_idle(vdev) && ivpu_hw_40xx_ip_reset(vdev))
 		ivpu_warn(vdev, "Failed to reset the VPU\n");
 	if (ivpu_pll_disable(vdev)) {
 static void ivpu_hw_40xx_irq_wdt_nce_handler(struct ivpu_device *vdev)
 {
 	/* TODO: For LNN hang consider engine reset instead of full recovery */
-	ivpu_pm_schedule_recovery(vdev);
+	ivpu_pm_trigger_recovery(vdev, "WDT NCE IRQ");
 }
 static void ivpu_hw_40xx_irq_wdt_mss_handler(struct ivpu_device *vdev)
 {
 	ivpu_hw_wdt_disable(vdev);
-	ivpu_pm_schedule_recovery(vdev);
+	ivpu_pm_trigger_recovery(vdev, "WDT MSS IRQ");
 }
 static void ivpu_hw_40xx_irq_noc_firewall_handler(struct ivpu_device *vdev)
 {
-	ivpu_pm_schedule_recovery(vdev);
+	ivpu_pm_trigger_recovery(vdev, "NOC Firewall IRQ");
 }
 /* Handler for IRQs from VPU core (irqV) */
 	REGB_WR32(VPU_40XX_BUTTRESS_INTERRUPT_STAT, status);
 	if (schedule_recovery)
-		ivpu_pm_schedule_recovery(vdev);
+		ivpu_pm_trigger_recovery(vdev, "Buttress IRQ");
 	return true;
 }

drivers/accel/ivpu/ivpu_ipc.c+2−4

 	hb_ret = ivpu_ipc_send_receive_internal(vdev, &hb_req, VPU_JSM_MSG_QUERY_ENGINE_HB_DONE,
 						&hb_resp, VPU_IPC_CHAN_ASYNC_CMD,
 						vdev->timeout.jsm);
-	if (hb_ret == -ETIMEDOUT) {
+	if (hb_ret == -ETIMEDOUT)
-		ivpu_hw_diagnose_failure(vdev);
+		ivpu_pm_trigger_recovery(vdev, "IPC timeout");
-		ivpu_pm_schedule_recovery(vdev);
-	}
 	return ret;
 }

drivers/accel/ivpu/ivpu_job.c+73−87

@@ -112,22 +112,20 @@ static void ivpu_cmdq_release_locked(struct ivpu_file_priv *file_priv, u16 engin · 111 unmodified lines
112	}	112	}
113	}	113	}
114		114
115	void ivpu_cmdq_release_all(struct ivpu_file_priv *file_priv)	115	void ivpu_cmdq_release_all_locked(struct ivpu_file_priv *file_priv)
116	{	116	{
117	int i;	117	int i;
118		118
119	mutex_lock(&file_priv->lock);	119	lockdep_assert_held(&file_priv->lock);
120		120
121	for (i = 0; i < IVPU_NUM_ENGINES; i++)	121	for (i = 0; i < IVPU_NUM_ENGINES; i++)
122	ivpu_cmdq_release_locked(file_priv, i);	122	ivpu_cmdq_release_locked(file_priv, i);
123
124	mutex_unlock(&file_priv->lock);
125	}	123	}
126		124
127	/*	125	/*
128	* Mark the doorbell as unregistered and reset job queue pointers.	126	* Mark the doorbell as unregistered and reset job queue pointers.
129	* This function needs to be called when the VPU hardware is restarted	127	* This function needs to be called when the VPU hardware is restarted
130	* and FW looses job queue state. The next time job queue is used it	128	* and FW loses job queue state. The next time job queue is used it
131	* will be registered again.	129	* will be registered again.
132	*/	130	*/
133	static void ivpu_cmdq_reset_locked(struct ivpu_file_priv *file_priv, u16 engine)	131	static void ivpu_cmdq_reset_locked(struct ivpu_file_priv *file_priv, u16 engine)
@@ -161,15 +159,13 @@ void ivpu_cmdq_reset_all_contexts(struct ivpu_device *vdev) · 27 unmodified lines
161	struct ivpu_file_priv *file_priv;	159	struct ivpu_file_priv *file_priv;
162	unsigned long ctx_id;	160	unsigned long ctx_id;
163		161
164	xa_for_each(&vdev->context_xa, ctx_id, file_priv) {	162	mutex_lock(&vdev->context_list_lock);
165	file_priv = ivpu_file_priv_get_by_ctx_id(vdev, ctx_id);
166	if (!file_priv)
167	continue;
168		163
		164	xa_for_each(&vdev->context_xa, ctx_id, file_priv)
169	ivpu_cmdq_reset_all(file_priv);	165	ivpu_cmdq_reset_all(file_priv);
170		166
171	ivpu_file_priv_put(&file_priv);	167	mutex_unlock(&vdev->context_list_lock);
172	}	168
173	}	169	}
174		170
175	static int ivpu_cmdq_push_job(struct ivpu_cmdq cmdq, struct ivpu_job job)	171	static int ivpu_cmdq_push_job(struct ivpu_cmdq cmdq, struct ivpu_job job)
@@ -243,60 +239,32 @@ static struct dma_fence ivpu_fence_create(struct ivpu_device vdev) · 67 unmodified lines
243	return &fence->base;	239	return &fence->base;
244	}	240	}
245		241
246	static void job_get(struct ivpu_job job, struct ivpu_job *link)	242	static void ivpu_job_destroy(struct ivpu_job *job)
247	{	243	{
248	struct ivpu_device *vdev = job->vdev;	244	struct ivpu_device *vdev = job->vdev;
249
250	kref_get(&job->ref);
251	*link = job;
252
253	ivpu_dbg(vdev, KREF, "Job get: id %u refcount %u\n", job->job_id, kref_read(&job->ref));
254	}
255
256	static void job_release(struct kref *ref)
257	{
258	struct ivpu_job *job = container_of(ref, struct ivpu_job, ref);
259	struct ivpu_device *vdev = job->vdev;
260	u32 i;	245	u32 i;
261		246
		247	ivpu_dbg(vdev, JOB, "Job destroyed: id %3u ctx %2d engine %d",
		248	job->job_id, job->file_priv->ctx.id, job->engine_idx);
		249
262	for (i = 0; i < job->bo_count; i++)	250	for (i = 0; i < job->bo_count; i++)
263	if (job->bos[i])	251	if (job->bos[i])
264	drm_gem_object_put(&job->bos[i]->base.base);	252	drm_gem_object_put(&job->bos[i]->base.base);
265		253
266	dma_fence_put(job->done_fence);	254	dma_fence_put(job->done_fence);
267	ivpu_file_priv_put(&job->file_priv);	255	ivpu_file_priv_put(&job->file_priv);
268
269	ivpu_dbg(vdev, KREF, "Job released: id %u\n", job->job_id);
270	kfree(job);	256	kfree(job);
271
272	/* Allow the VPU to get suspended, must be called after ivpu_file_priv_put() */
273	ivpu_rpm_put(vdev);
274	}
275
276	static void job_put(struct ivpu_job *job)
277	{
278	struct ivpu_device *vdev = job->vdev;
279
280	ivpu_dbg(vdev, KREF, "Job put: id %u refcount %u\n", job->job_id, kref_read(&job->ref));
281	kref_put(&job->ref, job_release);
282	}	257	}
283		258
284	static struct ivpu_job *	259	static struct ivpu_job *
285	ivpu_create_job(struct ivpu_file_priv *file_priv, u32 engine_idx, u32 bo_count)	260	ivpu_job_create(struct ivpu_file_priv *file_priv, u32 engine_idx, u32 bo_count)
286	{	261	{
287	struct ivpu_device *vdev = file_priv->vdev;	262	struct ivpu_device *vdev = file_priv->vdev;
288	struct ivpu_job *job;	263	struct ivpu_job *job;
289	int ret;
290
291	ret = ivpu_rpm_get(vdev);
292	if (ret < 0)
293	return NULL;
294		264
295	job = kzalloc(struct_size(job, bos, bo_count), GFP_KERNEL);	265	job = kzalloc(struct_size(job, bos, bo_count), GFP_KERNEL);
296	if (!job)	266	if (!job)
297	goto err_rpm_put;	267	return NULL;
298
299	kref_init(&job->ref);
300		268
301	job->vdev = vdev;	269	job->vdev = vdev;
302	job->engine_idx = engine_idx;	270	job->engine_idx = engine_idx;
@@ -310,17 +278,14 @@ ivpu_create_job(struct ivpu_file_priv *file_priv, u32 engine_idx, u32 bo_count) · 7 unmodified lines
310	job->file_priv = ivpu_file_priv_get(file_priv);	278	job->file_priv = ivpu_file_priv_get(file_priv);
311		279
312	ivpu_dbg(vdev, JOB, "Job created: ctx %2d engine %d", file_priv->ctx.id, job->engine_idx);	280	ivpu_dbg(vdev, JOB, "Job created: ctx %2d engine %d", file_priv->ctx.id, job->engine_idx);
313
314	return job;	281	return job;
315		282
316	err_free_job:	283	err_free_job:
317	kfree(job);	284	kfree(job);
318	err_rpm_put:
319	ivpu_rpm_put(vdev);
320	return NULL;	285	return NULL;
321	}	286	}
322		287
323	static int ivpu_job_done(struct ivpu_device *vdev, u32 job_id, u32 job_status)	288	static int ivpu_job_signal_and_destroy(struct ivpu_device *vdev, u32 job_id, u32 job_status)
324	{	289	{
325	struct ivpu_job *job;	290	struct ivpu_job *job;
326		291
@@ -337,9 +302,10 @@ static int ivpu_job_done(struct ivpu_device *vdev, u32 job_id, u32 job_status) · 10 unmodified lines
337	ivpu_dbg(vdev, JOB, "Job complete: id %3u ctx %2d engine %d status 0x%x\n",	302	ivpu_dbg(vdev, JOB, "Job complete: id %3u ctx %2d engine %d status 0x%x\n",
338	job->job_id, job->file_priv->ctx.id, job->engine_idx, job_status);	303	job->job_id, job->file_priv->ctx.id, job->engine_idx, job_status);
339		304
		305	ivpu_job_destroy(job);
340	ivpu_stop_job_timeout_detection(vdev);	306	ivpu_stop_job_timeout_detection(vdev);
341		307
342	job_put(job);	308	ivpu_rpm_put(vdev);
343	return 0;	309	return 0;
344	}	310	}
345		311
@@ -349,10 +315,10 @@ void ivpu_jobs_abort_all(struct ivpu_device *vdev) · 3 unmodified lines
349	unsigned long id;	315	unsigned long id;
350		316
351	xa_for_each(&vdev->submitted_jobs_xa, id, job)	317	xa_for_each(&vdev->submitted_jobs_xa, id, job)
352	ivpu_job_done(vdev, id, VPU_JSM_STATUS_ABORTED);	318	ivpu_job_signal_and_destroy(vdev, id, VPU_JSM_STATUS_ABORTED);
353	}	319	}
354		320
355	static int ivpu_direct_job_submission(struct ivpu_job *job)	321	static int ivpu_job_submit(struct ivpu_job *job)
356	{	322	{
357	struct ivpu_file_priv *file_priv = job->file_priv;	323	struct ivpu_file_priv *file_priv = job->file_priv;
358	struct ivpu_device *vdev = job->vdev;	324	struct ivpu_device *vdev = job->vdev;
@@ -360,53 +326,65 @@ static int ivpu_direct_job_submission(struct ivpu_job *job) · 1 unmodified line
360	struct ivpu_cmdq *cmdq;	326	struct ivpu_cmdq *cmdq;
361	int ret;	327	int ret;
362		328
		329	ret = ivpu_rpm_get(vdev);
		330	if (ret < 0)
		331	return ret;
		332
363	mutex_lock(&file_priv->lock);	333	mutex_lock(&file_priv->lock);
364		334
365	cmdq = ivpu_cmdq_acquire(job->file_priv, job->engine_idx);	335	cmdq = ivpu_cmdq_acquire(job->file_priv, job->engine_idx);
366	if (!cmdq) {	336	if (!cmdq) {
367	ivpu_warn(vdev, "Failed get job queue, ctx %d engine %d\n",	337	ivpu_warn_ratelimited(vdev, "Failed get job queue, ctx %d engine %d\n",
368	file_priv->ctx.id, job->engine_idx);	338	file_priv->ctx.id, job->engine_idx);
369	ret = -EINVAL;	339	ret = -EINVAL;
370	goto err_unlock;	340	goto err_unlock_file_priv;
371	}	341	}
372		342
373	job_id_range.min = FIELD_PREP(JOB_ID_CONTEXT_MASK, (file_priv->ctx.id - 1));	343	job_id_range.min = FIELD_PREP(JOB_ID_CONTEXT_MASK, (file_priv->ctx.id - 1));
374	job_id_range.max = job_id_range.min \| JOB_ID_JOB_MASK;	344	job_id_range.max = job_id_range.min \| JOB_ID_JOB_MASK;
375		345
376	job_get(job, &job);	346	xa_lock(&vdev->submitted_jobs_xa);
377	ret = xa_alloc(&vdev->submitted_jobs_xa, &job->job_id, job, job_id_range, GFP_KERNEL);	347	ret = __xa_alloc(&vdev->submitted_jobs_xa, &job->job_id, job, job_id_range, GFP_KERNEL);
378	if (ret) {	348	if (ret) {
379	ivpu_warn_ratelimited(vdev, "Failed to allocate job id: %d\n", ret);	349	ivpu_dbg(vdev, JOB, "Too many active jobs in ctx %d\n",
380	goto err_job_put;	350	file_priv->ctx.id);
		351	ret = -EBUSY;
		352	goto err_unlock_submitted_jobs_xa;
381	}	353	}
382		354
383	ret = ivpu_cmdq_push_job(cmdq, job);	355	ret = ivpu_cmdq_push_job(cmdq, job);
384	if (ret)	356	if (ret)
385	goto err_xa_erase;	357	goto err_erase_xa;
386		358
387	ivpu_start_job_timeout_detection(vdev);	359	ivpu_start_job_timeout_detection(vdev);
388		360
389	ivpu_dbg(vdev, JOB, "Job submitted: id %3u addr 0x%llx ctx %2d engine %d next %d\n",	361	if (unlikely(ivpu_test_mode & IVPU_TEST_MODE_NULL_HW)) {
390	job->job_id, job->cmd_buf_vpu_addr, file_priv->ctx.id,
391	job->engine_idx, cmdq->jobq->header.tail);
392
393	if (ivpu_test_mode & IVPU_TEST_MODE_NULL_HW) {
394	ivpu_job_done(vdev, job->job_id, VPU_JSM_STATUS_SUCCESS);
395	cmdq->jobq->header.head = cmdq->jobq->header.tail;	362	cmdq->jobq->header.head = cmdq->jobq->header.tail;
396	wmb(); /* Flush WC buffer for jobq header */	363	wmb(); /* Flush WC buffer for jobq header */
397	} else {	364	} else {
398	ivpu_cmdq_ring_db(vdev, cmdq);	365	ivpu_cmdq_ring_db(vdev, cmdq);
399	}	366	}
400		367
		368	ivpu_dbg(vdev, JOB, "Job submitted: id %3u ctx %2d engine %d addr 0x%llx next %d\n",
		369	job->job_id, file_priv->ctx.id, job->engine_idx,
		370	job->cmd_buf_vpu_addr, cmdq->jobq->header.tail);
		371
		372	xa_unlock(&vdev->submitted_jobs_xa);
		373
401	mutex_unlock(&file_priv->lock);	374	mutex_unlock(&file_priv->lock);
		375
		376	if (unlikely(ivpu_test_mode & IVPU_TEST_MODE_NULL_HW))
		377	ivpu_job_signal_and_destroy(vdev, job->job_id, VPU_JSM_STATUS_SUCCESS);
		378
402	return 0;	379	return 0;
403		380
404	err_xa_erase:	381	err_erase_xa:
405	xa_erase(&vdev->submitted_jobs_xa, job->job_id);	382	__xa_erase(&vdev->submitted_jobs_xa, job->job_id);
406	err_job_put:	383	err_unlock_submitted_jobs_xa:
407	job_put(job);	384	xa_unlock(&vdev->submitted_jobs_xa);
408	err_unlock:	385	err_unlock_file_priv:
409	mutex_unlock(&file_priv->lock);	386	mutex_unlock(&file_priv->lock);
		387	ivpu_rpm_put(vdev);
410	return ret;	388	return ret;
411	}	389	}
412		390
@@ -488,6 +466,9 @@ int ivpu_submit_ioctl(struct drm_device dev, void data, struct drm_file *file) · 75 unmodified lines
488	if (params->engine > DRM_IVPU_ENGINE_COPY)	466	if (params->engine > DRM_IVPU_ENGINE_COPY)
489	return -EINVAL;	467	return -EINVAL;
490		468
		469	if (params->priority > DRM_IVPU_JOB_PRIORITY_REALTIME)
		470	return -EINVAL;
		471
491	if (params->buffer_count == 0 \|\| params->buffer_count > JOB_MAX_BUFFER_COUNT)	472	if (params->buffer_count == 0 \|\| params->buffer_count > JOB_MAX_BUFFER_COUNT)
492	return -EINVAL;	473	return -EINVAL;
493		474
@@ -509,44 +490,49 @@ int ivpu_submit_ioctl(struct drm_device dev, void data, struct drm_file *file) · 15 unmodified lines
509	params->buffer_count * sizeof(u32));	490	params->buffer_count * sizeof(u32));
510	if (ret) {	491	if (ret) {
511	ret = -EFAULT;	492	ret = -EFAULT;
512	goto free_handles;	493	goto err_free_handles;
513	}	494	}
514		495
515	if (!drm_dev_enter(&vdev->drm, &idx)) {	496	if (!drm_dev_enter(&vdev->drm, &idx)) {
516	ret = -ENODEV;	497	ret = -ENODEV;
517	goto free_handles;	498	goto err_free_handles;
518	}	499	}
519		500
520	ivpu_dbg(vdev, JOB, "Submit ioctl: ctx %u buf_count %u\n",	501	ivpu_dbg(vdev, JOB, "Submit ioctl: ctx %u buf_count %u\n",
521	file_priv->ctx.id, params->buffer_count);	502	file_priv->ctx.id, params->buffer_count);
522		503
523	job = ivpu_create_job(file_priv, params->engine, params->buffer_count);	504	job = ivpu_job_create(file_priv, params->engine, params->buffer_count);
524	if (!job) {	505	if (!job) {
525	ivpu_err(vdev, "Failed to create job\n");	506	ivpu_err(vdev, "Failed to create job\n");
526	ret = -ENOMEM;	507	ret = -ENOMEM;
527	goto dev_exit;	508	goto err_exit_dev;
528	}	509	}
529		510
530	ret = ivpu_job_prepare_bos_for_submit(file, job, buf_handles, params->buffer_count,	511	ret = ivpu_job_prepare_bos_for_submit(file, job, buf_handles, params->buffer_count,
531	params->commands_offset);	512	params->commands_offset);
532	if (ret) {	513	if (ret) {
533	ivpu_err(vdev, "Failed to prepare job, ret %d\n", ret);	514	ivpu_err(vdev, "Failed to prepare job: %d\n", ret);
534	goto job_put;	515	goto err_destroy_job;
535	}	516	}
536		517
537	ret = ivpu_direct_job_submission(job);	518	down_read(&vdev->pm->reset_lock);
538	if (ret) {	519	ret = ivpu_job_submit(job);
539	dma_fence_signal(job->done_fence);	520	up_read(&vdev->pm->reset_lock);
540	ivpu_err(vdev, "Failed to submit job to the HW, ret %d\n", ret);	521	if (ret)
541	}	522	goto err_signal_fence;
542		523
543	job_put:
544	job_put(job);
545	dev_exit:
546	drm_dev_exit(idx);	524	drm_dev_exit(idx);
547	free_handles:
548	kfree(buf_handles);	525	kfree(buf_handles);
		526	return ret;
549		527
		528	err_signal_fence:
		529	dma_fence_signal(job->done_fence);
		530	err_destroy_job:
		531	ivpu_job_destroy(job);
		532	err_exit_dev:
		533	drm_dev_exit(idx);
		534	err_free_handles:
		535	kfree(buf_handles);
550	return ret;	536	return ret;
551	}	537	}
552		538
@@ -568,7 +554,7 @@ ivpu_job_done_callback(struct ivpu_device vdev, struct ivpu_ipc_hdr ipc_hdr, · 15 unmodified lines
568	}	554	}
569		555
570	payload = (struct vpu_ipc_msg_payload_job_done *)&jsm_msg->payload;	556	payload = (struct vpu_ipc_msg_payload_job_done *)&jsm_msg->payload;
571	ret = ivpu_job_done(vdev, payload->job_id, payload->job_status);	557	ret = ivpu_job_signal_and_destroy(vdev, payload->job_id, payload->job_status);
572	if (!ret && !xa_empty(&vdev->submitted_jobs_xa))	558	if (!ret && !xa_empty(&vdev->submitted_jobs_xa))
573	ivpu_start_job_timeout_detection(vdev);	559	ivpu_start_job_timeout_detection(vdev);
574	}	560	}

drivers/accel/ivpu/ivpu_job.h+1−2

 			  will update the job status
  */
 struct ivpu_job {
-	struct kref ref;
 	struct ivpu_device *vdev;
 	struct ivpu_file_priv *file_priv;
 	struct dma_fence *done_fence;
 int ivpu_submit_ioctl(struct drm_device *dev, void *data, struct drm_file *file);
-void ivpu_cmdq_release_all(struct ivpu_file_priv *file_priv);
+void ivpu_cmdq_release_all_locked(struct ivpu_file_priv *file_priv);
 void ivpu_cmdq_reset_all_contexts(struct ivpu_device *vdev);
 void ivpu_job_done_consumer_init(struct ivpu_device *vdev);

drivers/accel/ivpu/ivpu_mmu.c+15−7

 #include <linux/highmem.h>
 #include "ivpu_drv.h"
+#include "ivpu_hw.h"
 #include "ivpu_hw_reg_io.h"
 #include "ivpu_mmu.h"
 #include "ivpu_mmu_context.h"
 		ivpu_err(vdev, "Timed out waiting for MMU consumer: %d, error: %s\n", ret,
 			 ivpu_mmu_cmdq_err_to_str(err));
+		ivpu_hw_diagnose_failure(vdev);
 	}
 	return ret;
 void ivpu_mmu_irq_evtq_handler(struct ivpu_device *vdev)
 {
-	bool schedule_recovery = false;
 	u32 *event;
 	u32 ssid;
 		ivpu_mmu_dump_event(vdev, event);
 		ssid = FIELD_GET(IVPU_MMU_EVT_SSID_MASK, event[0]);
-		if (ssid == IVPU_GLOBAL_CONTEXT_MMU_SSID)
+		if (ssid == IVPU_GLOBAL_CONTEXT_MMU_SSID) {
-			schedule_recovery = true;
+			ivpu_pm_trigger_recovery(vdev, "MMU event");
-		else
+			return;
-			ivpu_mmu_user_context_mark_invalid(vdev, ssid);
+		}
+		ivpu_mmu_user_context_mark_invalid(vdev, ssid);
 	}
+}
-	if (schedule_recovery)
+void ivpu_mmu_evtq_dump(struct ivpu_device *vdev)
-		ivpu_pm_schedule_recovery(vdev);
+{
+	u32 *event;
+	while ((event = ivpu_mmu_get_event(vdev)) != NULL)
+		ivpu_mmu_dump_event(vdev, event);
 }
 void ivpu_mmu_irq_gerr_handler(struct ivpu_device *vdev)

drivers/accel/ivpu/ivpu_mmu.h+1−0

@@ -46,5 +46,6 @@ int ivpu_mmu_invalidate_tlb(struct ivpu_device *vdev, u16 ssid); · 45 unmodified lines
46		46
47	void ivpu_mmu_irq_evtq_handler(struct ivpu_device *vdev);	47	void ivpu_mmu_irq_evtq_handler(struct ivpu_device *vdev);
48	void ivpu_mmu_irq_gerr_handler(struct ivpu_device *vdev);	48	void ivpu_mmu_irq_gerr_handler(struct ivpu_device *vdev);
		49	void ivpu_mmu_evtq_dump(struct ivpu_device *vdev);
49		50
50	#endif /* __IVPU_MMU_H__ */	51	#endif /* __IVPU_MMU_H__ */

drivers/accel/ivpu/ivpu_mmu_context.c+9−0

 		dma_addr_t dma_addr = sg_dma_address(sg) - sg->offset;
 		size_t size = sg_dma_len(sg) + sg->offset;
+		ivpu_dbg(vdev, MMU_MAP, "Map ctx: %u dma_addr: 0x%llx vpu_addr: 0x%llx size: %lu\n",
+			 ctx->id, dma_addr, vpu_addr, size);
 		ret = ivpu_mmu_context_map_pages(vdev, ctx, vpu_addr, dma_addr, size, prot);
 		if (ret) {
 			ivpu_err(vdev, "Failed to map context pages\n");
 	/* Ensure page table modifications are flushed from wc buffers to memory */
 	wmb();
 	mutex_unlock(&ctx->lock);
 	ret = ivpu_mmu_invalidate_tlb(vdev, ctx->id);
 	mutex_lock(&ctx->lock);
 	for_each_sgtable_dma_sg(sgt, sg, i) {
+		dma_addr_t dma_addr = sg_dma_address(sg) - sg->offset;
 		size_t size = sg_dma_len(sg) + sg->offset;
+		ivpu_dbg(vdev, MMU_MAP, "Unmap ctx: %u dma_addr: 0x%llx vpu_addr: 0x%llx size: %lu\n",
+			 ctx->id, dma_addr, vpu_addr, size);
 		ivpu_mmu_context_unmap_pages(ctx, vpu_addr, size);
 		vpu_addr += size;
 	}
 	/* Ensure page table modifications are flushed from wc buffers to memory */
 	wmb();
 	mutex_unlock(&ctx->lock);
 	ret = ivpu_mmu_invalidate_tlb(vdev, ctx->id);

drivers/accel/ivpu/ivpu_pm.c+35−17

 #include "ivpu_drv.h"
 #include "ivpu_hw.h"
 #include "ivpu_fw.h"
+#include "ivpu_fw_log.h"
 #include "ivpu_ipc.h"
 #include "ivpu_job.h"
 #include "ivpu_jsm_msg.h"
 	char *evt[2] = {"IVPU_PM_EVENT=IVPU_RECOVER", NULL};
 	int ret;
+	ivpu_err(vdev, "Recovering the VPU (reset #%d)\n", atomic_read(&vdev->pm->reset_counter));
+	ret = pm_runtime_resume_and_get(vdev->drm.dev);
+	if (ret)
+		ivpu_err(vdev, "Failed to resume VPU: %d\n", ret);
+	ivpu_fw_log_dump(vdev);
 retry:
 	ret = pci_try_reset_function(to_pci_dev(vdev->drm.dev));
 	if (ret == -EAGAIN && !drm_dev_is_unplugged(&vdev->drm)) {
 		ivpu_err(vdev, "Failed to reset VPU: %d\n", ret);
 	kobject_uevent_env(&vdev->drm.dev->kobj, KOBJ_CHANGE, evt);
+	pm_runtime_mark_last_busy(vdev->drm.dev);
+	pm_runtime_put_autosuspend(vdev->drm.dev);
 }
-void ivpu_pm_schedule_recovery(struct ivpu_device *vdev)
+void ivpu_pm_trigger_recovery(struct ivpu_device *vdev, const char *reason)
 {
-	struct ivpu_pm_info *pm = vdev->pm;
+	ivpu_err(vdev, "Recovery triggered by %s\n", reason);
 	if (ivpu_disable_recovery) {
 		ivpu_err(vdev, "Recovery not available when disable_recovery param is set\n");
 		return;
 	}
-	/* Schedule recovery if it's not in progress */
+	/* Trigger recovery if it's not in progress */
-	if (atomic_cmpxchg(&pm->in_reset, 0, 1) == 0) {
+	if (atomic_cmpxchg(&vdev->pm->reset_pending, 0, 1) == 0) {
-		ivpu_hw_irq_disable(vdev);
+		ivpu_hw_diagnose_failure(vdev);
-		queue_work(system_long_wq, &pm->recovery_work);
+		ivpu_hw_irq_disable(vdev); /* Disable IRQ early to protect from IRQ storm */
+		queue_work(system_long_wq, &vdev->pm->recovery_work);
 	}
 }
 {
 	struct ivpu_pm_info *pm = container_of(work, struct ivpu_pm_info, job_timeout_work.work);
 	struct ivpu_device *vdev = pm->vdev;
-	unsigned long timeout_ms = ivpu_tdr_timeout_ms ? ivpu_tdr_timeout_ms : vdev->timeout.tdr;
-	ivpu_err(vdev, "TDR detected, timeout %lu ms", timeout_ms);
+	ivpu_pm_trigger_recovery(vdev, "TDR");
-	ivpu_hw_diagnose_failure(vdev);
-	ivpu_pm_schedule_recovery(vdev);
 }
 void ivpu_start_job_timeout_detection(struct ivpu_device *vdev)
 	bool hw_is_idle = true;
 	int ret;
+	drm_WARN_ON(&vdev->drm, !xa_empty(&vdev->submitted_jobs_xa));
+	drm_WARN_ON(&vdev->drm, work_pending(&vdev->pm->recovery_work));
 	ivpu_dbg(vdev, PM, "Runtime suspend..\n");
 	if (!ivpu_hw_is_idle(vdev) && vdev->pm->suspend_reschedule_counter) {
 		ivpu_err(vdev, "Failed to set suspend VPU: %d\n", ret);
 	if (!hw_is_idle) {
-		ivpu_warn(vdev, "VPU failed to enter idle, force suspended.\n");
+		ivpu_err(vdev, "VPU failed to enter idle, force suspended.\n");
+		ivpu_fw_log_dump(vdev);
 		ivpu_pm_prepare_cold_boot(vdev);
 	} else {
 		ivpu_pm_prepare_warm_boot(vdev);
 {
 	struct ivpu_device *vdev = pci_get_drvdata(pdev);
-	pm_runtime_get_sync(vdev->drm.dev);
 	ivpu_dbg(vdev, PM, "Pre-reset..\n");
 	atomic_inc(&vdev->pm->reset_counter);
-	atomic_set(&vdev->pm->in_reset, 1);
+	atomic_set(&vdev->pm->reset_pending, 1);
+	pm_runtime_get_sync(vdev->drm.dev);
+	down_write(&vdev->pm->reset_lock);
 	ivpu_prepare_for_reset(vdev);
 	ivpu_hw_reset(vdev);
 	ivpu_pm_prepare_cold_boot(vdev);
 	ret = ivpu_resume(vdev);
 	if (ret)
 		ivpu_err(vdev, "Failed to set RESUME state: %d\n", ret);
-	atomic_set(&vdev->pm->in_reset, 0);
+	up_write(&vdev->pm->reset_lock);
+	atomic_set(&vdev->pm->reset_pending, 0);
 	ivpu_dbg(vdev, PM, "Post-reset done.\n");
+	pm_runtime_mark_last_busy(vdev->drm.dev);
 	pm_runtime_put_autosuspend(vdev->drm.dev);
 }
 	pm->vdev = vdev;
 	pm->suspend_reschedule_counter = PM_RESCHEDULE_LIMIT;
-	atomic_set(&pm->in_reset, 0);
+	init_rwsem(&pm->reset_lock);
+	atomic_set(&pm->reset_pending, 0);
+	atomic_set(&pm->reset_counter, 0);
 	INIT_WORK(&pm->recovery_work, ivpu_pm_recovery_work);
 	INIT_DELAYED_WORK(&pm->job_timeout_work, ivpu_job_timeout_work);

drivers/accel/ivpu/ivpu_pm.h+4−2

 #ifndef __IVPU_PM_H__
 #define __IVPU_PM_H__
+#include <linux/rwsem.h>
 #include <linux/types.h>
 struct ivpu_device;
 	struct ivpu_device *vdev;
 	struct delayed_work job_timeout_work;
 	struct work_struct recovery_work;
-	atomic_t in_reset;
+	struct rw_semaphore reset_lock;
 	atomic_t reset_counter;
+	atomic_t reset_pending;
 	bool is_warmboot;
 	u32 suspend_reschedule_counter;
 };
 int __must_check ivpu_rpm_get_if_active(struct ivpu_device *vdev);
 void ivpu_rpm_put(struct ivpu_device *vdev);
-void ivpu_pm_schedule_recovery(struct ivpu_device *vdev);
+void ivpu_pm_trigger_recovery(struct ivpu_device *vdev, const char *reason);
 void ivpu_start_job_timeout_detection(struct ivpu_device *vdev);
 void ivpu_stop_job_timeout_detection(struct ivpu_device *vdev);

drivers/ata/ahci.c+28−6

 enum board_ids {
 	/* board IDs by feature in alphabetical order */
 	board_ahci,
+	board_ahci_43bit_dma,
 	board_ahci_ign_iferr,
 	board_ahci_low_power,
 	board_ahci_no_debounce_delay,
 		.udma_mask	= ATA_UDMA6,
 		.port_ops	= &ahci_ops,
 	},
+	[board_ahci_43bit_dma] = {
+		AHCI_HFLAGS	(AHCI_HFLAG_43BIT_ONLY),
+		.flags		= AHCI_FLAG_COMMON,
+		.pio_mask	= ATA_PIO4,
+		.udma_mask	= ATA_UDMA6,
+		.port_ops	= &ahci_ops,
+	},
 	[board_ahci_ign_iferr] = {
 		AHCI_HFLAGS	(AHCI_HFLAG_IGN_IRQ_IF_ERR),
 		.flags		= AHCI_FLAG_COMMON,
 	{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },	/* PDC42819 */
 	{ PCI_VDEVICE(PROMISE, 0x3781), board_ahci },   /* FastTrak TX8660 ahci-mode */
-	/* Asmedia */
+	/* ASMedia */
 	{ PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci },	/* ASM1060 */
 	{ PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci },	/* ASM1060 */
-	{ PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci },	/* ASM1061 */
+	{ PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci_43bit_dma },	/* ASM1061 */
-	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },	/* ASM1062 */
+	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci_43bit_dma },	/* ASM1061/1062 */
 	{ PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci },   /* ASM1061R */
 	{ PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci },   /* ASM1062R */
 	{ PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci },   /* ASM1062+JMB575 */
 static void ahci_pci_save_initial_config(struct pci_dev *pdev,
 					 struct ahci_host_priv *hpriv)
 {
+	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == 0x1166) {
+		dev_info(&pdev->dev, "ASM1166 has only six ports\n");
+		hpriv->saved_port_map = 0x3f;
+	}
 	if (pdev->vendor == PCI_VENDOR_ID_JMICRON && pdev->device == 0x2361) {
 		dev_info(&pdev->dev, "JMB361 has only one port\n");
 		hpriv->saved_port_map = 1;
 #endif /* CONFIG_PM */
-static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
+static int ahci_configure_dma_masks(struct pci_dev *pdev,
+				    struct ahci_host_priv *hpriv)
 {
-	const int dma_bits = using_dac ? 64 : 32;
+	int dma_bits;
 	int rc;
+	if (hpriv->cap & HOST_CAP_64) {
+		dma_bits = 64;
+		if (hpriv->flags & AHCI_HFLAG_43BIT_ONLY)
+			dma_bits = 43;
+	} else {
+		dma_bits = 32;
+	}
 	/*
 	 * If the device fixup already set the dma_mask to some non-standard
 	 * value, don't extend it here. This happens on STA2X11, for example.
 	ahci_gtf_filter_workaround(host);
 	/* initialize adapter */
-	rc = ahci_configure_dma_masks(pdev, hpriv->cap & HOST_CAP_64);
+	rc = ahci_configure_dma_masks(pdev, hpriv);
 	if (rc)
 		return rc;

drivers/ata/ahci.h+1−0

@@ -247,6 +247,7 @@ enum { · 246 unmodified lines
247	AHCI_HFLAG_SUSPEND_PHYS = BIT(26), /* handle PHYs during	247	AHCI_HFLAG_SUSPEND_PHYS = BIT(26), /* handle PHYs during
248	suspend/resume */	248	suspend/resume */
249	AHCI_HFLAG_NO_SXS = BIT(28), /* SXS not supported */	249	AHCI_HFLAG_NO_SXS = BIT(28), /* SXS not supported */
		250	AHCI_HFLAG_43BIT_ONLY = BIT(29), /* 43bit DMA addr limit */
250		251
251	/* ap->flags bits */	252	/* ap->flags bits */
252		253

drivers/ata/libata-sata.c+1−1

@@ -784,7 +784,7 @@ bool sata_lpm_ignore_phy_events(struct ata_link *link) · 783 unmodified lines
784	EXPORT_SYMBOL_GPL(sata_lpm_ignore_phy_events);	784	EXPORT_SYMBOL_GPL(sata_lpm_ignore_phy_events);
785		785
786	static const char *ata_lpm_policy_names[] = {	786	static const char *ata_lpm_policy_names[] = {
787	[ATA_LPM_UNKNOWN] = "max_performance",	787	[ATA_LPM_UNKNOWN] = "keep_firmware_settings",
788	[ATA_LPM_MAX_POWER] = "max_performance",	788	[ATA_LPM_MAX_POWER] = "max_performance",
789	[ATA_LPM_MED_POWER] = "medium_power",	789	[ATA_LPM_MED_POWER] = "medium_power",
790	[ATA_LPM_MED_POWER_WITH_DIPM] = "med_power_with_dipm",	790	[ATA_LPM_MED_POWER_WITH_DIPM] = "med_power_with_dipm",

drivers/block/aoe/aoeblk.c+4−1

 	struct gendisk *gd;
 	mempool_t *mp;
 	struct blk_mq_tag_set *set;
+	sector_t ssize;
 	ulong flags;
 	int late = 0;
 	int err;
 	gd->minors = AOE_PARTITIONS;
 	gd->fops = &aoe_bdops;
 	gd->private_data = d;
-	set_capacity(gd, d->ssize);
+	ssize = d->ssize;
 	snprintf(gd->disk_name, sizeof gd->disk_name, "etherd/e%ld.%d",
 		d->aoemajor, d->aoeminor);
 	spin_unlock_irqrestore(&d->lock, flags);
+	set_capacity(gd, ssize);
 	err = device_add_disk(NULL, gd, aoe_attr_groups);
 	if (err)
 		goto out_disk_cleanup;

drivers/cpufreq/amd-pstate.c+3−4

 	max_limit_perf = div_u64(policy->max * cpudata->highest_perf, cpudata->max_freq);
 	min_limit_perf = div_u64(policy->min * cpudata->highest_perf, cpudata->max_freq);
+	WRITE_ONCE(cpudata->max_limit_perf, max_limit_perf);
+	WRITE_ONCE(cpudata->min_limit_perf, min_limit_perf);
 	max_perf = clamp_t(unsigned long, max_perf, cpudata->min_limit_perf,
 			cpudata->max_limit_perf);
 	min_perf = clamp_t(unsigned long, min_perf, cpudata->min_limit_perf,
 			cpudata->max_limit_perf);
-	WRITE_ONCE(cpudata->max_limit_perf, max_limit_perf);
-	WRITE_ONCE(cpudata->min_limit_perf, min_limit_perf);
 	value = READ_ONCE(cpudata->cppc_req_cached);
 	if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)

drivers/cpufreq/intel_pstate.c+34−21

 }
 #endif /* CONFIG_ACPI_CPPC_LIB */
+static int intel_pstate_freq_to_hwp_rel(struct cpudata *cpu, int freq,
+					unsigned int relation)
+{
+	if (freq == cpu->pstate.turbo_freq)
+		return cpu->pstate.turbo_pstate;
+	if (freq == cpu->pstate.max_freq)
+		return cpu->pstate.max_pstate;
+	switch (relation) {
+	case CPUFREQ_RELATION_H:
+		return freq / cpu->pstate.scaling;
+	case CPUFREQ_RELATION_C:
+		return DIV_ROUND_CLOSEST(freq, cpu->pstate.scaling);
+	}
+	return DIV_ROUND_UP(freq, cpu->pstate.scaling);
+}
+static int intel_pstate_freq_to_hwp(struct cpudata *cpu, int freq)
+{
+	return intel_pstate_freq_to_hwp_rel(cpu, freq, CPUFREQ_RELATION_L);
+}
 /**
  * intel_pstate_hybrid_hwp_adjust - Calibrate HWP performance levels.
  * @cpu: Target CPU.
 	int perf_ctl_scaling = cpu->pstate.perf_ctl_scaling;
 	int perf_ctl_turbo = pstate_funcs.get_turbo(cpu->cpu);
 	int scaling = cpu->pstate.scaling;
+	int freq;
 	pr_debug("CPU%d: perf_ctl_max_phys = %d\n", cpu->cpu, perf_ctl_max_phys);
 	pr_debug("CPU%d: perf_ctl_turbo = %d\n", cpu->cpu, perf_ctl_turbo);
 	cpu->pstate.max_freq = rounddown(cpu->pstate.max_pstate * scaling,
 					 perf_ctl_scaling);
-	cpu->pstate.max_pstate_physical =
+	freq = perf_ctl_max_phys * perf_ctl_scaling;
-			DIV_ROUND_UP(perf_ctl_max_phys * perf_ctl_scaling,
+	cpu->pstate.max_pstate_physical = intel_pstate_freq_to_hwp(cpu, freq);
-				     scaling);
-	cpu->pstate.min_freq = cpu->pstate.min_pstate * perf_ctl_scaling;
+	freq = cpu->pstate.min_pstate * perf_ctl_scaling;
+	cpu->pstate.min_freq = freq;
 	/*
 	 * Cast the min P-state value retrieved via pstate_funcs.get_min() to
 	 * the effective range of HWP performance levels.
 	 */
-	cpu->pstate.min_pstate = DIV_ROUND_UP(cpu->pstate.min_freq, scaling);
+	cpu->pstate.min_pstate = intel_pstate_freq_to_hwp(cpu, freq);
 }
 static inline void update_turbo_state(void)
 	 * abstract values to represent performance rather than pure ratios.
 	 */
 	if (hwp_active && cpu->pstate.scaling != perf_ctl_scaling) {
-		int scaling = cpu->pstate.scaling;
 		int freq;
 		freq = max_policy_perf * perf_ctl_scaling;
-		max_policy_perf = DIV_ROUND_UP(freq, scaling);
+		max_policy_perf = intel_pstate_freq_to_hwp(cpu, freq);
 		freq = min_policy_perf * perf_ctl_scaling;
-		min_policy_perf = DIV_ROUND_UP(freq, scaling);
+		min_policy_perf = intel_pstate_freq_to_hwp(cpu, freq);
 	}
 	pr_debug("cpu:%d min_policy_perf:%d max_policy_perf:%d\n",
 	cpufreq_freq_transition_begin(policy, &freqs);
-	switch (relation) {
+	target_pstate = intel_pstate_freq_to_hwp_rel(cpu, freqs.new, relation);
-	case CPUFREQ_RELATION_L:
-		target_pstate = DIV_ROUND_UP(freqs.new, cpu->pstate.scaling);
-		break;
-	case CPUFREQ_RELATION_H:
-		target_pstate = freqs.new / cpu->pstate.scaling;
-		break;
-	default:
-		target_pstate = DIV_ROUND_CLOSEST(freqs.new, cpu->pstate.scaling);
-		break;
-	}
 	target_pstate = intel_cpufreq_update_pstate(policy, target_pstate, false);
 	freqs.new = target_pstate * cpu->pstate.scaling;
 	update_turbo_state();
-	target_pstate = DIV_ROUND_UP(target_freq, cpu->pstate.scaling);
+	target_pstate = intel_pstate_freq_to_hwp(cpu, target_freq);
 	target_pstate = intel_cpufreq_update_pstate(policy, target_pstate, true);

drivers/crypto/caam/caamalg_qi2.c+5−2

 	struct list_head entry;
 	struct device *dev;
 	int alg_type;
+	bool is_hmac;
 	struct ahash_alg ahash_alg;
 };
 	ctx->dev = caam_hash->dev;
-	if (alg->setkey) {
+	if (caam_hash->is_hmac) {
 		ctx->adata.key_dma = dma_map_single_attrs(ctx->dev, ctx->key,
 							  ARRAY_SIZE(ctx->key),
 							  DMA_TO_DEVICE,
 	 * For keyed hash algorithms shared descriptors
 	 * will be created later in setkey() callback
 	 */
-	return alg->setkey ? 0 : ahash_set_sh_desc(ahash);
+	return caam_hash->is_hmac ? 0 : ahash_set_sh_desc(ahash);
 }
 static void caam_hash_cra_exit(struct crypto_tfm *tfm)
 			 template->hmac_name);
 		snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->hmac_driver_name);
+		t_alg->is_hmac = true;
 	} else {
 		snprintf(alg->cra_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->name);
 		snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->driver_name);
 		t_alg->ahash_alg.setkey = NULL;
+		t_alg->is_hmac = false;
 	}
 	alg->cra_module = THIS_MODULE;
 	alg->cra_init = caam_hash_cra_init;

drivers/crypto/caam/caamhash.c+5−2

 struct caam_hash_alg {
 	struct list_head entry;
 	int alg_type;
+	bool is_hmac;
 	struct ahash_engine_alg ahash_alg;
 };
 	} else {
 		if (priv->era >= 6) {
 			ctx->dir = DMA_BIDIRECTIONAL;
-			ctx->key_dir = alg->setkey ? DMA_TO_DEVICE : DMA_NONE;
+			ctx->key_dir = caam_hash->is_hmac ? DMA_TO_DEVICE : DMA_NONE;
 		} else {
 			ctx->dir = DMA_TO_DEVICE;
 			ctx->key_dir = DMA_NONE;
 	 * For keyed hash algorithms shared descriptors
 	 * will be created later in setkey() callback
 	 */
-	return alg->setkey ? 0 : ahash_set_sh_desc(ahash);
+	return caam_hash->is_hmac ? 0 : ahash_set_sh_desc(ahash);
 }
 static void caam_hash_cra_exit(struct crypto_tfm *tfm)
 			 template->hmac_name);
 		snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->hmac_driver_name);
+		t_alg->is_hmac = true;
 	} else {
 		snprintf(alg->cra_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->name);
 		snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->driver_name);
 		halg->setkey = NULL;
+		t_alg->is_hmac = false;
 	}
 	alg->cra_module = THIS_MODULE;
 	alg->cra_init = caam_hash_cra_init;

drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c+1−0

@@ -463,6 +463,7 @@ void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data, u32 dev_id) · 462 unmodified lines
463	hw_data->fw_name = ADF_402XX_FW;	463	hw_data->fw_name = ADF_402XX_FW;
464	hw_data->fw_mmp_name = ADF_402XX_MMP;	464	hw_data->fw_mmp_name = ADF_402XX_MMP;
465	hw_data->uof_get_name = uof_get_name_402xx;	465	hw_data->uof_get_name = uof_get_name_402xx;
		466	hw_data->get_ena_thd_mask = get_ena_thd_mask;
466	break;	467	break;
467	case ADF_401XX_PCI_DEVICE_ID:	468	case ADF_401XX_PCI_DEVICE_ID:
468	hw_data->fw_name = ADF_4XXX_FW;	469	hw_data->fw_name = ADF_4XXX_FW;

drivers/cxl/core/region.c+2−2

@@ -525,7 +525,7 @@ static int alloc_hpa(struct cxl_region *cxlr, resource_size_t size) · 524 unmodified lines
525	struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(cxlr->dev.parent);	525	struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(cxlr->dev.parent);
526	struct cxl_region_params *p = &cxlr->params;	526	struct cxl_region_params *p = &cxlr->params;
527	struct resource *res;	527	struct resource *res;
528	u32 remainder = 0;	528	u64 remainder = 0;
529		529
530	lockdep_assert_held_write(&cxl_region_rwsem);	530	lockdep_assert_held_write(&cxl_region_rwsem);
531		531
@@ -545,7 +545,7 @@ static int alloc_hpa(struct cxl_region *cxlr, resource_size_t size) · 13 unmodified lines
545	(cxlr->mode == CXL_DECODER_PMEM && uuid_is_null(&p->uuid)))	545	(cxlr->mode == CXL_DECODER_PMEM && uuid_is_null(&p->uuid)))
546	return -ENXIO;	546	return -ENXIO;
547		547
548	div_u64_rem(size, SZ_256M * p->interleave_ways, &remainder);	548	div64_u64_rem(size, (u64)SZ_256M * p->interleave_ways, &remainder);
549	if (remainder)	549	if (remainder)
550	return -EINVAL;	550	return -EINVAL;
551		551

drivers/cxl/pci.c+15−11

 	return rc;
 }
-static int cxl_pci_setup_mailbox(struct cxl_memdev_state *mds)
+static int cxl_pci_setup_mailbox(struct cxl_memdev_state *mds, bool irq_avail)
 {
 	struct cxl_dev_state *cxlds = &mds->cxlds;
 	const int cap = readl(cxlds->regs.mbox + CXLDEV_MBOX_CAPS_OFFSET);
 	INIT_DELAYED_WORK(&mds->security.poll_dwork, cxl_mbox_sanitize_work);
 	/* background command interrupts are optional */
-	if (!(cap & CXLDEV_MBOX_CAP_BG_CMD_IRQ))
+	if (!(cap & CXLDEV_MBOX_CAP_BG_CMD_IRQ) || !irq_avail)
 		return 0;
 	msgnum = FIELD_GET(CXLDEV_MBOX_CAP_IRQ_MSGNUM_MASK, cap);
 	return devm_add_action_or_reset(mds->cxlds.dev, free_event_buf, buf);
 }
-static int cxl_alloc_irq_vectors(struct pci_dev *pdev)
+static bool cxl_alloc_irq_vectors(struct pci_dev *pdev)
 {
 	int nvecs;
 				      PCI_IRQ_MSIX | PCI_IRQ_MSI);
 	if (nvecs < 1) {
 		dev_dbg(&pdev->dev, "Failed to alloc irq vectors: %d\n", nvecs);
-		return -ENXIO;
+		return false;
 	}
-	return 0;
+	return true;
 }
 static irqreturn_t cxl_event_thread(int irq, void *id)
 }
 static int cxl_event_config(struct pci_host_bridge *host_bridge,
-			    struct cxl_memdev_state *mds)
+			    struct cxl_memdev_state *mds, bool irq_avail)
 {
 	struct cxl_event_interrupt_policy policy;
 	int rc;
 	if (!host_bridge->native_cxl_error)
 		return 0;
+	if (!irq_avail) {
+		dev_info(mds->cxlds.dev, "No interrupt support, disable event processing.\n");
+		return 0;
+	}
 	rc = cxl_mem_alloc_event_buf(mds);
 	if (rc)
 		return rc;
 	struct cxl_register_map map;
 	struct cxl_memdev *cxlmd;
 	int i, rc, pmu_count;
+	bool irq_avail;
 	/*
 	 * Double check the anonymous union trickery in struct cxl_regs
 	else
 		dev_warn(&pdev->dev, "Media not active (%d)\n", rc);
-	rc = cxl_alloc_irq_vectors(pdev);
+	irq_avail = cxl_alloc_irq_vectors(pdev);
-	if (rc)
-		return rc;
-	rc = cxl_pci_setup_mailbox(mds);
+	rc = cxl_pci_setup_mailbox(mds, irq_avail);
 	if (rc)
 		return rc;
 		}
 	}
-	rc = cxl_event_config(host_bridge, mds);
+	rc = cxl_event_config(host_bridge, mds, irq_avail);
 	if (rc)
 		return rc;

drivers/firewire/core-device.c+13−5

  * @buf:	where to put the string
  * @size:	size of @buf, in bytes
  *
- * The string is taken from a minimal ASCII text descriptor leaf after
+ * The string is taken from a minimal ASCII text descriptor leaf just after the entry with the
- * the immediate entry with @key.  The string is zero-terminated.
+ * @key. The string is zero-terminated. An overlong string is silently truncated such that it
- * An overlong string is silently truncated such that it and the
+ * and the zero byte fit into @size.
- * zero byte fit into @size.
  *
  * Returns strlen(buf) or a negative error code.
  */
 	for (i = 0; i < ARRAY_SIZE(directories) && !!directories[i]; ++i) {
 		int result = fw_csr_string(directories[i], attr->key, buf, bufsize);
 		// Detected.
-		if (result >= 0)
+		if (result >= 0) {
 			ret = result;
+		} else if (i == 0 && attr->key == CSR_VENDOR) {
+			// Sony DVMC-DA1 has configuration ROM such that the descriptor leaf entry
+			// in the root directory follows to the directory entry for vendor ID
+			// instead of the immediate value for vendor ID.
+			result = fw_csr_string(directories[i], CSR_DIRECTORY | attr->key, buf,
+					       bufsize);
+			if (result >= 0)
+				ret = result;
+		}
 	}
 	if (ret >= 0) {

drivers/firmware/arm_ffa/driver.c+57−28

 	struct work_struct notif_pcpu_work;
 	struct work_struct irq_work;
 	struct xarray partition_info;
-	unsigned int partition_count;
 	DECLARE_HASHTABLE(notifier_hash, ilog2(FFA_MAX_NOTIFICATIONS));
 	struct mutex notify_lock; /* lock to protect notifier hashtable  */
 };
 static struct ffa_drv_info *drv_info;
+static void ffa_partitions_cleanup(void);
 /*
  * The driver must be able to support all the versions from the earliest
 	void *cb_data;
 	partition = xa_load(&drv_info->partition_info, part_id);
+	if (!partition) {
+		pr_err("%s: Invalid partition ID 0x%x\n", __func__, part_id);
+		return;
+	}
 	read_lock(&partition->rw_lock);
 	callback = partition->callback;
 	cb_data = partition->cb_data;
 		return -EOPNOTSUPP;
 	partition = xa_load(&drv_info->partition_info, part_id);
+	if (!partition) {
+		pr_err("%s: Invalid partition ID 0x%x\n", __func__, part_id);
+		return -EINVAL;
+	}
 	write_lock(&partition->rw_lock);
 	cb_valid = !!partition->callback;
 	kfree(pbuf);
 }
-static void ffa_setup_partitions(void)
+static int ffa_setup_partitions(void)
 {
-	int count, idx;
+	int count, idx, ret;
 	uuid_t uuid;
 	struct ffa_device *ffa_dev;
 	struct ffa_dev_part_info *info;
 	count = ffa_partition_probe(&uuid_null, &pbuf);
 	if (count <= 0) {
 		pr_info("%s: No partitions found, error %d\n", __func__, count);
-		return;
+		return -EINVAL;
 	}
 	xa_init(&drv_info->partition_info);
 			ffa_device_unregister(ffa_dev);
 			continue;
 		}
-		xa_store(&drv_info->partition_info, tpbuf->id, info, GFP_KERNEL);
+		rwlock_init(&info->rw_lock);
+		ret = xa_insert(&drv_info->partition_info, tpbuf->id,
+				info, GFP_KERNEL);
+		if (ret) {
+			pr_err("%s: failed to save partition ID 0x%x - ret:%d\n",
+			       __func__, tpbuf->id, ret);
+			ffa_device_unregister(ffa_dev);
+			kfree(info);
+		}
 	}
-	drv_info->partition_count = count;
 	kfree(pbuf);
 	/* Allocate for the host */
 	info = kzalloc(sizeof(*info), GFP_KERNEL);
-	if (!info)
+	if (!info) {
-		return;
+		pr_err("%s: failed to alloc Host partition ID 0x%x. Abort.\n",
-	xa_store(&drv_info->partition_info, drv_info->vm_id, info, GFP_KERNEL);
+		       __func__, drv_info->vm_id);
-	drv_info->partition_count++;
+		/* Already registered devices are freed on bus_exit */
+		ffa_partitions_cleanup();
+		return -ENOMEM;
+	}
+	rwlock_init(&info->rw_lock);
+	ret = xa_insert(&drv_info->partition_info, drv_info->vm_id,
+			info, GFP_KERNEL);
+	if (ret) {
+		pr_err("%s: failed to save Host partition ID 0x%x - ret:%d. Abort.\n",
+		       __func__, drv_info->vm_id, ret);
+		kfree(info);
+		/* Already registered devices are freed on bus_exit */
+		ffa_partitions_cleanup();
+	}
+	return ret;
 }
 static void ffa_partitions_cleanup(void)
 {
-	struct ffa_dev_part_info **info;
+	struct ffa_dev_part_info *info;
-	int idx, count = drv_info->partition_count;
+	unsigned long idx;
-	if (!count)
-		return;
-	info = kcalloc(count, sizeof(*info), GFP_KERNEL);
-	if (!info)
-		return;
-	xa_extract(&drv_info->partition_info, (void **)info, 0, VM_ID_MASK,
-		   count, XA_PRESENT);
-	for (idx = 0; idx < count; idx++)
+	xa_for_each(&drv_info->partition_info, idx, info) {
-		kfree(info[idx]);
+		xa_erase(&drv_info->partition_info, idx);
-	kfree(info);
+		kfree(info);
+	}
-	drv_info->partition_count = 0;
 	xa_destroy(&drv_info->partition_info);
 }
 	ffa_notifications_setup();
-	ffa_setup_partitions();
+	ret = ffa_setup_partitions();
+	if (ret) {
+		pr_err("failed to setup partitions\n");
+		goto cleanup_notifs;
+	}
 	ret = ffa_sched_recv_cb_update(drv_info->vm_id, ffa_self_notif_handle,
 				       drv_info, true);
 		pr_info("Failed to register driver sched callback %d\n", ret);
 	return 0;
+cleanup_notifs:
+	ffa_notifications_cleanup();
 free_pages:
 	if (drv_info->tx_buffer)
 		free_pages_exact(drv_info->tx_buffer, RXTX_BUFFER_SIZE);
 	ffa_rxtx_unmap(drv_info->vm_id);
 	free_pages_exact(drv_info->tx_buffer, RXTX_BUFFER_SIZE);
 	free_pages_exact(drv_info->rx_buffer, RXTX_BUFFER_SIZE);
-	xa_destroy(&drv_info->partition_info);
 	kfree(drv_info);
 	arm_ffa_bus_exit();
 }

drivers/firmware/arm_scmi/clock.c+2−3

 #include "notify.h"
 /* Updated only after ALL the mandatory features for that version are merged */
-#define SCMI_PROTOCOL_SUPPORTED_VERSION		0x20001
+#define SCMI_PROTOCOL_SUPPORTED_VERSION		0x20000
 enum scmi_clock_protocol_cmd {
 	CLOCK_ATTRIBUTES = 0x3,
 			scmi_clock_describe_rates_get(ph, clkid, clk);
 	}
-	if (PROTOCOL_REV_MAJOR(version) >= 0x2 &&
+	if (PROTOCOL_REV_MAJOR(version) >= 0x3) {
-	    PROTOCOL_REV_MINOR(version) >= 0x1) {
 		cinfo->clock_config_set = scmi_clock_config_set_v2;
 		cinfo->clock_config_get = scmi_clock_config_get_v2;
 	} else {

drivers/firmware/arm_scmi/common.h+1−0

@@ -314,6 +314,7 @@ void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem, · 313 unmodified lines
314	void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem);	314	void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem);
315	bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,	315	bool shmem_poll_done(struct scmi_shared_mem __iomem *shmem,
316	struct scmi_xfer *xfer);	316	struct scmi_xfer *xfer);
		317	bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem);
317		318
318	/* declarations for message passing transports */	319	/* declarations for message passing transports */
319	struct scmi_msg_payld;	320	struct scmi_msg_payld;

drivers/firmware/arm_scmi/mailbox.c+14−0

@@ -45,6 +45,20 @@ static void rx_callback(struct mbox_client cl, void m) · 44 unmodified lines
45	{	45	{
46	struct scmi_mailbox *smbox = client_to_scmi_mailbox(cl);	46	struct scmi_mailbox *smbox = client_to_scmi_mailbox(cl);
47		47
		48	/*
		49	* An A2P IRQ is NOT valid when received while the platform still has
		50	* the ownership of the channel, because the platform at first releases
		51	* the SMT channel and then sends the completion interrupt.
		52	*
		53	* This addresses a possible race condition in which a spurious IRQ from
		54	* a previous timed-out reply which arrived late could be wrongly
		55	* associated with the next pending transaction.
		56	*/
		57	if (cl->knows_txdone && !shmem_channel_free(smbox->shmem)) {
		58	dev_warn(smbox->cinfo->dev, "Ignoring spurious A2P IRQ !\n");
		59	return;
		60	}
		61
48	scmi_rx_callback(smbox->cinfo, shmem_read_header(smbox->shmem), NULL);	62	scmi_rx_callback(smbox->cinfo, shmem_read_header(smbox->shmem), NULL);
49	}	63	}
50		64

drivers/firmware/arm_scmi/perf.c+18−5

 }
 static inline void
-process_response_opp_v4(struct perf_dom_info *dom, struct scmi_opp *opp,
+process_response_opp_v4(struct device *dev, struct perf_dom_info *dom,
-			unsigned int loop_idx,
+			struct scmi_opp *opp, unsigned int loop_idx,
 			const struct scmi_msg_resp_perf_describe_levels_v4 *r)
 {
 	opp->perf = le32_to_cpu(r->opp[loop_idx].perf_val);
 	/* Note that PERF v4 reports always five 32-bit words */
 	opp->indicative_freq = le32_to_cpu(r->opp[loop_idx].indicative_freq);
 	if (dom->level_indexing_mode) {
+		int ret;
 		opp->level_index = le32_to_cpu(r->opp[loop_idx].level_index);
-		xa_store(&dom->opps_by_idx, opp->level_index, opp, GFP_KERNEL);
+		ret = xa_insert(&dom->opps_by_idx, opp->level_index, opp,
-		xa_store(&dom->opps_by_lvl, opp->perf, opp, GFP_KERNEL);
+				GFP_KERNEL);
+		if (ret)
+			dev_warn(dev,
+				 "Failed to add opps_by_idx at %d - ret:%d\n",
+				 opp->level_index, ret);
+		ret = xa_insert(&dom->opps_by_lvl, opp->perf, opp, GFP_KERNEL);
+		if (ret)
+			dev_warn(dev,
+				 "Failed to add opps_by_lvl at %d - ret:%d\n",
+				 opp->perf, ret);
 		hash_add(dom->opps_by_freq, &opp->hash, opp->indicative_freq);
 	}
 }
 	if (PROTOCOL_REV_MAJOR(p->version) <= 0x3)
 		process_response_opp(opp, st->loop_idx, response);
 	else
-		process_response_opp_v4(p->perf_dom, opp, st->loop_idx,
+		process_response_opp_v4(ph->dev, p->perf_dom, opp, st->loop_idx,
 					response);
 	p->perf_dom->opp_count++;

drivers/firmware/arm_scmi/raw_mode.c+8−4

 		int i;
 		for (i = 0; i < num_chans; i++) {
-			void *xret;
 			struct scmi_raw_queue *q;
 			q = scmi_raw_queue_init(raw);
 				goto err_xa;
 			}
-			xret = xa_store(&raw->chans_q, channels[i], q,
+			ret = xa_insert(&raw->chans_q, channels[i], q,
 					GFP_KERNEL);
-			if (xa_err(xret)) {
+			if (ret) {
 				dev_err(dev,
 					"Fail to allocate Raw queue 0x%02X\n",
 					channels[i]);
-				ret = xa_err(xret);
 				goto err_xa;
 			}
 		}
 	dev = raw->handle->dev;
 	q = scmi_raw_queue_select(raw, idx,
 				  SCMI_XFER_IS_CHAN_SET(xfer) ? chan_id : 0);
+	if (!q) {
+		dev_warn(dev,
+			 "RAW[%d] - NO queue for chan 0x%X. Dropping report.\n",
+			 idx, chan_id);
+		return;
+	}
 	/*
 	 * Grab the msg_q_lock upfront to avoid a possible race between

drivers/firmware/arm_scmi/shmem.c+7−1

 #include <linux/processor.h>
 #include <linux/types.h>
-#include <asm-generic/bug.h>
+#include <linux/bug.h>
 #include "common.h"
 		(SCMI_SHMEM_CHAN_STAT_CHANNEL_ERROR |
 		 SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE);
 }
+bool shmem_channel_free(struct scmi_shared_mem __iomem *shmem)
+{
+	return (ioread32(&shmem->channel_status) &
+			SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE);
+}

drivers/firmware/sysfb.c+1−1

@@ -128,4 +128,4 @@ unlock_mutex: · 127 unmodified lines
128	}	128	}
129		129
130	/* must execute after PCI subsystem for EFI quirks */	130	/* must execute after PCI subsystem for EFI quirks */
131	subsys_initcall_sync(sysfb_init);	131	device_initcall(sysfb_init);

drivers/gpio/gpio-eic-sprd.c+28−4

 		switch (flow_type) {
 		case IRQ_TYPE_LEVEL_HIGH:
 			sprd_eic_update(chip, offset, SPRD_EIC_DBNC_IEV, 1);
+			sprd_eic_update(chip, offset, SPRD_EIC_DBNC_IC, 1);
 			break;
 		case IRQ_TYPE_LEVEL_LOW:
 			sprd_eic_update(chip, offset, SPRD_EIC_DBNC_IEV, 0);
+			sprd_eic_update(chip, offset, SPRD_EIC_DBNC_IC, 1);
 			break;
 		case IRQ_TYPE_EDGE_RISING:
 		case IRQ_TYPE_EDGE_FALLING:
 		case IRQ_TYPE_EDGE_BOTH:
 			state = sprd_eic_get(chip, offset);
-			if (state)
+			if (state) {
 				sprd_eic_update(chip, offset,
 						SPRD_EIC_DBNC_IEV, 0);
-			else
+				sprd_eic_update(chip, offset,
+						SPRD_EIC_DBNC_IC, 1);
+			} else {
 				sprd_eic_update(chip, offset,
 						SPRD_EIC_DBNC_IEV, 1);
+				sprd_eic_update(chip, offset,
+						SPRD_EIC_DBNC_IC, 1);
+			}
 			break;
 		default:
 			return -ENOTSUPP;
 		switch (flow_type) {
 		case IRQ_TYPE_LEVEL_HIGH:
 			sprd_eic_update(chip, offset, SPRD_EIC_LATCH_INTPOL, 0);
+			sprd_eic_update(chip, offset, SPRD_EIC_LATCH_INTCLR, 1);
 			break;
 		case IRQ_TYPE_LEVEL_LOW:
 			sprd_eic_update(chip, offset, SPRD_EIC_LATCH_INTPOL, 1);
+			sprd_eic_update(chip, offset, SPRD_EIC_LATCH_INTCLR, 1);
 			break;
 		case IRQ_TYPE_EDGE_RISING:
 		case IRQ_TYPE_EDGE_FALLING:
 		case IRQ_TYPE_EDGE_BOTH:
 			state = sprd_eic_get(chip, offset);
-			if (state)
+			if (state) {
 				sprd_eic_update(chip, offset,
 						SPRD_EIC_LATCH_INTPOL, 0);
-			else
+				sprd_eic_update(chip, offset,
+						SPRD_EIC_LATCH_INTCLR, 1);
+			} else {
 				sprd_eic_update(chip, offset,
 						SPRD_EIC_LATCH_INTPOL, 1);
+				sprd_eic_update(chip, offset,
+						SPRD_EIC_LATCH_INTCLR, 1);
+			}
 			break;
 		default:
 			return -ENOTSUPP;
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTBOTH, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTMODE, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTPOL, 1);
+			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTCLR, 1);
 			irq_set_handler_locked(data, handle_edge_irq);
 			break;
 		case IRQ_TYPE_EDGE_FALLING:
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTBOTH, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTMODE, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTPOL, 0);
+			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTCLR, 1);
 			irq_set_handler_locked(data, handle_edge_irq);
 			break;
 		case IRQ_TYPE_EDGE_BOTH:
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTMODE, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTBOTH, 1);
+			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTCLR, 1);
 			irq_set_handler_locked(data, handle_edge_irq);
 			break;
 		case IRQ_TYPE_LEVEL_HIGH:
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTBOTH, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTMODE, 1);
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTPOL, 1);
+			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTCLR, 1);
 			irq_set_handler_locked(data, handle_level_irq);
 			break;
 		case IRQ_TYPE_LEVEL_LOW:
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTBOTH, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTMODE, 1);
 			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTPOL, 0);
+			sprd_eic_update(chip, offset, SPRD_EIC_ASYNC_INTCLR, 1);
 			irq_set_handler_locked(data, handle_level_irq);
 			break;
 		default:
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTPOL, 1);
+			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTCLR, 1);
 			irq_set_handler_locked(data, handle_edge_irq);
 			break;
 		case IRQ_TYPE_EDGE_FALLING:
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTPOL, 0);
+			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTCLR, 1);
 			irq_set_handler_locked(data, handle_edge_irq);
 			break;
 		case IRQ_TYPE_EDGE_BOTH:
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 1);
+			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTCLR, 1);
 			irq_set_handler_locked(data, handle_edge_irq);
 			break;
 		case IRQ_TYPE_LEVEL_HIGH:
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 1);
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTPOL, 1);
+			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTCLR, 1);
 			irq_set_handler_locked(data, handle_level_irq);
 			break;
 		case IRQ_TYPE_LEVEL_LOW:
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 0);
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 1);
 			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTPOL, 0);
+			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTCLR, 1);
 			irq_set_handler_locked(data, handle_level_irq);
 			break;
 		default:

drivers/gpio/gpiolib-acpi.c+14−0

@@ -1651,6 +1651,20 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] __initconst = { · 1650 unmodified lines
1651	.ignore_interrupt = "INT33FC:00@3",	1651	.ignore_interrupt = "INT33FC:00@3",
1652	},	1652	},
1653	},	1653	},
		1654	{
		1655	/*
		1656	* Spurious wakeups from TP_ATTN# pin
		1657	* Found in BIOS 0.35
		1658	* https://gitlab.freedesktop.org/drm/amd/-/issues/3073
		1659	*/
		1660	.matches = {
		1661	DMI_MATCH(DMI_SYS_VENDOR, "GPD"),
		1662	DMI_MATCH(DMI_PRODUCT_NAME, "G1619-04"),
		1663	},
		1664	.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
		1665	.ignore_wake = "PNP0C50:00@8",
		1666	},
		1667	},
1654	{} /* Terminating entry */	1668	{} /* Terminating entry */
1655	};	1669	};
1656		1670

drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c+8−0

 	struct amdgpu_bo_param bp;
 	dma_addr_t dma_addr;
 	struct page *p;
+	unsigned long x;
 	int ret;
 	if (adev->gart.bo != NULL)
 	if (!p)
 		return -ENOMEM;
+	/* assign pages to this device */
+	for (x = 0; x < (1UL << order); x++)
+		p[x].mapping = adev->mman.bdev.dev_mapping;
 	/* If the hardware does not support UTCL2 snooping of the CPU caches
 	 * then set_memory_wc() could be used as a workaround to mark the pages
 	 * as write combine memory.
 	unsigned int order = get_order(adev->gart.table_size);
 	struct sg_table *sg = adev->gart.bo->tbo.sg;
 	struct page *p;
+	unsigned long x;
 	int ret;
 	ret = amdgpu_bo_reserve(adev->gart.bo, false);
 	sg_free_table(sg);
 	kfree(sg);
 	p = virt_to_page(adev->gart.ptr);
+	for (x = 0; x < (1UL << order); x++)
+		p[x].mapping = NULL;
 	__free_pages(p, order);
 	adev->gart.ptr = NULL;

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c+16−1

@@ -221,8 +221,23 @@ static struct attribute *amdgpu_vram_mgr_attributes[] = { · 220 unmodified lines
221	NULL	221	NULL
222	};	222	};
223		223
		224	static umode_t amdgpu_vram_attrs_is_visible(struct kobject *kobj,
		225	struct attribute *attr, int i)
		226	{
		227	struct device *dev = kobj_to_dev(kobj);
		228	struct drm_device *ddev = dev_get_drvdata(dev);
		229	struct amdgpu_device *adev = drm_to_adev(ddev);
		230
		231	if (attr == &dev_attr_mem_info_vram_vendor.attr &&
		232	!adev->gmc.vram_vendor)
		233	return 0;
		234
		235	return attr->mode;
		236	}
		237
224	const struct attribute_group amdgpu_vram_mgr_attr_group = {	238	const struct attribute_group amdgpu_vram_mgr_attr_group = {
225	.attrs = amdgpu_vram_mgr_attributes	239	.attrs = amdgpu_vram_mgr_attributes,
		240	.is_visible = amdgpu_vram_attrs_is_visible
226	};	241	};
227		242
228	/**	243	/**

drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c+1−1

@@ -6589,7 +6589,7 @@ static int gfx_v10_0_compute_mqd_init(struct amdgpu_device adev, void m, · 6588 unmodified lines
6589	#ifdef __BIG_ENDIAN	6589	#ifdef __BIG_ENDIAN
6590	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);	6590	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
6591	#endif	6591	#endif
6592	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, UNORD_DISPATCH, 0);	6592	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, UNORD_DISPATCH, 1);
6593	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, TUNNEL_DISPATCH,	6593	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, TUNNEL_DISPATCH,
6594	prop->allow_tunneling);	6594	prop->allow_tunneling);
6595	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, PRIV_STATE, 1);	6595	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, PRIV_STATE, 1);

drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c+1−1

@@ -3846,7 +3846,7 @@ static int gfx_v11_0_compute_mqd_init(struct amdgpu_device adev, void m, · 3845 unmodified lines
3846	(order_base_2(prop->queue_size / 4) - 1));	3846	(order_base_2(prop->queue_size / 4) - 1));
3847	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, RPTR_BLOCK_SIZE,	3847	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, RPTR_BLOCK_SIZE,
3848	(order_base_2(AMDGPU_GPU_PAGE_SIZE / 4) - 1));	3848	(order_base_2(AMDGPU_GPU_PAGE_SIZE / 4) - 1));
3849	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, UNORD_DISPATCH, 0);	3849	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, UNORD_DISPATCH, 1);
3850	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, TUNNEL_DISPATCH,	3850	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, TUNNEL_DISPATCH,
3851	prop->allow_tunneling);	3851	prop->allow_tunneling);
3852	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, PRIV_STATE, 1);	3852	tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, PRIV_STATE, 1);

drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c+2−1

@@ -1950,7 +1950,8 @@ static void gmc_v9_4_3_init_vram_info(struct amdgpu_device *adev) · 1949 unmodified lines
1950	static const u32 regBIF_BIOS_SCRATCH_4 = 0x50;	1950	static const u32 regBIF_BIOS_SCRATCH_4 = 0x50;
1951	u32 vram_info;	1951	u32 vram_info;
1952		1952
1953	if (!amdgpu_sriov_vf(adev)) {	1953	/* Only for dGPU, vendor informaton is reliable */
		1954	if (!amdgpu_sriov_vf(adev) && !(adev->flags & AMD_IS_APU)) {
1954	vram_info = RREG32(regBIF_BIOS_SCRATCH_4);	1955	vram_info = RREG32(regBIF_BIOS_SCRATCH_4);
1955	adev->gmc.vram_vendor = vram_info & 0xF;	1956	adev->gmc.vram_vendor = vram_info & 0xF;
1956	}	1957	}

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c+1−0

@@ -170,6 +170,7 @@ static void update_mqd(struct mqd_manager mm, void mqd, · 169 unmodified lines
170	m->cp_hqd_pq_control = 5 << CP_HQD_PQ_CONTROL__RPTR_BLOCK_SIZE__SHIFT;	170	m->cp_hqd_pq_control = 5 << CP_HQD_PQ_CONTROL__RPTR_BLOCK_SIZE__SHIFT;
171	m->cp_hqd_pq_control \|=	171	m->cp_hqd_pq_control \|=
172	ffs(q->queue_size / sizeof(unsigned int)) - 1 - 1;	172	ffs(q->queue_size / sizeof(unsigned int)) - 1 - 1;
		173	m->cp_hqd_pq_control \|= CP_HQD_PQ_CONTROL__UNORD_DISPATCH_MASK;
173	pr_debug("cp_hqd_pq_control 0x%x\n", m->cp_hqd_pq_control);	174	pr_debug("cp_hqd_pq_control 0x%x\n", m->cp_hqd_pq_control);
174		175
175	m->cp_hqd_pq_base_lo = lower_32_bits((uint64_t)q->queue_address >> 8);	176	m->cp_hqd_pq_base_lo = lower_32_bits((uint64_t)q->queue_address >> 8);

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c+1−0

@@ -224,6 +224,7 @@ static void update_mqd(struct mqd_manager mm, void mqd, · 223 unmodified lines
224	m->cp_hqd_pq_control = 5 << CP_HQD_PQ_CONTROL__RPTR_BLOCK_SIZE__SHIFT;	224	m->cp_hqd_pq_control = 5 << CP_HQD_PQ_CONTROL__RPTR_BLOCK_SIZE__SHIFT;
225	m->cp_hqd_pq_control \|=	225	m->cp_hqd_pq_control \|=
226	ffs(q->queue_size / sizeof(unsigned int)) - 1 - 1;	226	ffs(q->queue_size / sizeof(unsigned int)) - 1 - 1;
		227	m->cp_hqd_pq_control \|= CP_HQD_PQ_CONTROL__UNORD_DISPATCH_MASK;
227	pr_debug("cp_hqd_pq_control 0x%x\n", m->cp_hqd_pq_control);	228	pr_debug("cp_hqd_pq_control 0x%x\n", m->cp_hqd_pq_control);
228		229
229	m->cp_hqd_pq_base_lo = lower_32_bits((uint64_t)q->queue_address >> 8);	230	m->cp_hqd_pq_base_lo = lower_32_bits((uint64_t)q->queue_address >> 8);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c+10−11

 {
 	u32 v_blank_start, v_blank_end, h_position, v_position;
 	struct amdgpu_crtc *acrtc = NULL;
+	struct dc *dc = adev->dm.dc;
 	if ((crtc < 0) || (crtc >= adev->mode_info.num_crtc))
 		return -EINVAL;
 		return 0;
 	}
+	if (dc && dc->caps.ips_support && dc->idle_optimizations_allowed)
+		dc_allow_idle_optimizations(dc, false);
 	/*
 	 * TODO rework base driver to use values directly.
 	 * for now parse it back into reg-format
 	init_data.nbio_reg_offsets = adev->reg_offset[NBIO_HWIP][0];
 	init_data.clk_reg_offsets = adev->reg_offset[CLK_HWIP][0];
-	init_data.flags.disable_ips = DMUB_IPS_DISABLE_ALL;
+	if (amdgpu_dc_debug_mask & DC_DISABLE_IPS)
+		init_data.flags.disable_ips = DMUB_IPS_DISABLE_ALL;
+	init_data.flags.disable_ips_in_vpb = 1;
 	/* Enable DWB for tested platforms only */
 	if (amdgpu_ip_version(adev, DCE_HWIP, 0) >= IP_VERSION(3, 0, 0))
 	trace_amdgpu_dm_atomic_commit_tail_begin(state);
-	if (dm->dc->caps.ips_support) {
+	if (dm->dc->caps.ips_support && dm->dc->idle_optimizations_allowed)
-		for_each_oldnew_connector_in_state(state, connector, old_con_state, new_con_state, i) {
+		dc_allow_idle_optimizations(dm->dc, false);
-			if (new_con_state->crtc &&
-				new_con_state->crtc->state->active &&
-				drm_atomic_crtc_needs_modeset(new_con_state->crtc->state)) {
-				dc_dmub_srv_apply_idle_power_optimizations(dm->dc, false);
-				break;
-			}
-		}
-	}
 	drm_atomic_helper_update_legacy_modeset_state(dev, state);
 	drm_dp_mst_atomic_wait_for_dependencies(state);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c+4−1

@@ -711,7 +711,7 @@ static inline int dm_irq_state(struct amdgpu_device *adev, · 710 unmodified lines
711	{	711	{
712	bool st;	712	bool st;
713	enum dc_irq_source irq_source;	713	enum dc_irq_source irq_source;
714		714	struct dc *dc = adev->dm.dc;
715	struct amdgpu_crtc *acrtc = adev->mode_info.crtcs[crtc_id];	715	struct amdgpu_crtc *acrtc = adev->mode_info.crtcs[crtc_id];
716		716
717	if (!acrtc) {	717	if (!acrtc) {
@@ -729,6 +729,9 @@ static inline int dm_irq_state(struct amdgpu_device *adev, · 11 unmodified lines
729		729
730	st = (state == AMDGPU_IRQ_STATE_ENABLE);	730	st = (state == AMDGPU_IRQ_STATE_ENABLE);
731		731
		732	if (dc && dc->caps.ips_support && dc->idle_optimizations_allowed)
		733	dc_allow_idle_optimizations(dc, false);
		734
732	dc_interrupt_set(adev->dm.dc, irq_source, st);	735	dc_interrupt_set(adev->dm.dc, irq_source, st);
733	return 0;	736	return 0;
734	}	737	}

drivers/gpu/drm/amd/display/dc/dc.h+1−0

@@ -434,6 +434,7 @@ struct dc_config { · 433 unmodified lines
434	bool EnableMinDispClkODM;	434	bool EnableMinDispClkODM;
435	bool enable_auto_dpm_test_logs;	435	bool enable_auto_dpm_test_logs;
436	unsigned int disable_ips;	436	unsigned int disable_ips;
		437	unsigned int disable_ips_in_vpb;
437	};	438	};
438		439
439	enum visual_confirm {	440	enum visual_confirm {

drivers/gpu/drm/amd/display/dc/dc_types.h+5−0

 	Replay_Msg_Not_Support = -1,
 	Replay_Set_Timing_Sync_Supported,
 	Replay_Set_Residency_Frameupdate_Timer,
+	Replay_Set_Pseudo_VTotal,
 };
 union replay_error_status {
 	uint16_t coasting_vtotal_table[PR_COASTING_TYPE_NUM];
 	/* Maximum link off frame count */
 	enum replay_link_off_frame_count_level link_off_frame_count_level;
+	/* Replay pseudo vtotal for abm + ips on full screen video which can improve ips residency */
+	uint16_t abm_with_ips_on_full_screen_video_pseudo_vtotal;
+	/* Replay last pseudo vtotal set to DMUB */
+	uint16_t last_pseudo_vtotal;
 };
 /* To split out "global" and "per-panel" config settings.

drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c+8−1

 bool dcn35_apply_idle_power_optimizations(struct dc *dc, bool enable)
 {
 	struct dc_link *edp_links[MAX_NUM_EDP];
-	int edp_num;
+	int i, edp_num;
 	if (dc->debug.dmcub_emulation)
 		return true;
 		dc_get_edp_links(dc, edp_links, &edp_num);
 		if (edp_num == 0 || edp_num > 1)
 			return false;
+		for (i = 0; i < dc->current_state->stream_count; ++i) {
+			struct dc_stream_state *stream = dc->current_state->streams[i];
+			if (!stream->dpms_off && !dc_is_embedded_signal(stream->signal))
+				return false;
+		}
 	}
 	// TODO: review other cases when idle optimization is allowed

drivers/gpu/drm/amd/display/dc/link/protocols/link_dpcd.c+2−2

@@ -205,7 +205,7 @@ enum dc_status core_link_read_dpcd( · 204 unmodified lines
205	uint32_t extended_size;	205	uint32_t extended_size;
206	/* size of the remaining partitioned address space */	206	/* size of the remaining partitioned address space */
207	uint32_t size_left_to_read;	207	uint32_t size_left_to_read;
208	enum dc_status status;	208	enum dc_status status = DC_ERROR_UNEXPECTED;
209	/* size of the next partition to be read from */	209	/* size of the next partition to be read from */
210	uint32_t partition_size;	210	uint32_t partition_size;
211	uint32_t data_index = 0;	211	uint32_t data_index = 0;
@@ -234,7 +234,7 @@ enum dc_status core_link_write_dpcd( · 22 unmodified lines
234	{	234	{
235	uint32_t partition_size;	235	uint32_t partition_size;
236	uint32_t data_index = 0;	236	uint32_t data_index = 0;
237	enum dc_status status;	237	enum dc_status status = DC_ERROR_UNEXPECTED;
238		238
239	while (size) {	239	while (size) {
240	partition_size = dpcd_get_next_partition_size(address, size);	240	partition_size = dpcd_get_next_partition_size(address, size);

drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h+47−0

@@ -2832,6 +2832,7 @@ struct dmub_rb_cmd_psr_set_power_opt { · 2831 unmodified lines
2832	#define REPLAY_RESIDENCY_MODE_MASK (0x1 << REPLAY_RESIDENCY_MODE_SHIFT)	2832	#define REPLAY_RESIDENCY_MODE_MASK (0x1 << REPLAY_RESIDENCY_MODE_SHIFT)
2833	# define REPLAY_RESIDENCY_MODE_PHY (0x0 << REPLAY_RESIDENCY_MODE_SHIFT)	2833	# define REPLAY_RESIDENCY_MODE_PHY (0x0 << REPLAY_RESIDENCY_MODE_SHIFT)
2834	# define REPLAY_RESIDENCY_MODE_ALPM (0x1 << REPLAY_RESIDENCY_MODE_SHIFT)	2834	# define REPLAY_RESIDENCY_MODE_ALPM (0x1 << REPLAY_RESIDENCY_MODE_SHIFT)
		2835	# define REPLAY_RESIDENCY_MODE_IPS 0x10
2835		2836
2836	#define REPLAY_RESIDENCY_ENABLE_MASK (0x1 << REPLAY_RESIDENCY_ENABLE_SHIFT)	2837	#define REPLAY_RESIDENCY_ENABLE_MASK (0x1 << REPLAY_RESIDENCY_ENABLE_SHIFT)
2837	# define REPLAY_RESIDENCY_DISABLE (0x0 << REPLAY_RESIDENCY_ENABLE_SHIFT)	2838	# define REPLAY_RESIDENCY_DISABLE (0x0 << REPLAY_RESIDENCY_ENABLE_SHIFT)
@@ -2894,6 +2895,10 @@ enum dmub_cmd_replay_type { · 56 unmodified lines
2894	* Set Residency Frameupdate Timer.	2895	* Set Residency Frameupdate Timer.
2895	*/	2896	*/
2896	DMUB_CMD__REPLAY_SET_RESIDENCY_FRAMEUPDATE_TIMER = 6,	2897	DMUB_CMD__REPLAY_SET_RESIDENCY_FRAMEUPDATE_TIMER = 6,
		2898	/**
		2899	* Set pseudo vtotal
		2900	*/
		2901	DMUB_CMD__REPLAY_SET_PSEUDO_VTOTAL = 7,
2897	};	2902	};
2898		2903
2899	/**	2904	/**
@@ -3076,6 +3081,26 @@ struct dmub_cmd_replay_set_timing_sync_data { · 176 unmodified lines
3076	uint8_t pad[2];	3081	uint8_t pad[2];
3077	};	3082	};
3078		3083
		3084	/**
		3085	* Data passed from driver to FW in a DMUB_CMD__REPLAY_SET_PSEUDO_VTOTAL command.
		3086	*/
		3087	struct dmub_cmd_replay_set_pseudo_vtotal {
		3088	/**
		3089	* Panel Instance.
		3090	* Panel isntance to identify which replay_state to use
		3091	* Currently the support is only for 0 or 1
		3092	*/
		3093	uint8_t panel_inst;
		3094	/**
		3095	* Source Vtotal that Replay + IPS + ABM full screen video src vtotal
		3096	*/
		3097	uint16_t vtotal;
		3098	/**
		3099	* Explicit padding to 4 byte boundary.
		3100	*/
		3101	uint8_t pad;
		3102	};
		3103
3079	/**	3104	/**
3080	* Definition of a DMUB_CMD__SET_REPLAY_POWER_OPT command.	3105	* Definition of a DMUB_CMD__SET_REPLAY_POWER_OPT command.
3081	*/	3106	*/
@@ -3156,6 +3181,20 @@ struct dmub_rb_cmd_replay_set_timing_sync { · 74 unmodified lines
3156	struct dmub_cmd_replay_set_timing_sync_data replay_set_timing_sync_data;	3181	struct dmub_cmd_replay_set_timing_sync_data replay_set_timing_sync_data;
3157	};	3182	};
3158		3183
		3184	/**
		3185	* Definition of a DMUB_CMD__REPLAY_SET_PSEUDO_VTOTAL command.
		3186	*/
		3187	struct dmub_rb_cmd_replay_set_pseudo_vtotal {
		3188	/**
		3189	* Command header.
		3190	*/
		3191	struct dmub_cmd_header header;
		3192	/**
		3193	* Definition of DMUB_CMD__REPLAY_SET_PSEUDO_VTOTAL command.
		3194	*/
		3195	struct dmub_cmd_replay_set_pseudo_vtotal data;
		3196	};
		3197
3159	/**	3198	/**
3160	* Data passed from driver to FW in DMUB_CMD__REPLAY_SET_RESIDENCY_FRAMEUPDATE_TIMER command.	3199	* Data passed from driver to FW in DMUB_CMD__REPLAY_SET_RESIDENCY_FRAMEUPDATE_TIMER command.
3161	*/	3200	*/
@@ -3207,6 +3246,10 @@ union dmub_replay_cmd_set { · 45 unmodified lines
3207	* Definition of DMUB_CMD__REPLAY_SET_RESIDENCY_FRAMEUPDATE_TIMER command data.	3246	* Definition of DMUB_CMD__REPLAY_SET_RESIDENCY_FRAMEUPDATE_TIMER command data.
3208	*/	3247	*/
3209	struct dmub_cmd_replay_frameupdate_timer_data timer_data;	3248	struct dmub_cmd_replay_frameupdate_timer_data timer_data;
		3249	/**
		3250	* Definition of DMUB_CMD__REPLAY_SET_PSEUDO_VTOTAL command data.
		3251	*/
		3252	struct dmub_cmd_replay_set_pseudo_vtotal pseudo_vtotal_data;
3210	};	3253	};
3211		3254
3212	/**	3255	/**
@@ -4358,6 +4401,10 @@ union dmub_rb_cmd { · 1145 unmodified lines
4358	* Definition of a DMUB_CMD__REPLAY_SET_RESIDENCY_FRAMEUPDATE_TIMER command.	4401	* Definition of a DMUB_CMD__REPLAY_SET_RESIDENCY_FRAMEUPDATE_TIMER command.
4359	*/	4402	*/
4360	struct dmub_rb_cmd_replay_set_frameupdate_timer replay_set_frameupdate_timer;	4403	struct dmub_rb_cmd_replay_set_frameupdate_timer replay_set_frameupdate_timer;
		4404	/**
		4405	* Definition of a DMUB_CMD__REPLAY_SET_PSEUDO_VTOTAL command.
		4406	*/
		4407	struct dmub_rb_cmd_replay_set_pseudo_vtotal replay_set_pseudo_vtotal;
4361	};	4408	};
4362		4409
4363	/**	4410	/**

drivers/gpu/drm/amd/display/modules/power/power_helpers.c+5−0

 	link->replay_settings.coasting_vtotal_table[type] = vtotal;
 }
+void set_replay_ips_full_screen_video_src_vtotal(struct dc_link *link, uint16_t vtotal)
+{
+	link->replay_settings.abm_with_ips_on_full_screen_video_pseudo_vtotal = vtotal;
+}
 void calculate_replay_link_off_frame_count(struct dc_link *link,
 	uint16_t vtotal, uint16_t htotal)
 {

drivers/gpu/drm/amd/display/modules/power/power_helpers.h+1−0

@@ -57,6 +57,7 @@ void init_replay_config(struct dc_link link, struct replay_config pr_config); · 56 unmodified lines
57	void set_replay_coasting_vtotal(struct dc_link *link,	57	void set_replay_coasting_vtotal(struct dc_link *link,
58	enum replay_coasting_vtotal_type type,	58	enum replay_coasting_vtotal_type type,
59	uint16_t vtotal);	59	uint16_t vtotal);
		60	void set_replay_ips_full_screen_video_src_vtotal(struct dc_link *link, uint16_t vtotal);
60	void calculate_replay_link_off_frame_count(struct dc_link *link,	61	void calculate_replay_link_off_frame_count(struct dc_link *link,
61	uint16_t vtotal, uint16_t htotal);	62	uint16_t vtotal, uint16_t htotal);
62		63

drivers/gpu/drm/amd/include/amd_shared.h+1−0

@@ -258,6 +258,7 @@ enum DC_DEBUG_MASK { · 257 unmodified lines
258	DC_ENABLE_DML2 = 0x100,	258	DC_ENABLE_DML2 = 0x100,
259	DC_DISABLE_PSR_SU = 0x200,	259	DC_DISABLE_PSR_SU = 0x200,
260	DC_DISABLE_REPLAY = 0x400,	260	DC_DISABLE_REPLAY = 0x400,
		261	DC_DISABLE_IPS = 0x800,
261	};	262	};
262		263
263	enum amd_dpm_forced_level;	264	enum amd_dpm_forced_level;

drivers/gpu/drm/amd/include/amdgpu_reg_state.h+1−1

@@ -138,7 +138,7 @@ static inline size_t amdgpu_reginst_size(uint16_t num_inst, size_t inst_size, · 137 unmodified lines
138	}	138	}
139		139
140	#define amdgpu_asic_get_reg_state_supported(adev) \	140	#define amdgpu_asic_get_reg_state_supported(adev) \
141	((adev)->asic_funcs->get_reg_state ? 1 : 0)	141	(((adev)->asic_funcs && (adev)->asic_funcs->get_reg_state) ? 1 : 0)
142		142
143	#define amdgpu_asic_get_reg_state(adev, state, buf, size) \	143	#define amdgpu_asic_get_reg_state(adev, state, buf, size) \
144	((adev)->asic_funcs->get_reg_state ? \	144	((adev)->asic_funcs->get_reg_state ? \

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c+4−10

 #include <linux/firmware.h>
 #include <linux/pci.h>
+#include <linux/power_supply.h>
 #include <linux/reboot.h>
 #include "amdgpu.h"
 	 * handle the switch automatically. Driver involvement
 	 * is unnecessary.
 	 */
-	if (!smu->dc_controlled_by_gpio) {
+	adev->pm.ac_power = power_supply_is_system_supplied() > 0;
-		ret = smu_set_power_source(smu,
+	smu_set_ac_dc(smu);
-					   adev->pm.ac_power ? SMU_POWER_SOURCE_AC :
-					   SMU_POWER_SOURCE_DC);
-		if (ret) {
-			dev_err(adev->dev, "Failed to switch to %s mode!\n",
-				adev->pm.ac_power ? "AC" : "DC");
-			return ret;
-		}
-	}
 	if ((amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 1)) ||
 	    (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 3)))
 		case SMU_PPT_LIMIT_CURRENT:
 			switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
 			case IP_VERSION(13, 0, 2):
+			case IP_VERSION(13, 0, 6):
 			case IP_VERSION(11, 0, 7):
 			case IP_VERSION(11, 0, 11):
 			case IP_VERSION(11, 0, 12):

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c+2−0

 			case 0x3:
 				dev_dbg(adev->dev, "Switched to AC mode!\n");
 				schedule_work(&smu->interrupt_work);
+				adev->pm.ac_power = true;
 				break;
 			case 0x4:
 				dev_dbg(adev->dev, "Switched to DC mode!\n");
 				schedule_work(&smu->interrupt_work);
+				adev->pm.ac_power = false;
 				break;
 			case 0x7:
 				/*

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c+2−0

 			case 0x3:
 				dev_dbg(adev->dev, "Switched to AC mode!\n");
 				smu_v13_0_ack_ac_dc_interrupt(smu);
+				adev->pm.ac_power = true;
 				break;
 			case 0x4:
 				dev_dbg(adev->dev, "Switched to DC mode!\n");
 				smu_v13_0_ack_ac_dc_interrupt(smu);
+				adev->pm.ac_power = false;
 				break;
 			case 0x7:
 				/*

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c+52−2

@@ -2357,6 +2357,7 @@ static int smu_v13_0_0_get_power_limit(struct smu_context *smu, · 2356 unmodified lines
2357	PPTable_t *pptable = table_context->driver_pptable;	2357	PPTable_t *pptable = table_context->driver_pptable;
2358	SkuTable_t *skutable = &pptable->SkuTable;	2358	SkuTable_t *skutable = &pptable->SkuTable;
2359	uint32_t power_limit, od_percent_upper, od_percent_lower;	2359	uint32_t power_limit, od_percent_upper, od_percent_lower;
		2360	uint32_t msg_limit = skutable->MsgLimits.Power[PPT_THROTTLER_PPT0][POWER_SOURCE_AC];
2360		2361
2361	if (smu_v13_0_get_current_power_limit(smu, &power_limit))	2362	if (smu_v13_0_get_current_power_limit(smu, &power_limit))
2362	power_limit = smu->adev->pm.ac_power ?	2363	power_limit = smu->adev->pm.ac_power ?
@@ -2380,7 +2381,7 @@ static int smu_v13_0_0_get_power_limit(struct smu_context *smu, · 17 unmodified lines
2380	od_percent_upper, od_percent_lower, power_limit);	2381	od_percent_upper, od_percent_lower, power_limit);
2381		2382
2382	if (max_power_limit) {	2383	if (max_power_limit) {
2383	max_power_limit = power_limit (100 + od_percent_upper);	2384	max_power_limit = msg_limit (100 + od_percent_upper);
2384	*max_power_limit /= 100;	2385	*max_power_limit /= 100;
2385	}	2386	}
2386		2387
@@ -2959,6 +2960,55 @@ static bool smu_v13_0_0_wbrf_support_check(struct smu_context *smu) · 572 unmodified lines
2959	}	2960	}
2960	}	2961	}
2961		2962
		2963	static int smu_v13_0_0_set_power_limit(struct smu_context *smu,
		2964	enum smu_ppt_limit_type limit_type,
		2965	uint32_t limit)
		2966	{
		2967	PPTable_t *pptable = smu->smu_table.driver_pptable;
		2968	SkuTable_t *skutable = &pptable->SkuTable;
		2969	uint32_t msg_limit = skutable->MsgLimits.Power[PPT_THROTTLER_PPT0][POWER_SOURCE_AC];
		2970	struct smu_table_context *table_context = &smu->smu_table;
		2971	OverDriveTableExternal_t *od_table =
		2972	(OverDriveTableExternal_t *)table_context->overdrive_table;
		2973	int ret = 0;
		2974
		2975	if (limit_type != SMU_DEFAULT_PPT_LIMIT)
		2976	return -EINVAL;
		2977
		2978	if (limit <= msg_limit) {
		2979	if (smu->current_power_limit > msg_limit) {
		2980	od_table->OverDriveTable.Ppt = 0;
		2981	od_table->OverDriveTable.FeatureCtrlMask \|= 1U << PP_OD_FEATURE_PPT_BIT;
		2982
		2983	ret = smu_v13_0_0_upload_overdrive_table(smu, od_table);
		2984	if (ret) {
		2985	dev_err(smu->adev->dev, "Failed to upload overdrive table!\n");
		2986	return ret;
		2987	}
		2988	}
		2989	return smu_v13_0_set_power_limit(smu, limit_type, limit);
		2990	} else if (smu->od_enabled) {
		2991	ret = smu_v13_0_set_power_limit(smu, limit_type, msg_limit);
		2992	if (ret)
		2993	return ret;
		2994
		2995	od_table->OverDriveTable.Ppt = (limit * 100) / msg_limit - 100;
		2996	od_table->OverDriveTable.FeatureCtrlMask \|= 1U << PP_OD_FEATURE_PPT_BIT;
		2997
		2998	ret = smu_v13_0_0_upload_overdrive_table(smu, od_table);
		2999	if (ret) {
		3000	dev_err(smu->adev->dev, "Failed to upload overdrive table!\n");
		3001	return ret;
		3002	}
		3003
		3004	smu->current_power_limit = limit;
		3005	} else {
		3006	return -EINVAL;
		3007	}
		3008
		3009	return 0;
		3010	}
		3011
2962	static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {	3012	static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {
2963	.get_allowed_feature_mask = smu_v13_0_0_get_allowed_feature_mask,	3013	.get_allowed_feature_mask = smu_v13_0_0_get_allowed_feature_mask,
2964	.set_default_dpm_table = smu_v13_0_0_set_default_dpm_table,	3014	.set_default_dpm_table = smu_v13_0_0_set_default_dpm_table,
@@ -3013,7 +3063,7 @@ static const struct pptable_funcs smu_v13_0_0_ppt_funcs = { · 48 unmodified lines
3013	.set_fan_control_mode = smu_v13_0_set_fan_control_mode,	3063	.set_fan_control_mode = smu_v13_0_set_fan_control_mode,
3014	.enable_mgpu_fan_boost = smu_v13_0_0_enable_mgpu_fan_boost,	3064	.enable_mgpu_fan_boost = smu_v13_0_0_enable_mgpu_fan_boost,
3015	.get_power_limit = smu_v13_0_0_get_power_limit,	3065	.get_power_limit = smu_v13_0_0_get_power_limit,
3016	.set_power_limit = smu_v13_0_set_power_limit,	3066	.set_power_limit = smu_v13_0_0_set_power_limit,
3017	.set_power_source = smu_v13_0_set_power_source,	3067	.set_power_source = smu_v13_0_set_power_source,
3018	.get_power_profile_mode = smu_v13_0_0_get_power_profile_mode,	3068	.get_power_profile_mode = smu_v13_0_0_get_power_profile_mode,
3019	.set_power_profile_mode = smu_v13_0_0_set_power_profile_mode,	3069	.set_power_profile_mode = smu_v13_0_0_set_power_profile_mode,

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c+2−2

@@ -160,8 +160,8 @@ static const struct cmn2asic_msg_mapping smu_v13_0_6_message_map[SMU_MSG_MAX_COU · 159 unmodified lines
160	MSG_MAP(GfxDriverResetRecovery, PPSMC_MSG_GfxDriverResetRecovery, 0),	160	MSG_MAP(GfxDriverResetRecovery, PPSMC_MSG_GfxDriverResetRecovery, 0),
161	MSG_MAP(GetMinGfxclkFrequency, PPSMC_MSG_GetMinGfxDpmFreq, 1),	161	MSG_MAP(GetMinGfxclkFrequency, PPSMC_MSG_GetMinGfxDpmFreq, 1),
162	MSG_MAP(GetMaxGfxclkFrequency, PPSMC_MSG_GetMaxGfxDpmFreq, 1),	162	MSG_MAP(GetMaxGfxclkFrequency, PPSMC_MSG_GetMaxGfxDpmFreq, 1),
163	MSG_MAP(SetSoftMinGfxclk, PPSMC_MSG_SetSoftMinGfxClk, 0),	163	MSG_MAP(SetSoftMinGfxclk, PPSMC_MSG_SetSoftMinGfxClk, 1),
164	MSG_MAP(SetSoftMaxGfxClk, PPSMC_MSG_SetSoftMaxGfxClk, 0),	164	MSG_MAP(SetSoftMaxGfxClk, PPSMC_MSG_SetSoftMaxGfxClk, 1),
165	MSG_MAP(PrepareMp1ForUnload, PPSMC_MSG_PrepareForDriverUnload, 0),	165	MSG_MAP(PrepareMp1ForUnload, PPSMC_MSG_PrepareForDriverUnload, 0),
166	MSG_MAP(GetCTFLimit, PPSMC_MSG_GetCTFLimit, 0),	166	MSG_MAP(GetCTFLimit, PPSMC_MSG_GetCTFLimit, 0),
167	MSG_MAP(GetThermalLimit, PPSMC_MSG_ReadThrottlerLimit, 0),	167	MSG_MAP(GetThermalLimit, PPSMC_MSG_ReadThrottlerLimit, 0),

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c+52−2

@@ -2321,6 +2321,7 @@ static int smu_v13_0_7_get_power_limit(struct smu_context *smu, · 2320 unmodified lines
2321	PPTable_t *pptable = table_context->driver_pptable;	2321	PPTable_t *pptable = table_context->driver_pptable;
2322	SkuTable_t *skutable = &pptable->SkuTable;	2322	SkuTable_t *skutable = &pptable->SkuTable;
2323	uint32_t power_limit, od_percent_upper, od_percent_lower;	2323	uint32_t power_limit, od_percent_upper, od_percent_lower;
		2324	uint32_t msg_limit = skutable->MsgLimits.Power[PPT_THROTTLER_PPT0][POWER_SOURCE_AC];
2324		2325
2325	if (smu_v13_0_get_current_power_limit(smu, &power_limit))	2326	if (smu_v13_0_get_current_power_limit(smu, &power_limit))
2326	power_limit = smu->adev->pm.ac_power ?	2327	power_limit = smu->adev->pm.ac_power ?
@@ -2344,7 +2345,7 @@ static int smu_v13_0_7_get_power_limit(struct smu_context *smu, · 17 unmodified lines
2344	od_percent_upper, od_percent_lower, power_limit);	2345	od_percent_upper, od_percent_lower, power_limit);
2345		2346
2346	if (max_power_limit) {	2347	if (max_power_limit) {
2347	max_power_limit = power_limit (100 + od_percent_upper);	2348	max_power_limit = msg_limit (100 + od_percent_upper);
2348	*max_power_limit /= 100;	2349	*max_power_limit /= 100;
2349	}	2350	}
2350		2351
@@ -2545,6 +2546,55 @@ static bool smu_v13_0_7_wbrf_support_check(struct smu_context *smu) · 194 unmodified lines
2545	return smu->smc_fw_version > 0x00524600;	2546	return smu->smc_fw_version > 0x00524600;
2546	}	2547	}
2547		2548
		2549	static int smu_v13_0_7_set_power_limit(struct smu_context *smu,
		2550	enum smu_ppt_limit_type limit_type,
		2551	uint32_t limit)
		2552	{
		2553	PPTable_t *pptable = smu->smu_table.driver_pptable;
		2554	SkuTable_t *skutable = &pptable->SkuTable;
		2555	uint32_t msg_limit = skutable->MsgLimits.Power[PPT_THROTTLER_PPT0][POWER_SOURCE_AC];
		2556	struct smu_table_context *table_context = &smu->smu_table;
		2557	OverDriveTableExternal_t *od_table =
		2558	(OverDriveTableExternal_t *)table_context->overdrive_table;
		2559	int ret = 0;
		2560
		2561	if (limit_type != SMU_DEFAULT_PPT_LIMIT)
		2562	return -EINVAL;
		2563
		2564	if (limit <= msg_limit) {
		2565	if (smu->current_power_limit > msg_limit) {
		2566	od_table->OverDriveTable.Ppt = 0;
		2567	od_table->OverDriveTable.FeatureCtrlMask \|= 1U << PP_OD_FEATURE_PPT_BIT;
		2568
		2569	ret = smu_v13_0_7_upload_overdrive_table(smu, od_table);
		2570	if (ret) {
		2571	dev_err(smu->adev->dev, "Failed to upload overdrive table!\n");
		2572	return ret;
		2573	}
		2574	}
		2575	return smu_v13_0_set_power_limit(smu, limit_type, limit);
		2576	} else if (smu->od_enabled) {
		2577	ret = smu_v13_0_set_power_limit(smu, limit_type, msg_limit);
		2578	if (ret)
		2579	return ret;
		2580
		2581	od_table->OverDriveTable.Ppt = (limit * 100) / msg_limit - 100;
		2582	od_table->OverDriveTable.FeatureCtrlMask \|= 1U << PP_OD_FEATURE_PPT_BIT;
		2583
		2584	ret = smu_v13_0_7_upload_overdrive_table(smu, od_table);
		2585	if (ret) {
		2586	dev_err(smu->adev->dev, "Failed to upload overdrive table!\n");
		2587	return ret;
		2588	}
		2589
		2590	smu->current_power_limit = limit;
		2591	} else {
		2592	return -EINVAL;
		2593	}
		2594
		2595	return 0;
		2596	}
		2597
2548	static const struct pptable_funcs smu_v13_0_7_ppt_funcs = {	2598	static const struct pptable_funcs smu_v13_0_7_ppt_funcs = {
2549	.get_allowed_feature_mask = smu_v13_0_7_get_allowed_feature_mask,	2599	.get_allowed_feature_mask = smu_v13_0_7_get_allowed_feature_mask,
2550	.set_default_dpm_table = smu_v13_0_7_set_default_dpm_table,	2600	.set_default_dpm_table = smu_v13_0_7_set_default_dpm_table,
@@ -2596,7 +2646,7 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs = { · 45 unmodified lines
2596	.set_fan_control_mode = smu_v13_0_set_fan_control_mode,	2646	.set_fan_control_mode = smu_v13_0_set_fan_control_mode,
2597	.enable_mgpu_fan_boost = smu_v13_0_7_enable_mgpu_fan_boost,	2647	.enable_mgpu_fan_boost = smu_v13_0_7_enable_mgpu_fan_boost,
2598	.get_power_limit = smu_v13_0_7_get_power_limit,	2648	.get_power_limit = smu_v13_0_7_get_power_limit,
2599	.set_power_limit = smu_v13_0_set_power_limit,	2649	.set_power_limit = smu_v13_0_7_set_power_limit,
2600	.set_power_source = smu_v13_0_set_power_source,	2650	.set_power_source = smu_v13_0_set_power_source,
2601	.get_power_profile_mode = smu_v13_0_7_get_power_profile_mode,	2651	.get_power_profile_mode = smu_v13_0_7_get_power_profile_mode,
2602	.set_power_profile_mode = smu_v13_0_7_set_power_profile_mode,	2652	.set_power_profile_mode = smu_v13_0_7_set_power_profile_mode,

drivers/gpu/drm/bridge/analogix/anx7625.c+6−1

 	u8 request = msg->request & ~DP_AUX_I2C_MOT;
 	int ret = 0;
+	mutex_lock(&ctx->aux_lock);
 	pm_runtime_get_sync(dev);
 	msg->reply = 0;
 	switch (request) {
 					msg->size, msg->buffer);
 	pm_runtime_mark_last_busy(dev);
 	pm_runtime_put_autosuspend(dev);
+	mutex_unlock(&ctx->aux_lock);
 	return ret;
 }
 	ctx->connector = NULL;
 	anx7625_dp_stop(ctx);
-	pm_runtime_put_sync(dev);
+	mutex_lock(&ctx->aux_lock);
+	pm_runtime_put_sync_suspend(dev);
+	mutex_unlock(&ctx->aux_lock);
 }
 static enum drm_connector_status
 	mutex_init(&platform->lock);
 	mutex_init(&platform->hdcp_wq_lock);
+	mutex_init(&platform->aux_lock);
 	INIT_DELAYED_WORK(&platform->hdcp_work, hdcp_check_work_func);
 	platform->hdcp_workqueue = create_workqueue("hdcp workqueue");

drivers/gpu/drm/bridge/analogix/anx7625.h+2−0

 	struct workqueue_struct *hdcp_workqueue;
 	/* Lock for hdcp work queue */
 	struct mutex hdcp_wq_lock;
+	/* Lock for aux transfer and disable */
+	struct mutex aux_lock;
 	char edid_block;
 	struct display_timing dt;
 	u8 display_timing_valid;

drivers/gpu/drm/bridge/parade-ps8640.c+23−0

 	struct device_link *link;
 	bool pre_enabled;
 	bool need_post_hpd_delay;
+	struct mutex aux_lock;
 };
 static const struct regmap_config ps8640_regmap_config[] = {
 	struct device *dev = &ps_bridge->page[PAGE0_DP_CNTL]->dev;
 	int ret;
+	mutex_lock(&ps_bridge->aux_lock);
 	pm_runtime_get_sync(dev);
+	ret = _ps8640_wait_hpd_asserted(ps_bridge, 200 * 1000);
+	if (ret) {
+		pm_runtime_put_sync_suspend(dev);
+		goto exit;
+	}
 	ret = ps8640_aux_transfer_msg(aux, msg);
 	pm_runtime_mark_last_busy(dev);
 	pm_runtime_put_autosuspend(dev);
+exit:
+	mutex_unlock(&ps_bridge->aux_lock);
 	return ret;
 }
 	ps_bridge->pre_enabled = false;
 	ps8640_bridge_vdo_control(ps_bridge, DISABLE);
+	/*
+	 * The bridge seems to expect everything to be power cycled at the
+	 * disable process, so grab a lock here to make sure
+	 * ps8640_aux_transfer() is not holding a runtime PM reference and
+	 * preventing the bridge from suspend.
+	 */
+	mutex_lock(&ps_bridge->aux_lock);
 	pm_runtime_put_sync_suspend(&ps_bridge->page[PAGE0_DP_CNTL]->dev);
+	mutex_unlock(&ps_bridge->aux_lock);
 }
 static int ps8640_bridge_attach(struct drm_bridge *bridge,
 	if (!ps_bridge)
 		return -ENOMEM;
+	mutex_init(&ps_bridge->aux_lock);
 	ps_bridge->supplies[0].supply = "vdd12";
 	ps_bridge->supplies[1].supply = "vdd33";
 	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ps_bridge->supplies),

drivers/gpu/drm/bridge/samsung-dsim.c+2−30

 	reg = samsung_dsim_read(dsi, DSIM_ESCMODE_REG);
 	reg &= ~DSIM_STOP_STATE_CNT_MASK;
 	reg |= DSIM_STOP_STATE_CNT(driver_data->reg_values[STOP_STATE_CNT]);
-	if (!samsung_dsim_hw_is_exynos(dsi->plat_data->hw_type))
-		reg |= DSIM_FORCE_STOP_STATE;
 	samsung_dsim_write(dsi, DSIM_ESCMODE_REG, reg);
 	reg = DSIM_BTA_TIMEOUT(0xff) | DSIM_LPDR_TIMEOUT(0xffff);
 	disable_irq(dsi->irq);
 }
-static void samsung_dsim_set_stop_state(struct samsung_dsim *dsi, bool enable)
-{
-	u32 reg = samsung_dsim_read(dsi, DSIM_ESCMODE_REG);
-	if (enable)
-		reg |= DSIM_FORCE_STOP_STATE;
-	else
-		reg &= ~DSIM_FORCE_STOP_STATE;
-	samsung_dsim_write(dsi, DSIM_ESCMODE_REG, reg);
-}
 static int samsung_dsim_init(struct samsung_dsim *dsi)
 {
 	const struct samsung_dsim_driver_data *driver_data = dsi->driver_data;
 		ret = samsung_dsim_init(dsi);
 		if (ret)
 			return;
-		samsung_dsim_set_display_mode(dsi);
-		samsung_dsim_set_display_enable(dsi, true);
 	}
 }
 {
 	struct samsung_dsim *dsi = bridge_to_dsi(bridge);
-	if (samsung_dsim_hw_is_exynos(dsi->plat_data->hw_type)) {
+	samsung_dsim_set_display_mode(dsi);
-		samsung_dsim_set_display_mode(dsi);
+	samsung_dsim_set_display_enable(dsi, true);
-		samsung_dsim_set_display_enable(dsi, true);
-	} else {
-		samsung_dsim_set_stop_state(dsi, false);
-	}
 	dsi->state |= DSIM_STATE_VIDOUT_AVAILABLE;
 }
 	if (!(dsi->state & DSIM_STATE_ENABLED))
 		return;
-	if (!samsung_dsim_hw_is_exynos(dsi->plat_data->hw_type))
-		samsung_dsim_set_stop_state(dsi, true);
 	dsi->state &= ~DSIM_STATE_VIDOUT_AVAILABLE;
 }
 	if (ret)
 		return ret;
-	samsung_dsim_set_stop_state(dsi, false);
 	ret = mipi_dsi_create_packet(&xfer.packet, msg);
 	if (ret < 0)
 		return ret;

drivers/gpu/drm/bridge/sii902x.c+29−13

 			return ret;
 	}
+	ret = sii902x_audio_codec_init(sii902x, dev);
+	if (ret)
+		return ret;
+	i2c_set_clientdata(sii902x->i2c, sii902x);
+	sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,
+					1, 0, I2C_MUX_GATE,
+					sii902x_i2c_bypass_select,
+					sii902x_i2c_bypass_deselect);
+	if (!sii902x->i2cmux) {
+		ret = -ENOMEM;
+		goto err_unreg_audio;
+	}
+	sii902x->i2cmux->priv = sii902x;
+	ret = i2c_mux_add_adapter(sii902x->i2cmux, 0, 0, 0);
+	if (ret)
+		goto err_unreg_audio;
 	sii902x->bridge.funcs = &sii902x_bridge_funcs;
 	sii902x->bridge.of_node = dev->of_node;
 	sii902x->bridge.timings = &default_sii902x_timings;
 	drm_bridge_add(&sii902x->bridge);
-	sii902x_audio_codec_init(sii902x, dev);
+	return 0;
-	i2c_set_clientdata(sii902x->i2c, sii902x);
-	sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,
+err_unreg_audio:
-					1, 0, I2C_MUX_GATE,
+	if (!PTR_ERR_OR_ZERO(sii902x->audio.pdev))
-					sii902x_i2c_bypass_select,
+		platform_device_unregister(sii902x->audio.pdev);
-					sii902x_i2c_bypass_deselect);
-	if (!sii902x->i2cmux)
-		return -ENOMEM;
-	sii902x->i2cmux->priv = sii902x;
+	return ret;
-	return i2c_mux_add_adapter(sii902x->i2cmux, 0, 0, 0);
 }
 static int sii902x_probe(struct i2c_client *client)
 }
 static void sii902x_remove(struct i2c_client *client)
 {
 	struct sii902x *sii902x = i2c_get_clientdata(client);
-	i2c_mux_del_adapters(sii902x->i2cmux);
 	drm_bridge_remove(&sii902x->bridge);
+	i2c_mux_del_adapters(sii902x->i2cmux);
+	if (!PTR_ERR_OR_ZERO(sii902x->audio.pdev))
+		platform_device_unregister(sii902x->audio.pdev);
 }
 static const struct of_device_id sii902x_dt_ids[] = {

drivers/gpu/drm/display/drm_dp_mst_topology.c+2−0

  *   - 0 if the new state is valid
  *   - %-ENOSPC, if the new state is invalid, because of BW limitation
  *         @failing_port is set to:
+ *
  *         - The non-root port where a BW limit check failed
  *           with all the ports downstream of @failing_port passing
  *           the BW limit check.
  *         - %NULL if the BW limit check failed at the root port
  *           with all the ports downstream of the root port passing
  *           the BW limit check.
+ *
  *   - %-EINVAL, if the new state is invalid, because the root port has
  *     too many payloads.
  */

drivers/gpu/drm/exynos/exynos5433_drm_decon.c+2−2

@@ -319,9 +319,9 @@ static void decon_win_set_bldmod(struct decon_context *ctx, unsigned int win, · 318 unmodified lines
319	static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,	319	static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,
320	struct drm_framebuffer *fb)	320	struct drm_framebuffer *fb)
321	{	321	{
322	struct exynos_drm_plane plane = ctx->planes[win];	322	struct exynos_drm_plane *plane = &ctx->planes[win];
323	struct exynos_drm_plane_state *state =	323	struct exynos_drm_plane_state *state =
324	to_exynos_plane_state(plane.base.state);	324	to_exynos_plane_state(plane->base.state);
325	unsigned int alpha = state->base.alpha;	325	unsigned int alpha = state->base.alpha;
326	unsigned int pixel_alpha;	326	unsigned int pixel_alpha;
327	unsigned long val;	327	unsigned long val;

drivers/gpu/drm/exynos/exynos_drm_fimd.c+3−3

@@ -480,7 +480,7 @@ static void fimd_commit(struct exynos_drm_crtc *crtc) · 479 unmodified lines
480	struct fimd_context *ctx = crtc->ctx;	480	struct fimd_context *ctx = crtc->ctx;
481	struct drm_display_mode *mode = &crtc->base.state->adjusted_mode;	481	struct drm_display_mode *mode = &crtc->base.state->adjusted_mode;
482	const struct fimd_driver_data *driver_data = ctx->driver_data;	482	const struct fimd_driver_data *driver_data = ctx->driver_data;
483	void *timing_base = ctx->regs + driver_data->timing_base;	483	void __iomem *timing_base = ctx->regs + driver_data->timing_base;
484	u32 val;	484	u32 val;
485		485
486	if (ctx->suspended)	486	if (ctx->suspended)
@@ -661,9 +661,9 @@ static void fimd_win_set_bldmod(struct fimd_context *ctx, unsigned int win, · 174 unmodified lines
661	static void fimd_win_set_pixfmt(struct fimd_context *ctx, unsigned int win,	661	static void fimd_win_set_pixfmt(struct fimd_context *ctx, unsigned int win,
662	struct drm_framebuffer *fb, int width)	662	struct drm_framebuffer *fb, int width)
663	{	663	{
664	struct exynos_drm_plane plane = ctx->planes[win];	664	struct exynos_drm_plane *plane = &ctx->planes[win];
665	struct exynos_drm_plane_state *state =	665	struct exynos_drm_plane_state *state =
666	to_exynos_plane_state(plane.base.state);	666	to_exynos_plane_state(plane->base.state);
667	uint32_t pixel_format = fb->format->format;	667	uint32_t pixel_format = fb->format->format;
668	unsigned int alpha = state->base.alpha;	668	unsigned int alpha = state->base.alpha;
669	u32 val = WINCONx_ENWIN;	669	u32 val = WINCONx_ENWIN;

drivers/gpu/drm/exynos/exynos_drm_gsc.c+1−1

@@ -1341,7 +1341,7 @@ static int __maybe_unused gsc_runtime_resume(struct device *dev) · 1340 unmodified lines
1341	for (i = 0; i < ctx->num_clocks; i++) {	1341	for (i = 0; i < ctx->num_clocks; i++) {
1342	ret = clk_prepare_enable(ctx->clocks[i]);	1342	ret = clk_prepare_enable(ctx->clocks[i]);
1343	if (ret) {	1343	if (ret) {
1344	while (--i > 0)	1344	while (--i >= 0)
1345	clk_disable_unprepare(ctx->clocks[i]);	1345	clk_disable_unprepare(ctx->clocks[i]);
1346	return ret;	1346	return ret;
1347	}	1347	}

drivers/gpu/drm/i915/Makefile+0−1

@@ -17,7 +17,6 @@ subdir-ccflags-y += $(call cc-option, -Wunused-const-variable) · 16 unmodified lines
17	subdir-ccflags-y += $(call cc-option, -Wpacked-not-aligned)	17	subdir-ccflags-y += $(call cc-option, -Wpacked-not-aligned)
18	subdir-ccflags-y += $(call cc-option, -Wformat-overflow)	18	subdir-ccflags-y += $(call cc-option, -Wformat-overflow)
19	subdir-ccflags-y += $(call cc-option, -Wformat-truncation)	19	subdir-ccflags-y += $(call cc-option, -Wformat-truncation)
20	subdir-ccflags-y += $(call cc-option, -Wstringop-overflow)
21	subdir-ccflags-y += $(call cc-option, -Wstringop-truncation)	20	subdir-ccflags-y += $(call cc-option, -Wstringop-truncation)
22	# The following turn off the warnings enabled by -Wextra	21	# The following turn off the warnings enabled by -Wextra
23	ifeq ($(findstring 2, $(KBUILD_EXTRA_WARN)),)	22	ifeq ($(findstring 2, $(KBUILD_EXTRA_WARN)),)

drivers/gpu/drm/i915/display/icl_dsi.c+1−2

 	}
 	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_INIT_OTP);
+	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_ON);
 	/* ensure all panel commands dispatched before enabling transcoder */
 	wait_for_cmds_dispatched_to_panel(encoder);
 	/* step6d: enable dsi transcoder */
 	gen11_dsi_enable_transcoder(encoder);
-	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_ON);
 	/* step7: enable backlight */
 	intel_backlight_enable(crtc_state, conn_state);
 	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_ON);

drivers/gpu/drm/i915/display/intel_psr.c+12−2

@@ -1525,8 +1525,18 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, · 1524 unmodified lines
1525	* can rely on frontbuffer tracking.	1525	* can rely on frontbuffer tracking.
1526	*/	1526	*/
1527	mask = EDP_PSR_DEBUG_MASK_MEMUP \|	1527	mask = EDP_PSR_DEBUG_MASK_MEMUP \|
1528	EDP_PSR_DEBUG_MASK_HPD \|	1528	EDP_PSR_DEBUG_MASK_HPD;
1529	EDP_PSR_DEBUG_MASK_LPSP;	1529
		1530	/*
		1531	* For some unknown reason on HSW non-ULT (or at least on
		1532	* Dell Latitude E6540) external displays start to flicker
		1533	* when PSR is enabled on the eDP. SR/PC6 residency is much
		1534	* higher than should be possible with an external display.
		1535	* As a workaround leave LPSP unmasked to prevent PSR entry
		1536	* when external displays are active.
		1537	*/
		1538	if (DISPLAY_VER(dev_priv) >= 8 \|\| IS_HASWELL_ULT(dev_priv))
		1539	mask \|= EDP_PSR_DEBUG_MASK_LPSP;
1530		1540
1531	if (DISPLAY_VER(dev_priv) < 20)	1541	if (DISPLAY_VER(dev_priv) < 20)
1532	mask \|= EDP_PSR_DEBUG_MASK_MAX_SLEEP;	1542	mask \|= EDP_PSR_DEBUG_MASK_MAX_SLEEP;

drivers/gpu/drm/nouveau/nouveau_fence.c+5−23

 	if (test_bit(DMA_FENCE_FLAG_USER_BITS, &fence->base.flags)) {
 		struct nouveau_fence_chan *fctx = nouveau_fctx(fence);
-		if (atomic_dec_and_test(&fctx->notify_ref))
+		if (!--fctx->notify_ref)
 			drop = 1;
 	}
 void
 nouveau_fence_context_del(struct nouveau_fence_chan *fctx)
 {
-	cancel_work_sync(&fctx->allow_block_work);
 	nouveau_fence_context_kill(fctx, 0);
 	nvif_event_dtor(&fctx->event);
 	fctx->dead = 1;
 	return ret;
 }
-static void
-nouveau_fence_work_allow_block(struct work_struct *work)
-{
-	struct nouveau_fence_chan *fctx = container_of(work, struct nouveau_fence_chan,
-						       allow_block_work);
-	if (atomic_read(&fctx->notify_ref) == 0)
-		nvif_event_block(&fctx->event);
-	else
-		nvif_event_allow(&fctx->event);
-}
 void
 nouveau_fence_context_new(struct nouveau_channel *chan, struct nouveau_fence_chan *fctx)
 {
 	} args;
 	int ret;
-	INIT_WORK(&fctx->allow_block_work, nouveau_fence_work_allow_block);
 	INIT_LIST_HEAD(&fctx->flip);
 	INIT_LIST_HEAD(&fctx->pending);
 	spin_lock_init(&fctx->lock);
 	struct nouveau_fence *fence = from_fence(f);
 	struct nouveau_fence_chan *fctx = nouveau_fctx(fence);
 	bool ret;
-	bool do_work;
-	if (atomic_inc_return(&fctx->notify_ref) == 0)
+	if (!fctx->notify_ref++)
-		do_work = true;
+		nvif_event_allow(&fctx->event);
 	ret = nouveau_fence_no_signaling(f);
 	if (ret)
 		set_bit(DMA_FENCE_FLAG_USER_BITS, &fence->base.flags);
-	else if (atomic_dec_and_test(&fctx->notify_ref))
+	else if (!--fctx->notify_ref)
-		do_work = true;
+		nvif_event_block(&fctx->event);
-	if (do_work)
-		schedule_work(&fctx->allow_block_work);
 	return ret;
 }

drivers/gpu/drm/nouveau/nouveau_fence.h+1−4

 #define __NOUVEAU_FENCE_H__
 #include <linux/dma-fence.h>
-#include <linux/workqueue.h>
 #include <nvif/event.h>
 struct nouveau_drm;
 	char name[32];
 	struct nvif_event event;
-	struct work_struct allow_block_work;
+	int notify_ref, dead, killed;
-	atomic_t notify_ref;
-	int dead, killed;
 };
 struct nouveau_fence_priv {

drivers/gpu/drm/panel/Kconfig+2−0

 	depends on OF
 	depends on DRM_MIPI_DSI
 	depends on BACKLIGHT_CLASS_DEVICE
+	select DRM_DISPLAY_DP_HELPER
+	select DRM_DISPLAY_HELPER
 	help
 	  Say Y here if you want to enable support for Raydium RM692E5-based
 	  display panels, such as the one found in the Fairphone 5 smartphone.

drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c+1−1

@@ -309,7 +309,7 @@ static const struct s6d7aa0_panel_desc s6d7aa0_lsl080al02_desc = { · 308 unmodified lines
309	.off_func = s6d7aa0_lsl080al02_off,	309	.off_func = s6d7aa0_lsl080al02_off,
310	.drm_mode = &s6d7aa0_lsl080al02_mode,	310	.drm_mode = &s6d7aa0_lsl080al02_mode,
311	.mode_flags = MIPI_DSI_MODE_VSYNC_FLUSH \| MIPI_DSI_MODE_VIDEO_NO_HFP,	311	.mode_flags = MIPI_DSI_MODE_VSYNC_FLUSH \| MIPI_DSI_MODE_VIDEO_NO_HFP,
312	.bus_flags = DRM_BUS_FLAG_DE_HIGH,	312	.bus_flags = 0,
313		313
314	.has_backlight = false,	314	.has_backlight = false,
315	.use_passwd3 = false,	315	.use_passwd3 = false,

drivers/gpu/drm/panel/panel-simple.c+2−0

 	},
 	.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
 	.connector_type = DRM_MODE_CONNECTOR_LVDS,
+	.bus_flags = DRM_BUS_FLAG_DE_HIGH,
 };
 static const struct panel_desc tianma_tm070jvhg33 = {
 	},
 	.bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
 	.connector_type = DRM_MODE_CONNECTOR_LVDS,
+	.bus_flags = DRM_BUS_FLAG_DE_HIGH,
 };
 static const struct display_timing tianma_tm070rvhg71_timing = {

drivers/gpu/drm/scheduler/sched_main.c+7−8

 	struct drm_sched_entity *entity;
 	struct dma_fence *fence;
 	struct drm_sched_fence *s_fence;
-	struct drm_sched_job *sched_job;
+	struct drm_sched_job *sched_job = NULL;
 	int r;
 	if (READ_ONCE(sched->pause_submit))
 		return;
-	entity = drm_sched_select_entity(sched);
+	/* Find entity with a ready job */
+	while (!sched_job && (entity = drm_sched_select_entity(sched))) {
+		sched_job = drm_sched_entity_pop_job(entity);
+		if (!sched_job)
+			complete_all(&entity->entity_idle);
+	}
 	if (!entity)
-		return;
-	sched_job = drm_sched_entity_pop_job(entity);
-	if (!sched_job) {
-		complete_all(&entity->entity_idle);
 		return;	/* No more work */
-	}
 	s_fence = sched_job->s_fence;

drivers/gpu/drm/tests/drm_mm_test.c+4−1

 static void drm_test_mm_debug(struct kunit *test)
 {
+	struct drm_printer p = drm_debug_printer(test->name);
 	struct drm_mm mm;
 	struct drm_mm_node nodes[2];
 	/* Create a small drm_mm with a couple of nodes and a few holes, and
 	 * check that the debug iterator doesn't explode over a trivial drm_mm.
 	 */
 	drm_mm_init(&mm, 0, 4096);
 	memset(nodes, 0, sizeof(nodes));
 	KUNIT_ASSERT_FALSE_MSG(test, drm_mm_reserve_node(&mm, &nodes[1]),
 			       "failed to reserve node[0] {start=%lld, size=%lld)\n",
 			       nodes[0].start, nodes[0].size);
+	drm_mm_print(&mm, &p);
+	KUNIT_SUCCEED(test);
 }
 static bool expect_insert(struct kunit *test, struct drm_mm *mm,

drivers/gpu/drm/ttm/ttm_device.c+9−3

 	ttm_pool_mgr_init(num_pages);
 	ttm_tt_mgr_init(num_pages, num_dma32);
-	glob->dummy_read_page = alloc_page(__GFP_ZERO | GFP_DMA32);
+	glob->dummy_read_page = alloc_page(__GFP_ZERO | GFP_DMA32 |
+					   __GFP_NOWARN);
+	/* Retry without GFP_DMA32 for platforms DMA32 is not available */
 	if (unlikely(glob->dummy_read_page == NULL)) {
-		ret = -ENOMEM;
+		glob->dummy_read_page = alloc_page(__GFP_ZERO);
-		goto out;
+		if (unlikely(glob->dummy_read_page == NULL)) {
+			ret = -ENOMEM;
+			goto out;
+		}
+		pr_warn("Using GFP_DMA32 fallback for dummy_read_page\n");
 	}
 	INIT_LIST_HEAD(&glob->device_list);

drivers/gpu/drm/v3d/v3d_submit.c+28−7

 	return 0;
 }
+static void
+v3d_job_deallocate(void **container)
+{
+	kfree(*container);
+	*container = NULL;
+}
 static int
 v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv,
 	     struct v3d_job *job, void (*free)(struct kref *ref),
 	ret = v3d_job_init(v3d, file_priv, &(*job)->base,
 			   v3d_job_free, args->in_sync, se, V3D_CSD);
-	if (ret)
+	if (ret) {
+		v3d_job_deallocate((void *)job);
 		return ret;
+	}
 	ret = v3d_job_allocate((void *)clean_job, sizeof(**clean_job));
 	if (ret)
 	ret = v3d_job_init(v3d, file_priv, *clean_job,
 			   v3d_job_free, 0, NULL, V3D_CACHE_CLEAN);
-	if (ret)
+	if (ret) {
+		v3d_job_deallocate((void *)clean_job);
 		return ret;
+	}
 	(*job)->args = *args;
 	ret = v3d_job_init(v3d, file_priv, &render->base,
 			   v3d_render_job_free, args->in_sync_rcl, &se, V3D_RENDER);
-	if (ret)
+	if (ret) {
+		v3d_job_deallocate((void *)&render);
 		goto fail;
+	}
 	render->start = args->rcl_start;
 	render->end = args->rcl_end;
 		ret = v3d_job_init(v3d, file_priv, &bin->base,
 				   v3d_job_free, args->in_sync_bcl, &se, V3D_BIN);
-		if (ret)
+		if (ret) {
+			v3d_job_deallocate((void *)&bin);
 			goto fail;
+		}
 		bin->start = args->bcl_start;
 		bin->end = args->bcl_end;
 		ret = v3d_job_init(v3d, file_priv, clean_job,
 				   v3d_job_free, 0, NULL, V3D_CACHE_CLEAN);
-		if (ret)
+		if (ret) {
+			v3d_job_deallocate((void *)&clean_job);
 			goto fail;
+		}
 		last_job = clean_job;
 	} else {
 	ret = v3d_job_init(v3d, file_priv, &job->base,
 			   v3d_job_free, args->in_sync, &se, V3D_TFU);
-	if (ret)
+	if (ret) {
+		v3d_job_deallocate((void *)&job);
 		goto fail;
+	}
 	job->base.bo = kcalloc(ARRAY_SIZE(args->bo_handles),
 			       sizeof(*job->base.bo), GFP_KERNEL);
 	ret = v3d_job_init(v3d, file_priv, &cpu_job->base,
 			   v3d_job_free, 0, &se, V3D_CPU);
-	if (ret)
+	if (ret) {
+		v3d_job_deallocate((void *)&cpu_job);
 		goto fail;
+	}
 	clean_job = cpu_job->indirect_csd.clean_job;
 	csd_job = cpu_job->indirect_csd.job;

drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h+5−6

 					  u32 ofs, u64 *ptr, u32 size)
 {
 	struct ttm_bo_kmap_obj map;
-	void *virtual;
+	void *src;
 	bool is_iomem;
 	int ret;
-	XE_WARN_ON(size != 8);
 	ret = xe_bo_lock(bo, true);
 	if (ret)
 		return ret;
 		goto out_unlock;
 	ofs &= ~PAGE_MASK;
-	virtual = ttm_kmap_obj_virtual(&map, &is_iomem);
+	src = ttm_kmap_obj_virtual(&map, &is_iomem);
+	src += ofs;
 	if (is_iomem)
-		*ptr = readq((void __iomem *)(virtual + ofs));
+		memcpy_fromio(ptr, (void __iomem *)src, size);
 	else
-		*ptr = *(u64 *)(virtual + ofs);
+		memcpy(ptr, src, size);
 	ttm_bo_kunmap(&map);
 out_unlock:

drivers/gpu/drm/xe/tests/xe_wa_test.c+0−3

 	SUBPLATFORM_CASE(DG2, G11, B1),
 	SUBPLATFORM_CASE(DG2, G12, A0),
 	SUBPLATFORM_CASE(DG2, G12, A1),
-	PLATFORM_CASE(PVC, B0),
-	PLATFORM_CASE(PVC, B1),
-	PLATFORM_CASE(PVC, C0),
 	GMDID_CASE(METEORLAKE, 1270, A0, 1300, A0),
 	GMDID_CASE(METEORLAKE, 1271, A0, 1300, A0),
 	GMDID_CASE(LUNARLAKE, 2004, A0, 2000, A0),

drivers/gpu/drm/xe/xe_device.c+1−1

@@ -613,7 +613,7 @@ void xe_device_wmb(struct xe_device *xe) · 612 unmodified lines
613	u32 xe_device_ccs_bytes(struct xe_device *xe, u64 size)	613	u32 xe_device_ccs_bytes(struct xe_device *xe, u64 size)
614	{	614	{
615	return xe_device_has_flat_ccs(xe) ?	615	return xe_device_has_flat_ccs(xe) ?
616	DIV_ROUND_UP(size, NUM_BYTES_PER_CCS_BYTE(xe)) : 0;	616	DIV_ROUND_UP_ULL(size, NUM_BYTES_PER_CCS_BYTE(xe)) : 0;
617	}	617	}
618		618
619	bool xe_device_mem_access_ongoing(struct xe_device *xe)	619	bool xe_device_mem_access_ongoing(struct xe_device *xe)

drivers/gpu/drm/xe/xe_dma_buf.c+1−1

@@ -175,7 +175,7 @@ static int xe_dma_buf_begin_cpu_access(struct dma_buf *dma_buf, · 174 unmodified lines
175	return 0;	175	return 0;
176	}	176	}
177		177
178	const struct dma_buf_ops xe_dmabuf_ops = {	178	static const struct dma_buf_ops xe_dmabuf_ops = {
179	.attach = xe_dma_buf_attach,	179	.attach = xe_dma_buf_attach,
180	.detach = xe_dma_buf_detach,	180	.detach = xe_dma_buf_detach,
181	.pin = xe_dma_buf_pin,	181	.pin = xe_dma_buf_pin,

drivers/gpu/drm/xe/xe_hwmon.c+1−1

@@ -419,7 +419,7 @@ static int xe_hwmon_pcode_read_i1(struct xe_gt gt, u32 uval) · 418 unmodified lines
419		419
420	return xe_pcode_read(gt, PCODE_MBOX(PCODE_POWER_SETUP,	420	return xe_pcode_read(gt, PCODE_MBOX(PCODE_POWER_SETUP,
421	POWER_SETUP_SUBCOMMAND_READ_I1, 0),	421	POWER_SETUP_SUBCOMMAND_READ_I1, 0),
422	uval, 0);	422	uval, NULL);
423	}	423	}
424		424
425	static int xe_hwmon_pcode_write_i1(struct xe_gt *gt, u32 uval)	425	static int xe_hwmon_pcode_write_i1(struct xe_gt *gt, u32 uval)

drivers/gpu/drm/xe/xe_migrate.c+7−7

@@ -472,7 +472,7 @@ static void emit_pte(struct xe_migrate *m, · 471 unmodified lines
472	/* Indirect access needs compression enabled uncached PAT index */	472	/* Indirect access needs compression enabled uncached PAT index */
473	if (GRAPHICS_VERx100(xe) >= 2000)	473	if (GRAPHICS_VERx100(xe) >= 2000)
474	pat_index = is_comp_pte ? xe->pat.idx[XE_CACHE_NONE_COMPRESSION] :	474	pat_index = is_comp_pte ? xe->pat.idx[XE_CACHE_NONE_COMPRESSION] :
475	xe->pat.idx[XE_CACHE_NONE];	475	xe->pat.idx[XE_CACHE_WB];
476	else	476	else
477	pat_index = xe->pat.idx[XE_CACHE_WB];	477	pat_index = xe->pat.idx[XE_CACHE_WB];
478		478
@@ -760,14 +760,14 @@ struct dma_fence xe_migrate_copy(struct xe_migrate m, · 281 unmodified lines
760	if (src_is_vram && xe_migrate_allow_identity(src_L0, &src_it))	760	if (src_is_vram && xe_migrate_allow_identity(src_L0, &src_it))
761	xe_res_next(&src_it, src_L0);	761	xe_res_next(&src_it, src_L0);
762	else	762	else
763	emit_pte(m, bb, src_L0_pt, src_is_vram, true, &src_it, src_L0,	763	emit_pte(m, bb, src_L0_pt, src_is_vram, copy_system_ccs,
764	src);	764	&src_it, src_L0, src);
765		765
766	if (dst_is_vram && xe_migrate_allow_identity(src_L0, &dst_it))	766	if (dst_is_vram && xe_migrate_allow_identity(src_L0, &dst_it))
767	xe_res_next(&dst_it, src_L0);	767	xe_res_next(&dst_it, src_L0);
768	else	768	else
769	emit_pte(m, bb, dst_L0_pt, dst_is_vram, true, &dst_it, src_L0,	769	emit_pte(m, bb, dst_L0_pt, dst_is_vram, copy_system_ccs,
770	dst);	770	&dst_it, src_L0, dst);
771		771
772	if (copy_system_ccs)	772	if (copy_system_ccs)
773	emit_pte(m, bb, ccs_pt, false, false, &ccs_it, ccs_size, src);	773	emit_pte(m, bb, ccs_pt, false, false, &ccs_it, ccs_size, src);
@@ -1009,8 +1009,8 @@ struct dma_fence xe_migrate_clear(struct xe_migrate m, · 235 unmodified lines
1009	if (clear_vram && xe_migrate_allow_identity(clear_L0, &src_it))	1009	if (clear_vram && xe_migrate_allow_identity(clear_L0, &src_it))
1010	xe_res_next(&src_it, clear_L0);	1010	xe_res_next(&src_it, clear_L0);
1011	else	1011	else
1012	emit_pte(m, bb, clear_L0_pt, clear_vram, true, &src_it, clear_L0,	1012	emit_pte(m, bb, clear_L0_pt, clear_vram, clear_system_ccs,
1013	dst);	1013	&src_it, clear_L0, dst);
1014		1014
1015	bb->cs[bb->len++] = MI_BATCH_BUFFER_END;	1015	bb->cs[bb->len++] = MI_BATCH_BUFFER_END;
1016	update_idx = bb->len;	1016	update_idx = bb->len;

drivers/gpu/drm/xe/xe_mmio.c+2−2

@@ -272,8 +272,8 @@ int xe_mmio_probe_vram(struct xe_device *xe) · 271 unmodified lines
272	drm_info(&xe->drm, "VRAM[%u, %u]: Actual physical size %pa, usable size exclude stolen %pa, CPU accessible size %pa\n", id,	272	drm_info(&xe->drm, "VRAM[%u, %u]: Actual physical size %pa, usable size exclude stolen %pa, CPU accessible size %pa\n", id,
273	tile->id, &tile->mem.vram.actual_physical_size, &tile->mem.vram.usable_size, &tile->mem.vram.io_size);	273	tile->id, &tile->mem.vram.actual_physical_size, &tile->mem.vram.usable_size, &tile->mem.vram.io_size);
274	drm_info(&xe->drm, "VRAM[%u, %u]: DPA range: [%pa-%llx], io range: [%pa-%llx]\n", id, tile->id,	274	drm_info(&xe->drm, "VRAM[%u, %u]: DPA range: [%pa-%llx], io range: [%pa-%llx]\n", id, tile->id,
275	&tile->mem.vram.dpa_base, tile->mem.vram.dpa_base + tile->mem.vram.actual_physical_size,	275	&tile->mem.vram.dpa_base, tile->mem.vram.dpa_base + (u64)tile->mem.vram.actual_physical_size,
276	&tile->mem.vram.io_start, tile->mem.vram.io_start + tile->mem.vram.io_size);	276	&tile->mem.vram.io_start, tile->mem.vram.io_start + (u64)tile->mem.vram.io_size);
277		277
278	/* calculate total size using tile size to get the correct HW sizing */	278	/* calculate total size using tile size to get the correct HW sizing */
279	total_size += tile_size;	279	total_size += tile_size;

drivers/gpu/drm/xe/xe_vm.c+14−9

@@ -1855,10 +1855,8 @@ int xe_vm_create_ioctl(struct drm_device dev, void data, · 1854 unmodified lines
1855	mutex_lock(&xef->vm.lock);	1855	mutex_lock(&xef->vm.lock);
1856	err = xa_alloc(&xef->vm.xa, &id, vm, xa_limit_32b, GFP_KERNEL);	1856	err = xa_alloc(&xef->vm.xa, &id, vm, xa_limit_32b, GFP_KERNEL);
1857	mutex_unlock(&xef->vm.lock);	1857	mutex_unlock(&xef->vm.lock);
1858	if (err) {	1858	if (err)
1859	xe_vm_close_and_put(vm);	1859	goto err_close_and_put;
1860	return err;
1861	}
1862		1860
1863	if (xe->info.has_asid) {	1861	if (xe->info.has_asid) {
1864	mutex_lock(&xe->usm.lock);	1862	mutex_lock(&xe->usm.lock);
@@ -1866,11 +1864,9 @@ int xe_vm_create_ioctl(struct drm_device dev, void data, · 1 unmodified line
1866	XA_LIMIT(1, XE_MAX_ASID - 1),	1864	XA_LIMIT(1, XE_MAX_ASID - 1),
1867	&xe->usm.next_asid, GFP_KERNEL);	1865	&xe->usm.next_asid, GFP_KERNEL);
1868	mutex_unlock(&xe->usm.lock);	1866	mutex_unlock(&xe->usm.lock);
1869	if (err < 0) {	1867	if (err < 0)
1870	xe_vm_close_and_put(vm);	1868	goto err_free_id;
1871	return err;	1869
1872	}
1873	err = 0;
1874	vm->usm.asid = asid;	1870	vm->usm.asid = asid;
1875	}	1871	}
1876		1872
@@ -1888,6 +1884,15 @@ int xe_vm_create_ioctl(struct drm_device dev, void data, · 11 unmodified lines
1888	#endif	1884	#endif
1889		1885
1890	return 0;	1886	return 0;
		1887
		1888	err_free_id:
		1889	mutex_lock(&xef->vm.lock);
		1890	xa_erase(&xef->vm.xa, id);
		1891	mutex_unlock(&xef->vm.lock);
		1892	err_close_and_put:
		1893	xe_vm_close_and_put(vm);
		1894
		1895	return err;
1891	}	1896	}
1892		1897
1893	int xe_vm_destroy_ioctl(struct drm_device dev, void data,	1898	int xe_vm_destroy_ioctl(struct drm_device dev, void data,

drivers/hid/bpf/hid_bpf_dispatch.c+74−27

@@ -143,6 +143,9 @@ u8 call_hid_bpf_rdesc_fixup(struct hid_device hdev, u8 rdesc, unsigned int s · 142 unmodified lines
143	}	143	}
144	EXPORT_SYMBOL_GPL(call_hid_bpf_rdesc_fixup);	144	EXPORT_SYMBOL_GPL(call_hid_bpf_rdesc_fixup);
145		145
		146	/* Disables missing prototype warnings */
		147	__bpf_kfunc_start_defs();
		148
146	/**	149	/**
147	* hid_bpf_get_data - Get the kernel memory pointer associated with the context @ctx	150	* hid_bpf_get_data - Get the kernel memory pointer associated with the context @ctx
148	*	151	*
@@ -152,7 +155,7 @@ EXPORT_SYMBOL_GPL(call_hid_bpf_rdesc_fixup); · 3 unmodified lines
152	*	155	*
153	* @returns %NULL on error, an %__u8 memory pointer on success	156	* @returns %NULL on error, an %__u8 memory pointer on success
154	*/	157	*/
155	noinline __u8 *	158	__bpf_kfunc __u8 *
156	hid_bpf_get_data(struct hid_bpf_ctx *ctx, unsigned int offset, const size_t rdwr_buf_size)	159	hid_bpf_get_data(struct hid_bpf_ctx *ctx, unsigned int offset, const size_t rdwr_buf_size)
157	{	160	{
158	struct hid_bpf_ctx_kern *ctx_kern;	161	struct hid_bpf_ctx_kern *ctx_kern;
@@ -167,6 +170,7 @@ hid_bpf_get_data(struct hid_bpf_ctx *ctx, unsigned int offset, const size_t rdwr · 8 unmodified lines
167		170
168	return ctx_kern->data + offset;	171	return ctx_kern->data + offset;
169	}	172	}
		173	__bpf_kfunc_end_defs();
170		174
171	/*	175	/*
172	* The following set contains all functions we agree BPF programs	176	* The following set contains all functions we agree BPF programs
@@ -241,6 +245,42 @@ int hid_bpf_reconnect(struct hid_device *hdev) · 68 unmodified lines
241	return 0;	245	return 0;
242	}	246	}
243		247
		248	static int do_hid_bpf_attach_prog(struct hid_device hdev, int prog_fd, struct bpf_prog prog,
		249	__u32 flags)
		250	{
		251	int fd, err, prog_type;
		252
		253	prog_type = hid_bpf_get_prog_attach_type(prog);
		254	if (prog_type < 0)
		255	return prog_type;
		256
		257	if (prog_type >= HID_BPF_PROG_TYPE_MAX)
		258	return -EINVAL;
		259
		260	if (prog_type == HID_BPF_PROG_TYPE_DEVICE_EVENT) {
		261	err = hid_bpf_allocate_event_data(hdev);
		262	if (err)
		263	return err;
		264	}
		265
		266	fd = __hid_bpf_attach_prog(hdev, prog_type, prog_fd, prog, flags);
		267	if (fd < 0)
		268	return fd;
		269
		270	if (prog_type == HID_BPF_PROG_TYPE_RDESC_FIXUP) {
		271	err = hid_bpf_reconnect(hdev);
		272	if (err) {
		273	close_fd(fd);
		274	return err;
		275	}
		276	}
		277
		278	return fd;
		279	}
		280
		281	/* Disables missing prototype warnings */
		282	__bpf_kfunc_start_defs();
		283
244	/**	284	/**
245	* hid_bpf_attach_prog - Attach the given @prog_fd to the given HID device	285	* hid_bpf_attach_prog - Attach the given @prog_fd to the given HID device
246	*	286	*
@@ -253,22 +293,17 @@ int hid_bpf_reconnect(struct hid_device *hdev) · 6 unmodified lines
253	* is pinned to the BPF file system).	293	* is pinned to the BPF file system).
254	*/	294	*/
255	/* called from syscall */	295	/* called from syscall */
256	noinline int	296	__bpf_kfunc int
257	hid_bpf_attach_prog(unsigned int hid_id, int prog_fd, __u32 flags)	297	hid_bpf_attach_prog(unsigned int hid_id, int prog_fd, __u32 flags)
258	{	298	{
259	struct hid_device *hdev;	299	struct hid_device *hdev;
		300	struct bpf_prog *prog;
260	struct device *dev;	301	struct device *dev;
261	int fd, err, prog_type = hid_bpf_get_prog_attach_type(prog_fd);	302	int err, fd;
262		303
263	if (!hid_bpf_ops)	304	if (!hid_bpf_ops)
264	return -EINVAL;	305	return -EINVAL;
265		306
266	if (prog_type < 0)
267	return prog_type;
268
269	if (prog_type >= HID_BPF_PROG_TYPE_MAX)
270	return -EINVAL;
271
272	if ((flags & ~HID_BPF_FLAG_MASK))	307	if ((flags & ~HID_BPF_FLAG_MASK))
273	return -EINVAL;	308	return -EINVAL;
274		309
@@ -278,25 +313,29 @@ hid_bpf_attach_prog(unsigned int hid_id, int prog_fd, __u32 flags) · 3 unmodified lines
278		313
279	hdev = to_hid_device(dev);	314	hdev = to_hid_device(dev);
280		315
281	if (prog_type == HID_BPF_PROG_TYPE_DEVICE_EVENT) {	316	/*
282	err = hid_bpf_allocate_event_data(hdev);	317	* take a ref on the prog itself, it will be released
283	if (err)	318	* on errors or when it'll be detached
284	return err;	319	*/
		320	prog = bpf_prog_get(prog_fd);
		321	if (IS_ERR(prog)) {
		322	err = PTR_ERR(prog);
		323	goto out_dev_put;
285	}	324	}
286		325
287	fd = __hid_bpf_attach_prog(hdev, prog_type, prog_fd, flags);	326	fd = do_hid_bpf_attach_prog(hdev, prog_fd, prog, flags);
288	if (fd < 0)	327	if (fd < 0) {
289	return fd;	328	err = fd;
290		329	goto out_prog_put;
291	if (prog_type == HID_BPF_PROG_TYPE_RDESC_FIXUP) {
292	err = hid_bpf_reconnect(hdev);
293	if (err) {
294	close_fd(fd);
295	return err;
296	}
297	}	330	}
298		331
299	return fd;	332	return fd;
		333
		334	out_prog_put:
		335	bpf_prog_put(prog);
		336	out_dev_put:
		337	put_device(dev);
		338	return err;
300	}	339	}
301		340
302	/**	341	/**
@@ -306,7 +345,7 @@ hid_bpf_attach_prog(unsigned int hid_id, int prog_fd, __u32 flags) · 3 unmodified lines
306	*	345	*
307	* @returns A pointer to &struct hid_bpf_ctx on success, %NULL on error.	346	* @returns A pointer to &struct hid_bpf_ctx on success, %NULL on error.
308	*/	347	*/
309	noinline struct hid_bpf_ctx *	348	__bpf_kfunc struct hid_bpf_ctx *
310	hid_bpf_allocate_context(unsigned int hid_id)	349	hid_bpf_allocate_context(unsigned int hid_id)
311	{	350	{
312	struct hid_device *hdev;	351	struct hid_device *hdev;
@@ -323,8 +362,10 @@ hid_bpf_allocate_context(unsigned int hid_id) · 10 unmodified lines
323	hdev = to_hid_device(dev);	362	hdev = to_hid_device(dev);
324		363
325	ctx_kern = kzalloc(sizeof(*ctx_kern), GFP_KERNEL);	364	ctx_kern = kzalloc(sizeof(*ctx_kern), GFP_KERNEL);
326	if (!ctx_kern)	365	if (!ctx_kern) {
		366	put_device(dev);
327	return NULL;	367	return NULL;
		368	}
328		369
329	ctx_kern->ctx.hid = hdev;	370	ctx_kern->ctx.hid = hdev;
330		371
@@ -337,14 +378,19 @@ hid_bpf_allocate_context(unsigned int hid_id) · 6 unmodified lines
337	* @ctx: the HID-BPF context to release	378	* @ctx: the HID-BPF context to release
338	*	379	*
339	*/	380	*/
340	noinline void	381	__bpf_kfunc void
341	hid_bpf_release_context(struct hid_bpf_ctx *ctx)	382	hid_bpf_release_context(struct hid_bpf_ctx *ctx)
342	{	383	{
343	struct hid_bpf_ctx_kern *ctx_kern;	384	struct hid_bpf_ctx_kern *ctx_kern;
		385	struct hid_device *hid;
344		386
345	ctx_kern = container_of(ctx, struct hid_bpf_ctx_kern, ctx);	387	ctx_kern = container_of(ctx, struct hid_bpf_ctx_kern, ctx);
		388	hid = (struct hid_device )ctx_kern->ctx.hid; / ignore const */
346		389
347	kfree(ctx_kern);	390	kfree(ctx_kern);
		391
		392	/* get_device() is called by bus_find_device() */
		393	put_device(&hid->dev);
348	}	394	}
349		395
350	/**	396	/**
@@ -358,7 +404,7 @@ hid_bpf_release_context(struct hid_bpf_ctx *ctx) · 7 unmodified lines
358	*	404	*
359	* @returns %0 on success, a negative error code otherwise.	405	* @returns %0 on success, a negative error code otherwise.
360	*/	406	*/
361	noinline int	407	__bpf_kfunc int
362	hid_bpf_hw_request(struct hid_bpf_ctx ctx, __u8 buf, size_t buf__sz,	408	hid_bpf_hw_request(struct hid_bpf_ctx ctx, __u8 buf, size_t buf__sz,
363	enum hid_report_type rtype, enum hid_class_request reqtype)	409	enum hid_report_type rtype, enum hid_class_request reqtype)
364	{	410	{
@@ -426,6 +472,7 @@ hid_bpf_hw_request(struct hid_bpf_ctx ctx, __u8 buf, size_t buf__sz, · 61 unmodified lines
426	kfree(dma_data);	472	kfree(dma_data);
427	return ret;	473	return ret;
428	}	474	}
		475	__bpf_kfunc_end_defs();
429		476
430	/* our HID-BPF entrypoints */	477	/* our HID-BPF entrypoints */
431	BTF_SET8_START(hid_bpf_fmodret_ids)	478	BTF_SET8_START(hid_bpf_fmodret_ids)

drivers/hid/bpf/hid_bpf_dispatch.h+2−2

@@ -12,9 +12,9 @@ struct hid_bpf_ctx_kern { · 11 unmodified lines
12		12
13	int hid_bpf_preload_skel(void);	13	int hid_bpf_preload_skel(void);
14	void hid_bpf_free_links_and_skel(void);	14	void hid_bpf_free_links_and_skel(void);
15	int hid_bpf_get_prog_attach_type(int prog_fd);	15	int hid_bpf_get_prog_attach_type(struct bpf_prog *prog);
16	int __hid_bpf_attach_prog(struct hid_device *hdev, enum hid_bpf_prog_type prog_type, int prog_fd,	16	int __hid_bpf_attach_prog(struct hid_device *hdev, enum hid_bpf_prog_type prog_type, int prog_fd,
17	__u32 flags);	17	struct bpf_prog *prog, __u32 flags);
18	void __hid_bpf_destroy_device(struct hid_device *hdev);	18	void __hid_bpf_destroy_device(struct hid_device *hdev);
19	int hid_bpf_prog_run(struct hid_device *hdev, enum hid_bpf_prog_type type,	19	int hid_bpf_prog_run(struct hid_device *hdev, enum hid_bpf_prog_type type,
20	struct hid_bpf_ctx_kern *ctx_kern);	20	struct hid_bpf_ctx_kern *ctx_kern);

drivers/hid/bpf/hid_bpf_jmp_table.c+20−20

@@ -196,6 +196,7 @@ static void __hid_bpf_do_release_prog(int map_fd, unsigned int idx) · 195 unmodified lines
196	static void hid_bpf_release_progs(struct work_struct *work)	196	static void hid_bpf_release_progs(struct work_struct *work)
197	{	197	{
198	int i, j, n, map_fd = -1;	198	int i, j, n, map_fd = -1;
		199	bool hdev_destroyed;
199		200
200	if (!jmp_table.map)	201	if (!jmp_table.map)
201	return;	202	return;
@@ -220,6 +221,12 @@ static void hid_bpf_release_progs(struct work_struct *work) · 18 unmodified lines
220	if (entry->hdev) {	221	if (entry->hdev) {
221	hdev = entry->hdev;	222	hdev = entry->hdev;
222	type = entry->type;	223	type = entry->type;
		224	/*
		225	* hdev is still valid, even if we are called after hid_destroy_device():
		226	* when hid_bpf_attach() gets called, it takes a ref on the dev through
		227	* bus_find_device()
		228	*/
		229	hdev_destroyed = hdev->bpf.destroyed;
223		230
224	hid_bpf_populate_hdev(hdev, type);	231	hid_bpf_populate_hdev(hdev, type);
225		232
@@ -232,12 +239,19 @@ static void hid_bpf_release_progs(struct work_struct *work) · 6 unmodified lines
232	if (test_bit(next->idx, jmp_table.enabled))	239	if (test_bit(next->idx, jmp_table.enabled))
233	continue;	240	continue;
234		241
235	if (next->hdev == hdev && next->type == type)	242	if (next->hdev == hdev && next->type == type) {
		243	/*
		244	* clear the hdev reference and decrement the device ref
		245	* that was taken during bus_find_device() while calling
		246	* hid_bpf_attach()
		247	*/
236	next->hdev = NULL;	248	next->hdev = NULL;
		249	put_device(&hdev->dev);
		250	}
237	}	251	}
238		252
239	/* if type was rdesc fixup, reconnect device */	253	/* if type was rdesc fixup and the device is not gone, reconnect device */
240	if (type == HID_BPF_PROG_TYPE_RDESC_FIXUP)	254	if (type == HID_BPF_PROG_TYPE_RDESC_FIXUP && !hdev_destroyed)
241	hid_bpf_reconnect(hdev);	255	hid_bpf_reconnect(hdev);
242	}	256	}
243	}	257	}
@@ -333,15 +347,10 @@ static int hid_bpf_insert_prog(int prog_fd, struct bpf_prog *prog) · 89 unmodified lines
333	return err;	347	return err;
334	}	348	}
335		349
336	int hid_bpf_get_prog_attach_type(int prog_fd)	350	int hid_bpf_get_prog_attach_type(struct bpf_prog *prog)
337	{	351	{
338	struct bpf_prog *prog = NULL;
339	int i;
340	int prog_type = HID_BPF_PROG_TYPE_UNDEF;	352	int prog_type = HID_BPF_PROG_TYPE_UNDEF;
341		353	int i;
342	prog = bpf_prog_get(prog_fd);
343	if (IS_ERR(prog))
344	return PTR_ERR(prog);
345		354
346	for (i = 0; i < HID_BPF_PROG_TYPE_MAX; i++) {	355	for (i = 0; i < HID_BPF_PROG_TYPE_MAX; i++) {
347	if (hid_bpf_btf_ids[i] == prog->aux->attach_btf_id) {	356	if (hid_bpf_btf_ids[i] == prog->aux->attach_btf_id) {
@@ -350,8 +359,6 @@ int hid_bpf_get_prog_attach_type(int prog_fd) · 2 unmodified lines
350	}	359	}
351	}	360	}
352		361
353	bpf_prog_put(prog);
354
355	return prog_type;	362	return prog_type;
356	}	363	}
357		364
@@ -388,19 +395,13 @@ static const struct bpf_link_ops hid_bpf_link_lops = { · 30 unmodified lines
388	/* called from syscall */	395	/* called from syscall */
389	noinline int	396	noinline int
390	__hid_bpf_attach_prog(struct hid_device *hdev, enum hid_bpf_prog_type prog_type,	397	__hid_bpf_attach_prog(struct hid_device *hdev, enum hid_bpf_prog_type prog_type,
391	int prog_fd, __u32 flags)	398	int prog_fd, struct bpf_prog *prog, __u32 flags)
392	{	399	{
393	struct bpf_link_primer link_primer;	400	struct bpf_link_primer link_primer;
394	struct hid_bpf_link *link;	401	struct hid_bpf_link *link;
395	struct bpf_prog *prog = NULL;
396	struct hid_bpf_prog_entry *prog_entry;	402	struct hid_bpf_prog_entry *prog_entry;
397	int cnt, err = -EINVAL, prog_table_idx = -1;	403	int cnt, err = -EINVAL, prog_table_idx = -1;
398		404
399	/* take a ref on the prog itself */
400	prog = bpf_prog_get(prog_fd);
401	if (IS_ERR(prog))
402	return PTR_ERR(prog);
403
404	mutex_lock(&hid_bpf_attach_lock);	405	mutex_lock(&hid_bpf_attach_lock);
405		406
406	link = kzalloc(sizeof(*link), GFP_USER);	407	link = kzalloc(sizeof(*link), GFP_USER);
@@ -467,7 +468,6 @@ __hid_bpf_attach_prog(struct hid_device *hdev, enum hid_bpf_prog_type prog_type, · 60 unmodified lines
467	err_unlock:	468	err_unlock:
468	mutex_unlock(&hid_bpf_attach_lock);	469	mutex_unlock(&hid_bpf_attach_lock);
469		470
470	bpf_prog_put(prog);
471	kfree(link);	471	kfree(link);
472		472
473	return err;	473	return err;

drivers/hid/hid-ids.h+3−0

@@ -298,6 +298,9 @@ · 297 unmodified lines
298		298
299	#define USB_VENDOR_ID_CIDC 0x1677	299	#define USB_VENDOR_ID_CIDC 0x1677
300		300
		301	#define I2C_VENDOR_ID_CIRQUE 0x0488
		302	#define I2C_PRODUCT_ID_CIRQUE_1063 0x1063
		303
301	#define USB_VENDOR_ID_CJTOUCH 0x24b8	304	#define USB_VENDOR_ID_CJTOUCH 0x24b8
302	#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020 0x0020	305	#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0020 0x0020
303	#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040 0x0040	306	#define USB_DEVICE_ID_CJTOUCH_MULTI_TOUCH_0040 0x0040

drivers/hid/hid-logitech-hidpp.c+2−0

@@ -4610,6 +4610,8 @@ static const struct hid_device_id hidpp_devices[] = { · 4609 unmodified lines
4610	HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC088) },	4610	HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC088) },
4611	{ /* Logitech G Pro X Superlight Gaming Mouse over USB */	4611	{ /* Logitech G Pro X Superlight Gaming Mouse over USB */
4612	HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC094) },	4612	HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC094) },
		4613	{ /* Logitech G Pro X Superlight 2 Gaming Mouse over USB */
		4614	HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC09b) },
4613		4615
4614	{ /* G935 Gaming Headset */	4616	{ /* G935 Gaming Headset */
4615	HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0x0a87),	4617	HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0x0a87),

drivers/hid/hid-nvidia-shield.c+4−0

 	led->name = devm_kasprintf(&ts->base.hdev->dev, GFP_KERNEL,
 				   "thunderstrike%d:blue:led", ts->id);
+	if (!led->name)
+		return -ENOMEM;
 	led->max_brightness = 1;
 	led->flags = LED_CORE_SUSPENDRESUME | LED_RETAIN_AT_SHUTDOWN;
 	led->brightness_get = &thunderstrike_led_get_brightness;
 	shield_dev->battery_dev.desc.name =
 		devm_kasprintf(&ts->base.hdev->dev, GFP_KERNEL,
 			       "thunderstrike_%d", ts->id);
+	if (!shield_dev->battery_dev.desc.name)
+		return -ENOMEM;
 	shield_dev->battery_dev.psy = power_supply_register(
 		&hdev->dev, &shield_dev->battery_dev.desc, &psy_cfg);

drivers/hid/hid-steam.c+18−18

@@ -1109,10 +1109,9 @@ static int steam_probe(struct hid_device *hdev, · 1108 unmodified lines
1109	return hid_hw_start(hdev, HID_CONNECT_DEFAULT);	1109	return hid_hw_start(hdev, HID_CONNECT_DEFAULT);
1110		1110
1111	steam = devm_kzalloc(&hdev->dev, sizeof(*steam), GFP_KERNEL);	1111	steam = devm_kzalloc(&hdev->dev, sizeof(*steam), GFP_KERNEL);
1112	if (!steam) {	1112	if (!steam)
1113	ret = -ENOMEM;	1113	return -ENOMEM;
1114	goto steam_alloc_fail;	1114
1115	}
1116	steam->hdev = hdev;	1115	steam->hdev = hdev;
1117	hid_set_drvdata(hdev, steam);	1116	hid_set_drvdata(hdev, steam);
1118	spin_lock_init(&steam->lock);	1117	spin_lock_init(&steam->lock);
@@ -1129,14 +1128,14 @@ static int steam_probe(struct hid_device *hdev, · 10 unmodified lines
1129	*/	1128	*/
1130	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_HIDRAW);	1129	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_HIDRAW);
1131	if (ret)	1130	if (ret)
1132	goto hid_hw_start_fail;	1131	goto err_cancel_work;
1133		1132
1134	ret = hid_hw_open(hdev);	1133	ret = hid_hw_open(hdev);
1135	if (ret) {	1134	if (ret) {
1136	hid_err(hdev,	1135	hid_err(hdev,
1137	"%s:hid_hw_open\n",	1136	"%s:hid_hw_open\n",
1138	__func__);	1137	__func__);
1139	goto hid_hw_open_fail;	1138	goto err_hw_stop;
1140	}	1139	}
1141		1140
1142	if (steam->quirks & STEAM_QUIRK_WIRELESS) {	1141	if (steam->quirks & STEAM_QUIRK_WIRELESS) {
@@ -1152,36 +1151,37 @@ static int steam_probe(struct hid_device *hdev, · 9 unmodified lines
1152	hid_err(hdev,	1151	hid_err(hdev,
1153	"%s:steam_register failed with error %d\n",	1152	"%s:steam_register failed with error %d\n",
1154	__func__, ret);	1153	__func__, ret);
1155	goto input_register_fail;	1154	goto err_hw_close;
1156	}	1155	}
1157	}	1156	}
1158		1157
1159	steam->client_hdev = steam_create_client_hid(hdev);	1158	steam->client_hdev = steam_create_client_hid(hdev);
1160	if (IS_ERR(steam->client_hdev)) {	1159	if (IS_ERR(steam->client_hdev)) {
1161	ret = PTR_ERR(steam->client_hdev);	1160	ret = PTR_ERR(steam->client_hdev);
1162	goto client_hdev_fail;	1161	goto err_stream_unregister;
1163	}	1162	}
1164	steam->client_hdev->driver_data = steam;	1163	steam->client_hdev->driver_data = steam;
1165		1164
1166	ret = hid_add_device(steam->client_hdev);	1165	ret = hid_add_device(steam->client_hdev);
1167	if (ret)	1166	if (ret)
1168	goto client_hdev_add_fail;	1167	goto err_destroy;
1169		1168
1170	return 0;	1169	return 0;
1171		1170
1172	client_hdev_add_fail:	1171	err_destroy:
1173	hid_hw_stop(hdev);
1174	client_hdev_fail:
1175	hid_destroy_device(steam->client_hdev);	1172	hid_destroy_device(steam->client_hdev);
1176	input_register_fail:	1173	err_stream_unregister:
1177	hid_hw_open_fail:	1174	if (steam->connected)
1178	hid_hw_start_fail:	1175	steam_unregister(steam);
		1176	err_hw_close:
		1177	hid_hw_close(hdev);
		1178	err_hw_stop:
		1179	hid_hw_stop(hdev);
		1180	err_cancel_work:
1179	cancel_work_sync(&steam->work_connect);	1181	cancel_work_sync(&steam->work_connect);
1180	cancel_delayed_work_sync(&steam->mode_switch);	1182	cancel_delayed_work_sync(&steam->mode_switch);
1181	cancel_work_sync(&steam->rumble_work);	1183	cancel_work_sync(&steam->rumble_work);
1182	steam_alloc_fail:	1184
1183	hid_err(hdev, "%s: failed with error %d\n",
1184	__func__, ret);
1185	return ret;	1185	return ret;
1186	}	1186	}
1187		1187

drivers/hid/hidraw.c+5−2

 	down_write(&minors_rwsem);
 	spin_lock_irqsave(&hidraw_table[minor]->list_lock, flags);
-	for (int i = list->tail; i < list->head; i++)
+	while (list->tail != list->head) {
-		kfree(list->buffer[i].value);
+		kfree(list->buffer[list->tail].value);
+		list->buffer[list->tail].value = NULL;
+		list->tail = (list->tail + 1) & (HIDRAW_BUFFER_SIZE - 1);
+	}
 	list_del(&list->node);
 	spin_unlock_irqrestore(&hidraw_table[minor]->list_lock, flags);
 	kfree(list);

drivers/hid/i2c-hid/i2c-hid-core.c+5−1

 #define I2C_HID_QUIRK_RESET_ON_RESUME		BIT(2)
 #define I2C_HID_QUIRK_BAD_INPUT_SIZE		BIT(3)
 #define I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET	BIT(4)
+#define I2C_HID_QUIRK_NO_SLEEP_ON_SUSPEND	BIT(5)
 /* Command opcodes */
 #define I2C_HID_OPCODE_RESET			0x01
 		 I2C_HID_QUIRK_RESET_ON_RESUME },
 	{ USB_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_LENOVO_LEGION_Y720,
 		I2C_HID_QUIRK_BAD_INPUT_SIZE },
+	{ I2C_VENDOR_ID_CIRQUE, I2C_PRODUCT_ID_CIRQUE_1063,
+		I2C_HID_QUIRK_NO_SLEEP_ON_SUSPEND },
 	/*
 	 * Sending the wakeup after reset actually break ELAN touchscreen controller
 	 */
 		return ret;
 	/* Save some power */
-	i2c_hid_set_power(ihid, I2C_HID_PWR_SLEEP);
+	if (!(ihid->quirks & I2C_HID_QUIRK_NO_SLEEP_ON_SUSPEND))
+		i2c_hid_set_power(ihid, I2C_HID_PWR_SLEEP);
 	disable_irq(client->irq);

drivers/hid/i2c-hid/i2c-hid-of.c+1−0

@@ -87,6 +87,7 @@ static int i2c_hid_of_probe(struct i2c_client *client) · 86 unmodified lines
87	if (!ihid_of)	87	if (!ihid_of)
88	return -ENOMEM;	88	return -ENOMEM;
89		89
		90	ihid_of->client = client;
90	ihid_of->ops.power_up = i2c_hid_of_power_up;	91	ihid_of->ops.power_up = i2c_hid_of_power_up;
91	ihid_of->ops.power_down = i2c_hid_of_power_down;	92	ihid_of->ops.power_down = i2c_hid_of_power_down;
92		93

drivers/md/raid1.c+1−1

@@ -2262,7 +2262,7 @@ static void fix_read_error(struct r1conf conf, struct r1bio r1_bio) · 2261 unmodified lines
2262	int sectors = r1_bio->sectors;	2262	int sectors = r1_bio->sectors;
2263	int read_disk = r1_bio->read_disk;	2263	int read_disk = r1_bio->read_disk;
2264	struct mddev *mddev = conf->mddev;	2264	struct mddev *mddev = conf->mddev;
2265	struct md_rdev *rdev = rcu_dereference(conf->mirrors[read_disk].rdev);	2265	struct md_rdev *rdev = conf->mirrors[read_disk].rdev;
2266		2266
2267	if (exceed_read_errors(mddev, rdev)) {	2267	if (exceed_read_errors(mddev, rdev)) {
2268	r1_bio->bios[r1_bio->read_disk] = IO_BLOCKED;	2268	r1_bio->bios[r1_bio->read_disk] = IO_BLOCKED;

drivers/media/common/videobuf2/videobuf2-core.c+1−1

@@ -989,7 +989,7 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory, · 988 unmodified lines
989	bool no_previous_buffers = !q_num_bufs;	989	bool no_previous_buffers = !q_num_bufs;
990	int ret = 0;	990	int ret = 0;
991		991
992	if (q->num_buffers == q->max_num_buffers) {	992	if (q_num_bufs == q->max_num_buffers) {
993	dprintk(q, 1, "maximum number of buffers already allocated\n");	993	dprintk(q, 1, "maximum number of buffers already allocated\n");
994	return -ENOBUFS;	994	return -ENOBUFS;
995	}	995	}

drivers/media/common/videobuf2/videobuf2-v4l2.c+26−29

@@ -671,8 +671,20 @@ int vb2_querybuf(struct vb2_queue q, struct v4l2_buffer b) · 670 unmodified lines
671	}	671	}
672	EXPORT_SYMBOL(vb2_querybuf);	672	EXPORT_SYMBOL(vb2_querybuf);
673		673
674	static void fill_buf_caps(struct vb2_queue q, u32 caps)	674	static void vb2_set_flags_and_caps(struct vb2_queue *q, u32 memory,
		675	u32 flags, u32 caps, u32 *max_num_bufs)
675	{	676	{
		677	if (!q->allow_cache_hints \|\| memory != V4L2_MEMORY_MMAP) {
		678	/*
		679	* This needs to clear V4L2_MEMORY_FLAG_NON_COHERENT only,
		680	* but in order to avoid bugs we zero out all bits.
		681	*/
		682	*flags = 0;
		683	} else {
		684	/* Clear all unknown flags. */
		685	*flags &= V4L2_MEMORY_FLAG_NON_COHERENT;
		686	}
		687
676	*caps = V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS;	688	*caps = V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS;
677	if (q->io_modes & VB2_MMAP)	689	if (q->io_modes & VB2_MMAP)
678	*caps \|= V4L2_BUF_CAP_SUPPORTS_MMAP;	690	*caps \|= V4L2_BUF_CAP_SUPPORTS_MMAP;
@@ -686,21 +698,9 @@ static void fill_buf_caps(struct vb2_queue q, u32 caps) · 7 unmodified lines
686	*caps \|= V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS;	698	*caps \|= V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS;
687	if (q->supports_requests)	699	if (q->supports_requests)
688	*caps \|= V4L2_BUF_CAP_SUPPORTS_REQUESTS;	700	*caps \|= V4L2_BUF_CAP_SUPPORTS_REQUESTS;
689	}	701	if (max_num_bufs) {
690		702	*max_num_bufs = q->max_num_buffers;
691	static void validate_memory_flags(struct vb2_queue *q,	703	*caps \|= V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS;
692	int memory,
693	u32 *flags)
694	{
695	if (!q->allow_cache_hints \|\| memory != V4L2_MEMORY_MMAP) {
696	/*
697	* This needs to clear V4L2_MEMORY_FLAG_NON_COHERENT only,
698	* but in order to avoid bugs we zero out all bits.
699	*/
700	*flags = 0;
701	} else {
702	/* Clear all unknown flags. */
703	*flags &= V4L2_MEMORY_FLAG_NON_COHERENT;
704	}	704	}
705	}	705	}
706		706
@@ -709,8 +709,8 @@ int vb2_reqbufs(struct vb2_queue q, struct v4l2_requestbuffers req) · 2 unmodified lines
709	int ret = vb2_verify_memory_type(q, req->memory, req->type);	709	int ret = vb2_verify_memory_type(q, req->memory, req->type);
710	u32 flags = req->flags;	710	u32 flags = req->flags;
711		711
712	fill_buf_caps(q, &req->capabilities);	712	vb2_set_flags_and_caps(q, req->memory, &flags,
713	validate_memory_flags(q, req->memory, &flags);	713	&req->capabilities, NULL);
714	req->flags = flags;	714	req->flags = flags;
715	return ret ? ret : vb2_core_reqbufs(q, req->memory,	715	return ret ? ret : vb2_core_reqbufs(q, req->memory,
716	req->flags, &req->count);	716	req->flags, &req->count);
@@ -751,11 +751,9 @@ int vb2_create_bufs(struct vb2_queue q, struct v4l2_create_buffers create) · 34 unmodified lines
751	int ret = vb2_verify_memory_type(q, create->memory, f->type);	751	int ret = vb2_verify_memory_type(q, create->memory, f->type);
752	unsigned i;	752	unsigned i;
753		753
754	fill_buf_caps(q, &create->capabilities);
755	validate_memory_flags(q, create->memory, &create->flags);
756	create->index = vb2_get_num_buffers(q);	754	create->index = vb2_get_num_buffers(q);
757	create->max_num_buffers = q->max_num_buffers;	755	vb2_set_flags_and_caps(q, create->memory, &create->flags,
758	create->capabilities \|= V4L2_BUF_CAP_SUPPORTS_MAX_NUM_BUFFERS;	756	&create->capabilities, &create->max_num_buffers);
759	if (create->count == 0)	757	if (create->count == 0)
760	return ret != -EBUSY ? ret : 0;	758	return ret != -EBUSY ? ret : 0;
761		759
@@ -1006,8 +1004,8 @@ int vb2_ioctl_reqbufs(struct file file, void priv, · 244 unmodified lines
1006	int res = vb2_verify_memory_type(vdev->queue, p->memory, p->type);	1004	int res = vb2_verify_memory_type(vdev->queue, p->memory, p->type);
1007	u32 flags = p->flags;	1005	u32 flags = p->flags;
1008		1006
1009	fill_buf_caps(vdev->queue, &p->capabilities);	1007	vb2_set_flags_and_caps(vdev->queue, p->memory, &flags,
1010	validate_memory_flags(vdev->queue, p->memory, &flags);	1008	&p->capabilities, NULL);
1011	p->flags = flags;	1009	p->flags = flags;
1012	if (res)	1010	if (res)
1013	return res;	1011	return res;
@@ -1026,12 +1024,11 @@ int vb2_ioctl_create_bufs(struct file file, void priv, · 12 unmodified lines
1026	struct v4l2_create_buffers *p)	1024	struct v4l2_create_buffers *p)
1027	{	1025	{
1028	struct video_device *vdev = video_devdata(file);	1026	struct video_device *vdev = video_devdata(file);
1029	int res = vb2_verify_memory_type(vdev->queue, p->memory,	1027	int res = vb2_verify_memory_type(vdev->queue, p->memory, p->format.type);
1030	p->format.type);
1031		1028
1032	p->index = vdev->queue->num_buffers;	1029	p->index = vb2_get_num_buffers(vdev->queue);
1033	fill_buf_caps(vdev->queue, &p->capabilities);	1030	vb2_set_flags_and_caps(vdev->queue, p->memory, &p->flags,
1034	validate_memory_flags(vdev->queue, p->memory, &p->flags);	1031	&p->capabilities, &p->max_num_buffers);
1035	/*	1032	/*
1036	* If count == 0, then just check if memory and type are valid.	1033	* If count == 0, then just check if memory and type are valid.
1037	* Any -EBUSY result from vb2_verify_memory_type can be mapped to 0.	1034	* Any -EBUSY result from vb2_verify_memory_type can be mapped to 0.

drivers/media/platform/chips-media/wave5/wave5-vpu.c+1−1

@@ -272,7 +272,7 @@ static const struct wave5_match_data ti_wave521c_data = { · 271 unmodified lines
272	};	272	};
273		273
274	static const struct of_device_id wave5_dt_ids[] = {	274	static const struct of_device_id wave5_dt_ids[] = {
275	{ .compatible = "ti,k3-j721s2-wave521c", .data = &ti_wave521c_data },	275	{ .compatible = "ti,j721s2-wave521c", .data = &ti_wave521c_data },
276	{ /* sentinel */ }	276	{ /* sentinel */ }
277	};	277	};
278	MODULE_DEVICE_TABLE(of, wave5_dt_ids);	278	MODULE_DEVICE_TABLE(of, wave5_dt_ids);

drivers/net/dsa/mt7530.c+1−2

 	/* MT753x MAC works in 1G full duplex mode for all up-clocked
 	 * variants.
 	 */
-	if (interface == PHY_INTERFACE_MODE_INTERNAL ||
+	if (interface == PHY_INTERFACE_MODE_TRGMII ||
-	    interface == PHY_INTERFACE_MODE_TRGMII ||
 	    (phy_interface_mode_is_8023z(interface))) {
 		speed = SPEED_1000;
 		duplex = DUPLEX_FULL;

drivers/net/dsa/mv88e6xxx/chip.c+1−1

@@ -3659,7 +3659,7 @@ static int mv88e6xxx_mdio_read_c45(struct mii_bus *bus, int phy, int devad, · 3658 unmodified lines
3659	int err;	3659	int err;
3660		3660
3661	if (!chip->info->ops->phy_read_c45)	3661	if (!chip->info->ops->phy_read_c45)
3662	return -EOPNOTSUPP;	3662	return 0xffff;
3663		3663
3664	mv88e6xxx_reg_lock(chip);	3664	mv88e6xxx_reg_lock(chip);
3665	err = chip->info->ops->phy_read_c45(chip, bus, phy, devad, reg, &val);	3665	err = chip->info->ops->phy_read_c45(chip, bus, phy, devad, reg, &val);

drivers/net/dsa/qca/qca8k-8xxx.c+1−2

 	priv->info = of_device_get_match_data(priv->dev);
 	priv->reset_gpio = devm_gpiod_get_optional(priv->dev, "reset",
-						   GPIOD_ASIS);
+						   GPIOD_OUT_HIGH);
 	if (IS_ERR(priv->reset_gpio))
 		return PTR_ERR(priv->reset_gpio);
 	if (priv->reset_gpio) {
-		gpiod_set_value_cansleep(priv->reset_gpio, 1);
 		/* The active low duration must be greater than 10 ms
 		 * and checkpatch.pl wants 20 ms.
 		 */

drivers/net/ethernet/amd/pds_core/adminq.c+48−16

@@ -63,6 +63,15 @@ static int pdsc_process_notifyq(struct pdsc_qcq *qcq) · 62 unmodified lines
63	return nq_work;	63	return nq_work;
64	}	64	}
65		65
		66	static bool pdsc_adminq_inc_if_up(struct pdsc *pdsc)
		67	{
		68	if (pdsc->state & BIT_ULL(PDSC_S_STOPPING_DRIVER) \|\|
		69	pdsc->state & BIT_ULL(PDSC_S_FW_DEAD))
		70	return false;
		71
		72	return refcount_inc_not_zero(&pdsc->adminq_refcnt);
		73	}
		74
66	void pdsc_process_adminq(struct pdsc_qcq *qcq)	75	void pdsc_process_adminq(struct pdsc_qcq *qcq)
67	{	76	{
68	union pds_core_adminq_comp *comp;	77	union pds_core_adminq_comp *comp;
@@ -75,9 +84,9 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq) · 6 unmodified lines
75	int aq_work = 0;	84	int aq_work = 0;
76	int credits;	85	int credits;
77		86
78	/* Don't process AdminQ when shutting down */	87	/* Don't process AdminQ when it's not up */
79	if (pdsc->state & BIT_ULL(PDSC_S_STOPPING_DRIVER)) {	88	if (!pdsc_adminq_inc_if_up(pdsc)) {
80	dev_err(pdsc->dev, "%s: called while PDSC_S_STOPPING_DRIVER\n",	89	dev_err(pdsc->dev, "%s: called while adminq is unavailable\n",
81	__func__);	90	__func__);
82	return;	91	return;
83	}	92	}
@@ -124,6 +133,7 @@ credits: · 40 unmodified lines
124	pds_core_intr_credits(&pdsc->intr_ctrl[qcq->intx],	133	pds_core_intr_credits(&pdsc->intr_ctrl[qcq->intx],
125	credits,	134	credits,
126	PDS_CORE_INTR_CRED_REARM);	135	PDS_CORE_INTR_CRED_REARM);
		136	refcount_dec(&pdsc->adminq_refcnt);
127	}	137	}
128		138
129	void pdsc_work_thread(struct work_struct *work)	139	void pdsc_work_thread(struct work_struct *work)
@@ -135,18 +145,20 @@ void pdsc_work_thread(struct work_struct *work) · 5 unmodified lines
135		145
136	irqreturn_t pdsc_adminq_isr(int irq, void *data)	146	irqreturn_t pdsc_adminq_isr(int irq, void *data)
137	{	147	{
138	struct pdsc_qcq *qcq = data;	148	struct pdsc *pdsc = data;
139	struct pdsc *pdsc = qcq->pdsc;	149	struct pdsc_qcq *qcq;
140		150
141	/* Don't process AdminQ when shutting down */	151	/* Don't process AdminQ when it's not up */
142	if (pdsc->state & BIT_ULL(PDSC_S_STOPPING_DRIVER)) {	152	if (!pdsc_adminq_inc_if_up(pdsc)) {
143	dev_err(pdsc->dev, "%s: called while PDSC_S_STOPPING_DRIVER\n",	153	dev_err(pdsc->dev, "%s: called while adminq is unavailable\n",
144	__func__);	154	__func__);
145	return IRQ_HANDLED;	155	return IRQ_HANDLED;
146	}	156	}
147		157
		158	qcq = &pdsc->adminqcq;
148	queue_work(pdsc->wq, &qcq->work);	159	queue_work(pdsc->wq, &qcq->work);
149	pds_core_intr_mask(&pdsc->intr_ctrl[qcq->intx], PDS_CORE_INTR_MASK_CLEAR);	160	pds_core_intr_mask(&pdsc->intr_ctrl[qcq->intx], PDS_CORE_INTR_MASK_CLEAR);
		161	refcount_dec(&pdsc->adminq_refcnt);
150		162
151	return IRQ_HANDLED;	163	return IRQ_HANDLED;
152	}	164	}
@@ -179,10 +191,16 @@ static int __pdsc_adminq_post(struct pdsc *pdsc, · 26 unmodified lines
179		191
180	/* Check that the FW is running */	192	/* Check that the FW is running */
181	if (!pdsc_is_fw_running(pdsc)) {	193	if (!pdsc_is_fw_running(pdsc)) {
182	u8 fw_status = ioread8(&pdsc->info_regs->fw_status);	194	if (pdsc->info_regs) {
183		195	u8 fw_status =
184	dev_info(pdsc->dev, "%s: post failed - fw not running %#02x:\n",	196	ioread8(&pdsc->info_regs->fw_status);
185	__func__, fw_status);	197
		198	dev_info(pdsc->dev, "%s: post failed - fw not running %#02x:\n",
		199	__func__, fw_status);
		200	} else {
		201	dev_info(pdsc->dev, "%s: post failed - BARs not setup\n",
		202	__func__);
		203	}
186	ret = -ENXIO;	204	ret = -ENXIO;
187		205
188	goto err_out_unlock;	206	goto err_out_unlock;
@@ -230,6 +248,12 @@ int pdsc_adminq_post(struct pdsc *pdsc, · 41 unmodified lines
230	int err = 0;	248	int err = 0;
231	int index;	249	int index;
232		250
		251	if (!pdsc_adminq_inc_if_up(pdsc)) {
		252	dev_dbg(pdsc->dev, "%s: preventing adminq cmd %u\n",
		253	__func__, cmd->opcode);
		254	return -ENXIO;
		255	}
		256
233	wc.qcq = &pdsc->adminqcq;	257	wc.qcq = &pdsc->adminqcq;
234	index = __pdsc_adminq_post(pdsc, &pdsc->adminqcq, cmd, comp, &wc);	258	index = __pdsc_adminq_post(pdsc, &pdsc->adminqcq, cmd, comp, &wc);
235	if (index < 0) {	259	if (index < 0) {
@@ -248,10 +272,16 @@ int pdsc_adminq_post(struct pdsc *pdsc, · 12 unmodified lines
248	break;	272	break;
249		273
250	if (!pdsc_is_fw_running(pdsc)) {	274	if (!pdsc_is_fw_running(pdsc)) {
251	u8 fw_status = ioread8(&pdsc->info_regs->fw_status);	275	if (pdsc->info_regs) {
252		276	u8 fw_status =
253	dev_dbg(pdsc->dev, "%s: post wait failed - fw not running %#02x:\n",	277	ioread8(&pdsc->info_regs->fw_status);
254	__func__, fw_status);	278
		279	dev_dbg(pdsc->dev, "%s: post wait failed - fw not running %#02x:\n",
		280	__func__, fw_status);
		281	} else {
		282	dev_dbg(pdsc->dev, "%s: post wait failed - BARs not setup\n",
		283	__func__);
		284	}
255	err = -ENXIO;	285	err = -ENXIO;
256	break;	286	break;
257	}	287	}
@@ -285,6 +315,8 @@ err_out: · 27 unmodified lines
285	queue_work(pdsc->wq, &pdsc->health_work);	315	queue_work(pdsc->wq, &pdsc->health_work);
286	}	316	}
287		317
		318	refcount_dec(&pdsc->adminq_refcnt);
		319
288	return err;	320	return err;
289	}	321	}
290	EXPORT_SYMBOL_GPL(pdsc_adminq_post);	322	EXPORT_SYMBOL_GPL(pdsc_adminq_post);

drivers/net/ethernet/amd/pds_core/core.c+36−10

 	snprintf(name, sizeof(name), "%s-%d-%s",
 		 PDS_CORE_DRV_NAME, pdsc->pdev->bus->number, qcq->q.name);
-	index = pdsc_intr_alloc(pdsc, name, pdsc_adminq_isr, qcq);
+	index = pdsc_intr_alloc(pdsc, name, pdsc_adminq_isr, pdsc);
 	if (index < 0)
 		return index;
 	qcq->intx = index;
 	int numdescs;
 	int err;
-	if (init)
+	err = pdsc_dev_init(pdsc);
-		err = pdsc_dev_init(pdsc);
-	else
-		err = pdsc_dev_reinit(pdsc);
 	if (err)
 		return err;
 		pdsc_debugfs_add_viftype(pdsc);
 	}
+	refcount_set(&pdsc->adminq_refcnt, 1);
 	clear_bit(PDSC_S_FW_DEAD, &pdsc->state);
 	return 0;
 	if (!pdsc->pdev->is_virtfn)
 		pdsc_devcmd_reset(pdsc);
+	if (pdsc->adminqcq.work.func)
+		cancel_work_sync(&pdsc->adminqcq.work);
 	pdsc_qcq_free(pdsc, &pdsc->notifyqcq);
 	pdsc_qcq_free(pdsc, &pdsc->adminqcq);
 		for (i = 0; i < pdsc->nintrs; i++)
 			pdsc_intr_free(pdsc, i);
-		if (removing) {
+		kfree(pdsc->intr_info);
-			kfree(pdsc->intr_info);
+		pdsc->intr_info = NULL;
-			pdsc->intr_info = NULL;
+		pdsc->nintrs = 0;
-		}
 	}
 	if (pdsc->kern_dbpage) {
 		pdsc->kern_dbpage = NULL;
 	}
+	pci_free_irq_vectors(pdsc->pdev);
 	set_bit(PDSC_S_FW_DEAD, &pdsc->state);
 }
 					   PDS_CORE_INTR_MASK_SET);
 }
+static void pdsc_adminq_wait_and_dec_once_unused(struct pdsc *pdsc)
+{
+	/* The driver initializes the adminq_refcnt to 1 when the adminq is
+	 * allocated and ready for use. Other users/requesters will increment
+	 * the refcnt while in use. If the refcnt is down to 1 then the adminq
+	 * is not in use and the refcnt can be cleared and adminq freed. Before
+	 * calling this function the driver will set PDSC_S_FW_DEAD, which
+	 * prevent subsequent attempts to use the adminq and increment the
+	 * refcnt to fail. This guarantees that this function will eventually
+	 * exit.
+	 */
+	while (!refcount_dec_if_one(&pdsc->adminq_refcnt)) {
+		dev_dbg_ratelimited(pdsc->dev, "%s: adminq in use\n",
+				    __func__);
+		cpu_relax();
+	}
+}
 void pdsc_fw_down(struct pdsc *pdsc)
 {
 	union pds_core_notifyq_comp reset_event = {
 	if (pdsc->pdev->is_virtfn)
 		return;
+	pdsc_adminq_wait_and_dec_once_unused(pdsc);
 	/* Notify clients of fw_down */
 	if (pdsc->fw_reporter)
 		devlink_health_report(pdsc->fw_reporter, "FW down reported", pdsc);
 static void pdsc_check_pci_health(struct pdsc *pdsc)
 {
-	u8 fw_status = ioread8(&pdsc->info_regs->fw_status);
+	u8 fw_status;
+	/* some sort of teardown already in progress */
+	if (!pdsc->info_regs)
+		return;
+	fw_status = ioread8(&pdsc->info_regs->fw_status);
 	/* is PCI broken? */
 	if (fw_status != PDS_RC_BAD_PCI)

drivers/net/ethernet/amd/pds_core/core.h+1−1

 	struct mutex devcmd_lock;	/* lock for dev_cmd operations */
 	struct mutex config_lock;	/* lock for configuration operations */
 	spinlock_t adminq_lock;		/* lock for adminq operations */
+	refcount_t adminq_refcnt;
 	struct pds_core_dev_info_regs __iomem *info_regs;
 	struct pds_core_dev_cmd_regs __iomem *cmd_regs;
 	struct pds_core_intr __iomem *intr_ctrl;
 		       union pds_core_dev_comp *comp, int max_seconds);
 int pdsc_devcmd_init(struct pdsc *pdsc);
 int pdsc_devcmd_reset(struct pdsc *pdsc);
-int pdsc_dev_reinit(struct pdsc *pdsc);
 int pdsc_dev_init(struct pdsc *pdsc);
 void pdsc_reset_prepare(struct pci_dev *pdev);

drivers/net/ethernet/amd/pds_core/debugfs.c+4−0

 void pdsc_debugfs_add_ident(struct pdsc *pdsc)
 {
+	/* This file will already exist in the reset flow */
+	if (debugfs_lookup("identity", pdsc->dentry))
+		return;
 	debugfs_create_file("identity", 0400, pdsc->dentry,
 			    pdsc, &identity_fops);
 }

drivers/net/ethernet/amd/pds_core/dev.c+8−8

 bool pdsc_is_fw_running(struct pdsc *pdsc)
 {
+	if (!pdsc->info_regs)
+		return false;
 	pdsc->fw_status = ioread8(&pdsc->info_regs->fw_status);
 	pdsc->last_fw_time = jiffies;
 	pdsc->last_hb = ioread32(&pdsc->info_regs->fw_heartbeat);
 {
 	int err;
+	if (!pdsc->cmd_regs)
+		return -ENXIO;
 	memcpy_toio(&pdsc->cmd_regs->cmd, cmd, sizeof(*cmd));
 	pdsc_devcmd_dbell(pdsc);
 	err = pdsc_devcmd_wait(pdsc, cmd->opcode, max_seconds);
-	memcpy_fromio(comp, &pdsc->cmd_regs->comp, sizeof(*comp));
 	if ((err == -ENXIO || err == -ETIMEDOUT) && pdsc->wq)
 		queue_work(pdsc->wq, &pdsc->health_work);
+	else
+		memcpy_fromio(comp, &pdsc->cmd_regs->comp, sizeof(*comp));
 	return err;
 }
 	return 0;
 }
-int pdsc_dev_reinit(struct pdsc *pdsc)
-{
-	pdsc_init_devinfo(pdsc);
-	return pdsc_identify(pdsc);
-}
 int pdsc_dev_init(struct pdsc *pdsc)
 {
 	unsigned int nintrs;

drivers/net/ethernet/amd/pds_core/devlink.c+2−1

@@ -111,7 +111,8 @@ int pdsc_dl_info_get(struct devlink dl, struct devlink_info_req req, · 110 unmodified lines
111		111
112	mutex_lock(&pdsc->devcmd_lock);	112	mutex_lock(&pdsc->devcmd_lock);
113	err = pdsc_devcmd_locked(pdsc, &cmd, &comp, pdsc->devcmd_timeout * 2);	113	err = pdsc_devcmd_locked(pdsc, &cmd, &comp, pdsc->devcmd_timeout * 2);
114	memcpy_fromio(&fw_list, pdsc->cmd_regs->data, sizeof(fw_list));	114	if (!err)
		115	memcpy_fromio(&fw_list, pdsc->cmd_regs->data, sizeof(fw_list));
115	mutex_unlock(&pdsc->devcmd_lock);	116	mutex_unlock(&pdsc->devcmd_lock);
116	if (err && err != -EIO)	117	if (err && err != -EIO)
117	return err;	118	return err;

drivers/net/ethernet/amd/pds_core/fw.c+3−0

@@ -107,6 +107,9 @@ int pdsc_firmware_update(struct pdsc pdsc, const struct firmware fw, · 106 unmodified lines
107		107
108	dev_info(pdsc->dev, "Installing firmware\n");	108	dev_info(pdsc->dev, "Installing firmware\n");
109		109
		110	if (!pdsc->cmd_regs)
		111	return -ENXIO;
		112
110	dl = priv_to_devlink(pdsc);	113	dl = priv_to_devlink(pdsc);
111	devlink_flash_update_status_notify(dl, "Preparing to flash",	114	devlink_flash_update_status_notify(dl, "Preparing to flash",
112	NULL, 0, 0);	115	NULL, 0, 0);

drivers/net/ethernet/amd/pds_core/main.c+22−4

 	struct pdsc_dev_bar *bars = pdsc->bars;
 	unsigned int i;
+	pdsc->info_regs = NULL;
+	pdsc->cmd_regs = NULL;
+	pdsc->intr_status = NULL;
+	pdsc->intr_ctrl = NULL;
 	for (i = 0; i < PDS_CORE_BARS_MAX; i++) {
 		if (bars[i].vaddr)
 			pci_iounmap(pdsc->pdev, bars[i].vaddr);
 err_out_teardown:
 	pdsc_teardown(pdsc, PDSC_TEARDOWN_REMOVING);
 err_out_unmap_bars:
-	del_timer_sync(&pdsc->wdtimer);
+	timer_shutdown_sync(&pdsc->wdtimer);
 	if (pdsc->wq)
 		destroy_workqueue(pdsc->wq);
 	mutex_destroy(&pdsc->config_lock);
 		 */
 		pdsc_sriov_configure(pdev, 0);
-		del_timer_sync(&pdsc->wdtimer);
+		timer_shutdown_sync(&pdsc->wdtimer);
 		if (pdsc->wq)
 			destroy_workqueue(pdsc->wq);
 		mutex_destroy(&pdsc->config_lock);
 		mutex_destroy(&pdsc->devcmd_lock);
-		pci_free_irq_vectors(pdev);
 		pdsc_unmap_bars(pdsc);
 		pci_release_regions(pdev);
 	}
 	devlink_free(dl);
 }
+static void pdsc_stop_health_thread(struct pdsc *pdsc)
+{
+	timer_shutdown_sync(&pdsc->wdtimer);
+	if (pdsc->health_work.func)
+		cancel_work_sync(&pdsc->health_work);
+}
+static void pdsc_restart_health_thread(struct pdsc *pdsc)
+{
+	timer_setup(&pdsc->wdtimer, pdsc_wdtimer_cb, 0);
+	mod_timer(&pdsc->wdtimer, jiffies + 1);
+}
 void pdsc_reset_prepare(struct pci_dev *pdev)
 {
 	struct pdsc *pdsc = pci_get_drvdata(pdev);
+	pdsc_stop_health_thread(pdsc);
 	pdsc_fw_down(pdsc);
-	pci_free_irq_vectors(pdev);
 	pdsc_unmap_bars(pdsc);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
 	}
 	pdsc_fw_up(pdsc);
+	pdsc_restart_health_thread(pdsc);
 }
 static const struct pci_error_handlers pdsc_err_handler = {

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

@@ -684,7 +684,7 @@ static void bnxt_stamp_tx_skb(struct bnxt bp, struct sk_buff skb) · 683 unmodified lines
684	timestamp.hwtstamp = ns_to_ktime(ns);	684	timestamp.hwtstamp = ns_to_ktime(ns);
685	skb_tstamp_tx(ptp->tx_skb, &timestamp);	685	skb_tstamp_tx(ptp->tx_skb, &timestamp);
686	} else {	686	} else {
687	netdev_WARN_ONCE(bp->dev,	687	netdev_warn_once(bp->dev,
688	"TS query for TX timer failed rc = %x\n", rc);	688	"TS query for TX timer failed rc = %x\n", rc);
689	}	689	}
690		690

drivers/net/ethernet/google/gve/gve_rx.c+4−4

@@ -402,7 +402,7 @@ static enum pkt_hash_types gve_rss_type(__be16 pkt_flags) · 401 unmodified lines
402		402
403	static struct sk_buff gve_rx_add_frags(struct napi_struct napi,	403	static struct sk_buff gve_rx_add_frags(struct napi_struct napi,
404	struct gve_rx_slot_page_info *page_info,	404	struct gve_rx_slot_page_info *page_info,
405	u16 packet_buffer_size, u16 len,	405	unsigned int truesize, u16 len,
406	struct gve_rx_ctx *ctx)	406	struct gve_rx_ctx *ctx)
407	{	407	{
408	u32 offset = page_info->page_offset + page_info->pad;	408	u32 offset = page_info->page_offset + page_info->pad;
@@ -435,10 +435,10 @@ static struct sk_buff gve_rx_add_frags(struct napi_struct napi, · 26 unmodified lines
435	if (skb != ctx->skb_head) {	435	if (skb != ctx->skb_head) {
436	ctx->skb_head->len += len;	436	ctx->skb_head->len += len;
437	ctx->skb_head->data_len += len;	437	ctx->skb_head->data_len += len;
438	ctx->skb_head->truesize += packet_buffer_size;	438	ctx->skb_head->truesize += truesize;
439	}	439	}
440	skb_add_rx_frag(skb, num_frags, page_info->page,	440	skb_add_rx_frag(skb, num_frags, page_info->page,
441	offset, len, packet_buffer_size);	441	offset, len, truesize);
442		442
443	return ctx->skb_head;	443	return ctx->skb_head;
444	}	444	}
@@ -532,7 +532,7 @@ static struct sk_buff gve_rx_copy_to_pool(struct gve_rx_ring rx, · 87 unmodified lines
532		532
533	memcpy(alloc_page_info.page_address, src, page_info->pad + len);	533	memcpy(alloc_page_info.page_address, src, page_info->pad + len);
534	skb = gve_rx_add_frags(napi, &alloc_page_info,	534	skb = gve_rx_add_frags(napi, &alloc_page_info,
535	rx->packet_buffer_size,	535	PAGE_SIZE,
536	len, ctx);	536	len, ctx);
537		537
538	u64_stats_update_begin(&rx->statss);	538	u64_stats_update_begin(&rx->statss);

drivers/net/ethernet/intel/e1000e/e1000.h+20−0

  * As a result, a shift of INCVALUE_SHIFT_n is used to fit a value of
  * INCVALUE_n into the TIMINCA register allowing 32+8+(24-INCVALUE_SHIFT_n)
  * bits to count nanoseconds leaving the rest for fractional nonseconds.
+ *
+ * Any given INCVALUE also has an associated maximum adjustment value. This
+ * maximum adjustment value is the largest increase (or decrease) which can be
+ * safely applied without overflowing the INCVALUE. Since INCVALUE has
+ * a maximum range of 24 bits, its largest value is 0xFFFFFF.
+ *
+ * To understand where the maximum value comes from, consider the following
+ * equation:
+ *
+ *   new_incval = base_incval + (base_incval * adjustment) / 1billion
+ *
+ * To avoid overflow that means:
+ *   max_incval = base_incval + (base_incval * max_adj) / billion
+ *
+ * Re-arranging:
+ *   max_adj = floor(((max_incval - base_incval) * 1billion) / 1billion)
  */
 #define INCVALUE_96MHZ		125
 #define INCVALUE_SHIFT_96MHZ	17
 #define INCPERIOD_SHIFT_96MHZ	2
 #define INCPERIOD_96MHZ		(12 >> INCPERIOD_SHIFT_96MHZ)
+#define MAX_PPB_96MHZ		23999900 /* 23,999,900 ppb */
 #define INCVALUE_25MHZ		40
 #define INCVALUE_SHIFT_25MHZ	18
 #define INCPERIOD_25MHZ		1
+#define MAX_PPB_25MHZ		599999900 /* 599,999,900 ppb */
 #define INCVALUE_24MHZ		125
 #define INCVALUE_SHIFT_24MHZ	14
 #define INCPERIOD_24MHZ		3
+#define MAX_PPB_24MHZ		999999999 /* 999,999,999 ppb */
 #define INCVALUE_38400KHZ	26
 #define INCVALUE_SHIFT_38400KHZ	19
 #define INCPERIOD_38400KHZ	1
+#define MAX_PPB_38400KHZ	230769100 /* 230,769,100 ppb */
 /* Another drawback of scaling the incvalue by a large factor is the
  * 64-bit SYSTIM register overflows more quickly.  This is dealt with

drivers/net/ethernet/intel/e1000e/ptp.c+15−7

 	switch (hw->mac.type) {
 	case e1000_pch2lan:
+		adapter->ptp_clock_info.max_adj = MAX_PPB_96MHZ;
+		break;
 	case e1000_pch_lpt:
+		if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI)
+			adapter->ptp_clock_info.max_adj = MAX_PPB_96MHZ;
+		else
+			adapter->ptp_clock_info.max_adj = MAX_PPB_25MHZ;
+		break;
 	case e1000_pch_spt:
+		adapter->ptp_clock_info.max_adj = MAX_PPB_24MHZ;
+		break;
 	case e1000_pch_cnp:
 	case e1000_pch_tgp:
 	case e1000_pch_adp:
 	case e1000_pch_lnp:
 	case e1000_pch_ptp:
 	case e1000_pch_nvp:
-		if ((hw->mac.type < e1000_pch_lpt) ||
+		if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI)
-		    (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI)) {
+			adapter->ptp_clock_info.max_adj = MAX_PPB_24MHZ;
-			adapter->ptp_clock_info.max_adj = 24000000 - 1;
+		else
-			break;
+			adapter->ptp_clock_info.max_adj = MAX_PPB_38400KHZ;
-		}
+		break;
-		fallthrough;
 	case e1000_82574:
 	case e1000_82583:
-		adapter->ptp_clock_info.max_adj = 600000000 - 1;
+		adapter->ptp_clock_info.max_adj = MAX_PPB_25MHZ;
 		break;
 	default:
 		break;

drivers/net/ethernet/intel/idpf/virtchnl2.h+1−1

@@ -978,7 +978,7 @@ struct virtchnl2_ptype { · 977 unmodified lines
978	u8 proto_id_count;	978	u8 proto_id_count;
979	__le16 pad;	979	__le16 pad;
980	__le16 proto_id[];	980	__le16 proto_id[];
981	};	981	} __packed __aligned(2);
982	VIRTCHNL2_CHECK_STRUCT_LEN(6, virtchnl2_ptype);	982	VIRTCHNL2_CHECK_STRUCT_LEN(6, virtchnl2_ptype);
983		983
984	/**	984	/**

drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c+2−1

@@ -716,7 +716,8 @@ static s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr, · 715 unmodified lines
716	if ((command & IXGBE_SB_IOSF_CTRL_RESP_STAT_MASK) != 0) {	716	if ((command & IXGBE_SB_IOSF_CTRL_RESP_STAT_MASK) != 0) {
717	error = FIELD_GET(IXGBE_SB_IOSF_CTRL_CMPL_ERR_MASK, command);	717	error = FIELD_GET(IXGBE_SB_IOSF_CTRL_CMPL_ERR_MASK, command);
718	hw_dbg(hw, "Failed to read, error %x\n", error);	718	hw_dbg(hw, "Failed to read, error %x\n", error);
719	return -EIO;	719	ret = -EIO;
		720	goto out;
720	}	721	}
721		722
722	if (!ret)	723	if (!ret)

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

@@ -314,7 +314,6 @@ static int otx2_set_channels(struct net_device *dev, · 313 unmodified lines
314	pfvf->hw.tx_queues = channel->tx_count;	314	pfvf->hw.tx_queues = channel->tx_count;
315	if (pfvf->xdp_prog)	315	if (pfvf->xdp_prog)
316	pfvf->hw.xdp_queues = channel->rx_count;	316	pfvf->hw.xdp_queues = channel->rx_count;
317	pfvf->hw.non_qos_queues = pfvf->hw.tx_queues + pfvf->hw.xdp_queues;
318		317
319	if (if_up)	318	if (if_up)
320	err = dev->netdev_ops->ndo_open(dev);	319	err = dev->netdev_ops->ndo_open(dev);

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

 	/* RQ and SQs are mapped to different CQs,
 	 * so find out max CQ IRQs (i.e CINTs) needed.
 	 */
+	pf->hw.non_qos_queues =  pf->hw.tx_queues + pf->hw.xdp_queues;
 	pf->hw.cint_cnt = max3(pf->hw.rx_queues, pf->hw.tx_queues,
 			       pf->hw.tc_tx_queues);
 		xdp_features_clear_redirect_target(dev);
 	}
-	pf->hw.non_qos_queues += pf->hw.xdp_queues;
 	if (if_up)
 		otx2_open(pf->netdev);

drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c+3−4

 				     struct otx2_cq_queue *cq,
 				     bool *need_xdp_flush)
 {
-	unsigned char *hard_start, *data;
+	unsigned char *hard_start;
 	int qidx = cq->cq_idx;
 	struct xdp_buff xdp;
 	struct page *page;
 	xdp_init_buff(&xdp, pfvf->rbsize, &cq->xdp_rxq);
-	data = (unsigned char *)phys_to_virt(pa);
+	hard_start = (unsigned char *)phys_to_virt(pa);
-	hard_start = page_address(page);
+	xdp_prepare_buff(&xdp, hard_start, OTX2_HEAD_ROOM,
-	xdp_prepare_buff(&xdp, hard_start, data - hard_start,
 			 cqe->sg.seg_size, false);
 	act = bpf_prog_run_xdp(prog, &xdp);

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

 	}
 	if (MTK_HAS_CAPS(eth->soc->caps, MTK_36BIT_DMA)) {
-		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(36));
+		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(36));
+		if (!err)
+			err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
 		if (err) {
 			dev_err(&pdev->dev, "Wrong DMA config\n");
 			return -EINVAL;

drivers/net/ethernet/microchip/lan966x/lan966x_port.c+3−2

 	lan966x_taprio_speed_set(port, config->speed);
 	/* Also the GIGA_MODE_ENA(1) needs to be set regardless of the
-	 * port speed for QSGMII ports.
+	 * port speed for QSGMII or SGMII ports.
 	 */
-	if (phy_interface_num_ports(config->portmode) == 4)
+	if (phy_interface_num_ports(config->portmode) == 4 ||
+	    config->portmode == PHY_INTERFACE_MODE_SGMII)
 		mode = DEV_MAC_MODE_CFG_GIGA_MODE_ENA_SET(1);
 	lan_wr(config->duplex | mode,

drivers/net/ethernet/netronome/nfp/flower/conntrack.c+43−3

@@ -1424,10 +1424,30 @@ static void nfp_nft_ct_translate_mangle_action(struct flow_action_entry *mangle_ · 1423 unmodified lines
1424	mangle_action->mangle.mask = (__force u32)cpu_to_be32(mangle_action->mangle.mask);	1424	mangle_action->mangle.mask = (__force u32)cpu_to_be32(mangle_action->mangle.mask);
1425	return;	1425	return;
1426		1426
		1427	/* Both struct tcphdr and struct udphdr start with
		1428	* __be16 source;
		1429	* __be16 dest;
		1430	* so we can use the same code for both.
		1431	*/
1427	case FLOW_ACT_MANGLE_HDR_TYPE_TCP:	1432	case FLOW_ACT_MANGLE_HDR_TYPE_TCP:
1428	case FLOW_ACT_MANGLE_HDR_TYPE_UDP:	1433	case FLOW_ACT_MANGLE_HDR_TYPE_UDP:
1429	mangle_action->mangle.val = (__force u16)cpu_to_be16(mangle_action->mangle.val);	1434	if (mangle_action->mangle.offset == offsetof(struct tcphdr, source)) {
1430	mangle_action->mangle.mask = (__force u16)cpu_to_be16(mangle_action->mangle.mask);	1435	mangle_action->mangle.val =
		1436	(__force u32)cpu_to_be32(mangle_action->mangle.val << 16);
		1437	/* The mask of mangle action is inverse mask,
		1438	* so clear the dest tp port with 0xFFFF to
		1439	* instead of rotate-left operation.
		1440	*/
		1441	mangle_action->mangle.mask =
		1442	(__force u32)cpu_to_be32(mangle_action->mangle.mask << 16 \| 0xFFFF);
		1443	}
		1444	if (mangle_action->mangle.offset == offsetof(struct tcphdr, dest)) {
		1445	mangle_action->mangle.offset = 0;
		1446	mangle_action->mangle.val =
		1447	(__force u32)cpu_to_be32(mangle_action->mangle.val);
		1448	mangle_action->mangle.mask =
		1449	(__force u32)cpu_to_be32(mangle_action->mangle.mask);
		1450	}
1431	return;	1451	return;
1432		1452
1433	default:	1453	default:
@@ -1864,10 +1884,30 @@ int nfp_fl_ct_handle_post_ct(struct nfp_flower_priv *priv, · 430 unmodified lines
1864	{	1884	{
1865	struct flow_rule *rule = flow_cls_offload_flow_rule(flow);	1885	struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
1866	struct nfp_fl_ct_flow_entry *ct_entry;	1886	struct nfp_fl_ct_flow_entry *ct_entry;
		1887	struct flow_action_entry *ct_goto;
1867	struct nfp_fl_ct_zone_entry *zt;	1888	struct nfp_fl_ct_zone_entry *zt;
		1889	struct flow_action_entry *act;
1868	bool wildcarded = false;	1890	bool wildcarded = false;
1869	struct flow_match_ct ct;	1891	struct flow_match_ct ct;
1870	struct flow_action_entry *ct_goto;	1892	int i;
		1893
		1894	flow_action_for_each(i, act, &rule->action) {
		1895	switch (act->id) {
		1896	case FLOW_ACTION_REDIRECT:
		1897	case FLOW_ACTION_REDIRECT_INGRESS:
		1898	case FLOW_ACTION_MIRRED:
		1899	case FLOW_ACTION_MIRRED_INGRESS:
		1900	if (act->dev->rtnl_link_ops &&
		1901	!strcmp(act->dev->rtnl_link_ops->kind, "openvswitch")) {
		1902	NL_SET_ERR_MSG_MOD(extack,
		1903	"unsupported offload: out port is openvswitch internal port");
		1904	return -EOPNOTSUPP;
		1905	}
		1906	break;
		1907	default:
		1908	break;
		1909	}
		1910	}
1871		1911
1872	flow_rule_match_ct(rule, &ct);	1912	flow_rule_match_ct(rule, &ct);
1873	if (!ct.mask->ct_zone) {	1913	if (!ct.mask->ct_zone) {

drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c+4−0

 	if (data->flags & STMMAC_FLAG_HWTSTAMP_CORRECT_LATENCY)
 		plat_dat->flags |= STMMAC_FLAG_HWTSTAMP_CORRECT_LATENCY;
+	/* Default TX Q0 to use TSO and rest TXQ for TBS */
+	for (int i = 1; i < plat_dat->tx_queues_to_use; i++)
+		plat_dat->tx_queues_cfg[i].tbs_en = 1;
 	plat_dat->host_dma_width = dwmac->ops->addr_width;
 	plat_dat->init = imx_dwmac_init;
 	plat_dat->exit = imx_dwmac_exit;

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c+3−0

@@ -3939,6 +3939,9 @@ static int __stmmac_open(struct net_device *dev, · 3938 unmodified lines
3939	priv->rx_copybreak = STMMAC_RX_COPYBREAK;	3939	priv->rx_copybreak = STMMAC_RX_COPYBREAK;
3940		3940
3941	buf_sz = dma_conf->dma_buf_sz;	3941	buf_sz = dma_conf->dma_buf_sz;
		3942	for (int i = 0; i < MTL_MAX_TX_QUEUES; i++)
		3943	if (priv->dma_conf.tx_queue[i].tbs & STMMAC_TBS_EN)
		3944	dma_conf->tx_queue[i].tbs = priv->dma_conf.tx_queue[i].tbs;
3942	memcpy(&priv->dma_conf, dma_conf, sizeof(*dma_conf));	3945	memcpy(&priv->dma_conf, dma_conf, sizeof(*dma_conf));
3943		3946
3944	stmmac_reset_queues_param(priv);	3947	stmmac_reset_queues_param(priv);

drivers/net/hyperv/netvsc.c+4−1

 	/* Disable NAPI and disassociate its context from the device. */
 	for (i = 0; i < net_device->num_chn; i++) {
 		/* See also vmbus_reset_channel_cb(). */
-		napi_disable(&net_device->chan_table[i].napi);
+		/* only disable enabled NAPI channel */
+		if (i < ndev->real_num_rx_queues)
+			napi_disable(&net_device->chan_table[i].napi);
 		netif_napi_del(&net_device->chan_table[i].napi);
 	}

drivers/net/phy/mediatek-ge-soc.c+81−66

 	u16 reg, val;
 	if (phydev->drv->phy_id == MTK_GPHY_ID_MT7988)
-		bias = -2;
+		bias = -1;
 	val = clamp_val(bias + tx_r50_cal_val, 0, 63);
 static void mt798x_phy_common_finetune(struct phy_device *phydev)
 {
 	phy_select_page(phydev, MTK_PHY_PAGE_EXTENDED_52B5);
+	/* SlvDSPreadyTime = 24, MasDSPreadyTime = 24 */
+	__phy_write(phydev, 0x11, 0xc71);
+	__phy_write(phydev, 0x12, 0xc);
+	__phy_write(phydev, 0x10, 0x8fae);
 	/* EnabRandUpdTrig = 1 */
 	__phy_write(phydev, 0x11, 0x2f00);
 	__phy_write(phydev, 0x12, 0xe);
 	__phy_write(phydev, 0x12, 0x0);
 	__phy_write(phydev, 0x10, 0x83aa);
-	/* TrFreeze = 0 */
+	/* FfeUpdGainForce = 1(Enable), FfeUpdGainForceVal = 4 */
+	__phy_write(phydev, 0x11, 0x240);
+	__phy_write(phydev, 0x12, 0x0);
+	__phy_write(phydev, 0x10, 0x9680);
+	/* TrFreeze = 0 (mt7988 default) */
 	__phy_write(phydev, 0x11, 0x0);
 	__phy_write(phydev, 0x12, 0x0);
 	__phy_write(phydev, 0x10, 0x9686);
+	/* SSTrKp100 = 5 */
+	/* SSTrKf100 = 6 */
+	/* SSTrKp1000Mas = 5 */
+	/* SSTrKf1000Mas = 6 */
 	/* SSTrKp1000Slv = 5 */
+	/* SSTrKf1000Slv = 6 */
 	__phy_write(phydev, 0x11, 0xbaef);
 	__phy_write(phydev, 0x12, 0x2e);
 	__phy_write(phydev, 0x10, 0x968c);
+	phy_restore_page(phydev, MTK_PHY_PAGE_STANDARD, 0);
+}
+static void mt7981_phy_finetune(struct phy_device *phydev)
+{
+	u16 val[8] = { 0x01ce, 0x01c1,
+		       0x020f, 0x0202,
+		       0x03d0, 0x03c0,
+		       0x0013, 0x0005 };
+	int i, k;
+	/* 100M eye finetune:
+	 * Keep middle level of TX MLT3 shapper as default.
+	 * Only change TX MLT3 overshoot level here.
+	 */
+	for (k = 0, i = 1; i < 12; i++) {
+		if (i % 3 == 0)
+			continue;
+		phy_write_mmd(phydev, MDIO_MMD_VEND1, i, val[k++]);
+	}
+	phy_select_page(phydev, MTK_PHY_PAGE_EXTENDED_52B5);
+	/* ResetSyncOffset = 6 */
+	__phy_write(phydev, 0x11, 0x600);
+	__phy_write(phydev, 0x12, 0x0);
+	__phy_write(phydev, 0x10, 0x8fc0);
+	/* VgaDecRate = 1 */
+	__phy_write(phydev, 0x11, 0x4c2a);
+	__phy_write(phydev, 0x12, 0x3e);
+	__phy_write(phydev, 0x10, 0x8fa4);
 	/* MrvlTrFix100Kp = 3, MrvlTrFix100Kf = 2,
 	 * MrvlTrFix1000Kp = 3, MrvlTrFix1000Kf = 2
 	__phy_write(phydev, 0x10, 0x8ec0);
 	phy_restore_page(phydev, MTK_PHY_PAGE_STANDARD, 0);
-	/* TR_OPEN_LOOP_EN = 1, lpf_x_average = 9*/
+	/* TR_OPEN_LOOP_EN = 1, lpf_x_average = 9 */
 	phy_modify_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RG_DEV1E_REG234,
 		       MTK_PHY_TR_OPEN_LOOP_EN_MASK | MTK_PHY_LPF_X_AVERAGE_MASK,
 		       BIT(0) | FIELD_PREP(MTK_PHY_LPF_X_AVERAGE_MASK, 0x9));
 	phy_write_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_LDO_OUTPUT_V, 0x2222);
 }
-static void mt7981_phy_finetune(struct phy_device *phydev)
-{
-	u16 val[8] = { 0x01ce, 0x01c1,
-		       0x020f, 0x0202,
-		       0x03d0, 0x03c0,
-		       0x0013, 0x0005 };
-	int i, k;
-	/* 100M eye finetune:
-	 * Keep middle level of TX MLT3 shapper as default.
-	 * Only change TX MLT3 overshoot level here.
-	 */
-	for (k = 0, i = 1; i < 12; i++) {
-		if (i % 3 == 0)
-			continue;
-		phy_write_mmd(phydev, MDIO_MMD_VEND1, i, val[k++]);
-	}
-	phy_select_page(phydev, MTK_PHY_PAGE_EXTENDED_52B5);
-	/* SlvDSPreadyTime = 24, MasDSPreadyTime = 24 */
-	__phy_write(phydev, 0x11, 0xc71);
-	__phy_write(phydev, 0x12, 0xc);
-	__phy_write(phydev, 0x10, 0x8fae);
-	/* ResetSyncOffset = 6 */
-	__phy_write(phydev, 0x11, 0x600);
-	__phy_write(phydev, 0x12, 0x0);
-	__phy_write(phydev, 0x10, 0x8fc0);
-	/* VgaDecRate = 1 */
-	__phy_write(phydev, 0x11, 0x4c2a);
-	__phy_write(phydev, 0x12, 0x3e);
-	__phy_write(phydev, 0x10, 0x8fa4);
-	/* FfeUpdGainForce = 4 */
-	__phy_write(phydev, 0x11, 0x240);
-	__phy_write(phydev, 0x12, 0x0);
-	__phy_write(phydev, 0x10, 0x9680);
-	phy_restore_page(phydev, MTK_PHY_PAGE_STANDARD, 0);
-}
 static void mt7988_phy_finetune(struct phy_device *phydev)
 {
 	u16 val[12] = { 0x0187, 0x01cd, 0x01c8, 0x0182,
 	/* TCT finetune */
 	phy_write_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RG_TX_FILTER, 0x5);
-	/* Disable TX power saving */
-	phy_modify_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RXADC_CTRL_RG7,
-		       MTK_PHY_DA_AD_BUF_BIAS_LP_MASK, 0x3 << 8);
 	phy_select_page(phydev, MTK_PHY_PAGE_EXTENDED_52B5);
-	/* SlvDSPreadyTime = 24, MasDSPreadyTime = 12 */
-	__phy_write(phydev, 0x11, 0x671);
-	__phy_write(phydev, 0x12, 0xc);
-	__phy_write(phydev, 0x10, 0x8fae);
 	/* ResetSyncOffset = 5 */
 	__phy_write(phydev, 0x11, 0x500);
 	__phy_write(phydev, 0x12, 0x0);
 	/* VgaDecRate is 1 at default on mt7988 */
-	phy_restore_page(phydev, MTK_PHY_PAGE_STANDARD, 0);
+	/* MrvlTrFix100Kp = 6, MrvlTrFix100Kf = 7,
+	 * MrvlTrFix1000Kp = 6, MrvlTrFix1000Kf = 7
+	 */
+	__phy_write(phydev, 0x11, 0xb90a);
+	__phy_write(phydev, 0x12, 0x6f);
+	__phy_write(phydev, 0x10, 0x8f82);
+	/* RemAckCntLimitCtrl = 1 */
+	__phy_write(phydev, 0x11, 0xfbba);
+	__phy_write(phydev, 0x12, 0xc3);
+	__phy_write(phydev, 0x10, 0x87f8);
-	phy_select_page(phydev, MTK_PHY_PAGE_EXTENDED_2A30);
-	/* TxClkOffset = 2 */
-	__phy_modify(phydev, MTK_PHY_ANARG_RG, MTK_PHY_TCLKOFFSET_MASK,
-		     FIELD_PREP(MTK_PHY_TCLKOFFSET_MASK, 0x2));
 	phy_restore_page(phydev, MTK_PHY_PAGE_STANDARD, 0);
+	/* TR_OPEN_LOOP_EN = 1, lpf_x_average = 10 */
+	phy_modify_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RG_DEV1E_REG234,
+		       MTK_PHY_TR_OPEN_LOOP_EN_MASK | MTK_PHY_LPF_X_AVERAGE_MASK,
+		       BIT(0) | FIELD_PREP(MTK_PHY_LPF_X_AVERAGE_MASK, 0xa));
+	/* rg_tr_lpf_cnt_val = 1023 */
+	phy_write_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RG_LPF_CNT_VAL, 0x3ff);
 }
 static void mt798x_phy_eee(struct phy_device *phydev)
 		       MTK_PHY_LPI_SLV_SEND_TX_EN,
 		       FIELD_PREP(MTK_PHY_LPI_SLV_SEND_TX_TIMER_MASK, 0x120));
-	phy_modify_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RG_DEV1E_REG239,
+	/* Keep MTK_PHY_LPI_SEND_LOC_TIMER as 375 */
-		       MTK_PHY_LPI_SEND_LOC_TIMER_MASK |
+	phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RG_DEV1E_REG239,
-		       MTK_PHY_LPI_TXPCS_LOC_RCV,
+			   MTK_PHY_LPI_TXPCS_LOC_RCV);
-		       FIELD_PREP(MTK_PHY_LPI_SEND_LOC_TIMER_MASK, 0x117));
+	/* This also fixes some IoT issues, such as CH340 */
 	phy_modify_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RG_DEV1E_REG2C7,
 		       MTK_PHY_MAX_GAIN_MASK | MTK_PHY_MIN_GAIN_MASK,
 		       FIELD_PREP(MTK_PHY_MAX_GAIN_MASK, 0x8) |
 	__phy_write(phydev, 0x12, 0x0);
 	__phy_write(phydev, 0x10, 0x9690);
-	/* REG_EEE_st2TrKf1000 = 3 */
+	/* REG_EEE_st2TrKf1000 = 2 */
 	__phy_write(phydev, 0x11, 0x114f);
 	__phy_write(phydev, 0x12, 0x2);
 	__phy_write(phydev, 0x10, 0x969a);
 	__phy_write(phydev, 0x12, 0x0);
 	__phy_write(phydev, 0x10, 0x96b8);
-	/* REGEEE_wake_slv_tr_wait_dfesigdet_en = 1 */
+	/* REGEEE_wake_slv_tr_wait_dfesigdet_en = 0 */
 	__phy_write(phydev, 0x11, 0x1463);
 	__phy_write(phydev, 0x12, 0x0);
 	__phy_write(phydev, 0x10, 0x96ca);
 	if (err)
 		return err;
+	/* Disable TX power saving at probing to:
+	 * 1. Meet common mode compliance test criteria
+	 * 2. Make sure that TX-VCM calibration works fine
+	 */
+	phy_modify_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RXADC_CTRL_RG7,
+		       MTK_PHY_DA_AD_BUF_BIAS_LP_MASK, 0x3 << 8);
 	return mt798x_phy_calibration(phydev);
 }

drivers/net/xen-netback/netback.c+40−44

 module_param(provides_xdp_headroom, bool, 0644);
 static void xenvif_idx_release(struct xenvif_queue *queue, u16 pending_idx,
-			       u8 status);
+			       s8 status);
 static void make_tx_response(struct xenvif_queue *queue,
-			     struct xen_netif_tx_request *txp,
+			     const struct xen_netif_tx_request *txp,
 			     unsigned int extra_count,
-			     s8       st);
+			     s8 status);
-static void push_tx_responses(struct xenvif_queue *queue);
 static void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx);
 			  unsigned int extra_count, RING_IDX end)
 {
 	RING_IDX cons = queue->tx.req_cons;
-	unsigned long flags;
 	do {
-		spin_lock_irqsave(&queue->response_lock, flags);
 		make_tx_response(queue, txp, extra_count, XEN_NETIF_RSP_ERROR);
-		push_tx_responses(queue);
-		spin_unlock_irqrestore(&queue->response_lock, flags);
 		if (cons == end)
 			break;
 		RING_COPY_REQUEST(&queue->tx, cons++, txp);
 	for (shinfo->nr_frags = 0; nr_slots > 0 && shinfo->nr_frags < MAX_SKB_FRAGS;
 	     nr_slots--) {
 		if (unlikely(!txp->size)) {
-			unsigned long flags;
-			spin_lock_irqsave(&queue->response_lock, flags);
 			make_tx_response(queue, txp, 0, XEN_NETIF_RSP_OKAY);
-			push_tx_responses(queue);
-			spin_unlock_irqrestore(&queue->response_lock, flags);
 			++txp;
 			continue;
 		}
 		for (shinfo->nr_frags = 0; shinfo->nr_frags < nr_slots; ++txp) {
 			if (unlikely(!txp->size)) {
-				unsigned long flags;
-				spin_lock_irqsave(&queue->response_lock, flags);
 				make_tx_response(queue, txp, 0,
 						 XEN_NETIF_RSP_OKAY);
-				push_tx_responses(queue);
-				spin_unlock_irqrestore(&queue->response_lock,
-						       flags);
 				continue;
 			}
 					 (ret == 0) ?
 					 XEN_NETIF_RSP_OKAY :
 					 XEN_NETIF_RSP_ERROR);
-			push_tx_responses(queue);
 			continue;
 		}
 			make_tx_response(queue, &txreq, extra_count,
 					 XEN_NETIF_RSP_OKAY);
-			push_tx_responses(queue);
 			continue;
 		}
 	return work_done;
 }
+static void _make_tx_response(struct xenvif_queue *queue,
+			     const struct xen_netif_tx_request *txp,
+			     unsigned int extra_count,
+			     s8 status)
+{
+	RING_IDX i = queue->tx.rsp_prod_pvt;
+	struct xen_netif_tx_response *resp;
+	resp = RING_GET_RESPONSE(&queue->tx, i);
+	resp->id     = txp->id;
+	resp->status = status;
+	while (extra_count-- != 0)
+		RING_GET_RESPONSE(&queue->tx, ++i)->status = XEN_NETIF_RSP_NULL;
+	queue->tx.rsp_prod_pvt = ++i;
+}
+static void push_tx_responses(struct xenvif_queue *queue)
+{
+	int notify;
+	RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&queue->tx, notify);
+	if (notify)
+		notify_remote_via_irq(queue->tx_irq);
+}
 static void xenvif_idx_release(struct xenvif_queue *queue, u16 pending_idx,
-			       u8 status)
+			       s8 status)
 {
 	struct pending_tx_info *pending_tx_info;
 	pending_ring_idx_t index;
 	spin_lock_irqsave(&queue->response_lock, flags);
-	make_tx_response(queue, &pending_tx_info->req,
+	_make_tx_response(queue, &pending_tx_info->req,
-			 pending_tx_info->extra_count, status);
+			  pending_tx_info->extra_count, status);
 	/* Release the pending index before pusing the Tx response so
 	 * its available before a new Tx request is pushed by the
 	spin_unlock_irqrestore(&queue->response_lock, flags);
 }
 static void make_tx_response(struct xenvif_queue *queue,
-			     struct xen_netif_tx_request *txp,
+			     const struct xen_netif_tx_request *txp,
 			     unsigned int extra_count,
-			     s8       st)
+			     s8 status)
 {
-	RING_IDX i = queue->tx.rsp_prod_pvt;
+	unsigned long flags;
-	struct xen_netif_tx_response *resp;
-	resp = RING_GET_RESPONSE(&queue->tx, i);
-	resp->id     = txp->id;
-	resp->status = st;
-	while (extra_count-- != 0)
-		RING_GET_RESPONSE(&queue->tx, ++i)->status = XEN_NETIF_RSP_NULL;
-	queue->tx.rsp_prod_pvt = ++i;
+	spin_lock_irqsave(&queue->response_lock, flags);
-}
-static void push_tx_responses(struct xenvif_queue *queue)
+	_make_tx_response(queue, txp, extra_count, status);
-{
+	push_tx_responses(queue);
-	int notify;
-	RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&queue->tx, notify);
+	spin_unlock_irqrestore(&queue->response_lock, flags);
-	if (notify)
-		notify_remote_via_irq(queue->tx_irq);
 }
 static void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx)

drivers/platform/mellanox/mlxbf-pmc.c+2−2

@@ -1170,7 +1170,7 @@ static int mlxbf_pmc_program_crspace_counter(int blk_num, uint32_t cnt_num, · 1169 unmodified lines
1170	int ret;	1170	int ret;
1171		1171
1172	addr = pmc->block[blk_num].mmio_base +	1172	addr = pmc->block[blk_num].mmio_base +
1173	(rounddown(cnt_num, 2) * MLXBF_PMC_CRSPACE_PERFSEL_SZ);	1173	((cnt_num / 2) * MLXBF_PMC_CRSPACE_PERFSEL_SZ);
1174	ret = mlxbf_pmc_readl(addr, &word);	1174	ret = mlxbf_pmc_readl(addr, &word);
1175	if (ret)	1175	if (ret)
1176	return ret;	1176	return ret;
@@ -1413,7 +1413,7 @@ static int mlxbf_pmc_read_crspace_event(int blk_num, uint32_t cnt_num, · 236 unmodified lines
1413	int ret;	1413	int ret;
1414		1414
1415	addr = pmc->block[blk_num].mmio_base +	1415	addr = pmc->block[blk_num].mmio_base +
1416	(rounddown(cnt_num, 2) * MLXBF_PMC_CRSPACE_PERFSEL_SZ);	1416	((cnt_num / 2) * MLXBF_PMC_CRSPACE_PERFSEL_SZ);
1417	ret = mlxbf_pmc_readl(addr, &word);	1417	ret = mlxbf_pmc_readl(addr, &word);
1418	if (ret)	1418	if (ret)
1419	return ret;	1419	return ret;

drivers/platform/mellanox/mlxbf-tmfifo.c+67−0

@@ -47,6 +47,9 @@ · 46 unmodified lines
47	/* Message with data needs at least two words (for header & data). */	47	/* Message with data needs at least two words (for header & data). */
48	#define MLXBF_TMFIFO_DATA_MIN_WORDS 2	48	#define MLXBF_TMFIFO_DATA_MIN_WORDS 2
49		49
		50	/* Tx timeout in milliseconds. */
		51	#define TMFIFO_TX_TIMEOUT 2000
		52
50	/* ACPI UID for BlueField-3. */	53	/* ACPI UID for BlueField-3. */
51	#define TMFIFO_BF3_UID 1	54	#define TMFIFO_BF3_UID 1
52		55
@@ -62,12 +65,14 @@ struct mlxbf_tmfifo; · 9 unmodified lines
62	* @drop_desc: dummy desc for packet dropping	65	* @drop_desc: dummy desc for packet dropping
63	* @cur_len: processed length of the current descriptor	66	* @cur_len: processed length of the current descriptor
64	* @rem_len: remaining length of the pending packet	67	* @rem_len: remaining length of the pending packet
		68	* @rem_padding: remaining bytes to send as paddings
65	* @pkt_len: total length of the pending packet	69	* @pkt_len: total length of the pending packet
66	* @next_avail: next avail descriptor id	70	* @next_avail: next avail descriptor id
67	* @num: vring size (number of descriptors)	71	* @num: vring size (number of descriptors)
68	* @align: vring alignment size	72	* @align: vring alignment size
69	* @index: vring index	73	* @index: vring index
70	* @vdev_id: vring virtio id (VIRTIO_ID_xxx)	74	* @vdev_id: vring virtio id (VIRTIO_ID_xxx)
		75	* @tx_timeout: expire time of last tx packet
71	* @fifo: pointer to the tmfifo structure	76	* @fifo: pointer to the tmfifo structure
72	*/	77	*/
73	struct mlxbf_tmfifo_vring {	78	struct mlxbf_tmfifo_vring {
@@ -79,12 +84,14 @@ struct mlxbf_tmfifo_vring { · 5 unmodified lines
79	struct vring_desc drop_desc;	84	struct vring_desc drop_desc;
80	int cur_len;	85	int cur_len;
81	int rem_len;	86	int rem_len;
		87	int rem_padding;
82	u32 pkt_len;	88	u32 pkt_len;
83	u16 next_avail;	89	u16 next_avail;
84	int num;	90	int num;
85	int align;	91	int align;
86	int index;	92	int index;
87	int vdev_id;	93	int vdev_id;
		94	unsigned long tx_timeout;
88	struct mlxbf_tmfifo *fifo;	95	struct mlxbf_tmfifo *fifo;
89	};	96	};
90		97
@@ -819,6 +826,50 @@ mlxbf_tmfifo_desc_done: · 728 unmodified lines
819	return true;	826	return true;
820	}	827	}
821		828
		829	static void mlxbf_tmfifo_check_tx_timeout(struct mlxbf_tmfifo_vring *vring)
		830	{
		831	unsigned long flags;
		832
		833	/* Only handle Tx timeout for network vdev. */
		834	if (vring->vdev_id != VIRTIO_ID_NET)
		835	return;
		836
		837	/* Initialize the timeout or return if not expired. */
		838	if (!vring->tx_timeout) {
		839	/* Initialize the timeout. */
		840	vring->tx_timeout = jiffies +
		841	msecs_to_jiffies(TMFIFO_TX_TIMEOUT);
		842	return;
		843	} else if (time_before(jiffies, vring->tx_timeout)) {
		844	/* Return if not timeout yet. */
		845	return;
		846	}
		847
		848	/*
		849	* Drop the packet after timeout. The outstanding packet is
		850	* released and the remaining bytes will be sent with padding byte 0x00
		851	* as a recovery. On the peer(host) side, the padding bytes 0x00 will be
		852	* either dropped directly, or appended into existing outstanding packet
		853	* thus dropped as corrupted network packet.
		854	*/
		855	vring->rem_padding = round_up(vring->rem_len, sizeof(u64));
		856	mlxbf_tmfifo_release_pkt(vring);
		857	vring->cur_len = 0;
		858	vring->rem_len = 0;
		859	vring->fifo->vring[0] = NULL;
		860
		861	/*
		862	* Make sure the load/store are in order before
		863	* returning back to virtio.
		864	*/
		865	virtio_mb(false);
		866
		867	/* Notify upper layer. */
		868	spin_lock_irqsave(&vring->fifo->spin_lock[0], flags);
		869	vring_interrupt(0, vring->vq);
		870	spin_unlock_irqrestore(&vring->fifo->spin_lock[0], flags);
		871	}
		872
822	/* Rx & Tx processing of a queue. */	873	/* Rx & Tx processing of a queue. */
823	static void mlxbf_tmfifo_rxtx(struct mlxbf_tmfifo_vring *vring, bool is_rx)	874	static void mlxbf_tmfifo_rxtx(struct mlxbf_tmfifo_vring *vring, bool is_rx)
824	{	875	{
@@ -841,6 +892,7 @@ static void mlxbf_tmfifo_rxtx(struct mlxbf_tmfifo_vring *vring, bool is_rx) · 16 unmodified lines
841	return;	892	return;
842		893
843	do {	894	do {
		895	retry:
844	/* Get available FIFO space. */	896	/* Get available FIFO space. */
845	if (avail == 0) {	897	if (avail == 0) {
846	if (is_rx)	898	if (is_rx)
@@ -851,6 +903,17 @@ static void mlxbf_tmfifo_rxtx(struct mlxbf_tmfifo_vring *vring, bool is_rx) · 4 unmodified lines
851	break;	903	break;
852	}	904	}
853		905
		906	/* Insert paddings for discarded Tx packet. */
		907	if (!is_rx) {
		908	vring->tx_timeout = 0;
		909	while (vring->rem_padding >= sizeof(u64)) {
		910	writeq(0, vring->fifo->tx.data);
		911	vring->rem_padding -= sizeof(u64);
		912	if (--avail == 0)
		913	goto retry;
		914	}
		915	}
		916
854	/* Console output always comes from the Tx buffer. */	917	/* Console output always comes from the Tx buffer. */
855	if (!is_rx && devid == VIRTIO_ID_CONSOLE) {	918	if (!is_rx && devid == VIRTIO_ID_CONSOLE) {
856	mlxbf_tmfifo_console_tx(fifo, avail);	919	mlxbf_tmfifo_console_tx(fifo, avail);
@@ -860,6 +923,10 @@ static void mlxbf_tmfifo_rxtx(struct mlxbf_tmfifo_vring *vring, bool is_rx) · 3 unmodified lines
860	/* Handle one descriptor. */	923	/* Handle one descriptor. */
861	more = mlxbf_tmfifo_rxtx_one_desc(vring, is_rx, &avail);	924	more = mlxbf_tmfifo_rxtx_one_desc(vring, is_rx, &avail);
862	} while (more);	925	} while (more);
		926
		927	/* Check Tx timeout. */
		928	if (avail <= 0 && !is_rx)
		929	mlxbf_tmfifo_check_tx_timeout(vring);
863	}	930	}
864		931
865	/* Handle Rx or Tx queues. */	932	/* Handle Rx or Tx queues. */

drivers/platform/x86/amd/pmf/Kconfig+1−0

@@ -10,6 +10,7 @@ config AMD_PMF · 9 unmodified lines
10	depends on AMD_NB	10	depends on AMD_NB
11	select ACPI_PLATFORM_PROFILE	11	select ACPI_PLATFORM_PROFILE
12	depends on TEE && AMDTEE	12	depends on TEE && AMDTEE
		13	depends on AMD_SFH_HID
13	help	14	help
14	This driver provides support for the AMD Platform Management Framework.	15	This driver provides support for the AMD Platform Management Framework.
15	The goal is to enhance end user experience by making AMD PCs smarter,	16	The goal is to enhance end user experience by making AMD PCs smarter,

drivers/platform/x86/amd/pmf/spc.c+36−0

@@ -10,6 +10,7 @@ · 9 unmodified lines
10	*/	10	*/
11		11
12	#include <acpi/button.h>	12	#include <acpi/button.h>
		13	#include <linux/amd-pmf-io.h>
13	#include <linux/power_supply.h>	14	#include <linux/power_supply.h>
14	#include <linux/units.h>	15	#include <linux/units.h>
15	#include "pmf.h"	16	#include "pmf.h"
@@ -44,6 +45,8 @@ void amd_pmf_dump_ta_inputs(struct amd_pmf_dev dev, struct ta_pmf_enact_table · 28 unmodified lines
44	dev_dbg(dev->dev, "Max C0 Residency: %u\n", in->ev_info.max_c0residency);	45	dev_dbg(dev->dev, "Max C0 Residency: %u\n", in->ev_info.max_c0residency);
45	dev_dbg(dev->dev, "GFX Busy: %u\n", in->ev_info.gfx_busy);	46	dev_dbg(dev->dev, "GFX Busy: %u\n", in->ev_info.gfx_busy);
46	dev_dbg(dev->dev, "LID State: %s\n", in->ev_info.lid_state ? "close" : "open");	47	dev_dbg(dev->dev, "LID State: %s\n", in->ev_info.lid_state ? "close" : "open");
		48	dev_dbg(dev->dev, "User Presence: %s\n", in->ev_info.user_present ? "Present" : "Away");
		49	dev_dbg(dev->dev, "Ambient Light: %d\n", in->ev_info.ambient_light);
47	dev_dbg(dev->dev, "==== TA inputs END ====\n");	50	dev_dbg(dev->dev, "==== TA inputs END ====\n");
48	}	51	}
49	#else	52	#else
@@ -147,6 +150,38 @@ static int amd_pmf_get_slider_info(struct amd_pmf_dev *dev, struct ta_pmf_enact_ · 97 unmodified lines
147	return 0;	150	return 0;
148	}	151	}
149		152
		153	static int amd_pmf_get_sensor_info(struct amd_pmf_dev dev, struct ta_pmf_enact_table in)
		154	{
		155	struct amd_sfh_info sfh_info;
		156	int ret;
		157
		158	/* Get ALS data */
		159	ret = amd_get_sfh_info(&sfh_info, MT_ALS);
		160	if (!ret)
		161	in->ev_info.ambient_light = sfh_info.ambient_light;
		162	else
		163	return ret;
		164
		165	/* get HPD data */
		166	ret = amd_get_sfh_info(&sfh_info, MT_HPD);
		167	if (ret)
		168	return ret;
		169
		170	switch (sfh_info.user_present) {
		171	case SFH_NOT_DETECTED:
		172	in->ev_info.user_present = 0xff; /* assume no sensors connected */
		173	break;
		174	case SFH_USER_PRESENT:
		175	in->ev_info.user_present = 1;
		176	break;
		177	case SFH_USER_AWAY:
		178	in->ev_info.user_present = 0;
		179	break;
		180	}
		181
		182	return 0;
		183	}
		184
150	void amd_pmf_populate_ta_inputs(struct amd_pmf_dev dev, struct ta_pmf_enact_table in)	185	void amd_pmf_populate_ta_inputs(struct amd_pmf_dev dev, struct ta_pmf_enact_table in)
151	{	186	{
152	/* TA side lid open is 1 and close is 0, hence the ! here */	187	/* TA side lid open is 1 and close is 0, hence the ! here */
@@ -155,4 +190,5 @@ void amd_pmf_populate_ta_inputs(struct amd_pmf_dev *dev, struct ta_pmf_enact_tab · 2 unmodified lines
155	amd_pmf_get_smu_info(dev, in);	190	amd_pmf_get_smu_info(dev, in);
156	amd_pmf_get_battery_info(dev, in);	191	amd_pmf_get_battery_info(dev, in);
157	amd_pmf_get_slider_info(dev, in);	192	amd_pmf_get_slider_info(dev, in);
		193	amd_pmf_get_sensor_info(dev, in);
158	}	194	}

drivers/platform/x86/amd/pmf/tee-if.c+3−1

 	if (!new_policy_buf)
 		return -ENOMEM;
-	if (copy_from_user(new_policy_buf, buf, length))
+	if (copy_from_user(new_policy_buf, buf, length)) {
+		kfree(new_policy_buf);
 		return -EFAULT;
+	}
 	kfree(dev->policy_buf);
 	dev->policy_buf = new_policy_buf;

drivers/platform/x86/intel/ifs/load.c+2−1

@@ -399,7 +399,8 @@ int ifs_load_firmware(struct device *dev) · 398 unmodified lines
399	if (fw->size != expected_size) {	399	if (fw->size != expected_size) {
400	dev_err(dev, "File size mismatch (expected %u, actual %zu). Corrupted IFS image.\n",	400	dev_err(dev, "File size mismatch (expected %u, actual %zu). Corrupted IFS image.\n",
401	expected_size, fw->size);	401	expected_size, fw->size);
402	return -EINVAL;	402	ret = -EINVAL;
		403	goto release;
403	}	404	}
404		405
405	ret = image_sanity_check(dev, (struct microcode_header_intel *)fw->data);	406	ret = image_sanity_check(dev, (struct microcode_header_intel *)fw->data);

drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c+41−41

@@ -23,23 +23,23 @@ static int (uncore_read)(struct uncore_data data, unsigned int *min, unsigned · 22 unmodified lines
23	static int (uncore_write)(struct uncore_data data, unsigned int input, unsigned int min_max);	23	static int (uncore_write)(struct uncore_data data, unsigned int input, unsigned int min_max);
24	static int (uncore_read_freq)(struct uncore_data data, unsigned int *freq);	24	static int (uncore_read_freq)(struct uncore_data data, unsigned int *freq);
25		25
26	static ssize_t show_domain_id(struct device dev, struct device_attribute attr, char *buf)	26	static ssize_t show_domain_id(struct kobject kobj, struct kobj_attribute attr, char *buf)
27	{	27	{
28	struct uncore_data *data = container_of(attr, struct uncore_data, domain_id_dev_attr);	28	struct uncore_data *data = container_of(attr, struct uncore_data, domain_id_kobj_attr);
29		29
30	return sprintf(buf, "%u\n", data->domain_id);	30	return sprintf(buf, "%u\n", data->domain_id);
31	}	31	}
32		32
33	static ssize_t show_fabric_cluster_id(struct device dev, struct device_attribute attr, char *buf)	33	static ssize_t show_fabric_cluster_id(struct kobject kobj, struct kobj_attribute attr, char *buf)
34	{	34	{
35	struct uncore_data *data = container_of(attr, struct uncore_data, fabric_cluster_id_dev_attr);	35	struct uncore_data *data = container_of(attr, struct uncore_data, fabric_cluster_id_kobj_attr);
36		36
37	return sprintf(buf, "%u\n", data->cluster_id);	37	return sprintf(buf, "%u\n", data->cluster_id);
38	}	38	}
39		39
40	static ssize_t show_package_id(struct device dev, struct device_attribute attr, char *buf)	40	static ssize_t show_package_id(struct kobject kobj, struct kobj_attribute attr, char *buf)
41	{	41	{
42	struct uncore_data *data = container_of(attr, struct uncore_data, package_id_dev_attr);	42	struct uncore_data *data = container_of(attr, struct uncore_data, package_id_kobj_attr);
43		43
44	return sprintf(buf, "%u\n", data->package_id);	44	return sprintf(buf, "%u\n", data->package_id);
45	}	45	}
@@ -97,30 +97,30 @@ static ssize_t show_perf_status_freq_khz(struct uncore_data data, char buf) · 51 unmodified lines
97	}	97	}
98		98
99	#define store_uncore_min_max(name, min_max) \	99	#define store_uncore_min_max(name, min_max) \
100	static ssize_t store_##name(struct device *dev, \	100	static ssize_t store_##name(struct kobject *kobj, \
101	struct device_attribute *attr, \	101	struct kobj_attribute *attr, \
102	const char *buf, size_t count) \	102	const char *buf, size_t count) \
103	{ \	103	{ \
104	struct uncore_data *data = container_of(attr, struct uncore_data, name##_dev_attr);\	104	struct uncore_data *data = container_of(attr, struct uncore_data, name##_kobj_attr);\
105	\	105	\
106	return store_min_max_freq_khz(data, buf, count, \	106	return store_min_max_freq_khz(data, buf, count, \
107	min_max); \	107	min_max); \
108	}	108	}
109		109
110	#define show_uncore_min_max(name, min_max) \	110	#define show_uncore_min_max(name, min_max) \
111	static ssize_t show_##name(struct device *dev, \	111	static ssize_t show_##name(struct kobject *kobj, \
112	struct device_attribute attr, char buf)\	112	struct kobj_attribute attr, char buf)\
113	{ \	113	{ \
114	struct uncore_data *data = container_of(attr, struct uncore_data, name##_dev_attr);\	114	struct uncore_data *data = container_of(attr, struct uncore_data, name##_kobj_attr);\
115	\	115	\
116	return show_min_max_freq_khz(data, buf, min_max); \	116	return show_min_max_freq_khz(data, buf, min_max); \
117	}	117	}
118		118
119	#define show_uncore_perf_status(name) \	119	#define show_uncore_perf_status(name) \
120	static ssize_t show_##name(struct device *dev, \	120	static ssize_t show_##name(struct kobject *kobj, \
121	struct device_attribute attr, char buf)\	121	struct kobj_attribute attr, char buf)\
122	{ \	122	{ \
123	struct uncore_data *data = container_of(attr, struct uncore_data, name##_dev_attr);\	123	struct uncore_data *data = container_of(attr, struct uncore_data, name##_kobj_attr);\
124	\	124	\
125	return show_perf_status_freq_khz(data, buf); \	125	return show_perf_status_freq_khz(data, buf); \
126	}	126	}
@@ -134,11 +134,11 @@ show_uncore_min_max(max_freq_khz, 1); · 7 unmodified lines
134	show_uncore_perf_status(current_freq_khz);	134	show_uncore_perf_status(current_freq_khz);
135		135
136	#define show_uncore_data(member_name) \	136	#define show_uncore_data(member_name) \
137	static ssize_t show_##member_name(struct device *dev, \	137	static ssize_t show_##member_name(struct kobject *kobj, \
138	struct device_attribute attr, char buf)\	138	struct kobj_attribute attr, char buf)\
139	{ \	139	{ \
140	struct uncore_data *data = container_of(attr, struct uncore_data,\	140	struct uncore_data *data = container_of(attr, struct uncore_data,\
141	member_name##_dev_attr);\	141	member_name##_kobj_attr);\
142	\	142	\
143	return sysfs_emit(buf, "%u\n", \	143	return sysfs_emit(buf, "%u\n", \
144	data->member_name); \	144	data->member_name); \
@@ -149,29 +149,29 @@ show_uncore_data(initial_max_freq_khz); · 4 unmodified lines
149		149
150	#define init_attribute_rw(_name) \	150	#define init_attribute_rw(_name) \
151	do { \	151	do { \
152	sysfs_attr_init(&data->_name##_dev_attr.attr); \	152	sysfs_attr_init(&data->_name##_kobj_attr.attr); \
153	data->_name##_dev_attr.show = show_##_name; \	153	data->_name##_kobj_attr.show = show_##_name; \
154	data->_name##_dev_attr.store = store_##_name; \	154	data->_name##_kobj_attr.store = store_##_name; \
155	data->_name##_dev_attr.attr.name = #_name; \	155	data->_name##_kobj_attr.attr.name = #_name; \
156	data->_name##_dev_attr.attr.mode = 0644; \	156	data->_name##_kobj_attr.attr.mode = 0644; \
157	} while (0)	157	} while (0)
158		158
159	#define init_attribute_ro(_name) \	159	#define init_attribute_ro(_name) \
160	do { \	160	do { \
161	sysfs_attr_init(&data->_name##_dev_attr.attr); \	161	sysfs_attr_init(&data->_name##_kobj_attr.attr); \
162	data->_name##_dev_attr.show = show_##_name; \	162	data->_name##_kobj_attr.show = show_##_name; \
163	data->_name##_dev_attr.store = NULL; \	163	data->_name##_kobj_attr.store = NULL; \
164	data->_name##_dev_attr.attr.name = #_name; \	164	data->_name##_kobj_attr.attr.name = #_name; \
165	data->_name##_dev_attr.attr.mode = 0444; \	165	data->_name##_kobj_attr.attr.mode = 0444; \
166	} while (0)	166	} while (0)
167		167
168	#define init_attribute_root_ro(_name) \	168	#define init_attribute_root_ro(_name) \
169	do { \	169	do { \
170	sysfs_attr_init(&data->_name##_dev_attr.attr); \	170	sysfs_attr_init(&data->_name##_kobj_attr.attr); \
171	data->_name##_dev_attr.show = show_##_name; \	171	data->_name##_kobj_attr.show = show_##_name; \
172	data->_name##_dev_attr.store = NULL; \	172	data->_name##_kobj_attr.store = NULL; \
173	data->_name##_dev_attr.attr.name = #_name; \	173	data->_name##_kobj_attr.attr.name = #_name; \
174	data->_name##_dev_attr.attr.mode = 0400; \	174	data->_name##_kobj_attr.attr.mode = 0400; \
175	} while (0)	175	} while (0)
176		176
177	static int create_attr_group(struct uncore_data data, char name)	177	static int create_attr_group(struct uncore_data data, char name)
@@ -186,21 +186,21 @@ static int create_attr_group(struct uncore_data data, char name) · 8 unmodified lines
186		186
187	if (data->domain_id != UNCORE_DOMAIN_ID_INVALID) {	187	if (data->domain_id != UNCORE_DOMAIN_ID_INVALID) {
188	init_attribute_root_ro(domain_id);	188	init_attribute_root_ro(domain_id);
189	data->uncore_attrs[index++] = &data->domain_id_dev_attr.attr;	189	data->uncore_attrs[index++] = &data->domain_id_kobj_attr.attr;
190	init_attribute_root_ro(fabric_cluster_id);	190	init_attribute_root_ro(fabric_cluster_id);
191	data->uncore_attrs[index++] = &data->fabric_cluster_id_dev_attr.attr;	191	data->uncore_attrs[index++] = &data->fabric_cluster_id_kobj_attr.attr;
192	init_attribute_root_ro(package_id);	192	init_attribute_root_ro(package_id);
193	data->uncore_attrs[index++] = &data->package_id_dev_attr.attr;	193	data->uncore_attrs[index++] = &data->package_id_kobj_attr.attr;
194	}	194	}
195		195
196	data->uncore_attrs[index++] = &data->max_freq_khz_dev_attr.attr;	196	data->uncore_attrs[index++] = &data->max_freq_khz_kobj_attr.attr;
197	data->uncore_attrs[index++] = &data->min_freq_khz_dev_attr.attr;	197	data->uncore_attrs[index++] = &data->min_freq_khz_kobj_attr.attr;
198	data->uncore_attrs[index++] = &data->initial_min_freq_khz_dev_attr.attr;	198	data->uncore_attrs[index++] = &data->initial_min_freq_khz_kobj_attr.attr;
199	data->uncore_attrs[index++] = &data->initial_max_freq_khz_dev_attr.attr;	199	data->uncore_attrs[index++] = &data->initial_max_freq_khz_kobj_attr.attr;
200		200
201	ret = uncore_read_freq(data, &freq);	201	ret = uncore_read_freq(data, &freq);
202	if (!ret)	202	if (!ret)
203	data->uncore_attrs[index++] = &data->current_freq_khz_dev_attr.attr;	203	data->uncore_attrs[index++] = &data->current_freq_khz_kobj_attr.attr;
204		204
205	data->uncore_attrs[index] = NULL;	205	data->uncore_attrs[index] = NULL;
206		206

drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.h+16−16

@@ -26,14 +26,14 @@ · 25 unmodified lines
26	* @instance_id: Unique instance id to append to directory name	26	* @instance_id: Unique instance id to append to directory name
27	* @name: Sysfs entry name for this instance	27	* @name: Sysfs entry name for this instance
28	* @uncore_attr_group: Attribute group storage	28	* @uncore_attr_group: Attribute group storage
29	* @max_freq_khz_dev_attr: Storage for device attribute max_freq_khz	29	* @max_freq_khz_kobj_attr: Storage for kobject attribute max_freq_khz
30	* @mix_freq_khz_dev_attr: Storage for device attribute min_freq_khz	30	* @mix_freq_khz_kobj_attr: Storage for kobject attribute min_freq_khz
31	* @initial_max_freq_khz_dev_attr: Storage for device attribute initial_max_freq_khz	31	* @initial_max_freq_khz_kobj_attr: Storage for kobject attribute initial_max_freq_khz
32	* @initial_min_freq_khz_dev_attr: Storage for device attribute initial_min_freq_khz	32	* @initial_min_freq_khz_kobj_attr: Storage for kobject attribute initial_min_freq_khz
33	* @current_freq_khz_dev_attr: Storage for device attribute current_freq_khz	33	* @current_freq_khz_kobj_attr: Storage for kobject attribute current_freq_khz
34	* @domain_id_dev_attr: Storage for device attribute domain_id	34	* @domain_id_kobj_attr: Storage for kobject attribute domain_id
35	* @fabric_cluster_id_dev_attr: Storage for device attribute fabric_cluster_id	35	* @fabric_cluster_id_kobj_attr: Storage for kobject attribute fabric_cluster_id
36	* @package_id_dev_attr: Storage for device attribute package_id	36	* @package_id_kobj_attr: Storage for kobject attribute package_id
37	* @uncore_attrs: Attribute storage for group creation	37	* @uncore_attrs: Attribute storage for group creation
38	*	38	*
39	* This structure is used to encapsulate all data related to uncore sysfs	39	* This structure is used to encapsulate all data related to uncore sysfs
@@ -53,14 +53,14 @@ struct uncore_data { · 13 unmodified lines
53	char name[32];	53	char name[32];
54		54
55	struct attribute_group uncore_attr_group;	55	struct attribute_group uncore_attr_group;
56	struct device_attribute max_freq_khz_dev_attr;	56	struct kobj_attribute max_freq_khz_kobj_attr;
57	struct device_attribute min_freq_khz_dev_attr;	57	struct kobj_attribute min_freq_khz_kobj_attr;
58	struct device_attribute initial_max_freq_khz_dev_attr;	58	struct kobj_attribute initial_max_freq_khz_kobj_attr;
59	struct device_attribute initial_min_freq_khz_dev_attr;	59	struct kobj_attribute initial_min_freq_khz_kobj_attr;
60	struct device_attribute current_freq_khz_dev_attr;	60	struct kobj_attribute current_freq_khz_kobj_attr;
61	struct device_attribute domain_id_dev_attr;	61	struct kobj_attribute domain_id_kobj_attr;
62	struct device_attribute fabric_cluster_id_dev_attr;	62	struct kobj_attribute fabric_cluster_id_kobj_attr;
63	struct device_attribute package_id_dev_attr;	63	struct kobj_attribute package_id_kobj_attr;
64	struct attribute *uncore_attrs[9];	64	struct attribute *uncore_attrs[9];
65	};	65	};
66		66

drivers/platform/x86/intel/wmi/sbl-fw-update.c+2−2

@@ -32,7 +32,7 @@ static int get_fwu_request(struct device dev, u32 out) · 31 unmodified lines
32	return -ENODEV;	32	return -ENODEV;
33		33
34	if (obj->type != ACPI_TYPE_INTEGER) {	34	if (obj->type != ACPI_TYPE_INTEGER) {
35	dev_warn(dev, "wmi_query_block returned invalid value\n");	35	dev_warn(dev, "wmidev_block_query returned invalid value\n");
36	kfree(obj);	36	kfree(obj);
37	return -EINVAL;	37	return -EINVAL;
38	}	38	}
@@ -55,7 +55,7 @@ static int set_fwu_request(struct device *dev, u32 in) · 16 unmodified lines
55		55
56	status = wmidev_block_set(to_wmi_device(dev), 0, &input);	56	status = wmidev_block_set(to_wmi_device(dev), 0, &input);
57	if (ACPI_FAILURE(status)) {	57	if (ACPI_FAILURE(status)) {
58	dev_err(dev, "wmi_set_block failed\n");	58	dev_err(dev, "wmidev_block_set failed\n");
59	return -ENODEV;	59	return -ENODEV;
60	}	60	}
61		61

drivers/platform/x86/p2sb.c+140−42

@@ -26,6 +26,21 @@ static const struct x86_cpu_id p2sb_cpu_ids[] = { · 25 unmodified lines
26	{}	26	{}
27	};	27	};
28		28
		29	/*
		30	* Cache BAR0 of P2SB device functions 0 to 7.
		31	* TODO: The constant 8 is the number of functions that PCI specification
		32	* defines. Same definitions exist tree-wide. Unify this definition and
		33	* the other definitions then move to include/uapi/linux/pci.h.
		34	*/
		35	#define NR_P2SB_RES_CACHE 8
		36
		37	struct p2sb_res_cache {
		38	u32 bus_dev_id;
		39	struct resource res;
		40	};
		41
		42	static struct p2sb_res_cache p2sb_resources[NR_P2SB_RES_CACHE];
		43
29	static int p2sb_get_devfn(unsigned int *devfn)	44	static int p2sb_get_devfn(unsigned int *devfn)
30	{	45	{
31	unsigned int fn = P2SB_DEVFN_DEFAULT;	46	unsigned int fn = P2SB_DEVFN_DEFAULT;
@@ -39,10 +54,18 @@ static int p2sb_get_devfn(unsigned int *devfn) · 7 unmodified lines
39	return 0;	54	return 0;
40	}	55	}
41		56
		57	static bool p2sb_valid_resource(struct resource *res)
		58	{
		59	if (res->flags)
		60	return true;
		61
		62	return false;
		63	}
		64
42	/* Copy resource from the first BAR of the device in question */	65	/* Copy resource from the first BAR of the device in question */
43	static int p2sb_read_bar0(struct pci_dev pdev, struct resource mem)	66	static void p2sb_read_bar0(struct pci_dev pdev, struct resource mem)
44	{	67	{
45	struct resource *bar0 = &pdev->resource[0];	68	struct resource *bar0 = pci_resource_n(pdev, 0);
46		69
47	/* Make sure we have no dangling pointers in the output */	70	/* Make sure we have no dangling pointers in the output */
48	memset(mem, 0, sizeof(*mem));	71	memset(mem, 0, sizeof(*mem));
@@ -56,49 +79,66 @@ static int p2sb_read_bar0(struct pci_dev pdev, struct resource mem) · 7 unmodified lines
56	mem->end = bar0->end;	79	mem->end = bar0->end;
57	mem->flags = bar0->flags;	80	mem->flags = bar0->flags;
58	mem->desc = bar0->desc;	81	mem->desc = bar0->desc;
59
60	return 0;
61	}	82	}
62		83
63	static int p2sb_scan_and_read(struct pci_bus bus, unsigned int devfn, struct resource mem)	84	static void p2sb_scan_and_cache_devfn(struct pci_bus *bus, unsigned int devfn)
64	{	85	{
		86	struct p2sb_res_cache *cache = &p2sb_resources[PCI_FUNC(devfn)];
65	struct pci_dev *pdev;	87	struct pci_dev *pdev;
66	int ret;
67		88
68	pdev = pci_scan_single_device(bus, devfn);	89	pdev = pci_scan_single_device(bus, devfn);
69	if (!pdev)	90	if (!pdev)
70	return -ENODEV;	91	return;
71		92
72	ret = p2sb_read_bar0(pdev, mem);	93	p2sb_read_bar0(pdev, &cache->res);
		94	cache->bus_dev_id = bus->dev.id;
73		95
74	pci_stop_and_remove_bus_device(pdev);	96	pci_stop_and_remove_bus_device(pdev);
75	return ret;
76	}	97	}
77		98
78	/**	99	static int p2sb_scan_and_cache(struct pci_bus *bus, unsigned int devfn)
79	* p2sb_bar - Get Primary to Sideband (P2SB) bridge device BAR	100	{
80	* @bus: PCI bus to communicate with	101	unsigned int slot, fn;
81	* @devfn: PCI slot and function to communicate with	102
82	* @mem: memory resource to be filled in	103	if (PCI_FUNC(devfn) == 0) {
83	*	104	/*
84	* The BIOS prevents the P2SB device from being enumerated by the PCI	105	* When function number of the P2SB device is zero, scan it and
85	* subsystem, so we need to unhide and hide it back to lookup the BAR.	106	* other function numbers, and if devices are available, cache
86	*	107	* their BAR0s.
87	* if @bus is NULL, the bus 0 in domain 0 will be used.	108	*/
88	* If @devfn is 0, it will be replaced by devfn of the P2SB device.	109	slot = PCI_SLOT(devfn);
89	*	110	for (fn = 0; fn < NR_P2SB_RES_CACHE; fn++)
90	* Caller must provide a valid pointer to @mem.	111	p2sb_scan_and_cache_devfn(bus, PCI_DEVFN(slot, fn));
91	*	112	} else {
92	* Locking is handled by pci_rescan_remove_lock mutex.	113	/* Scan the P2SB device and cache its BAR0 */
93	*	114	p2sb_scan_and_cache_devfn(bus, devfn);
94	* Return:	115	}
95	* 0 on success or appropriate errno value on error.	116
96	*/	117	if (!p2sb_valid_resource(&p2sb_resources[PCI_FUNC(devfn)].res))
97	int p2sb_bar(struct pci_bus bus, unsigned int devfn, struct resource mem)	118	return -ENOENT;
		119
		120	return 0;
		121	}
		122
		123	static struct pci_bus p2sb_get_bus(struct pci_bus bus)
		124	{
		125	static struct pci_bus *p2sb_bus;
		126
		127	bus = bus ?: p2sb_bus;
		128	if (bus)
		129	return bus;
		130
		131	/* Assume P2SB is on the bus 0 in domain 0 */
		132	p2sb_bus = pci_find_bus(0, 0);
		133	return p2sb_bus;
		134	}
		135
		136	static int p2sb_cache_resources(void)
98	{	137	{
99	struct pci_dev *pdev_p2sb;
100	unsigned int devfn_p2sb;	138	unsigned int devfn_p2sb;
101	u32 value = P2SBC_HIDE;	139	u32 value = P2SBC_HIDE;
		140	struct pci_bus *bus;
		141	u16 class;
102	int ret;	142	int ret;
103		143
104	/* Get devfn for P2SB device itself */	144	/* Get devfn for P2SB device itself */
@@ -106,8 +146,17 @@ int p2sb_bar(struct pci_bus bus, unsigned int devfn, struct resource mem) · 1 unmodified line
106	if (ret)	146	if (ret)
107	return ret;	147	return ret;
108		148
109	/* if @bus is NULL, use bus 0 in domain 0 */	149	bus = p2sb_get_bus(NULL);
110	bus = bus ?: pci_find_bus(0, 0);	150	if (!bus)
		151	return -ENODEV;
		152
		153	/*
		154	* When a device with same devfn exists and its device class is not
		155	* PCI_CLASS_MEMORY_OTHER for P2SB, do not touch it.
		156	*/
		157	pci_bus_read_config_word(bus, devfn_p2sb, PCI_CLASS_DEVICE, &class);
		158	if (!PCI_POSSIBLE_ERROR(class) && class != PCI_CLASS_MEMORY_OTHER)
		159	return -ENODEV;
111		160
112	/*	161	/*
113	* Prevent concurrent PCI bus scan from seeing the P2SB device and	162	* Prevent concurrent PCI bus scan from seeing the P2SB device and
@@ -115,17 +164,16 @@ int p2sb_bar(struct pci_bus bus, unsigned int devfn, struct resource mem) · 1 unmodified line
115	*/	164	*/
116	pci_lock_rescan_remove();	165	pci_lock_rescan_remove();
117		166
118	/* Unhide the P2SB device, if needed */	167	/*
		168	* The BIOS prevents the P2SB device from being enumerated by the PCI
		169	* subsystem, so we need to unhide and hide it back to lookup the BAR.
		170	* Unhide the P2SB device here, if needed.
		171	*/
119	pci_bus_read_config_dword(bus, devfn_p2sb, P2SBC, &value);	172	pci_bus_read_config_dword(bus, devfn_p2sb, P2SBC, &value);
120	if (value & P2SBC_HIDE)	173	if (value & P2SBC_HIDE)
121	pci_bus_write_config_dword(bus, devfn_p2sb, P2SBC, 0);	174	pci_bus_write_config_dword(bus, devfn_p2sb, P2SBC, 0);
122		175
123	pdev_p2sb = pci_scan_single_device(bus, devfn_p2sb);	176	ret = p2sb_scan_and_cache(bus, devfn_p2sb);
124	if (devfn)
125	ret = p2sb_scan_and_read(bus, devfn, mem);
126	else
127	ret = p2sb_read_bar0(pdev_p2sb, mem);
128	pci_stop_and_remove_bus_device(pdev_p2sb);
129		177
130	/* Hide the P2SB device, if it was hidden */	178	/* Hide the P2SB device, if it was hidden */
131	if (value & P2SBC_HIDE)	179	if (value & P2SBC_HIDE)
@@ -133,12 +181,62 @@ int p2sb_bar(struct pci_bus bus, unsigned int devfn, struct resource mem) · 1 unmodified line
133		181
134	pci_unlock_rescan_remove();	182	pci_unlock_rescan_remove();
135		183
136	if (ret)	184	return ret;
137	return ret;	185	}
		186
		187	/**
		188	* p2sb_bar - Get Primary to Sideband (P2SB) bridge device BAR
		189	* @bus: PCI bus to communicate with
		190	* @devfn: PCI slot and function to communicate with
		191	* @mem: memory resource to be filled in
		192	*
		193	* If @bus is NULL, the bus 0 in domain 0 will be used.
		194	* If @devfn is 0, it will be replaced by devfn of the P2SB device.
		195	*
		196	* Caller must provide a valid pointer to @mem.
		197	*
		198	* Return:
		199	* 0 on success or appropriate errno value on error.
		200	*/
		201	int p2sb_bar(struct pci_bus bus, unsigned int devfn, struct resource mem)
		202	{
		203	struct p2sb_res_cache *cache;
		204	int ret;
		205
		206	bus = p2sb_get_bus(bus);
		207	if (!bus)
		208	return -ENODEV;
		209
		210	if (!devfn) {
		211	ret = p2sb_get_devfn(&devfn);
		212	if (ret)
		213	return ret;
		214	}
138		215
139	if (mem->flags == 0)	216	cache = &p2sb_resources[PCI_FUNC(devfn)];
		217	if (cache->bus_dev_id != bus->dev.id)
140	return -ENODEV;	218	return -ENODEV;
141		219
		220	if (!p2sb_valid_resource(&cache->res))
		221	return -ENOENT;
		222
		223	memcpy(mem, &cache->res, sizeof(*mem));
142	return 0;	224	return 0;
143	}	225	}
144	EXPORT_SYMBOL_GPL(p2sb_bar);	226	EXPORT_SYMBOL_GPL(p2sb_bar);
		227
		228	static int __init p2sb_fs_init(void)
		229	{
		230	p2sb_cache_resources();
		231	return 0;
		232	}
		233
		234	/*
		235	* pci_rescan_remove_lock to avoid access to unhidden P2SB devices can
		236	* not be locked in sysfs pci bus rescan path because of deadlock. To
		237	* avoid the deadlock, access to P2SB devices with the lock at an early
		238	* step in kernel initialization and cache required resources. This
		239	* should happen after subsys_initcall which initializes PCI subsystem
		240	* and before device_initcall which requires P2SB resources.
		241	*/
		242	fs_initcall(p2sb_fs_init);

drivers/platform/x86/touchscreen_dmi.c+35−0

@@ -944,6 +944,32 @@ static const struct ts_dmi_data teclast_tbook11_data = { · 943 unmodified lines
944	.properties = teclast_tbook11_props,	944	.properties = teclast_tbook11_props,
945	};	945	};
946		946
		947	static const struct property_entry teclast_x16_plus_props[] = {
		948	PROPERTY_ENTRY_U32("touchscreen-min-x", 8),
		949	PROPERTY_ENTRY_U32("touchscreen-min-y", 14),
		950	PROPERTY_ENTRY_U32("touchscreen-size-x", 1916),
		951	PROPERTY_ENTRY_U32("touchscreen-size-y", 1264),
		952	PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
		953	PROPERTY_ENTRY_STRING("firmware-name", "gsl3692-teclast-x16-plus.fw"),
		954	PROPERTY_ENTRY_U32("silead,max-fingers", 10),
		955	PROPERTY_ENTRY_BOOL("silead,home-button"),
		956	{ }
		957	};
		958
		959	static const struct ts_dmi_data teclast_x16_plus_data = {
		960	.embedded_fw = {
		961	.name = "silead/gsl3692-teclast-x16-plus.fw",
		962	.prefix = { 0xf0, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 },
		963	.length = 43560,
		964	.sha256 = { 0x9d, 0xb0, 0x3d, 0xf1, 0x00, 0x3c, 0xb5, 0x25,
		965	0x62, 0x8a, 0xa0, 0x93, 0x4b, 0xe0, 0x4e, 0x75,
		966	0xd1, 0x27, 0xb1, 0x65, 0x3c, 0xba, 0xa5, 0x0f,
		967	0xcd, 0xb4, 0xbe, 0x00, 0xbb, 0xf6, 0x43, 0x29 },
		968	},
		969	.acpi_name = "MSSL1680:00",
		970	.properties = teclast_x16_plus_props,
		971	};
		972
947	static const struct property_entry teclast_x3_plus_props[] = {	973	static const struct property_entry teclast_x3_plus_props[] = {
948	PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),	974	PROPERTY_ENTRY_U32("touchscreen-size-x", 1980),
949	PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),	975	PROPERTY_ENTRY_U32("touchscreen-size-y", 1500),
@@ -1612,6 +1638,15 @@ const struct dmi_system_id touchscreen_dmi_table[] = { · 662 unmodified lines
1612	DMI_MATCH(DMI_PRODUCT_SKU, "E5A6_A1"),	1638	DMI_MATCH(DMI_PRODUCT_SKU, "E5A6_A1"),
1613	},	1639	},
1614	},	1640	},
		1641	{
		1642	/* Teclast X16 Plus */
		1643	.driver_data = (void *)&teclast_x16_plus_data,
		1644	.matches = {
		1645	DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"),
		1646	DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),
		1647	DMI_MATCH(DMI_PRODUCT_SKU, "D3A5_A1"),
		1648	},
		1649	},
1615	{	1650	{
1616	/* Teclast X3 Plus */	1651	/* Teclast X3 Plus */
1617	.driver_data = (void *)&teclast_x3_plus_data,	1652	.driver_data = (void *)&teclast_x3_plus_data,

drivers/platform/x86/wmi.c+112−69

@@ -25,6 +25,7 @@ · 24 unmodified lines
25	#include <linux/list.h>	25	#include <linux/list.h>
26	#include <linux/module.h>	26	#include <linux/module.h>
27	#include <linux/platform_device.h>	27	#include <linux/platform_device.h>
		28	#include <linux/rwsem.h>
28	#include <linux/slab.h>	29	#include <linux/slab.h>
29	#include <linux/sysfs.h>	30	#include <linux/sysfs.h>
30	#include <linux/types.h>	31	#include <linux/types.h>
@@ -56,7 +57,6 @@ static_assert(__alignof__(struct guid_block) == 1); · 25 unmodified lines
56		57
57	enum { /* wmi_block flags */	58	enum { /* wmi_block flags */
58	WMI_READ_TAKES_NO_ARGS,	59	WMI_READ_TAKES_NO_ARGS,
59	WMI_PROBED,
60	};	60	};
61		61
62	struct wmi_block {	62	struct wmi_block {
@@ -64,8 +64,10 @@ struct wmi_block { · 1 unmodified line
64	struct list_head list;	64	struct list_head list;
65	struct guid_block gblock;	65	struct guid_block gblock;
66	struct acpi_device *acpi_device;	66	struct acpi_device *acpi_device;
		67	struct rw_semaphore notify_lock; /* Protects notify callback add/remove */
67	wmi_notify_handler handler;	68	wmi_notify_handler handler;
68	void *handler_data;	69	void *handler_data;
		70	bool driver_ready;
69	unsigned long flags;	71	unsigned long flags;
70	};	72	};
71		73
@@ -219,6 +221,17 @@ static int wmidev_match_guid(struct device dev, const void data) · 147 unmodified lines
219	return 0;	221	return 0;
220	}	222	}
221		223
		224	static int wmidev_match_notify_id(struct device dev, const void data)
		225	{
		226	struct wmi_block *wblock = dev_to_wblock(dev);
		227	const u32 *notify_id = data;
		228
		229	if (wblock->gblock.flags & ACPI_WMI_EVENT && wblock->gblock.notify_id == *notify_id)
		230	return 1;
		231
		232	return 0;
		233	}
		234
222	static struct bus_type wmi_bus_type;	235	static struct bus_type wmi_bus_type;
223		236
224	static struct wmi_device wmi_find_device_by_guid(const char guid_string)	237	static struct wmi_device wmi_find_device_by_guid(const char guid_string)
@@ -238,6 +251,17 @@ static struct wmi_device wmi_find_device_by_guid(const char guid_string) · 13 unmodified lines
238	return dev_to_wdev(dev);	251	return dev_to_wdev(dev);
239	}	252	}
240		253
		254	static struct wmi_device *wmi_find_event_by_notify_id(const u32 notify_id)
		255	{
		256	struct device *dev;
		257
		258	dev = bus_find_device(&wmi_bus_type, NULL, &notify_id, wmidev_match_notify_id);
		259	if (!dev)
		260	return ERR_PTR(-ENODEV);
		261
		262	return to_wmi_device(dev);
		263	}
		264
241	static void wmi_device_put(struct wmi_device *wdev)	265	static void wmi_device_put(struct wmi_device *wdev)
242	{	266	{
243	put_device(&wdev->dev);	267	put_device(&wdev->dev);
@@ -572,32 +596,31 @@ acpi_status wmi_install_notify_handler(const char *guid, · 328 unmodified lines
572	wmi_notify_handler handler,	596	wmi_notify_handler handler,
573	void *data)	597	void *data)
574	{	598	{
575	struct wmi_block *block;	599	struct wmi_block *wblock;
576	acpi_status status = AE_NOT_EXIST;	600	struct wmi_device *wdev;
577	guid_t guid_input;	601	acpi_status status;
578
579	if (!guid \|\| !handler)
580	return AE_BAD_PARAMETER;
581		602
582	if (guid_parse(guid, &guid_input))	603	wdev = wmi_find_device_by_guid(guid);
583	return AE_BAD_PARAMETER;	604	if (IS_ERR(wdev))
		605	return AE_ERROR;
584		606
585	list_for_each_entry(block, &wmi_block_list, list) {	607	wblock = container_of(wdev, struct wmi_block, dev);
586	acpi_status wmi_status;
587		608
588	if (guid_equal(&block->gblock.guid, &guid_input)) {	609	down_write(&wblock->notify_lock);
589	if (block->handler)	610	if (wblock->handler) {
590	return AE_ALREADY_ACQUIRED;	611	status = AE_ALREADY_ACQUIRED;
		612	} else {
		613	wblock->handler = handler;
		614	wblock->handler_data = data;
591		615
592	block->handler = handler;	616	if (ACPI_FAILURE(wmi_method_enable(wblock, true)))
593	block->handler_data = data;	617	dev_warn(&wblock->dev.dev, "Failed to enable device\n");
594		618
595	wmi_status = wmi_method_enable(block, true);	619	status = AE_OK;
596	if ((wmi_status != AE_OK) \|\|
597	((wmi_status == AE_OK) && (status == AE_NOT_EXIST)))
598	status = wmi_status;
599	}
600	}	620	}
		621	up_write(&wblock->notify_lock);
		622
		623	wmi_device_put(wdev);
601		624
602	return status;	625	return status;
603	}	626	}
@@ -613,30 +636,31 @@ EXPORT_SYMBOL_GPL(wmi_install_notify_handler); · 9 unmodified lines
613	*/	636	*/
614	acpi_status wmi_remove_notify_handler(const char *guid)	637	acpi_status wmi_remove_notify_handler(const char *guid)
615	{	638	{
616	struct wmi_block *block;	639	struct wmi_block *wblock;
617	acpi_status status = AE_NOT_EXIST;	640	struct wmi_device *wdev;
618	guid_t guid_input;	641	acpi_status status;
619		642
620	if (!guid)	643	wdev = wmi_find_device_by_guid(guid);
621	return AE_BAD_PARAMETER;	644	if (IS_ERR(wdev))
		645	return AE_ERROR;
622		646
623	if (guid_parse(guid, &guid_input))	647	wblock = container_of(wdev, struct wmi_block, dev);
624	return AE_BAD_PARAMETER;
625		648
626	list_for_each_entry(block, &wmi_block_list, list) {	649	down_write(&wblock->notify_lock);
627	acpi_status wmi_status;	650	if (!wblock->handler) {
		651	status = AE_NULL_ENTRY;
		652	} else {
		653	if (ACPI_FAILURE(wmi_method_enable(wblock, false)))
		654	dev_warn(&wblock->dev.dev, "Failed to disable device\n");
628		655
629	if (guid_equal(&block->gblock.guid, &guid_input)) {	656	wblock->handler = NULL;
630	if (!block->handler)	657	wblock->handler_data = NULL;
631	return AE_NULL_ENTRY;
632		658
633	wmi_status = wmi_method_enable(block, false);	659	status = AE_OK;
634	block->handler = NULL;
635	block->handler_data = NULL;
636	if (wmi_status != AE_OK \|\| (wmi_status == AE_OK && status == AE_NOT_EXIST))
637	status = wmi_status;
638	}
639	}	660	}
		661	up_write(&wblock->notify_lock);
		662
		663	wmi_device_put(wdev);
640		664
641	return status;	665	return status;
642	}	666	}
@@ -655,15 +679,19 @@ EXPORT_SYMBOL_GPL(wmi_remove_notify_handler); · 12 unmodified lines
655	acpi_status wmi_get_event_data(u32 event, struct acpi_buffer *out)	679	acpi_status wmi_get_event_data(u32 event, struct acpi_buffer *out)
656	{	680	{
657	struct wmi_block *wblock;	681	struct wmi_block *wblock;
		682	struct wmi_device *wdev;
		683	acpi_status status;
658		684
659	list_for_each_entry(wblock, &wmi_block_list, list) {	685	wdev = wmi_find_event_by_notify_id(event);
660	struct guid_block *gblock = &wblock->gblock;	686	if (IS_ERR(wdev))
		687	return AE_NOT_FOUND;
661		688
662	if ((gblock->flags & ACPI_WMI_EVENT) && gblock->notify_id == event)	689	wblock = container_of(wdev, struct wmi_block, dev);
663	return get_event_data(wblock, out);	690	status = get_event_data(wblock, out);
664	}
665		691
666	return AE_NOT_FOUND;	692	wmi_device_put(wdev);
		693
		694	return status;
667	}	695	}
668	EXPORT_SYMBOL_GPL(wmi_get_event_data);	696	EXPORT_SYMBOL_GPL(wmi_get_event_data);
669		697
@@ -868,7 +896,7 @@ static int wmi_dev_probe(struct device *dev) · 198 unmodified lines
868	if (wdriver->probe) {	896	if (wdriver->probe) {
869	ret = wdriver->probe(dev_to_wdev(dev),	897	ret = wdriver->probe(dev_to_wdev(dev),
870	find_guid_context(wblock, wdriver));	898	find_guid_context(wblock, wdriver));
871	if (!ret) {	899	if (ret) {
872	if (ACPI_FAILURE(wmi_method_enable(wblock, false)))	900	if (ACPI_FAILURE(wmi_method_enable(wblock, false)))
873	dev_warn(dev, "Failed to disable device\n");	901	dev_warn(dev, "Failed to disable device\n");
874		902
@@ -876,7 +904,9 @@ static int wmi_dev_probe(struct device *dev) · 1 unmodified line
876	}	904	}
877	}	905	}
878		906
879	set_bit(WMI_PROBED, &wblock->flags);	907	down_write(&wblock->notify_lock);
		908	wblock->driver_ready = true;
		909	up_write(&wblock->notify_lock);
880		910
881	return 0;	911	return 0;
882	}	912	}
@@ -886,7 +916,9 @@ static void wmi_dev_remove(struct device *dev) · 3 unmodified lines
886	struct wmi_block *wblock = dev_to_wblock(dev);	916	struct wmi_block *wblock = dev_to_wblock(dev);
887	struct wmi_driver *wdriver = drv_to_wdrv(dev->driver);	917	struct wmi_driver *wdriver = drv_to_wdrv(dev->driver);
888		918
889	clear_bit(WMI_PROBED, &wblock->flags);	919	down_write(&wblock->notify_lock);
		920	wblock->driver_ready = false;
		921	up_write(&wblock->notify_lock);
890		922
891	if (wdriver->remove)	923	if (wdriver->remove)
892	wdriver->remove(dev_to_wdev(dev));	924	wdriver->remove(dev_to_wdev(dev));
@@ -999,6 +1031,8 @@ static int wmi_create_device(struct device *wmi_bus_dev, · 106 unmodified lines
999	wblock->dev.setable = true;	1031	wblock->dev.setable = true;
1000		1032
1001	out_init:	1033	out_init:
		1034	init_rwsem(&wblock->notify_lock);
		1035	wblock->driver_ready = false;
1002	wblock->dev.dev.bus = &wmi_bus_type;	1036	wblock->dev.dev.bus = &wmi_bus_type;
1003	wblock->dev.dev.parent = wmi_bus_dev;	1037	wblock->dev.dev.parent = wmi_bus_dev;
1004		1038
@@ -1171,6 +1205,26 @@ acpi_wmi_ec_space_handler(u32 function, acpi_physical_address address, · 166 unmodified lines
1171	}	1205	}
1172	}	1206	}
1173		1207
		1208	static void wmi_notify_driver(struct wmi_block *wblock)
		1209	{
		1210	struct wmi_driver *driver = drv_to_wdrv(wblock->dev.dev.driver);
		1211	struct acpi_buffer data = { ACPI_ALLOCATE_BUFFER, NULL };
		1212	acpi_status status;
		1213
		1214	if (!driver->no_notify_data) {
		1215	status = get_event_data(wblock, &data);
		1216	if (ACPI_FAILURE(status)) {
		1217	dev_warn(&wblock->dev.dev, "Failed to get event data\n");
		1218	return;
		1219	}
		1220	}
		1221
		1222	if (driver->notify)
		1223	driver->notify(&wblock->dev, data.pointer);
		1224
		1225	kfree(data.pointer);
		1226	}
		1227
1174	static int wmi_notify_device(struct device dev, void data)	1228	static int wmi_notify_device(struct device dev, void data)
1175	{	1229	{
1176	struct wmi_block *wblock = dev_to_wblock(dev);	1230	struct wmi_block *wblock = dev_to_wblock(dev);
@@ -1179,28 +1233,17 @@ static int wmi_notify_device(struct device dev, void data) · 2 unmodified lines
1179	if (!(wblock->gblock.flags & ACPI_WMI_EVENT && wblock->gblock.notify_id == *event))	1233	if (!(wblock->gblock.flags & ACPI_WMI_EVENT && wblock->gblock.notify_id == *event))
1180	return 0;	1234	return 0;
1181		1235
1182	/* If a driver is bound, then notify the driver. */	1236	down_read(&wblock->notify_lock);
1183	if (test_bit(WMI_PROBED, &wblock->flags) && wblock->dev.dev.driver) {	1237	/* The WMI driver notify handler conflicts with the legacy WMI handler.
1184	struct wmi_driver *driver = drv_to_wdrv(wblock->dev.dev.driver);	1238	* Because of this the WMI driver notify handler takes precedence.
1185	struct acpi_buffer evdata = { ACPI_ALLOCATE_BUFFER, NULL };	1239	*/
1186	acpi_status status;	1240	if (wblock->dev.dev.driver && wblock->driver_ready) {
1187		1241	wmi_notify_driver(wblock);
1188	if (!driver->no_notify_data) {	1242	} else {
1189	status = get_event_data(wblock, &evdata);	1243	if (wblock->handler)
1190	if (ACPI_FAILURE(status)) {	1244	wblock->handler(*event, wblock->handler_data);
1191	dev_warn(&wblock->dev.dev, "failed to get event data\n");
1192	return -EIO;
1193	}
1194	}
1195
1196	if (driver->notify)
1197	driver->notify(&wblock->dev, evdata.pointer);
1198
1199	kfree(evdata.pointer);
1200	} else if (wblock->handler) {
1201	/* Legacy handler */
1202	wblock->handler(*event, wblock->handler_data);
1203	}	1245	}
		1246	up_read(&wblock->notify_lock);
1204		1247
1205	acpi_bus_generate_netlink_event(wblock->acpi_device->pnp.device_class,	1248	acpi_bus_generate_netlink_event(wblock->acpi_device->pnp.device_class,
1206	dev_name(&wblock->dev.dev), *event, 0);	1249	dev_name(&wblock->dev.dev), *event, 0);

drivers/regulator/max5970-regulator.c+1−1

@@ -392,7 +392,7 @@ static int max597x_regmap_read_clear(struct regmap *map, unsigned int reg, · 391 unmodified lines
392	return ret;	392	return ret;
393		393
394	if (*val)	394	if (*val)
395	return regmap_write(map, reg, *val);	395	return regmap_write(map, reg, 0);
396		396
397	return 0;	397	return 0;
398	}	398	}

drivers/regulator/pwm-regulator.c+43−0

@@ -157,7 +157,17 @@ static int pwm_regulator_get_voltage(struct regulator_dev *rdev) · 156 unmodified lines
157		157
158	pwm_get_state(drvdata->pwm, &pstate);	158	pwm_get_state(drvdata->pwm, &pstate);
159		159
		160	if (!pstate.enabled) {
		161	if (pstate.polarity == PWM_POLARITY_INVERSED)
		162	pstate.duty_cycle = pstate.period;
		163	else
		164	pstate.duty_cycle = 0;
		165	}
		166
160	voltage = pwm_get_relative_duty_cycle(&pstate, duty_unit);	167	voltage = pwm_get_relative_duty_cycle(&pstate, duty_unit);
		168	if (voltage < min(max_uV_duty, min_uV_duty) \|\|
		169	voltage > max(max_uV_duty, min_uV_duty))
		170	return -ENOTRECOVERABLE;
161		171
162	/*	172	/*
163	* The dutycycle for min_uV might be greater than the one for max_uV.	173	* The dutycycle for min_uV might be greater than the one for max_uV.
@@ -313,6 +323,32 @@ static int pwm_regulator_init_continuous(struct platform_device *pdev, · 149 unmodified lines
313	return 0;	323	return 0;
314	}	324	}
315		325
		326	static int pwm_regulator_init_boot_on(struct platform_device *pdev,
		327	struct pwm_regulator_data *drvdata,
		328	const struct regulator_init_data *init_data)
		329	{
		330	struct pwm_state pstate;
		331
		332	if (!init_data->constraints.boot_on \|\| drvdata->enb_gpio)
		333	return 0;
		334
		335	pwm_get_state(drvdata->pwm, &pstate);
		336	if (pstate.enabled)
		337	return 0;
		338
		339	/*
		340	* Update the duty cycle so the output does not change
		341	* when the regulator core enables the regulator (and
		342	* thus the PWM channel).
		343	*/
		344	if (pstate.polarity == PWM_POLARITY_INVERSED)
		345	pstate.duty_cycle = pstate.period;
		346	else
		347	pstate.duty_cycle = 0;
		348
		349	return pwm_apply_might_sleep(drvdata->pwm, &pstate);
		350	}
		351
316	static int pwm_regulator_probe(struct platform_device *pdev)	352	static int pwm_regulator_probe(struct platform_device *pdev)
317	{	353	{
318	const struct regulator_init_data *init_data;	354	const struct regulator_init_data *init_data;
@@ -372,6 +408,13 @@ static int pwm_regulator_probe(struct platform_device *pdev) · 53 unmodified lines
372	if (ret)	408	if (ret)
373	return ret;	409	return ret;
374		410
		411	ret = pwm_regulator_init_boot_on(pdev, drvdata, init_data);
		412	if (ret) {
		413	dev_err(&pdev->dev, "Failed to apply boot_on settings: %d\n",
		414	ret);
		415	return ret;
		416	}
		417
375	regulator = devm_regulator_register(&pdev->dev,	418	regulator = devm_regulator_register(&pdev->dev,
376	&drvdata->desc, &config);	419	&drvdata->desc, &config);
377	if (IS_ERR(regulator)) {	420	if (IS_ERR(regulator)) {

drivers/regulator/ti-abb-regulator.c+19−3

@@ -726,9 +726,25 @@ static int ti_abb_probe(struct platform_device *pdev) · 725 unmodified lines
726	return PTR_ERR(abb->setup_reg);	726	return PTR_ERR(abb->setup_reg);
727	}	727	}
728		728
729	abb->int_base = devm_platform_ioremap_resource_byname(pdev, "int-address");	729	pname = "int-address";
730	if (IS_ERR(abb->int_base))	730	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
731	return PTR_ERR(abb->int_base);	731	if (!res) {
		732	dev_err(dev, "Missing '%s' IO resource\n", pname);
		733	return -ENODEV;
		734	}
		735	/*
		736	* The MPU interrupt status register (PRM_IRQSTATUS_MPU) is
		737	* shared between regulator-abb-{ivahd,dspeve,gpu} driver
		738	* instances. Therefore use devm_ioremap() rather than
		739	* devm_platform_ioremap_resource_byname() to avoid busy
		740	* resource region conflicts.
		741	*/
		742	abb->int_base = devm_ioremap(dev, res->start,
		743	resource_size(res));
		744	if (!abb->int_base) {
		745	dev_err(dev, "Unable to map '%s'\n", pname);
		746	return -ENOMEM;
		747	}
732		748
733	/* Map Optional resources */	749	/* Map Optional resources */
734	pname = "efuse-address";	750	pname = "efuse-address";

drivers/scsi/initio.c+1−2

  */
 static void initio_se2_wr(unsigned long base, u8 addr, u16 val)
 {
-	u8 rb;
 	u8 instr;
 	int i;
 		udelay(30);
 		outb(SE2CS, base + TUL_NVRAM);			/* -CLK */
 		udelay(30);
-		if ((rb = inb(base + TUL_NVRAM)) & SE2DI)
+		if (inb(base + TUL_NVRAM) & SE2DI)
 			break;	/* write complete */
 	}
 	outb(0, base + TUL_NVRAM);				/* -CS */

drivers/scsi/isci/request.c+1−1

@@ -3387,7 +3387,7 @@ static enum sci_status isci_io_request_build(struct isci_host *ihost, · 3386 unmodified lines
3387	return SCI_FAILURE;	3387	return SCI_FAILURE;
3388	}	3388	}
3389		3389
3390	return SCI_SUCCESS;	3390	return status;
3391	}	3391	}
3392		3392
3393	static struct isci_request isci_request_from_tag(struct isci_host ihost, u16 tag)	3393	static struct isci_request isci_request_from_tag(struct isci_host ihost, u16 tag)

drivers/scsi/scsi_error.c+4−4

@@ -61,11 +61,11 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd); · 60 unmodified lines
61	static enum scsi_disposition scsi_try_to_abort_cmd(const struct scsi_host_template *,	61	static enum scsi_disposition scsi_try_to_abort_cmd(const struct scsi_host_template *,
62	struct scsi_cmnd *);	62	struct scsi_cmnd *);
63		63
64	void scsi_eh_wakeup(struct Scsi_Host *shost)	64	void scsi_eh_wakeup(struct Scsi_Host *shost, unsigned int busy)
65	{	65	{
66	lockdep_assert_held(shost->host_lock);	66	lockdep_assert_held(shost->host_lock);
67		67
68	if (scsi_host_busy(shost) == shost->host_failed) {	68	if (busy == shost->host_failed) {
69	trace_scsi_eh_wakeup(shost);	69	trace_scsi_eh_wakeup(shost);
70	wake_up_process(shost->ehandler);	70	wake_up_process(shost->ehandler);
71	SCSI_LOG_ERROR_RECOVERY(5, shost_printk(KERN_INFO, shost,	71	SCSI_LOG_ERROR_RECOVERY(5, shost_printk(KERN_INFO, shost,
@@ -88,7 +88,7 @@ void scsi_schedule_eh(struct Scsi_Host *shost) · 16 unmodified lines
88	if (scsi_host_set_state(shost, SHOST_RECOVERY) == 0 \|\|	88	if (scsi_host_set_state(shost, SHOST_RECOVERY) == 0 \|\|
89	scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY) == 0) {	89	scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY) == 0) {
90	shost->host_eh_scheduled++;	90	shost->host_eh_scheduled++;
91	scsi_eh_wakeup(shost);	91	scsi_eh_wakeup(shost, scsi_host_busy(shost));
92	}	92	}
93		93
94	spin_unlock_irqrestore(shost->host_lock, flags);	94	spin_unlock_irqrestore(shost->host_lock, flags);
@@ -286,7 +286,7 @@ static void scsi_eh_inc_host_failed(struct rcu_head *head) · 191 unmodified lines
286		286
287	spin_lock_irqsave(shost->host_lock, flags);	287	spin_lock_irqsave(shost->host_lock, flags);
288	shost->host_failed++;	288	shost->host_failed++;
289	scsi_eh_wakeup(shost);	289	scsi_eh_wakeup(shost, scsi_host_busy(shost));
290	spin_unlock_irqrestore(shost->host_lock, flags);	290	spin_unlock_irqrestore(shost->host_lock, flags);
291	}	291	}
292		292

drivers/scsi/scsi_lib.c+1−1

@@ -280,7 +280,7 @@ static void scsi_dec_host_busy(struct Scsi_Host shost, struct scsi_cmnd cmd) · 279 unmodified lines
280	if (unlikely(scsi_host_in_recovery(shost))) {	280	if (unlikely(scsi_host_in_recovery(shost))) {
281	spin_lock_irqsave(shost->host_lock, flags);	281	spin_lock_irqsave(shost->host_lock, flags);
282	if (shost->host_failed \|\| shost->host_eh_scheduled)	282	if (shost->host_failed \|\| shost->host_eh_scheduled)
283	scsi_eh_wakeup(shost);	283	scsi_eh_wakeup(shost, scsi_host_busy(shost));
284	spin_unlock_irqrestore(shost->host_lock, flags);	284	spin_unlock_irqrestore(shost->host_lock, flags);
285	}	285	}
286	rcu_read_unlock();	286	rcu_read_unlock();

drivers/scsi/scsi_priv.h+1−1

@@ -92,7 +92,7 @@ extern void scmd_eh_abort_handler(struct work_struct *work); · 91 unmodified lines
92	extern enum blk_eh_timer_return scsi_timeout(struct request *req);	92	extern enum blk_eh_timer_return scsi_timeout(struct request *req);
93	extern int scsi_error_handler(void *host);	93	extern int scsi_error_handler(void *host);
94	extern enum scsi_disposition scsi_decide_disposition(struct scsi_cmnd *cmd);	94	extern enum scsi_disposition scsi_decide_disposition(struct scsi_cmnd *cmd);
95	extern void scsi_eh_wakeup(struct Scsi_Host *shost);	95	extern void scsi_eh_wakeup(struct Scsi_Host *shost, unsigned int busy);
96	extern void scsi_eh_scmd_add(struct scsi_cmnd *);	96	extern void scsi_eh_scmd_add(struct scsi_cmnd *);
97	void scsi_eh_ready_devs(struct Scsi_Host *shost,	97	void scsi_eh_ready_devs(struct Scsi_Host *shost,
98	struct list_head *work_q,	98	struct list_head *work_q,

drivers/scsi/storvsc_drv.c+7−5

  */
 static int storvsc_ringbuffer_size = (128 * 1024);
+static int aligned_ringbuffer_size;
 static u32 max_outstanding_req_per_channel;
 static int storvsc_change_queue_depth(struct scsi_device *sdev, int queue_depth);
 	new_sc->next_request_id_callback = storvsc_next_request_id;
 	ret = vmbus_open(new_sc,
-			 storvsc_ringbuffer_size,
+			 aligned_ringbuffer_size,
-			 storvsc_ringbuffer_size,
+			 aligned_ringbuffer_size,
 			 (void *)&props,
 			 sizeof(struct vmstorage_channel_properties),
 			 storvsc_on_channel_callback, new_sc);
 	dma_set_min_align_mask(&device->device, HV_HYP_PAGE_SIZE - 1);
 	stor_device->port_number = host->host_no;
-	ret = storvsc_connect_to_vsp(device, storvsc_ringbuffer_size, is_fc);
+	ret = storvsc_connect_to_vsp(device, aligned_ringbuffer_size, is_fc);
 	if (ret)
 		goto err_out1;
 {
 	int ret;
-	ret = storvsc_connect_to_vsp(hv_dev, storvsc_ringbuffer_size,
+	ret = storvsc_connect_to_vsp(hv_dev, aligned_ringbuffer_size,
 				     hv_dev_is_fc(hv_dev));
 	return ret;
 }
 	 * the ring buffer indices) by the max request size (which is
 	 * vmbus_channel_packet_multipage_buffer + struct vstor_packet + u64)
 	 */
+	aligned_ringbuffer_size = VMBUS_RING_SIZE(storvsc_ringbuffer_size);
 	max_outstanding_req_per_channel =
-		((storvsc_ringbuffer_size - PAGE_SIZE) /
+		((aligned_ringbuffer_size - PAGE_SIZE) /
 		ALIGN(MAX_MULTIPAGE_BUFFER_PACKET +
 		sizeof(struct vstor_packet) + sizeof(u64),
 		sizeof(u64)));

drivers/scsi/virtio_scsi.c+0−2

@@ -188,8 +188,6 @@ static void virtscsi_vq_done(struct virtio_scsi *vscsi, · 187 unmodified lines
188	while ((buf = virtqueue_get_buf(vq, &len)) != NULL)	188	while ((buf = virtqueue_get_buf(vq, &len)) != NULL)
189	fn(vscsi, buf);	189	fn(vscsi, buf);
190		190
191	if (unlikely(virtqueue_is_broken(vq)))
192	break;
193	} while (!virtqueue_enable_cb(vq));	191	} while (!virtqueue_enable_cb(vq));
194	spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags);	192	spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags);
195	}	193	}

drivers/soc/apple/mailbox.c+3−3

@@ -296,14 +296,14 @@ struct apple_mbox apple_mbox_get(struct device dev, int index) · 295 unmodified lines
296	of_node_put(args.np);	296	of_node_put(args.np);
297		297
298	if (!pdev)	298	if (!pdev)
299	return ERR_PTR(EPROBE_DEFER);	299	return ERR_PTR(-EPROBE_DEFER);
300		300
301	mbox = platform_get_drvdata(pdev);	301	mbox = platform_get_drvdata(pdev);
302	if (!mbox)	302	if (!mbox)
303	return ERR_PTR(EPROBE_DEFER);	303	return ERR_PTR(-EPROBE_DEFER);
304		304
305	if (!device_link_add(dev, &pdev->dev, DL_FLAG_AUTOREMOVE_CONSUMER))	305	if (!device_link_add(dev, &pdev->dev, DL_FLAG_AUTOREMOVE_CONSUMER))
306	return ERR_PTR(ENODEV);	306	return ERR_PTR(-ENODEV);
307		307
308	return mbox;	308	return mbox;
309	}	309	}

drivers/spi/spi-bcm-qspi.c+2−2

@@ -19,7 +19,7 @@ · 18 unmodified lines
19	#include <linux/platform_device.h>	19	#include <linux/platform_device.h>
20	#include <linux/slab.h>	20	#include <linux/slab.h>
21	#include <linux/spi/spi.h>	21	#include <linux/spi/spi.h>
22	#include <linux/spi/spi-mem.h>	22	#include <linux/mtd/spi-nor.h>
23	#include <linux/sysfs.h>	23	#include <linux/sysfs.h>
24	#include <linux/types.h>	24	#include <linux/types.h>
25	#include "spi-bcm-qspi.h"	25	#include "spi-bcm-qspi.h"
@@ -1221,7 +1221,7 @@ static int bcm_qspi_exec_mem_op(struct spi_mem *mem, · 1195 unmodified lines
1221		1221
1222	/* non-aligned and very short transfers are handled by MSPI */	1222	/* non-aligned and very short transfers are handled by MSPI */
1223	if (!IS_ALIGNED((uintptr_t)addr, 4) \|\| !IS_ALIGNED((uintptr_t)buf, 4) \|\|	1223	if (!IS_ALIGNED((uintptr_t)addr, 4) \|\| !IS_ALIGNED((uintptr_t)buf, 4) \|\|
1224	len < 4)	1224	len < 4 \|\| op->cmd.opcode == SPINOR_OP_RDSFDP)
1225	mspi_read = true;	1225	mspi_read = true;
1226		1226
1227	if (!has_bspi(qspi) \|\| mspi_read)	1227	if (!has_bspi(qspi) \|\| mspi_read)

drivers/spi/spi-cadence.c+9−8

 	xspi->rx_bytes -= nrx;
 	while (ntx || nrx) {
+		if (nrx) {
+			u8 data = cdns_spi_read(xspi, CDNS_SPI_RXD);
+			if (xspi->rxbuf)
+				*xspi->rxbuf++ = data;
+			nrx--;
+		}
 		if (ntx) {
 			if (xspi->txbuf)
 				cdns_spi_write(xspi, CDNS_SPI_TXD, *xspi->txbuf++);
 			ntx--;
 		}
-		if (nrx) {
-			u8 data = cdns_spi_read(xspi, CDNS_SPI_RXD);
-			if (xspi->rxbuf)
-				*xspi->rxbuf++ = data;
-			nrx--;
-		}
 	}
 }

drivers/spi/spi-cs42l43.c+4−1

@@ -244,7 +244,10 @@ static int cs42l43_spi_probe(struct platform_device *pdev) · 243 unmodified lines
244	priv->ctlr->use_gpio_descriptors = true;	244	priv->ctlr->use_gpio_descriptors = true;
245	priv->ctlr->auto_runtime_pm = true;	245	priv->ctlr->auto_runtime_pm = true;
246		246
247	devm_pm_runtime_enable(priv->dev);	247	ret = devm_pm_runtime_enable(priv->dev);
		248	if (ret)
		249	return ret;
		250
248	pm_runtime_idle(priv->dev);	251	pm_runtime_idle(priv->dev);
249		252
250	regmap_write(priv->regmap, CS42L43_TRAN_CONFIG6, CS42L43_FIFO_SIZE - 1);	253	regmap_write(priv->regmap, CS42L43_TRAN_CONFIG6, CS42L43_FIFO_SIZE - 1);

drivers/spi/spi-hisi-sfc-v3xx.c+5−0

 static irqreturn_t hisi_sfc_v3xx_isr(int irq, void *data)
 {
 	struct hisi_sfc_v3xx_host *host = data;
+	u32 reg;
+	reg = readl(host->regbase + HISI_SFC_V3XX_INT_STAT);
+	if (!reg)
+		return IRQ_NONE;
 	hisi_sfc_v3xx_disable_int(host);

drivers/spi/spi-imx.c+2−2

@@ -1344,7 +1344,7 @@ static int spi_imx_sdma_init(struct device dev, struct spi_imx_data spi_imx, · 1343 unmodified lines
1344	controller->dma_tx = dma_request_chan(dev, "tx");	1344	controller->dma_tx = dma_request_chan(dev, "tx");
1345	if (IS_ERR(controller->dma_tx)) {	1345	if (IS_ERR(controller->dma_tx)) {
1346	ret = PTR_ERR(controller->dma_tx);	1346	ret = PTR_ERR(controller->dma_tx);
1347	dev_dbg(dev, "can't get the TX DMA channel, error %d!\n", ret);	1347	dev_err_probe(dev, ret, "can't get the TX DMA channel!\n");
1348	controller->dma_tx = NULL;	1348	controller->dma_tx = NULL;
1349	goto err;	1349	goto err;
1350	}	1350	}
@@ -1353,7 +1353,7 @@ static int spi_imx_sdma_init(struct device dev, struct spi_imx_data spi_imx, · 2 unmodified lines
1353	controller->dma_rx = dma_request_chan(dev, "rx");	1353	controller->dma_rx = dma_request_chan(dev, "rx");
1354	if (IS_ERR(controller->dma_rx)) {	1354	if (IS_ERR(controller->dma_rx)) {
1355	ret = PTR_ERR(controller->dma_rx);	1355	ret = PTR_ERR(controller->dma_rx);
1356	dev_dbg(dev, "can't get the RX DMA channel, error %d\n", ret);	1356	dev_err_probe(dev, ret, "can't get the RX DMA channel!\n");
1357	controller->dma_rx = NULL;	1357	controller->dma_rx = NULL;
1358	goto err;	1358	goto err;
1359	}	1359	}

drivers/spi/spi-intel-pci.c+1−1

 	{ PCI_VDEVICE(INTEL, 0x7a24), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x7aa4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x7e23), (unsigned long)&cnl_info },
+	{ PCI_VDEVICE(INTEL, 0x7f24), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x9d24), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0x9da4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0xa0a4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0xa2a4), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0xa324), (unsigned long)&cnl_info },
 	{ PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&cnl_info },
-	{ PCI_VDEVICE(INTEL, 0xae23), (unsigned long)&cnl_info },
 	{ },
 };
 MODULE_DEVICE_TABLE(pci, intel_spi_pci_ids);

drivers/spi/spi-sh-msiof.c+8−8

@@ -136,14 +136,14 @@ struct sh_msiof_spi_priv { · 135 unmodified lines
136		136
137	/* SIFCTR */	137	/* SIFCTR */
138	#define SIFCTR_TFWM_MASK GENMASK(31, 29) /* Transmit FIFO Watermark */	138	#define SIFCTR_TFWM_MASK GENMASK(31, 29) /* Transmit FIFO Watermark */
139	#define SIFCTR_TFWM_64 (0 << 29) /* Transfer Request when 64 empty stages */	139	#define SIFCTR_TFWM_64 (0UL << 29) /* Transfer Request when 64 empty stages */
140	#define SIFCTR_TFWM_32 (1 << 29) /* Transfer Request when 32 empty stages */	140	#define SIFCTR_TFWM_32 (1UL << 29) /* Transfer Request when 32 empty stages */
141	#define SIFCTR_TFWM_24 (2 << 29) /* Transfer Request when 24 empty stages */	141	#define SIFCTR_TFWM_24 (2UL << 29) /* Transfer Request when 24 empty stages */
142	#define SIFCTR_TFWM_16 (3 << 29) /* Transfer Request when 16 empty stages */	142	#define SIFCTR_TFWM_16 (3UL << 29) /* Transfer Request when 16 empty stages */
143	#define SIFCTR_TFWM_12 (4 << 29) /* Transfer Request when 12 empty stages */	143	#define SIFCTR_TFWM_12 (4UL << 29) /* Transfer Request when 12 empty stages */
144	#define SIFCTR_TFWM_8 (5 << 29) /* Transfer Request when 8 empty stages */	144	#define SIFCTR_TFWM_8 (5UL << 29) /* Transfer Request when 8 empty stages */
145	#define SIFCTR_TFWM_4 (6 << 29) /* Transfer Request when 4 empty stages */	145	#define SIFCTR_TFWM_4 (6UL << 29) /* Transfer Request when 4 empty stages */
146	#define SIFCTR_TFWM_1 (7 << 29) /* Transfer Request when 1 empty stage */	146	#define SIFCTR_TFWM_1 (7UL << 29) /* Transfer Request when 1 empty stage */
147	#define SIFCTR_TFUA_MASK GENMASK(26, 20) /* Transmit FIFO Usable Area */	147	#define SIFCTR_TFUA_MASK GENMASK(26, 20) /* Transmit FIFO Usable Area */
148	#define SIFCTR_TFUA_SHIFT 20	148	#define SIFCTR_TFUA_SHIFT 20
149	#define SIFCTR_TFUA(i) ((i) << SIFCTR_TFUA_SHIFT)	149	#define SIFCTR_TFUA(i) ((i) << SIFCTR_TFUA_SHIFT)

drivers/spi/spi.c+4−0

 			pm_runtime_put_noidle(ctlr->dev.parent);
 			dev_err(&ctlr->dev, "Failed to power device: %d\n",
 				ret);
+			msg->status = ret;
+			spi_finalize_current_message(ctlr);
 			return ret;
 		}
 	}

drivers/thermal/intel/intel_powerclamp.c+0−32

@@ -49,7 +49,6 @@ · 48 unmodified lines
49	*/	49	*/
50	#define DEFAULT_DURATION_JIFFIES (6)	50	#define DEFAULT_DURATION_JIFFIES (6)
51		51
52	static unsigned int target_mwait;
53	static struct dentry *debug_dir;	52	static struct dentry *debug_dir;
54	static bool poll_pkg_cstate_enable;	53	static bool poll_pkg_cstate_enable;
55		54
@@ -312,34 +311,6 @@ MODULE_PARM_DESC(window_size, "sliding window in number of clamping cycles\n" · 256 unmodified lines
312	"\twindow size results in slower response time but more smooth\n"	311	"\twindow size results in slower response time but more smooth\n"
313	"\tclamping results. default to 2.");	312	"\tclamping results. default to 2.");
314		313
315	static void find_target_mwait(void)
316	{
317	unsigned int eax, ebx, ecx, edx;
318	unsigned int highest_cstate = 0;
319	unsigned int highest_subcstate = 0;
320	int i;
321
322	if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF)
323	return;
324
325	cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx);
326
327	if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) \|\|
328	!(ecx & CPUID5_ECX_INTERRUPT_BREAK))
329	return;
330
331	edx >>= MWAIT_SUBSTATE_SIZE;
332	for (i = 0; i < 7 && edx; i++, edx >>= MWAIT_SUBSTATE_SIZE) {
333	if (edx & MWAIT_SUBSTATE_MASK) {
334	highest_cstate = i;
335	highest_subcstate = edx & MWAIT_SUBSTATE_MASK;
336	}
337	}
338	target_mwait = (highest_cstate << MWAIT_SUBSTATE_SIZE) \|
339	(highest_subcstate - 1);
340
341	}
342
343	struct pkg_cstate_info {	314	struct pkg_cstate_info {
344	bool skip;	315	bool skip;
345	int msr_index;	316	int msr_index;
@@ -759,9 +730,6 @@ static int __init powerclamp_probe(void) · 413 unmodified lines
759	return -ENODEV;	730	return -ENODEV;
760	}	731	}
761		732
762	/* find the deepest mwait value */
763	find_target_mwait();
764
765	return 0;	733	return 0;
766	}	734	}
767		735

fs/bcachefs/alloc_background.c+1−1

@@ -1715,7 +1715,7 @@ static int bch2_discard_one_bucket(struct btree_trans *trans, · 1714 unmodified lines
1715	* This works without any other locks because this is the only	1715	* This works without any other locks because this is the only
1716	* thread that removes items from the need_discard tree	1716	* thread that removes items from the need_discard tree
1717	*/	1717	*/
1718	bch2_trans_unlock(trans);	1718	bch2_trans_unlock_long(trans);
1719	blkdev_issue_discard(ca->disk_sb.bdev,	1719	blkdev_issue_discard(ca->disk_sb.bdev,
1720	k.k->p.offset * ca->mi.bucket_size,	1720	k.k->p.offset * ca->mi.bucket_size,
1721	ca->mi.bucket_size,	1721	ca->mi.bucket_size,

fs/bcachefs/btree_locking.c+2−2

@@ -92,7 +92,7 @@ static noinline void print_cycle(struct printbuf out, struct lock_graph g) · 91 unmodified lines
92	continue;	92	continue;
93		93
94	bch2_btree_trans_to_text(out, i->trans);	94	bch2_btree_trans_to_text(out, i->trans);
95	bch2_prt_task_backtrace(out, task, i == g->g ? 5 : 1);	95	bch2_prt_task_backtrace(out, task, i == g->g ? 5 : 1, GFP_NOWAIT);
96	}	96	}
97	}	97	}
98		98
@@ -227,7 +227,7 @@ static noinline int break_cycle(struct lock_graph g, struct printbuf cycle) · 128 unmodified lines
227	prt_printf(&buf, "backtrace:");	227	prt_printf(&buf, "backtrace:");
228	prt_newline(&buf);	228	prt_newline(&buf);
229	printbuf_indent_add(&buf, 2);	229	printbuf_indent_add(&buf, 2);
230	bch2_prt_task_backtrace(&buf, trans->locking_wait.task, 2);	230	bch2_prt_task_backtrace(&buf, trans->locking_wait.task, 2, GFP_NOWAIT);
231	printbuf_indent_sub(&buf, 2);	231	printbuf_indent_sub(&buf, 2);
232	prt_newline(&buf);	232	prt_newline(&buf);
233	}	233	}

fs/bcachefs/debug.c+1−1

@@ -627,7 +627,7 @@ restart: · 626 unmodified lines
627	prt_printf(&i->buf, "backtrace:");	627	prt_printf(&i->buf, "backtrace:");
628	prt_newline(&i->buf);	628	prt_newline(&i->buf);
629	printbuf_indent_add(&i->buf, 2);	629	printbuf_indent_add(&i->buf, 2);
630	bch2_prt_task_backtrace(&i->buf, task, 0);	630	bch2_prt_task_backtrace(&i->buf, task, 0, GFP_KERNEL);
631	printbuf_indent_sub(&i->buf, 2);	631	printbuf_indent_sub(&i->buf, 2);
632	prt_newline(&i->buf);	632	prt_newline(&i->buf);
633		633

fs/bcachefs/fs-io.c+1−1

@@ -79,7 +79,7 @@ void bch2_inode_flush_nocow_writes_async(struct bch_fs *c, · 78 unmodified lines
79	continue;	79	continue;
80		80
81	bio = container_of(bio_alloc_bioset(ca->disk_sb.bdev, 0,	81	bio = container_of(bio_alloc_bioset(ca->disk_sb.bdev, 0,
82	REQ_OP_FLUSH,	82	REQ_OP_WRITE\|REQ_PREFLUSH,
83	GFP_KERNEL,	83	GFP_KERNEL,
84	&c->nocow_flush_bioset),	84	&c->nocow_flush_bioset),
85	struct nocow_flush, bio);	85	struct nocow_flush, bio);

fs/bcachefs/fsck.c+12−11

@@ -119,22 +119,19 @@ static int lookup_inode(struct btree_trans *trans, u64 inode_nr, · 118 unmodified lines
119	if (!ret)	119	if (!ret)
120	*snapshot = iter.pos.snapshot;	120	*snapshot = iter.pos.snapshot;
121	err:	121	err:
122	bch_err_msg(trans->c, ret, "fetching inode %llu:%u", inode_nr, *snapshot);
123	bch2_trans_iter_exit(trans, &iter);	122	bch2_trans_iter_exit(trans, &iter);
124	return ret;	123	return ret;
125	}	124	}
126		125
127	static int __lookup_dirent(struct btree_trans *trans,	126	static int lookup_dirent_in_snapshot(struct btree_trans *trans,
128	struct bch_hash_info hash_info,	127	struct bch_hash_info hash_info,
129	subvol_inum dir, struct qstr *name,	128	subvol_inum dir, struct qstr *name,
130	u64 target, unsigned type)	129	u64 target, unsigned type, u32 snapshot)
131	{	130	{
132	struct btree_iter iter;	131	struct btree_iter iter;
133	struct bkey_s_c_dirent d;	132	struct bkey_s_c_dirent d;
134	int ret;	133	int ret = bch2_hash_lookup_in_snapshot(trans, &iter, bch2_dirent_hash_desc,
135		134	&hash_info, dir, name, 0, snapshot);
136	ret = bch2_hash_lookup(trans, &iter, bch2_dirent_hash_desc,
137	&hash_info, dir, name, 0);
138	if (ret)	135	if (ret)
139	return ret;	136	return ret;
140		137
@@ -225,15 +222,16 @@ static int lookup_lostfound(struct btree_trans *trans, u32 snapshot, · 84 unmodified lines
225		222
226	struct bch_inode_unpacked root_inode;	223	struct bch_inode_unpacked root_inode;
227	struct bch_hash_info root_hash_info;	224	struct bch_hash_info root_hash_info;
228	ret = lookup_inode(trans, root_inum.inum, &root_inode, &snapshot);	225	u32 root_inode_snapshot = snapshot;
		226	ret = lookup_inode(trans, root_inum.inum, &root_inode, &root_inode_snapshot);
229	bch_err_msg(c, ret, "looking up root inode");	227	bch_err_msg(c, ret, "looking up root inode");
230	if (ret)	228	if (ret)
231	return ret;	229	return ret;
232		230
233	root_hash_info = bch2_hash_info_init(c, &root_inode);	231	root_hash_info = bch2_hash_info_init(c, &root_inode);
234		232
235	ret = __lookup_dirent(trans, root_hash_info, root_inum,	233	ret = lookup_dirent_in_snapshot(trans, root_hash_info, root_inum,
236	&lostfound_str, &inum, &d_type);	234	&lostfound_str, &inum, &d_type, snapshot);
237	if (bch2_err_matches(ret, ENOENT))	235	if (bch2_err_matches(ret, ENOENT))
238	goto create_lostfound;	236	goto create_lostfound;
239		237
@@ -250,7 +248,10 @@ static int lookup_lostfound(struct btree_trans *trans, u32 snapshot, · 10 unmodified lines
250	* The bch2_check_dirents pass has already run, dangling dirents	248	* The bch2_check_dirents pass has already run, dangling dirents
251	* shouldn't exist here:	249	* shouldn't exist here:
252	*/	250	*/
253	return lookup_inode(trans, inum, lostfound, &snapshot);	251	ret = lookup_inode(trans, inum, lostfound, &snapshot);
		252	bch_err_msg(c, ret, "looking up lost+found %llu:%u in (root inode %llu, snapshot root %u)",
		253	inum, snapshot, root_inum.inum, bch2_snapshot_root(c, snapshot));
		254	return ret;
254		255
255	create_lostfound:	256	create_lostfound:
256	/*	257	/*

fs/bcachefs/journal.c+1−1

@@ -233,7 +233,7 @@ static void __journal_entry_close(struct journal *j, unsigned closed_val, bool t · 232 unmodified lines
233	prt_str(&pbuf, "entry size: ");	233	prt_str(&pbuf, "entry size: ");
234	prt_human_readable_u64(&pbuf, vstruct_bytes(buf->data));	234	prt_human_readable_u64(&pbuf, vstruct_bytes(buf->data));
235	prt_newline(&pbuf);	235	prt_newline(&pbuf);
236	bch2_prt_task_backtrace(&pbuf, current, 1);	236	bch2_prt_task_backtrace(&pbuf, current, 1, GFP_NOWAIT);
237	trace_journal_entry_close(c, pbuf.buf);	237	trace_journal_entry_close(c, pbuf.buf);
238	printbuf_exit(&pbuf);	238	printbuf_exit(&pbuf);
239	}	239	}

fs/bcachefs/journal_io.c+2−1

@@ -1988,7 +1988,8 @@ CLOSURE_CALLBACK(bch2_journal_write) · 1987 unmodified lines
1988	percpu_ref_get(&ca->io_ref);	1988	percpu_ref_get(&ca->io_ref);
1989		1989
1990	bio = ca->journal.bio;	1990	bio = ca->journal.bio;
1991	bio_reset(bio, ca->disk_sb.bdev, REQ_OP_FLUSH);	1991	bio_reset(bio, ca->disk_sb.bdev,
		1992	REQ_OP_WRITE\|REQ_PREFLUSH);
1992	bio->bi_end_io = journal_write_endio;	1993	bio->bi_end_io = journal_write_endio;
1993	bio->bi_private = ca;	1994	bio->bi_private = ca;
1994	closure_bio_submit(bio, cl);	1995	closure_bio_submit(bio, cl);

fs/bcachefs/str_hash.h+15−7

 }
 static __always_inline int
-bch2_hash_lookup(struct btree_trans *trans,
+bch2_hash_lookup_in_snapshot(struct btree_trans *trans,
 		 struct btree_iter *iter,
 		 const struct bch_hash_desc desc,
 		 const struct bch_hash_info *info,
 		 subvol_inum inum, const void *key,
-		 unsigned flags)
+		 unsigned flags, u32 snapshot)
 {
 	struct bkey_s_c k;
-	u32 snapshot;
 	int ret;
-	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &snapshot);
-	if (ret)
-		return ret;
 	for_each_btree_key_upto_norestart(trans, *iter, desc.btree_id,
 			   SPOS(inum.inum, desc.hash_key(info, key), snapshot),
 			   POS(inum.inum, U64_MAX),
 	return ret ?: -BCH_ERR_ENOENT_str_hash_lookup;
 }
+static __always_inline int
+bch2_hash_lookup(struct btree_trans *trans,
+		 struct btree_iter *iter,
+		 const struct bch_hash_desc desc,
+		 const struct bch_hash_info *info,
+		 subvol_inum inum, const void *key,
+		 unsigned flags)
+{
+	u32 snapshot;
+	return  bch2_subvolume_get_snapshot(trans, inum.subvol, &snapshot) ?:
+		bch2_hash_lookup_in_snapshot(trans, iter, desc, info, inum, key, flags, snapshot);
+}
 static __always_inline int
 bch2_hash_hole(struct btree_trans *trans,
 	       struct btree_iter *iter,

fs/bcachefs/util.c+5−5

 	console_unlock();
 }
-int bch2_save_backtrace(bch_stacktrace *stack, struct task_struct *task, unsigned skipnr)
+int bch2_save_backtrace(bch_stacktrace *stack, struct task_struct *task, unsigned skipnr,
+			gfp_t gfp)
 {
 #ifdef CONFIG_STACKTRACE
 	unsigned nr_entries = 0;
-	int ret = 0;
 	stack->nr = 0;
-	ret = darray_make_room(stack, 32);
+	int ret = darray_make_room_gfp(stack, 32, gfp);
 	if (ret)
 		return ret;
 	}
 }
-int bch2_prt_task_backtrace(struct printbuf *out, struct task_struct *task, unsigned skipnr)
+int bch2_prt_task_backtrace(struct printbuf *out, struct task_struct *task, unsigned skipnr, gfp_t gfp)
 {
 	bch_stacktrace stack = { 0 };
-	int ret = bch2_save_backtrace(&stack, task, skipnr + 1);
+	int ret = bch2_save_backtrace(&stack, task, skipnr + 1, gfp);
 	bch2_prt_backtrace(out, &stack);
 	darray_exit(&stack);

fs/bcachefs/util.h+2−2

@@ -348,9 +348,9 @@ void bch2_prt_u64_base2(struct printbuf *, u64); · 347 unmodified lines
348	void bch2_print_string_as_lines(const char prefix, const char lines);	348	void bch2_print_string_as_lines(const char prefix, const char lines);
349		349
350	typedef DARRAY(unsigned long) bch_stacktrace;	350	typedef DARRAY(unsigned long) bch_stacktrace;
351	int bch2_save_backtrace(bch_stacktrace stack, struct task_struct , unsigned);	351	int bch2_save_backtrace(bch_stacktrace stack, struct task_struct , unsigned, gfp_t);
352	void bch2_prt_backtrace(struct printbuf , bch_stacktrace );	352	void bch2_prt_backtrace(struct printbuf , bch_stacktrace );
353	int bch2_prt_task_backtrace(struct printbuf , struct task_struct , unsigned);	353	int bch2_prt_task_backtrace(struct printbuf , struct task_struct , unsigned, gfp_t);
354		354
355	static inline void prt_bdevname(struct printbuf out, struct block_device bdev)	355	static inline void prt_bdevname(struct printbuf out, struct block_device bdev)
356	{	356	{

fs/erofs/compress.h+2−3

 struct z_erofs_decompress_req {
 	struct super_block *sb;
 	struct page **in, **out;
 	unsigned short pageofs_in, pageofs_out;
 	unsigned int inputsize, outputsize;
-	/* indicate the algorithm will be used for decompression */
+	unsigned int alg;       /* the algorithm for decompression */
-	unsigned int alg;
 	bool inplace_io, partial_decoding, fillgaps;
+	gfp_t gfp;      /* allocation flags for extra temporary buffers */
 };
 struct z_erofs_decompressor {

fs/erofs/decompressor.c+3−2

 			victim = availables[--top];
 			get_page(victim);
 		} else {
-			victim = erofs_allocpage(pagepool,
+			victim = erofs_allocpage(pagepool, rq->gfp);
-						 GFP_KERNEL | __GFP_NOFAIL);
+			if (!victim)
+				return -ENOMEM;
 			set_page_private(victim, Z_EROFS_SHORTLIVED_PAGE);
 		}
 		rq->out[i] = victim;

fs/erofs/decompressor_deflate.c+13−6

@@ -95,7 +95,7 @@ int z_erofs_load_deflate_config(struct super_block *sb, · 94 unmodified lines
95	}	95	}
96		96
97	int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,	97	int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,
98	struct page **pagepool)	98	struct page **pgpl)
99	{	99	{
100	const unsigned int nrpages_out =	100	const unsigned int nrpages_out =
101	PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT;	101	PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT;
@@ -158,8 +158,12 @@ again: · 56 unmodified lines
158	strm->z.avail_out = min_t(u32, outsz, PAGE_SIZE - pofs);	158	strm->z.avail_out = min_t(u32, outsz, PAGE_SIZE - pofs);
159	outsz -= strm->z.avail_out;	159	outsz -= strm->z.avail_out;
160	if (!rq->out[no]) {	160	if (!rq->out[no]) {
161	rq->out[no] = erofs_allocpage(pagepool,	161	rq->out[no] = erofs_allocpage(pgpl, rq->gfp);
162	GFP_KERNEL \| __GFP_NOFAIL);	162	if (!rq->out[no]) {
		163	kout = NULL;
		164	err = -ENOMEM;
		165	break;
		166	}
163	set_page_private(rq->out[no],	167	set_page_private(rq->out[no],
164	Z_EROFS_SHORTLIVED_PAGE);	168	Z_EROFS_SHORTLIVED_PAGE);
165	}	169	}
@@ -211,8 +215,11 @@ again: · 45 unmodified lines
211		215
212	DBG_BUGON(erofs_page_is_managed(EROFS_SB(sb),	216	DBG_BUGON(erofs_page_is_managed(EROFS_SB(sb),
213	rq->in[j]));	217	rq->in[j]));
214	tmppage = erofs_allocpage(pagepool,	218	tmppage = erofs_allocpage(pgpl, rq->gfp);
215	GFP_KERNEL \| __GFP_NOFAIL);	219	if (!tmppage) {
		220	err = -ENOMEM;
		221	goto failed;
		222	}
216	set_page_private(tmppage, Z_EROFS_SHORTLIVED_PAGE);	223	set_page_private(tmppage, Z_EROFS_SHORTLIVED_PAGE);
217	copy_highpage(tmppage, rq->in[j]);	224	copy_highpage(tmppage, rq->in[j]);
218	rq->in[j] = tmppage;	225	rq->in[j] = tmppage;
@@ -230,7 +237,7 @@ again: · 11 unmodified lines
230	break;	237	break;
231	}	238	}
232	}	239	}
233		240	failed:
234	if (zlib_inflateEnd(&strm->z) != Z_OK && !err)	241	if (zlib_inflateEnd(&strm->z) != Z_OK && !err)
235	err = -EIO;	242	err = -EIO;
236	if (kout)	243	if (kout)

fs/erofs/decompressor_lzma.c+12−5

 }
 int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,
-			    struct page **pagepool)
+			    struct page **pgpl)
 {
 	const unsigned int nrpages_out =
 		PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT;
 						   PAGE_SIZE - pageofs);
 			outlen -= strm->buf.out_size;
 			if (!rq->out[no] && rq->fillgaps) {	/* deduped */
-				rq->out[no] = erofs_allocpage(pagepool,
+				rq->out[no] = erofs_allocpage(pgpl, rq->gfp);
-						GFP_KERNEL | __GFP_NOFAIL);
+				if (!rq->out[no]) {
+					err = -ENOMEM;
+					break;
+				}
 				set_page_private(rq->out[no],
 						 Z_EROFS_SHORTLIVED_PAGE);
 			}
 			DBG_BUGON(erofs_page_is_managed(EROFS_SB(rq->sb),
 							rq->in[j]));
-			tmppage = erofs_allocpage(pagepool,
+			tmppage = erofs_allocpage(pgpl, rq->gfp);
-						  GFP_KERNEL | __GFP_NOFAIL);
+			if (!tmppage) {
+				err = -ENOMEM;
+				goto failed;
+			}
 			set_page_private(tmppage, Z_EROFS_SHORTLIVED_PAGE);
 			copy_highpage(tmppage, rq->in[j]);
 			rq->in[j] = tmppage;
 			break;
 		}
 	}
+failed:
 	if (no < nrpages_out && strm->buf.out)
 		kunmap(rq->out[no]);
 	if (ni < nrpages_in)

fs/erofs/fscache.c+1−1

@@ -459,7 +459,7 @@ static struct erofs_fscache erofs_fscache_acquire_cookie(struct super_block sb · 458 unmodified lines
459		459
460	inode->i_size = OFFSET_MAX;	460	inode->i_size = OFFSET_MAX;
461	inode->i_mapping->a_ops = &erofs_fscache_meta_aops;	461	inode->i_mapping->a_ops = &erofs_fscache_meta_aops;
462	mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS);	462	mapping_set_gfp_mask(inode->i_mapping, GFP_KERNEL);
463	inode->i_blkbits = EROFS_SB(sb)->blkszbits;	463	inode->i_blkbits = EROFS_SB(sb)->blkszbits;
464	inode->i_private = ctx;	464	inode->i_private = ctx;
465		465

fs/erofs/inode.c+1−1

@@ -60,7 +60,7 @@ static void erofs_read_inode(struct erofs_buf buf, · 59 unmodified lines
60	} else {	60	} else {
61	const unsigned int gotten = sb->s_blocksize - *ofs;	61	const unsigned int gotten = sb->s_blocksize - *ofs;
62		62
63	copied = kmalloc(vi->inode_isize, GFP_NOFS);	63	copied = kmalloc(vi->inode_isize, GFP_KERNEL);
64	if (!copied) {	64	if (!copied) {
65	err = -ENOMEM;	65	err = -ENOMEM;
66	goto err_out;	66	goto err_out;

fs/erofs/utils.c+1−1

@@ -81,7 +81,7 @@ struct erofs_workgroup erofs_insert_workgroup(struct super_block sb, · 80 unmodified lines
81	repeat:	81	repeat:
82	xa_lock(&sbi->managed_pslots);	82	xa_lock(&sbi->managed_pslots);
83	pre = __xa_cmpxchg(&sbi->managed_pslots, grp->index,	83	pre = __xa_cmpxchg(&sbi->managed_pslots, grp->index,
84	NULL, grp, GFP_NOFS);	84	NULL, grp, GFP_KERNEL);
85	if (pre) {	85	if (pre) {
86	if (xa_is_err(pre)) {	86	if (xa_is_err(pre)) {
87	pre = ERR_PTR(xa_err(pre));	87	pre = ERR_PTR(xa_err(pre));

fs/erofs/zdata.c+54−44

@@ -82,6 +82,9 @@ struct z_erofs_pcluster { · 81 unmodified lines
82	/* L: indicate several pageofs_outs or not */	82	/* L: indicate several pageofs_outs or not */
83	bool multibases;	83	bool multibases;
84		84
		85	/* L: whether extra buffer allocations are best-effort */
		86	bool besteffort;
		87
85	/* A: compressed bvecs (can be cached or inplaced pages) */	88	/* A: compressed bvecs (can be cached or inplaced pages) */
86	struct z_erofs_bvec compressed_bvecs[];	89	struct z_erofs_bvec compressed_bvecs[];
87	};	90	};
@@ -230,7 +233,7 @@ static int z_erofs_bvec_enqueue(struct z_erofs_bvec_iter *iter, · 142 unmodified lines
230	struct page nextpage = candidate_bvpage;	233	struct page nextpage = candidate_bvpage;
231		234
232	if (!nextpage) {	235	if (!nextpage) {
233	nextpage = erofs_allocpage(pagepool, GFP_NOFS);	236	nextpage = erofs_allocpage(pagepool, GFP_KERNEL);
234	if (!nextpage)	237	if (!nextpage)
235	return -ENOMEM;	238	return -ENOMEM;
236	set_page_private(nextpage, Z_EROFS_SHORTLIVED_PAGE);	239	set_page_private(nextpage, Z_EROFS_SHORTLIVED_PAGE);
@@ -302,7 +305,7 @@ static struct z_erofs_pcluster *z_erofs_alloc_pcluster(unsigned int size) · 65 unmodified lines
302	if (nrpages > pcs->maxpages)	305	if (nrpages > pcs->maxpages)
303	continue;	306	continue;
304		307
305	pcl = kmem_cache_zalloc(pcs->slab, GFP_NOFS);	308	pcl = kmem_cache_zalloc(pcs->slab, GFP_KERNEL);
306	if (!pcl)	309	if (!pcl)
307	return ERR_PTR(-ENOMEM);	310	return ERR_PTR(-ENOMEM);
308	pcl->pclustersize = size;	311	pcl->pclustersize = size;
@@ -563,21 +566,19 @@ static void z_erofs_bind_cache(struct z_erofs_decompress_frontend *fe) · 254 unmodified lines
563	__GFP_NOMEMALLOC \| __GFP_NORETRY \| __GFP_NOWARN;	566	__GFP_NOMEMALLOC \| __GFP_NORETRY \| __GFP_NOWARN;
564	unsigned int i;	567	unsigned int i;
565		568
566	if (i_blocksize(fe->inode) != PAGE_SIZE)	569	if (i_blocksize(fe->inode) != PAGE_SIZE \|\|
567	return;	570	fe->mode < Z_EROFS_PCLUSTER_FOLLOWED)
568	if (fe->mode < Z_EROFS_PCLUSTER_FOLLOWED)
569	return;	571	return;
570		572
571	for (i = 0; i < pclusterpages; ++i) {	573	for (i = 0; i < pclusterpages; ++i) {
572	struct page page, newpage;	574	struct page page, newpage;
573	void t; / mark pages just found for debugging */	575	void t; / mark pages just found for debugging */
574		576
575	/* the compressed page was loaded before */	577	/* Inaccurate check w/o locking to avoid unneeded lookups */
576	if (READ_ONCE(pcl->compressed_bvecs[i].page))	578	if (READ_ONCE(pcl->compressed_bvecs[i].page))
577	continue;	579	continue;
578		580
579	page = find_get_page(mc, pcl->obj.index + i);	581	page = find_get_page(mc, pcl->obj.index + i);
580
581	if (page) {	582	if (page) {
582	t = (void *)((unsigned long)page \| 1);	583	t = (void *)((unsigned long)page \| 1);
583	newpage = NULL;	584	newpage = NULL;
@@ -597,9 +598,13 @@ static void z_erofs_bind_cache(struct z_erofs_decompress_frontend *fe) · 13 unmodified lines
597	set_page_private(newpage, Z_EROFS_PREALLOCATED_PAGE);	598	set_page_private(newpage, Z_EROFS_PREALLOCATED_PAGE);
598	t = (void *)((unsigned long)newpage \| 1);	599	t = (void *)((unsigned long)newpage \| 1);
599	}	600	}
600		601	spin_lock(&pcl->obj.lockref.lock);
601	if (!cmpxchg_relaxed(&pcl->compressed_bvecs[i].page, NULL, t))	602	if (!pcl->compressed_bvecs[i].page) {
		603	pcl->compressed_bvecs[i].page = t;
		604	spin_unlock(&pcl->obj.lockref.lock);
602	continue;	605	continue;
		606	}
		607	spin_unlock(&pcl->obj.lockref.lock);
603		608
604	if (page)	609	if (page)
605	put_page(page);	610	put_page(page);
@@ -694,7 +699,7 @@ static void z_erofs_cache_invalidate_folio(struct folio *folio, · 88 unmodified lines
694	DBG_BUGON(stop > folio_size(folio) \|\| stop < length);	699	DBG_BUGON(stop > folio_size(folio) \|\| stop < length);
695		700
696	if (offset == 0 && stop == folio_size(folio))	701	if (offset == 0 && stop == folio_size(folio))
697	while (!z_erofs_cache_release_folio(folio, GFP_NOFS))	702	while (!z_erofs_cache_release_folio(folio, 0))
698	cond_resched();	703	cond_resched();
699	}	704	}
700		705
@@ -713,36 +718,30 @@ int erofs_init_managed_cache(struct super_block *sb) · 12 unmodified lines
713	set_nlink(inode, 1);	718	set_nlink(inode, 1);
714	inode->i_size = OFFSET_MAX;	719	inode->i_size = OFFSET_MAX;
715	inode->i_mapping->a_ops = &z_erofs_cache_aops;	720	inode->i_mapping->a_ops = &z_erofs_cache_aops;
716	mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS);	721	mapping_set_gfp_mask(inode->i_mapping, GFP_KERNEL);
717	EROFS_SB(sb)->managed_cache = inode;	722	EROFS_SB(sb)->managed_cache = inode;
718	return 0;	723	return 0;
719	}	724	}
720		725
721	static bool z_erofs_try_inplace_io(struct z_erofs_decompress_frontend *fe,
722	struct z_erofs_bvec *bvec)
723	{
724	struct z_erofs_pcluster *const pcl = fe->pcl;
725
726	while (fe->icur > 0) {
727	if (!cmpxchg(&pcl->compressed_bvecs[--fe->icur].page,
728	NULL, bvec->page)) {
729	pcl->compressed_bvecs[fe->icur] = *bvec;
730	return true;
731	}
732	}
733	return false;
734	}
735
736	/* callers must be with pcluster lock held */	726	/* callers must be with pcluster lock held */
737	static int z_erofs_attach_page(struct z_erofs_decompress_frontend *fe,	727	static int z_erofs_attach_page(struct z_erofs_decompress_frontend *fe,
738	struct z_erofs_bvec *bvec, bool exclusive)	728	struct z_erofs_bvec *bvec, bool exclusive)
739	{	729	{
		730	struct z_erofs_pcluster *pcl = fe->pcl;
740	int ret;	731	int ret;
741		732
742	if (exclusive) {	733	if (exclusive) {
743	/* give priority for inplaceio to use file pages first */	734	/* give priority for inplaceio to use file pages first */
744	if (z_erofs_try_inplace_io(fe, bvec))	735	spin_lock(&pcl->obj.lockref.lock);
		736	while (fe->icur > 0) {
		737	if (pcl->compressed_bvecs[--fe->icur].page)
		738	continue;
		739	pcl->compressed_bvecs[fe->icur] = *bvec;
		740	spin_unlock(&pcl->obj.lockref.lock);
745	return 0;	741	return 0;
		742	}
		743	spin_unlock(&pcl->obj.lockref.lock);
		744
746	/* otherwise, check if it can be used as a bvpage */	745	/* otherwise, check if it can be used as a bvpage */
747	if (fe->mode >= Z_EROFS_PCLUSTER_FOLLOWED &&	746	if (fe->mode >= Z_EROFS_PCLUSTER_FOLLOWED &&
748	!fe->candidate_bvpage)	747	!fe->candidate_bvpage)
@@ -964,7 +963,7 @@ static int z_erofs_read_fragment(struct super_block sb, struct page page, · 215 unmodified lines
964	}	963	}
965		964
966	static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,	965	static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,
967	struct page *page)	966	struct page *page, bool ra)
968	{	967	{
969	struct inode *const inode = fe->inode;	968	struct inode *const inode = fe->inode;
970	struct erofs_map_blocks *const map = &fe->map;	969	struct erofs_map_blocks *const map = &fe->map;
@@ -1014,6 +1013,7 @@ repeat: · 43 unmodified lines
1014	err = z_erofs_pcluster_begin(fe);	1013	err = z_erofs_pcluster_begin(fe);
1015	if (err)	1014	if (err)
1016	goto out;	1015	goto out;
		1016	fe->pcl->besteffort \|= !ra;
1017	}	1017	}
1018		1018
1019	/*	1019	/*
@@ -1280,6 +1280,9 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, · 260 unmodified lines
1280	.inplace_io = overlapped,	1280	.inplace_io = overlapped,
1281	.partial_decoding = pcl->partial,	1281	.partial_decoding = pcl->partial,
1282	.fillgaps = pcl->multibases,	1282	.fillgaps = pcl->multibases,
		1283	.gfp = pcl->besteffort ?
		1284	GFP_KERNEL \| __GFP_NOFAIL :
		1285	GFP_NOWAIT \| __GFP_NORETRY
1283	}, be->pagepool);	1286	}, be->pagepool);
1284		1287
1285	/* must handle all compressed pages before actual file pages */	1288	/* must handle all compressed pages before actual file pages */
@@ -1322,6 +1325,7 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, · 36 unmodified lines
1322	pcl->length = 0;	1325	pcl->length = 0;
1323	pcl->partial = true;	1326	pcl->partial = true;
1324	pcl->multibases = false;	1327	pcl->multibases = false;
		1328	pcl->besteffort = false;
1325	pcl->bvset.nextpage = NULL;	1329	pcl->bvset.nextpage = NULL;
1326	pcl->vcnt = 0;	1330	pcl->vcnt = 0;
1327		1331
@@ -1423,23 +1427,26 @@ static void z_erofs_fill_bio_vec(struct bio_vec *bvec, · 95 unmodified lines
1423	{	1427	{
1424	gfp_t gfp = mapping_gfp_mask(mc);	1428	gfp_t gfp = mapping_gfp_mask(mc);
1425	bool tocache = false;	1429	bool tocache = false;
1426	struct z_erofs_bvec *zbv = pcl->compressed_bvecs + nr;	1430	struct z_erofs_bvec zbv;
1427	struct address_space *mapping;	1431	struct address_space *mapping;
1428	struct page page, oldpage;	1432	struct page *page;
1429	int justfound, bs = i_blocksize(f->inode);	1433	int justfound, bs = i_blocksize(f->inode);
1430		1434
1431	/* Except for inplace pages, the entire page can be used for I/Os */	1435	/* Except for inplace pages, the entire page can be used for I/Os */
1432	bvec->bv_offset = 0;	1436	bvec->bv_offset = 0;
1433	bvec->bv_len = PAGE_SIZE;	1437	bvec->bv_len = PAGE_SIZE;
1434	repeat:	1438	repeat:
1435	oldpage = READ_ONCE(zbv->page);	1439	spin_lock(&pcl->obj.lockref.lock);
1436	if (!oldpage)	1440	zbv = pcl->compressed_bvecs[nr];
		1441	page = zbv.page;
		1442	justfound = (unsigned long)page & 1UL;
		1443	page = (struct page *)((unsigned long)page & ~1UL);
		1444	pcl->compressed_bvecs[nr].page = page;
		1445	spin_unlock(&pcl->obj.lockref.lock);
		1446	if (!page)
1437	goto out_allocpage;	1447	goto out_allocpage;
1438		1448
1439	justfound = (unsigned long)oldpage & 1UL;
1440	page = (struct page *)((unsigned long)oldpage & ~1UL);
1441	bvec->bv_page = page;	1449	bvec->bv_page = page;
1442
1443	DBG_BUGON(z_erofs_is_shortlived_page(page));	1450	DBG_BUGON(z_erofs_is_shortlived_page(page));
1444	/*	1451	/*
1445	* Handle preallocated cached pages. We tried to allocate such pages	1452	* Handle preallocated cached pages. We tried to allocate such pages
@@ -1448,7 +1455,6 @@ repeat: · 2 unmodified lines
1448	*/	1455	*/
1449	if (page->private == Z_EROFS_PREALLOCATED_PAGE) {	1456	if (page->private == Z_EROFS_PREALLOCATED_PAGE) {
1450	set_page_private(page, 0);	1457	set_page_private(page, 0);
1451	WRITE_ONCE(zbv->page, page);
1452	tocache = true;	1458	tocache = true;
1453	goto out_tocache;	1459	goto out_tocache;
1454	}	1460	}
@@ -1459,9 +1465,9 @@ repeat: · 4 unmodified lines
1459	* therefore it is impossible for `mapping` to be NULL.	1465	* therefore it is impossible for `mapping` to be NULL.
1460	*/	1466	*/
1461	if (mapping && mapping != mc) {	1467	if (mapping && mapping != mc) {
1462	if (zbv->offset < 0)	1468	if (zbv.offset < 0)
1463	bvec->bv_offset = round_up(-zbv->offset, bs);	1469	bvec->bv_offset = round_up(-zbv.offset, bs);
1464	bvec->bv_len = round_up(zbv->end, bs) - bvec->bv_offset;	1470	bvec->bv_len = round_up(zbv.end, bs) - bvec->bv_offset;
1465	return;	1471	return;
1466	}	1472	}
1467		1473
@@ -1471,7 +1477,6 @@ repeat: · 3 unmodified lines
1471		1477
1472	/* the cached page is still in managed cache */	1478	/* the cached page is still in managed cache */
1473	if (page->mapping == mc) {	1479	if (page->mapping == mc) {
1474	WRITE_ONCE(zbv->page, page);
1475	/*	1480	/*
1476	* The cached page is still available but without a valid	1481	* The cached page is still available but without a valid
1477	* `->private` pcluster hint. Let's reconnect them.	1482	* `->private` pcluster hint. Let's reconnect them.
@@ -1503,11 +1508,15 @@ repeat: · 25 unmodified lines
1503	put_page(page);	1508	put_page(page);
1504	out_allocpage:	1509	out_allocpage:
1505	page = erofs_allocpage(&f->pagepool, gfp \| __GFP_NOFAIL);	1510	page = erofs_allocpage(&f->pagepool, gfp \| __GFP_NOFAIL);
1506	if (oldpage != cmpxchg(&zbv->page, oldpage, page)) {	1511	spin_lock(&pcl->obj.lockref.lock);
		1512	if (pcl->compressed_bvecs[nr].page) {
1507	erofs_pagepool_add(&f->pagepool, page);	1513	erofs_pagepool_add(&f->pagepool, page);
		1514	spin_unlock(&pcl->obj.lockref.lock);
1508	cond_resched();	1515	cond_resched();
1509	goto repeat;	1516	goto repeat;
1510	}	1517	}
		1518	pcl->compressed_bvecs[nr].page = page;
		1519	spin_unlock(&pcl->obj.lockref.lock);
1511	bvec->bv_page = page;	1520	bvec->bv_page = page;
1512	out_tocache:	1521	out_tocache:
1513	if (!tocache \|\| bs != PAGE_SIZE \|\|	1522	if (!tocache \|\| bs != PAGE_SIZE \|\|
@@ -1685,6 +1694,7 @@ submit_bio_retry: · 171 unmodified lines
1685		1694
1686	if (cur + bvec.bv_len > end)	1695	if (cur + bvec.bv_len > end)
1687	bvec.bv_len = end - cur;	1696	bvec.bv_len = end - cur;
		1697	DBG_BUGON(bvec.bv_len < sb->s_blocksize);
1688	if (!bio_add_page(bio, bvec.bv_page, bvec.bv_len,	1698	if (!bio_add_page(bio, bvec.bv_page, bvec.bv_len,
1689	bvec.bv_offset))	1699	bvec.bv_offset))
1690	goto submit_bio_retry;	1700	goto submit_bio_retry;
@@ -1785,7 +1795,7 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f, · 94 unmodified lines
1785	if (PageUptodate(page))	1795	if (PageUptodate(page))
1786	unlock_page(page);	1796	unlock_page(page);
1787	else	1797	else
1788	(void)z_erofs_do_read_page(f, page);	1798	(void)z_erofs_do_read_page(f, page, !!rac);
1789	put_page(page);	1799	put_page(page);
1790	}	1800	}
1791		1801
@@ -1806,7 +1816,7 @@ static int z_erofs_read_folio(struct file file, struct folio folio) · 14 unmodified lines
1806	f.headoffset = (erofs_off_t)folio->index << PAGE_SHIFT;	1816	f.headoffset = (erofs_off_t)folio->index << PAGE_SHIFT;
1807		1817
1808	z_erofs_pcluster_readmore(&f, NULL, true);	1818	z_erofs_pcluster_readmore(&f, NULL, true);
1809	err = z_erofs_do_read_page(&f, &folio->page);	1819	err = z_erofs_do_read_page(&f, &folio->page, false);
1810	z_erofs_pcluster_readmore(&f, NULL, false);	1820	z_erofs_pcluster_readmore(&f, NULL, false);
1811	z_erofs_pcluster_end(&f);	1821	z_erofs_pcluster_end(&f);
1812		1822
@@ -1847,7 +1857,7 @@ static void z_erofs_readahead(struct readahead_control *rac) · 34 unmodified lines
1847	folio = head;	1857	folio = head;
1848	head = folio_get_private(folio);	1858	head = folio_get_private(folio);
1849		1859
1850	err = z_erofs_do_read_page(&f, &folio->page);	1860	err = z_erofs_do_read_page(&f, &folio->page, true);
1851	if (err && err != -EINTR)	1861	if (err && err != -EINTR)
1852	erofs_err(inode->i_sb, "readahead error at folio %lu @ nid %llu",	1862	erofs_err(inode->i_sb, "readahead error at folio %lu @ nid %llu",
1853	folio->index, EROFS_I(inode)->nid);	1863	folio->index, EROFS_I(inode)->nid);

fs/exfat/inode.c+3−4

 	struct inode *inode = mapping->host;
 	struct exfat_inode_info *ei = EXFAT_I(inode);
 	loff_t pos = iocb->ki_pos;
-	loff_t size = iocb->ki_pos + iov_iter_count(iter);
+	loff_t size = pos + iov_iter_count(iter);
 	int rw = iov_iter_rw(iter);
 	ssize_t ret;
 	 */
 	ret = blockdev_direct_IO(iocb, inode, iter, exfat_get_block);
 	if (ret < 0) {
-		if (rw == WRITE)
+		if (rw == WRITE && ret != -EIOCBQUEUED)
 			exfat_write_failed(mapping, size);
-		if (ret != -EIOCBQUEUED)
+		return ret;
-			return ret;
 	} else
 		size = pos + ret;

fs/hugetlbfs/inode.c+1−1

@@ -340,7 +340,7 @@ static ssize_t hugetlbfs_read_iter(struct kiocb iocb, struct iov_iter to) · 339 unmodified lines
340	} else {	340	} else {
341	folio_unlock(folio);	341	folio_unlock(folio);
342		342
343	if (!folio_test_has_hwpoisoned(folio))	343	if (!folio_test_hwpoison(folio))
344	want = nr;	344	want = nr;
345	else {	345	else {
346	/*	346	/*

fs/jfs/jfs_dmap.c+1−7

  *	leafno	- the number of the leaf to be updated.
  *	newval	- the new value for the leaf.
  *
- * RETURN VALUES:
+ * RETURN VALUES: none
- *  0		- success
- *	-EIO	- i/o error
  */
 static int dbJoin(dmtree_t *tp, int leafno, int newval, bool is_ctl)
 {
 		 * get the buddy size (number of words covered) of
 		 * the new value.
 		 */
-		if ((newval - tp->dmt_budmin) > BUDMIN)
-			return -EIO;
 		budsz = BUDSIZE(newval, tp->dmt_budmin);
 		/* try to join.

fs/smb/client/cached_dir.c+20−4

 	struct cached_fid *cfid;
 	struct cached_fids *cfids;
 	const char *npath;
+	int retries = 0, cur_sleep = 1;
 	if (tcon == NULL || tcon->cfids == NULL || tcon->nohandlecache ||
 	    is_smb1_server(tcon->ses->server) || (dir_cache_timeout == 0))
 		return -EOPNOTSUPP;
 	ses = tcon->ses;
-	server = cifs_pick_channel(ses);
 	cfids = tcon->cfids;
-	if (!server->ops->new_lease_key)
-		return -EIO;
 	if (cifs_sb->root == NULL)
 		return -ENOENT;
+replay_again:
+	/* reinitialize for possible replay */
+	flags = 0;
+	oplock = SMB2_OPLOCK_LEVEL_II;
+	server = cifs_pick_channel(ses);
+	if (!server->ops->new_lease_key)
+		return -EIO;
 	utf16_path = cifs_convert_path_to_utf16(path, cifs_sb);
 	if (!utf16_path)
 		return -ENOMEM;
 	 */
 	cfid->has_lease = true;
+	if (retries) {
+		smb2_set_replay(server, &rqst[0]);
+		smb2_set_replay(server, &rqst[1]);
+	}
 	rc = compound_send_recv(xid, ses, server,
 				flags, 2, rqst,
 				resp_buftype, rsp_iov);
 		atomic_inc(&tcon->num_remote_opens);
 	}
 	kfree(utf16_path);
+	if (is_replayable_error(rc) &&
+	    smb2_should_replay(tcon, &retries, &cur_sleep))
+		goto replay_again;
 	return rc;
 }

fs/smb/client/cifsencrypt.c+1−1

@@ -572,7 +572,7 @@ static int calc_ntlmv2_hash(struct cifs_ses ses, char ntlmv2_hash, · 571 unmodified lines
572	len = cifs_strtoUTF16(user, ses->user_name, len, nls_cp);	572	len = cifs_strtoUTF16(user, ses->user_name, len, nls_cp);
573	UniStrupr(user);	573	UniStrupr(user);
574	} else {	574	} else {
575	memset(user, '\0', 2);	575	(u16 )user = 0;
576	}	576	}
577		577
578	rc = crypto_shash_update(ses->server->secmech.hmacmd5,	578	rc = crypto_shash_update(ses->server->secmech.hmacmd5,

fs/smb/client/cifsfs.c+14−3

 	spin_lock_init(&cifs_inode->writers_lock);
 	cifs_inode->writers = 0;
 	cifs_inode->netfs.inode.i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */
-	cifs_inode->server_eof = 0;
+	cifs_inode->netfs.remote_i_size = 0;
 	cifs_inode->uniqueid = 0;
 	cifs_inode->createtime = 0;
 	cifs_inode->epoch = 0;
 	struct inode *src_inode = file_inode(src_file);
 	struct inode *target_inode = file_inode(dst_file);
 	struct cifsInodeInfo *src_cifsi = CIFS_I(src_inode);
+	struct cifsInodeInfo *target_cifsi = CIFS_I(target_inode);
 	struct cifsFileInfo *smb_file_src;
 	struct cifsFileInfo *smb_file_target;
 	struct cifs_tcon *src_tcon;
 	 * Advance the EOF marker after the flush above to the end of the range
 	 * if it's short of that.
 	 */
-	if (src_cifsi->server_eof < off + len) {
+	if (src_cifsi->netfs.remote_i_size < off + len) {
 		rc = cifs_precopy_set_eof(src_inode, src_cifsi, src_tcon, xid, off + len);
 		if (rc < 0)
 			goto unlock;
 	/* Discard all the folios that overlap the destination region. */
 	truncate_inode_pages_range(&target_inode->i_data, fstart, fend);
+	fscache_invalidate(cifs_inode_cookie(target_inode), NULL,
+			   i_size_read(target_inode), 0);
 	rc = file_modified(dst_file);
 	if (!rc) {
 		rc = target_tcon->ses->server->ops->copychunk_range(xid,
 			smb_file_src, smb_file_target, off, len, destoff);
-		if (rc > 0 && destoff + rc > i_size_read(target_inode))
+		if (rc > 0 && destoff + rc > i_size_read(target_inode)) {
 			truncate_setsize(target_inode, destoff + rc);
+			netfs_resize_file(&target_cifsi->netfs,
+					  i_size_read(target_inode), true);
+			fscache_resize_cookie(cifs_inode_cookie(target_inode),
+					      i_size_read(target_inode));
+		}
+		if (rc > 0 && destoff + rc > target_cifsi->netfs.zero_point)
+			target_cifsi->netfs.zero_point = destoff + rc;
 	}
 	file_accessed(src_file);

fs/smb/client/cifsglob.h+13−1

  */
 #define CIFS_DEF_ACTIMEO (1 * HZ)
+/*
+ * max sleep time before retry to server
+ */
+#define CIFS_MAX_SLEEP 2000
 /*
  * max attribute cache timeout (jiffies) - 2^30
  */
 	struct smbd_mr			*mr;
 #endif
 	struct cifs_credits		credits;
+	bool				replay;
 };
 /*
 	spinlock_t writers_lock;
 	unsigned int writers;		/* Number of writers on this inode */
 	unsigned long time;		/* jiffies of last update of inode */
-	u64  server_eof;		/* current file size on server -- protected by i_lock */
 	u64  uniqueid;			/* server inode number */
 	u64  createtime;		/* creation time on server */
 	__u8 lease_key[SMB2_LEASE_KEY_SIZE];	/* lease key for this inode */
 	return false;
 }
+static inline bool is_replayable_error(int error)
+{
+	if (error == -EAGAIN || error == -ECONNABORTED)
+		return true;
+	return false;
+}
 /* cifs_get_writable_file() flags */
 #define FIND_WR_ANY         0

fs/smb/client/file.c+5−4

 {
 	loff_t end_of_write = offset + bytes_written;
-	if (end_of_write > cifsi->server_eof)
+	if (end_of_write > cifsi->netfs.remote_i_size)
-		cifsi->server_eof = end_of_write;
+		netfs_resize_file(&cifsi->netfs, end_of_write, true);
 }
 static ssize_t
 	spin_lock(&inode->i_lock);
 	cifs_update_eof(cifsi, wdata->offset, wdata->bytes);
-	if (cifsi->server_eof > inode->i_size)
+	if (cifsi->netfs.remote_i_size > inode->i_size)
-		i_size_write(inode, cifsi->server_eof);
+		i_size_write(inode, cifsi->netfs.remote_i_size);
 	spin_unlock(&inode->i_lock);
 	complete(&wdata->done);
 			if (wdata->cfile->invalidHandle)
 				rc = -EAGAIN;
 			else {
+				wdata->replay = true;
 #ifdef CONFIG_CIFS_SMB_DIRECT
 				if (wdata->mr) {
 					wdata->mr->need_invalidate = true;

fs/smb/client/inode.c+5−3

 	fattr->cf_mtime = timestamp_truncate(fattr->cf_mtime, inode);
 	mtime = inode_get_mtime(inode);
 	if (timespec64_equal(&mtime, &fattr->cf_mtime) &&
-	    cifs_i->server_eof == fattr->cf_eof) {
+	    cifs_i->netfs.remote_i_size == fattr->cf_eof) {
 		cifs_dbg(FYI, "%s: inode %llu is unchanged\n",
 			 __func__, cifs_i->uniqueid);
 		return;
 	else
 		clear_bit(CIFS_INO_DELETE_PENDING, &cifs_i->flags);
-	cifs_i->server_eof = fattr->cf_eof;
+	cifs_i->netfs.remote_i_size = fattr->cf_eof;
 	/*
 	 * Can't safely change the file size here if the client is writing to
 	 * it due to potential races.
 set_size_out:
 	if (rc == 0) {
-		cifsInode->server_eof = attrs->ia_size;
+		netfs_resize_file(&cifsInode->netfs, attrs->ia_size, true);
 		cifs_setsize(inode, attrs->ia_size);
 		/*
 		 * i_blocks is not related to (i_size / i_blksize), but instead
 	if ((attrs->ia_valid & ATTR_SIZE) &&
 	    attrs->ia_size != i_size_read(inode)) {
 		truncate_setsize(inode, attrs->ia_size);
+		netfs_resize_file(&cifsInode->netfs, attrs->ia_size, true);
 		fscache_resize_cookie(cifs_inode_cookie(inode), attrs->ia_size);
 	}
 	if ((attrs->ia_valid & ATTR_SIZE) &&
 	    attrs->ia_size != i_size_read(inode)) {
 		truncate_setsize(inode, attrs->ia_size);
+		netfs_resize_file(&cifsInode->netfs, attrs->ia_size, true);
 		fscache_resize_cookie(cifs_inode_cookie(inode), attrs->ia_size);
 	}

fs/smb/client/readdir.c+1−1

@@ -141,7 +141,7 @@ retry: · 140 unmodified lines
141	if (likely(reparse_inode_match(inode, fattr))) {	141	if (likely(reparse_inode_match(inode, fattr))) {
142	fattr->cf_mode = inode->i_mode;	142	fattr->cf_mode = inode->i_mode;
143	fattr->cf_rdev = inode->i_rdev;	143	fattr->cf_rdev = inode->i_rdev;
144	fattr->cf_eof = CIFS_I(inode)->server_eof;	144	fattr->cf_eof = CIFS_I(inode)->netfs.remote_i_size;
145	fattr->cf_symlink_target = NULL;	145	fattr->cf_symlink_target = NULL;
146	} else {	146	} else {
147	CIFS_I(inode)->time = 0;	147	CIFS_I(inode)->time = 0;

fs/smb/client/smb2inode.c+27−6

 	unsigned int size[2];
 	void *data[2];
 	int len;
+	int retries = 0, cur_sleep = 1;
+replay_again:
+	/* reinitialize for possible replay */
+	flags = 0;
+	oplock = SMB2_OPLOCK_LEVEL_NONE;
+	num_rqst = 0;
+	server = cifs_pick_channel(ses);
 	vars = kzalloc(sizeof(*vars), GFP_ATOMIC);
 	if (vars == NULL)
 	rqst = &vars->rqst[0];
 	rsp_iov = &vars->rsp_iov[0];
-	server = cifs_pick_channel(ses);
 	if (smb3_encryption_required(tcon))
 		flags |= CIFS_TRANSFORM_REQ;
 	num_rqst++;
 	if (cfile) {
+		if (retries)
+			for (i = 1; i < num_rqst - 2; i++)
+				smb2_set_replay(server, &rqst[i]);
 		rc = compound_send_recv(xid, ses, server,
 					flags, num_rqst - 2,
 					&rqst[1], &resp_buftype[1],
 					&rsp_iov[1]);
-	} else
+	} else {
+		if (retries)
+			for (i = 0; i < num_rqst; i++)
+				smb2_set_replay(server, &rqst[i]);
 		rc = compound_send_recv(xid, ses, server,
 					flags, num_rqst,
 					rqst, resp_buftype,
 					rsp_iov);
+	}
 finished:
 	num_rqst = 0;
 	}
 	SMB2_close_free(&rqst[num_rqst]);
-	if (cfile)
-		cifsFileInfo_put(cfile);
 	num_cmds += 2;
 	if (out_iov && out_buftype) {
 		memcpy(out_iov, rsp_iov, num_cmds * sizeof(*out_iov));
 		for (i = 0; i < num_cmds; i++)
 			free_rsp_buf(resp_buftype[i], rsp_iov[i].iov_base);
 	}
+	num_cmds -= 2; /* correct num_cmds as there could be a retry */
 	kfree(vars);
+	if (is_replayable_error(rc) &&
+	    smb2_should_replay(tcon, &retries, &cur_sleep))
+		goto replay_again;
+	if (cfile)
+		cifsFileInfo_put(cfile);
 	return rc;
 }

fs/smb/client/smb2ops.c+127−14

 {
 	struct smb2_compound_vars *vars;
 	struct cifs_ses *ses = tcon->ses;
-	struct TCP_Server_Info *server = cifs_pick_channel(ses);
+	struct TCP_Server_Info *server;
 	struct smb_rqst *rqst;
 	struct kvec *rsp_iov;
 	__le16 *utf16_path = NULL;
 	struct smb2_file_full_ea_info *ea = NULL;
 	struct smb2_query_info_rsp *rsp;
 	int rc, used_len = 0;
+	int retries = 0, cur_sleep = 1;
+replay_again:
+	/* reinitialize for possible replay */
+	flags = CIFS_CP_CREATE_CLOSE_OP;
+	oplock = SMB2_OPLOCK_LEVEL_NONE;
+	server = cifs_pick_channel(ses);
 	if (smb3_encryption_required(tcon))
 		flags |= CIFS_TRANSFORM_REQ;
 		goto sea_exit;
 	smb2_set_related(&rqst[2]);
+	if (retries) {
+		smb2_set_replay(server, &rqst[0]);
+		smb2_set_replay(server, &rqst[1]);
+		smb2_set_replay(server, &rqst[2]);
+	}
 	rc = compound_send_recv(xid, ses, server,
 				flags, 3, rqst,
 				resp_buftype, rsp_iov);
 	kfree(vars);
 out_free_path:
 	kfree(utf16_path);
+	if (is_replayable_error(rc) &&
+	    smb2_should_replay(tcon, &retries, &cur_sleep))
+		goto replay_again;
 	return rc;
 }
 #endif
 	struct smb_rqst *rqst;
 	struct kvec *rsp_iov;
 	struct cifs_ses *ses = tcon->ses;
-	struct TCP_Server_Info *server = cifs_pick_channel(ses);
+	struct TCP_Server_Info *server;
 	char __user *arg = (char __user *)p;
 	struct smb_query_info qi;
 	struct smb_query_info __user *pqi;
 	void *data[2];
 	int create_options = is_dir ? CREATE_NOT_FILE : CREATE_NOT_DIR;
 	void (*free_req1_func)(struct smb_rqst *r);
+	int retries = 0, cur_sleep = 1;
+replay_again:
+	/* reinitialize for possible replay */
+	flags = CIFS_CP_CREATE_CLOSE_OP;
+	oplock = SMB2_OPLOCK_LEVEL_NONE;
+	server = cifs_pick_channel(ses);
 	vars = kzalloc(sizeof(*vars), GFP_ATOMIC);
 	if (vars == NULL)
 		goto free_req_1;
 	smb2_set_related(&rqst[2]);
+	if (retries) {
+		smb2_set_replay(server, &rqst[0]);
+		smb2_set_replay(server, &rqst[1]);
+		smb2_set_replay(server, &rqst[2]);
+	}
 	rc = compound_send_recv(xid, ses, server,
 				flags, 3, rqst,
 				resp_buftype, rsp_iov);
 	kfree(buffer);
 free_vars:
 	kfree(vars);
+	if (is_replayable_error(rc) &&
+	    smb2_should_replay(tcon, &retries, &cur_sleep))
+		goto replay_again;
 	return rc;
 }
 	struct cifs_open_parms oparms;
 	struct smb2_query_directory_rsp *qd_rsp = NULL;
 	struct smb2_create_rsp *op_rsp = NULL;
-	struct TCP_Server_Info *server = cifs_pick_channel(tcon->ses);
+	struct TCP_Server_Info *server;
-	int retry_count = 0;
+	int retries = 0, cur_sleep = 1;
+replay_again:
+	/* reinitialize for possible replay */
+	flags = 0;
+	oplock = SMB2_OPLOCK_LEVEL_NONE;
+	server = cifs_pick_channel(tcon->ses);
 	utf16_path = cifs_convert_path_to_utf16(path, cifs_sb);
 	if (!utf16_path)
 	smb2_set_related(&rqst[1]);
-again:
+	if (retries) {
+		smb2_set_replay(server, &rqst[0]);
+		smb2_set_replay(server, &rqst[1]);
+	}
 	rc = compound_send_recv(xid, tcon->ses, server,
 				flags, 2, rqst,
 				resp_buftype, rsp_iov);
-	if (rc == -EAGAIN && retry_count++ < 10)
-		goto again;
 	/* If the open failed there is nothing to do */
 	op_rsp = (struct smb2_create_rsp *)rsp_iov[0].iov_base;
 	if (op_rsp == NULL || op_rsp->hdr.Status != STATUS_SUCCESS) {
 	SMB2_query_directory_free(&rqst[1]);
 	free_rsp_buf(resp_buftype[0], rsp_iov[0].iov_base);
 	free_rsp_buf(resp_buftype[1], rsp_iov[1].iov_base);
+	if (is_replayable_error(rc) &&
+	    smb2_should_replay(tcon, &retries, &cur_sleep))
+		goto replay_again;
 	return rc;
 }
 				 CIFS_CACHE_READ(cinode) ? 1 : 0);
 }
+void
+smb2_set_replay(struct TCP_Server_Info *server, struct smb_rqst *rqst)
+{
+	struct smb2_hdr *shdr;
+	if (server->dialect < SMB30_PROT_ID)
+		return;
+	shdr = (struct smb2_hdr *)(rqst->rq_iov[0].iov_base);
+	if (shdr == NULL) {
+		cifs_dbg(FYI, "shdr NULL in smb2_set_related\n");
+		return;
+	}
+	shdr->Flags |= SMB2_FLAGS_REPLAY_OPERATION;
+}
 void
 smb2_set_related(struct smb_rqst *rqst)
 {
 	shdr->NextCommand = cpu_to_le32(len);
 }
+/*
+ * helper function for exponential backoff and check if replayable
+ */
+bool smb2_should_replay(struct cifs_tcon *tcon,
+				int *pretries,
+				int *pcur_sleep)
+{
+	if (!pretries || !pcur_sleep)
+		return false;
+	if (tcon->retry || (*pretries)++ < tcon->ses->server->retrans) {
+		msleep(*pcur_sleep);
+		(*pcur_sleep) = ((*pcur_sleep) << 1);
+		if ((*pcur_sleep) > CIFS_MAX_SLEEP)
+			(*pcur_sleep) = CIFS_MAX_SLEEP;
+		return true;
+	}
+	return false;
+}
 /*
  * Passes the query info response back to the caller on success.
  * Caller need to free this with free_rsp_buf().
 {
 	struct smb2_compound_vars *vars;
 	struct cifs_ses *ses = tcon->ses;
-	struct TCP_Server_Info *server = cifs_pick_channel(ses);
+	struct TCP_Server_Info *server;
 	int flags = CIFS_CP_CREATE_CLOSE_OP;
 	struct smb_rqst *rqst;
 	int resp_buftype[3];
 	int rc;
 	__le16 *utf16_path;
 	struct cached_fid *cfid = NULL;
+	int retries = 0, cur_sleep = 1;
+replay_again:
+	/* reinitialize for possible replay */
+	flags = CIFS_CP_CREATE_CLOSE_OP;
+	oplock = SMB2_OPLOCK_LEVEL_NONE;
+	server = cifs_pick_channel(ses);
 	if (!path)
 		path = "";
 		goto qic_exit;
 	smb2_set_related(&rqst[2]);
+	if (retries) {
+		if (!cfid) {
+			smb2_set_replay(server, &rqst[0]);
+			smb2_set_replay(server, &rqst[2]);
+		}
+		smb2_set_replay(server, &rqst[1]);
+	}
 	if (cfid) {
 		rc = compound_send_recv(xid, ses, server,
 					flags, 1, &rqst[1],
 	kfree(vars);
 out_free_path:
 	kfree(utf16_path);
+	if (is_replayable_error(rc) &&
+	    smb2_should_replay(tcon, &retries, &cur_sleep))
+		goto replay_again;
 	return rc;
 }
 				  cfile->fid.volatile_fid, cfile->pid, new_size);
 		if (rc >= 0) {
 			truncate_setsize(inode, new_size);
+			netfs_resize_file(&cifsi->netfs, new_size, true);
+			if (offset < cifsi->netfs.zero_point)
+				cifsi->netfs.zero_point = offset;
 			fscache_resize_cookie(cifs_inode_cookie(inode), new_size);
 		}
 	}
 		rc = SMB2_set_eof(xid, tcon, cfile->fid.persistent_fid,
 				  cfile->fid.volatile_fid, cfile->pid, new_eof);
 		if (rc == 0) {
-			cifsi->server_eof = new_eof;
+			netfs_resize_file(&cifsi->netfs, new_eof, true);
 			cifs_setsize(inode, new_eof);
 			cifs_truncate_page(inode->i_mapping, inode->i_size);
 			truncate_setsize(inode, new_eof);
 	int rc;
 	unsigned int xid;
 	struct inode *inode = file_inode(file);
-	struct cifsFileInfo *cfile = file->private_data;
 	struct cifsInodeInfo *cifsi = CIFS_I(inode);
+	struct cifsFileInfo *cfile = file->private_data;
+	struct netfs_inode *ictx = &cifsi->netfs;
 	loff_t old_eof, new_eof;
 	xid = get_xid();
 		goto out_2;
 	truncate_pagecache_range(inode, off, old_eof);
+	ictx->zero_point = old_eof;
 	rc = smb2_copychunk_range(xid, cfile, cfile, off + len,
 				  old_eof - off - len, off);
 	rc = 0;
-	cifsi->server_eof = i_size_read(inode) - len;
+	truncate_setsize(inode, new_eof);
-	truncate_setsize(inode, cifsi->server_eof);
+	netfs_resize_file(&cifsi->netfs, new_eof, true);
-	fscache_resize_cookie(cifs_inode_cookie(inode), cifsi->server_eof);
+	ictx->zero_point = new_eof;
+	fscache_resize_cookie(cifs_inode_cookie(inode), new_eof);
 out_2:
 	filemap_invalidate_unlock(inode->i_mapping);
  out:
 	unsigned int xid;
 	struct cifsFileInfo *cfile = file->private_data;
 	struct inode *inode = file_inode(file);
+	struct cifsInodeInfo *cifsi = CIFS_I(inode);
 	__u64 count, old_eof, new_eof;
 	xid = get_xid();
 		goto out_2;
 	truncate_setsize(inode, new_eof);
+	netfs_resize_file(&cifsi->netfs, i_size_read(inode), true);
 	fscache_resize_cookie(cifs_inode_cookie(inode), i_size_read(inode));
 	rc = smb2_copychunk_range(xid, cfile, cfile, off, count, off + len);

fs/smb/client/smb2pdu.c+237−28

@@ -195,7 +195,6 @@ cifs_chan_skip_or_disable(struct cifs_ses *ses, · 194 unmodified lines
195	pserver = server->primary_server;	195	pserver = server->primary_server;
196	cifs_signal_cifsd_for_reconnect(pserver, false);	196	cifs_signal_cifsd_for_reconnect(pserver, false);
197	skip_terminate:	197	skip_terminate:
198	mutex_unlock(&ses->session_mutex);
199	return -EHOSTDOWN;	198	return -EHOSTDOWN;
200	}	199	}
201		200
@@ -2765,7 +2764,14 @@ int smb311_posix_mkdir(const unsigned int xid, struct inode *inode, · 2563 unmodified lines
2765	int flags = 0;	2764	int flags = 0;
2766	unsigned int total_len;	2765	unsigned int total_len;
2767	__le16 *utf16_path = NULL;	2766	__le16 *utf16_path = NULL;
2768	struct TCP_Server_Info *server = cifs_pick_channel(ses);	2767	struct TCP_Server_Info *server;
		2768	int retries = 0, cur_sleep = 1;
		2769
		2770	replay_again:
		2771	/* reinitialize for possible replay */
		2772	flags = 0;
		2773	n_iov = 2;
		2774	server = cifs_pick_channel(ses);
2769		2775
2770	cifs_dbg(FYI, "mkdir\n");	2776	cifs_dbg(FYI, "mkdir\n");
2771		2777
@@ -2869,6 +2875,10 @@ int smb311_posix_mkdir(const unsigned int xid, struct inode *inode, · 97 unmodified lines
2869	/* no need to inc num_remote_opens because we close it just below */	2875	/* no need to inc num_remote_opens because we close it just below */
2870	trace_smb3_posix_mkdir_enter(xid, tcon->tid, ses->Suid, full_path, CREATE_NOT_FILE,	2876	trace_smb3_posix_mkdir_enter(xid, tcon->tid, ses->Suid, full_path, CREATE_NOT_FILE,
2871	FILE_WRITE_ATTRIBUTES);	2877	FILE_WRITE_ATTRIBUTES);
		2878
		2879	if (retries)
		2880	smb2_set_replay(server, &rqst);
		2881
2872	/* resource #4: response buffer */	2882	/* resource #4: response buffer */
2873	rc = cifs_send_recv(xid, ses, server,	2883	rc = cifs_send_recv(xid, ses, server,
2874	&rqst, &resp_buftype, flags, &rsp_iov);	2884	&rqst, &resp_buftype, flags, &rsp_iov);
@@ -2906,6 +2916,11 @@ err_free_req: · 31 unmodified lines
2906	cifs_small_buf_release(req);	2916	cifs_small_buf_release(req);
2907	err_free_path:	2917	err_free_path:
2908	kfree(utf16_path);	2918	kfree(utf16_path);
		2919
		2920	if (is_replayable_error(rc) &&
		2921	smb2_should_replay(tcon, &retries, &cur_sleep))
		2922	goto replay_again;
		2923
2909	return rc;	2924	return rc;
2910	}	2925	}
2911		2926
@@ -3101,12 +3116,18 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms oparms, __le16 path, · 189 unmodified lines
3101	struct smb2_create_rsp *rsp = NULL;	3116	struct smb2_create_rsp *rsp = NULL;
3102	struct cifs_tcon *tcon = oparms->tcon;	3117	struct cifs_tcon *tcon = oparms->tcon;
3103	struct cifs_ses *ses = tcon->ses;	3118	struct cifs_ses *ses = tcon->ses;
3104	struct TCP_Server_Info *server = cifs_pick_channel(ses);	3119	struct TCP_Server_Info *server;
3105	struct kvec iov[SMB2_CREATE_IOV_SIZE];	3120	struct kvec iov[SMB2_CREATE_IOV_SIZE];
3106	struct kvec rsp_iov = {NULL, 0};	3121	struct kvec rsp_iov = {NULL, 0};
3107	int resp_buftype = CIFS_NO_BUFFER;	3122	int resp_buftype = CIFS_NO_BUFFER;
3108	int rc = 0;	3123	int rc = 0;
3109	int flags = 0;	3124	int flags = 0;
		3125	int retries = 0, cur_sleep = 1;
		3126
		3127	replay_again:
		3128	/* reinitialize for possible replay */
		3129	flags = 0;
		3130	server = cifs_pick_channel(ses);
3110		3131
3111	cifs_dbg(FYI, "create/open\n");	3132	cifs_dbg(FYI, "create/open\n");
3112	if (!ses \|\| !server)	3133	if (!ses \|\| !server)
@@ -3128,6 +3149,9 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms oparms, __le16 path, · 15 unmodified lines
3128	trace_smb3_open_enter(xid, tcon->tid, tcon->ses->Suid, oparms->path,	3149	trace_smb3_open_enter(xid, tcon->tid, tcon->ses->Suid, oparms->path,
3129	oparms->create_options, oparms->desired_access);	3150	oparms->create_options, oparms->desired_access);
3130		3151
		3152	if (retries)
		3153	smb2_set_replay(server, &rqst);
		3154
3131	rc = cifs_send_recv(xid, ses, server,	3155	rc = cifs_send_recv(xid, ses, server,
3132	&rqst, &resp_buftype, flags,	3156	&rqst, &resp_buftype, flags,
3133	&rsp_iov);	3157	&rsp_iov);
@@ -3181,6 +3205,11 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms oparms, __le16 path, · 47 unmodified lines
3181	creat_exit:	3205	creat_exit:
3182	SMB2_open_free(&rqst);	3206	SMB2_open_free(&rqst);
3183	free_rsp_buf(resp_buftype, rsp);	3207	free_rsp_buf(resp_buftype, rsp);
		3208
		3209	if (is_replayable_error(rc) &&
		3210	smb2_should_replay(tcon, &retries, &cur_sleep))
		3211	goto replay_again;
		3212
3184	return rc;	3213	return rc;
3185	}	3214	}
3186		3215
@@ -3305,15 +3334,7 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, · 118 unmodified lines
3305	int resp_buftype = CIFS_NO_BUFFER;	3334	int resp_buftype = CIFS_NO_BUFFER;
3306	int rc = 0;	3335	int rc = 0;
3307	int flags = 0;	3336	int flags = 0;
3308		3337	int retries = 0, cur_sleep = 1;
3309	cifs_dbg(FYI, "SMB2 IOCTL\n");
3310
3311	if (out_data != NULL)
3312	*out_data = NULL;
3313
3314	/* zero out returned data len, in case of error */
3315	if (plen)
3316	*plen = 0;
3317		3338
3318	if (!tcon)	3339	if (!tcon)
3319	return -EIO;	3340	return -EIO;
@@ -3322,10 +3343,23 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, · 2 unmodified lines
3322	if (!ses)	3343	if (!ses)
3323	return -EIO;	3344	return -EIO;
3324		3345
		3346	replay_again:
		3347	/* reinitialize for possible replay */
		3348	flags = 0;
3325	server = cifs_pick_channel(ses);	3349	server = cifs_pick_channel(ses);
		3350
3326	if (!server)	3351	if (!server)
3327	return -EIO;	3352	return -EIO;
3328		3353
		3354	cifs_dbg(FYI, "SMB2 IOCTL\n");
		3355
		3356	if (out_data != NULL)
		3357	*out_data = NULL;
		3358
		3359	/* zero out returned data len, in case of error */
		3360	if (plen)
		3361	*plen = 0;
		3362
3329	if (smb3_encryption_required(tcon))	3363	if (smb3_encryption_required(tcon))
3330	flags \|= CIFS_TRANSFORM_REQ;	3364	flags \|= CIFS_TRANSFORM_REQ;
3331		3365
@@ -3340,6 +3374,9 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, · 8 unmodified lines
3340	if (rc)	3374	if (rc)
3341	goto ioctl_exit;	3375	goto ioctl_exit;
3342		3376
		3377	if (retries)
		3378	smb2_set_replay(server, &rqst);
		3379
3343	rc = cifs_send_recv(xid, ses, server,	3380	rc = cifs_send_recv(xid, ses, server,
3344	&rqst, &resp_buftype, flags,	3381	&rqst, &resp_buftype, flags,
3345	&rsp_iov);	3382	&rsp_iov);
@@ -3409,6 +3446,11 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, · 63 unmodified lines
3409	ioctl_exit:	3446	ioctl_exit:
3410	SMB2_ioctl_free(&rqst);	3447	SMB2_ioctl_free(&rqst);
3411	free_rsp_buf(resp_buftype, rsp);	3448	free_rsp_buf(resp_buftype, rsp);
		3449
		3450	if (is_replayable_error(rc) &&
		3451	smb2_should_replay(tcon, &retries, &cur_sleep))
		3452	goto replay_again;
		3453
3412	return rc;	3454	return rc;
3413	}	3455	}
3414		3456
@@ -3480,13 +3522,20 @@ __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, · 65 unmodified lines
3480	struct smb_rqst rqst;	3522	struct smb_rqst rqst;
3481	struct smb2_close_rsp *rsp = NULL;	3523	struct smb2_close_rsp *rsp = NULL;
3482	struct cifs_ses *ses = tcon->ses;	3524	struct cifs_ses *ses = tcon->ses;
3483	struct TCP_Server_Info *server = cifs_pick_channel(ses);	3525	struct TCP_Server_Info *server;
3484	struct kvec iov[1];	3526	struct kvec iov[1];
3485	struct kvec rsp_iov;	3527	struct kvec rsp_iov;
3486	int resp_buftype = CIFS_NO_BUFFER;	3528	int resp_buftype = CIFS_NO_BUFFER;
3487	int rc = 0;	3529	int rc = 0;
3488	int flags = 0;	3530	int flags = 0;
3489	bool query_attrs = false;	3531	bool query_attrs = false;
		3532	int retries = 0, cur_sleep = 1;
		3533
		3534	replay_again:
		3535	/* reinitialize for possible replay */
		3536	flags = 0;
		3537	query_attrs = false;
		3538	server = cifs_pick_channel(ses);
3490		3539
3491	cifs_dbg(FYI, "Close\n");	3540	cifs_dbg(FYI, "Close\n");
3492		3541
@@ -3512,6 +3561,9 @@ __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, · 19 unmodified lines
3512	if (rc)	3561	if (rc)
3513	goto close_exit;	3562	goto close_exit;
3514		3563
		3564	if (retries)
		3565	smb2_set_replay(server, &rqst);
		3566
3515	rc = cifs_send_recv(xid, ses, server,	3567	rc = cifs_send_recv(xid, ses, server,
3516	&rqst, &resp_buftype, flags, &rsp_iov);	3568	&rqst, &resp_buftype, flags, &rsp_iov);
3517	rsp = (struct smb2_close_rsp *)rsp_iov.iov_base;	3569	rsp = (struct smb2_close_rsp *)rsp_iov.iov_base;
@@ -3545,6 +3597,11 @@ close_exit: · 27 unmodified lines
3545	cifs_dbg(VFS, "handle cancelled close fid 0x%llx returned error %d\n",	3597	cifs_dbg(VFS, "handle cancelled close fid 0x%llx returned error %d\n",
3546	persistent_fid, tmp_rc);	3598	persistent_fid, tmp_rc);
3547	}	3599	}
		3600
		3601	if (is_replayable_error(rc) &&
		3602	smb2_should_replay(tcon, &retries, &cur_sleep))
		3603	goto replay_again;
		3604
3548	return rc;	3605	return rc;
3549	}	3606	}
3550		3607
@@ -3675,12 +3732,19 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon, · 124 unmodified lines
3675	struct TCP_Server_Info *server;	3732	struct TCP_Server_Info *server;
3676	int flags = 0;	3733	int flags = 0;
3677	bool allocated = false;	3734	bool allocated = false;
		3735	int retries = 0, cur_sleep = 1;
3678		3736
3679	cifs_dbg(FYI, "Query Info\n");	3737	cifs_dbg(FYI, "Query Info\n");
3680		3738
3681	if (!ses)	3739	if (!ses)
3682	return -EIO;	3740	return -EIO;
		3741
		3742	replay_again:
		3743	/* reinitialize for possible replay */
		3744	flags = 0;
		3745	allocated = false;
3683	server = cifs_pick_channel(ses);	3746	server = cifs_pick_channel(ses);
		3747
3684	if (!server)	3748	if (!server)
3685	return -EIO;	3749	return -EIO;
3686		3750
@@ -3702,6 +3766,9 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon, · 15 unmodified lines
3702	trace_smb3_query_info_enter(xid, persistent_fid, tcon->tid,	3766	trace_smb3_query_info_enter(xid, persistent_fid, tcon->tid,
3703	ses->Suid, info_class, (__u32)info_type);	3767	ses->Suid, info_class, (__u32)info_type);
3704		3768
		3769	if (retries)
		3770	smb2_set_replay(server, &rqst);
		3771
3705	rc = cifs_send_recv(xid, ses, server,	3772	rc = cifs_send_recv(xid, ses, server,
3706	&rqst, &resp_buftype, flags, &rsp_iov);	3773	&rqst, &resp_buftype, flags, &rsp_iov);
3707	rsp = (struct smb2_query_info_rsp *)rsp_iov.iov_base;	3774	rsp = (struct smb2_query_info_rsp *)rsp_iov.iov_base;
@@ -3744,6 +3811,11 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon, · 36 unmodified lines
3744	qinf_exit:	3811	qinf_exit:
3745	SMB2_query_info_free(&rqst);	3812	SMB2_query_info_free(&rqst);
3746	free_rsp_buf(resp_buftype, rsp);	3813	free_rsp_buf(resp_buftype, rsp);
		3814
		3815	if (is_replayable_error(rc) &&
		3816	smb2_should_replay(tcon, &retries, &cur_sleep))
		3817	goto replay_again;
		3818
3747	return rc;	3819	return rc;
3748	}	3820	}
3749		3821
@@ -3844,7 +3916,7 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon, · 94 unmodified lines
3844	u32 plen / returned data len */)	3916	u32 plen / returned data len */)
3845	{	3917	{
3846	struct cifs_ses *ses = tcon->ses;	3918	struct cifs_ses *ses = tcon->ses;
3847	struct TCP_Server_Info *server = cifs_pick_channel(ses);	3919	struct TCP_Server_Info *server;
3848	struct smb_rqst rqst;	3920	struct smb_rqst rqst;
3849	struct smb2_change_notify_rsp *smb_rsp;	3921	struct smb2_change_notify_rsp *smb_rsp;
3850	struct kvec iov[1];	3922	struct kvec iov[1];
@@ -3852,6 +3924,12 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon, · 1 unmodified line
3852	int resp_buftype = CIFS_NO_BUFFER;	3924	int resp_buftype = CIFS_NO_BUFFER;
3853	int flags = 0;	3925	int flags = 0;
3854	int rc = 0;	3926	int rc = 0;
		3927	int retries = 0, cur_sleep = 1;
		3928
		3929	replay_again:
		3930	/* reinitialize for possible replay */
		3931	flags = 0;
		3932	server = cifs_pick_channel(ses);
3855		3933
3856	cifs_dbg(FYI, "change notify\n");	3934	cifs_dbg(FYI, "change notify\n");
3857	if (!ses \|\| !server)	3935	if (!ses \|\| !server)
@@ -3876,6 +3954,10 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon, · 18 unmodified lines
3876		3954
3877	trace_smb3_notify_enter(xid, persistent_fid, tcon->tid, ses->Suid,	3955	trace_smb3_notify_enter(xid, persistent_fid, tcon->tid, ses->Suid,
3878	(u8)watch_tree, completion_filter);	3956	(u8)watch_tree, completion_filter);
		3957
		3958	if (retries)
		3959	smb2_set_replay(server, &rqst);
		3960
3879	rc = cifs_send_recv(xid, ses, server,	3961	rc = cifs_send_recv(xid, ses, server,
3880	&rqst, &resp_buftype, flags, &rsp_iov);	3962	&rqst, &resp_buftype, flags, &rsp_iov);
3881		3963
@@ -3910,6 +3992,11 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon, · 28 unmodified lines
3910	if (rqst.rq_iov)	3992	if (rqst.rq_iov)
3911	cifs_small_buf_release(rqst.rq_iov[0].iov_base); /* request */	3993	cifs_small_buf_release(rqst.rq_iov[0].iov_base); /* request */
3912	free_rsp_buf(resp_buftype, rsp_iov.iov_base);	3994	free_rsp_buf(resp_buftype, rsp_iov.iov_base);
		3995
		3996	if (is_replayable_error(rc) &&
		3997	smb2_should_replay(tcon, &retries, &cur_sleep))
		3998	goto replay_again;
		3999
3913	return rc;	4000	return rc;
3914	}	4001	}
3915		4002
@@ -4152,10 +4239,16 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, · 236 unmodified lines
4152	struct smb_rqst rqst;	4239	struct smb_rqst rqst;
4153	struct kvec iov[1];	4240	struct kvec iov[1];
4154	struct kvec rsp_iov = {NULL, 0};	4241	struct kvec rsp_iov = {NULL, 0};
4155	struct TCP_Server_Info *server = cifs_pick_channel(ses);	4242	struct TCP_Server_Info *server;
4156	int resp_buftype = CIFS_NO_BUFFER;	4243	int resp_buftype = CIFS_NO_BUFFER;
4157	int flags = 0;	4244	int flags = 0;
4158	int rc = 0;	4245	int rc = 0;
		4246	int retries = 0, cur_sleep = 1;
		4247
		4248	replay_again:
		4249	/* reinitialize for possible replay */
		4250	flags = 0;
		4251	server = cifs_pick_channel(ses);
4159		4252
4160	cifs_dbg(FYI, "flush\n");	4253	cifs_dbg(FYI, "flush\n");
4161	if (!ses \|\| !(ses->server))	4254	if (!ses \|\| !(ses->server))
@@ -4175,6 +4268,10 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, · 13 unmodified lines
4175	goto flush_exit;	4268	goto flush_exit;
4176		4269
4177	trace_smb3_flush_enter(xid, persistent_fid, tcon->tid, ses->Suid);	4270	trace_smb3_flush_enter(xid, persistent_fid, tcon->tid, ses->Suid);
		4271
		4272	if (retries)
		4273	smb2_set_replay(server, &rqst);
		4274
4178	rc = cifs_send_recv(xid, ses, server,	4275	rc = cifs_send_recv(xid, ses, server,
4179	&rqst, &resp_buftype, flags, &rsp_iov);	4276	&rqst, &resp_buftype, flags, &rsp_iov);
4180		4277
@@ -4189,6 +4286,11 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, · 8 unmodified lines
4189	flush_exit:	4286	flush_exit:
4190	SMB2_flush_free(&rqst);	4287	SMB2_flush_free(&rqst);
4191	free_rsp_buf(resp_buftype, rsp_iov.iov_base);	4288	free_rsp_buf(resp_buftype, rsp_iov.iov_base);
		4289
		4290	if (is_replayable_error(rc) &&
		4291	smb2_should_replay(tcon, &retries, &cur_sleep))
		4292	goto replay_again;
		4293
4192	return rc;	4294	return rc;
4193	}	4295	}
4194		4296
@@ -4668,7 +4770,7 @@ smb2_async_writev(struct cifs_writedata *wdata, · 473 unmodified lines
4668	struct cifs_io_parms *io_parms = NULL;	4770	struct cifs_io_parms *io_parms = NULL;
4669	int credit_request;	4771	int credit_request;
4670		4772
4671	if (!wdata->server)	4773	if (!wdata->server \|\| wdata->replay)
4672	server = wdata->server = cifs_pick_channel(tcon->ses);	4774	server = wdata->server = cifs_pick_channel(tcon->ses);
4673		4775
4674	/*	4776	/*
@@ -4753,6 +4855,8 @@ smb2_async_writev(struct cifs_writedata *wdata, · 78 unmodified lines
4753	rqst.rq_nvec = 1;	4855	rqst.rq_nvec = 1;
4754	rqst.rq_iter = wdata->iter;	4856	rqst.rq_iter = wdata->iter;
4755	rqst.rq_iter_size = iov_iter_count(&rqst.rq_iter);	4857	rqst.rq_iter_size = iov_iter_count(&rqst.rq_iter);
		4858	if (wdata->replay)
		4859	smb2_set_replay(server, &rqst);
4756	#ifdef CONFIG_CIFS_SMB_DIRECT	4860	#ifdef CONFIG_CIFS_SMB_DIRECT
4757	if (wdata->mr)	4861	if (wdata->mr)
4758	iov[0].iov_len += sizeof(struct smbd_buffer_descriptor_v1);	4862	iov[0].iov_len += sizeof(struct smbd_buffer_descriptor_v1);
@@ -4826,18 +4930,21 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms, · 67 unmodified lines
4826	int flags = 0;	4930	int flags = 0;
4827	unsigned int total_len;	4931	unsigned int total_len;
4828	struct TCP_Server_Info *server;	4932	struct TCP_Server_Info *server;
		4933	int retries = 0, cur_sleep = 1;
4829		4934
		4935	replay_again:
		4936	/* reinitialize for possible replay */
		4937	flags = 0;
4830	*nbytes = 0;	4938	*nbytes = 0;
4831
4832	if (n_vec < 1)
4833	return rc;
4834
4835	if (!io_parms->server)	4939	if (!io_parms->server)
4836	io_parms->server = cifs_pick_channel(io_parms->tcon->ses);	4940	io_parms->server = cifs_pick_channel(io_parms->tcon->ses);
4837	server = io_parms->server;	4941	server = io_parms->server;
4838	if (server == NULL)	4942	if (server == NULL)
4839	return -ECONNABORTED;	4943	return -ECONNABORTED;
4840		4944
		4945	if (n_vec < 1)
		4946	return rc;
		4947
4841	rc = smb2_plain_req_init(SMB2_WRITE, io_parms->tcon, server,	4948	rc = smb2_plain_req_init(SMB2_WRITE, io_parms->tcon, server,
4842	(void **) &req, &total_len);	4949	(void **) &req, &total_len);
4843	if (rc)	4950	if (rc)
@@ -4871,6 +4978,9 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms, · 27 unmodified lines
4871	rqst.rq_iov = iov;	4978	rqst.rq_iov = iov;
4872	rqst.rq_nvec = n_vec + 1;	4979	rqst.rq_nvec = n_vec + 1;
4873		4980
		4981	if (retries)
		4982	smb2_set_replay(server, &rqst);
		4983
4874	rc = cifs_send_recv(xid, io_parms->tcon->ses, server,	4984	rc = cifs_send_recv(xid, io_parms->tcon->ses, server,
4875	&rqst,	4985	&rqst,
4876	&resp_buftype, flags, &rsp_iov);	4986	&resp_buftype, flags, &rsp_iov);
@@ -4895,6 +5005,11 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms, · 18 unmodified lines
4895		5005
4896	cifs_small_buf_release(req);	5006	cifs_small_buf_release(req);
4897	free_rsp_buf(resp_buftype, rsp);	5007	free_rsp_buf(resp_buftype, rsp);
		5008
		5009	if (is_replayable_error(rc) &&
		5010	smb2_should_replay(io_parms->tcon, &retries, &cur_sleep))
		5011	goto replay_again;
		5012
4898	return rc;	5013	return rc;
4899	}	5014	}
4900		5015
@@ -5206,8 +5321,14 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, · 305 unmodified lines
5206	struct kvec rsp_iov;	5321	struct kvec rsp_iov;
5207	int rc = 0;	5322	int rc = 0;
5208	struct cifs_ses *ses = tcon->ses;	5323	struct cifs_ses *ses = tcon->ses;
5209	struct TCP_Server_Info *server = cifs_pick_channel(ses);	5324	struct TCP_Server_Info *server;
5210	int flags = 0;	5325	int flags = 0;
		5326	int retries = 0, cur_sleep = 1;
		5327
		5328	replay_again:
		5329	/* reinitialize for possible replay */
		5330	flags = 0;
		5331	server = cifs_pick_channel(ses);
5211		5332
5212	if (!ses \|\| !(ses->server))	5333	if (!ses \|\| !(ses->server))
5213	return -EIO;	5334	return -EIO;
@@ -5227,6 +5348,9 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, · 13 unmodified lines
5227	if (rc)	5348	if (rc)
5228	goto qdir_exit;	5349	goto qdir_exit;
5229		5350
		5351	if (retries)
		5352	smb2_set_replay(server, &rqst);
		5353
5230	rc = cifs_send_recv(xid, ses, server,	5354	rc = cifs_send_recv(xid, ses, server,
5231	&rqst, &resp_buftype, flags, &rsp_iov);	5355	&rqst, &resp_buftype, flags, &rsp_iov);
5232	rsp = (struct smb2_query_directory_rsp *)rsp_iov.iov_base;	5356	rsp = (struct smb2_query_directory_rsp *)rsp_iov.iov_base;
@@ -5261,6 +5385,11 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, · 28 unmodified lines
5261	qdir_exit:	5385	qdir_exit:
5262	SMB2_query_directory_free(&rqst);	5386	SMB2_query_directory_free(&rqst);
5263	free_rsp_buf(resp_buftype, rsp);	5387	free_rsp_buf(resp_buftype, rsp);
		5388
		5389	if (is_replayable_error(rc) &&
		5390	smb2_should_replay(tcon, &retries, &cur_sleep))
		5391	goto replay_again;
		5392
5264	return rc;	5393	return rc;
5265	}	5394	}
5266		5395
@@ -5327,8 +5456,14 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon, · 60 unmodified lines
5327	int rc = 0;	5456	int rc = 0;
5328	int resp_buftype;	5457	int resp_buftype;
5329	struct cifs_ses *ses = tcon->ses;	5458	struct cifs_ses *ses = tcon->ses;
5330	struct TCP_Server_Info *server = cifs_pick_channel(ses);	5459	struct TCP_Server_Info *server;
5331	int flags = 0;	5460	int flags = 0;
		5461	int retries = 0, cur_sleep = 1;
		5462
		5463	replay_again:
		5464	/* reinitialize for possible replay */
		5465	flags = 0;
		5466	server = cifs_pick_channel(ses);
5332		5467
5333	if (!ses \|\| !server)	5468	if (!ses \|\| !server)
5334	return -EIO;	5469	return -EIO;
@@ -5356,6 +5491,8 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon, · 21 unmodified lines
5356	return rc;	5491	return rc;
5357	}	5492	}
5358		5493
		5494	if (retries)
		5495	smb2_set_replay(server, &rqst);
5359		5496
5360	rc = cifs_send_recv(xid, ses, server,	5497	rc = cifs_send_recv(xid, ses, server,
5361	&rqst, &resp_buftype, flags,	5498	&rqst, &resp_buftype, flags,
@@ -5371,6 +5508,11 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon, · 9 unmodified lines
5371		5508
5372	free_rsp_buf(resp_buftype, rsp);	5509	free_rsp_buf(resp_buftype, rsp);
5373	kfree(iov);	5510	kfree(iov);
		5511
		5512	if (is_replayable_error(rc) &&
		5513	smb2_should_replay(tcon, &retries, &cur_sleep))
		5514	goto replay_again;
		5515
5374	return rc;	5516	return rc;
5375	}	5517	}
5376		5518
@@ -5423,12 +5565,18 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon, · 46 unmodified lines
5423	int rc;	5565	int rc;
5424	struct smb2_oplock_break *req = NULL;	5566	struct smb2_oplock_break *req = NULL;
5425	struct cifs_ses *ses = tcon->ses;	5567	struct cifs_ses *ses = tcon->ses;
5426	struct TCP_Server_Info *server = cifs_pick_channel(ses);	5568	struct TCP_Server_Info *server;
5427	int flags = CIFS_OBREAK_OP;	5569	int flags = CIFS_OBREAK_OP;
5428	unsigned int total_len;	5570	unsigned int total_len;
5429	struct kvec iov[1];	5571	struct kvec iov[1];
5430	struct kvec rsp_iov;	5572	struct kvec rsp_iov;
5431	int resp_buf_type;	5573	int resp_buf_type;
		5574	int retries = 0, cur_sleep = 1;
		5575
		5576	replay_again:
		5577	/* reinitialize for possible replay */
		5578	flags = CIFS_OBREAK_OP;
		5579	server = cifs_pick_channel(ses);
5432		5580
5433	cifs_dbg(FYI, "SMB2_oplock_break\n");	5581	cifs_dbg(FYI, "SMB2_oplock_break\n");
5434	rc = smb2_plain_req_init(SMB2_OPLOCK_BREAK, tcon, server,	5582	rc = smb2_plain_req_init(SMB2_OPLOCK_BREAK, tcon, server,
@@ -5453,15 +5601,21 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon, · 18 unmodified lines
5453	rqst.rq_iov = iov;	5601	rqst.rq_iov = iov;
5454	rqst.rq_nvec = 1;	5602	rqst.rq_nvec = 1;
5455		5603
		5604	if (retries)
		5605	smb2_set_replay(server, &rqst);
		5606
5456	rc = cifs_send_recv(xid, ses, server,	5607	rc = cifs_send_recv(xid, ses, server,
5457	&rqst, &resp_buf_type, flags, &rsp_iov);	5608	&rqst, &resp_buf_type, flags, &rsp_iov);
5458	cifs_small_buf_release(req);	5609	cifs_small_buf_release(req);
5459
5460	if (rc) {	5610	if (rc) {
5461	cifs_stats_fail_inc(tcon, SMB2_OPLOCK_BREAK_HE);	5611	cifs_stats_fail_inc(tcon, SMB2_OPLOCK_BREAK_HE);
5462	cifs_dbg(FYI, "Send error in Oplock Break = %d\n", rc);	5612	cifs_dbg(FYI, "Send error in Oplock Break = %d\n", rc);
5463	}	5613	}
5464		5614
		5615	if (is_replayable_error(rc) &&
		5616	smb2_should_replay(tcon, &retries, &cur_sleep))
		5617	goto replay_again;
		5618
5465	return rc;	5619	return rc;
5466	}	5620	}
5467		5621
@@ -5547,9 +5701,15 @@ SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon, · 79 unmodified lines
5547	int rc = 0;	5701	int rc = 0;
5548	int resp_buftype;	5702	int resp_buftype;
5549	struct cifs_ses *ses = tcon->ses;	5703	struct cifs_ses *ses = tcon->ses;
5550	struct TCP_Server_Info *server = cifs_pick_channel(ses);	5704	struct TCP_Server_Info *server;
5551	FILE_SYSTEM_POSIX_INFO *info = NULL;	5705	FILE_SYSTEM_POSIX_INFO *info = NULL;
5552	int flags = 0;	5706	int flags = 0;
		5707	int retries = 0, cur_sleep = 1;
		5708
		5709	replay_again:
		5710	/* reinitialize for possible replay */
		5711	flags = 0;
		5712	server = cifs_pick_channel(ses);
5553		5713
5554	rc = build_qfs_info_req(&iov, tcon, server,	5714	rc = build_qfs_info_req(&iov, tcon, server,
5555	FS_POSIX_INFORMATION,	5715	FS_POSIX_INFORMATION,
@@ -5565,6 +5725,9 @@ SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon, · 9 unmodified lines
5565	rqst.rq_iov = &iov;	5725	rqst.rq_iov = &iov;
5566	rqst.rq_nvec = 1;	5726	rqst.rq_nvec = 1;
5567		5727
		5728	if (retries)
		5729	smb2_set_replay(server, &rqst);
		5730
5568	rc = cifs_send_recv(xid, ses, server,	5731	rc = cifs_send_recv(xid, ses, server,
5569	&rqst, &resp_buftype, flags, &rsp_iov);	5732	&rqst, &resp_buftype, flags, &rsp_iov);
5570	free_qfs_info_req(&iov);	5733	free_qfs_info_req(&iov);
@@ -5584,6 +5747,11 @@ SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon, · 13 unmodified lines
5584		5747
5585	posix_qfsinf_exit:	5748	posix_qfsinf_exit:
5586	free_rsp_buf(resp_buftype, rsp_iov.iov_base);	5749	free_rsp_buf(resp_buftype, rsp_iov.iov_base);
		5750
		5751	if (is_replayable_error(rc) &&
		5752	smb2_should_replay(tcon, &retries, &cur_sleep))
		5753	goto replay_again;
		5754
5587	return rc;	5755	return rc;
5588	}	5756	}
5589		5757
@@ -5598,9 +5766,15 @@ SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon, · 8 unmodified lines
5598	int rc = 0;	5766	int rc = 0;
5599	int resp_buftype;	5767	int resp_buftype;
5600	struct cifs_ses *ses = tcon->ses;	5768	struct cifs_ses *ses = tcon->ses;
5601	struct TCP_Server_Info *server = cifs_pick_channel(ses);	5769	struct TCP_Server_Info *server;
5602	struct smb2_fs_full_size_info *info = NULL;	5770	struct smb2_fs_full_size_info *info = NULL;
5603	int flags = 0;	5771	int flags = 0;
		5772	int retries = 0, cur_sleep = 1;
		5773
		5774	replay_again:
		5775	/* reinitialize for possible replay */
		5776	flags = 0;
		5777	server = cifs_pick_channel(ses);
5604		5778
5605	rc = build_qfs_info_req(&iov, tcon, server,	5779	rc = build_qfs_info_req(&iov, tcon, server,
5606	FS_FULL_SIZE_INFORMATION,	5780	FS_FULL_SIZE_INFORMATION,
@@ -5616,6 +5790,9 @@ SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon, · 9 unmodified lines
5616	rqst.rq_iov = &iov;	5790	rqst.rq_iov = &iov;
5617	rqst.rq_nvec = 1;	5791	rqst.rq_nvec = 1;
5618		5792
		5793	if (retries)
		5794	smb2_set_replay(server, &rqst);
		5795
5619	rc = cifs_send_recv(xid, ses, server,	5796	rc = cifs_send_recv(xid, ses, server,
5620	&rqst, &resp_buftype, flags, &rsp_iov);	5797	&rqst, &resp_buftype, flags, &rsp_iov);
5621	free_qfs_info_req(&iov);	5798	free_qfs_info_req(&iov);
@@ -5635,6 +5812,11 @@ SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon, · 13 unmodified lines
5635		5812
5636	qfsinf_exit:	5813	qfsinf_exit:
5637	free_rsp_buf(resp_buftype, rsp_iov.iov_base);	5814	free_rsp_buf(resp_buftype, rsp_iov.iov_base);
		5815
		5816	if (is_replayable_error(rc) &&
		5817	smb2_should_replay(tcon, &retries, &cur_sleep))
		5818	goto replay_again;
		5819
5638	return rc;	5820	return rc;
5639	}	5821	}
5640		5822
@@ -5649,9 +5831,15 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon, · 8 unmodified lines
5649	int rc = 0;	5831	int rc = 0;
5650	int resp_buftype, max_len, min_len;	5832	int resp_buftype, max_len, min_len;
5651	struct cifs_ses *ses = tcon->ses;	5833	struct cifs_ses *ses = tcon->ses;
5652	struct TCP_Server_Info *server = cifs_pick_channel(ses);	5834	struct TCP_Server_Info *server;
5653	unsigned int rsp_len, offset;	5835	unsigned int rsp_len, offset;
5654	int flags = 0;	5836	int flags = 0;
		5837	int retries = 0, cur_sleep = 1;
		5838
		5839	replay_again:
		5840	/* reinitialize for possible replay */
		5841	flags = 0;
		5842	server = cifs_pick_channel(ses);
5655		5843
5656	if (level == FS_DEVICE_INFORMATION) {	5844	if (level == FS_DEVICE_INFORMATION) {
5657	max_len = sizeof(FILE_SYSTEM_DEVICE_INFO);	5845	max_len = sizeof(FILE_SYSTEM_DEVICE_INFO);
@@ -5683,6 +5871,9 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon, · 25 unmodified lines
5683	rqst.rq_iov = &iov;	5871	rqst.rq_iov = &iov;
5684	rqst.rq_nvec = 1;	5872	rqst.rq_nvec = 1;
5685		5873
		5874	if (retries)
		5875	smb2_set_replay(server, &rqst);
		5876
5686	rc = cifs_send_recv(xid, ses, server,	5877	rc = cifs_send_recv(xid, ses, server,
5687	&rqst, &resp_buftype, flags, &rsp_iov);	5878	&rqst, &resp_buftype, flags, &rsp_iov);
5688	free_qfs_info_req(&iov);	5879	free_qfs_info_req(&iov);
@@ -5720,6 +5911,11 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon, · 31 unmodified lines
5720		5911
5721	qfsattr_exit:	5912	qfsattr_exit:
5722	free_rsp_buf(resp_buftype, rsp_iov.iov_base);	5913	free_rsp_buf(resp_buftype, rsp_iov.iov_base);
		5914
		5915	if (is_replayable_error(rc) &&
		5916	smb2_should_replay(tcon, &retries, &cur_sleep))
		5917	goto replay_again;
		5918
5723	return rc;	5919	return rc;
5724	}	5920	}
5725		5921
@@ -5737,7 +5933,13 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon, · 11 unmodified lines
5737	unsigned int count;	5933	unsigned int count;
5738	int flags = CIFS_NO_RSP_BUF;	5934	int flags = CIFS_NO_RSP_BUF;
5739	unsigned int total_len;	5935	unsigned int total_len;
5740	struct TCP_Server_Info *server = cifs_pick_channel(tcon->ses);	5936	struct TCP_Server_Info *server;
		5937	int retries = 0, cur_sleep = 1;
		5938
		5939	replay_again:
		5940	/* reinitialize for possible replay */
		5941	flags = CIFS_NO_RSP_BUF;
		5942	server = cifs_pick_channel(tcon->ses);
5741		5943
5742	cifs_dbg(FYI, "smb2_lockv num lock %d\n", num_lock);	5944	cifs_dbg(FYI, "smb2_lockv num lock %d\n", num_lock);
5743		5945
@@ -5768,6 +5970,9 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon, · 24 unmodified lines
5768	rqst.rq_iov = iov;	5970	rqst.rq_iov = iov;
5769	rqst.rq_nvec = 2;	5971	rqst.rq_nvec = 2;
5770		5972
		5973	if (retries)
		5974	smb2_set_replay(server, &rqst);
		5975
5771	rc = cifs_send_recv(xid, tcon->ses, server,	5976	rc = cifs_send_recv(xid, tcon->ses, server,
5772	&rqst, &resp_buf_type, flags,	5977	&rqst, &resp_buf_type, flags,
5773	&rsp_iov);	5978	&rsp_iov);
@@ -5779,6 +5984,10 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon, · 5 unmodified lines
5779	tcon->ses->Suid, rc);	5984	tcon->ses->Suid, rc);
5780	}	5985	}
5781		5986
		5987	if (is_replayable_error(rc) &&
		5988	smb2_should_replay(tcon, &retries, &cur_sleep))
		5989	goto replay_again;
		5990
5782	return rc;	5991	return rc;
5783	}	5992	}
5784		5993

fs/smb/client/smb2proto.h+5−0

 extern void smb2_set_next_command(struct cifs_tcon *tcon,
 				  struct smb_rqst *rqst);
 extern void smb2_set_related(struct smb_rqst *rqst);
+extern void smb2_set_replay(struct TCP_Server_Info *server,
+			    struct smb_rqst *rqst);
+extern bool smb2_should_replay(struct cifs_tcon *tcon,
+			  int *pretries,
+			  int *pcur_sleep);
 /*
  * SMB2 Worker functions - most of protocol specific implementation details

fs/smb/client/smbencrypt.c+0−7

@@ -26,13 +26,6 @@ · 25 unmodified lines
26	#include "cifsproto.h"	26	#include "cifsproto.h"
27	#include "../common/md4.h"	27	#include "../common/md4.h"
28		28
29	#ifndef false
30	#define false 0
31	#endif
32	#ifndef true
33	#define true 1
34	#endif
35
36	/* following came from the other byteorder.h to avoid include conflicts */	29	/* following came from the other byteorder.h to avoid include conflicts */
37	#define CVAL(buf,pos) (((unsigned char *)(buf))[pos])	30	#define CVAL(buf,pos) (((unsigned char *)(buf))[pos])
38	#define SSVALX(buf,pos,val) (CVAL(buf,pos)=(val)&0xFF,CVAL(buf,pos+1)=(val)>>8)	31	#define SSVALX(buf,pos,val) (CVAL(buf,pos)=(val)&0xFF,CVAL(buf,pos+1)=(val)>>8)

fs/smb/client/transport.c+12−2

 						  server->conn_id, server->hostname);
 	}
 smbd_done:
-	if (rc < 0 && rc != -EINTR)
+	/*
+	 * there's hardly any use for the layers above to know the
+	 * actual error code here. All they should do at this point is
+	 * to retry the connection and hope it goes away.
+	 */
+	if (rc < 0 && rc != -EINTR && rc != -EAGAIN) {
 		cifs_server_dbg(VFS, "Error %d sending data on socket to server\n",
 			 rc);
-	else if (rc > 0)
+		rc = -ECONNABORTED;
+		cifs_signal_cifsd_for_reconnect(server, false);
+	} else if (rc > 0)
 		rc = 0;
 out:
 	cifs_in_send_dec(server);
 		if (!server || server->terminate)
 			continue;
+		if (CIFS_CHAN_NEEDS_RECONNECT(ses, i))
+			continue;
 		/*
 		 * strictly speaking, we should pick up req_lock to read
 		 * server->in_flight. But it shouldn't matter much here if we

fs/smb/server/ksmbd_netlink.h+2−1

@@ -304,7 +304,8 @@ enum ksmbd_event { · 303 unmodified lines
304	KSMBD_EVENT_SPNEGO_AUTHEN_REQUEST,	304	KSMBD_EVENT_SPNEGO_AUTHEN_REQUEST,
305	KSMBD_EVENT_SPNEGO_AUTHEN_RESPONSE = 15,	305	KSMBD_EVENT_SPNEGO_AUTHEN_RESPONSE = 15,
306		306
307	KSMBD_EVENT_MAX	307	__KSMBD_EVENT_MAX,
		308	KSMBD_EVENT_MAX = __KSMBD_EVENT_MAX - 1
308	};	309	};
309		310
310	/*	311	/*

fs/smb/server/transport_ipc.c+2−2

@@ -74,7 +74,7 @@ static int handle_unsupported_event(struct sk_buff skb, struct genl_info info) · 73 unmodified lines
74	static int handle_generic_event(struct sk_buff skb, struct genl_info info);	74	static int handle_generic_event(struct sk_buff skb, struct genl_info info);
75	static int ksmbd_ipc_heartbeat_request(void);	75	static int ksmbd_ipc_heartbeat_request(void);
76		76
77	static const struct nla_policy ksmbd_nl_policy[KSMBD_EVENT_MAX] = {	77	static const struct nla_policy ksmbd_nl_policy[KSMBD_EVENT_MAX + 1] = {
78	[KSMBD_EVENT_UNSPEC] = {	78	[KSMBD_EVENT_UNSPEC] = {
79	.len = 0,	79	.len = 0,
80	},	80	},
@@ -403,7 +403,7 @@ static int handle_generic_event(struct sk_buff skb, struct genl_info info) · 322 unmodified lines
403	return -EPERM;	403	return -EPERM;
404	#endif	404	#endif
405		405
406	if (type >= KSMBD_EVENT_MAX) {	406	if (type > KSMBD_EVENT_MAX) {
407	WARN_ON(1);	407	WARN_ON(1);
408	return -EINVAL;	408	return -EINVAL;
409	}	409	}

fs/smb/server/transport_tcp.c+2−0

  * @t:		TCP transport instance
  * @buf:	buffer to store read data from socket
  * @to_read:	number of bytes to read from socket
+ * @max_retries: number of retries if reading from socket fails
  *
  * Return:	on success return number of bytes read from socket,
  *		otherwise return error number
 /**
  * create_socket - create socket for ksmbd/0
+ * @iface:      interface to bind the created socket to
  *
  * Return:	0 on success, error number otherwise
  */

fs/tracefs/event_inode.c+0−38

@@ -281,44 +281,6 @@ static void update_inode_attr(struct dentry dentry, struct inode inode, · 280 unmodified lines
281	inode->i_gid = attr->gid;	281	inode->i_gid = attr->gid;
282	}	282	}
283		283
284	static void update_gid(struct eventfs_inode *ei, kgid_t gid, int level)
285	{
286	struct eventfs_inode *ei_child;
287
288	/* at most we have events/system/event */
289	if (WARN_ON_ONCE(level > 3))
290	return;
291
292	ei->attr.gid = gid;
293
294	if (ei->entry_attrs) {
295	for (int i = 0; i < ei->nr_entries; i++) {
296	ei->entry_attrs[i].gid = gid;
297	}
298	}
299
300	/*
301	* Only eventfs_inode with dentries are updated, make sure
302	* all eventfs_inodes are updated. If one of the children
303	* do not have a dentry, this function must traverse it.
304	*/
305	list_for_each_entry_srcu(ei_child, &ei->children, list,
306	srcu_read_lock_held(&eventfs_srcu)) {
307	if (!ei_child->dentry)
308	update_gid(ei_child, gid, level + 1);
309	}
310	}
311
312	void eventfs_update_gid(struct dentry *dentry, kgid_t gid)
313	{
314	struct eventfs_inode *ei = dentry->d_fsdata;
315	int idx;
316
317	idx = srcu_read_lock(&eventfs_srcu);
318	update_gid(ei, gid, 0);
319	srcu_read_unlock(&eventfs_srcu, idx);
320	}
321
322	/**	284	/**
323	* create_file - create a file in the tracefs filesystem	285	* create_file - create a file in the tracefs filesystem
324	* @name: the name of the file to create.	286	* @name: the name of the file to create.

fs/tracefs/internal.h+0−1

@@ -82,7 +82,6 @@ struct inode tracefs_get_inode(struct super_block sb); · 81 unmodified lines
82	struct dentry eventfs_start_creating(const char name, struct dentry *parent);	82	struct dentry eventfs_start_creating(const char name, struct dentry *parent);
83	struct dentry eventfs_failed_creating(struct dentry dentry);	83	struct dentry eventfs_failed_creating(struct dentry dentry);
84	struct dentry eventfs_end_creating(struct dentry dentry);	84	struct dentry eventfs_end_creating(struct dentry dentry);
85	void eventfs_update_gid(struct dentry *dentry, kgid_t gid);
86	void eventfs_set_ei_status_free(struct tracefs_inode ti, struct dentry dentry);	85	void eventfs_set_ei_status_free(struct tracefs_inode ti, struct dentry dentry);
87		86
88	#endif /* _TRACEFS_INTERNAL_H */	87	#endif /* _TRACEFS_INTERNAL_H */

fs/xfs/xfs_super.c+17−10

 	mp->m_super = sb;
+	/*
+	 * Copy VFS mount flags from the context now that all parameter parsing
+	 * is guaranteed to have been completed by either the old mount API or
+	 * the newer fsopen/fsconfig API.
+	 */
+	if (fc->sb_flags & SB_RDONLY)
+		set_bit(XFS_OPSTATE_READONLY, &mp->m_opstate);
+	if (fc->sb_flags & SB_DIRSYNC)
+		mp->m_features |= XFS_FEAT_DIRSYNC;
+	if (fc->sb_flags & SB_SYNCHRONOUS)
+		mp->m_features |= XFS_FEAT_WSYNC;
 	error = xfs_fs_validate_params(mp);
 	if (error)
 		return error;
 	.free        = xfs_fs_free,
 };
+/*
+ * WARNING: do not initialise any parameters in this function that depend on
+ * mount option parsing having already been performed as this can be called from
+ * fsopen() before any parameters have been set.
+ */
 static int xfs_init_fs_context(
 	struct fs_context	*fc)
 {
 	mp->m_logbsize = -1;
 	mp->m_allocsize_log = 16; /* 64k */
-	/*
-	 * Copy binary VFS mount flags we are interested in.
-	 */
-	if (fc->sb_flags & SB_RDONLY)
-		set_bit(XFS_OPSTATE_READONLY, &mp->m_opstate);
-	if (fc->sb_flags & SB_DIRSYNC)
-		mp->m_features |= XFS_FEAT_DIRSYNC;
-	if (fc->sb_flags & SB_SYNCHRONOUS)
-		mp->m_features |= XFS_FEAT_WSYNC;
 	fc->s_fs_info = mp;
 	fc->ops = &xfs_context_ops;

include/linux/hid_bpf.h+0−11

@@ -77,17 +77,6 @@ enum hid_bpf_attach_flags { · 76 unmodified lines
77	int hid_bpf_device_event(struct hid_bpf_ctx *ctx);	77	int hid_bpf_device_event(struct hid_bpf_ctx *ctx);
78	int hid_bpf_rdesc_fixup(struct hid_bpf_ctx *ctx);	78	int hid_bpf_rdesc_fixup(struct hid_bpf_ctx *ctx);
79		79
80	/* Following functions are kfunc that we export to BPF programs */
81	/* available everywhere in HID-BPF */
82	__u8 hid_bpf_get_data(struct hid_bpf_ctx ctx, unsigned int offset, const size_t __sz);
83
84	/* only available in syscall */
85	int hid_bpf_attach_prog(unsigned int hid_id, int prog_fd, __u32 flags);
86	int hid_bpf_hw_request(struct hid_bpf_ctx ctx, __u8 buf, size_t buf__sz,
87	enum hid_report_type rtype, enum hid_class_request reqtype);
88	struct hid_bpf_ctx *hid_bpf_allocate_context(unsigned int hid_id);
89	void hid_bpf_release_context(struct hid_bpf_ctx *ctx);
90
91	/*	80	/*
92	* Below is HID internal	81	* Below is HID internal
93	*/	82	*/

include/linux/libata.h+1−1

@@ -471,7 +471,7 @@ enum ata_completion_errors { · 470 unmodified lines
471		471
472	/*	472	/*
473	* Link power management policy: If you alter this, you also need to	473	* Link power management policy: If you alter this, you also need to
474	* alter libata-scsi.c (for the ascii descriptions)	474	* alter libata-sata.c (for the ascii descriptions)
475	*/	475	*/
476	enum ata_lpm_policy {	476	enum ata_lpm_policy {
477	ATA_LPM_UNKNOWN,	477	ATA_LPM_UNKNOWN,

include/linux/lsm_hook_defs.h+2−2

@@ -315,9 +315,9 @@ LSM_HOOK(int, 0, socket_getsockopt, struct socket *sock, int level, int optname) · 314 unmodified lines
315	LSM_HOOK(int, 0, socket_setsockopt, struct socket *sock, int level, int optname)	315	LSM_HOOK(int, 0, socket_setsockopt, struct socket *sock, int level, int optname)
316	LSM_HOOK(int, 0, socket_shutdown, struct socket *sock, int how)	316	LSM_HOOK(int, 0, socket_shutdown, struct socket *sock, int how)
317	LSM_HOOK(int, 0, socket_sock_rcv_skb, struct sock sk, struct sk_buff skb)	317	LSM_HOOK(int, 0, socket_sock_rcv_skb, struct sock sk, struct sk_buff skb)
318	LSM_HOOK(int, 0, socket_getpeersec_stream, struct socket *sock,	318	LSM_HOOK(int, -ENOPROTOOPT, socket_getpeersec_stream, struct socket *sock,
319	sockptr_t optval, sockptr_t optlen, unsigned int len)	319	sockptr_t optval, sockptr_t optlen, unsigned int len)
320	LSM_HOOK(int, 0, socket_getpeersec_dgram, struct socket *sock,	320	LSM_HOOK(int, -ENOPROTOOPT, socket_getpeersec_dgram, struct socket *sock,
321	struct sk_buff skb, u32 secid)	321	struct sk_buff skb, u32 secid)
322	LSM_HOOK(int, 0, sk_alloc_security, struct sock *sk, int family, gfp_t priority)	322	LSM_HOOK(int, 0, sk_alloc_security, struct sock *sk, int family, gfp_t priority)
323	LSM_HOOK(void, LSM_RET_VOID, sk_free_security, struct sock *sk)	323	LSM_HOOK(void, LSM_RET_VOID, sk_free_security, struct sock *sk)

include/linux/mman.h+1−0

@@ -156,6 +156,7 @@ calc_vm_flag_bits(unsigned long flags) · 155 unmodified lines
156	return _calc_vm_trans(flags, MAP_GROWSDOWN, VM_GROWSDOWN ) \|	156	return _calc_vm_trans(flags, MAP_GROWSDOWN, VM_GROWSDOWN ) \|
157	_calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ) \|	157	_calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ) \|
158	_calc_vm_trans(flags, MAP_SYNC, VM_SYNC ) \|	158	_calc_vm_trans(flags, MAP_SYNC, VM_SYNC ) \|
		159	_calc_vm_trans(flags, MAP_STACK, VM_NOHUGEPAGE) \|
159	arch_calc_vm_flag_bits(flags);	160	arch_calc_vm_flag_bits(flags);
160	}	161	}
161		162

include/linux/mmzone.h+3−3

@@ -2013,9 +2013,9 @@ static inline int pfn_valid(unsigned long pfn) · 2012 unmodified lines
2013	if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS)	2013	if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS)
2014	return 0;	2014	return 0;
2015	ms = __pfn_to_section(pfn);	2015	ms = __pfn_to_section(pfn);
2016	rcu_read_lock();	2016	rcu_read_lock_sched();
2017	if (!valid_section(ms)) {	2017	if (!valid_section(ms)) {
2018	rcu_read_unlock();	2018	rcu_read_unlock_sched();
2019	return 0;	2019	return 0;
2020	}	2020	}
2021	/*	2021	/*
@@ -2023,7 +2023,7 @@ static inline int pfn_valid(unsigned long pfn) · 1 unmodified line
2023	* the entire section-sized span.	2023	* the entire section-sized span.
2024	*/	2024	*/
2025	ret = early_section(ms) \|\| pfn_section_valid(ms, pfn);	2025	ret = early_section(ms) \|\| pfn_section_valid(ms, pfn);
2026	rcu_read_unlock();	2026	rcu_read_unlock_sched();
2027		2027
2028	return ret;	2028	return ret;
2029	}	2029	}

include/linux/netfilter/ipset/ip_set.h+4−0

 	/* Return true if "b" set is the same as "a"
 	 * according to the create set parameters */
 	bool (*same_set)(const struct ip_set *a, const struct ip_set *b);
+	/* Cancel ongoing garbage collectors before destroying the set*/
+	void (*cancel_gc)(struct ip_set *set);
 	/* Region-locking is used */
 	bool region_lock;
 };
 /* A generic IP set */
 struct ip_set {
+	/* For call_cru in destroy */
+	struct rcu_head rcu;
 	/* The name of the set */
 	char name[IPSET_MAXNAMELEN];
 	/* Lock protecting the set data */

include/linux/spi/spi.h+1−1

@@ -21,7 +21,7 @@ · 20 unmodified lines
21	#include <uapi/linux/spi/spi.h>	21	#include <uapi/linux/spi/spi.h>
22		22
23	/* Max no. of CS supported per spi device */	23	/* Max no. of CS supported per spi device */
24	#define SPI_CS_CNT_MAX 4	24	#define SPI_CS_CNT_MAX 16
25		25
26	struct dma_chan;	26	struct dma_chan;
27	struct software_node;	27	struct software_node;

include/linux/syscalls.h+1−0

@@ -128,6 +128,7 @@ struct mnt_id_req; · 127 unmodified lines
128	#define __TYPE_IS_LL(t) (__TYPE_AS(t, 0LL) \|\| __TYPE_AS(t, 0ULL))	128	#define __TYPE_IS_LL(t) (__TYPE_AS(t, 0LL) \|\| __TYPE_AS(t, 0ULL))
129	#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a	129	#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
130	#define __SC_CAST(t, a) (__force t) a	130	#define __SC_CAST(t, a) (__force t) a
		131	#define __SC_TYPE(t, a) t
131	#define __SC_ARGS(t, a) a	132	#define __SC_ARGS(t, a) a
132	#define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))	133	#define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
133		134

include/net/af_unix.h+14−6

 #define UNIXCB(skb)	(*(struct unix_skb_parms *)&((skb)->cb))
-#define unix_state_lock(s)	spin_lock(&unix_sk(s)->lock)
-#define unix_state_unlock(s)	spin_unlock(&unix_sk(s)->lock)
-#define unix_state_lock_nested(s) \
-				spin_lock_nested(&unix_sk(s)->lock, \
-				SINGLE_DEPTH_NESTING)
 /* The AF_UNIX socket */
 struct unix_sock {
 	/* WARNING: sk has to be the first member */
 #define unix_sk(ptr) container_of_const(ptr, struct unix_sock, sk)
 #define unix_peer(sk) (unix_sk(sk)->peer)
+#define unix_state_lock(s)	spin_lock(&unix_sk(s)->lock)
+#define unix_state_unlock(s)	spin_unlock(&unix_sk(s)->lock)
+enum unix_socket_lock_class {
+	U_LOCK_NORMAL,
+	U_LOCK_SECOND,	/* for double locking, see unix_state_double_lock(). */
+	U_LOCK_DIAG, /* used while dumping icons, see sk_diag_dump_icons(). */
+};
+static inline void unix_state_lock_nested(struct sock *sk,
+				   enum unix_socket_lock_class subclass)
+{
+	spin_lock_nested(&unix_sk(sk)->lock, subclass);
+}
 #define peer_wait peer_wq.wait
 long unix_inq_len(struct sock *sk);

include/net/ip.h+1−1

@@ -767,7 +767,7 @@ int ip_options_rcv_srr(struct sk_buff skb, struct net_device dev); · 766 unmodified lines
767	* Functions provided by ip_sockglue.c	767	* Functions provided by ip_sockglue.c
768	*/	768	*/
769		769
770	void ipv4_pktinfo_prepare(const struct sock sk, struct sk_buff skb);	770	void ipv4_pktinfo_prepare(const struct sock sk, struct sk_buff skb, bool drop_dst);
771	void ip_cmsg_recv_offset(struct msghdr msg, struct sock sk,	771	void ip_cmsg_recv_offset(struct msghdr msg, struct sock sk,
772	struct sk_buff *skb, int tlen, int offset);	772	struct sk_buff *skb, int tlen, int offset);
773	int ip_cmsg_send(struct sock sk, struct msghdr msg,	773	int ip_cmsg_send(struct sock sk, struct msghdr msg,

include/net/netfilter/nf_tables.h+2−0

  *	@type: stateful object numeric type
  *	@owner: module owner
  *	@maxattr: maximum netlink attribute
+ *	@family: address family for AF-specific object types
  *	@policy: netlink attribute policy
  */
 struct nft_object_type {
 	struct list_head		list;
 	u32				type;
 	unsigned int                    maxattr;
+	u8				family;
 	struct module			*owner;
 	const struct nla_policy		*policy;
 };

include/uapi/drm/ivpu_accel.h+20−5

 #define DRM_IVPU_PARAM_CORE_CLOCK_RATE	    3
 #define DRM_IVPU_PARAM_NUM_CONTEXTS	    4
 #define DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS 5
-#define DRM_IVPU_PARAM_CONTEXT_PRIORITY	    6
+#define DRM_IVPU_PARAM_CONTEXT_PRIORITY	    6 /* Deprecated */
 #define DRM_IVPU_PARAM_CONTEXT_ID	    7
 #define DRM_IVPU_PARAM_FW_API_VERSION	    8
 #define DRM_IVPU_PARAM_ENGINE_HEARTBEAT	    9
 #define DRM_IVPU_PLATFORM_TYPE_SILICON	    0
+/* Deprecated, use DRM_IVPU_JOB_PRIORITY */
 #define DRM_IVPU_CONTEXT_PRIORITY_IDLE	    0
 #define DRM_IVPU_CONTEXT_PRIORITY_NORMAL    1
 #define DRM_IVPU_CONTEXT_PRIORITY_FOCUS	    2
 #define DRM_IVPU_CONTEXT_PRIORITY_REALTIME  3
+#define DRM_IVPU_JOB_PRIORITY_DEFAULT  0
+#define DRM_IVPU_JOB_PRIORITY_IDLE     1
+#define DRM_IVPU_JOB_PRIORITY_NORMAL   2
+#define DRM_IVPU_JOB_PRIORITY_FOCUS    3
+#define DRM_IVPU_JOB_PRIORITY_REALTIME 4
 /**
  * DRM_IVPU_CAP_METRIC_STREAMER
  *
 	 * %DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS:
 	 * Lowest VPU virtual address available in the current context (read-only)
 	 *
-	 * %DRM_IVPU_PARAM_CONTEXT_PRIORITY:
-	 * Value of current context scheduling priority (read-write).
-	 * See DRM_IVPU_CONTEXT_PRIORITY_* for possible values.
-	 *
 	 * %DRM_IVPU_PARAM_CONTEXT_ID:
 	 * Current context ID, always greater than 0 (read-only)
 	 *
 	 * to be executed. The offset has to be 8-byte aligned.
 	 */
 	__u32 commands_offset;
+	/**
+	 * @priority:
+	 *
+	 * Priority to be set for related job command queue, can be one of the following:
+	 * %DRM_IVPU_JOB_PRIORITY_DEFAULT
+	 * %DRM_IVPU_JOB_PRIORITY_IDLE
+	 * %DRM_IVPU_JOB_PRIORITY_NORMAL
+	 * %DRM_IVPU_JOB_PRIORITY_FOCUS
+	 * %DRM_IVPU_JOB_PRIORITY_REALTIME
+	 */
+	__u32 priority;
 };
 /* drm_ivpu_bo_wait job status codes */

io_uring/opdef.c+0−1

@@ -471,7 +471,6 @@ const struct io_issue_def io_issue_defs[] = { · 470 unmodified lines
471	},	471	},
472	[IORING_OP_FIXED_FD_INSTALL] = {	472	[IORING_OP_FIXED_FD_INSTALL] = {
473	.needs_file = 1,	473	.needs_file = 1,
474	.audit_skip = 1,
475	.prep = io_install_fixed_fd_prep,	474	.prep = io_install_fixed_fd_prep,
476	.issue = io_install_fixed_fd,	475	.issue = io_install_fixed_fd,
477	},	476	},

io_uring/openclose.c+4−0

 	if (flags & ~IORING_FIXED_FD_NO_CLOEXEC)
 		return -EINVAL;
+	/* ensure the task's creds are used when installing/receiving fds */
+	if (req->flags & REQ_F_CREDS)
+		return -EPERM;
 	/* default to O_CLOEXEC, disable if IORING_FIXED_FD_NO_CLOEXEC is set */
 	ifi = io_kiocb_to_cmd(req, struct io_fixed_install);
 	ifi->o_flags = O_CLOEXEC;

kernel/events/uprobes.c+1−1

@@ -537,7 +537,7 @@ retry: · 536 unmodified lines
537	}	537	}
538	}	538	}
539		539
540	ret = __replace_page(vma, vaddr, old_page, new_page);	540	ret = __replace_page(vma, vaddr & PAGE_MASK, old_page, new_page);
541	if (new_page)	541	if (new_page)
542	put_page(new_page);	542	put_page(new_page);
543	put_old:	543	put_old:

kernel/futex/core.c+12−3

 }
 /*
- * PI futexes can not be requeued and must remove themselves from the
+ * PI futexes can not be requeued and must remove themselves from the hash
- * hash bucket. The hash bucket lock (i.e. lock_ptr) is held.
+ * bucket. The hash bucket lock (i.e. lock_ptr) is held.
  */
 void futex_unqueue_pi(struct futex_q *q)
 {
-	__futex_unqueue(q);
+	/*
+	 * If the lock was not acquired (due to timeout or signal) then the
+	 * rt_waiter is removed before futex_q is. If this is observed by
+	 * an unlocker after dropping the rtmutex wait lock and before
+	 * acquiring the hash bucket lock, then the unlocker dequeues the
+	 * futex_q from the hash bucket list to guarantee consistent state
+	 * vs. userspace. Therefore the dequeue here must be conditional.
+	 */
+	if (!plist_node_empty(&q->list))
+		__futex_unqueue(q);
 	BUG_ON(!q->pi_state);
 	put_pi_state(q->pi_state);

kernel/futex/pi.c+8−3

 	hb = futex_hash(&key);
 	spin_lock(&hb->lock);
+retry_hb:
 	/*
 	 * Check waiters first. We do not trust user space values at
 		/*
 		 * Futex vs rt_mutex waiter state -- if there are no rt_mutex
 		 * waiters even though futex thinks there are, then the waiter
-		 * is leaving and the uncontended path is safe to take.
+		 * is leaving. The entry needs to be removed from the list so a
+		 * new futex_lock_pi() is not using this stale PI-state while
+		 * the futex is available in user space again.
+		 * There can be more than one task on its way out so it needs
+		 * to retry.
 		 */
 		rt_waiter = rt_mutex_top_waiter(&pi_state->pi_mutex);
 		if (!rt_waiter) {
+			__futex_unqueue(top_waiter);
 			raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
-			goto do_uncontended;
+			goto retry_hb;
 		}
 		get_pi_state(pi_state);
 		return ret;
 	}
-do_uncontended:
 	/*
 	 * We have no kernel internal state, i.e. no waiters in the
 	 * kernel. Waiters which are about to queue themselves are stuck

kernel/irq/irqdesc.c+1−1

@@ -600,7 +600,7 @@ int __init early_irq_init(void) · 599 unmodified lines
600	mutex_init(&desc[i].request_mutex);	600	mutex_init(&desc[i].request_mutex);
601	init_waitqueue_head(&desc[i].wait_for_threads);	601	init_waitqueue_head(&desc[i].wait_for_threads);
602	desc_set_defaults(i, &desc[i], node, NULL, NULL);	602	desc_set_defaults(i, &desc[i], node, NULL, NULL);
603	irq_resend_init(desc);	603	irq_resend_init(&desc[i]);
604	}	604	}
605	return arch_early_irq_init();	605	return arch_early_irq_init();
606	}	606	}

kernel/time/clocksource.c+24−1

  * Interval: 0.5sec.
  */
 #define WATCHDOG_INTERVAL (HZ >> 1)
+#define WATCHDOG_INTERVAL_MAX_NS ((2 * WATCHDOG_INTERVAL) * (NSEC_PER_SEC / HZ))
 /*
  * Threshold: 0.0312s, when doubled: 0.0625s.
 static DEFINE_SPINLOCK(watchdog_lock);
 static int watchdog_running;
 static atomic_t watchdog_reset_pending;
+static int64_t watchdog_max_interval;
 static inline void clocksource_watchdog_lock(unsigned long *flags)
 {
 static void clocksource_watchdog(struct timer_list *unused)
 {
 	u64 csnow, wdnow, cslast, wdlast, delta;
+	int64_t wd_nsec, cs_nsec, interval;
 	int next_cpu, reset_pending;
-	int64_t wd_nsec, cs_nsec;
 	struct clocksource *cs;
 	enum wd_read_status read_ret;
 	unsigned long extra_wait = 0;
 		if (atomic_read(&watchdog_reset_pending))
 			continue;
+		/*
+		 * The processing of timer softirqs can get delayed (usually
+		 * on account of ksoftirqd not getting to run in a timely
+		 * manner), which causes the watchdog interval to stretch.
+		 * Skew detection may fail for longer watchdog intervals
+		 * on account of fixed margins being used.
+		 * Some clocksources, e.g. acpi_pm, cannot tolerate
+		 * watchdog intervals longer than a few seconds.
+		 */
+		interval = max(cs_nsec, wd_nsec);
+		if (unlikely(interval > WATCHDOG_INTERVAL_MAX_NS)) {
+			if (system_state > SYSTEM_SCHEDULING &&
+			    interval > 2 * watchdog_max_interval) {
+				watchdog_max_interval = interval;
+				pr_warn("Long readout interval, skipping watchdog check: cs_nsec: %lld wd_nsec: %lld\n",
+					cs_nsec, wd_nsec);
+			}
+			watchdog_timer.expires = jiffies;
+			continue;
+		}
 		/* Check the deviation from the watchdog clocksource. */
 		md = cs->uncertainty_margin + watchdog->uncertainty_margin;
 		if (abs(cs_nsec - wd_nsec) > md) {

kernel/time/tick-sched.c+5−0

 {
 	struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
 	ktime_t idle_sleeptime, iowait_sleeptime;
+	unsigned long idle_calls, idle_sleeps;
 # ifdef CONFIG_HIGH_RES_TIMERS
 	if (ts->sched_timer.base)
 	idle_sleeptime = ts->idle_sleeptime;
 	iowait_sleeptime = ts->iowait_sleeptime;
+	idle_calls = ts->idle_calls;
+	idle_sleeps = ts->idle_sleeps;
 	memset(ts, 0, sizeof(*ts));
 	ts->idle_sleeptime = idle_sleeptime;
 	ts->iowait_sleeptime = iowait_sleeptime;
+	ts->idle_calls = idle_calls;
+	ts->idle_sleeps = idle_sleeps;
 }
 #endif

kernel/trace/trace_events_trigger.c+4−2

@@ -1470,8 +1470,10 @@ register_snapshot_trigger(char *glob, · 1469 unmodified lines
1470	struct event_trigger_data *data,	1470	struct event_trigger_data *data,
1471	struct trace_event_file *file)	1471	struct trace_event_file *file)
1472	{	1472	{
1473	if (tracing_alloc_snapshot_instance(file->tr) != 0)	1473	int ret = tracing_alloc_snapshot_instance(file->tr);
1474	return 0;	1474
		1475	if (ret < 0)
		1476	return ret;
1475		1477
1476	return register_trigger(glob, data, file);	1478	return register_trigger(glob, data, file);
1477	}	1479	}

lib/kunit/device.c+2−2

@@ -45,8 +45,8 @@ int kunit_bus_init(void) · 44 unmodified lines
45	int error;	45	int error;
46		46
47	kunit_bus_device = root_device_register("kunit");	47	kunit_bus_device = root_device_register("kunit");
48	if (!kunit_bus_device)	48	if (IS_ERR(kunit_bus_device))
49	return -ENOMEM;	49	return PTR_ERR(kunit_bus_device);
50		50
51	error = bus_register(&kunit_bus_type);	51	error = bus_register(&kunit_bus_type);
52	if (error)	52	if (error)

lib/kunit/executor.c+4−0

 	kfree(suite_set.start);
 }
+/*
+ * Filter and reallocate test suites. Must return the filtered test suites set
+ * allocated at a valid virtual address or NULL in case of error.
+ */
 struct kunit_suite_set
 kunit_filter_suites(const struct kunit_suite_set *suite_set,
 		    const char *filter_glob,

lib/kunit/kunit-test.c+1−1

@@ -720,7 +720,7 @@ static void kunit_device_cleanup_test(struct kunit *test) · 719 unmodified lines
720	long action_was_run = 0;	720	long action_was_run = 0;
721		721
722	test_device = kunit_device_register(test, "my_device");	722	test_device = kunit_device_register(test, "my_device");
723	KUNIT_ASSERT_NOT_NULL(test, test_device);	723	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, test_device);
724		724
725	/* Add an action to verify cleanup. */	725	/* Add an action to verify cleanup. */
726	devm_add_action(test_device, test_dev_action, &action_was_run);	726	devm_add_action(test_device, test_dev_action, &action_was_run);

lib/kunit/test.c+11−3

 #include <linux/panic.h>
 #include <linux/sched/debug.h>
 #include <linux/sched.h>
+#include <linux/mm.h>
 #include "debugfs.h"
 #include "device-impl.h"
 	};
 	const char *action = kunit_action();
+	/*
+	 * Check if the start address is a valid virtual address to detect
+	 * if the module load sequence has failed and the suite set has not
+	 * been initialized and filtered.
+	 */
+	if (!suite_set.start || !virt_addr_valid(suite_set.start))
+		return;
 	if (!action)
 		__kunit_test_suites_exit(mod->kunit_suites,
 					 mod->num_kunit_suites);
-	if (suite_set.start)
+	kunit_free_suite_set(suite_set);
-		kunit_free_suite_set(suite_set);
 }
 static int kunit_module_notify(struct notifier_block *nb, unsigned long val,
 	switch (val) {
 	case MODULE_STATE_LIVE:
+		kunit_module_init(mod);
 		break;
 	case MODULE_STATE_GOING:
 		kunit_module_exit(mod);
 		break;
 	case MODULE_STATE_COMING:
-		kunit_module_init(mod);
 		break;
 	case MODULE_STATE_UNFORMED:
 		break;

lib/stackdepot.c+263−110

@@ -14,6 +14,7 @@ · 13 unmodified lines
14		14
15	#define pr_fmt(fmt) "stackdepot: " fmt	15	#define pr_fmt(fmt) "stackdepot: " fmt
16		16
		17	#include <linux/debugfs.h>
17	#include <linux/gfp.h>	18	#include <linux/gfp.h>
18	#include <linux/jhash.h>	19	#include <linux/jhash.h>
19	#include <linux/kernel.h>	20	#include <linux/kernel.h>
@@ -21,8 +22,9 @@ · 1 unmodified line
21	#include <linux/list.h>	22	#include <linux/list.h>
22	#include <linux/mm.h>	23	#include <linux/mm.h>
23	#include <linux/mutex.h>	24	#include <linux/mutex.h>
24	#include <linux/percpu.h>
25	#include <linux/printk.h>	25	#include <linux/printk.h>
		26	#include <linux/rculist.h>
		27	#include <linux/rcupdate.h>
26	#include <linux/refcount.h>	28	#include <linux/refcount.h>
27	#include <linux/slab.h>	29	#include <linux/slab.h>
28	#include <linux/spinlock.h>	30	#include <linux/spinlock.h>
@@ -67,12 +69,28 @@ union handle_parts { · 38 unmodified lines
67	};	69	};
68		70
69	struct stack_record {	71	struct stack_record {
70	struct list_head list; /* Links in hash table or freelist */	72	struct list_head hash_list; /* Links in the hash table */
71	u32 hash; /* Hash in hash table */	73	u32 hash; /* Hash in hash table */
72	u32 size; /* Number of stored frames */	74	u32 size; /* Number of stored frames */
73	union handle_parts handle;	75	union handle_parts handle; /* Constant after initialization */
74	refcount_t count;	76	refcount_t count;
75	unsigned long entries[CONFIG_STACKDEPOT_MAX_FRAMES]; /* Frames */	77	union {
		78	unsigned long entries[CONFIG_STACKDEPOT_MAX_FRAMES]; /* Frames */
		79	struct {
		80	/*
		81	* An important invariant of the implementation is to
		82	* only place a stack record onto the freelist iff its
		83	* refcount is zero. Because stack records with a zero
		84	* refcount are never considered as valid, it is safe to
		85	* union @entries and freelist management state below.
		86	* Conversely, as soon as an entry is off the freelist
		87	* and its refcount becomes non-zero, the below must not
		88	* be accessed until being placed back on the freelist.
		89	*/
		90	struct list_head free_list; /* Links in the freelist */
		91	unsigned long rcu_state; /* RCU cookie */
		92	};
		93	};
76	};	94	};
77		95
78	#define DEPOT_STACK_RECORD_SIZE \	96	#define DEPOT_STACK_RECORD_SIZE \
@@ -112,8 +130,25 @@ static LIST_HEAD(free_stacks); · 33 unmodified lines
112	* yet allocated or if the limit on the number of pools is reached.	130	* yet allocated or if the limit on the number of pools is reached.
113	*/	131	*/
114	static bool new_pool_required = true;	132	static bool new_pool_required = true;
115	/* Lock that protects the variables above. */	133	/* The lock must be held when performing pool or freelist modifications. */
116	static DEFINE_RWLOCK(pool_rwlock);	134	static DEFINE_RAW_SPINLOCK(pool_lock);
		135
		136	/* Statistics counters for debugfs. */
		137	enum depot_counter_id {
		138	DEPOT_COUNTER_ALLOCS,
		139	DEPOT_COUNTER_FREES,
		140	DEPOT_COUNTER_INUSE,
		141	DEPOT_COUNTER_FREELIST_SIZE,
		142	DEPOT_COUNTER_COUNT,
		143	};
		144	static long counters[DEPOT_COUNTER_COUNT];
		145	static const char *const counter_names[] = {
		146	[DEPOT_COUNTER_ALLOCS] = "allocations",
		147	[DEPOT_COUNTER_FREES] = "frees",
		148	[DEPOT_COUNTER_INUSE] = "in_use",
		149	[DEPOT_COUNTER_FREELIST_SIZE] = "freelist_size",
		150	};
		151	static_assert(ARRAY_SIZE(counter_names) == DEPOT_COUNTER_COUNT);
117		152
118	static int __init disable_stack_depot(char *str)	153	static int __init disable_stack_depot(char *str)
119	{	154	{
@@ -258,14 +293,15 @@ out_unlock: · 138 unmodified lines
258	}	293	}
259	EXPORT_SYMBOL_GPL(stack_depot_init);	294	EXPORT_SYMBOL_GPL(stack_depot_init);
260		295
261	/* Initializes a stack depol pool. */	296	/*
		297	* Initializes new stack depot @pool, release all its entries to the freelist,
		298	* and update the list of pools.
		299	*/
262	static void depot_init_pool(void *pool)	300	static void depot_init_pool(void *pool)
263	{	301	{
264	int offset;	302	int offset;
265		303
266	lockdep_assert_held_write(&pool_rwlock);	304	lockdep_assert_held(&pool_lock);
267
268	WARN_ON(!list_empty(&free_stacks));
269		305
270	/* Initialize handles and link stack records into the freelist. */	306	/* Initialize handles and link stack records into the freelist. */
271	for (offset = 0; offset <= DEPOT_POOL_SIZE - DEPOT_STACK_RECORD_SIZE;	307	for (offset = 0; offset <= DEPOT_POOL_SIZE - DEPOT_STACK_RECORD_SIZE;
@@ -276,18 +312,36 @@ static void depot_init_pool(void *pool) · 4 unmodified lines
276	stack->handle.offset = offset >> DEPOT_STACK_ALIGN;	312	stack->handle.offset = offset >> DEPOT_STACK_ALIGN;
277	stack->handle.extra = 0;	313	stack->handle.extra = 0;
278		314
279	list_add(&stack->list, &free_stacks);	315	/*
		316	* Stack traces of size 0 are never saved, and we can simply use
		317	* the size field as an indicator if this is a new unused stack
		318	* record in the freelist.
		319	*/
		320	stack->size = 0;
		321
		322	INIT_LIST_HEAD(&stack->hash_list);
		323	/*
		324	* Add to the freelist front to prioritize never-used entries:
		325	* required in case there are entries in the freelist, but their
		326	* RCU cookie still belongs to the current RCU grace period
		327	* (there can still be concurrent readers).
		328	*/
		329	list_add(&stack->free_list, &free_stacks);
		330	counters[DEPOT_COUNTER_FREELIST_SIZE]++;
280	}	331	}
281		332
282	/* Save reference to the pool to be used by depot_fetch_stack(). */	333	/* Save reference to the pool to be used by depot_fetch_stack(). */
283	stack_pools[pools_num] = pool;	334	stack_pools[pools_num] = pool;
284	pools_num++;	335
		336	/* Pairs with concurrent READ_ONCE() in depot_fetch_stack(). */
		337	WRITE_ONCE(pools_num, pools_num + 1);
		338	ASSERT_EXCLUSIVE_WRITER(pools_num);
285	}	339	}
286		340
287	/* Keeps the preallocated memory to be used for a new stack depot pool. */	341	/* Keeps the preallocated memory to be used for a new stack depot pool. */
288	static void depot_keep_new_pool(void **prealloc)	342	static void depot_keep_new_pool(void **prealloc)
289	{	343	{
290	lockdep_assert_held_write(&pool_rwlock);	344	lockdep_assert_held(&pool_lock);
291		345
292	/*	346	/*
293	* If a new pool is already saved or the maximum number of	347	* If a new pool is already saved or the maximum number of
@@ -310,17 +364,16 @@ static void depot_keep_new_pool(void **prealloc) · 16 unmodified lines
310	* number of pools is reached. In either case, take note that	364	* number of pools is reached. In either case, take note that
311	* keeping another pool is not required.	365	* keeping another pool is not required.
312	*/	366	*/
313	new_pool_required = false;	367	WRITE_ONCE(new_pool_required, false);
314	}	368	}
315		369
316	/* Updates references to the current and the next stack depot pools. */	370	/*
317	static bool depot_update_pools(void **prealloc)	371	* Try to initialize a new stack depot pool from either a previous or the
		372	* current pre-allocation, and release all its entries to the freelist.
		373	*/
		374	static bool depot_try_init_pool(void **prealloc)
318	{	375	{
319	lockdep_assert_held_write(&pool_rwlock);	376	lockdep_assert_held(&pool_lock);
320
321	/* Check if we still have objects in the freelist. */
322	if (!list_empty(&free_stacks))
323	goto out_keep_prealloc;
324		377
325	/* Check if we have a new pool saved and use it. */	378	/* Check if we have a new pool saved and use it. */
326	if (new_pool) {	379	if (new_pool) {
@@ -329,10 +382,9 @@ static bool depot_update_pools(void **prealloc) · 2 unmodified lines
329		382
330	/* Take note that we might need a new new_pool. */	383	/* Take note that we might need a new new_pool. */
331	if (pools_num < DEPOT_MAX_POOLS)	384	if (pools_num < DEPOT_MAX_POOLS)
332	new_pool_required = true;	385	WRITE_ONCE(new_pool_required, true);
333		386
334	/* Try keeping the preallocated memory for new_pool. */	387	return true;
335	goto out_keep_prealloc;
336	}	388	}
337		389
338	/* Bail out if we reached the pool limit. */	390	/* Bail out if we reached the pool limit. */
@@ -349,12 +401,32 @@ static bool depot_update_pools(void **prealloc) · 10 unmodified lines
349	}	401	}
350		402
351	return false;	403	return false;
		404	}
		405
		406	/* Try to find next free usable entry. */
		407	static struct stack_record *depot_pop_free(void)
		408	{
		409	struct stack_record *stack;
		410
		411	lockdep_assert_held(&pool_lock);
		412
		413	if (list_empty(&free_stacks))
		414	return NULL;
		415
		416	/*
		417	* We maintain the invariant that the elements in front are least
		418	* recently used, and are therefore more likely to be associated with an
		419	* RCU grace period in the past. Consequently it is sufficient to only
		420	* check the first entry.
		421	*/
		422	stack = list_first_entry(&free_stacks, struct stack_record, free_list);
		423	if (stack->size && !poll_state_synchronize_rcu(stack->rcu_state))
		424	return NULL;
		425
		426	list_del(&stack->free_list);
		427	counters[DEPOT_COUNTER_FREELIST_SIZE]--;
352		428
353	out_keep_prealloc:	429	return stack;
354	/* Keep the preallocated memory for a new pool if required. */
355	if (*prealloc)
356	depot_keep_new_pool(prealloc);
357	return true;
358	}	430	}
359		431
360	/* Allocates a new stack in a stack depot pool. */	432	/* Allocates a new stack in a stack depot pool. */
@@ -363,19 +435,22 @@ depot_alloc_stack(unsigned long entries, int size, u32 hash, void *prealloc) · 2 unmodified lines
363	{	435	{
364	struct stack_record *stack;	436	struct stack_record *stack;
365		437
366	lockdep_assert_held_write(&pool_rwlock);	438	lockdep_assert_held(&pool_lock);
367		439
368	/* Update current and new pools if required and possible. */	440	/* This should already be checked by public API entry points. */
369	if (!depot_update_pools(prealloc))	441	if (WARN_ON_ONCE(!size))
370	return NULL;	442	return NULL;
371		443
372	/* Check if we have a stack record to save the stack trace. */	444	/* Check if we have a stack record to save the stack trace. */
373	if (list_empty(&free_stacks))	445	stack = depot_pop_free();
374	return NULL;	446	if (!stack) {
375		447	/* No usable entries on the freelist - try to refill the freelist. */
376	/* Get and unlink the first entry from the freelist. */	448	if (!depot_try_init_pool(prealloc))
377	stack = list_first_entry(&free_stacks, struct stack_record, list);	449	return NULL;
378	list_del(&stack->list);	450	stack = depot_pop_free();
		451	if (WARN_ON(!stack))
		452	return NULL;
		453	}
379		454
380	/* Limit number of saved frames to CONFIG_STACKDEPOT_MAX_FRAMES. */	455	/* Limit number of saved frames to CONFIG_STACKDEPOT_MAX_FRAMES. */
381	if (size > CONFIG_STACKDEPOT_MAX_FRAMES)	456	if (size > CONFIG_STACKDEPOT_MAX_FRAMES)
@@ -394,38 +469,80 @@ depot_alloc_stack(unsigned long entries, int size, u32 hash, void *prealloc) · 12 unmodified lines
394	*/	469	*/
395	kmsan_unpoison_memory(stack, DEPOT_STACK_RECORD_SIZE);	470	kmsan_unpoison_memory(stack, DEPOT_STACK_RECORD_SIZE);
396		471
		472	counters[DEPOT_COUNTER_ALLOCS]++;
		473	counters[DEPOT_COUNTER_INUSE]++;
397	return stack;	474	return stack;
398	}	475	}
399		476
400	static struct stack_record *depot_fetch_stack(depot_stack_handle_t handle)	477	static struct stack_record *depot_fetch_stack(depot_stack_handle_t handle)
401	{	478	{
		479	const int pools_num_cached = READ_ONCE(pools_num);
402	union handle_parts parts = { .handle = handle };	480	union handle_parts parts = { .handle = handle };
403	void *pool;	481	void *pool;
404	size_t offset = parts.offset << DEPOT_STACK_ALIGN;	482	size_t offset = parts.offset << DEPOT_STACK_ALIGN;
405	struct stack_record *stack;	483	struct stack_record *stack;
406		484
407	lockdep_assert_held(&pool_rwlock);	485	lockdep_assert_not_held(&pool_lock);
408		486
409	if (parts.pool_index > pools_num) {	487	if (parts.pool_index > pools_num_cached) {
410	WARN(1, "pool index %d out of bounds (%d) for stack id %08x\n",	488	WARN(1, "pool index %d out of bounds (%d) for stack id %08x\n",
411	parts.pool_index, pools_num, handle);	489	parts.pool_index, pools_num_cached, handle);
412	return NULL;	490	return NULL;
413	}	491	}
414		492
415	pool = stack_pools[parts.pool_index];	493	pool = stack_pools[parts.pool_index];
416	if (!pool)	494	if (WARN_ON(!pool))
417	return NULL;	495	return NULL;
418		496
419	stack = pool + offset;	497	stack = pool + offset;
		498	if (WARN_ON(!refcount_read(&stack->count)))
		499	return NULL;
		500
420	return stack;	501	return stack;
421	}	502	}
422		503
423	/* Links stack into the freelist. */	504	/* Links stack into the freelist. */
424	static void depot_free_stack(struct stack_record *stack)	505	static void depot_free_stack(struct stack_record *stack)
425	{	506	{
426	lockdep_assert_held_write(&pool_rwlock);	507	unsigned long flags;
		508
		509	lockdep_assert_not_held(&pool_lock);
427		510
428	list_add(&stack->list, &free_stacks);	511	raw_spin_lock_irqsave(&pool_lock, flags);
		512	printk_deferred_enter();
		513
		514	/*
		515	* Remove the entry from the hash list. Concurrent list traversal may
		516	* still observe the entry, but since the refcount is zero, this entry
		517	* will no longer be considered as valid.
		518	*/
		519	list_del_rcu(&stack->hash_list);
		520
		521	/*
		522	* Due to being used from constrained contexts such as the allocators,
		523	* NMI, or even RCU itself, stack depot cannot rely on primitives that
		524	* would sleep (such as synchronize_rcu()) or recursively call into
		525	* stack depot again (such as call_rcu()).
		526	*
		527	* Instead, get an RCU cookie, so that we can ensure this entry isn't
		528	* moved onto another list until the next grace period, and concurrent
		529	* RCU list traversal remains safe.
		530	*/
		531	stack->rcu_state = get_state_synchronize_rcu();
		532
		533	/*
		534	* Add the entry to the freelist tail, so that older entries are
		535	* considered first - their RCU cookie is more likely to no longer be
		536	* associated with the current grace period.
		537	*/
		538	list_add_tail(&stack->free_list, &free_stacks);
		539
		540	counters[DEPOT_COUNTER_FREELIST_SIZE]++;
		541	counters[DEPOT_COUNTER_FREES]++;
		542	counters[DEPOT_COUNTER_INUSE]--;
		543
		544	printk_deferred_exit();
		545	raw_spin_unlock_irqrestore(&pool_lock, flags);
429	}	546	}
430		547
431	/* Calculates the hash for a stack. */	548	/* Calculates the hash for a stack. */
@@ -453,22 +570,52 @@ int stackdepot_memcmp(const unsigned long u1, const unsigned long u2, · 21 unmodified lines
453		570
454	/* Finds a stack in a bucket of the hash table. */	571	/* Finds a stack in a bucket of the hash table. */
455	static inline struct stack_record find_stack(struct list_head bucket,	572	static inline struct stack_record find_stack(struct list_head bucket,
456	unsigned long *entries, int size,	573	unsigned long *entries, int size,
457	u32 hash)	574	u32 hash, depot_flags_t flags)
458	{	575	{
459	struct list_head *pos;	576	struct stack_record stack, ret = NULL;
460	struct stack_record *found;	577
		578	/*
		579	* Stack depot may be used from instrumentation that instruments RCU or
		580	* tracing itself; use variant that does not call into RCU and cannot be
		581	* traced.
		582	*
		583	* Note: Such use cases must take care when using refcounting to evict
		584	* unused entries, because the stack record free-then-reuse code paths
		585	* do call into RCU.
		586	*/
		587	rcu_read_lock_sched_notrace();
461		588
462	lockdep_assert_held(&pool_rwlock);	589	list_for_each_entry_rcu(stack, bucket, hash_list) {
		590	if (stack->hash != hash \|\| stack->size != size)
		591	continue;
		592
		593	/*
		594	* This may race with depot_free_stack() accessing the freelist
		595	* management state unioned with @entries. The refcount is zero
		596	* in that case and the below refcount_inc_not_zero() will fail.
		597	*/
		598	if (data_race(stackdepot_memcmp(entries, stack->entries, size)))
		599	continue;
		600
		601	/*
		602	* Try to increment refcount. If this succeeds, the stack record
		603	* is valid and has not yet been freed.
		604	*
		605	* If STACK_DEPOT_FLAG_GET is not used, it is undefined behavior
		606	* to then call stack_depot_put() later, and we can assume that
		607	* a stack record is never placed back on the freelist.
		608	*/
		609	if ((flags & STACK_DEPOT_FLAG_GET) && !refcount_inc_not_zero(&stack->count))
		610	continue;
463		611
464	list_for_each(pos, bucket) {	612	ret = stack;
465	found = list_entry(pos, struct stack_record, list);	613	break;
466	if (found->hash == hash &&
467	found->size == size &&
468	!stackdepot_memcmp(entries, found->entries, size))
469	return found;
470	}	614	}
471	return NULL;	615
		616	rcu_read_unlock_sched_notrace();
		617
		618	return ret;
472	}	619	}
473		620
474	depot_stack_handle_t stack_depot_save_flags(unsigned long *entries,	621	depot_stack_handle_t stack_depot_save_flags(unsigned long *entries,
@@ -482,7 +629,6 @@ depot_stack_handle_t stack_depot_save_flags(unsigned long *entries, · 7 unmodified lines
482	struct page *page = NULL;	629	struct page *page = NULL;
483	void *prealloc = NULL;	630	void *prealloc = NULL;
484	bool can_alloc = depot_flags & STACK_DEPOT_FLAG_CAN_ALLOC;	631	bool can_alloc = depot_flags & STACK_DEPOT_FLAG_CAN_ALLOC;
485	bool need_alloc = false;
486	unsigned long flags;	632	unsigned long flags;
487	u32 hash;	633	u32 hash;
488		634
@@ -505,31 +651,16 @@ depot_stack_handle_t stack_depot_save_flags(unsigned long *entries, · 16 unmodified lines
505	hash = hash_stack(entries, nr_entries);	651	hash = hash_stack(entries, nr_entries);
506	bucket = &stack_table[hash & stack_hash_mask];	652	bucket = &stack_table[hash & stack_hash_mask];
507		653
508	read_lock_irqsave(&pool_rwlock, flags);	654	/* Fast path: look the stack trace up without locking. */
509	printk_deferred_enter();	655	found = find_stack(bucket, entries, nr_entries, hash, depot_flags);
510		656	if (found)
511	/* Fast path: look the stack trace up without full locking. */
512	found = find_stack(bucket, entries, nr_entries, hash);
513	if (found) {
514	if (depot_flags & STACK_DEPOT_FLAG_GET)
515	refcount_inc(&found->count);
516	printk_deferred_exit();
517	read_unlock_irqrestore(&pool_rwlock, flags);
518	goto exit;	657	goto exit;
519	}
520
521	/* Take note if another stack pool needs to be allocated. */
522	if (new_pool_required)
523	need_alloc = true;
524
525	printk_deferred_exit();
526	read_unlock_irqrestore(&pool_rwlock, flags);
527		658
528	/*	659	/*
529	* Allocate memory for a new pool if required now:	660	* Allocate memory for a new pool if required now:
530	* we won't be able to do that under the lock.	661	* we won't be able to do that under the lock.
531	*/	662	*/
532	if (unlikely(can_alloc && need_alloc)) {	663	if (unlikely(can_alloc && READ_ONCE(new_pool_required))) {
533	/*	664	/*
534	* Zero out zone modifiers, as we don't have specific zone	665	* Zero out zone modifiers, as we don't have specific zone
535	* requirements. Keep the flags related to allocation in atomic	666	* requirements. Keep the flags related to allocation in atomic
@@ -543,31 +674,36 @@ depot_stack_handle_t stack_depot_save_flags(unsigned long *entries, · 7 unmodified lines
543	prealloc = page_address(page);	674	prealloc = page_address(page);
544	}	675	}
545		676
546	write_lock_irqsave(&pool_rwlock, flags);	677	raw_spin_lock_irqsave(&pool_lock, flags);
547	printk_deferred_enter();	678	printk_deferred_enter();
548		679
549	found = find_stack(bucket, entries, nr_entries, hash);	680	/* Try to find again, to avoid concurrently inserting duplicates. */
		681	found = find_stack(bucket, entries, nr_entries, hash, depot_flags);
550	if (!found) {	682	if (!found) {
551	struct stack_record *new =	683	struct stack_record *new =
552	depot_alloc_stack(entries, nr_entries, hash, &prealloc);	684	depot_alloc_stack(entries, nr_entries, hash, &prealloc);
553		685
554	if (new) {	686	if (new) {
555	list_add(&new->list, bucket);	687	/*
		688	* This releases the stack record into the bucket and
		689	* makes it visible to readers in find_stack().
		690	*/
		691	list_add_rcu(&new->hash_list, bucket);
556	found = new;	692	found = new;
557	}	693	}
558	} else {	694	}
559	if (depot_flags & STACK_DEPOT_FLAG_GET)	695
560	refcount_inc(&found->count);	696	if (prealloc) {
561	/*	697	/*
562	* Stack depot already contains this stack trace, but let's	698	* Either stack depot already contains this stack trace, or
563	* keep the preallocated memory for future.	699	* depot_alloc_stack() did not consume the preallocated memory.
		700	* Try to keep the preallocated memory for future.
564	*/	701	*/
565	if (prealloc)	702	depot_keep_new_pool(&prealloc);
566	depot_keep_new_pool(&prealloc);
567	}	703	}
568		704
569	printk_deferred_exit();	705	printk_deferred_exit();
570	write_unlock_irqrestore(&pool_rwlock, flags);	706	raw_spin_unlock_irqrestore(&pool_lock, flags);
571	exit:	707	exit:
572	if (prealloc) {	708	if (prealloc) {
573	/* Stack depot didn't use this memory, free it. */	709	/* Stack depot didn't use this memory, free it. */
@@ -592,7 +728,6 @@ unsigned int stack_depot_fetch(depot_stack_handle_t handle, · 18 unmodified lines
592	unsigned long **entries)	728	unsigned long **entries)
593	{	729	{
594	struct stack_record *stack;	730	struct stack_record *stack;
595	unsigned long flags;
596		731
597	*entries = NULL;	732	*entries = NULL;
598	/*	733	/*
@@ -604,13 +739,13 @@ unsigned int stack_depot_fetch(depot_stack_handle_t handle, · 5 unmodified lines
604	if (!handle \|\| stack_depot_disabled)	739	if (!handle \|\| stack_depot_disabled)
605	return 0;	740	return 0;
606		741
607	read_lock_irqsave(&pool_rwlock, flags);
608	printk_deferred_enter();
609
610	stack = depot_fetch_stack(handle);	742	stack = depot_fetch_stack(handle);
611		743	/*
612	printk_deferred_exit();	744	* Should never be NULL, otherwise this is a use-after-put (or just a
613	read_unlock_irqrestore(&pool_rwlock, flags);	745	* corrupt handle).
		746	*/
		747	if (WARN(!stack, "corrupt handle or use after stack_depot_put()"))
		748	return 0;
614		749
615	*entries = stack->entries;	750	*entries = stack->entries;
616	return stack->size;	751	return stack->size;
@@ -620,29 +755,20 @@ EXPORT_SYMBOL_GPL(stack_depot_fetch); · 3 unmodified lines
620	void stack_depot_put(depot_stack_handle_t handle)	755	void stack_depot_put(depot_stack_handle_t handle)
621	{	756	{
622	struct stack_record *stack;	757	struct stack_record *stack;
623	unsigned long flags;
624		758
625	if (!handle \|\| stack_depot_disabled)	759	if (!handle \|\| stack_depot_disabled)
626	return;	760	return;
627		761
628	write_lock_irqsave(&pool_rwlock, flags);
629	printk_deferred_enter();
630
631	stack = depot_fetch_stack(handle);	762	stack = depot_fetch_stack(handle);
632	if (WARN_ON(!stack))	763	/*
633	goto out;	764	* Should always be able to find the stack record, otherwise this is an
634		765	* unbalanced put attempt (or corrupt handle).
635	if (refcount_dec_and_test(&stack->count)) {	766	*/
636	/* Unlink stack from the hash table. */	767	if (WARN(!stack, "corrupt handle or unbalanced stack_depot_put()"))
637	list_del(&stack->list);	768	return;
638		769
639	/* Free stack. */	770	if (refcount_dec_and_test(&stack->count))
640	depot_free_stack(stack);	771	depot_free_stack(stack);
641	}
642
643	out:
644	printk_deferred_exit();
645	write_unlock_irqrestore(&pool_rwlock, flags);
646	}	772	}
647	EXPORT_SYMBOL_GPL(stack_depot_put);	773	EXPORT_SYMBOL_GPL(stack_depot_put);
648		774
@@ -690,3 +816,30 @@ unsigned int stack_depot_get_extra_bits(depot_stack_handle_t handle) · 41 unmodified lines
690	return parts.extra;	816	return parts.extra;
691	}	817	}
692	EXPORT_SYMBOL(stack_depot_get_extra_bits);	818	EXPORT_SYMBOL(stack_depot_get_extra_bits);
		819
		820	static int stats_show(struct seq_file seq, void v)
		821	{
		822	/*
		823	* data race ok: These are just statistics counters, and approximate
		824	* statistics are ok for debugging.
		825	*/
		826	seq_printf(seq, "pools: %d\n", data_race(pools_num));
		827	for (int i = 0; i < DEPOT_COUNTER_COUNT; i++)
		828	seq_printf(seq, "%s: %ld\n", counter_names[i], data_race(counters[i]));
		829
		830	return 0;
		831	}
		832	DEFINE_SHOW_ATTRIBUTE(stats);
		833
		834	static int depot_debugfs_init(void)
		835	{
		836	struct dentry *dir;
		837
		838	if (stack_depot_disabled)
		839	return 0;
		840
		841	dir = debugfs_create_dir("stackdepot", NULL);
		842	debugfs_create_file("stats", 0444, dir, NULL, &stats_fops);
		843	return 0;
		844	}
		845	late_initcall(depot_debugfs_init);

mm/huge_memory.c+14−4

 #include <linux/page_owner.h>
 #include <linux/sched/sysctl.h>
 #include <linux/memory-tiers.h>
+#include <linux/compat.h>
 #include <asm/tlb.h>
 #include <asm/pgalloc.h>
 {
 	loff_t off_end = off + len;
 	loff_t off_align = round_up(off, size);
-	unsigned long len_pad, ret;
+	unsigned long len_pad, ret, off_sub;
+	if (IS_ENABLED(CONFIG_32BIT) || in_compat_syscall())
+		return 0;
 	if (off_end <= off_align || (off_end - off_align) < size)
 		return 0;
 	if (ret == addr)
 		return addr;
-	ret += (off - ret) & (size - 1);
+	off_sub = (off - ret) & (size - 1);
+	if (current->mm->get_unmapped_area == arch_get_unmapped_area_topdown &&
+	    !off_sub)
+		return ret + size;
+	ret += off_sub;
 	return ret;
 }
 			page = pmd_page(old_pmd);
 			folio = page_folio(page);
 			if (!folio_test_dirty(folio) && pmd_dirty(old_pmd))
-				folio_set_dirty(folio);
+				folio_mark_dirty(folio);
 			if (!folio_test_referenced(folio) && pmd_young(old_pmd))
 				folio_set_referenced(folio);
 			folio_remove_rmap_pmd(folio, page, vma);
 	}
 	if (pmd_dirty(pmdval))
-		folio_set_dirty(folio);
+		folio_mark_dirty(folio);
 	if (pmd_write(pmdval))
 		entry = make_writable_migration_entry(page_to_pfn(page));
 	else if (anon_exclusive)

mm/memblock.c+3−0

@@ -2176,6 +2176,9 @@ static void __init memmap_init_reserved_pages(void) · 2175 unmodified lines
2176	start = region->base;	2176	start = region->base;
2177	end = start + region->size;	2177	end = start + region->size;
2178		2178
		2179	if (nid == NUMA_NO_NODE \|\| nid >= MAX_NUMNODES)
		2180	nid = early_pfn_to_nid(PFN_DOWN(start));
		2181
2179	reserve_bootmem_region(start, end, nid);	2182	reserve_bootmem_region(start, end, nid);
2180	}	2183	}
2181	}	2184	}

mm/memcontrol.c+25−4

 }
 /*
- * Scheduled by try_charge() to be executed from the userland return path
+ * Reclaims memory over the high limit. Called directly from
- * and reclaims memory over the high limit.
+ * try_charge() (context permitting), as well as from the userland
+ * return path where reclaim is always able to block.
  */
 void mem_cgroup_handle_over_high(gfp_t gfp_mask)
 {
 	current->memcg_nr_pages_over_high = 0;
 retry_reclaim:
+	/*
+	 * Bail if the task is already exiting. Unlike memory.max,
+	 * memory.high enforcement isn't as strict, and there is no
+	 * OOM killer involved, which means the excess could already
+	 * be much bigger (and still growing) than it could for
+	 * memory.max; the dying task could get stuck in fruitless
+	 * reclaim for a long time, which isn't desirable.
+	 */
+	if (task_is_dying())
+		goto out;
 	/*
 	 * The allocating task should reclaim at least the batch size, but for
 	 * subsequent retries we only want to do what's necessary to prevent oom
 	}
 	/*
+	 * Reclaim didn't manage to push usage below the limit, slow
+	 * this allocating task down.
+	 *
 	 * If we exit early, we're guaranteed to die (since
 	 * schedule_timeout_killable sets TASK_KILLABLE). This means we don't
 	 * need to account for any ill-begotten jiffies to pay them off later.
 		}
 	} while ((memcg = parent_mem_cgroup(memcg)));
+	/*
+	 * Reclaim is set up above to be called from the userland
+	 * return path. But also attempt synchronous reclaim to avoid
+	 * excessive overrun while the task is still inside the
+	 * kernel. If this is successful, the return path will see it
+	 * when it rechecks the overage and simply bail out.
+	 */
 	if (current->memcg_nr_pages_over_high > MEMCG_CHARGE_BATCH &&
 	    !(current->flags & PF_MEMALLOC) &&
-	    gfpflags_allow_blocking(gfp_mask)) {
+	    gfpflags_allow_blocking(gfp_mask))
 		mem_cgroup_handle_over_high(gfp_mask);
-	}
 	return 0;
 }

mm/memory-failure.c+1−1

@@ -982,7 +982,7 @@ static bool has_extra_refcount(struct page_state ps, struct page p, · 981 unmodified lines
982	int count = page_count(p) - 1;	982	int count = page_count(p) - 1;
983		983
984	if (extra_pins)	984	if (extra_pins)
985	count -= 1;	985	count -= folio_nr_pages(page_folio(p));
986		986
987	if (count > 0) {	987	if (count > 0) {
988	pr_err("%#lx: %s still referenced by %d users\n",	988	pr_err("%#lx: %s still referenced by %d users\n",

mm/memory.c+1−1

@@ -1464,7 +1464,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, · 1463 unmodified lines
1464	delay_rmap = 0;	1464	delay_rmap = 0;
1465	if (!folio_test_anon(folio)) {	1465	if (!folio_test_anon(folio)) {
1466	if (pte_dirty(ptent)) {	1466	if (pte_dirty(ptent)) {
1467	folio_set_dirty(folio);	1467	folio_mark_dirty(folio);
1468	if (tlb_delay_rmap(tlb)) {	1468	if (tlb_delay_rmap(tlb)) {
1469	delay_rmap = 1;	1469	delay_rmap = 1;
1470	force_flush = 1;	1470	force_flush = 1;

mm/mmap.c+4−2

 		/*
 		 * mmap_region() will call shmem_zero_setup() to create a file,
 		 * so use shmem's get_unmapped_area in case it can be huge.
-		 * do_mmap() will clear pgoff, so match alignment.
 		 */
-		pgoff = 0;
 		get_area = shmem_get_unmapped_area;
 	} else if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
 		/* Ensures that larger anonymous mappings are THP aligned. */
 		get_area = thp_get_unmapped_area;
 	}
+	/* Always treat pgoff as zero for anonymous memory. */
+	if (!file)
+		pgoff = 0;
 	addr = get_area(file, addr, len, pgoff, flags);
 	if (IS_ERR_VALUE(addr))
 		return addr;

mm/page-writeback.c+1−1

@@ -1638,7 +1638,7 @@ static inline void wb_dirty_limits(struct dirty_throttle_control *dtc) · 1637 unmodified lines
1638	*/	1638	*/
1639	dtc->wb_thresh = __wb_calc_thresh(dtc);	1639	dtc->wb_thresh = __wb_calc_thresh(dtc);
1640	dtc->wb_bg_thresh = dtc->thresh ?	1640	dtc->wb_bg_thresh = dtc->thresh ?
1641	div_u64((u64)dtc->wb_thresh * dtc->bg_thresh, dtc->thresh) : 0;	1641	div64_u64(dtc->wb_thresh * dtc->bg_thresh, dtc->thresh) : 0;
1642		1642
1643	/*	1643	/*
1644	* In order to avoid the stacked BDI deadlock we need	1644	* In order to avoid the stacked BDI deadlock we need

mm/readahead.c+2−2

@@ -469,7 +469,7 @@ static inline int ra_alloc_folio(struct readahead_control *ractl, pgoff_t index, · 468 unmodified lines
469		469
470	if (!folio)	470	if (!folio)
471	return -ENOMEM;	471	return -ENOMEM;
472	mark = round_up(mark, 1UL << order);	472	mark = round_down(mark, 1UL << order);
473	if (index == mark)	473	if (index == mark)
474	folio_set_readahead(folio);	474	folio_set_readahead(folio);
475	err = filemap_add_folio(ractl->mapping, folio, index, gfp);	475	err = filemap_add_folio(ractl->mapping, folio, index, gfp);
@@ -575,7 +575,7 @@ static void ondemand_readahead(struct readahead_control *ractl, · 99 unmodified lines
575	* It's the expected callback index, assume sequential access.	575	* It's the expected callback index, assume sequential access.
576	* Ramp up sizes, and push forward the readahead window.	576	* Ramp up sizes, and push forward the readahead window.
577	*/	577	*/
578	expected = round_up(ra->start + ra->size - ra->async_size,	578	expected = round_down(ra->start + ra->size - ra->async_size,
579	1UL << order);	579	1UL << order);
580	if (index == expected \|\| index == (ra->start + ra->size)) {	580	if (index == expected \|\| index == (ra->start + ra->size)) {
581	ra->start += ra->size;	581	ra->start += ra->size;

mm/userfaultfd.c+13−2

 					      unsigned long dst_start,
 					      unsigned long src_start,
 					      unsigned long len,
+					      atomic_t *mmap_changing,
 					      uffd_flags_t flags)
 {
 	struct mm_struct *dst_mm = dst_vma->vm_mm;
 				goto out;
 			}
 			mmap_read_lock(dst_mm);
+			/*
+			 * If memory mappings are changing because of non-cooperative
+			 * operation (e.g. mremap) running in parallel, bail out and
+			 * request the user to retry later
+			 */
+			if (mmap_changing && atomic_read(mmap_changing)) {
+				err = -EAGAIN;
+				break;
+			}
 			dst_vma = NULL;
 			goto retry;
 				    unsigned long dst_start,
 				    unsigned long src_start,
 				    unsigned long len,
+				    atomic_t *mmap_changing,
 				    uffd_flags_t flags);
 #endif /* CONFIG_HUGETLB_PAGE */
 	 * If this is a HUGETLB vma, pass off to appropriate routine
 	 */
 	if (is_vm_hugetlb_page(dst_vma))
-		return  mfill_atomic_hugetlb(dst_vma, dst_start,
+		return  mfill_atomic_hugetlb(dst_vma, dst_start, src_start,
-					     src_start, len, flags);
+					     len, mmap_changing, flags);
 	if (!vma_is_anonymous(dst_vma) && !vma_is_shmem(dst_vma))
 		goto out_unlock;

net/batman-adv/multicast.c+3−0

 	cancel_delayed_work_sync(&bat_priv->mcast.work);
 	batadv_tvlv_container_unregister(bat_priv, BATADV_TVLV_MCAST, 2);
+	batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_MCAST_TRACKER, 1);
 	batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_MCAST, 2);
 	/* safely calling outside of worker, as worker was canceled above */
 				      BATADV_MCAST_WANT_NO_RTR4);
 	batadv_mcast_want_rtr6_update(bat_priv, orig,
 				      BATADV_MCAST_WANT_NO_RTR6);
+	batadv_mcast_have_mc_ptype_update(bat_priv, orig,
+					  BATADV_MCAST_HAVE_MC_PTYPE_CAPA);
 	spin_unlock_bh(&orig->mcast_handler_lock);
 }

net/bridge/br_multicast.c+15−5

 }
 #endif
+static void br_multicast_query_delay_expired(struct timer_list *t)
+{
+}
 static void br_multicast_select_own_querier(struct net_bridge_mcast *brmctx,
 					    struct br_ip *ip,
 					    struct sk_buff *skb)
 				unsigned long max_delay)
 {
 	if (!timer_pending(&query->timer))
-		query->delay_time = jiffies + max_delay;
+		mod_timer(&query->delay_timer, jiffies + max_delay);
 	mod_timer(&query->timer, jiffies + brmctx->multicast_querier_interval);
 }
 	brmctx->multicast_querier_interval = 255 * HZ;
 	brmctx->multicast_membership_interval = 260 * HZ;
-	brmctx->ip4_other_query.delay_time = 0;
 	brmctx->ip4_querier.port_ifidx = 0;
 	seqcount_spinlock_init(&brmctx->ip4_querier.seq, &br->multicast_lock);
 	brmctx->multicast_igmp_version = 2;
 #if IS_ENABLED(CONFIG_IPV6)
 	brmctx->multicast_mld_version = 1;
-	brmctx->ip6_other_query.delay_time = 0;
 	brmctx->ip6_querier.port_ifidx = 0;
 	seqcount_spinlock_init(&brmctx->ip6_querier.seq, &br->multicast_lock);
 #endif
 		    br_ip4_multicast_local_router_expired, 0);
 	timer_setup(&brmctx->ip4_other_query.timer,
 		    br_ip4_multicast_querier_expired, 0);
+	timer_setup(&brmctx->ip4_other_query.delay_timer,
+		    br_multicast_query_delay_expired, 0);
 	timer_setup(&brmctx->ip4_own_query.timer,
 		    br_ip4_multicast_query_expired, 0);
 #if IS_ENABLED(CONFIG_IPV6)
 		    br_ip6_multicast_local_router_expired, 0);
 	timer_setup(&brmctx->ip6_other_query.timer,
 		    br_ip6_multicast_querier_expired, 0);
+	timer_setup(&brmctx->ip6_other_query.delay_timer,
+		    br_multicast_query_delay_expired, 0);
 	timer_setup(&brmctx->ip6_own_query.timer,
 		    br_ip6_multicast_query_expired, 0);
 #endif
 {
 	del_timer_sync(&brmctx->ip4_mc_router_timer);
 	del_timer_sync(&brmctx->ip4_other_query.timer);
+	del_timer_sync(&brmctx->ip4_other_query.delay_timer);
 	del_timer_sync(&brmctx->ip4_own_query.timer);
 #if IS_ENABLED(CONFIG_IPV6)
 	del_timer_sync(&brmctx->ip6_mc_router_timer);
 	del_timer_sync(&brmctx->ip6_other_query.timer);
+	del_timer_sync(&brmctx->ip6_other_query.delay_timer);
 	del_timer_sync(&brmctx->ip6_own_query.timer);
 #endif
 }
 	max_delay = brmctx->multicast_query_response_interval;
 	if (!timer_pending(&brmctx->ip4_other_query.timer))
-		brmctx->ip4_other_query.delay_time = jiffies + max_delay;
+		mod_timer(&brmctx->ip4_other_query.delay_timer,
+			  jiffies + max_delay);
 	br_multicast_start_querier(brmctx, &brmctx->ip4_own_query);
 #if IS_ENABLED(CONFIG_IPV6)
 	if (!timer_pending(&brmctx->ip6_other_query.timer))
-		brmctx->ip6_other_query.delay_time = jiffies + max_delay;
+		mod_timer(&brmctx->ip6_other_query.delay_timer,
+			  jiffies + max_delay);
 	br_multicast_start_querier(brmctx, &brmctx->ip6_own_query);
 #endif

net/bridge/br_private.h+2−2

@@ -78,7 +78,7 @@ struct bridge_mcast_own_query { · 77 unmodified lines
78	/* other querier */	78	/* other querier */
79	struct bridge_mcast_other_query {	79	struct bridge_mcast_other_query {
80	struct timer_list timer;	80	struct timer_list timer;
81	unsigned long delay_time;	81	struct timer_list delay_timer;
82	};	82	};
83		83
84	/* selected querier */	84	/* selected querier */
@@ -1159,7 +1159,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx, · 1074 unmodified lines
1159	own_querier_enabled = false;	1159	own_querier_enabled = false;
1160	}	1160	}
1161		1161
1162	return time_is_before_jiffies(querier->delay_time) &&	1162	return !timer_pending(&querier->delay_timer) &&
1163	(own_querier_enabled \|\| timer_pending(&querier->timer));	1163	(own_querier_enabled \|\| timer_pending(&querier->timer));
1164	}	1164	}
1165		1165

net/devlink/port.c+1−1

@@ -674,7 +674,7 @@ static int devlink_port_function_validate(struct devlink_port *devlink_port, · 673 unmodified lines
674	return -EOPNOTSUPP;	674	return -EOPNOTSUPP;
675	}	675	}
676	if (tb[DEVLINK_PORT_FN_ATTR_STATE] && !ops->port_fn_state_set) {	676	if (tb[DEVLINK_PORT_FN_ATTR_STATE] && !ops->port_fn_state_set) {
677	NL_SET_ERR_MSG_ATTR(extack, tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR],	677	NL_SET_ERR_MSG_ATTR(extack, tb[DEVLINK_PORT_FN_ATTR_STATE],
678	"Function does not support state setting");	678	"Function does not support state setting");
679	return -EOPNOTSUPP;	679	return -EOPNOTSUPP;
680	}	680	}

net/hsr/hsr_device.c+2−2

@@ -308,7 +308,7 @@ static void send_hsr_supervision_frame(struct hsr_port *master, · 307 unmodified lines
308		308
309	skb = hsr_init_skb(master);	309	skb = hsr_init_skb(master);
310	if (!skb) {	310	if (!skb) {
311	WARN_ONCE(1, "HSR: Could not send supervision frame\n");	311	netdev_warn_once(master->dev, "HSR: Could not send supervision frame\n");
312	return;	312	return;
313	}	313	}
314		314
@@ -355,7 +355,7 @@ static void send_prp_supervision_frame(struct hsr_port *master, · 40 unmodified lines
355		355
356	skb = hsr_init_skb(master);	356	skb = hsr_init_skb(master);
357	if (!skb) {	357	if (!skb) {
358	WARN_ONCE(1, "PRP: Could not send supervision frame\n");	358	netdev_warn_once(master->dev, "PRP: Could not send supervision frame\n");
359	return;	359	return;
360	}	360	}
361		361

net/ipv4/ip_output.c+6−6

 	if (unlikely(!rt))
 		return -EFAULT;
+	cork->fragsize = ip_sk_use_pmtu(sk) ?
+			 dst_mtu(&rt->dst) : READ_ONCE(rt->dst.dev->mtu);
+	if (!inetdev_valid_mtu(cork->fragsize))
+		return -ENETUNREACH;
 	/*
 	 * setup for corking.
 	 */
 		cork->addr = ipc->addr;
 	}
-	cork->fragsize = ip_sk_use_pmtu(sk) ?
-			 dst_mtu(&rt->dst) : READ_ONCE(rt->dst.dev->mtu);
-	if (!inetdev_valid_mtu(cork->fragsize))
-		return -ENETUNREACH;
 	cork->gso_size = ipc->gso_size;
 	cork->dst = &rt->dst;

net/ipv4/ip_sockglue.c+4−2

  * ipv4_pktinfo_prepare - transfer some info from rtable to skb
  * @sk: socket
  * @skb: buffer
+ * @drop_dst: if true, drops skb dst
  *
  * To support IP_CMSG_PKTINFO option, we store rt_iif and specific
  * destination in skb->cb[] before dst drop.
  * This way, receiver doesn't make cache line misses to read rtable.
  */
-void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb)
+void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb, bool drop_dst)
 {
 	struct in_pktinfo *pktinfo = PKTINFO_SKB_CB(skb);
 	bool prepare = inet_test_bit(PKTINFO, sk) ||
 		pktinfo->ipi_ifindex = 0;
 		pktinfo->ipi_spec_dst.s_addr = 0;
 	}
-	skb_dst_drop(skb);
+	if (drop_dst)
+		skb_dst_drop(skb);
 }
 int ip_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,

net/ipv4/ipmr.c+1−1

@@ -1073,7 +1073,7 @@ static int ipmr_cache_report(const struct mr_table *mrt, · 1072 unmodified lines
1073	msg = (struct igmpmsg *)skb_network_header(skb);	1073	msg = (struct igmpmsg *)skb_network_header(skb);
1074	msg->im_vif = vifi;	1074	msg->im_vif = vifi;
1075	msg->im_vif_hi = vifi >> 8;	1075	msg->im_vif_hi = vifi >> 8;
1076	ipv4_pktinfo_prepare(mroute_sk, pkt);	1076	ipv4_pktinfo_prepare(mroute_sk, pkt, false);
1077	memcpy(skb->cb, pkt->cb, sizeof(skb->cb));	1077	memcpy(skb->cb, pkt->cb, sizeof(skb->cb));
1078	/* Add our header */	1078	/* Add our header */
1079	igmp = skb_put(skb, sizeof(struct igmphdr));	1079	igmp = skb_put(skb, sizeof(struct igmphdr));

net/ipv4/raw.c+1−1

@@ -292,7 +292,7 @@ static int raw_rcv_skb(struct sock sk, struct sk_buff skb) · 291 unmodified lines
292		292
293	/* Charge it to the socket. */	293	/* Charge it to the socket. */
294		294
295	ipv4_pktinfo_prepare(sk, skb);	295	ipv4_pktinfo_prepare(sk, skb, true);
296	if (sock_queue_rcv_skb_reason(sk, skb, &reason) < 0) {	296	if (sock_queue_rcv_skb_reason(sk, skb, &reason) < 0) {
297	kfree_skb_reason(skb, reason);	297	kfree_skb_reason(skb, reason);
298	return NET_RX_DROP;	298	return NET_RX_DROP;

net/ipv4/tcp.c+11−1

@@ -1786,7 +1786,17 @@ static skb_frag_t skb_advance_to_frag(struct sk_buff skb, u32 offset_skb, · 1785 unmodified lines
1786		1786
1787	static bool can_map_frag(const skb_frag_t *frag)	1787	static bool can_map_frag(const skb_frag_t *frag)
1788	{	1788	{
1789	return skb_frag_size(frag) == PAGE_SIZE && !skb_frag_off(frag);	1789	struct page *page;
		1790
		1791	if (skb_frag_size(frag) != PAGE_SIZE \|\| skb_frag_off(frag))
		1792	return false;
		1793
		1794	page = skb_frag_page(frag);
		1795
		1796	if (PageCompound(page) \|\| page->mapping)
		1797	return false;
		1798
		1799	return true;
1790	}	1800	}
1791		1801
1792	static int find_next_mappable_frag(const skb_frag_t *frag,	1802	static int find_next_mappable_frag(const skb_frag_t *frag,

net/ipv4/udp.c+1−1

@@ -2169,7 +2169,7 @@ static int udp_queue_rcv_one_skb(struct sock sk, struct sk_buff skb) · 2168 unmodified lines
2169		2169
2170	udp_csum_pull_header(skb);	2170	udp_csum_pull_header(skb);
2171		2171
2172	ipv4_pktinfo_prepare(sk, skb);	2172	ipv4_pktinfo_prepare(sk, skb, true);
2173	return __udp_queue_rcv_skb(sk, skb);	2173	return __udp_queue_rcv_skb(sk, skb);
2174		2174
2175	csum_error:	2175	csum_error:

net/ipv6/addrconf_core.c+14−7

 EXPORT_SYMBOL_GPL(ipv6_stub);
 /* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */
-const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
+const struct in6_addr in6addr_loopback __aligned(BITS_PER_LONG/8)
+	= IN6ADDR_LOOPBACK_INIT;
 EXPORT_SYMBOL(in6addr_loopback);
-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
+const struct in6_addr in6addr_any __aligned(BITS_PER_LONG/8)
+	= IN6ADDR_ANY_INIT;
 EXPORT_SYMBOL(in6addr_any);
-const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;
+const struct in6_addr in6addr_linklocal_allnodes __aligned(BITS_PER_LONG/8)
+	= IN6ADDR_LINKLOCAL_ALLNODES_INIT;
 EXPORT_SYMBOL(in6addr_linklocal_allnodes);
-const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;
+const struct in6_addr in6addr_linklocal_allrouters __aligned(BITS_PER_LONG/8)
+	= IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;
 EXPORT_SYMBOL(in6addr_linklocal_allrouters);
-const struct in6_addr in6addr_interfacelocal_allnodes = IN6ADDR_INTERFACELOCAL_ALLNODES_INIT;
+const struct in6_addr in6addr_interfacelocal_allnodes __aligned(BITS_PER_LONG/8)
+	= IN6ADDR_INTERFACELOCAL_ALLNODES_INIT;
 EXPORT_SYMBOL(in6addr_interfacelocal_allnodes);
-const struct in6_addr in6addr_interfacelocal_allrouters = IN6ADDR_INTERFACELOCAL_ALLROUTERS_INIT;
+const struct in6_addr in6addr_interfacelocal_allrouters __aligned(BITS_PER_LONG/8)
+	= IN6ADDR_INTERFACELOCAL_ALLROUTERS_INIT;
 EXPORT_SYMBOL(in6addr_interfacelocal_allrouters);
-const struct in6_addr in6addr_sitelocal_allrouters = IN6ADDR_SITELOCAL_ALLROUTERS_INIT;
+const struct in6_addr in6addr_sitelocal_allrouters __aligned(BITS_PER_LONG/8)
+	= IN6ADDR_SITELOCAL_ALLROUTERS_INIT;
 EXPORT_SYMBOL(in6addr_sitelocal_allrouters);
 static void snmp6_free_dev(struct inet6_dev *idev)

net/ipv6/ip6_tunnel.c+18−3

 						struct sk_buff *skb),
 			 bool log_ecn_err)
 {
-	const struct ipv6hdr *ipv6h = ipv6_hdr(skb);
+	const struct ipv6hdr *ipv6h;
-	int err;
+	int nh, err;
 	if ((!(tpi->flags & TUNNEL_CSUM) &&
 	     (tunnel->parms.i_flags & TUNNEL_CSUM)) ||
 			goto drop;
 		}
-		ipv6h = ipv6_hdr(skb);
 		skb->protocol = eth_type_trans(skb, tunnel->dev);
 		skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
 	} else {
 		skb_reset_mac_header(skb);
 	}
+	/* Save offset of outer header relative to skb->head,
+	 * because we are going to reset the network header to the inner header
+	 * and might change skb->head.
+	 */
+	nh = skb_network_header(skb) - skb->head;
 	skb_reset_network_header(skb);
+	if (!pskb_inet_may_pull(skb)) {
+		DEV_STATS_INC(tunnel->dev, rx_length_errors);
+		DEV_STATS_INC(tunnel->dev, rx_errors);
+		goto drop;
+	}
+	/* Get the outer header. */
+	ipv6h = (struct ipv6hdr *)(skb->head + nh);
 	memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
 	__skb_tunnel_rx(skb, tunnel->dev, tunnel->net);

net/llc/af_llc.c+2−0

 	}
 	netdev_put(llc->dev, &llc->dev_tracker);
 	sock_put(sk);
+	sock_orphan(sk);
+	sock->sk = NULL;
 	llc_sk_free(sk);
 out:
 	return 0;

net/mptcp/protocol.c+0−3

@@ -2314,9 +2314,6 @@ bool __mptcp_retransmit_pending_data(struct sock *sk) · 2313 unmodified lines
2314	if (__mptcp_check_fallback(msk))	2314	if (__mptcp_check_fallback(msk))
2315	return false;	2315	return false;
2316		2316
2317	if (tcp_rtx_and_write_queues_empty(sk))
2318	return false;
2319
2320	/* the closing socket has some data untransmitted and/or unacked:	2317	/* the closing socket has some data untransmitted and/or unacked:
2321	* some data in the mptcp rtx queue has not really xmitted yet.	2318	* some data in the mptcp rtx queue has not really xmitted yet.
2322	* keep it simple and re-inject the whole mptcp level rtx queue	2319	* keep it simple and re-inject the whole mptcp level rtx queue

net/netfilter/ipset/ip_set_bitmap_gen.h+11−3

 #define mtype_del		IPSET_TOKEN(MTYPE, _del)
 #define mtype_list		IPSET_TOKEN(MTYPE, _list)
 #define mtype_gc		IPSET_TOKEN(MTYPE, _gc)
+#define mtype_cancel_gc		IPSET_TOKEN(MTYPE, _cancel_gc)
 #define mtype			MTYPE
 #define get_ext(set, map, id)	((map)->extensions + ((set)->dsize * (id)))
 {
 	struct mtype *map = set->data;
-	if (SET_WITH_TIMEOUT(set))
-		del_timer_sync(&map->gc);
 	if (set->dsize && set->extensions & IPSET_EXT_DESTROY)
 		mtype_ext_cleanup(set);
 	ip_set_free(map->members);
 	add_timer(&map->gc);
 }
+static void
+mtype_cancel_gc(struct ip_set *set)
+{
+	struct mtype *map = set->data;
+	if (SET_WITH_TIMEOUT(set))
+		del_timer_sync(&map->gc);
+}
 static const struct ip_set_type_variant mtype = {
 	.kadt	= mtype_kadt,
 	.uadt	= mtype_uadt,
 	.head	= mtype_head,
 	.list	= mtype_list,
 	.same_set = mtype_same_set,
+	.cancel_gc = mtype_cancel_gc,
 };
 #endif /* __IP_SET_BITMAP_IP_GEN_H */

net/netfilter/ipset/ip_set_core.c+28−9

@@ -1182,6 +1182,14 @@ ip_set_destroy_set(struct ip_set *set) · 1181 unmodified lines
1182	kfree(set);	1182	kfree(set);
1183	}	1183	}
1184		1184
		1185	static void
		1186	ip_set_destroy_set_rcu(struct rcu_head *head)
		1187	{
		1188	struct ip_set *set = container_of(head, struct ip_set, rcu);
		1189
		1190	ip_set_destroy_set(set);
		1191	}
		1192
1185	static int ip_set_destroy(struct sk_buff skb, const struct nfnl_info info,	1193	static int ip_set_destroy(struct sk_buff skb, const struct nfnl_info info,
1186	const struct nlattr * const attr[])	1194	const struct nlattr * const attr[])
1187	{	1195	{
@@ -1193,8 +1201,6 @@ static int ip_set_destroy(struct sk_buff skb, const struct nfnl_info info, · 5 unmodified lines
1193	if (unlikely(protocol_min_failed(attr)))	1201	if (unlikely(protocol_min_failed(attr)))
1194	return -IPSET_ERR_PROTOCOL;	1202	return -IPSET_ERR_PROTOCOL;
1195		1203
1196	/* Must wait for flush to be really finished in list:set */
1197	rcu_barrier();
1198		1204
1199	/* Commands are serialized and references are	1205	/* Commands are serialized and references are
1200	* protected by the ip_set_ref_lock.	1206	* protected by the ip_set_ref_lock.
@@ -1206,8 +1212,10 @@ static int ip_set_destroy(struct sk_buff skb, const struct nfnl_info info, · 5 unmodified lines
1206	* counter, so if it's already zero, we can proceed	1212	* counter, so if it's already zero, we can proceed
1207	* without holding the lock.	1213	* without holding the lock.
1208	*/	1214	*/
1209	read_lock_bh(&ip_set_ref_lock);
1210	if (!attr[IPSET_ATTR_SETNAME]) {	1215	if (!attr[IPSET_ATTR_SETNAME]) {
		1216	/* Must wait for flush to be really finished in list:set */
		1217	rcu_barrier();
		1218	read_lock_bh(&ip_set_ref_lock);
1211	for (i = 0; i < inst->ip_set_max; i++) {	1219	for (i = 0; i < inst->ip_set_max; i++) {
1212	s = ip_set(inst, i);	1220	s = ip_set(inst, i);
1213	if (s && (s->ref \|\| s->ref_netlink)) {	1221	if (s && (s->ref \|\| s->ref_netlink)) {
@@ -1221,6 +1229,8 @@ static int ip_set_destroy(struct sk_buff skb, const struct nfnl_info info, · 7 unmodified lines
1221	s = ip_set(inst, i);	1229	s = ip_set(inst, i);
1222	if (s) {	1230	if (s) {
1223	ip_set(inst, i) = NULL;	1231	ip_set(inst, i) = NULL;
		1232	/* Must cancel garbage collectors */
		1233	s->variant->cancel_gc(s);
1224	ip_set_destroy_set(s);	1234	ip_set_destroy_set(s);
1225	}	1235	}
1226	}	1236	}
@@ -1228,6 +1238,9 @@ static int ip_set_destroy(struct sk_buff skb, const struct nfnl_info info, · 1 unmodified line
1228	inst->is_destroyed = false;	1238	inst->is_destroyed = false;
1229	} else {	1239	} else {
1230	u32 flags = flag_exist(info->nlh);	1240	u32 flags = flag_exist(info->nlh);
		1241	u16 features = 0;
		1242
		1243	read_lock_bh(&ip_set_ref_lock);
1231	s = find_set_and_id(inst, nla_data(attr[IPSET_ATTR_SETNAME]),	1244	s = find_set_and_id(inst, nla_data(attr[IPSET_ATTR_SETNAME]),
1232	&i);	1245	&i);
1233	if (!s) {	1246	if (!s) {
@@ -1238,10 +1251,16 @@ static int ip_set_destroy(struct sk_buff skb, const struct nfnl_info info, · 4 unmodified lines
1238	ret = -IPSET_ERR_BUSY;	1251	ret = -IPSET_ERR_BUSY;
1239	goto out;	1252	goto out;
1240	}	1253	}
		1254	features = s->type->features;
1241	ip_set(inst, i) = NULL;	1255	ip_set(inst, i) = NULL;
1242	read_unlock_bh(&ip_set_ref_lock);	1256	read_unlock_bh(&ip_set_ref_lock);
1243		1257	if (features & IPSET_TYPE_NAME) {
1244	ip_set_destroy_set(s);	1258	/* Must wait for flush to be really finished */
		1259	rcu_barrier();
		1260	}
		1261	/* Must cancel garbage collectors */
		1262	s->variant->cancel_gc(s);
		1263	call_rcu(&s->rcu, ip_set_destroy_set_rcu);
1245	}	1264	}
1246	return 0;	1265	return 0;
1247	out:	1266	out:
@@ -1394,9 +1413,6 @@ static int ip_set_swap(struct sk_buff skb, const struct nfnl_info info, · 146 unmodified lines
1394	ip_set(inst, to_id) = from;	1413	ip_set(inst, to_id) = from;
1395	write_unlock_bh(&ip_set_ref_lock);	1414	write_unlock_bh(&ip_set_ref_lock);
1396		1415
1397	/* Make sure all readers of the old set pointers are completed. */
1398	synchronize_rcu();
1399
1400	return 0;	1416	return 0;
1401	}	1417	}
1402		1418
@@ -2409,8 +2425,11 @@ ip_set_fini(void) · 1006 unmodified lines
2409	{	2425	{
2410	nf_unregister_sockopt(&so_set);	2426	nf_unregister_sockopt(&so_set);
2411	nfnetlink_subsys_unregister(&ip_set_netlink_subsys);	2427	nfnetlink_subsys_unregister(&ip_set_netlink_subsys);
2412
2413	unregister_pernet_subsys(&ip_set_net_ops);	2428	unregister_pernet_subsys(&ip_set_net_ops);
		2429
		2430	/* Wait for call_rcu() in destroy */
		2431	rcu_barrier();
		2432
2414	pr_debug("these are the famous last words\n");	2433	pr_debug("these are the famous last words\n");
2415	}	2434	}
2416		2435

net/netfilter/ipset/ip_set_hash_gen.h+12−3

 #undef mtype_gc_do
 #undef mtype_gc
 #undef mtype_gc_init
+#undef mtype_cancel_gc
 #undef mtype_variant
 #undef mtype_data_match
 #define mtype_gc_do		IPSET_TOKEN(MTYPE, _gc_do)
 #define mtype_gc		IPSET_TOKEN(MTYPE, _gc)
 #define mtype_gc_init		IPSET_TOKEN(MTYPE, _gc_init)
+#define mtype_cancel_gc		IPSET_TOKEN(MTYPE, _cancel_gc)
 #define mtype_variant		IPSET_TOKEN(MTYPE, _variant)
 #define mtype_data_match	IPSET_TOKEN(MTYPE, _data_match)
 	struct htype *h = set->data;
 	struct list_head *l, *lt;
-	if (SET_WITH_TIMEOUT(set))
-		cancel_delayed_work_sync(&h->gc.dwork);
 	mtype_ahash_destroy(set, ipset_dereference_nfnl(h->table), true);
 	list_for_each_safe(l, lt, &h->ad) {
 		list_del(l);
 	queue_delayed_work(system_power_efficient_wq, &gc->dwork, HZ);
 }
+static void
+mtype_cancel_gc(struct ip_set *set)
+{
+	struct htype *h = set->data;
+	if (SET_WITH_TIMEOUT(set))
+		cancel_delayed_work_sync(&h->gc.dwork);
+}
 static int
 mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext,
 	  struct ip_set_ext *mext, u32 flags);
 	.uref	= mtype_uref,
 	.resize	= mtype_resize,
 	.same_set = mtype_same_set,
+	.cancel_gc = mtype_cancel_gc,
 	.region_lock = true,
 };

net/netfilter/ipset/ip_set_list_set.c+10−3

 	struct list_set *map = set->data;
 	struct set_elem *e, *n;
-	if (SET_WITH_TIMEOUT(set))
-		timer_shutdown_sync(&map->gc);
 	list_for_each_entry_safe(e, n, &map->members, list) {
 		list_del(&e->list);
 		ip_set_put_byindex(map->net, e->id);
 	       a->extensions == b->extensions;
 }
+static void
+list_set_cancel_gc(struct ip_set *set)
+{
+	struct list_set *map = set->data;
+	if (SET_WITH_TIMEOUT(set))
+		timer_shutdown_sync(&map->gc);
+}
 static const struct ip_set_type_variant set_variant = {
 	.kadt	= list_set_kadt,
 	.uadt	= list_set_uadt,
 	.head	= list_set_head,
 	.list	= list_set_list,
 	.same_set = list_set_same_set,
+	.cancel_gc = list_set_cancel_gc,
 };
 static void

net/netfilter/nf_conntrack_proto_sctp.c+1−1

@@ -283,7 +283,7 @@ sctp_new(struct nf_conn ct, const struct sk_buff skb, · 282 unmodified lines
283	pr_debug("Setting vtag %x for secondary conntrack\n",	283	pr_debug("Setting vtag %x for secondary conntrack\n",
284	sh->vtag);	284	sh->vtag);
285	ct->proto.sctp.vtag[IP_CT_DIR_ORIGINAL] = sh->vtag;	285	ct->proto.sctp.vtag[IP_CT_DIR_ORIGINAL] = sh->vtag;
286	} else {	286	} else if (sch->type == SCTP_CID_SHUTDOWN_ACK) {
287	/* If it is a shutdown ack OOTB packet, we expect a return	287	/* If it is a shutdown ack OOTB packet, we expect a return
288	shutdown complete, otherwise an ABORT Sec 8.4 (5) and (8) */	288	shutdown complete, otherwise an ABORT Sec 8.4 (5) and (8) */
289	pr_debug("Setting vtag %x for new conn OOTB\n",	289	pr_debug("Setting vtag %x for new conn OOTB\n",

net/netfilter/nf_conntrack_proto_tcp.c+6−4

 			    const struct sk_buff *skb,
 			    unsigned int dataoff,
 			    const struct tcphdr *tcph,
-			    u32 end, u32 win)
+			    u32 end, u32 win,
+			    enum ip_conntrack_dir dir)
 {
 	/* SYN-ACK in reply to a SYN
 	 * or SYN from reply direction in simultaneous open.
 	 * Both sides must send the Window Scale option
 	 * to enable window scaling in either direction.
 	 */
-	if (!(sender->flags & IP_CT_TCP_FLAG_WINDOW_SCALE &&
+	if (dir == IP_CT_DIR_REPLY &&
+	    !(sender->flags & IP_CT_TCP_FLAG_WINDOW_SCALE &&
 	      receiver->flags & IP_CT_TCP_FLAG_WINDOW_SCALE)) {
 		sender->td_scale = 0;
 		receiver->td_scale = 0;
 		if (tcph->syn) {
 			tcp_init_sender(sender, receiver,
 					skb, dataoff, tcph,
-					end, win);
+					end, win, dir);
 			if (!tcph->ack)
 				/* Simultaneous open */
 				return NFCT_TCP_ACCEPT;
 		 */
 		tcp_init_sender(sender, receiver,
 				skb, dataoff, tcph,
-				end, win);
+				end, win, dir);
 		if (dir == IP_CT_DIR_REPLY && !tcph->ack)
 			return NFCT_TCP_ACCEPT;

net/netfilter/nf_log.c+4−3

 		return;
 	}
-	BUG_ON(loggers[pf][type] == NULL);
 	rcu_read_lock();
 	logger = rcu_dereference(loggers[pf][type]);
-	module_put(logger->me);
+	if (!logger)
+		WARN_ON_ONCE(1);
+	else
+		module_put(logger->me);
 	rcu_read_unlock();
 }
 EXPORT_SYMBOL_GPL(nf_logger_put);

net/netfilter/nf_tables_api.c+9−5

 	return -1;
 }
-static const struct nft_object_type *__nft_obj_type_get(u32 objtype)
+static const struct nft_object_type *__nft_obj_type_get(u32 objtype, u8 family)
 {
 	const struct nft_object_type *type;
 	list_for_each_entry(type, &nf_tables_objects, list) {
+		if (type->family != NFPROTO_UNSPEC &&
+		    type->family != family)
+			continue;
 		if (objtype == type->type)
 			return type;
 	}
 }
 static const struct nft_object_type *
-nft_obj_type_get(struct net *net, u32 objtype)
+nft_obj_type_get(struct net *net, u32 objtype, u8 family)
 {
 	const struct nft_object_type *type;
-	type = __nft_obj_type_get(objtype);
+	type = __nft_obj_type_get(objtype, family);
 	if (type != NULL && try_module_get(type->owner))
 		return type;
 		if (info->nlh->nlmsg_flags & NLM_F_REPLACE)
 			return -EOPNOTSUPP;
-		type = __nft_obj_type_get(objtype);
+		type = __nft_obj_type_get(objtype, family);
 		if (WARN_ON_ONCE(!type))
 			return -ENOENT;
 	if (!nft_use_inc(&table->use))
 		return -EMFILE;
-	type = nft_obj_type_get(net, objtype);
+	type = nft_obj_type_get(net, objtype, family);
 	if (IS_ERR(type)) {
 		err = PTR_ERR(type);
 		goto err_type;

net/netfilter/nft_ct.c+24−0

@@ -1250,7 +1250,31 @@ static int nft_ct_expect_obj_init(const struct nft_ctx *ctx, · 1249 unmodified lines
1250	if (tb[NFTA_CT_EXPECT_L3PROTO])	1250	if (tb[NFTA_CT_EXPECT_L3PROTO])
1251	priv->l3num = ntohs(nla_get_be16(tb[NFTA_CT_EXPECT_L3PROTO]));	1251	priv->l3num = ntohs(nla_get_be16(tb[NFTA_CT_EXPECT_L3PROTO]));
1252		1252
		1253	switch (priv->l3num) {
		1254	case NFPROTO_IPV4:
		1255	case NFPROTO_IPV6:
		1256	if (priv->l3num != ctx->family)
		1257	return -EINVAL;
		1258
		1259	fallthrough;
		1260	case NFPROTO_INET:
		1261	break;
		1262	default:
		1263	return -EOPNOTSUPP;
		1264	}
		1265
1253	priv->l4proto = nla_get_u8(tb[NFTA_CT_EXPECT_L4PROTO]);	1266	priv->l4proto = nla_get_u8(tb[NFTA_CT_EXPECT_L4PROTO]);
		1267	switch (priv->l4proto) {
		1268	case IPPROTO_TCP:
		1269	case IPPROTO_UDP:
		1270	case IPPROTO_UDPLITE:
		1271	case IPPROTO_DCCP:
		1272	case IPPROTO_SCTP:
		1273	break;
		1274	default:
		1275	return -EOPNOTSUPP;
		1276	}
		1277
1254	priv->dport = nla_get_be16(tb[NFTA_CT_EXPECT_DPORT]);	1278	priv->dport = nla_get_be16(tb[NFTA_CT_EXPECT_DPORT]);
1255	priv->timeout = nla_get_u32(tb[NFTA_CT_EXPECT_TIMEOUT]);	1279	priv->timeout = nla_get_u32(tb[NFTA_CT_EXPECT_TIMEOUT]);
1256	priv->size = nla_get_u8(tb[NFTA_CT_EXPECT_SIZE]);	1280	priv->size = nla_get_u8(tb[NFTA_CT_EXPECT_SIZE]);

net/netfilter/nft_tunnel.c+1−0

@@ -713,6 +713,7 @@ static const struct nft_object_ops nft_tunnel_obj_ops = { · 712 unmodified lines
713		713
714	static struct nft_object_type nft_tunnel_obj_type __read_mostly = {	714	static struct nft_object_type nft_tunnel_obj_type __read_mostly = {
715	.type = NFT_OBJECT_TUNNEL,	715	.type = NFT_OBJECT_TUNNEL,
		716	.family = NFPROTO_NETDEV,
716	.ops = &nft_tunnel_obj_ops,	717	.ops = &nft_tunnel_obj_ops,
717	.maxattr = NFTA_TUNNEL_KEY_MAX,	718	.maxattr = NFTA_TUNNEL_KEY_MAX,
718	.policy = nft_tunnel_key_policy,	719	.policy = nft_tunnel_key_policy,

net/nfc/nci/core.c+4−0

 {
 	nfc_free_device(ndev->nfc_dev);
 	nci_hci_deallocate(ndev);
+	/* drop partial rx data packet if present */
+	if (ndev->rx_data_reassembly)
+		kfree_skb(ndev->rx_data_reassembly);
 	kfree(ndev);
 }
 EXPORT_SYMBOL(nci_free_device);

net/smc/smc_core.c+9−3

 			   struct smcd_dev *smcismdev,
 			   struct smcd_gid *peer_gid)
 {
-	return lgr->peer_gid.gid == peer_gid->gid && lgr->smcd == smcismdev &&
+	if (lgr->peer_gid.gid != peer_gid->gid ||
-		smc_ism_is_virtual(smcismdev) ?
+	    lgr->smcd != smcismdev)
-		(lgr->peer_gid.gid_ext == peer_gid->gid_ext) : 1;
+		return false;
+	if (smc_ism_is_virtual(smcismdev) &&
+	    lgr->peer_gid.gid_ext != peer_gid->gid_ext)
+		return false;
+	return true;
 }
 /* create a new SMC connection (and a new link group if necessary) */

net/sunrpc/svc.c+2−2

@@ -1598,10 +1598,10 @@ void svc_process_bc(struct rpc_rqst req, struct svc_rqst rqstp) · 1597 unmodified lines
1598	/* Finally, send the reply synchronously */	1598	/* Finally, send the reply synchronously */
1599	if (rqstp->bc_to_initval > 0) {	1599	if (rqstp->bc_to_initval > 0) {
1600	timeout.to_initval = rqstp->bc_to_initval;	1600	timeout.to_initval = rqstp->bc_to_initval;
1601	timeout.to_retries = rqstp->bc_to_initval;	1601	timeout.to_retries = rqstp->bc_to_retries;
1602	} else {	1602	} else {
1603	timeout.to_initval = req->rq_xprt->timeout->to_initval;	1603	timeout.to_initval = req->rq_xprt->timeout->to_initval;
1604	timeout.to_initval = req->rq_xprt->timeout->to_retries;	1604	timeout.to_retries = req->rq_xprt->timeout->to_retries;
1605	}	1605	}
1606	memcpy(&req->rq_snd_buf, &rqstp->rq_res, sizeof(req->rq_snd_buf));	1606	memcpy(&req->rq_snd_buf, &rqstp->rq_res, sizeof(req->rq_snd_buf));
1607	task = rpc_run_bc_task(req, &timeout);	1607	task = rpc_run_bc_task(req, &timeout);

net/unix/af_unix.c+6−8

@@ -1342,13 +1342,11 @@ static void unix_state_double_lock(struct sock sk1, struct sock sk2) · 1341 unmodified lines
1342	unix_state_lock(sk1);	1342	unix_state_lock(sk1);
1343	return;	1343	return;
1344	}	1344	}
1345	if (sk1 < sk2) {	1345	if (sk1 > sk2)
1346	unix_state_lock(sk1);	1346	swap(sk1, sk2);
1347	unix_state_lock_nested(sk2);	1347
1348	} else {	1348	unix_state_lock(sk1);
1349	unix_state_lock(sk2);	1349	unix_state_lock_nested(sk2, U_LOCK_SECOND);
1350	unix_state_lock_nested(sk1);
1351	}
1352	}	1350	}
1353		1351
1354	static void unix_state_double_unlock(struct sock sk1, struct sock sk2)	1352	static void unix_state_double_unlock(struct sock sk1, struct sock sk2)
@@ -1589,7 +1587,7 @@ restart: · 234 unmodified lines
1589	goto out_unlock;	1587	goto out_unlock;
1590	}	1588	}
1591		1589
1592	unix_state_lock_nested(sk);	1590	unix_state_lock_nested(sk, U_LOCK_SECOND);
1593		1591
1594	if (sk->sk_state != st) {	1592	if (sk->sk_state != st) {
1595	unix_state_unlock(sk);	1593	unix_state_unlock(sk);

net/unix/diag.c+1−1

@@ -84,7 +84,7 @@ static int sk_diag_dump_icons(struct sock sk, struct sk_buff nlskb) · 83 unmodified lines
84	* queue lock. With the other's queue locked it's	84	* queue lock. With the other's queue locked it's
85	* OK to lock the state.	85	* OK to lock the state.
86	*/	86	*/
87	unix_state_lock_nested(req);	87	unix_state_lock_nested(req, U_LOCK_DIAG);
88	peer = unix_sk(req)->peer;	88	peer = unix_sk(req)->peer;
89	buf[i++] = (peer ? sock_i_ino(peer) : 0);	89	buf[i++] = (peer ? sock_i_ino(peer) : 0);
90	unix_state_unlock(req);	90	unix_state_unlock(req);

scripts/Makefile.defconf+4−4

@@ -9,8 +9,8 @@ · 8 unmodified lines
9	# Input config fragments without '.config' suffix	9	# Input config fragments without '.config' suffix
10	define merge_into_defconfig	10	define merge_into_defconfig
11	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \	11	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
12	-m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \	12	-m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
13	$(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)	13	$(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
14	+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig	14	+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
15	endef	15	endef
16		16
@@ -23,7 +23,7 @@ endef · 6 unmodified lines
23	# Input config fragments without '.config' suffix	23	# Input config fragments without '.config' suffix
24	define merge_into_defconfig_override	24	define merge_into_defconfig_override
25	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \	25	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
26	-Q -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \	26	-Q -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
27	$(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)	27	$(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
28	+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig	28	+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
29	endef	29	endef

scripts/kconfig/symbol.c+3−1

 	oldval = sym->curr;
+	newval.tri = no;
 	switch (sym->type) {
 	case S_INT:
 		newval.val = "0";
 		break;
 	case S_BOOLEAN:
 	case S_TRISTATE:
-		newval = symbol_no.curr;
+		newval.val = "n";
 		break;
 	default:
 		sym->curr.val = sym->name;

scripts/mod/modpost.c+3−12

 		break;
 	case LOG_ERROR:
 		fprintf(stderr, "ERROR: ");
-		break;
+		error_occurred = true;
-	case LOG_FATAL:
-		fprintf(stderr, "FATAL: ");
 		break;
 	default: /* invalid loglevel, ignore */
 		break;
 	va_start(arglist, fmt);
 	vfprintf(stderr, fmt, arglist);
 	va_end(arglist);
-	if (loglevel == LOG_FATAL)
-		exit(1);
-	if (loglevel == LOG_ERROR)
-		error_occurred = true;
 }
-void __attribute__((alias("modpost_log")))
-modpost_log_noret(enum loglevel loglevel, const char *fmt, ...);
 static inline bool strends(const char *str, const char *postfix)
 {
 	if (strlen(str) < strlen(postfix))
 #define DATA_SECTIONS ".data", ".data.rel"
 #define TEXT_SECTIONS ".text", ".text.*", ".sched.text", \
-		".kprobes.text", ".cpuidle.text", ".noinstr.text"
+		".kprobes.text", ".cpuidle.text", ".noinstr.text", \
+		".ltext", ".ltext.*"
 #define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \
 		".fixup", ".entry.text", ".exception.text", \
 		".coldtext", ".softirqentry.text"

scripts/mod/modpost.h+1−5

 enum loglevel {
 	LOG_WARN,
 	LOG_ERROR,
-	LOG_FATAL
 };
 void __attribute__((format(printf, 2, 3)))
 modpost_log(enum loglevel loglevel, const char *fmt, ...);
-void __attribute__((format(printf, 2, 3), noreturn))
-modpost_log_noret(enum loglevel loglevel, const char *fmt, ...);
 /*
  * warn - show the given message, then let modpost continue running, still
  *        allowing modpost to exit successfully. This should be used when
  */
 #define warn(fmt, args...)	modpost_log(LOG_WARN, fmt, ##args)
 #define error(fmt, args...)	modpost_log(LOG_ERROR, fmt, ##args)
-#define fatal(fmt, args...)	modpost_log_noret(LOG_FATAL, fmt, ##args)
+#define fatal(fmt, args...)	do { error(fmt, ##args); exit(1); } while (1)

scripts/package/kernel.spec+11−11

 %{make} %{makeflags} KERNELRELEASE=%{KERNELRELEASE} KBUILD_BUILD_VERSION=%{release}
 %install
-mkdir -p %{buildroot}/boot
+mkdir -p %{buildroot}/lib/modules/%{KERNELRELEASE}
-cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEASE}
+cp $(%{make} %{makeflags} -s image_name) %{buildroot}/lib/modules/%{KERNELRELEASE}/vmlinuz
 %{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} modules_install
 %{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
-cp System.map %{buildroot}/boot/System.map-%{KERNELRELEASE}
+cp System.map %{buildroot}/lib/modules/%{KERNELRELEASE}
-cp .config %{buildroot}/boot/config-%{KERNELRELEASE}
+cp .config %{buildroot}/lib/modules/%{KERNELRELEASE}/config
 ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/build
 %if %{with_devel}
 %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}'
 rm -rf %{buildroot}
 %post
-if [ -x /sbin/installkernel -a -r /boot/vmlinuz-%{KERNELRELEASE} -a -r /boot/System.map-%{KERNELRELEASE} ]; then
+if [ -x /usr/bin/kernel-install ]; then
-cp /boot/vmlinuz-%{KERNELRELEASE} /boot/.vmlinuz-%{KERNELRELEASE}-rpm
+	/usr/bin/kernel-install add %{KERNELRELEASE} /lib/modules/%{KERNELRELEASE}/vmlinuz
-cp /boot/System.map-%{KERNELRELEASE} /boot/.System.map-%{KERNELRELEASE}-rpm
-rm -f /boot/vmlinuz-%{KERNELRELEASE} /boot/System.map-%{KERNELRELEASE}
-/sbin/installkernel %{KERNELRELEASE} /boot/.vmlinuz-%{KERNELRELEASE}-rpm /boot/.System.map-%{KERNELRELEASE}-rpm
-rm -f /boot/.vmlinuz-%{KERNELRELEASE}-rpm /boot/.System.map-%{KERNELRELEASE}-rpm
 fi
+for file in vmlinuz System.map config; do
+	if ! cmp --silent "/lib/modules/%{KERNELRELEASE}/${file}" "/boot/${file}-%{KERNELRELEASE}"; then
+		cp "/lib/modules/%{KERNELRELEASE}/${file}" "/boot/${file}-%{KERNELRELEASE}"
+	fi
+done
 %preun
 if [ -x /sbin/new-kernel-pkg ]; then
 %defattr (-, root, root)
 /lib/modules/%{KERNELRELEASE}
 %exclude /lib/modules/%{KERNELRELEASE}/build
-/boot/*
 %files headers
 %defattr (-, root, root)

security/security.c+40−5

@@ -4255,7 +4255,19 @@ EXPORT_SYMBOL(security_inode_setsecctx); · 4254 unmodified lines
4255	*/	4255	*/
4256	int security_inode_getsecctx(struct inode inode, void ctx, u32 ctxlen)	4256	int security_inode_getsecctx(struct inode inode, void ctx, u32 ctxlen)
4257	{	4257	{
4258	return call_int_hook(inode_getsecctx, -EOPNOTSUPP, inode, ctx, ctxlen);	4258	struct security_hook_list *hp;
		4259	int rc;
		4260
		4261	/*
		4262	* Only one module will provide a security context.
		4263	*/
		4264	hlist_for_each_entry(hp, &security_hook_heads.inode_getsecctx, list) {
		4265	rc = hp->hook.inode_getsecctx(inode, ctx, ctxlen);
		4266	if (rc != LSM_RET_DEFAULT(inode_getsecctx))
		4267	return rc;
		4268	}
		4269
		4270	return LSM_RET_DEFAULT(inode_getsecctx);
4259	}	4271	}
4260	EXPORT_SYMBOL(security_inode_getsecctx);	4272	EXPORT_SYMBOL(security_inode_getsecctx);
4261		4273
@@ -4612,8 +4624,20 @@ EXPORT_SYMBOL(security_sock_rcv_skb); · 350 unmodified lines
4612	int security_socket_getpeersec_stream(struct socket *sock, sockptr_t optval,	4624	int security_socket_getpeersec_stream(struct socket *sock, sockptr_t optval,
4613	sockptr_t optlen, unsigned int len)	4625	sockptr_t optlen, unsigned int len)
4614	{	4626	{
4615	return call_int_hook(socket_getpeersec_stream, -ENOPROTOOPT, sock,	4627	struct security_hook_list *hp;
4616	optval, optlen, len);	4628	int rc;
		4629
		4630	/*
		4631	* Only one module will provide a security context.
		4632	*/
		4633	hlist_for_each_entry(hp, &security_hook_heads.socket_getpeersec_stream,
		4634	list) {
		4635	rc = hp->hook.socket_getpeersec_stream(sock, optval, optlen,
		4636	len);
		4637	if (rc != LSM_RET_DEFAULT(socket_getpeersec_stream))
		4638	return rc;
		4639	}
		4640	return LSM_RET_DEFAULT(socket_getpeersec_stream);
4617	}	4641	}
4618		4642
4619	/**	4643	/**
@@ -4633,8 +4657,19 @@ int security_socket_getpeersec_stream(struct socket *sock, sockptr_t optval, · 13 unmodified lines
4633	int security_socket_getpeersec_dgram(struct socket *sock,	4657	int security_socket_getpeersec_dgram(struct socket *sock,
4634	struct sk_buff skb, u32 secid)	4658	struct sk_buff skb, u32 secid)
4635	{	4659	{
4636	return call_int_hook(socket_getpeersec_dgram, -ENOPROTOOPT, sock,	4660	struct security_hook_list *hp;
4637	skb, secid);	4661	int rc;
		4662
		4663	/*
		4664	* Only one module will provide a security context.
		4665	*/
		4666	hlist_for_each_entry(hp, &security_hook_heads.socket_getpeersec_dgram,
		4667	list) {
		4668	rc = hp->hook.socket_getpeersec_dgram(sock, skb, secid);
		4669	if (rc != LSM_RET_DEFAULT(socket_getpeersec_dgram))
		4670	return rc;
		4671	}
		4672	return LSM_RET_DEFAULT(socket_getpeersec_dgram);
4638	}	4673	}
4639	EXPORT_SYMBOL(security_socket_getpeersec_dgram);	4674	EXPORT_SYMBOL(security_socket_getpeersec_dgram);
4640		4675

tools/power/cpupower/bench/Makefile+1−1

@@ -15,7 +15,7 @@ LIBS = -L../ -L$(OUTPUT) -lm -lcpupower · 14 unmodified lines
15	OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o	15	OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o
16	endif	16	endif
17		17
18	CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\"	18	override CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\"
19		19
20	$(OUTPUT)%.o : %.c	20	$(OUTPUT)%.o : %.c
21	$(ECHO) " CC " $@	21	$(ECHO) " CC " $@

tools/testing/cxl/Kbuild+2−0

@@ -65,4 +65,6 @@ cxl_core-y += config_check.o · 64 unmodified lines
65	cxl_core-y += cxl_core_test.o	65	cxl_core-y += cxl_core_test.o
66	cxl_core-y += cxl_core_exports.o	66	cxl_core-y += cxl_core_exports.o
67		67
		68	KBUILD_CFLAGS := $(filter-out -Wmissing-prototypes -Wmissing-declarations, $(KBUILD_CFLAGS))
		69
68	obj-m += test/	70	obj-m += test/

tools/testing/cxl/test/Kbuild+2−0

@@ -8,3 +8,5 @@ obj-m += cxl_mock_mem.o · 7 unmodified lines
8	cxl_test-y := cxl.o	8	cxl_test-y := cxl.o
9	cxl_mock-y := mock.o	9	cxl_mock-y := mock.o
10	cxl_mock_mem-y := mem.o	10	cxl_mock_mem-y := mem.o
		11
		12	KBUILD_CFLAGS := $(filter-out -Wmissing-prototypes -Wmissing-declarations, $(KBUILD_CFLAGS))

tools/testing/nvdimm/Kbuild+2−0

@@ -82,4 +82,6 @@ libnvdimm-$(CONFIG_NVDIMM_KEYS) += $(NVDIMM_SRC)/security.o · 81 unmodified lines
82	libnvdimm-y += libnvdimm_test.o	82	libnvdimm-y += libnvdimm_test.o
83	libnvdimm-y += config_check.o	83	libnvdimm-y += config_check.o
84		84
		85	KBUILD_CFLAGS := $(filter-out -Wmissing-prototypes -Wmissing-declarations, $(KBUILD_CFLAGS))
		86
85	obj-m += test/	87	obj-m += test/

tools/testing/selftests/drivers/net/bonding/lag_lib.sh+11−0

@@ -48,6 +48,17 @@ test_LAG_cleanup() · 47 unmodified lines
48	ip link add mv0 link "$name" up address "$ucaddr" type macvlan	48	ip link add mv0 link "$name" up address "$ucaddr" type macvlan
49	# Used to test dev->mc handling	49	# Used to test dev->mc handling
50	ip address add "$addr6" dev "$name"	50	ip address add "$addr6" dev "$name"
		51
		52	# Check that addresses were added as expected
		53	(grep_bridge_fdb "$ucaddr" bridge fdb show dev dummy1 \|\|
		54	grep_bridge_fdb "$ucaddr" bridge fdb show dev dummy2) >/dev/null
		55	check_err $? "macvlan unicast address not found on a slave"
		56
		57	# mcaddr is added asynchronously by addrconf_dad_work(), use busywait
		58	(busywait 10000 grep_bridge_fdb "$mcaddr" bridge fdb show dev dummy1 \|\|
		59	grep_bridge_fdb "$mcaddr" bridge fdb show dev dummy2) >/dev/null
		60	check_err $? "IPv6 solicited-node multicast mac address not found on a slave"
		61
51	ip link set dev "$name" down	62	ip link set dev "$name" down
52	ip link del "$name"	63	ip link del "$name"
53		64

tools/testing/selftests/drivers/net/team/config+3−1

@@ -1,3 +1,5 @@
		1	CONFIG_DUMMY=y
		2	CONFIG_IPV6=y
		3	CONFIG_MACVLAN=y
1	CONFIG_NET_TEAM=y	4	CONFIG_NET_TEAM=y
2	CONFIG_NET_TEAM_MODE_LOADBALANCE=y	5	CONFIG_NET_TEAM_MODE_LOADBALANCE=y
3	CONFIG_MACVLAN=y

tools/testing/selftests/hid/tests/test_wacom_generic.py+4−4

@@ -880,8 +880,8 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest · 879 unmodified lines
880	does not overlap with other contacts. The value of `t` may be	880	does not overlap with other contacts. The value of `t` may be
881	incremented over time to move the point along a linear path.	881	incremented over time to move the point along a linear path.
882	"""	882	"""
883	x = 50 + 10 * contact_id + t	883	x = 50 + 10 * contact_id + t * 11
884	y = 100 + 100 * contact_id + t	884	y = 100 + 100 * contact_id + t * 11
885	return test_multitouch.Touch(contact_id, x, y)	885	return test_multitouch.Touch(contact_id, x, y)
886		886
887	def make_contacts(self, n, t=0):	887	def make_contacts(self, n, t=0):
@@ -902,8 +902,8 @@ class TestDTH2452Tablet(test_multitouch.BaseTest.TestMultitouch, TouchTabletTest · 14 unmodified lines
902	tracking_id = contact_ids.tracking_id	902	tracking_id = contact_ids.tracking_id
903	slot_num = contact_ids.slot_num	903	slot_num = contact_ids.slot_num
904		904
905	x = 50 + 10 * contact_id + t	905	x = 50 + 10 * contact_id + t * 11
906	y = 100 + 100 * contact_id + t	906	y = 100 + 100 * contact_id + t * 11
907		907
908	# If the data isn't supposed to be stored in any slots, there is	908	# If the data isn't supposed to be stored in any slots, there is
909	# nothing we can check for in the evdev stream.	909	# nothing we can check for in the evdev stream.

tools/testing/selftests/livepatch/functions.sh+17−20

@@ -42,17 +42,6 @@ function die() { · 41 unmodified lines
42	exit 1	42	exit 1
43	}	43	}
44		44
45	# save existing dmesg so we can detect new content
46	function save_dmesg() {
47	SAVED_DMESG=$(mktemp --tmpdir -t klp-dmesg-XXXXXX)
48	dmesg > "$SAVED_DMESG"
49	}
50
51	# cleanup temporary dmesg file from save_dmesg()
52	function cleanup_dmesg_file() {
53	rm -f "$SAVED_DMESG"
54	}
55
56	function push_config() {	45	function push_config() {
57	DYNAMIC_DEBUG=$(grep '^kernel/livepatch' /sys/kernel/debug/dynamic_debug/control \| \	46	DYNAMIC_DEBUG=$(grep '^kernel/livepatch' /sys/kernel/debug/dynamic_debug/control \| \
58	awk -F'[: ]' '{print "file " $1 " line " $2 " " $4}')	47	awk -F'[: ]' '{print "file " $1 " line " $2 " " $4}')
@@ -99,7 +88,6 @@ function set_ftrace_enabled() { · 40 unmodified lines
99		88
100	function cleanup() {	89	function cleanup() {
101	pop_config	90	pop_config
102	cleanup_dmesg_file
103	}	91	}
104		92
105	# setup_config - save the current config and set a script exit trap that	93	# setup_config - save the current config and set a script exit trap that
@@ -280,7 +268,15 @@ function set_pre_patch_ret { · 174 unmodified lines
280	function start_test {	268	function start_test {
281	local test="$1"	269	local test="$1"
282		270
283	save_dmesg	271	# Dump something unique into the dmesg log, then stash the entry
		272	# in LAST_DMESG. The check_result() function will use it to
		273	# find new kernel messages since the test started.
		274	local last_dmesg_msg="livepatch kselftest timestamp: $(date --rfc-3339=ns)"
		275	log "$last_dmesg_msg"
		276	loop_until 'dmesg \| grep -q "$last_dmesg_msg"' \|\|
		277	die "buffer busy? can't find canary dmesg message: $last_dmesg_msg"
		278	LAST_DMESG=$(dmesg \| grep "$last_dmesg_msg")
		279
284	echo -n "TEST: $test ... "	280	echo -n "TEST: $test ... "
285	log "===== TEST: $test ====="	281	log "===== TEST: $test ====="
286	}	282	}
@@ -291,23 +287,24 @@ function check_result { · 4 unmodified lines
291	local expect="$*"	287	local expect="$*"
292	local result	288	local result
293		289
294	# Note: when comparing dmesg output, the kernel log timestamps	290	# Test results include any new dmesg entry since LAST_DMESG, then:
295	# help differentiate repeated testing runs. Remove them with a	291	# - include lines matching keywords
296	# post-comparison sed filter.	292	# - exclude lines matching keywords
297		293	# - filter out dmesg timestamp prefixes
298	result=$(dmesg \| comm --nocheck-order -13 "$SAVED_DMESG" - \| \	294	result=$(dmesg \| awk -v last_dmesg="$LAST_DMESG" 'p; $0 == last_dmesg { p=1 }' \| \
299	grep -e 'livepatch:' -e 'test_klp' \| \	295	grep -e 'livepatch:' -e 'test_klp' \| \
300	grep -v '$tainting\\|taints$ kernel' \| \	296	grep -v '$tainting\\|taints$ kernel' \| \
301	sed 's/^\[[ 0-9.]*\] //')	297	sed 's/^\[[ 0-9.]*\] //')
302		298
303	if [[ "$expect" == "$result" ]] ; then	299	if [[ "$expect" == "$result" ]] ; then
304	echo "ok"	300	echo "ok"
		301	elif [[ "$result" == "" ]] ; then
		302	echo -e "not ok\n\nbuffer overrun? can't find canary dmesg entry: $LAST_DMESG\n"
		303	die "livepatch kselftest(s) failed"
305	else	304	else
306	echo -e "not ok\n\n$(diff -upr --label expected --label result <(echo "$expect") <(echo "$result"))\n"	305	echo -e "not ok\n\n$(diff -upr --label expected --label result <(echo "$expect") <(echo "$result"))\n"
307	die "livepatch kselftest(s) failed"	306	die "livepatch kselftest(s) failed"
308	fi	307	fi
309
310	cleanup_dmesg_file
311	}	308	}
312		309
313	# check_sysfs_rights(modname, rel_path, expected_rights) - check sysfs	310	# check_sysfs_rights(modname, rel_path, expected_rights) - check sysfs

tools/testing/selftests/mm/charge_reserved_hugetlb.sh+1−1

@@ -1,4 +1,4 @@
1	#!/bin/sh	1	#!/bin/bash
2	# SPDX-License-Identifier: GPL-2.0	2	# SPDX-License-Identifier: GPL-2.0
3		3
4	# Kselftest framework requirement - SKIP code is 4.	4	# Kselftest framework requirement - SKIP code is 4.

tools/testing/selftests/mm/ksm_tests.c+1−1

@@ -566,7 +566,7 @@ static int ksm_merge_hugepages_time(int merge_type, int mapping, int prot, · 565 unmodified lines
566	if (map_ptr_orig == MAP_FAILED)	566	if (map_ptr_orig == MAP_FAILED)
567	err(2, "initial mmap");	567	err(2, "initial mmap");
568		568
569	if (madvise(map_ptr, len + HPAGE_SIZE, MADV_HUGEPAGE))	569	if (madvise(map_ptr, len, MADV_HUGEPAGE))
570	err(2, "MADV_HUGEPAGE");	570	err(2, "MADV_HUGEPAGE");
571		571
572	pagemap_fd = open("/proc/self/pagemap", O_RDONLY);	572	pagemap_fd = open("/proc/self/pagemap", O_RDONLY);

tools/testing/selftests/mm/map_hugetlb.c+7−0

 #include <unistd.h>
 #include <sys/mman.h>
 #include <fcntl.h>
+#include "vm_util.h"
 #define LENGTH (256UL*1024*1024)
 #define PROTECTION (PROT_READ | PROT_WRITE)
 {
 	void *addr;
 	int ret;
+	size_t hugepage_size;
 	size_t length = LENGTH;
 	int flags = FLAGS;
 	int shift = 0;
+	hugepage_size = default_huge_page_size();
+	/* munmap with fail if the length is not page aligned */
+	if (hugepage_size > length)
+		length = hugepage_size;
 	if (argc > 1)
 		length = atol(argv[1]) << 20;
 	if (argc > 2) {

tools/testing/selftests/mm/mremap_test.c+14−13

 			      char pattern_seed)
 {
 	void *addr, *src_addr, *dest_addr, *dest_preamble_addr;
-	unsigned long long i;
+	int d;
+	unsigned long long t;
 	struct timespec t_start = {0, 0}, t_end = {0, 0};
 	long long  start_ns, end_ns, align_mask, ret, offset;
 	unsigned long long threshold;
 	/* Set byte pattern for source block. */
 	srand(pattern_seed);
-	for (i = 0; i < threshold; i++)
+	for (t = 0; t < threshold; t++)
-		memset((char *) src_addr + i, (char) rand(), 1);
+		memset((char *) src_addr + t, (char) rand(), 1);
 	/* Mask to zero out lower bits of address for alignment */
 	align_mask = ~(c.dest_alignment - 1);
 		/* Set byte pattern for the dest preamble block. */
 		srand(pattern_seed);
-		for (i = 0; i < c.dest_preamble_size; i++)
+		for (d = 0; d < c.dest_preamble_size; d++)
-			memset((char *) dest_preamble_addr + i, (char) rand(), 1);
+			memset((char *) dest_preamble_addr + d, (char) rand(), 1);
 	}
 	clock_gettime(CLOCK_MONOTONIC, &t_start);
 	/* Verify byte pattern after remapping */
 	srand(pattern_seed);
-	for (i = 0; i < threshold; i++) {
+	for (t = 0; t < threshold; t++) {
 		char c = (char) rand();
-		if (((char *) dest_addr)[i] != c) {
+		if (((char *) dest_addr)[t] != c) {
 			ksft_print_msg("Data after remap doesn't match at offset %llu\n",
-				       i);
+				       t);
 			ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff,
-					((char *) dest_addr)[i] & 0xff);
+					((char *) dest_addr)[t] & 0xff);
 			ret = -1;
 			goto clean_up_dest;
 		}
 	/* Verify the dest preamble byte pattern after remapping */
 	if (c.dest_preamble_size) {
 		srand(pattern_seed);
-		for (i = 0; i < c.dest_preamble_size; i++) {
+		for (d = 0; d < c.dest_preamble_size; d++) {
 			char c = (char) rand();
-			if (((char *) dest_preamble_addr)[i] != c) {
+			if (((char *) dest_preamble_addr)[d] != c) {
 				ksft_print_msg("Preamble data after remap doesn't match at offset %d\n",
-					       i);
+					       d);
 				ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff,
-					       ((char *) dest_preamble_addr)[i] & 0xff);
+					       ((char *) dest_preamble_addr)[d] & 0xff);
 				ret = -1;
 				goto clean_up_dest;
 			}

tools/testing/selftests/mm/va_high_addr_switch.sh+6−0

 	# See man 1 gzip under '-f'.
 	local pg_table_levels=$(gzip -dcfq "${config}" | grep PGTABLE_LEVELS | cut -d'=' -f 2)
+	local cpu_supports_pl5=$(awk '/^flags/ {if (/la57/) {print 0;}
+		else {print 1}; exit}' /proc/cpuinfo 2>/dev/null)
 	if [[ "${pg_table_levels}" -lt 5 ]]; then
 		echo "$0: PGTABLE_LEVELS=${pg_table_levels}, must be >= 5 to run this test"
 		exit $ksft_skip
+	elif [[ "${cpu_supports_pl5}" -ne 0 ]]; then
+		echo "$0: CPU does not have the necessary la57 flag to support page table level 5"
+		exit $ksft_skip
 	fi
 }

tools/testing/selftests/mm/write_hugetlb_memory.sh+1−1

@@ -1,4 +1,4 @@
1	#!/bin/sh	1	#!/bin/bash
2	# SPDX-License-Identifier: GPL-2.0	2	# SPDX-License-Identifier: GPL-2.0
3		3
4	set -e	4	set -e

tools/testing/selftests/net/Makefile+5−4

 TEST_PROGS += ip_local_port_range.sh
 TEST_PROGS += rps_default_mask.sh
 TEST_PROGS += big_tcp.sh
-TEST_PROGS_EXTENDED := in_netns.sh setup_loopback.sh setup_veth.sh
+TEST_PROGS_EXTENDED := toeplitz_client.sh toeplitz.sh
-TEST_PROGS_EXTENDED += toeplitz_client.sh toeplitz.sh lib.sh
 TEST_GEN_FILES =  socket nettest
 TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any
 TEST_GEN_FILES += tcp_mmap tcp_inq psock_snd txring_overwrite
 TEST_GEN_FILES += sctp_hello
 TEST_GEN_FILES += csum
 TEST_GEN_FILES += nat6to4.o
+TEST_GEN_FILES += xdp_dummy.o
 TEST_GEN_FILES += ip_local_port_range
 TEST_GEN_FILES += bind_wildcard
 TEST_PROGS += test_vxlan_mdb.sh
 TEST_PROGS += vlan_hw_filter.sh
 TEST_FILES := settings
+TEST_FILES += in_netns.sh lib.sh net_helper.sh setup_loopback.sh setup_veth.sh
 include ../lib.mk
 $(OUTPUT)/bind_bhash: LDLIBS += -lpthread
 $(OUTPUT)/io_uring_zerocopy_tx: CFLAGS += -I../../../include/
-# Rules to generate bpf obj nat6to4.o
+# Rules to generate bpf objs
 CLANG ?= clang
 SCRATCH_DIR := $(OUTPUT)/tools
 BUILD_DIR := $(SCRATCH_DIR)/build
 CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH))
-$(OUTPUT)/nat6to4.o: nat6to4.c $(BPFOBJ) | $(MAKE_DIRS)
+$(OUTPUT)/nat6to4.o $(OUTPUT)/xdp_dummy.o: $(OUTPUT)/%.o : %.c $(BPFOBJ) | $(MAKE_DIRS)
 	$(CLANG) -O2 --target=bpf -c $< $(CCINCLUDE) $(CLANG_SYS_INCLUDES) -o $@
 $(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile)		       \

tools/testing/selftests/net/config+16−0

 CONFIG_BRIDGE=y
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_VLAN_8021Q=y
+CONFIG_GENEVE=m
 CONFIG_IFB=y
 CONFIG_INET_DIAG=y
+CONFIG_INET_ESP=y
+CONFIG_INET_ESP_OFFLOAD=y
 CONFIG_IP_GRE=m
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_RAW=m
 CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IPV6_GRE=m
 CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_L2TP_ETH=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_NAT=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CT=m
 CONFIG_NET_ACT_GACT=m
+CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_MATCHALL=m
 CONFIG_NET_CLS_U32=m
 CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_SCH_FQ=m
 CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_NETEM=y
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_PSAMPLE=m
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_BLACKHOLE_DEV=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_CRYPTO_ARIA=y
 CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_USER=m

tools/testing/selftests/net/forwarding/Makefile+1−1

@@ -112,7 +112,7 @@ TEST_PROGS = bridge_fdb_learning_limit.sh \ · 111 unmodified lines
112	vxlan_symmetric_ipv6.sh \	112	vxlan_symmetric_ipv6.sh \
113	vxlan_symmetric.sh	113	vxlan_symmetric.sh
114		114
115	TEST_PROGS_EXTENDED := devlink_lib.sh \	115	TEST_FILES := devlink_lib.sh \
116	ethtool_lib.sh \	116	ethtool_lib.sh \
117	fib_offload_lib.sh \	117	fib_offload_lib.sh \
118	forwarding.config.sample \	118	forwarding.config.sample \

tools/testing/selftests/net/lib.sh+4−1

 ##############################################################################
 # Defines
+WAIT_TIMEOUT=${WAIT_TIMEOUT:=20}
+BUSYWAIT_TIMEOUT=$((WAIT_TIMEOUT * 1000)) # ms
 # Kselftest framework requirement - SKIP code is 4.
 ksft_skip=4
 # namespace list created by setup_ns
 	for ns in "$@"; do
 		ip netns delete "${ns}" &> /dev/null
-		if ! busywait 2 ip netns list \| grep -vq "^$ns$" &> /dev/null; then
+		if ! busywait $BUSYWAIT_TIMEOUT ip netns list \| grep -vq "^$ns$" &> /dev/null; then
 			echo "Warn: Failed to remove namespace $ns"
 			ret=1
 		fi

tools/testing/selftests/net/mptcp/config+3−0

 CONFIG_NFT_SOCKET=m
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IP6_NF_FILTER=m
 CONFIG_NET_ACT_CSUM=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_CLS_ACT=y

tools/testing/selftests/net/mptcp/mptcp_join.sh+11−16

 	mptcp_lib_kill_wait $evts_ns2_pid
 }
-kill_tests_wait()
-{
-	#shellcheck disable=SC2046
-	kill -SIGUSR1 $(ip netns pids $ns2) $(ip netns pids $ns1)
-	wait
-}
 pm_nl_set_limits()
 {
 	local ns=$1
 		chk_mptcp_info subflows 0 subflows 0
 		chk_subflows_total 1 1
 		kill_events_pids
-		wait $tests_pid
+		mptcp_lib_kill_wait $tests_pid
 	fi
 	# userspace pm create destroy subflow
 		chk_mptcp_info subflows 0 subflows 0
 		chk_subflows_total 1 1
 		kill_events_pids
-		wait $tests_pid
+		mptcp_lib_kill_wait $tests_pid
 	fi
 	# userspace pm create id 0 subflow
 		chk_mptcp_info subflows 1 subflows 1
 		chk_subflows_total 2 2
 		kill_events_pids
-		wait $tests_pid
+		mptcp_lib_kill_wait $tests_pid
 	fi
 	# userspace pm remove initial subflow
 		chk_mptcp_info subflows 1 subflows 1
 		chk_subflows_total 1 1
 		kill_events_pids
-		wait $tests_pid
+		mptcp_lib_kill_wait $tests_pid
 	fi
 	# userspace pm send RM_ADDR for ID 0
 		chk_mptcp_info subflows 1 subflows 1
 		chk_subflows_total 1 1
 		kill_events_pids
-		wait $tests_pid
+		mptcp_lib_kill_wait $tests_pid
 	fi
 }
 		pm_nl_set_limits $ns2 2 2
 		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
 		speed=slow \
-			run_tests $ns1 $ns2 10.0.1.1 2>/dev/null &
+			run_tests $ns1 $ns2 10.0.1.1 &
+		local tests_pid=$!
 		wait_mpj $ns1
 		pm_nl_check_endpoint "creation" \
 		pm_nl_add_endpoint $ns2 10.0.2.2 flags signal
 		pm_nl_check_endpoint "modif is allowed" \
 			$ns2 10.0.2.2 id 1 flags signal
-		kill_tests_wait
+		mptcp_lib_kill_wait $tests_pid
 	fi
 	if reset "delete and re-add" &&
 		pm_nl_set_limits $ns2 1 1
 		pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
 		test_linkfail=4 speed=20 \
-			run_tests $ns1 $ns2 10.0.1.1 2>/dev/null &
+			run_tests $ns1 $ns2 10.0.1.1 &
+		local tests_pid=$!
 		wait_mpj $ns2
 		chk_subflow_nr "before delete" 2
 		wait_mpj $ns2
 		chk_subflow_nr "after re-add" 2
 		chk_mptcp_info subflows 1 subflows 1
-		kill_tests_wait
+		mptcp_lib_kill_wait $tests_pid
 	fi
 }

tools/testing/selftests/net/mptcp/mptcp_lib.sh+1−1

@@ -6,7 +6,7 @@ readonly KSFT_FAIL=1 · 5 unmodified lines
6	readonly KSFT_SKIP=4	6	readonly KSFT_SKIP=4
7		7
8	# shellcheck disable=SC2155 # declare and assign separately	8	# shellcheck disable=SC2155 # declare and assign separately
9	readonly KSFT_TEST=$(basename "${0}" \| sed 's/\.sh$//g')	9	readonly KSFT_TEST="${MPTCP_LIB_KSFT_TEST:-$(basename "${0}" .sh)}"
10		10
11	MPTCP_LIB_SUBTESTS=()	11	MPTCP_LIB_SUBTESTS=()
12		12

tools/testing/selftests/net/mptcp/settings+1−1

@@ -1 +1 @@
1	timeout=1200	1	timeout=1800

tools/testing/selftests/net/mptcp/simult_flows.sh+4−4

@@ -284,12 +284,12 @@ done · 283 unmodified lines
284		284
285	setup	285	setup
286	run_test 10 10 0 0 "balanced bwidth"	286	run_test 10 10 0 0 "balanced bwidth"
287	run_test 10 10 1 50 "balanced bwidth with unbalanced delay"	287	run_test 10 10 1 25 "balanced bwidth with unbalanced delay"
288		288
289	# we still need some additional infrastructure to pass the following test-cases	289	# we still need some additional infrastructure to pass the following test-cases
290	run_test 30 10 0 0 "unbalanced bwidth"	290	run_test 10 3 0 0 "unbalanced bwidth"
291	run_test 30 10 1 50 "unbalanced bwidth with unbalanced delay"	291	run_test 10 3 1 25 "unbalanced bwidth with unbalanced delay"
292	run_test 30 10 50 1 "unbalanced bwidth with opposed, unbalanced delay"	292	run_test 10 3 25 1 "unbalanced bwidth with opposed, unbalanced delay"
293		293
294	mptcp_lib_result_print_all_tap	294	mptcp_lib_result_print_all_tap
295	exit $ret	295	exit $ret

tools/testing/selftests/net/net_helper.sh+0−0

File mode changed from 100755 to 100644.

tools/testing/selftests/net/pmtu.sh+9−9

@@ -707,23 +707,23 @@ setup_xfrm6() { · 706 unmodified lines
707	}	707	}
708		708
709	setup_xfrm4udp() {	709	setup_xfrm4udp() {
710	setup_xfrm 4 ${veth4_a_addr} ${veth4_b_addr} "encap espinudp 4500 4500 0.0.0.0"	710	setup_xfrm 4 ${veth4_a_addr} ${veth4_b_addr} "encap espinudp 4500 4500 0.0.0.0" && \
711	setup_nettest_xfrm 4 4500	711	setup_nettest_xfrm 4 4500
712	}	712	}
713		713
714	setup_xfrm6udp() {	714	setup_xfrm6udp() {
715	setup_xfrm 6 ${veth6_a_addr} ${veth6_b_addr} "encap espinudp 4500 4500 0.0.0.0"	715	setup_xfrm 6 ${veth6_a_addr} ${veth6_b_addr} "encap espinudp 4500 4500 0.0.0.0" && \
716	setup_nettest_xfrm 6 4500	716	setup_nettest_xfrm 6 4500
717	}	717	}
718		718
719	setup_xfrm4udprouted() {	719	setup_xfrm4udprouted() {
720	setup_xfrm 4 ${prefix4}.${a_r1}.1 ${prefix4}.${b_r1}.1 "encap espinudp 4500 4500 0.0.0.0"	720	setup_xfrm 4 ${prefix4}.${a_r1}.1 ${prefix4}.${b_r1}.1 "encap espinudp 4500 4500 0.0.0.0" && \
721	setup_nettest_xfrm 4 4500	721	setup_nettest_xfrm 4 4500
722	}	722	}
723		723
724	setup_xfrm6udprouted() {	724	setup_xfrm6udprouted() {
725	setup_xfrm 6 ${prefix6}:${a_r1}::1 ${prefix6}:${b_r1}::1 "encap espinudp 4500 4500 0.0.0.0"	725	setup_xfrm 6 ${prefix6}:${a_r1}::1 ${prefix6}:${b_r1}::1 "encap espinudp 4500 4500 0.0.0.0" && \
726	setup_nettest_xfrm 6 4500	726	setup_nettest_xfrm 6 4500
727	}	727	}
728		728
729	setup_routing_old() {	729	setup_routing_old() {
@@ -1339,7 +1339,7 @@ test_pmtu_ipvX_over_bridged_vxlanY_or_geneveY_exception() { · 609 unmodified lines
1339		1339
1340	sleep 1	1340	sleep 1
1341		1341
1342	dd if=/dev/zero of=/dev/stdout status=none bs=1M count=1 \| ${target} socat -T 3 -u STDIN $TCPDST,connect-timeout=3	1342	dd if=/dev/zero status=none bs=1M count=1 \| ${target} socat -T 3 -u STDIN $TCPDST,connect-timeout=3
1343		1343
1344	size=$(du -sb $tmpoutfile)	1344	size=$(du -sb $tmpoutfile)
1345	size=${size%%/tmp/*}	1345	size=${size%%/tmp/*}

tools/testing/selftests/net/setup_loopback.sh+0−0

File mode changed from 100755 to 100644.

tools/testing/selftests/net/setup_veth.sh+1−1

@@ -11,7 +11,7 @@ setup_veth_ns() { · 10 unmodified lines
11	local -r ns_mac="$4"	11	local -r ns_mac="$4"
12		12
13	[[ -e /var/run/netns/"${ns_name}" ]] \|\| ip netns add "${ns_name}"	13	[[ -e /var/run/netns/"${ns_name}" ]] \|\| ip netns add "${ns_name}"
14	echo 100000 > "/sys/class/net/${ns_dev}/gro_flush_timeout"	14	echo 1000000 > "/sys/class/net/${ns_dev}/gro_flush_timeout"
15	ip link set dev "${ns_dev}" netns "${ns_name}" mtu 65535	15	ip link set dev "${ns_dev}" netns "${ns_name}" mtu 65535
16	ip -netns "${ns_name}" link set dev "${ns_dev}" up	16	ip -netns "${ns_name}" link set dev "${ns_dev}" up
17		17

tools/testing/selftests/net/tcp_ao/config+10−0

@@ -0,0 +1,10 @@
	1	CONFIG_CRYPTO_HMAC=y
	2	CONFIG_CRYPTO_RMD160=y
	3	CONFIG_CRYPTO_SHA1=y
	4	CONFIG_IPV6_MULTIPLE_TABLES=y
	5	CONFIG_IPV6=y
	6	CONFIG_NET_L3_MASTER_DEV=y
	7	CONFIG_NET_VRF=y
	8	CONFIG_TCP_AO=y
	9	CONFIG_TCP_MD5SIG=y
	10	CONFIG_VETH=m

tools/testing/selftests/net/tcp_ao/key-management.c+26−20

 		matches_vrf		: 1,
 		is_current		: 1,
 		is_rnext		: 1,
-		used_on_handshake	: 1,
+		used_on_server_tx	: 1,
-		used_after_accept	: 1,
+		used_on_client_tx	: 1,
-		used_on_client		: 1;
+		skip_counters_checks	: 1;
 };
 struct key_collection {
 				addr = &this_ip_dest;
 			sndid = key->client_keyid;
 			rcvid = key->server_keyid;
-			set_current = key->is_current;
+			key->used_on_client_tx = set_current = key->is_current;
-			set_rnext = key->is_rnext;
+			key->used_on_server_tx = set_rnext = key->is_rnext;
 		}
 		if (test_add_key_cr(sk, key->password, key->len,
 				    *addr, vrf, sndid, rcvid, key->maclen,
 				    key->alg, set_current, set_rnext))
 			test_key_error("setsockopt(TCP_AO_ADD_KEY)", key);
-		if (set_current || set_rnext)
-			key->used_on_handshake = 1;
 #ifdef DEBUG
 		test_print("%s [%u/%u] key: { %s, %u:%u, %u, %u:%u:%u:%u (%u)}",
 			   server ? "server" : "client", i, collection.nr_keys,
 	for (i = 0; i < collection.nr_keys; i++) {
 		struct test_key *key = &collection.keys[i];
 		uint8_t sndid, rcvid;
-		bool was_used;
+		bool rx_cnt_expected;
+		if (key->skip_counters_checks)
+			continue;
 		if (server) {
 			sndid = key->server_keyid;
 			rcvid = key->client_keyid;
-			if (is_listen_sk)
+			rx_cnt_expected = key->used_on_client_tx;
-				was_used = key->used_on_handshake;
-			else
-				was_used = key->used_after_accept;
 		} else {
 			sndid = key->client_keyid;
 			rcvid = key->server_keyid;
-			was_used = key->used_on_client;
+			rx_cnt_expected = key->used_on_server_tx;
 		}
-		test_tcp_ao_key_counters_cmp(tst_name, a, b, was_used,
+		test_tcp_ao_key_counters_cmp(tst_name, a, b,
+					     rx_cnt_expected ? TEST_CNT_KEY_GOOD : 0,
 					     sndid, rcvid);
 	}
 	test_tcp_ao_counters_free(a);
 	synchronize_threads(); /* 4: verified => closed */
 	close(sk);
-	verify_counters(tst_name, true, false, begin, &end);
+	verify_counters(tst_name, false, true, begin, &end);
 	synchronize_threads(); /* 5: counters */
 }
 		current_index = nr_keys - 1;
 	if (rnext_index < 0)
 		rnext_index = nr_keys - 1;
-	collection.keys[current_index].used_on_handshake = 1;
+	collection.keys[current_index].used_on_client_tx = 1;
-	collection.keys[rnext_index].used_after_accept = 1;
+	collection.keys[rnext_index].used_on_server_tx = 1;
-	collection.keys[rnext_index].used_on_client = 1;
 	synchronize_threads(); /* 3: accepted => send data */
 	if (test_client_verify(sk, msg_sz, msg_nr, TEST_TIMEOUT_SEC)) {
 		test_error("Can't change the current key");
 	if (test_client_verify(sk, msg_len, nr_packets, TEST_TIMEOUT_SEC))
 		test_fail("verify failed");
-	collection.keys[rotate_to_index].used_after_accept = 1;
+	/* There is a race here: between setting the current_key with
+	 * setsockopt(TCP_AO_INFO) and starting to send some data - there
+	 * might have been a segment received with the desired
+	 * RNext_key set. In turn that would mean that the first outgoing
+	 * segment will have the desired current_key (flipped back).
+	 * Which is what the user/test wants. As it's racy, skip checking
+	 * the counters, yet check what are the resulting current/rnext
+	 * keys on both sides.
+	 */
+	collection.keys[rotate_to_index].skip_counters_checks = 1;
 	end_client(tst_name, sk, nr_keys, current_index, rnext_index, &tmp);
 }
 		}
 		verify_current_rnext(tst_name, sk, -1,
 				     collection.keys[i].server_keyid);
-		collection.keys[i].used_on_client = 1;
+		collection.keys[i].used_on_server_tx = 1;
 		synchronize_threads(); /* verify current/rnext */
 	}
 	end_client(tst_name, sk, nr_keys, current_index, rnext_index, &tmp);

tools/testing/selftests/net/tcp_ao/lib/sock.c+8−4

 		return -ETIMEDOUT;
 	}
-	if (getsockopt(sk, SOL_SOCKET, SO_ERROR, &ret, &slen) || ret)
+	if (getsockopt(sk, SOL_SOCKET, SO_ERROR, &ret, &slen))
+		return -errno;
+	if (ret)
 		return -ret;
 	return 0;
 }
 {
 	size_t buf_sz = msg_len * nr;
 	char *buf = alloca(buf_sz);
+	ssize_t ret;
 	randomize_buffer(buf, buf_sz);
-	if (test_client_loop(sk, buf, buf_sz, msg_len, timeout_sec) != buf_sz)
+	ret = test_client_loop(sk, buf, buf_sz, msg_len, timeout_sec);
-		return -1;
+	if (ret < 0)
-	return 0;
+		return (int)ret;
+	return ret != buf_sz ? -1 : 0;
 }

tools/testing/selftests/net/tcp_ao/rst.c+90−48

@@ -1,10 +1,33 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/* Author: Dmitry Safonov <dima@arista.com> */	2	/*
		3	* The test checks that both active and passive reset have correct TCP-AO
		4	* signature. An "active" reset (abort) here is procured from closing
		5	* listen() socket with non-accepted connections in the queue:
		6	* inet_csk_listen_stop() => inet_child_forget() =>
		7	* => tcp_disconnect() => tcp_send_active_reset()
		8	*
		9	* The passive reset is quite hard to get on established TCP connections.
		10	* It could be procured from non-established states, but the synchronization
		11	* part from userspace in order to reliably get RST seems uneasy.
		12	* So, instead it's procured by corrupting SEQ number on TIMED-WAIT state.
		13	*
		14	* It's important to test both passive and active RST as they go through
		15	* different code-paths:
		16	* - tcp_send_active_reset() makes no-data skb, sends it with tcp_transmit_skb()
		17	* - tcp_v*_send_reset() create their reply skbs and send them with
		18	* ip_send_unicast_reply()
		19	*
		20	* In both cases TCP-AO signatures have to be correct, which is verified by
		21	* (1) checking that the TCP-AO connection was reset and (2) TCP-AO counters.
		22	*
		23	* Author: Dmitry Safonov <dima@arista.com>
		24	*/
3	#include <inttypes.h>	25	#include <inttypes.h>
4	#include "../../../../include/linux/kernel.h"	26	#include "../../../../include/linux/kernel.h"
5	#include "aolib.h"	27	#include "aolib.h"
6		28
7	const size_t quota = 1000;	29	const size_t quota = 1000;
		30	const size_t packet_sz = 100;
8	/*	31	/*
9	* Backlog == 0 means 1 connection in queue, see:	32	* Backlog == 0 means 1 connection in queue, see:
10	* commit 64a146513f8f ("[NET]: Revert incorrect accept queue...")	33	* commit 64a146513f8f ("[NET]: Revert incorrect accept queue...")
@@ -59,26 +82,6 @@ static void close_forced(int sk) · 48 unmodified lines
59	close(sk);	82	close(sk);
60	}	83	}
61		84
62	static int test_wait_for_exception(int sk, time_t sec)
63	{
64	struct timeval tv = { .tv_sec = sec };
65	struct timeval *ptv = NULL;
66	fd_set efds;
67	int ret;
68
69	FD_ZERO(&efds);
70	FD_SET(sk, &efds);
71
72	if (sec)
73	ptv = &tv;
74
75	errno = 0;
76	ret = select(sk + 1, NULL, NULL, &efds, ptv);
77	if (ret < 0)
78	return -errno;
79	return ret ? sk : 0;
80	}
81
82	static void test_server_active_rst(unsigned int port)	85	static void test_server_active_rst(unsigned int port)
83	{	86	{
84	struct tcp_ao_counters cnt1, cnt2;	87	struct tcp_ao_counters cnt1, cnt2;
@@ -155,17 +158,16 @@ static void test_server_passive_rst(unsigned int port) · 70 unmodified lines
155	test_fail("server returned %zd", bytes);	158	test_fail("server returned %zd", bytes);
156	}	159	}
157		160
158	synchronize_threads(); /* 3: chekpoint/restore the connection */	161	synchronize_threads(); /* 3: checkpoint the client */
		162	synchronize_threads(); /* 4: close the server, creating twsk */
159	if (test_get_tcp_ao_counters(sk, &ao2))	163	if (test_get_tcp_ao_counters(sk, &ao2))
160	test_error("test_get_tcp_ao_counters()");	164	test_error("test_get_tcp_ao_counters()");
161
162	synchronize_threads(); /* 4: terminate server + send more on client */
163	bytes = test_server_run(sk, quota, TEST_RETRANSMIT_SEC);
164	close(sk);	165	close(sk);
		166
		167	synchronize_threads(); /* 5: restore the socket, send more data */
165	test_tcp_ao_counters_cmp("passive RST server", &ao1, &ao2, TEST_CNT_GOOD);	168	test_tcp_ao_counters_cmp("passive RST server", &ao1, &ao2, TEST_CNT_GOOD);
166		169
167	synchronize_threads(); /* 5: verified => closed */	170	synchronize_threads(); /* 6: server exits */
168	close(sk);
169	}	171	}
170		172
171	static void server_fn(void arg)	173	static void server_fn(void arg)
@@ -284,7 +286,7 @@ static void test_client_active_rst(unsigned int port) · 112 unmodified lines
284	test_error("test_wait_fds(): %d", err);	286	test_error("test_wait_fds(): %d", err);
285		287
286	synchronize_threads(); /* 3: close listen socket */	288	synchronize_threads(); /* 3: close listen socket */
287	if (test_client_verify(sk[0], 100, quota / 100, TEST_TIMEOUT_SEC))	289	if (test_client_verify(sk[0], packet_sz, quota / packet_sz, TEST_TIMEOUT_SEC))
288	test_fail("Failed to send data on connected socket");	290	test_fail("Failed to send data on connected socket");
289	else	291	else
290	test_ok("Verified established tcp connection");	292	test_ok("Verified established tcp connection");
@@ -323,7 +325,6 @@ static void test_client_passive_rst(unsigned int port) · 32 unmodified lines
323	struct tcp_sock_state img;	325	struct tcp_sock_state img;
324	sockaddr_af saddr;	326	sockaddr_af saddr;
325	int sk, err;	327	int sk, err;
326	socklen_t slen = sizeof(err);
327		328
328	sk = socket(test_family, SOCK_STREAM, IPPROTO_TCP);	329	sk = socket(test_family, SOCK_STREAM, IPPROTO_TCP);
329	if (sk < 0)	330	if (sk < 0)
@@ -337,18 +338,51 @@ static void test_client_passive_rst(unsigned int port) · 7 unmodified lines
337	test_error("failed to connect()");	338	test_error("failed to connect()");
338		339
339	synchronize_threads(); /* 2: accepted => send data */	340	synchronize_threads(); /* 2: accepted => send data */
340	if (test_client_verify(sk, 100, quota / 100, TEST_TIMEOUT_SEC))	341	if (test_client_verify(sk, packet_sz, quota / packet_sz, TEST_TIMEOUT_SEC))
341	test_fail("Failed to send data on connected socket");	342	test_fail("Failed to send data on connected socket");
342	else	343	else
343	test_ok("Verified established tcp connection");	344	test_ok("Verified established tcp connection");
344		345
345	synchronize_threads(); /* 3: chekpoint/restore the connection */	346	synchronize_threads(); /* 3: checkpoint the client */
346	test_enable_repair(sk);	347	test_enable_repair(sk);
347	test_sock_checkpoint(sk, &img, &saddr);	348	test_sock_checkpoint(sk, &img, &saddr);
348	test_ao_checkpoint(sk, &ao_img);	349	test_ao_checkpoint(sk, &ao_img);
349	test_kill_sk(sk);	350	test_disable_repair(sk);
350		351
351	img.out.seq += quota;	352	synchronize_threads(); /* 4: close the server, creating twsk */
		353
		354	/*
		355	* The "corruption" in SEQ has to be small enough to fit into TCP
		356	* window, see tcp_timewait_state_process() for out-of-window
		357	* segments.
		358	*/
		359	img.out.seq += 5; /* 5 is more noticeable in tcpdump than 1 */
		360
		361	/*
		362	* FIXME: This is kind-of ugly and dirty, but it works.
		363	*
		364	* At this moment, the server has close'ed(sk).
		365	* The passive RST that is being targeted here is new data after
		366	* half-duplex close, see tcp_timewait_state_process() => TCP_TW_RST
		367	*
		368	* What is needed here is:
		369	* (1) wait for FIN from the server
		370	* (2) make sure that the ACK from the client went out
		371	* (3) make sure that the ACK was received and processed by the server
		372	*
		373	* Otherwise, the data that will be sent from "repaired" socket
		374	* post SEQ corruption may get to the server before it's in
		375	* TCP_FIN_WAIT2.
		376	*
		377	* (1) is easy with select()/poll()
		378	* (2) is possible by polling tcpi_state from TCP_INFO
		379	* (3) is quite complex: as server's socket was already closed,
		380	* probably the way to do it would be tcp-diag.
		381	*/
		382	sleep(TEST_RETRANSMIT_SEC);
		383
		384	synchronize_threads(); /* 5: restore the socket, send more data */
		385	test_kill_sk(sk);
352		386
353	sk = socket(test_family, SOCK_STREAM, IPPROTO_TCP);	387	sk = socket(test_family, SOCK_STREAM, IPPROTO_TCP);
354	if (sk < 0)	388	if (sk < 0)
@@ -366,25 +400,33 @@ static void test_client_passive_rst(unsigned int port) · 11 unmodified lines
366	test_disable_repair(sk);	400	test_disable_repair(sk);
367	test_sock_state_free(&img);	401	test_sock_state_free(&img);
368		402
369	synchronize_threads(); /* 4: terminate server + send more on client */	403	/*
370	if (test_client_verify(sk, 100, quota / 100, 2 * TEST_TIMEOUT_SEC))	404	* This is how "passive reset" is acquired in this test from TCP_TW_RST:
371	test_ok("client connection broken post-seq-adjust");	405	*
372	else	406	* IP 10.0.254.1.7011 > 10.0.1.1.59772: Flags [P.], seq 901:1001, ack 1001, win 249,
373	test_fail("client connection still works post-seq-adjust");	407	* options [tcp-ao keyid 100 rnextkeyid 100 mac 0x10217d6c36a22379086ef3b1], length 100
374		408	* IP 10.0.254.1.7011 > 10.0.1.1.59772: Flags [F.], seq 1001, ack 1001, win 249,
375	test_wait_for_exception(sk, TEST_TIMEOUT_SEC);	409	* options [tcp-ao keyid 100 rnextkeyid 100 mac 0x104ffc99b98c10a5298cc268], length 0
376		410	* IP 10.0.1.1.59772 > 10.0.254.1.7011: Flags [.], ack 1002, win 251,
377	if (getsockopt(sk, SOL_SOCKET, SO_ERROR, &err, &slen))	411	* options [tcp-ao keyid 100 rnextkeyid 100 mac 0xe496dd4f7f5a8a66873c6f93,nop,nop,sack 1 {1001:1002}], length 0
378	test_error("getsockopt()");	412	* IP 10.0.1.1.59772 > 10.0.254.1.7011: Flags [P.], seq 1006:1106, ack 1001, win 251,
379	if (err != ECONNRESET && err != EPIPE)	413	* options [tcp-ao keyid 100 rnextkeyid 100 mac 0x1b5f3330fb23fbcd0c77d0ca], length 100
380	test_fail("client connection was not reset: %d", err);	414	* IP 10.0.254.1.7011 > 10.0.1.1.59772: Flags [R], seq 3215596252, win 0,
		415	* options [tcp-ao keyid 100 rnextkeyid 100 mac 0x0bcfbbf497bce844312304b2], length 0
		416	*/
		417	err = test_client_verify(sk, packet_sz, quota / packet_sz, 2 * TEST_TIMEOUT_SEC);
		418	/* Make sure that the connection was reset, not timeouted */
		419	if (err && err == -ECONNRESET)
		420	test_ok("client sock was passively reset post-seq-adjust");
		421	else if (err)
		422	test_fail("client sock was not reset post-seq-adjust: %d", err);
381	else	423	else
382	test_ok("client connection was reset");	424	test_fail("client sock is yet connected post-seq-adjust");
383		425
384	if (test_get_tcp_ao_counters(sk, &ao2))	426	if (test_get_tcp_ao_counters(sk, &ao2))
385	test_error("test_get_tcp_ao_counters()");	427	test_error("test_get_tcp_ao_counters()");
386		428
387	synchronize_threads(); /* 5: verified => closed */	429	synchronize_threads(); /* 6: server exits */
388	close(sk);	430	close(sk);
389	test_tcp_ao_counters_cmp("client passive RST", &ao1, &ao2, TEST_CNT_GOOD);	431	test_tcp_ao_counters_cmp("client passive RST", &ao1, &ao2, TEST_CNT_GOOD);
390	}	432	}
@@ -410,6 +452,6 @@ static void client_fn(void arg) · 19 unmodified lines
410		452
411	int main(int argc, char *argv[])	453	int main(int argc, char *argv[])
412	{	454	{
413	test_init(15, server_fn, client_fn);	455	test_init(14, server_fn, client_fn);
414	return 0;	456	return 0;
415	}	457	}

tools/testing/selftests/net/tcp_ao/settings+1−0

@@ -0,0 +1 @@
		1	timeout=120

tools/testing/selftests/net/udpgro.sh+2−2

@@ -7,7 +7,7 @@ source net_helper.sh · 6 unmodified lines
7		7
8	readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)"	8	readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)"
9		9
10	BPF_FILE="../bpf/xdp_dummy.bpf.o"	10	BPF_FILE="xdp_dummy.o"
11		11
12	# set global exit status, but never reset nonzero one.	12	# set global exit status, but never reset nonzero one.
13	check_err()	13	check_err()
@@ -197,7 +197,7 @@ run_all() { · 183 unmodified lines
197	}	197	}
198		198
199	if [ ! -f ${BPF_FILE} ]; then	199	if [ ! -f ${BPF_FILE} ]; then
200	echo "Missing ${BPF_FILE}. Build bpf selftest first"	200	echo "Missing ${BPF_FILE}. Run 'make' first"
201	exit -1	201	exit -1
202	fi	202	fi
203		203

tools/testing/selftests/net/udpgro_bench.sh+2−2

@@ -7,7 +7,7 @@ source net_helper.sh · 6 unmodified lines
7		7
8	readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)"	8	readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)"
9		9
10	BPF_FILE="../bpf/xdp_dummy.bpf.o"	10	BPF_FILE="xdp_dummy.o"
11		11
12	cleanup() {	12	cleanup() {
13	local -r jobs="$(jobs -p)"	13	local -r jobs="$(jobs -p)"
@@ -84,7 +84,7 @@ run_all() { · 70 unmodified lines
84	}	84	}
85		85
86	if [ ! -f ${BPF_FILE} ]; then	86	if [ ! -f ${BPF_FILE} ]; then
87	echo "Missing ${BPF_FILE}. Build bpf selftest first"	87	echo "Missing ${BPF_FILE}. Run 'make' first"
88	exit -1	88	exit -1
89	fi	89	fi
90		90

tools/testing/selftests/net/udpgro_frglist.sh+3−3

@@ -7,7 +7,7 @@ source net_helper.sh · 6 unmodified lines
7		7
8	readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)"	8	readonly PEER_NS="ns-peer-$(mktemp -u XXXXXX)"
9		9
10	BPF_FILE="../bpf/xdp_dummy.bpf.o"	10	BPF_FILE="xdp_dummy.o"
11		11
12	cleanup() {	12	cleanup() {
13	local -r jobs="$(jobs -p)"	13	local -r jobs="$(jobs -p)"
@@ -85,12 +85,12 @@ run_all() { · 71 unmodified lines
85	}	85	}
86		86
87	if [ ! -f ${BPF_FILE} ]; then	87	if [ ! -f ${BPF_FILE} ]; then
88	echo "Missing ${BPF_FILE}. Build bpf selftest first"	88	echo "Missing ${BPF_FILE}. Run 'make' first"
89	exit -1	89	exit -1
90	fi	90	fi
91		91
92	if [ ! -f nat6to4.o ]; then	92	if [ ! -f nat6to4.o ]; then
93	echo "Missing nat6to4 helper. Build bpf nat6to4.o selftest first"	93	echo "Missing nat6to4 helper. Run 'make' first"
94	exit -1	94	exit -1
95	fi	95	fi
96		96

tools/testing/selftests/net/udpgro_fwd.sh+5−3

 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
-BPF_FILE="../bpf/xdp_dummy.bpf.o"
+source net_helper.sh
+BPF_FILE="xdp_dummy.o"
 readonly BASE="ns-$(mktemp -u XXXXXX)"
 readonly SRC=2
 readonly DST=1
 	ip netns exec $NS_DST $ipt -A INPUT -p udp --dport 8000
 	ip netns exec $NS_DST ./udpgso_bench_rx -C 1000 -R 10 -n 10 -l 1300 $rx_args &
 	local spid=$!
-	sleep 0.1
+	wait_local_port_listen "$NS_DST" 8000 udp
 	ip netns exec $NS_SRC ./udpgso_bench_tx $family -M 1 -s 13000 -S 1300 -D $dst
 	local retc=$?
 	wait $spid
 	ip netns exec $NS_DST bash -c "echo 2 > /sys/class/net/veth$DST/queues/rx-0/rps_cpus"
 	ip netns exec $NS_DST taskset 0x2 ./udpgso_bench_rx -C 1000 -R 10  &
 	local spid=$!
-	sleep 0.1
+	wait_local_port_listen "$NS_DST" 8000 udp
 	ip netns exec $NS_SRC taskset 0x1 ./udpgso_bench_tx $family -l 3 -S 1300 -D $dst
 	local retc=$?
 	wait $spid

tools/testing/selftests/net/veth.sh+2−2

@@ -1,7 +1,7 @@
1	#!/bin/sh	1	#!/bin/sh
2	# SPDX-License-Identifier: GPL-2.0	2	# SPDX-License-Identifier: GPL-2.0
3		3
4	BPF_FILE="../bpf/xdp_dummy.bpf.o"	4	BPF_FILE="xdp_dummy.o"
5	readonly STATS="$(mktemp -p /tmp ns-XXXXXX)"	5	readonly STATS="$(mktemp -p /tmp ns-XXXXXX)"
6	readonly BASE=`basename $STATS`	6	readonly BASE=`basename $STATS`
7	readonly SRC=2	7	readonly SRC=2
@@ -218,7 +218,7 @@ while getopts "hs:" option; do · 210 unmodified lines
218	done	218	done
219		219
220	if [ ! -f ${BPF_FILE} ]; then	220	if [ ! -f ${BPF_FILE} ]; then
221	echo "Missing ${BPF_FILE}. Build bpf selftest first"	221	echo "Missing ${BPF_FILE}. Run 'make' first"
222	exit 1	222	exit 1
223	fi	223	fi
224		224

tools/testing/selftests/net/xdp_dummy.c+13−0

@@ -0,0 +1,13 @@
	1	// SPDX-License-Identifier: GPL-2.0
	2
	3	#define KBUILD_MODNAME "xdp_dummy"
	4	#include <linux/bpf.h>
	5	#include <bpf/bpf_helpers.h>
	6
	7	SEC("xdp")
	8	int xdp_dummy_prog(struct xdp_md *ctx)
	9	{
	10	return XDP_PASS;
	11	}
	12
	13	char _license[] SEC("license") = "GPL";

tools/testing/selftests/rseq/basic_percpu_ops_test.c+12−2

 {
 	return rseq_mm_cid_available();
 }
+static
+bool rseq_use_cpu_index(void)
+{
+	return false;	/* Use mm_cid */
+}
 #else
 # define RSEQ_PERCPU	RSEQ_PERCPU_CPU_ID
 static
 {
 	return rseq_current_cpu_raw() >= 0;
 }
+static
+bool rseq_use_cpu_index(void)
+{
+	return true;	/* Use cpu_id as index. */
+}
 #endif
 struct percpu_lock_entry {
 	/* Generate list entries for every usable cpu. */
 	sched_getaffinity(0, sizeof(allowed_cpus), &allowed_cpus);
 	for (i = 0; i < CPU_SETSIZE; i++) {
-		if (!CPU_ISSET(i, &allowed_cpus))
+		if (rseq_use_cpu_index() && !CPU_ISSET(i, &allowed_cpus))
 			continue;
 		for (j = 1; j <= 100; j++) {
 			struct percpu_list_node *node;
 	for (i = 0; i < CPU_SETSIZE; i++) {
 		struct percpu_list_node *node;
-		if (!CPU_ISSET(i, &allowed_cpus))
+		if (rseq_use_cpu_index() && !CPU_ISSET(i, &allowed_cpus))
 			continue;
 		while ((node = __percpu_list_pop(&list, i))) {

tools/testing/selftests/rseq/param_test.c+16−6

 {
 	return rseq_mm_cid_available();
 }
+static
+bool rseq_use_cpu_index(void)
+{
+	return false;	/* Use mm_cid */
+}
 # ifdef TEST_MEMBARRIER
 /*
  * Membarrier does not currently support targeting a mm_cid, so
 {
 	return rseq_current_cpu_raw() >= 0;
 }
+static
+bool rseq_use_cpu_index(void)
+{
+	return true;	/* Use cpu_id as index. */
+}
 # ifdef TEST_MEMBARRIER
 static
 int rseq_membarrier_expedited(int cpu)
 	/* Generate list entries for every usable cpu. */
 	sched_getaffinity(0, sizeof(allowed_cpus), &allowed_cpus);
 	for (i = 0; i < CPU_SETSIZE; i++) {
-		if (!CPU_ISSET(i, &allowed_cpus))
+		if (rseq_use_cpu_index() && !CPU_ISSET(i, &allowed_cpus))
 			continue;
 		for (j = 1; j <= 100; j++) {
 			struct percpu_list_node *node;
 	for (i = 0; i < CPU_SETSIZE; i++) {
 		struct percpu_list_node *node;
-		if (!CPU_ISSET(i, &allowed_cpus))
+		if (rseq_use_cpu_index() && !CPU_ISSET(i, &allowed_cpus))
 			continue;
 		while ((node = __percpu_list_pop(&list, i))) {
 	/* Generate list entries for every usable cpu. */
 	sched_getaffinity(0, sizeof(allowed_cpus), &allowed_cpus);
 	for (i = 0; i < CPU_SETSIZE; i++) {
-		if (!CPU_ISSET(i, &allowed_cpus))
+		if (rseq_use_cpu_index() && !CPU_ISSET(i, &allowed_cpus))
 			continue;
 		/* Worse-case is every item in same CPU. */
 		buffer.c[i].array =
 	for (i = 0; i < CPU_SETSIZE; i++) {
 		struct percpu_buffer_node *node;
-		if (!CPU_ISSET(i, &allowed_cpus))
+		if (rseq_use_cpu_index() && !CPU_ISSET(i, &allowed_cpus))
 			continue;
 		while ((node = __percpu_buffer_pop(&buffer, i))) {
 	/* Generate list entries for every usable cpu. */
 	sched_getaffinity(0, sizeof(allowed_cpus), &allowed_cpus);
 	for (i = 0; i < CPU_SETSIZE; i++) {
-		if (!CPU_ISSET(i, &allowed_cpus))
+		if (rseq_use_cpu_index() && !CPU_ISSET(i, &allowed_cpus))
 			continue;
 		/* Worse-case is every item in same CPU. */
 		buffer.c[i].array =
 	for (i = 0; i < CPU_SETSIZE; i++) {
 		struct percpu_memcpy_buffer_node item;
-		if (!CPU_ISSET(i, &allowed_cpus))
+		if (rseq_use_cpu_index() && !CPU_ISSET(i, &allowed_cpus))
 			continue;
 		while (__percpu_memcpy_buffer_pop(&buffer, &item, i)) {

tools/testing/selftests/seccomp/seccomp_benchmark.c+64−40

@@ -38,10 +38,10 @@ unsigned long long timing(clockid_t clk_id, unsigned long long samples) · 37 unmodified lines
38	i *= 1000000000ULL;	38	i *= 1000000000ULL;
39	i += finish.tv_nsec - start.tv_nsec;	39	i += finish.tv_nsec - start.tv_nsec;
40		40
41	printf("%lu.%09lu - %lu.%09lu = %llu (%.1fs)\n",	41	ksft_print_msg("%lu.%09lu - %lu.%09lu = %llu (%.1fs)\n",
42	finish.tv_sec, finish.tv_nsec,	42	finish.tv_sec, finish.tv_nsec,
43	start.tv_sec, start.tv_nsec,	43	start.tv_sec, start.tv_nsec,
44	i, (double)i / 1000000000.0);	44	i, (double)i / 1000000000.0);
45		45
46	return i;	46	return i;
47	}	47	}
@@ -53,7 +53,7 @@ unsigned long long calibrate(void) · 5 unmodified lines
53	pid_t pid, ret;	53	pid_t pid, ret;
54	int seconds = 15;	54	int seconds = 15;
55		55
56	printf("Calibrating sample size for %d seconds worth of syscalls ...\n", seconds);	56	ksft_print_msg("Calibrating sample size for %d seconds worth of syscalls ...\n", seconds);
57		57
58	samples = 0;	58	samples = 0;
59	pid = getpid();	59	pid = getpid();
@@ -98,24 +98,36 @@ bool le(int i_one, int i_two) · 38 unmodified lines
98	}	98	}
99		99
100	long compare(const char name_one, const char name_eval, const char *name_two,	100	long compare(const char name_one, const char name_eval, const char *name_two,
101	unsigned long long one, bool (*eval)(int, int), unsigned long long two)	101	unsigned long long one, bool (*eval)(int, int), unsigned long long two,
		102	bool skip)
102	{	103	{
103	bool good;	104	bool good;
104		105
105	printf("\t%s %s %s (%lld %s %lld): ", name_one, name_eval, name_two,	106	if (skip) {
106	(long long)one, name_eval, (long long)two);	107	ksft_test_result_skip("%s %s %s\n", name_one, name_eval,
		108	name_two);
		109	return 0;
		110	}
		111
		112	ksft_print_msg("\t%s %s %s (%lld %s %lld): ", name_one, name_eval, name_two,
		113	(long long)one, name_eval, (long long)two);
107	if (one > INT_MAX) {	114	if (one > INT_MAX) {
108	printf("Miscalculation! Measurement went negative: %lld\n", (long long)one);	115	ksft_print_msg("Miscalculation! Measurement went negative: %lld\n", (long long)one);
109	return 1;	116	good = false;
		117	goto out;
110	}	118	}
111	if (two > INT_MAX) {	119	if (two > INT_MAX) {
112	printf("Miscalculation! Measurement went negative: %lld\n", (long long)two);	120	ksft_print_msg("Miscalculation! Measurement went negative: %lld\n", (long long)two);
113	return 1;	121	good = false;
		122	goto out;
114	}	123	}
115		124
116	good = eval(one, two);	125	good = eval(one, two);
117	printf("%s\n", good ? "✔️" : "❌");	126	printf("%s\n", good ? "✔️" : "❌");
118		127
		128	out:
		129	ksft_test_result(good, "%s %s %s\n", name_one, name_eval, name_two);
		130
119	return good ? 0 : 1;	131	return good ? 0 : 1;
120	}	132	}
121		133
@@ -142,15 +154,22 @@ int main(int argc, char *argv[]) · 20 unmodified lines
142	unsigned long long samples, calc;	154	unsigned long long samples, calc;
143	unsigned long long native, filter1, filter2, bitmap1, bitmap2;	155	unsigned long long native, filter1, filter2, bitmap1, bitmap2;
144	unsigned long long entry, per_filter1, per_filter2;	156	unsigned long long entry, per_filter1, per_filter2;
		157	bool skip = false;
145		158
146	setbuf(stdout, NULL);	159	setbuf(stdout, NULL);
147		160
148	printf("Running on:\n");	161	ksft_print_header();
		162	ksft_set_plan(7);
		163
		164	ksft_print_msg("Running on:\n");
		165	ksft_print_msg("");
149	system("uname -a");	166	system("uname -a");
150		167
151	printf("Current BPF sysctl settings:\n");	168	ksft_print_msg("Current BPF sysctl settings:\n");
152	/* Avoid using "sysctl" which may not be installed. */	169	/* Avoid using "sysctl" which may not be installed. */
		170	ksft_print_msg("");
153	system("grep -H . /proc/sys/net/core/bpf_jit_enable");	171	system("grep -H . /proc/sys/net/core/bpf_jit_enable");
		172	ksft_print_msg("");
154	system("grep -H . /proc/sys/net/core/bpf_jit_harden");	173	system("grep -H . /proc/sys/net/core/bpf_jit_harden");
155		174
156	if (argc > 1)	175	if (argc > 1)
@@ -158,11 +177,11 @@ int main(int argc, char *argv[]) · 1 unmodified line
158	else	177	else
159	samples = calibrate();	178	samples = calibrate();
160		179
161	printf("Benchmarking %llu syscalls...\n", samples);	180	ksft_print_msg("Benchmarking %llu syscalls...\n", samples);
162		181
163	/* Native call */	182	/* Native call */
164	native = timing(CLOCK_PROCESS_CPUTIME_ID, samples) / samples;	183	native = timing(CLOCK_PROCESS_CPUTIME_ID, samples) / samples;
165	printf("getpid native: %llu ns\n", native);	184	ksft_print_msg("getpid native: %llu ns\n", native);
166		185
167	ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0);	186	ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0);
168	assert(ret == 0);	187	assert(ret == 0);
@@ -172,35 +191,37 @@ int main(int argc, char *argv[]) · 3 unmodified lines
172	assert(ret == 0);	191	assert(ret == 0);
173		192
174	bitmap1 = timing(CLOCK_PROCESS_CPUTIME_ID, samples) / samples;	193	bitmap1 = timing(CLOCK_PROCESS_CPUTIME_ID, samples) / samples;
175	printf("getpid RET_ALLOW 1 filter (bitmap): %llu ns\n", bitmap1);	194	ksft_print_msg("getpid RET_ALLOW 1 filter (bitmap): %llu ns\n", bitmap1);
176		195
177	/* Second filter resulting in a bitmap */	196	/* Second filter resulting in a bitmap */
178	ret = prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &bitmap_prog);	197	ret = prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &bitmap_prog);
179	assert(ret == 0);	198	assert(ret == 0);
180		199
181	bitmap2 = timing(CLOCK_PROCESS_CPUTIME_ID, samples) / samples;	200	bitmap2 = timing(CLOCK_PROCESS_CPUTIME_ID, samples) / samples;
182	printf("getpid RET_ALLOW 2 filters (bitmap): %llu ns\n", bitmap2);	201	ksft_print_msg("getpid RET_ALLOW 2 filters (bitmap): %llu ns\n", bitmap2);
183		202
184	/* Third filter, can no longer be converted to bitmap */	203	/* Third filter, can no longer be converted to bitmap */
185	ret = prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog);	204	ret = prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog);
186	assert(ret == 0);	205	assert(ret == 0);
187		206
188	filter1 = timing(CLOCK_PROCESS_CPUTIME_ID, samples) / samples;	207	filter1 = timing(CLOCK_PROCESS_CPUTIME_ID, samples) / samples;
189	printf("getpid RET_ALLOW 3 filters (full): %llu ns\n", filter1);	208	ksft_print_msg("getpid RET_ALLOW 3 filters (full): %llu ns\n", filter1);
190		209
191	/* Fourth filter, can not be converted to bitmap because of filter 3 */	210	/* Fourth filter, can not be converted to bitmap because of filter 3 */
192	ret = prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &bitmap_prog);	211	ret = prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &bitmap_prog);
193	assert(ret == 0);	212	assert(ret == 0);
194		213
195	filter2 = timing(CLOCK_PROCESS_CPUTIME_ID, samples) / samples;	214	filter2 = timing(CLOCK_PROCESS_CPUTIME_ID, samples) / samples;
196	printf("getpid RET_ALLOW 4 filters (full): %llu ns\n", filter2);	215	ksft_print_msg("getpid RET_ALLOW 4 filters (full): %llu ns\n", filter2);
197		216
198	/* Estimations */	217	/* Estimations */
199	#define ESTIMATE(fmt, var, what) do { \	218	#define ESTIMATE(fmt, var, what) do { \
200	var = (what); \	219	var = (what); \
201	printf("Estimated " fmt ": %llu ns\n", var); \	220	ksft_print_msg("Estimated " fmt ": %llu ns\n", var); \
202	if (var > INT_MAX) \	221	if (var > INT_MAX) { \
203	goto more_samples; \	222	skip = true; \
		223	ret \|= 1; \
		224	} \
204	} while (0)	225	} while (0)
205		226
206	ESTIMATE("total seccomp overhead for 1 bitmapped filter", calc,	227	ESTIMATE("total seccomp overhead for 1 bitmapped filter", calc,
@@ -218,31 +239,34 @@ int main(int argc, char *argv[]) · 11 unmodified lines
218	ESTIMATE("seccomp per-filter overhead (filters / 4)", per_filter2,	239	ESTIMATE("seccomp per-filter overhead (filters / 4)", per_filter2,
219	(filter2 - native - entry) / 4);	240	(filter2 - native - entry) / 4);
220		241
221	printf("Expectations:\n");	242	ksft_print_msg("Expectations:\n");
222	ret \|= compare("native", "≤", "1 bitmap", native, le, bitmap1);	243	ret \|= compare("native", "≤", "1 bitmap", native, le, bitmap1,
223	bits = compare("native", "≤", "1 filter", native, le, filter1);	244	skip);
		245	bits = compare("native", "≤", "1 filter", native, le, filter1,
		246	skip);
224	if (bits)	247	if (bits)
225	goto more_samples;	248	skip = true;
226		249
227	ret \|= compare("per-filter (last 2 diff)", "≈", "per-filter (filters / 4)",	250	ret \|= compare("per-filter (last 2 diff)", "≈", "per-filter (filters / 4)",
228	per_filter1, approx, per_filter2);	251	per_filter1, approx, per_filter2, skip);
229		252
230	bits = compare("1 bitmapped", "≈", "2 bitmapped",	253	bits = compare("1 bitmapped", "≈", "2 bitmapped",
231	bitmap1 - native, approx, bitmap2 - native);	254	bitmap1 - native, approx, bitmap2 - native, skip);
232	if (bits) {	255	if (bits) {
233	printf("Skipping constant action bitmap expectations: they appear unsupported.\n");	256	ksft_print_msg("Skipping constant action bitmap expectations: they appear unsupported.\n");
234	goto out;	257	skip = true;
235	}	258	}
236		259
237	ret \|= compare("entry", "≈", "1 bitmapped", entry, approx, bitmap1 - native);	260	ret \|= compare("entry", "≈", "1 bitmapped", entry, approx,
238	ret \|= compare("entry", "≈", "2 bitmapped", entry, approx, bitmap2 - native);	261	bitmap1 - native, skip);
		262	ret \|= compare("entry", "≈", "2 bitmapped", entry, approx,
		263	bitmap2 - native, skip);
239	ret \|= compare("native + entry + (per filter * 4)", "≈", "4 filters total",	264	ret \|= compare("native + entry + (per filter * 4)", "≈", "4 filters total",
240	entry + (per_filter1 * 4) + native, approx, filter2);	265	entry + (per_filter1 * 4) + native, approx, filter2,
241	if (ret == 0)	266	skip);
242	goto out;
243		267
244	more_samples:	268	if (ret)
245	printf("Saw unexpected benchmark result. Try running again with more samples?\n");	269	ksft_print_msg("Saw unexpected benchmark result. Try running again with more samples?\n");
246	out:	270
247	return 0;	271	ksft_finished();
248	}	272	}

Merge 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

@@ -60,7 +60,7 @@ int kvm_own_lsx(struct kvm_vcpu *vcpu); · 59 unmodified lines
60	void kvm_save_lsx(struct loongarch_fpu *fpu);	60	void kvm_save_lsx(struct loongarch_fpu *fpu);
61	void kvm_restore_lsx(struct loongarch_fpu *fpu);	61	void kvm_restore_lsx(struct loongarch_fpu *fpu);
62	#else	62	#else
63	static inline int kvm_own_lsx(struct kvm_vcpu *vcpu) { }	63	static inline int kvm_own_lsx(struct kvm_vcpu *vcpu) { return -EINVAL; }
64	static inline void kvm_save_lsx(struct loongarch_fpu *fpu) { }	64	static inline void kvm_save_lsx(struct loongarch_fpu *fpu) { }
65	static inline void kvm_restore_lsx(struct loongarch_fpu *fpu) { }	65	static inline void kvm_restore_lsx(struct loongarch_fpu *fpu) { }
66	#endif	66	#endif
@@ -70,7 +70,7 @@ int kvm_own_lasx(struct kvm_vcpu *vcpu); · 3 unmodified lines
70	void kvm_save_lasx(struct loongarch_fpu *fpu);	70	void kvm_save_lasx(struct loongarch_fpu *fpu);
71	void kvm_restore_lasx(struct loongarch_fpu *fpu);	71	void kvm_restore_lasx(struct loongarch_fpu *fpu);
72	#else	72	#else
73	static inline int kvm_own_lasx(struct kvm_vcpu *vcpu) { }	73	static inline int kvm_own_lasx(struct kvm_vcpu *vcpu) { return -EINVAL; }
74	static inline void kvm_save_lasx(struct loongarch_fpu *fpu) { }	74	static inline void kvm_save_lasx(struct loongarch_fpu *fpu) { }
75	static inline void kvm_restore_lasx(struct loongarch_fpu *fpu) { }	75	static inline void kvm_restore_lasx(struct loongarch_fpu *fpu) { }
76	#endif	76	#endif