lael-labs/linux

.mailmap+4−0

 # Please keep this list dictionary sorted.
 #
 Aaron Durbin <adurbin@google.com>
+Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>
+Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>
 Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
 Adam Oldham <oldhamca@gmail.com>
 Adam Radford <aradford@gmail.com>
 Christian Brauner <brauner@kernel.org> <christian@brauner.io>
 Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
 Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
+Christian Marangi <ansuelsmth@gmail.com>
 Christophe Ricard <christophe.ricard@gmail.com>
 Christoph Hellwig <hch@lst.de>
 Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
 Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
 Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
 Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
+Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
 Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
 Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
 Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

Documentation/ABI/testing/sysfs-bus-iio-vf610+1−1

@@ -1,4 +1,4 @@
1	What: /sys/bus/iio/devices/iio:deviceX/conversion_mode	1	What: /sys/bus/iio/devices/iio:deviceX/in_conversion_mode
2	KernelVersion: 4.2	2	KernelVersion: 4.2
3	Contact: linux-iio@vger.kernel.org	3	Contact: linux-iio@vger.kernel.org
4	Description:	4	Description:

Documentation/ABI/testing/sysfs-devices-system-cpu+1−0

@@ -526,6 +526,7 @@ What: /sys/devices/system/cpu/vulnerabilities · 525 unmodified lines
526	/sys/devices/system/cpu/vulnerabilities/srbds	526	/sys/devices/system/cpu/vulnerabilities/srbds
527	/sys/devices/system/cpu/vulnerabilities/tsx_async_abort	527	/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
528	/sys/devices/system/cpu/vulnerabilities/itlb_multihit	528	/sys/devices/system/cpu/vulnerabilities/itlb_multihit
		529	/sys/devices/system/cpu/vulnerabilities/mmio_stale_data
529	Date: January 2018	530	Date: January 2018
530	Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>	531	Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
531	Description: Information about CPU vulnerabilities	532	Description: Information about CPU vulnerabilities

Documentation/admin-guide/hw-vuln/index.rst+1−0

@@ -17,3 +17,4 @@ are configurable at compile, boot or run time. · 16 unmodified lines
17	special-register-buffer-data-sampling.rst	17	special-register-buffer-data-sampling.rst
18	core-scheduling.rst	18	core-scheduling.rst
19	l1d_flush.rst	19	l1d_flush.rst
		20	processor_mmio_stale_data.rst

Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst+246−0

@@ -0,0 +1,246 @@
	1	=========================================
	2	Processor MMIO Stale Data Vulnerabilities
	3	=========================================
	4
	5	Processor MMIO Stale Data Vulnerabilities are a class of memory-mapped I/O
	6	(MMIO) vulnerabilities that can expose data. The sequences of operations for
	7	exposing data range from simple to very complex. Because most of the
	8	vulnerabilities require the attacker to have access to MMIO, many environments
	9	are not affected. System environments using virtualization where MMIO access is
	10	provided to untrusted guests may need mitigation. These vulnerabilities are
	11	not transient execution attacks. However, these vulnerabilities may propagate
	12	stale data into core fill buffers where the data can subsequently be inferred
	13	by an unmitigated transient execution attack. Mitigation for these
	14	vulnerabilities includes a combination of microcode update and software
	15	changes, depending on the platform and usage model. Some of these mitigations
	16	are similar to those used to mitigate Microarchitectural Data Sampling (MDS) or
	17	those used to mitigate Special Register Buffer Data Sampling (SRBDS).
	18
	19	Data Propagators
	20	================
	21	Propagators are operations that result in stale data being copied or moved from
	22	one microarchitectural buffer or register to another. Processor MMIO Stale Data
	23	Vulnerabilities are operations that may result in stale data being directly
	24	read into an architectural, software-visible state or sampled from a buffer or
	25	register.
	26
	27	Fill Buffer Stale Data Propagator (FBSDP)
	28	-----------------------------------------
	29	Stale data may propagate from fill buffers (FB) into the non-coherent portion
	30	of the uncore on some non-coherent writes. Fill buffer propagation by itself
	31	does not make stale data architecturally visible. Stale data must be propagated
	32	to a location where it is subject to reading or sampling.
	33
	34	Sideband Stale Data Propagator (SSDP)
	35	-------------------------------------
	36	The sideband stale data propagator (SSDP) is limited to the client (including
	37	Intel Xeon server E3) uncore implementation. The sideband response buffer is
	38	shared by all client cores. For non-coherent reads that go to sideband
	39	destinations, the uncore logic returns 64 bytes of data to the core, including
	40	both requested data and unrequested stale data, from a transaction buffer and
	41	the sideband response buffer. As a result, stale data from the sideband
	42	response and transaction buffers may now reside in a core fill buffer.
	43
	44	Primary Stale Data Propagator (PSDP)
	45	------------------------------------
	46	The primary stale data propagator (PSDP) is limited to the client (including
	47	Intel Xeon server E3) uncore implementation. Similar to the sideband response
	48	buffer, the primary response buffer is shared by all client cores. For some
	49	processors, MMIO primary reads will return 64 bytes of data to the core fill
	50	buffer including both requested data and unrequested stale data. This is
	51	similar to the sideband stale data propagator.
	52
	53	Vulnerabilities
	54	===============
	55	Device Register Partial Write (DRPW) (CVE-2022-21166)
	56	-----------------------------------------------------
	57	Some endpoint MMIO registers incorrectly handle writes that are smaller than
	58	the register size. Instead of aborting the write or only copying the correct
	59	subset of bytes (for example, 2 bytes for a 2-byte write), more bytes than
	60	specified by the write transaction may be written to the register. On
	61	processors affected by FBSDP, this may expose stale data from the fill buffers
	62	of the core that created the write transaction.
	63
	64	Shared Buffers Data Sampling (SBDS) (CVE-2022-21125)
	65	----------------------------------------------------
	66	After propagators may have moved data around the uncore and copied stale data
	67	into client core fill buffers, processors affected by MFBDS can leak data from
	68	the fill buffer. It is limited to the client (including Intel Xeon server E3)
	69	uncore implementation.
	70
	71	Shared Buffers Data Read (SBDR) (CVE-2022-21123)
	72	------------------------------------------------
	73	It is similar to Shared Buffer Data Sampling (SBDS) except that the data is
	74	directly read into the architectural software-visible state. It is limited to
	75	the client (including Intel Xeon server E3) uncore implementation.
	76
	77	Affected Processors
	78	===================
	79	Not all the CPUs are affected by all the variants. For instance, most
	80	processors for the server market (excluding Intel Xeon E3 processors) are
	81	impacted by only Device Register Partial Write (DRPW).
	82
	83	Below is the list of affected Intel processors [#f1]_:
	84
	85	=================== ============ =========
	86	Common name Family_Model Steppings
	87	=================== ============ =========
	88	HASWELL_X 06_3FH 2,4
	89	SKYLAKE_L 06_4EH 3
	90	BROADWELL_X 06_4FH All
	91	SKYLAKE_X 06_55H 3,4,6,7,11
	92	BROADWELL_D 06_56H 3,4,5
	93	SKYLAKE 06_5EH 3
	94	ICELAKE_X 06_6AH 4,5,6
	95	ICELAKE_D 06_6CH 1
	96	ICELAKE_L 06_7EH 5
	97	ATOM_TREMONT_D 06_86H All
	98	LAKEFIELD 06_8AH 1
	99	KABYLAKE_L 06_8EH 9 to 12
	100	ATOM_TREMONT 06_96H 1
	101	ATOM_TREMONT_L 06_9CH 0
	102	KABYLAKE 06_9EH 9 to 13
	103	COMETLAKE 06_A5H 2,3,5
	104	COMETLAKE_L 06_A6H 0,1
	105	ROCKETLAKE 06_A7H 1
	106	=================== ============ =========
	107
	108	If a CPU is in the affected processor list, but not affected by a variant, it
	109	is indicated by new bits in MSR IA32_ARCH_CAPABILITIES. As described in a later
	110	section, mitigation largely remains the same for all the variants, i.e. to
	111	clear the CPU fill buffers via VERW instruction.
	112
	113	New bits in MSRs
	114	================
	115	Newer processors and microcode update on existing affected processors added new
	116	bits to IA32_ARCH_CAPABILITIES MSR. These bits can be used to enumerate
	117	specific variants of Processor MMIO Stale Data vulnerabilities and mitigation
	118	capability.
	119
	120	MSR IA32_ARCH_CAPABILITIES
	121	--------------------------
	122	Bit 13 - SBDR_SSDP_NO - When set, processor is not affected by either the
	123	Shared Buffers Data Read (SBDR) vulnerability or the sideband stale
	124	data propagator (SSDP).
	125	Bit 14 - FBSDP_NO - When set, processor is not affected by the Fill Buffer
	126	Stale Data Propagator (FBSDP).
	127	Bit 15 - PSDP_NO - When set, processor is not affected by Primary Stale Data
	128	Propagator (PSDP).
	129	Bit 17 - FB_CLEAR - When set, VERW instruction will overwrite CPU fill buffer
	130	values as part of MD_CLEAR operations. Processors that do not
	131	enumerate MDS_NO (meaning they are affected by MDS) but that do
	132	enumerate support for both L1D_FLUSH and MD_CLEAR implicitly enumerate
	133	FB_CLEAR as part of their MD_CLEAR support.
	134	Bit 18 - FB_CLEAR_CTRL - Processor supports read and write to MSR
	135	IA32_MCU_OPT_CTRL[FB_CLEAR_DIS]. On such processors, the FB_CLEAR_DIS
	136	bit can be set to cause the VERW instruction to not perform the
	137	FB_CLEAR action. Not all processors that support FB_CLEAR will support
	138	FB_CLEAR_CTRL.
	139
	140	MSR IA32_MCU_OPT_CTRL
	141	---------------------
	142	Bit 3 - FB_CLEAR_DIS - When set, VERW instruction does not perform the FB_CLEAR
	143	action. This may be useful to reduce the performance impact of FB_CLEAR in
	144	cases where system software deems it warranted (for example, when performance
	145	is more critical, or the untrusted software has no MMIO access). Note that
	146	FB_CLEAR_DIS has no impact on enumeration (for example, it does not change
	147	FB_CLEAR or MD_CLEAR enumeration) and it may not be supported on all processors
	148	that enumerate FB_CLEAR.
	149
	150	Mitigation
	151	==========
	152	Like MDS, all variants of Processor MMIO Stale Data vulnerabilities have the
	153	same mitigation strategy to force the CPU to clear the affected buffers before
	154	an attacker can extract the secrets.
	155
	156	This is achieved by using the otherwise unused and obsolete VERW instruction in
	157	combination with a microcode update. The microcode clears the affected CPU
	158	buffers when the VERW instruction is executed.
	159
	160	Kernel reuses the MDS function to invoke the buffer clearing:
	161
	162	mds_clear_cpu_buffers()
	163
	164	On MDS affected CPUs, the kernel already invokes CPU buffer clear on
	165	kernel/userspace, hypervisor/guest and C-state (idle) transitions. No
	166	additional mitigation is needed on such CPUs.
	167
	168	For CPUs not affected by MDS or TAA, mitigation is needed only for the attacker
	169	with MMIO capability. Therefore, VERW is not required for kernel/userspace. For
	170	virtualization case, VERW is only needed at VMENTER for a guest with MMIO
	171	capability.
	172
	173	Mitigation points
	174	-----------------
	175	Return to user space
	176	^^^^^^^^^^^^^^^^^^^^
	177	Same mitigation as MDS when affected by MDS/TAA, otherwise no mitigation
	178	needed.
	179
	180	C-State transition
	181	^^^^^^^^^^^^^^^^^^
	182	Control register writes by CPU during C-state transition can propagate data
	183	from fill buffer to uncore buffers. Execute VERW before C-state transition to
	184	clear CPU fill buffers.
	185
	186	Guest entry point
	187	^^^^^^^^^^^^^^^^^
	188	Same mitigation as MDS when processor is also affected by MDS/TAA, otherwise
	189	execute VERW at VMENTER only for MMIO capable guests. On CPUs not affected by
	190	MDS/TAA, guest without MMIO access cannot extract secrets using Processor MMIO
	191	Stale Data vulnerabilities, so there is no need to execute VERW for such guests.
	192
	193	Mitigation control on the kernel command line
	194	---------------------------------------------
	195	The kernel command line allows to control the Processor MMIO Stale Data
	196	mitigations at boot time with the option "mmio_stale_data=". The valid
	197	arguments for this option are:
	198
	199	========== =================================================================
	200	full If the CPU is vulnerable, enable mitigation; CPU buffer clearing
	201	on exit to userspace and when entering a VM. Idle transitions are
	202	protected as well. It does not automatically disable SMT.
	203	full,nosmt Same as full, with SMT disabled on vulnerable CPUs. This is the
	204	complete mitigation.
	205	off Disables mitigation completely.
	206	========== =================================================================
	207
	208	If the CPU is affected and mmio_stale_data=off is not supplied on the kernel
	209	command line, then the kernel selects the appropriate mitigation.
	210
	211	Mitigation status information
	212	-----------------------------
	213	The Linux kernel provides a sysfs interface to enumerate the current
	214	vulnerability status of the system: whether the system is vulnerable, and
	215	which mitigations are active. The relevant sysfs file is:
	216
	217	/sys/devices/system/cpu/vulnerabilities/mmio_stale_data
	218
	219	The possible values in this file are:
	220
	221	.. list-table::
	222
	223	* - 'Not affected'
	224	- The processor is not vulnerable
	225	* - 'Vulnerable'
	226	- The processor is vulnerable, but no mitigation enabled
	227	* - 'Vulnerable: Clear CPU buffers attempted, no microcode'
	228	- The processor is vulnerable, but microcode is not updated. The
	229	mitigation is enabled on a best effort basis.
	230	* - 'Mitigation: Clear CPU buffers'
	231	- The processor is vulnerable and the CPU buffer clearing mitigation is
	232	enabled.
	233
	234	If the processor is vulnerable then the following information is appended to
	235	the above information:
	236
	237	======================== ===========================================
	238	'SMT vulnerable' SMT is enabled
	239	'SMT disabled' SMT is disabled
	240	'SMT Host state unknown' Kernel runs in a VM, Host SMT state unknown
	241	======================== ===========================================
	242
	243	References
	244	----------
	245	.. [#f1] Affected Processors
	246	https://www.intel.com/content/www/us/en/developer/topic-technology/software-security-guidance/processors-affected-consolidated-product-cpu-model.html

Documentation/admin-guide/kernel-parameters.txt+36−1

@@ -2469,7 +2469,6 @@ · 2468 unmodified lines
2469		2469
2470	protected: nVHE-based mode with support for guests whose	2470	protected: nVHE-based mode with support for guests whose
2471	state is kept private from the host.	2471	state is kept private from the host.
2472	Not valid if the kernel is running in EL2.
2473		2472
2474	Defaults to VHE/nVHE based on hardware support. Setting	2473	Defaults to VHE/nVHE based on hardware support. Setting
2475	mode to "protected" will disable kexec and hibernation	2474	mode to "protected" will disable kexec and hibernation
@@ -3176,6 +3175,7 @@ · 700 unmodified lines
3176	srbds=off [X86,INTEL]	3175	srbds=off [X86,INTEL]
3177	no_entry_flush [PPC]	3176	no_entry_flush [PPC]
3178	no_uaccess_flush [PPC]	3177	no_uaccess_flush [PPC]
		3178	mmio_stale_data=off [X86]
3179		3179
3180	Exceptions:	3180	Exceptions:
3181	This does not have any effect on	3181	This does not have any effect on
@@ -3197,6 +3197,7 @@ · 15 unmodified lines
3197	Equivalent to: l1tf=flush,nosmt [X86]	3197	Equivalent to: l1tf=flush,nosmt [X86]
3198	mds=full,nosmt [X86]	3198	mds=full,nosmt [X86]
3199	tsx_async_abort=full,nosmt [X86]	3199	tsx_async_abort=full,nosmt [X86]
		3200	mmio_stale_data=full,nosmt [X86]
3200		3201
3201	mminit_loglevel=	3202	mminit_loglevel=
3202	[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this	3203	[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this
@@ -3206,6 +3207,40 @@ · 3 unmodified lines
3206	log everything. Information is printed at KERN_DEBUG	3207	log everything. Information is printed at KERN_DEBUG
3207	so loglevel=8 may also need to be specified.	3208	so loglevel=8 may also need to be specified.
3208		3209
		3210	mmio_stale_data=
		3211	[X86,INTEL] Control mitigation for the Processor
		3212	MMIO Stale Data vulnerabilities.
		3213
		3214	Processor MMIO Stale Data is a class of
		3215	vulnerabilities that may expose data after an MMIO
		3216	operation. Exposed data could originate or end in
		3217	the same CPU buffers as affected by MDS and TAA.
		3218	Therefore, similar to MDS and TAA, the mitigation
		3219	is to clear the affected CPU buffers.
		3220
		3221	This parameter controls the mitigation. The
		3222	options are:
		3223
		3224	full - Enable mitigation on vulnerable CPUs
		3225
		3226	full,nosmt - Enable mitigation and disable SMT on
		3227	vulnerable CPUs.
		3228
		3229	off - Unconditionally disable mitigation
		3230
		3231	On MDS or TAA affected machines,
		3232	mmio_stale_data=off can be prevented by an active
		3233	MDS or TAA mitigation as these vulnerabilities are
		3234	mitigated with the same mechanism so in order to
		3235	disable this mitigation, you need to specify
		3236	mds=off and tsx_async_abort=off too.
		3237
		3238	Not specifying this option is equivalent to
		3239	mmio_stale_data=full.
		3240
		3241	For details see:
		3242	Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst
		3243
3209	module.sig_enforce	3244	module.sig_enforce
3210	[KNL] When CONFIG_MODULE_SIG is set, this means that	3245	[KNL] When CONFIG_MODULE_SIG is set, this means that
3211	modules without (valid) signatures will fail to load.	3246	modules without (valid) signatures will fail to load.

Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml+2−3

       value to be used for converting remote channel measurements to
       temperature.
     $ref: /schemas/types.yaml#/definitions/int32
-    items:
+    minimum: -128
-      minimum: -128
+    maximum: 127
-      maximum: 127
   ti,beta-compensation:
     description:

Documentation/devicetree/bindings/interrupt-controller/socionext,uniphier-aidet.yaml+1−0

@@ -30,6 +30,7 @@ properties: · 29 unmodified lines
30	- socionext,uniphier-ld11-aidet	30	- socionext,uniphier-ld11-aidet
31	- socionext,uniphier-ld20-aidet	31	- socionext,uniphier-ld20-aidet
32	- socionext,uniphier-pxs3-aidet	32	- socionext,uniphier-pxs3-aidet
		33	- socionext,uniphier-nx1-aidet
33		34
34	reg:	35	reg:
35	maxItems: 1	36	maxItems: 1

Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml+0−1

@@ -47,6 +47,5 @@ examples: · 46 unmodified lines
47	clocks = <&clkcfg CLK_SPI0>;	47	clocks = <&clkcfg CLK_SPI0>;
48	interrupt-parent = <&plic>;	48	interrupt-parent = <&plic>;
49	interrupts = <54>;	49	interrupts = <54>;
50	spi-max-frequency = <25000000>;
51	};	50	};
52	...	51	...

Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.yaml+0−1

@@ -110,7 +110,6 @@ examples: · 109 unmodified lines
110	pinctrl-names = "default";	110	pinctrl-names = "default";
111	pinctrl-0 = <&qup_spi1_default>;	111	pinctrl-0 = <&qup_spi1_default>;
112	interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>;	112	interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>;
113	spi-max-frequency = <50000000>;
114	#address-cells = <1>;	113	#address-cells = <1>;
115	#size-cells = <0>;	114	#size-cells = <0>;
116	};	115	};

Documentation/devicetree/bindings/usb/generic-ehci.yaml+2−1

@@ -136,7 +136,8 @@ properties: · 135 unmodified lines
136	Phandle of a companion.	136	Phandle of a companion.
137		137
138	phys:	138	phys:
139	maxItems: 1	139	minItems: 1
		140	maxItems: 3
140		141
141	phy-names:	142	phy-names:
142	const: usb	143	const: usb

Documentation/devicetree/bindings/usb/generic-ohci.yaml+2−1

@@ -103,7 +103,8 @@ properties: · 102 unmodified lines
103	Overrides the detected port count	103	Overrides the detected port count
104		104
105	phys:	105	phys:
106	maxItems: 1	106	minItems: 1
		107	maxItems: 3
107		108
108	phy-names:	109	phy-names:
109	const: usb	110	const: usb

Documentation/driver-api/gpio/board.rst+1−1

@@ -6,7 +6,7 @@ This document explains how GPIOs can be assigned to given devices and functions. · 5 unmodified lines
6		6
7	Note that it only applies to the new descriptor-based interface. For a	7	Note that it only applies to the new descriptor-based interface. For a
8	description of the deprecated integer-based GPIO interface please refer to	8	description of the deprecated integer-based GPIO interface please refer to
9	gpio-legacy.txt (actually, there is no real mapping possible with the old	9	legacy.rst (actually, there is no real mapping possible with the old
10	interface; you just fetch an integer from somewhere and request the	10	interface; you just fetch an integer from somewhere and request the
11	corresponding GPIO).	11	corresponding GPIO).
12		12

Documentation/driver-api/gpio/consumer.rst+3−3

Documentation/driver-api/gpio/intro.rst+3−3

@@ -14,12 +14,12 @@ Due to the history of GPIO interfaces in the kernel, there are two different · 13 unmodified lines
14	ways to obtain and use GPIOs:	14	ways to obtain and use GPIOs:
15		15
16	- The descriptor-based interface is the preferred way to manipulate GPIOs,	16	- The descriptor-based interface is the preferred way to manipulate GPIOs,
17	and is described by all the files in this directory excepted gpio-legacy.txt.	17	and is described by all the files in this directory excepted legacy.rst.
18	- The legacy integer-based interface which is considered deprecated (but still	18	- The legacy integer-based interface which is considered deprecated (but still
19	usable for compatibility reasons) is documented in gpio-legacy.txt.	19	usable for compatibility reasons) is documented in legacy.rst.
20		20
21	The remainder of this document applies to the new descriptor-based interface.	21	The remainder of this document applies to the new descriptor-based interface.
22	gpio-legacy.txt contains the same information applied to the legacy	22	legacy.rst contains the same information applied to the legacy
23	integer-based interface.	23	integer-based interface.
24		24
25		25

Documentation/filesystems/btrfs.rst+13−3

     * Subvolumes (separate internal filesystem roots)
     * Object level mirroring and striping
     * Checksums on data and metadata (multiple algorithms available)
-    * Compression
+    * Compression (multiple algorithms available)
+    * Reflink, deduplication
+    * Scrub (on-line checksum verification)
+    * Hierarchical quota groups (subvolume and snapshot support)
     * Integrated multiple device support, with several raid algorithms
     * Offline filesystem check
-    * Efficient incremental backup and FS mirroring
+    * Efficient incremental backup and FS mirroring (send/receive)
+    * Trim/discard
     * Online filesystem defragmentation
+    * Swapfile support
+    * Zoned mode
+    * Read/write metadata verification
+    * Online resize (shrink, grow)
-For more information please refer to the wiki
+For more information please refer to the documentation site or wiki
+  https://btrfs.readthedocs.io
   https://btrfs.wiki.kernel.org

Documentation/filesystems/ext4/attributes.rst+34−34

@@ -13,8 +13,8 @@ disappeared as of Linux 3.0. · 12 unmodified lines
13		13
14	There are two places where extended attributes can be found. The first	14	There are two places where extended attributes can be found. The first
15	place is between the end of each inode entry and the beginning of the	15	place is between the end of each inode entry and the beginning of the
16	next inode entry. For example, if inode.i\_extra\_isize = 28 and	16	next inode entry. For example, if inode.i_extra_isize = 28 and
17	sb.inode\_size = 256, then there are 256 - (128 + 28) = 100 bytes	17	sb.inode_size = 256, then there are 256 - (128 + 28) = 100 bytes
18	available for in-inode extended attribute storage. The second place	18	available for in-inode extended attribute storage. The second place
19	where extended attributes can be found is in the block pointed to by	19	where extended attributes can be found is in the block pointed to by
20	``inode.i_file_acl``. As of Linux 3.11, it is not possible for this	20	``inode.i_file_acl``. As of Linux 3.11, it is not possible for this
@@ -38,8 +38,8 @@ Extended attributes, when stored after the inode, have a header · 17 unmodified lines
38	- Name	38	- Name
39	- Description	39	- Description
40	* - 0x0	40	* - 0x0
41	- \_\_le32	41	- __le32
42	- h\_magic	42	- h_magic
43	- Magic number for identification, 0xEA020000. This value is set by the	43	- Magic number for identification, 0xEA020000. This value is set by the
44	Linux driver, though e2fsprogs doesn't seem to check it(?)	44	Linux driver, though e2fsprogs doesn't seem to check it(?)
45		45
@@ -55,28 +55,28 @@ The beginning of an extended attribute block is in · 9 unmodified lines
55	- Name	55	- Name
56	- Description	56	- Description
57	* - 0x0	57	* - 0x0
58	- \_\_le32	58	- __le32
59	- h\_magic	59	- h_magic
60	- Magic number for identification, 0xEA020000.	60	- Magic number for identification, 0xEA020000.
61	* - 0x4	61	* - 0x4
62	- \_\_le32	62	- __le32
63	- h\_refcount	63	- h_refcount
64	- Reference count.	64	- Reference count.
65	* - 0x8	65	* - 0x8
66	- \_\_le32	66	- __le32
67	- h\_blocks	67	- h_blocks
68	- Number of disk blocks used.	68	- Number of disk blocks used.
69	* - 0xC	69	* - 0xC
70	- \_\_le32	70	- __le32
71	- h\_hash	71	- h_hash
72	- Hash value of all attributes.	72	- Hash value of all attributes.
73	* - 0x10	73	* - 0x10
74	- \_\_le32	74	- __le32
75	- h\_checksum	75	- h_checksum
76	- Checksum of the extended attribute block.	76	- Checksum of the extended attribute block.
77	* - 0x14	77	* - 0x14
78	- \_\_u32	78	- __u32
79	- h\_reserved[3]	79	- h_reserved[3]
80	- Zero.	80	- Zero.
81		81
82	The checksum is calculated against the FS UUID, the 64-bit block number	82	The checksum is calculated against the FS UUID, the 64-bit block number
@@ -100,46 +100,46 @@ Attributes stored inside an inode do not need be stored in sorted order. · 17 unmodified lines
100	- Name	100	- Name
101	- Description	101	- Description
102	* - 0x0	102	* - 0x0
103	- \_\_u8	103	- __u8
104	- e\_name\_len	104	- e_name_len
105	- Length of name.	105	- Length of name.
106	* - 0x1	106	* - 0x1
107	- \_\_u8	107	- __u8
108	- e\_name\_index	108	- e_name_index
109	- Attribute name index. There is a discussion of this below.	109	- Attribute name index. There is a discussion of this below.
110	* - 0x2	110	* - 0x2
111	- \_\_le16	111	- __le16
112	- e\_value\_offs	112	- e_value_offs
113	- Location of this attribute's value on the disk block where it is stored.	113	- Location of this attribute's value on the disk block where it is stored.
114	Multiple attributes can share the same value. For an inode attribute	114	Multiple attributes can share the same value. For an inode attribute
115	this value is relative to the start of the first entry; for a block this	115	this value is relative to the start of the first entry; for a block this
116	value is relative to the start of the block (i.e. the header).	116	value is relative to the start of the block (i.e. the header).
117	* - 0x4	117	* - 0x4
118	- \_\_le32	118	- __le32
119	- e\_value\_inum	119	- e_value_inum
120	- The inode where the value is stored. Zero indicates the value is in the	120	- The inode where the value is stored. Zero indicates the value is in the
121	same block as this entry. This field is only used if the	121	same block as this entry. This field is only used if the
122	INCOMPAT\_EA\_INODE feature is enabled.	122	INCOMPAT_EA_INODE feature is enabled.
123	* - 0x8	123	* - 0x8
124	- \_\_le32	124	- __le32
125	- e\_value\_size	125	- e_value_size
126	- Length of attribute value.	126	- Length of attribute value.
127	* - 0xC	127	* - 0xC
128	- \_\_le32	128	- __le32
129	- e\_hash	129	- e_hash
130	- Hash value of attribute name and attribute value. The kernel doesn't	130	- Hash value of attribute name and attribute value. The kernel doesn't
131	update the hash for in-inode attributes, so for that case this value	131	update the hash for in-inode attributes, so for that case this value
132	must be zero, because e2fsck validates any non-zero hash regardless of	132	must be zero, because e2fsck validates any non-zero hash regardless of
133	where the xattr lives.	133	where the xattr lives.
134	* - 0x10	134	* - 0x10
135	- char	135	- char
136	- e\_name[e\_name\_len]	136	- e_name[e_name_len]
137	- Attribute name. Does not include trailing NULL.	137	- Attribute name. Does not include trailing NULL.
138		138
139	Attribute values can follow the end of the entry table. There appears to	139	Attribute values can follow the end of the entry table. There appears to
140	be a requirement that they be aligned to 4-byte boundaries. The values	140	be a requirement that they be aligned to 4-byte boundaries. The values
141	are stored starting at the end of the block and grow towards the	141	are stored starting at the end of the block and grow towards the
142	xattr\_header/xattr\_entry table. When the two collide, the overflow is	142	xattr_header/xattr_entry table. When the two collide, the overflow is
143	put into a separate disk block. If the disk block fills up, the	143	put into a separate disk block. If the disk block fills up, the
144	filesystem returns -ENOSPC.	144	filesystem returns -ENOSPC.
145		145
@@ -167,15 +167,15 @@ the key name. Here is a map of name index values to key prefixes: · 21 unmodified lines
167	* - 1	167	* - 1
168	- “user.”	168	- “user.”
169	* - 2	169	* - 2
170	- “system.posix\_acl\_access”	170	- “system.posix_acl_access”
171	* - 3	171	* - 3
172	- “system.posix\_acl\_default”	172	- “system.posix_acl_default”
173	* - 4	173	* - 4
174	- “trusted.”	174	- “trusted.”
175	* - 6	175	* - 6
176	- “security.”	176	- “security.”
177	* - 7	177	* - 7
178	- “system.” (inline\_data only?)	178	- “system.” (inline_data only?)
179	* - 8	179	* - 8
180	- “system.richacl” (SuSE kernels only?)	180	- “system.richacl” (SuSE kernels only?)
181		181

Documentation/filesystems/ext4/bigalloc.rst+1−1

@@ -23,7 +23,7 @@ means that a block group addresses 32 gigabytes instead of 128 megabytes, · 22 unmodified lines
23	also shrinking the amount of file system overhead for metadata.	23	also shrinking the amount of file system overhead for metadata.
24		24
25	The administrator can set a block cluster size at mkfs time (which is	25	The administrator can set a block cluster size at mkfs time (which is
26	stored in the s\_log\_cluster\_size field in the superblock); from then	26	stored in the s_log_cluster_size field in the superblock); from then
27	on, the block bitmaps track clusters, not individual blocks. This means	27	on, the block bitmaps track clusters, not individual blocks. This means
28	that block groups can be several gigabytes in size (instead of just	28	that block groups can be several gigabytes in size (instead of just
29	128MiB); however, the minimum allocation unit becomes a cluster, not a	29	128MiB); however, the minimum allocation unit becomes a cluster, not a

Documentation/filesystems/ext4/bitmaps.rst+3−3

@@ -9,15 +9,15 @@ group. · 8 unmodified lines
9	The inode bitmap records which entries in the inode table are in use.	9	The inode bitmap records which entries in the inode table are in use.
10		10
11	As with most bitmaps, one bit represents the usage status of one data	11	As with most bitmaps, one bit represents the usage status of one data
12	block or inode table entry. This implies a block group size of 8 \*	12	block or inode table entry. This implies a block group size of 8 *
13	number\_of\_bytes\_in\_a\_logical\_block.	13	number_of_bytes_in_a_logical_block.
14		14
15	NOTE: If ``BLOCK_UNINIT`` is set for a given block group, various parts	15	NOTE: If ``BLOCK_UNINIT`` is set for a given block group, various parts
16	of the kernel and e2fsprogs code pretends that the block bitmap contains	16	of the kernel and e2fsprogs code pretends that the block bitmap contains
17	zeros (i.e. all blocks in the group are free). However, it is not	17	zeros (i.e. all blocks in the group are free). However, it is not
18	necessarily the case that no blocks are in use -- if ``meta_bg`` is set,	18	necessarily the case that no blocks are in use -- if ``meta_bg`` is set,
19	the bitmaps and group descriptor live inside the group. Unfortunately,	19	the bitmaps and group descriptor live inside the group. Unfortunately,
20	ext2fs\_test\_block\_bitmap2() will return '0' for those locations,	20	ext2fs_test_block_bitmap2() will return '0' for those locations,
21	which produces confusing debugfs output.	21	which produces confusing debugfs output.
22		22
23	Inode Table	23	Inode Table

Documentation/filesystems/ext4/blockgroup.rst+15−15

Documentation/filesystems/ext4/blockmap.rst+1−1

@@ -1,7 +1,7 @@
1	.. SPDX-License-Identifier: GPL-2.0	1	.. SPDX-License-Identifier: GPL-2.0
2		2
3	+---------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+	3	+---------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
4	\| i.i\_block Offset \| Where It Points \|	4	\| i.i_block Offset \| Where It Points \|
5	+=====================+==============================================================================================================================================================================================================================+	5	+=====================+==============================================================================================================================================================================================================================+
6	\| 0 to 11 \| Direct map to file blocks 0 to 11. \|	6	\| 0 to 11 \| Direct map to file blocks 0 to 11. \|
7	+---------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+	7	+---------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+

Documentation/filesystems/ext4/checksums.rst+13−13

@@ -4,7 +4,7 @@ Checksums · 3 unmodified lines
4	---------	4	---------
5		5
6	Starting in early 2012, metadata checksums were added to all major ext4	6	Starting in early 2012, metadata checksums were added to all major ext4
7	and jbd2 data structures. The associated feature flag is metadata\_csum.	7	and jbd2 data structures. The associated feature flag is metadata_csum.
8	The desired checksum algorithm is indicated in the superblock, though as	8	The desired checksum algorithm is indicated in the superblock, though as
9	of October 2012 the only supported algorithm is crc32c. Some data	9	of October 2012 the only supported algorithm is crc32c. Some data
10	structures did not have space to fit a full 32-bit checksum, so only the	10	structures did not have space to fit a full 32-bit checksum, so only the
@@ -20,7 +20,7 @@ encounters directory blocks that lack sufficient empty space to add a · 9 unmodified lines
20	checksum, it will request that you run ``e2fsck -D`` to have the	20	checksum, it will request that you run ``e2fsck -D`` to have the
21	directories rebuilt with checksums. This has the added benefit of	21	directories rebuilt with checksums. This has the added benefit of
22	removing slack space from the directory files and rebalancing the htree	22	removing slack space from the directory files and rebalancing the htree
23	indexes. If you \_ignore\_ this step, your directories will not be	23	indexes. If you _ignore_ this step, your directories will not be
24	protected by a checksum!	24	protected by a checksum!
25		25
26	The following table describes the data elements that go into each type	26	The following table describes the data elements that go into each type
@@ -35,39 +35,39 @@ of checksum. The checksum function is whatever the superblock describes · 8 unmodified lines
35	- Length	35	- Length
36	- Ingredients	36	- Ingredients
37	* - Superblock	37	* - Superblock
38	- \_\_le32	38	- __le32
39	- The entire superblock up to the checksum field. The UUID lives inside	39	- The entire superblock up to the checksum field. The UUID lives inside
40	the superblock.	40	the superblock.
41	* - MMP	41	* - MMP
42	- \_\_le32	42	- __le32
43	- UUID + the entire MMP block up to the checksum field.	43	- UUID + the entire MMP block up to the checksum field.
44	* - Extended Attributes	44	* - Extended Attributes
45	- \_\_le32	45	- __le32
46	- UUID + the entire extended attribute block. The checksum field is set to	46	- UUID + the entire extended attribute block. The checksum field is set to
47	zero.	47	zero.
48	* - Directory Entries	48	* - Directory Entries
49	- \_\_le32	49	- __le32
50	- UUID + inode number + inode generation + the directory block up to the	50	- UUID + inode number + inode generation + the directory block up to the
51	fake entry enclosing the checksum field.	51	fake entry enclosing the checksum field.
52	* - HTREE Nodes	52	* - HTREE Nodes
53	- \_\_le32	53	- __le32
54	- UUID + inode number + inode generation + all valid extents + HTREE tail.	54	- UUID + inode number + inode generation + all valid extents + HTREE tail.
55	The checksum field is set to zero.	55	The checksum field is set to zero.
56	* - Extents	56	* - Extents
57	- \_\_le32	57	- __le32
58	- UUID + inode number + inode generation + the entire extent block up to	58	- UUID + inode number + inode generation + the entire extent block up to
59	the checksum field.	59	the checksum field.
60	* - Bitmaps	60	* - Bitmaps
61	- \_\_le32 or \_\_le16	61	- __le32 or __le16
62	- UUID + the entire bitmap. Checksums are stored in the group descriptor,	62	- UUID + the entire bitmap. Checksums are stored in the group descriptor,
63	and truncated if the group descriptor size is 32 bytes (i.e. ^64bit)	63	and truncated if the group descriptor size is 32 bytes (i.e. ^64bit)
64	* - Inodes	64	* - Inodes
65	- \_\_le32	65	- __le32
66	- UUID + inode number + inode generation + the entire inode. The checksum	66	- UUID + inode number + inode generation + the entire inode. The checksum
67	field is set to zero. Each inode has its own checksum.	67	field is set to zero. Each inode has its own checksum.
68	* - Group Descriptors	68	* - Group Descriptors
69	- \_\_le16	69	- __le16
70	- If metadata\_csum, then UUID + group number + the entire descriptor;	70	- If metadata_csum, then UUID + group number + the entire descriptor;
71	else if gdt\_csum, then crc16(UUID + group number + the entire	71	else if gdt_csum, then crc16(UUID + group number + the entire
72	descriptor). In all cases, only the lower 16 bits are stored.	72	descriptor). In all cases, only the lower 16 bits are stored.
73		73

Documentation/filesystems/ext4/directory.rst+83−83

@@ -42,24 +42,24 @@ is at most 263 bytes long, though on disk you'll need to reference · 41 unmodified lines
42	- Name	42	- Name
43	- Description	43	- Description
44	* - 0x0	44	* - 0x0
45	- \_\_le32	45	- __le32
46	- inode	46	- inode
47	- Number of the inode that this directory entry points to.	47	- Number of the inode that this directory entry points to.
48	* - 0x4	48	* - 0x4
49	- \_\_le16	49	- __le16
50	- rec\_len	50	- rec_len
51	- Length of this directory entry. Must be a multiple of 4.	51	- Length of this directory entry. Must be a multiple of 4.
52	* - 0x6	52	* - 0x6
53	- \_\_le16	53	- __le16
54	- name\_len	54	- name_len
55	- Length of the file name.	55	- Length of the file name.
56	* - 0x8	56	* - 0x8
57	- char	57	- char
58	- name[EXT4\_NAME\_LEN]	58	- name[EXT4_NAME_LEN]
59	- File name.	59	- File name.
60		60
61	Since file names cannot be longer than 255 bytes, the new directory	61	Since file names cannot be longer than 255 bytes, the new directory
62	entry format shortens the name\_len field and uses the space for a file	62	entry format shortens the name_len field and uses the space for a file
63	type flag, probably to avoid having to load every inode during directory	63	type flag, probably to avoid having to load every inode during directory
64	tree traversal. This format is ``ext4_dir_entry_2``, which is at most	64	tree traversal. This format is ``ext4_dir_entry_2``, which is at most
65	263 bytes long, though on disk you'll need to reference	65	263 bytes long, though on disk you'll need to reference
@@ -74,24 +74,24 @@ tree traversal. This format is ``ext4_dir_entry_2``, which is at most · 8 unmodified lines
74	- Name	74	- Name
75	- Description	75	- Description
76	* - 0x0	76	* - 0x0
77	- \_\_le32	77	- __le32
78	- inode	78	- inode
79	- Number of the inode that this directory entry points to.	79	- Number of the inode that this directory entry points to.
80	* - 0x4	80	* - 0x4
81	- \_\_le16	81	- __le16
82	- rec\_len	82	- rec_len
83	- Length of this directory entry.	83	- Length of this directory entry.
84	* - 0x6	84	* - 0x6
85	- \_\_u8	85	- __u8
86	- name\_len	86	- name_len
87	- Length of the file name.	87	- Length of the file name.
88	* - 0x7	88	* - 0x7
89	- \_\_u8	89	- __u8
90	- file\_type	90	- file_type
91	- File type code, see ftype_ table below.	91	- File type code, see ftype_ table below.
92	* - 0x8	92	* - 0x8
93	- char	93	- char
94	- name[EXT4\_NAME\_LEN]	94	- name[EXT4_NAME_LEN]
95	- File name.	95	- File name.
96		96
97	.. _ftype:	97	.. _ftype:
@@ -137,19 +137,19 @@ entry uses this extension, it may be up to 271 bytes. · 39 unmodified lines
137	- Name	137	- Name
138	- Description	138	- Description
139	* - 0x0	139	* - 0x0
140	- \_\_le32	140	- __le32
141	- hash	141	- hash
142	- The hash of the directory name	142	- The hash of the directory name
143	* - 0x4	143	* - 0x4
144	- \_\_le32	144	- __le32
145	- minor\_hash	145	- minor_hash
146	- The minor hash of the directory name	146	- The minor hash of the directory name
147		147
148		148
149	In order to add checksums to these classic directory blocks, a phony	149	In order to add checksums to these classic directory blocks, a phony
150	``struct ext4_dir_entry`` is placed at the end of each leaf block to	150	``struct ext4_dir_entry`` is placed at the end of each leaf block to
151	hold the checksum. The directory entry is 12 bytes long. The inode	151	hold the checksum. The directory entry is 12 bytes long. The inode
152	number and name\_len fields are set to zero to fool old software into	152	number and name_len fields are set to zero to fool old software into
153	ignoring an apparently empty directory entry, and the checksum is stored	153	ignoring an apparently empty directory entry, and the checksum is stored
154	in the place where the name normally goes. The structure is	154	in the place where the name normally goes. The structure is
155	``struct ext4_dir_entry_tail``:	155	``struct ext4_dir_entry_tail``:
@@ -163,24 +163,24 @@ in the place where the name normally goes. The structure is · 7 unmodified lines
163	- Name	163	- Name
164	- Description	164	- Description
165	* - 0x0	165	* - 0x0
166	- \_\_le32	166	- __le32
167	- det\_reserved\_zero1	167	- det_reserved_zero1
168	- Inode number, which must be zero.	168	- Inode number, which must be zero.
169	* - 0x4	169	* - 0x4
170	- \_\_le16	170	- __le16
171	- det\_rec\_len	171	- det_rec_len
172	- Length of this directory entry, which must be 12.	172	- Length of this directory entry, which must be 12.
173	* - 0x6	173	* - 0x6
174	- \_\_u8	174	- __u8
175	- det\_reserved\_zero2	175	- det_reserved_zero2
176	- Length of the file name, which must be zero.	176	- Length of the file name, which must be zero.
177	* - 0x7	177	* - 0x7
178	- \_\_u8	178	- __u8
179	- det\_reserved\_ft	179	- det_reserved_ft
180	- File type, which must be 0xDE.	180	- File type, which must be 0xDE.
181	* - 0x8	181	* - 0x8
182	- \_\_le32	182	- __le32
183	- det\_checksum	183	- det_checksum
184	- Directory leaf block checksum.	184	- Directory leaf block checksum.
185		185
186	The leaf directory block checksum is calculated against the FS UUID, the	186	The leaf directory block checksum is calculated against the FS UUID, the
@@ -194,7 +194,7 @@ Hash Tree Directories · 7 unmodified lines
194	A linear array of directory entries isn't great for performance, so a	194	A linear array of directory entries isn't great for performance, so a
195	new feature was added to ext3 to provide a faster (but peculiar)	195	new feature was added to ext3 to provide a faster (but peculiar)
196	balanced tree keyed off a hash of the directory entry name. If the	196	balanced tree keyed off a hash of the directory entry name. If the
197	EXT4\_INDEX\_FL (0x1000) flag is set in the inode, this directory uses a	197	EXT4_INDEX_FL (0x1000) flag is set in the inode, this directory uses a
198	hashed btree (htree) to organize and find directory entries. For	198	hashed btree (htree) to organize and find directory entries. For
199	backwards read-only compatibility with ext2, this tree is actually	199	backwards read-only compatibility with ext2, this tree is actually
200	hidden inside the directory file, masquerading as “empty” directory data	200	hidden inside the directory file, masquerading as “empty” directory data
@@ -206,14 +206,14 @@ rest of the directory block is empty so that it moves on. · 5 unmodified lines
206	The root of the tree always lives in the first data block of the	206	The root of the tree always lives in the first data block of the
207	directory. By ext2 custom, the '.' and '..' entries must appear at the	207	directory. By ext2 custom, the '.' and '..' entries must appear at the
208	beginning of this first block, so they are put here as two	208	beginning of this first block, so they are put here as two
209	``struct ext4_dir_entry_2``\ s and not stored in the tree. The rest of	209	``struct ext4_dir_entry_2`` s and not stored in the tree. The rest of
210	the root node contains metadata about the tree and finally a hash->block	210	the root node contains metadata about the tree and finally a hash->block
211	map to find nodes that are lower in the htree. If	211	map to find nodes that are lower in the htree. If
212	``dx_root.info.indirect_levels`` is non-zero then the htree has two	212	``dx_root.info.indirect_levels`` is non-zero then the htree has two
213	levels; the data block pointed to by the root node's map is an interior	213	levels; the data block pointed to by the root node's map is an interior
214	node, which is indexed by a minor hash. Interior nodes in this tree	214	node, which is indexed by a minor hash. Interior nodes in this tree
215	contains a zeroed out ``struct ext4_dir_entry_2`` followed by a	215	contains a zeroed out ``struct ext4_dir_entry_2`` followed by a
216	minor\_hash->block map to find leafe nodes. Leaf nodes contain a linear	216	minor_hash->block map to find leafe nodes. Leaf nodes contain a linear
217	array of all ``struct ext4_dir_entry_2``; all of these entries	217	array of all ``struct ext4_dir_entry_2``; all of these entries
218	(presumably) hash to the same value. If there is an overflow, the	218	(presumably) hash to the same value. If there is an overflow, the
219	entries simply overflow into the next leaf node, and the	219	entries simply overflow into the next leaf node, and the
@@ -245,83 +245,83 @@ of a data block: · 25 unmodified lines
245	- Name	245	- Name
246	- Description	246	- Description
247	* - 0x0	247	* - 0x0
248	- \_\_le32	248	- __le32
249	- dot.inode	249	- dot.inode
250	- inode number of this directory.	250	- inode number of this directory.
251	* - 0x4	251	* - 0x4
252	- \_\_le16	252	- __le16
253	- dot.rec\_len	253	- dot.rec_len
254	- Length of this record, 12.	254	- Length of this record, 12.
255	* - 0x6	255	* - 0x6
256	- u8	256	- u8
257	- dot.name\_len	257	- dot.name_len
258	- Length of the name, 1.	258	- Length of the name, 1.
259	* - 0x7	259	* - 0x7
260	- u8	260	- u8
261	- dot.file\_type	261	- dot.file_type
262	- File type of this entry, 0x2 (directory) (if the feature flag is set).	262	- File type of this entry, 0x2 (directory) (if the feature flag is set).
263	* - 0x8	263	* - 0x8
264	- char	264	- char
265	- dot.name[4]	265	- dot.name[4]
266	- “.\\0\\0\\0”	266	- “.\0\0\0”
267	* - 0xC	267	* - 0xC
268	- \_\_le32	268	- __le32
269	- dotdot.inode	269	- dotdot.inode
270	- inode number of parent directory.	270	- inode number of parent directory.
271	* - 0x10	271	* - 0x10
272	- \_\_le16	272	- __le16
273	- dotdot.rec\_len	273	- dotdot.rec_len
274	- block\_size - 12. The record length is long enough to cover all htree	274	- block_size - 12. The record length is long enough to cover all htree
275	data.	275	data.
276	* - 0x12	276	* - 0x12
277	- u8	277	- u8
278	- dotdot.name\_len	278	- dotdot.name_len
279	- Length of the name, 2.	279	- Length of the name, 2.
280	* - 0x13	280	* - 0x13
281	- u8	281	- u8
282	- dotdot.file\_type	282	- dotdot.file_type
283	- File type of this entry, 0x2 (directory) (if the feature flag is set).	283	- File type of this entry, 0x2 (directory) (if the feature flag is set).
284	* - 0x14	284	* - 0x14
285	- char	285	- char
286	- dotdot\_name[4]	286	- dotdot_name[4]
287	- “..\\0\\0”	287	- “..\0\0”
288	* - 0x18	288	* - 0x18
289	- \_\_le32	289	- __le32
290	- struct dx\_root\_info.reserved\_zero	290	- struct dx_root_info.reserved_zero
291	- Zero.	291	- Zero.
292	* - 0x1C	292	* - 0x1C
293	- u8	293	- u8
294	- struct dx\_root\_info.hash\_version	294	- struct dx_root_info.hash_version
295	- Hash type, see dirhash_ table below.	295	- Hash type, see dirhash_ table below.
296	* - 0x1D	296	* - 0x1D
297	- u8	297	- u8
298	- struct dx\_root\_info.info\_length	298	- struct dx_root_info.info_length
299	- Length of the tree information, 0x8.	299	- Length of the tree information, 0x8.
300	* - 0x1E	300	* - 0x1E
301	- u8	301	- u8
302	- struct dx\_root\_info.indirect\_levels	302	- struct dx_root_info.indirect_levels
303	- Depth of the htree. Cannot be larger than 3 if the INCOMPAT\_LARGEDIR	303	- Depth of the htree. Cannot be larger than 3 if the INCOMPAT_LARGEDIR
304	feature is set; cannot be larger than 2 otherwise.	304	feature is set; cannot be larger than 2 otherwise.
305	* - 0x1F	305	* - 0x1F
306	- u8	306	- u8
307	- struct dx\_root\_info.unused\_flags	307	- struct dx_root_info.unused_flags
308	-	308	-
309	* - 0x20	309	* - 0x20
310	- \_\_le16	310	- __le16
311	- limit	311	- limit
312	- Maximum number of dx\_entries that can follow this header, plus 1 for	312	- Maximum number of dx_entries that can follow this header, plus 1 for
313	the header itself.	313	the header itself.
314	* - 0x22	314	* - 0x22
315	- \_\_le16	315	- __le16
316	- count	316	- count
317	- Actual number of dx\_entries that follow this header, plus 1 for the	317	- Actual number of dx_entries that follow this header, plus 1 for the
318	header itself.	318	header itself.
319	* - 0x24	319	* - 0x24
320	- \_\_le32	320	- __le32
321	- block	321	- block
322	- The block number (within the directory file) that goes with hash=0.	322	- The block number (within the directory file) that goes with hash=0.
323	* - 0x28	323	* - 0x28
324	- struct dx\_entry	324	- struct dx_entry
325	- entries[0]	325	- entries[0]
326	- As many 8-byte ``struct dx_entry`` as fits in the rest of the data block.	326	- As many 8-byte ``struct dx_entry`` as fits in the rest of the data block.
327		327
@@ -362,38 +362,38 @@ also the full length of a data block: · 34 unmodified lines
362	- Name	362	- Name
363	- Description	363	- Description
364	* - 0x0	364	* - 0x0
365	- \_\_le32	365	- __le32
366	- fake.inode	366	- fake.inode
367	- Zero, to make it look like this entry is not in use.	367	- Zero, to make it look like this entry is not in use.
368	* - 0x4	368	* - 0x4
369	- \_\_le16	369	- __le16
370	- fake.rec\_len	370	- fake.rec_len
371	- The size of the block, in order to hide all of the dx\_node data.	371	- The size of the block, in order to hide all of the dx_node data.
372	* - 0x6	372	* - 0x6
373	- u8	373	- u8
374	- name\_len	374	- name_len
375	- Zero. There is no name for this “unused” directory entry.	375	- Zero. There is no name for this “unused” directory entry.
376	* - 0x7	376	* - 0x7
377	- u8	377	- u8
378	- file\_type	378	- file_type
379	- Zero. There is no file type for this “unused” directory entry.	379	- Zero. There is no file type for this “unused” directory entry.
380	* - 0x8	380	* - 0x8
381	- \_\_le16	381	- __le16
382	- limit	382	- limit
383	- Maximum number of dx\_entries that can follow this header, plus 1 for	383	- Maximum number of dx_entries that can follow this header, plus 1 for
384	the header itself.	384	the header itself.
385	* - 0xA	385	* - 0xA
386	- \_\_le16	386	- __le16
387	- count	387	- count
388	- Actual number of dx\_entries that follow this header, plus 1 for the	388	- Actual number of dx_entries that follow this header, plus 1 for the
389	header itself.	389	header itself.
390	* - 0xE	390	* - 0xE
391	- \_\_le32	391	- __le32
392	- block	392	- block
393	- The block number (within the directory file) that goes with the lowest	393	- The block number (within the directory file) that goes with the lowest
394	hash value of this block. This value is stored in the parent block.	394	hash value of this block. This value is stored in the parent block.
395	* - 0x12	395	* - 0x12
396	- struct dx\_entry	396	- struct dx_entry
397	- entries[0]	397	- entries[0]
398	- As many 8-byte ``struct dx_entry`` as fits in the rest of the data block.	398	- As many 8-byte ``struct dx_entry`` as fits in the rest of the data block.
399		399
@@ -410,11 +410,11 @@ long: · 10 unmodified lines
410	- Name	410	- Name
411	- Description	411	- Description
412	* - 0x0	412	* - 0x0
413	- \_\_le32	413	- __le32
414	- hash	414	- hash
415	- Hash code.	415	- Hash code.
416	* - 0x4	416	* - 0x4
417	- \_\_le32	417	- __le32
418	- block	418	- block
419	- Block number (within the directory file, not filesystem blocks) of the	419	- Block number (within the directory file, not filesystem blocks) of the
420	next node in the htree.	420	next node in the htree.
@@ -423,13 +423,13 @@ long: · 2 unmodified lines
423	author.)	423	author.)
424		424
425	If metadata checksums are enabled, the last 8 bytes of the directory	425	If metadata checksums are enabled, the last 8 bytes of the directory
426	block (precisely the length of one dx\_entry) are used to store a	426	block (precisely the length of one dx_entry) are used to store a
427	``struct dx_tail``, which contains the checksum. The ``limit`` and	427	``struct dx_tail``, which contains the checksum. The ``limit`` and
428	``count`` entries in the dx\_root/dx\_node structures are adjusted as	428	``count`` entries in the dx_root/dx_node structures are adjusted as
429	necessary to fit the dx\_tail into the block. If there is no space for	429	necessary to fit the dx_tail into the block. If there is no space for
430	the dx\_tail, the user is notified to run e2fsck -D to rebuild the	430	the dx_tail, the user is notified to run e2fsck -D to rebuild the
431	directory index (which will ensure that there's space for the checksum.	431	directory index (which will ensure that there's space for the checksum.
432	The dx\_tail structure is 8 bytes long and looks like this:	432	The dx_tail structure is 8 bytes long and looks like this:
433		433
434	.. list-table::	434	.. list-table::
435	:widths: 8 8 24 40	435	:widths: 8 8 24 40
@@ -441,13 +441,13 @@ The dx\_tail structure is 8 bytes long and looks like this: · 5 unmodified lines
441	- Description	441	- Description
442	* - 0x0	442	* - 0x0
443	- u32	443	- u32
444	- dt\_reserved	444	- dt_reserved
445	- Zero.	445	- Zero.
446	* - 0x4	446	* - 0x4
447	- \_\_le32	447	- __le32
448	- dt\_checksum	448	- dt_checksum
449	- Checksum of the htree directory block.	449	- Checksum of the htree directory block.
450		450
451	The checksum is calculated against the FS UUID, the htree index header	451	The checksum is calculated against the FS UUID, the htree index header
452	(dx\_root or dx\_node), all of the htree indices (dx\_entry) that are in	452	(dx_root or dx_node), all of the htree indices (dx_entry) that are in
453	use, and the tail block (dx\_tail).	453	use, and the tail block (dx_tail).

Documentation/filesystems/ext4/eainode.rst+5−5

@@ -5,14 +5,14 @@ Large Extended Attribute Values · 4 unmodified lines
5		5
6	To enable ext4 to store extended attribute values that do not fit in the	6	To enable ext4 to store extended attribute values that do not fit in the
7	inode or in the single extended attribute block attached to an inode,	7	inode or in the single extended attribute block attached to an inode,
8	the EA\_INODE feature allows us to store the value in the data blocks of	8	the EA_INODE feature allows us to store the value in the data blocks of
9	a regular file inode. This “EA inode” is linked only from the extended	9	a regular file inode. This “EA inode” is linked only from the extended
10	attribute name index and must not appear in a directory entry. The	10	attribute name index and must not appear in a directory entry. The
11	inode's i\_atime field is used to store a checksum of the xattr value;	11	inode's i_atime field is used to store a checksum of the xattr value;
12	and i\_ctime/i\_version store a 64-bit reference count, which enables	12	and i_ctime/i_version store a 64-bit reference count, which enables
13	sharing of large xattr values between multiple owning inodes. For	13	sharing of large xattr values between multiple owning inodes. For
14	backward compatibility with older versions of this feature, the	14	backward compatibility with older versions of this feature, the
15	i\_mtime/i\_generation may store a back-reference to the inode number	15	i_mtime/i_generation may store a back-reference to the inode number
16	and i\_generation of the one owning inode (in cases where the EA	16	and i_generation of the one owning inode (in cases where the EA
17	inode is not referenced by multiple inodes) to verify that the EA inode	17	inode is not referenced by multiple inodes) to verify that the EA inode
18	is the correct one being accessed.	18	is the correct one being accessed.

Documentation/filesystems/ext4/group_descr.rst+63−63

@@ -7,34 +7,34 @@ Each block group on the filesystem has one of these descriptors · 6 unmodified lines
7	associated with it. As noted in the Layout section above, the group	7	associated with it. As noted in the Layout section above, the group
8	descriptors (if present) are the second item in the block group. The	8	descriptors (if present) are the second item in the block group. The
9	standard configuration is for each block group to contain a full copy of	9	standard configuration is for each block group to contain a full copy of
10	the block group descriptor table unless the sparse\_super feature flag	10	the block group descriptor table unless the sparse_super feature flag
11	is set.	11	is set.
12		12
13	Notice how the group descriptor records the location of both bitmaps and	13	Notice how the group descriptor records the location of both bitmaps and
14	the inode table (i.e. they can float). This means that within a block	14	the inode table (i.e. they can float). This means that within a block
15	group, the only data structures with fixed locations are the superblock	15	group, the only data structures with fixed locations are the superblock
16	and the group descriptor table. The flex\_bg mechanism uses this	16	and the group descriptor table. The flex_bg mechanism uses this
17	property to group several block groups into a flex group and lay out all	17	property to group several block groups into a flex group and lay out all
18	of the groups' bitmaps and inode tables into one long run in the first	18	of the groups' bitmaps and inode tables into one long run in the first
19	group of the flex group.	19	group of the flex group.
20		20
21	If the meta\_bg feature flag is set, then several block groups are	21	If the meta_bg feature flag is set, then several block groups are
22	grouped together into a meta group. Note that in the meta\_bg case,	22	grouped together into a meta group. Note that in the meta_bg case,
23	however, the first and last two block groups within the larger meta	23	however, the first and last two block groups within the larger meta
24	group contain only group descriptors for the groups inside the meta	24	group contain only group descriptors for the groups inside the meta
25	group.	25	group.
26		26
27	flex\_bg and meta\_bg do not appear to be mutually exclusive features.	27	flex_bg and meta_bg do not appear to be mutually exclusive features.
28		28
29	In ext2, ext3, and ext4 (when the 64bit feature is not enabled), the	29	In ext2, ext3, and ext4 (when the 64bit feature is not enabled), the
30	block group descriptor was only 32 bytes long and therefore ends at	30	block group descriptor was only 32 bytes long and therefore ends at
31	bg\_checksum. On an ext4 filesystem with the 64bit feature enabled, the	31	bg_checksum. On an ext4 filesystem with the 64bit feature enabled, the
32	block group descriptor expands to at least the 64 bytes described below;	32	block group descriptor expands to at least the 64 bytes described below;
33	the size is stored in the superblock.	33	the size is stored in the superblock.
34		34
35	If gdt\_csum is set and metadata\_csum is not set, the block group	35	If gdt_csum is set and metadata_csum is not set, the block group
36	checksum is the crc16 of the FS UUID, the group number, and the group	36	checksum is the crc16 of the FS UUID, the group number, and the group
37	descriptor structure. If metadata\_csum is set, then the block group	37	descriptor structure. If metadata_csum is set, then the block group
38	checksum is the lower 16 bits of the checksum of the FS UUID, the group	38	checksum is the lower 16 bits of the checksum of the FS UUID, the group
39	number, and the group descriptor structure. Both block and inode bitmap	39	number, and the group descriptor structure. Both block and inode bitmap
40	checksums are calculated against the FS UUID, the group number, and the	40	checksums are calculated against the FS UUID, the group number, and the
@@ -51,59 +51,59 @@ The block group descriptor is laid out in ``struct ext4_group_desc``. · 10 unmodified lines
51	- Name	51	- Name
52	- Description	52	- Description
53	* - 0x0	53	* - 0x0
54	- \_\_le32	54	- __le32
55	- bg\_block\_bitmap\_lo	55	- bg_block_bitmap_lo
56	- Lower 32-bits of location of block bitmap.	56	- Lower 32-bits of location of block bitmap.
57	* - 0x4	57	* - 0x4
58	- \_\_le32	58	- __le32
59	- bg\_inode\_bitmap\_lo	59	- bg_inode_bitmap_lo
60	- Lower 32-bits of location of inode bitmap.	60	- Lower 32-bits of location of inode bitmap.
61	* - 0x8	61	* - 0x8
62	- \_\_le32	62	- __le32
63	- bg\_inode\_table\_lo	63	- bg_inode_table_lo
64	- Lower 32-bits of location of inode table.	64	- Lower 32-bits of location of inode table.
65	* - 0xC	65	* - 0xC
66	- \_\_le16	66	- __le16
67	- bg\_free\_blocks\_count\_lo	67	- bg_free_blocks_count_lo
68	- Lower 16-bits of free block count.	68	- Lower 16-bits of free block count.
69	* - 0xE	69	* - 0xE
70	- \_\_le16	70	- __le16
71	- bg\_free\_inodes\_count\_lo	71	- bg_free_inodes_count_lo
72	- Lower 16-bits of free inode count.	72	- Lower 16-bits of free inode count.
73	* - 0x10	73	* - 0x10
74	- \_\_le16	74	- __le16
75	- bg\_used\_dirs\_count\_lo	75	- bg_used_dirs_count_lo
76	- Lower 16-bits of directory count.	76	- Lower 16-bits of directory count.
77	* - 0x12	77	* - 0x12
78	- \_\_le16	78	- __le16
79	- bg\_flags	79	- bg_flags
80	- Block group flags. See the bgflags_ table below.	80	- Block group flags. See the bgflags_ table below.
81	* - 0x14	81	* - 0x14
82	- \_\_le32	82	- __le32
83	- bg\_exclude\_bitmap\_lo	83	- bg_exclude_bitmap_lo
84	- Lower 32-bits of location of snapshot exclusion bitmap.	84	- Lower 32-bits of location of snapshot exclusion bitmap.
85	* - 0x18	85	* - 0x18
86	- \_\_le16	86	- __le16
87	- bg\_block\_bitmap\_csum\_lo	87	- bg_block_bitmap_csum_lo
88	- Lower 16-bits of the block bitmap checksum.	88	- Lower 16-bits of the block bitmap checksum.
89	* - 0x1A	89	* - 0x1A
90	- \_\_le16	90	- __le16
91	- bg\_inode\_bitmap\_csum\_lo	91	- bg_inode_bitmap_csum_lo
92	- Lower 16-bits of the inode bitmap checksum.	92	- Lower 16-bits of the inode bitmap checksum.
93	* - 0x1C	93	* - 0x1C
94	- \_\_le16	94	- __le16
95	- bg\_itable\_unused\_lo	95	- bg_itable_unused_lo
96	- Lower 16-bits of unused inode count. If set, we needn't scan past the	96	- Lower 16-bits of unused inode count. If set, we needn't scan past the
97	``(sb.s_inodes_per_group - gdt.bg_itable_unused)``\ th entry in the	97	``(sb.s_inodes_per_group - gdt.bg_itable_unused)`` th entry in the
98	inode table for this group.	98	inode table for this group.
99	* - 0x1E	99	* - 0x1E
100	- \_\_le16	100	- __le16
101	- bg\_checksum	101	- bg_checksum
102	- Group descriptor checksum; crc16(sb\_uuid+group\_num+bg\_desc) if the	102	- Group descriptor checksum; crc16(sb_uuid+group_num+bg_desc) if the
103	RO\_COMPAT\_GDT\_CSUM feature is set, or	103	RO_COMPAT_GDT_CSUM feature is set, or
104	crc32c(sb\_uuid+group\_num+bg\_desc) & 0xFFFF if the	104	crc32c(sb_uuid+group_num+bg_desc) & 0xFFFF if the
105	RO\_COMPAT\_METADATA\_CSUM feature is set. The bg\_checksum	105	RO_COMPAT_METADATA_CSUM feature is set. The bg_checksum
106	field in bg\_desc is skipped when calculating crc16 checksum,	106	field in bg_desc is skipped when calculating crc16 checksum,
107	and set to zero if crc32c checksum is used.	107	and set to zero if crc32c checksum is used.
108	* -	108	* -
109	-	109	-
@@ -111,48 +111,48 @@ The block group descriptor is laid out in ``struct ext4_group_desc``. · 1 unmodified line
111	- These fields only exist if the 64bit feature is enabled and s_desc_size	111	- These fields only exist if the 64bit feature is enabled and s_desc_size
112	> 32.	112	> 32.
113	* - 0x20	113	* - 0x20
114	- \_\_le32	114	- __le32
115	- bg\_block\_bitmap\_hi	115	- bg_block_bitmap_hi
116	- Upper 32-bits of location of block bitmap.	116	- Upper 32-bits of location of block bitmap.
117	* - 0x24	117	* - 0x24
118	- \_\_le32	118	- __le32
119	- bg\_inode\_bitmap\_hi	119	- bg_inode_bitmap_hi
120	- Upper 32-bits of location of inodes bitmap.	120	- Upper 32-bits of location of inodes bitmap.
121	* - 0x28	121	* - 0x28
122	- \_\_le32	122	- __le32
123	- bg\_inode\_table\_hi	123	- bg_inode_table_hi
124	- Upper 32-bits of location of inodes table.	124	- Upper 32-bits of location of inodes table.
125	* - 0x2C	125	* - 0x2C
126	- \_\_le16	126	- __le16
127	- bg\_free\_blocks\_count\_hi	127	- bg_free_blocks_count_hi
128	- Upper 16-bits of free block count.	128	- Upper 16-bits of free block count.
129	* - 0x2E	129	* - 0x2E
130	- \_\_le16	130	- __le16
131	- bg\_free\_inodes\_count\_hi	131	- bg_free_inodes_count_hi
132	- Upper 16-bits of free inode count.	132	- Upper 16-bits of free inode count.
133	* - 0x30	133	* - 0x30
134	- \_\_le16	134	- __le16
135	- bg\_used\_dirs\_count\_hi	135	- bg_used_dirs_count_hi
136	- Upper 16-bits of directory count.	136	- Upper 16-bits of directory count.
137	* - 0x32	137	* - 0x32
138	- \_\_le16	138	- __le16
139	- bg\_itable\_unused\_hi	139	- bg_itable_unused_hi
140	- Upper 16-bits of unused inode count.	140	- Upper 16-bits of unused inode count.
141	* - 0x34	141	* - 0x34
142	- \_\_le32	142	- __le32
143	- bg\_exclude\_bitmap\_hi	143	- bg_exclude_bitmap_hi
144	- Upper 32-bits of location of snapshot exclusion bitmap.	144	- Upper 32-bits of location of snapshot exclusion bitmap.
145	* - 0x38	145	* - 0x38
146	- \_\_le16	146	- __le16
147	- bg\_block\_bitmap\_csum\_hi	147	- bg_block_bitmap_csum_hi
148	- Upper 16-bits of the block bitmap checksum.	148	- Upper 16-bits of the block bitmap checksum.
149	* - 0x3A	149	* - 0x3A
150	- \_\_le16	150	- __le16
151	- bg\_inode\_bitmap\_csum\_hi	151	- bg_inode_bitmap_csum_hi
152	- Upper 16-bits of the inode bitmap checksum.	152	- Upper 16-bits of the inode bitmap checksum.
153	* - 0x3C	153	* - 0x3C
154	- \_\_u32	154	- __u32
155	- bg\_reserved	155	- bg_reserved
156	- Padding to 64 bytes.	156	- Padding to 64 bytes.
157		157
158	.. _bgflags:	158	.. _bgflags:
@@ -166,8 +166,8 @@ Block group flags can be any combination of the following: · 7 unmodified lines
166	* - Value	166	* - Value
167	- Description	167	- Description
168	* - 0x1	168	* - 0x1
169	- inode table and bitmap are not initialized (EXT4\_BG\_INODE\_UNINIT).	169	- inode table and bitmap are not initialized (EXT4_BG_INODE_UNINIT).
170	* - 0x2	170	* - 0x2
171	- block bitmap is not initialized (EXT4\_BG\_BLOCK\_UNINIT).	171	- block bitmap is not initialized (EXT4_BG_BLOCK_UNINIT).
172	* - 0x4	172	* - 0x4
173	- inode table is zeroed (EXT4\_BG\_INODE\_ZEROED).	173	- inode table is zeroed (EXT4_BG_INODE_ZEROED).

Documentation/filesystems/ext4/ifork.rst+30−30

@@ -1,6 +1,6 @@
1	.. SPDX-License-Identifier: GPL-2.0	1	.. SPDX-License-Identifier: GPL-2.0
2		2
3	The Contents of inode.i\_block	3	The Contents of inode.i_block
4	------------------------------	4	------------------------------
5		5
6	Depending on the type of file an inode describes, the 60 bytes of	6	Depending on the type of file an inode describes, the 60 bytes of
@@ -47,7 +47,7 @@ In ext4, the file to logical block map has been replaced with an extent · 40 unmodified lines
47	tree. Under the old scheme, allocating a contiguous run of 1,000 blocks	47	tree. Under the old scheme, allocating a contiguous run of 1,000 blocks
48	requires an indirect block to map all 1,000 entries; with extents, the	48	requires an indirect block to map all 1,000 entries; with extents, the
49	mapping is reduced to a single ``struct ext4_extent`` with	49	mapping is reduced to a single ``struct ext4_extent`` with
50	``ee_len = 1000``. If flex\_bg is enabled, it is possible to allocate	50	``ee_len = 1000``. If flex_bg is enabled, it is possible to allocate
51	very large files with a single extent, at a considerable reduction in	51	very large files with a single extent, at a considerable reduction in
52	metadata block use, and some improvement in disk efficiency. The inode	52	metadata block use, and some improvement in disk efficiency. The inode
53	must have the extents flag (0x80000) flag set for this feature to be in	53	must have the extents flag (0x80000) flag set for this feature to be in
@@ -76,28 +76,28 @@ which is 12 bytes long: · 22 unmodified lines
76	- Name	76	- Name
77	- Description	77	- Description
78	* - 0x0	78	* - 0x0
79	- \_\_le16	79	- __le16
80	- eh\_magic	80	- eh_magic
81	- Magic number, 0xF30A.	81	- Magic number, 0xF30A.
82	* - 0x2	82	* - 0x2
83	- \_\_le16	83	- __le16
84	- eh\_entries	84	- eh_entries
85	- Number of valid entries following the header.	85	- Number of valid entries following the header.
86	* - 0x4	86	* - 0x4
87	- \_\_le16	87	- __le16
88	- eh\_max	88	- eh_max
89	- Maximum number of entries that could follow the header.	89	- Maximum number of entries that could follow the header.
90	* - 0x6	90	* - 0x6
91	- \_\_le16	91	- __le16
92	- eh\_depth	92	- eh_depth
93	- Depth of this extent node in the extent tree. 0 = this extent node	93	- Depth of this extent node in the extent tree. 0 = this extent node
94	points to data blocks; otherwise, this extent node points to other	94	points to data blocks; otherwise, this extent node points to other
95	extent nodes. The extent tree can be at most 5 levels deep: a logical	95	extent nodes. The extent tree can be at most 5 levels deep: a logical
96	block number can be at most ``2^32``, and the smallest ``n`` that	96	block number can be at most ``2^32``, and the smallest ``n`` that
97	satisfies ``4*(((blocksize - 12)/12)^n) >= 2^32`` is 5.	97	satisfies ``4*(((blocksize - 12)/12)^n) >= 2^32`` is 5.
98	* - 0x8	98	* - 0x8
99	- \_\_le32	99	- __le32
100	- eh\_generation	100	- eh_generation
101	- Generation of the tree. (Used by Lustre, but not standard ext4).	101	- Generation of the tree. (Used by Lustre, but not standard ext4).
102		102
103	Internal nodes of the extent tree, also known as index nodes, are	103	Internal nodes of the extent tree, also known as index nodes, are
@@ -112,22 +112,22 @@ recorded as ``struct ext4_extent_idx``, and are 12 bytes long: · 8 unmodified lines
112	- Name	112	- Name
113	- Description	113	- Description
114	* - 0x0	114	* - 0x0
115	- \_\_le32	115	- __le32
116	- ei\_block	116	- ei_block
117	- This index node covers file blocks from 'block' onward.	117	- This index node covers file blocks from 'block' onward.
118	* - 0x4	118	* - 0x4
119	- \_\_le32	119	- __le32
120	- ei\_leaf\_lo	120	- ei_leaf_lo
121	- Lower 32-bits of the block number of the extent node that is the next	121	- Lower 32-bits of the block number of the extent node that is the next
122	level lower in the tree. The tree node pointed to can be either another	122	level lower in the tree. The tree node pointed to can be either another
123	internal node or a leaf node, described below.	123	internal node or a leaf node, described below.
124	* - 0x8	124	* - 0x8
125	- \_\_le16	125	- __le16
126	- ei\_leaf\_hi	126	- ei_leaf_hi
127	- Upper 16-bits of the previous field.	127	- Upper 16-bits of the previous field.
128	* - 0xA	128	* - 0xA
129	- \_\_u16	129	- __u16
130	- ei\_unused	130	- ei_unused
131	-	131	-
132		132
133	Leaf nodes of the extent tree are recorded as ``struct ext4_extent``,	133	Leaf nodes of the extent tree are recorded as ``struct ext4_extent``,
@@ -142,24 +142,24 @@ and are also 12 bytes long: · 8 unmodified lines
142	- Name	142	- Name
143	- Description	143	- Description
144	* - 0x0	144	* - 0x0
145	- \_\_le32	145	- __le32
146	- ee\_block	146	- ee_block
147	- First file block number that this extent covers.	147	- First file block number that this extent covers.
148	* - 0x4	148	* - 0x4
149	- \_\_le16	149	- __le16
150	- ee\_len	150	- ee_len
151	- Number of blocks covered by extent. If the value of this field is <=	151	- Number of blocks covered by extent. If the value of this field is <=
152	32768, the extent is initialized. If the value of the field is > 32768,	152	32768, the extent is initialized. If the value of the field is > 32768,
153	the extent is uninitialized and the actual extent length is ``ee_len`` -	153	the extent is uninitialized and the actual extent length is ``ee_len`` -
154	32768. Therefore, the maximum length of a initialized extent is 32768	154	32768. Therefore, the maximum length of a initialized extent is 32768
155	blocks, and the maximum length of an uninitialized extent is 32767.	155	blocks, and the maximum length of an uninitialized extent is 32767.
156	* - 0x6	156	* - 0x6
157	- \_\_le16	157	- __le16
158	- ee\_start\_hi	158	- ee_start_hi
159	- Upper 16-bits of the block number to which this extent points.	159	- Upper 16-bits of the block number to which this extent points.
160	* - 0x8	160	* - 0x8
161	- \_\_le32	161	- __le32
162	- ee\_start\_lo	162	- ee_start_lo
163	- Lower 32-bits of the block number to which this extent points.	163	- Lower 32-bits of the block number to which this extent points.
164		164
165	Prior to the introduction of metadata checksums, the extent header +	165	Prior to the introduction of metadata checksums, the extent header +
@@ -182,8 +182,8 @@ including) the checksum itself. · 16 unmodified lines
182	- Name	182	- Name
183	- Description	183	- Description
184	* - 0x0	184	* - 0x0
185	- \_\_le32	185	- __le32
186	- eb\_checksum	186	- eb_checksum
187	- Checksum of the extent block, crc32c(uuid+inum+igeneration+extentblock)	187	- Checksum of the extent block, crc32c(uuid+inum+igeneration+extentblock)
188		188
189	Inline Data	189	Inline Data

Documentation/filesystems/ext4/inlinedata.rst+4−4

Documentation/filesystems/ext4/inodes.rst+153−153

@@ -38,138 +38,138 @@ The inode table entry is laid out in ``struct ext4_inode``. · 37 unmodified lines
38	- Name	38	- Name
39	- Description	39	- Description
40	* - 0x0	40	* - 0x0
41	- \_\_le16	41	- __le16
42	- i\_mode	42	- i_mode
43	- File mode. See the table i_mode_ below.	43	- File mode. See the table i_mode_ below.
44	* - 0x2	44	* - 0x2
45	- \_\_le16	45	- __le16
46	- i\_uid	46	- i_uid
47	- Lower 16-bits of Owner UID.	47	- Lower 16-bits of Owner UID.
48	* - 0x4	48	* - 0x4
49	- \_\_le32	49	- __le32
50	- i\_size\_lo	50	- i_size_lo
51	- Lower 32-bits of size in bytes.	51	- Lower 32-bits of size in bytes.
52	* - 0x8	52	* - 0x8
53	- \_\_le32	53	- __le32
54	- i\_atime	54	- i_atime
55	- Last access time, in seconds since the epoch. However, if the EA\_INODE	55	- Last access time, in seconds since the epoch. However, if the EA_INODE
56	inode flag is set, this inode stores an extended attribute value and	56	inode flag is set, this inode stores an extended attribute value and
57	this field contains the checksum of the value.	57	this field contains the checksum of the value.
58	* - 0xC	58	* - 0xC
59	- \_\_le32	59	- __le32
60	- i\_ctime	60	- i_ctime
61	- Last inode change time, in seconds since the epoch. However, if the	61	- Last inode change time, in seconds since the epoch. However, if the
62	EA\_INODE inode flag is set, this inode stores an extended attribute	62	EA_INODE inode flag is set, this inode stores an extended attribute
63	value and this field contains the lower 32 bits of the attribute value's	63	value and this field contains the lower 32 bits of the attribute value's
64	reference count.	64	reference count.
65	* - 0x10	65	* - 0x10
66	- \_\_le32	66	- __le32
67	- i\_mtime	67	- i_mtime
68	- Last data modification time, in seconds since the epoch. However, if the	68	- Last data modification time, in seconds since the epoch. However, if the
69	EA\_INODE inode flag is set, this inode stores an extended attribute	69	EA_INODE inode flag is set, this inode stores an extended attribute
70	value and this field contains the number of the inode that owns the	70	value and this field contains the number of the inode that owns the
71	extended attribute.	71	extended attribute.
72	* - 0x14	72	* - 0x14
73	- \_\_le32	73	- __le32
74	- i\_dtime	74	- i_dtime
75	- Deletion Time, in seconds since the epoch.	75	- Deletion Time, in seconds since the epoch.
76	* - 0x18	76	* - 0x18
77	- \_\_le16	77	- __le16
78	- i\_gid	78	- i_gid
79	- Lower 16-bits of GID.	79	- Lower 16-bits of GID.
80	* - 0x1A	80	* - 0x1A
81	- \_\_le16	81	- __le16
82	- i\_links\_count	82	- i_links_count
83	- Hard link count. Normally, ext4 does not permit an inode to have more	83	- Hard link count. Normally, ext4 does not permit an inode to have more
84	than 65,000 hard links. This applies to files as well as directories,	84	than 65,000 hard links. This applies to files as well as directories,
85	which means that there cannot be more than 64,998 subdirectories in a	85	which means that there cannot be more than 64,998 subdirectories in a
86	directory (each subdirectory's '..' entry counts as a hard link, as does	86	directory (each subdirectory's '..' entry counts as a hard link, as does
87	the '.' entry in the directory itself). With the DIR\_NLINK feature	87	the '.' entry in the directory itself). With the DIR_NLINK feature
88	enabled, ext4 supports more than 64,998 subdirectories by setting this	88	enabled, ext4 supports more than 64,998 subdirectories by setting this
89	field to 1 to indicate that the number of hard links is not known.	89	field to 1 to indicate that the number of hard links is not known.
90	* - 0x1C	90	* - 0x1C
91	- \_\_le32	91	- __le32
92	- i\_blocks\_lo	92	- i_blocks_lo
93	- Lower 32-bits of “block” count. If the huge\_file feature flag is not	93	- Lower 32-bits of “block” count. If the huge_file feature flag is not
94	set on the filesystem, the file consumes ``i_blocks_lo`` 512-byte blocks	94	set on the filesystem, the file consumes ``i_blocks_lo`` 512-byte blocks
95	on disk. If huge\_file is set and EXT4\_HUGE\_FILE\_FL is NOT set in	95	on disk. If huge_file is set and EXT4_HUGE_FILE_FL is NOT set in
96	``inode.i_flags``, then the file consumes ``i_blocks_lo + (i_blocks_hi	96	``inode.i_flags``, then the file consumes ``i_blocks_lo + (i_blocks_hi
97	<< 32)`` 512-byte blocks on disk. If huge\_file is set and	97	<< 32)`` 512-byte blocks on disk. If huge_file is set and
98	EXT4\_HUGE\_FILE\_FL IS set in ``inode.i_flags``, then this file	98	EXT4_HUGE_FILE_FL IS set in ``inode.i_flags``, then this file
99	consumes (``i_blocks_lo + i_blocks_hi`` << 32) filesystem blocks on	99	consumes (``i_blocks_lo + i_blocks_hi`` << 32) filesystem blocks on
100	disk.	100	disk.
101	* - 0x20	101	* - 0x20
102	- \_\_le32	102	- __le32
103	- i\_flags	103	- i_flags
104	- Inode flags. See the table i_flags_ below.	104	- Inode flags. See the table i_flags_ below.
105	* - 0x24	105	* - 0x24
106	- 4 bytes	106	- 4 bytes
107	- i\_osd1	107	- i_osd1
108	- See the table i_osd1_ for more details.	108	- See the table i_osd1_ for more details.
109	* - 0x28	109	* - 0x28
110	- 60 bytes	110	- 60 bytes
111	- i\_block[EXT4\_N\_BLOCKS=15]	111	- i_block[EXT4_N_BLOCKS=15]
112	- Block map or extent tree. See the section “The Contents of inode.i\_block”.	112	- Block map or extent tree. See the section “The Contents of inode.i_block”.
113	* - 0x64	113	* - 0x64
114	- \_\_le32	114	- __le32
115	- i\_generation	115	- i_generation
116	- File version (for NFS).	116	- File version (for NFS).
117	* - 0x68	117	* - 0x68
118	- \_\_le32	118	- __le32
119	- i\_file\_acl\_lo	119	- i_file_acl_lo
120	- Lower 32-bits of extended attribute block. ACLs are of course one of	120	- Lower 32-bits of extended attribute block. ACLs are of course one of
121	many possible extended attributes; I think the name of this field is a	121	many possible extended attributes; I think the name of this field is a
122	result of the first use of extended attributes being for ACLs.	122	result of the first use of extended attributes being for ACLs.
123	* - 0x6C	123	* - 0x6C
124	- \_\_le32	124	- __le32
125	- i\_size\_high / i\_dir\_acl	125	- i_size_high / i_dir_acl
126	- Upper 32-bits of file/directory size. In ext2/3 this field was named	126	- Upper 32-bits of file/directory size. In ext2/3 this field was named
127	i\_dir\_acl, though it was usually set to zero and never used.	127	i_dir_acl, though it was usually set to zero and never used.
128	* - 0x70	128	* - 0x70
129	- \_\_le32	129	- __le32
130	- i\_obso\_faddr	130	- i_obso_faddr
131	- (Obsolete) fragment address.	131	- (Obsolete) fragment address.
132	* - 0x74	132	* - 0x74
133	- 12 bytes	133	- 12 bytes
134	- i\_osd2	134	- i_osd2
135	- See the table i_osd2_ for more details.	135	- See the table i_osd2_ for more details.
136	* - 0x80	136	* - 0x80
137	- \_\_le16	137	- __le16
138	- i\_extra\_isize	138	- i_extra_isize
139	- Size of this inode - 128. Alternately, the size of the extended inode	139	- Size of this inode - 128. Alternately, the size of the extended inode
140	fields beyond the original ext2 inode, including this field.	140	fields beyond the original ext2 inode, including this field.
141	* - 0x82	141	* - 0x82
142	- \_\_le16	142	- __le16
143	- i\_checksum\_hi	143	- i_checksum_hi
144	- Upper 16-bits of the inode checksum.	144	- Upper 16-bits of the inode checksum.
145	* - 0x84	145	* - 0x84
146	- \_\_le32	146	- __le32
147	- i\_ctime\_extra	147	- i_ctime_extra
148	- Extra change time bits. This provides sub-second precision. See Inode	148	- Extra change time bits. This provides sub-second precision. See Inode
149	Timestamps section.	149	Timestamps section.
150	* - 0x88	150	* - 0x88
151	- \_\_le32	151	- __le32
152	- i\_mtime\_extra	152	- i_mtime_extra
153	- Extra modification time bits. This provides sub-second precision.	153	- Extra modification time bits. This provides sub-second precision.
154	* - 0x8C	154	* - 0x8C
155	- \_\_le32	155	- __le32
156	- i\_atime\_extra	156	- i_atime_extra
157	- Extra access time bits. This provides sub-second precision.	157	- Extra access time bits. This provides sub-second precision.
158	* - 0x90	158	* - 0x90
159	- \_\_le32	159	- __le32
160	- i\_crtime	160	- i_crtime
161	- File creation time, in seconds since the epoch.	161	- File creation time, in seconds since the epoch.
162	* - 0x94	162	* - 0x94
163	- \_\_le32	163	- __le32
164	- i\_crtime\_extra	164	- i_crtime_extra
165	- Extra file creation time bits. This provides sub-second precision.	165	- Extra file creation time bits. This provides sub-second precision.
166	* - 0x98	166	* - 0x98
167	- \_\_le32	167	- __le32
168	- i\_version\_hi	168	- i_version_hi
169	- Upper 32-bits for version number.	169	- Upper 32-bits for version number.
170	* - 0x9C	170	* - 0x9C
171	- \_\_le32	171	- __le32
172	- i\_projid	172	- i_projid
173	- Project ID.	173	- Project ID.
174		174
175	.. _i_mode:	175	.. _i_mode:
@@ -183,45 +183,45 @@ The ``i_mode`` value is a combination of the following flags: · 7 unmodified lines
183	* - Value	183	* - Value
184	- Description	184	- Description
185	* - 0x1	185	* - 0x1
186	- S\_IXOTH (Others may execute)	186	- S_IXOTH (Others may execute)
187	* - 0x2	187	* - 0x2
188	- S\_IWOTH (Others may write)	188	- S_IWOTH (Others may write)
189	* - 0x4	189	* - 0x4
190	- S\_IROTH (Others may read)	190	- S_IROTH (Others may read)
191	* - 0x8	191	* - 0x8
192	- S\_IXGRP (Group members may execute)	192	- S_IXGRP (Group members may execute)
193	* - 0x10	193	* - 0x10
194	- S\_IWGRP (Group members may write)	194	- S_IWGRP (Group members may write)
195	* - 0x20	195	* - 0x20
196	- S\_IRGRP (Group members may read)	196	- S_IRGRP (Group members may read)
197	* - 0x40	197	* - 0x40
198	- S\_IXUSR (Owner may execute)	198	- S_IXUSR (Owner may execute)
199	* - 0x80	199	* - 0x80
200	- S\_IWUSR (Owner may write)	200	- S_IWUSR (Owner may write)
201	* - 0x100	201	* - 0x100
202	- S\_IRUSR (Owner may read)	202	- S_IRUSR (Owner may read)
203	* - 0x200	203	* - 0x200
204	- S\_ISVTX (Sticky bit)	204	- S_ISVTX (Sticky bit)
205	* - 0x400	205	* - 0x400
206	- S\_ISGID (Set GID)	206	- S_ISGID (Set GID)
207	* - 0x800	207	* - 0x800
208	- S\_ISUID (Set UID)	208	- S_ISUID (Set UID)
209	* -	209	* -
210	- These are mutually-exclusive file types:	210	- These are mutually-exclusive file types:
211	* - 0x1000	211	* - 0x1000
212	- S\_IFIFO (FIFO)	212	- S_IFIFO (FIFO)
213	* - 0x2000	213	* - 0x2000
214	- S\_IFCHR (Character device)	214	- S_IFCHR (Character device)
215	* - 0x4000	215	* - 0x4000
216	- S\_IFDIR (Directory)	216	- S_IFDIR (Directory)
217	* - 0x6000	217	* - 0x6000
218	- S\_IFBLK (Block device)	218	- S_IFBLK (Block device)
219	* - 0x8000	219	* - 0x8000
220	- S\_IFREG (Regular file)	220	- S_IFREG (Regular file)
221	* - 0xA000	221	* - 0xA000
222	- S\_IFLNK (Symbolic link)	222	- S_IFLNK (Symbolic link)
223	* - 0xC000	223	* - 0xC000
224	- S\_IFSOCK (Socket)	224	- S_IFSOCK (Socket)
225		225
226	.. _i_flags:	226	.. _i_flags:
227		227
@@ -234,56 +234,56 @@ The ``i_flags`` field is a combination of these values: · 6 unmodified lines
234	* - Value	234	* - Value
235	- Description	235	- Description
236	* - 0x1	236	* - 0x1
237	- This file requires secure deletion (EXT4\_SECRM\_FL). (not implemented)	237	- This file requires secure deletion (EXT4_SECRM_FL). (not implemented)
238	* - 0x2	238	* - 0x2
239	- This file should be preserved, should undeletion be desired	239	- This file should be preserved, should undeletion be desired
240	(EXT4\_UNRM\_FL). (not implemented)	240	(EXT4_UNRM_FL). (not implemented)
241	* - 0x4	241	* - 0x4
242	- File is compressed (EXT4\_COMPR\_FL). (not really implemented)	242	- File is compressed (EXT4_COMPR_FL). (not really implemented)
243	* - 0x8	243	* - 0x8
244	- All writes to the file must be synchronous (EXT4\_SYNC\_FL).	244	- All writes to the file must be synchronous (EXT4_SYNC_FL).
245	* - 0x10	245	* - 0x10
246	- File is immutable (EXT4\_IMMUTABLE\_FL).	246	- File is immutable (EXT4_IMMUTABLE_FL).
247	* - 0x20	247	* - 0x20
248	- File can only be appended (EXT4\_APPEND\_FL).	248	- File can only be appended (EXT4_APPEND_FL).
249	* - 0x40	249	* - 0x40
250	- The dump(1) utility should not dump this file (EXT4\_NODUMP\_FL).	250	- The dump(1) utility should not dump this file (EXT4_NODUMP_FL).
251	* - 0x80	251	* - 0x80
252	- Do not update access time (EXT4\_NOATIME\_FL).	252	- Do not update access time (EXT4_NOATIME_FL).
253	* - 0x100	253	* - 0x100
254	- Dirty compressed file (EXT4\_DIRTY\_FL). (not used)	254	- Dirty compressed file (EXT4_DIRTY_FL). (not used)
255	* - 0x200	255	* - 0x200
256	- File has one or more compressed clusters (EXT4\_COMPRBLK\_FL). (not used)	256	- File has one or more compressed clusters (EXT4_COMPRBLK_FL). (not used)
257	* - 0x400	257	* - 0x400
258	- Do not compress file (EXT4\_NOCOMPR\_FL). (not used)	258	- Do not compress file (EXT4_NOCOMPR_FL). (not used)
259	* - 0x800	259	* - 0x800
260	- Encrypted inode (EXT4\_ENCRYPT\_FL). This bit value previously was	260	- Encrypted inode (EXT4_ENCRYPT_FL). This bit value previously was
261	EXT4\_ECOMPR\_FL (compression error), which was never used.	261	EXT4_ECOMPR_FL (compression error), which was never used.
262	* - 0x1000	262	* - 0x1000
263	- Directory has hashed indexes (EXT4\_INDEX\_FL).	263	- Directory has hashed indexes (EXT4_INDEX_FL).
264	* - 0x2000	264	* - 0x2000
265	- AFS magic directory (EXT4\_IMAGIC\_FL).	265	- AFS magic directory (EXT4_IMAGIC_FL).
266	* - 0x4000	266	* - 0x4000
267	- File data must always be written through the journal	267	- File data must always be written through the journal
268	(EXT4\_JOURNAL\_DATA\_FL).	268	(EXT4_JOURNAL_DATA_FL).
269	* - 0x8000	269	* - 0x8000
270	- File tail should not be merged (EXT4\_NOTAIL\_FL). (not used by ext4)	270	- File tail should not be merged (EXT4_NOTAIL_FL). (not used by ext4)
271	* - 0x10000	271	* - 0x10000
272	- All directory entry data should be written synchronously (see	272	- All directory entry data should be written synchronously (see
273	``dirsync``) (EXT4\_DIRSYNC\_FL).	273	``dirsync``) (EXT4_DIRSYNC_FL).
274	* - 0x20000	274	* - 0x20000
275	- Top of directory hierarchy (EXT4\_TOPDIR\_FL).	275	- Top of directory hierarchy (EXT4_TOPDIR_FL).
276	* - 0x40000	276	* - 0x40000
277	- This is a huge file (EXT4\_HUGE\_FILE\_FL).	277	- This is a huge file (EXT4_HUGE_FILE_FL).
278	* - 0x80000	278	* - 0x80000
279	- Inode uses extents (EXT4\_EXTENTS\_FL).	279	- Inode uses extents (EXT4_EXTENTS_FL).
280	* - 0x100000	280	* - 0x100000
281	- Verity protected file (EXT4\_VERITY\_FL).	281	- Verity protected file (EXT4_VERITY_FL).
282	* - 0x200000	282	* - 0x200000
283	- Inode stores a large extended attribute value in its data blocks	283	- Inode stores a large extended attribute value in its data blocks
284	(EXT4\_EA\_INODE\_FL).	284	(EXT4_EA_INODE_FL).
285	* - 0x400000	285	* - 0x400000
286	- This file has blocks allocated past EOF (EXT4\_EOFBLOCKS\_FL).	286	- This file has blocks allocated past EOF (EXT4_EOFBLOCKS_FL).
287	(deprecated)	287	(deprecated)
288	* - 0x01000000	288	* - 0x01000000
289	- Inode is a snapshot (``EXT4_SNAPFILE_FL``). (not in mainline)	289	- Inode is a snapshot (``EXT4_SNAPFILE_FL``). (not in mainline)
@@ -294,21 +294,21 @@ The ``i_flags`` field is a combination of these values: · 4 unmodified lines
294	- Snapshot shrink has completed (``EXT4_SNAPFILE_SHRUNK_FL``). (not in	294	- Snapshot shrink has completed (``EXT4_SNAPFILE_SHRUNK_FL``). (not in
295	mainline)	295	mainline)
296	* - 0x10000000	296	* - 0x10000000
297	- Inode has inline data (EXT4\_INLINE\_DATA\_FL).	297	- Inode has inline data (EXT4_INLINE_DATA_FL).
298	* - 0x20000000	298	* - 0x20000000
299	- Create children with the same project ID (EXT4\_PROJINHERIT\_FL).	299	- Create children with the same project ID (EXT4_PROJINHERIT_FL).
300	* - 0x80000000	300	* - 0x80000000
301	- Reserved for ext4 library (EXT4\_RESERVED\_FL).	301	- Reserved for ext4 library (EXT4_RESERVED_FL).
302	* -	302	* -
303	- Aggregate flags:	303	- Aggregate flags:
304	* - 0x705BDFFF	304	* - 0x705BDFFF
305	- User-visible flags.	305	- User-visible flags.
306	* - 0x604BC0FF	306	* - 0x604BC0FF
307	- User-modifiable flags. Note that while EXT4\_JOURNAL\_DATA\_FL and	307	- User-modifiable flags. Note that while EXT4_JOURNAL_DATA_FL and
308	EXT4\_EXTENTS\_FL can be set with setattr, they are not in the kernel's	308	EXT4_EXTENTS_FL can be set with setattr, they are not in the kernel's
309	EXT4\_FL\_USER\_MODIFIABLE mask, since it needs to handle the setting of	309	EXT4_FL_USER_MODIFIABLE mask, since it needs to handle the setting of
310	these flags in a special manner and they are masked out of the set of	310	these flags in a special manner and they are masked out of the set of
311	flags that are saved directly to i\_flags.	311	flags that are saved directly to i_flags.
312		312
313	.. _i_osd1:	313	.. _i_osd1:
314		314
@@ -325,9 +325,9 @@ Linux: · 10 unmodified lines
325	- Name	325	- Name
326	- Description	326	- Description
327	* - 0x0	327	* - 0x0
328	- \_\_le32	328	- __le32
329	- l\_i\_version	329	- l_i_version
330	- Inode version. However, if the EA\_INODE inode flag is set, this inode	330	- Inode version. However, if the EA_INODE inode flag is set, this inode
331	stores an extended attribute value and this field contains the upper 32	331	stores an extended attribute value and this field contains the upper 32
332	bits of the attribute value's reference count.	332	bits of the attribute value's reference count.
333		333
@@ -342,8 +342,8 @@ Hurd: · 8 unmodified lines
342	- Name	342	- Name
343	- Description	343	- Description
344	* - 0x0	344	* - 0x0
345	- \_\_le32	345	- __le32
346	- h\_i\_translator	346	- h_i_translator
347	- ??	347	- ??
348		348
349	Masix:	349	Masix:
@@ -357,8 +357,8 @@ Masix: · 7 unmodified lines
357	- Name	357	- Name
358	- Description	358	- Description
359	* - 0x0	359	* - 0x0
360	- \_\_le32	360	- __le32
361	- m\_i\_reserved	361	- m_i_reserved
362	- ??	362	- ??
363		363
364	.. _i_osd2:	364	.. _i_osd2:
@@ -376,30 +376,30 @@ Linux: · 11 unmodified lines
376	- Name	376	- Name
377	- Description	377	- Description
378	* - 0x0	378	* - 0x0
379	- \_\_le16	379	- __le16
380	- l\_i\_blocks\_high	380	- l_i_blocks_high
381	- Upper 16-bits of the block count. Please see the note attached to	381	- Upper 16-bits of the block count. Please see the note attached to
382	i\_blocks\_lo.	382	i_blocks_lo.
383	* - 0x2	383	* - 0x2
384	- \_\_le16	384	- __le16
385	- l\_i\_file\_acl\_high	385	- l_i_file_acl_high
386	- Upper 16-bits of the extended attribute block (historically, the file	386	- Upper 16-bits of the extended attribute block (historically, the file
387	ACL location). See the Extended Attributes section below.	387	ACL location). See the Extended Attributes section below.
388	* - 0x4	388	* - 0x4
389	- \_\_le16	389	- __le16
390	- l\_i\_uid\_high	390	- l_i_uid_high
391	- Upper 16-bits of the Owner UID.	391	- Upper 16-bits of the Owner UID.
392	* - 0x6	392	* - 0x6
393	- \_\_le16	393	- __le16
394	- l\_i\_gid\_high	394	- l_i_gid_high
395	- Upper 16-bits of the GID.	395	- Upper 16-bits of the GID.
396	* - 0x8	396	* - 0x8
397	- \_\_le16	397	- __le16
398	- l\_i\_checksum\_lo	398	- l_i_checksum_lo
399	- Lower 16-bits of the inode checksum.	399	- Lower 16-bits of the inode checksum.
400	* - 0xA	400	* - 0xA
401	- \_\_le16	401	- __le16
402	- l\_i\_reserved	402	- l_i_reserved
403	- Unused.	403	- Unused.
404		404
405	Hurd:	405	Hurd:
@@ -413,24 +413,24 @@ Hurd: · 7 unmodified lines
413	- Name	413	- Name
414	- Description	414	- Description
415	* - 0x0	415	* - 0x0
416	- \_\_le16	416	- __le16
417	- h\_i\_reserved1	417	- h_i_reserved1
418	- ??	418	- ??
419	* - 0x2	419	* - 0x2
420	- \_\_u16	420	- __u16
421	- h\_i\_mode\_high	421	- h_i_mode_high
422	- Upper 16-bits of the file mode.	422	- Upper 16-bits of the file mode.
423	* - 0x4	423	* - 0x4
424	- \_\_le16	424	- __le16
425	- h\_i\_uid\_high	425	- h_i_uid_high
426	- Upper 16-bits of the Owner UID.	426	- Upper 16-bits of the Owner UID.
427	* - 0x6	427	* - 0x6
428	- \_\_le16	428	- __le16
429	- h\_i\_gid\_high	429	- h_i_gid_high
430	- Upper 16-bits of the GID.	430	- Upper 16-bits of the GID.
431	* - 0x8	431	* - 0x8
432	- \_\_u32	432	- __u32
433	- h\_i\_author	433	- h_i_author
434	- Author code?	434	- Author code?
435		435
436	Masix:	436	Masix:
@@ -444,17 +444,17 @@ Masix: · 7 unmodified lines
444	- Name	444	- Name
445	- Description	445	- Description
446	* - 0x0	446	* - 0x0
447	- \_\_le16	447	- __le16
448	- h\_i\_reserved1	448	- h_i_reserved1
449	- ??	449	- ??
450	* - 0x2	450	* - 0x2
451	- \_\_u16	451	- __u16
452	- m\_i\_file\_acl\_high	452	- m_i_file_acl_high
453	- Upper 16-bits of the extended attribute block (historically, the file	453	- Upper 16-bits of the extended attribute block (historically, the file
454	ACL location).	454	ACL location).
455	* - 0x4	455	* - 0x4
456	- \_\_u32	456	- __u32
457	- m\_i\_reserved2[2]	457	- m_i_reserved2[2]
458	- ??	458	- ??
459		459
460	Inode Size	460	Inode Size
@@ -466,11 +466,11 @@ In ext2 and ext3, the inode structure size was fixed at 128 bytes · 5 unmodified lines
466	on-disk inode at format time for all inodes in the filesystem to provide	466	on-disk inode at format time for all inodes in the filesystem to provide
467	space beyond the end of the original ext2 inode. The on-disk inode	467	space beyond the end of the original ext2 inode. The on-disk inode
468	record size is recorded in the superblock as ``s_inode_size``. The	468	record size is recorded in the superblock as ``s_inode_size``. The
469	number of bytes actually used by struct ext4\_inode beyond the original	469	number of bytes actually used by struct ext4_inode beyond the original
470	128-byte ext2 inode is recorded in the ``i_extra_isize`` field for each	470	128-byte ext2 inode is recorded in the ``i_extra_isize`` field for each
471	inode, which allows struct ext4\_inode to grow for a new kernel without	471	inode, which allows struct ext4_inode to grow for a new kernel without
472	having to upgrade all of the on-disk inodes. Access to fields beyond	472	having to upgrade all of the on-disk inodes. Access to fields beyond
473	EXT2\_GOOD\_OLD\_INODE\_SIZE should be verified to be within	473	EXT2_GOOD_OLD_INODE_SIZE should be verified to be within
474	``i_extra_isize``. By default, ext4 inode records are 256 bytes, and (as	474	``i_extra_isize``. By default, ext4 inode records are 256 bytes, and (as
475	of August 2019) the inode structure is 160 bytes	475	of August 2019) the inode structure is 160 bytes
476	(``i_extra_isize = 32``). The extra space between the end of the inode	476	(``i_extra_isize = 32``). The extra space between the end of the inode
@@ -516,7 +516,7 @@ creation time (crtime); this field is 64-bits wide and decoded in the · 39 unmodified lines
516	same manner as 64-bit [cma]time. Neither crtime nor dtime are accessible	516	same manner as 64-bit [cma]time. Neither crtime nor dtime are accessible
517	through the regular stat() interface, though debugfs will report them.	517	through the regular stat() interface, though debugfs will report them.
518		518
519	We use the 32-bit signed time value plus (2^32 \* (extra epoch bits)).	519	We use the 32-bit signed time value plus (2^32 * (extra epoch bits)).
520	In other words:	520	In other words:
521		521
522	.. list-table::	522	.. list-table::
@@ -525,8 +525,8 @@ In other words: · 2 unmodified lines
525		525
526	* - Extra epoch bits	526	* - Extra epoch bits
527	- MSB of 32-bit time	527	- MSB of 32-bit time
528	- Adjustment for signed 32-bit to 64-bit tv\_sec	528	- Adjustment for signed 32-bit to 64-bit tv_sec
529	- Decoded 64-bit tv\_sec	529	- Decoded 64-bit tv_sec
530	- valid time range	530	- valid time range
531	* - 0 0	531	* - 0 0
532	- 1	532	- 1

Documentation/filesystems/ext4/journal.rst+107−107

@@ -63,8 +63,8 @@ Generally speaking, the journal has this format: · 62 unmodified lines
63	:header-rows: 1	63	:header-rows: 1
64		64
65	* - Superblock	65	* - Superblock
66	- descriptor\_block (data\_blocks or revocation\_block) [more data or	66	- descriptor_block (data_blocks or revocation_block) [more data or
67	revocations] commmit\_block	67	revocations] commmit_block
68	- [more transactions...]	68	- [more transactions...]
69	* -	69	* -
70	- One transaction	70	- One transaction
@@ -93,8 +93,8 @@ superblock. · 22 unmodified lines
93	* - 1024 bytes of padding	93	* - 1024 bytes of padding
94	- ext4 Superblock	94	- ext4 Superblock
95	- Journal Superblock	95	- Journal Superblock
96	- descriptor\_block (data\_blocks or revocation\_block) [more data or	96	- descriptor_block (data_blocks or revocation_block) [more data or
97	revocations] commmit\_block	97	revocations] commmit_block
98	- [more transactions...]	98	- [more transactions...]
99	* -	99	* -
100	-	100	-
@@ -117,17 +117,17 @@ Every block in the journal starts with a common 12-byte header · 16 unmodified lines
117	- Name	117	- Name
118	- Description	118	- Description
119	* - 0x0	119	* - 0x0
120	- \_\_be32	120	- __be32
121	- h\_magic	121	- h_magic
122	- jbd2 magic number, 0xC03B3998.	122	- jbd2 magic number, 0xC03B3998.
123	* - 0x4	123	* - 0x4
124	- \_\_be32	124	- __be32
125	- h\_blocktype	125	- h_blocktype
126	- Description of what this block contains. See the jbd2_blocktype_ table	126	- Description of what this block contains. See the jbd2_blocktype_ table
127	below.	127	below.
128	* - 0x8	128	* - 0x8
129	- \_\_be32	129	- __be32
130	- h\_sequence	130	- h_sequence
131	- The transaction ID that goes with this block.	131	- The transaction ID that goes with this block.
132		132
133	.. _jbd2_blocktype:	133	.. _jbd2_blocktype:
@@ -177,99 +177,99 @@ which is 1024 bytes long: · 43 unmodified lines
177	-	177	-
178	- Static information describing the journal.	178	- Static information describing the journal.
179	* - 0x0	179	* - 0x0
180	- journal\_header\_t (12 bytes)	180	- journal_header_t (12 bytes)
181	- s\_header	181	- s_header
182	- Common header identifying this as a superblock.	182	- Common header identifying this as a superblock.
183	* - 0xC	183	* - 0xC
184	- \_\_be32	184	- __be32
185	- s\_blocksize	185	- s_blocksize
186	- Journal device block size.	186	- Journal device block size.
187	* - 0x10	187	* - 0x10
188	- \_\_be32	188	- __be32
189	- s\_maxlen	189	- s_maxlen
190	- Total number of blocks in this journal.	190	- Total number of blocks in this journal.
191	* - 0x14	191	* - 0x14
192	- \_\_be32	192	- __be32
193	- s\_first	193	- s_first
194	- First block of log information.	194	- First block of log information.
195	* -	195	* -
196	-	196	-
197	-	197	-
198	- Dynamic information describing the current state of the log.	198	- Dynamic information describing the current state of the log.
199	* - 0x18	199	* - 0x18
200	- \_\_be32	200	- __be32
201	- s\_sequence	201	- s_sequence
202	- First commit ID expected in log.	202	- First commit ID expected in log.
203	* - 0x1C	203	* - 0x1C
204	- \_\_be32	204	- __be32
205	- s\_start	205	- s_start
206	- Block number of the start of log. Contrary to the comments, this field	206	- Block number of the start of log. Contrary to the comments, this field
207	being zero does not imply that the journal is clean!	207	being zero does not imply that the journal is clean!
208	* - 0x20	208	* - 0x20
209	- \_\_be32	209	- __be32
210	- s\_errno	210	- s_errno
211	- Error value, as set by jbd2\_journal\_abort().	211	- Error value, as set by jbd2_journal_abort().
212	* -	212	* -
213	-	213	-
214	-	214	-
215	- The remaining fields are only valid in a v2 superblock.	215	- The remaining fields are only valid in a v2 superblock.
216	* - 0x24	216	* - 0x24
217	- \_\_be32	217	- __be32
218	- s\_feature\_compat;	218	- s_feature_compat;
219	- Compatible feature set. See the table jbd2_compat_ below.	219	- Compatible feature set. See the table jbd2_compat_ below.
220	* - 0x28	220	* - 0x28
221	- \_\_be32	221	- __be32
222	- s\_feature\_incompat	222	- s_feature_incompat
223	- Incompatible feature set. See the table jbd2_incompat_ below.	223	- Incompatible feature set. See the table jbd2_incompat_ below.
224	* - 0x2C	224	* - 0x2C
225	- \_\_be32	225	- __be32
226	- s\_feature\_ro\_compat	226	- s_feature_ro_compat
227	- Read-only compatible feature set. There aren't any of these currently.	227	- Read-only compatible feature set. There aren't any of these currently.
228	* - 0x30	228	* - 0x30
229	- \_\_u8	229	- __u8
230	- s\_uuid[16]	230	- s_uuid[16]
231	- 128-bit uuid for journal. This is compared against the copy in the ext4	231	- 128-bit uuid for journal. This is compared against the copy in the ext4
232	super block at mount time.	232	super block at mount time.
233	* - 0x40	233	* - 0x40
234	- \_\_be32	234	- __be32
235	- s\_nr\_users	235	- s_nr_users
236	- Number of file systems sharing this journal.	236	- Number of file systems sharing this journal.
237	* - 0x44	237	* - 0x44
238	- \_\_be32	238	- __be32
239	- s\_dynsuper	239	- s_dynsuper
240	- Location of dynamic super block copy. (Not used?)	240	- Location of dynamic super block copy. (Not used?)
241	* - 0x48	241	* - 0x48
242	- \_\_be32	242	- __be32
243	- s\_max\_transaction	243	- s_max_transaction
244	- Limit of journal blocks per transaction. (Not used?)	244	- Limit of journal blocks per transaction. (Not used?)
245	* - 0x4C	245	* - 0x4C
246	- \_\_be32	246	- __be32
247	- s\_max\_trans\_data	247	- s_max_trans_data
248	- Limit of data blocks per transaction. (Not used?)	248	- Limit of data blocks per transaction. (Not used?)
249	* - 0x50	249	* - 0x50
250	- \_\_u8	250	- __u8
251	- s\_checksum\_type	251	- s_checksum_type
252	- Checksum algorithm used for the journal. See jbd2_checksum_type_ for	252	- Checksum algorithm used for the journal. See jbd2_checksum_type_ for
253	more info.	253	more info.
254	* - 0x51	254	* - 0x51
255	- \_\_u8[3]	255	- __u8[3]
256	- s\_padding2	256	- s_padding2
257	-	257	-
258	* - 0x54	258	* - 0x54
259	- \_\_be32	259	- __be32
260	- s\_num\_fc\_blocks	260	- s_num_fc_blocks
261	- Number of fast commit blocks in the journal.	261	- Number of fast commit blocks in the journal.
262	* - 0x58	262	* - 0x58
263	- \_\_u32	263	- __u32
264	- s\_padding[42]	264	- s_padding[42]
265	-	265	-
266	* - 0xFC	266	* - 0xFC
267	- \_\_be32	267	- __be32
268	- s\_checksum	268	- s_checksum
269	- Checksum of the entire superblock, with this field set to zero.	269	- Checksum of the entire superblock, with this field set to zero.
270	* - 0x100	270	* - 0x100
271	- \_\_u8	271	- __u8
272	- s\_users[16\*48]	272	- s_users[16*48]
273	- ids of all file systems sharing the log. e2fsprogs/Linux don't allow	273	- ids of all file systems sharing the log. e2fsprogs/Linux don't allow
274	shared external journals, but I imagine Lustre (or ocfs2?), which use	274	shared external journals, but I imagine Lustre (or ocfs2?), which use
275	the jbd2 code, might.	275	the jbd2 code, might.
@@ -286,7 +286,7 @@ The journal compat features are any combination of the following: · 10 unmodified lines
286	- Description	286	- Description
287	* - 0x1	287	* - 0x1
288	- Journal maintains checksums on the data blocks.	288	- Journal maintains checksums on the data blocks.
289	(JBD2\_FEATURE\_COMPAT\_CHECKSUM)	289	(JBD2_FEATURE_COMPAT_CHECKSUM)
290		290
291	.. _jbd2_incompat:	291	.. _jbd2_incompat:
292		292
@@ -299,23 +299,23 @@ The journal incompat features are any combination of the following: · 6 unmodified lines
299	* - Value	299	* - Value
300	- Description	300	- Description
301	* - 0x1	301	* - 0x1
302	- Journal has block revocation records. (JBD2\_FEATURE\_INCOMPAT\_REVOKE)	302	- Journal has block revocation records. (JBD2_FEATURE_INCOMPAT_REVOKE)
303	* - 0x2	303	* - 0x2
304	- Journal can deal with 64-bit block numbers.	304	- Journal can deal with 64-bit block numbers.
305	(JBD2\_FEATURE\_INCOMPAT\_64BIT)	305	(JBD2_FEATURE_INCOMPAT_64BIT)
306	* - 0x4	306	* - 0x4
307	- Journal commits asynchronously. (JBD2\_FEATURE\_INCOMPAT\_ASYNC\_COMMIT)	307	- Journal commits asynchronously. (JBD2_FEATURE_INCOMPAT_ASYNC_COMMIT)
308	* - 0x8	308	* - 0x8
309	- This journal uses v2 of the checksum on-disk format. Each journal	309	- This journal uses v2 of the checksum on-disk format. Each journal
310	metadata block gets its own checksum, and the block tags in the	310	metadata block gets its own checksum, and the block tags in the
311	descriptor table contain checksums for each of the data blocks in the	311	descriptor table contain checksums for each of the data blocks in the
312	journal. (JBD2\_FEATURE\_INCOMPAT\_CSUM\_V2)	312	journal. (JBD2_FEATURE_INCOMPAT_CSUM_V2)
313	* - 0x10	313	* - 0x10
314	- This journal uses v3 of the checksum on-disk format. This is the same as	314	- This journal uses v3 of the checksum on-disk format. This is the same as
315	v2, but the journal block tag size is fixed regardless of the size of	315	v2, but the journal block tag size is fixed regardless of the size of
316	block numbers. (JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3)	316	block numbers. (JBD2_FEATURE_INCOMPAT_CSUM_V3)
317	* - 0x20	317	* - 0x20
318	- Journal has fast commit blocks. (JBD2\_FEATURE\_INCOMPAT\_FAST\_COMMIT)	318	- Journal has fast commit blocks. (JBD2_FEATURE_INCOMPAT_FAST_COMMIT)
319		319
320	.. _jbd2_checksum_type:	320	.. _jbd2_checksum_type:
321		321
@@ -355,11 +355,11 @@ Descriptor blocks consume at least 36 bytes, but use a full block: · 33 unmodified lines
355	- Name	355	- Name
356	- Descriptor	356	- Descriptor
357	* - 0x0	357	* - 0x0
358	- journal\_header\_t	358	- journal_header_t
359	- (open coded)	359	- (open coded)
360	- Common block header.	360	- Common block header.
361	* - 0xC	361	* - 0xC
362	- struct journal\_block\_tag\_s	362	- struct journal_block_tag_s
363	- open coded array[]	363	- open coded array[]
364	- Enough tags either to fill up the block or to describe all the data	364	- Enough tags either to fill up the block or to describe all the data
365	blocks that follow this descriptor block.	365	blocks that follow this descriptor block.
@@ -367,7 +367,7 @@ Descriptor blocks consume at least 36 bytes, but use a full block: · 1 unmodified line
367	Journal block tags have any of the following formats, depending on which	367	Journal block tags have any of the following formats, depending on which
368	journal feature and block tag flags are set.	368	journal feature and block tag flags are set.
369		369
370	If JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3 is set, the journal block tag is	370	If JBD2_FEATURE_INCOMPAT_CSUM_V3 is set, the journal block tag is
371	defined as ``struct journal_block_tag3_s``, which looks like the	371	defined as ``struct journal_block_tag3_s``, which looks like the
372	following. The size is 16 or 32 bytes.	372	following. The size is 16 or 32 bytes.
373		373
@@ -380,24 +380,24 @@ following. The size is 16 or 32 bytes. · 6 unmodified lines
380	- Name	380	- Name
381	- Descriptor	381	- Descriptor
382	* - 0x0	382	* - 0x0
383	- \_\_be32	383	- __be32
384	- t\_blocknr	384	- t_blocknr
385	- Lower 32-bits of the location of where the corresponding data block	385	- Lower 32-bits of the location of where the corresponding data block
386	should end up on disk.	386	should end up on disk.
387	* - 0x4	387	* - 0x4
388	- \_\_be32	388	- __be32
389	- t\_flags	389	- t_flags
390	- Flags that go with the descriptor. See the table jbd2_tag_flags_ for	390	- Flags that go with the descriptor. See the table jbd2_tag_flags_ for
391	more info.	391	more info.
392	* - 0x8	392	* - 0x8
393	- \_\_be32	393	- __be32
394	- t\_blocknr\_high	394	- t_blocknr_high
395	- Upper 32-bits of the location of where the corresponding data block	395	- Upper 32-bits of the location of where the corresponding data block
396	should end up on disk. This is zero if JBD2\_FEATURE\_INCOMPAT\_64BIT is	396	should end up on disk. This is zero if JBD2_FEATURE_INCOMPAT_64BIT is
397	not enabled.	397	not enabled.
398	* - 0xC	398	* - 0xC
399	- \_\_be32	399	- __be32
400	- t\_checksum	400	- t_checksum
401	- Checksum of the journal UUID, the sequence number, and the data block.	401	- Checksum of the journal UUID, the sequence number, and the data block.
402	* -	402	* -
403	-	403	-
@@ -433,7 +433,7 @@ The journal tag flags are any combination of the following: · 29 unmodified lines
433	* - 0x8	433	* - 0x8
434	- This is the last tag in this descriptor block.	434	- This is the last tag in this descriptor block.
435		435
436	If JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3 is NOT set, the journal block tag	436	If JBD2_FEATURE_INCOMPAT_CSUM_V3 is NOT set, the journal block tag
437	is defined as ``struct journal_block_tag_s``, which looks like the	437	is defined as ``struct journal_block_tag_s``, which looks like the
438	following. The size is 8, 12, 24, or 28 bytes:	438	following. The size is 8, 12, 24, or 28 bytes:
439		439
@@ -446,18 +446,18 @@ following. The size is 8, 12, 24, or 28 bytes: · 6 unmodified lines
446	- Name	446	- Name
447	- Descriptor	447	- Descriptor
448	* - 0x0	448	* - 0x0
449	- \_\_be32	449	- __be32
450	- t\_blocknr	450	- t_blocknr
451	- Lower 32-bits of the location of where the corresponding data block	451	- Lower 32-bits of the location of where the corresponding data block
452	should end up on disk.	452	should end up on disk.
453	* - 0x4	453	* - 0x4
454	- \_\_be16	454	- __be16
455	- t\_checksum	455	- t_checksum
456	- Checksum of the journal UUID, the sequence number, and the data block.	456	- Checksum of the journal UUID, the sequence number, and the data block.
457	Note that only the lower 16 bits are stored.	457	Note that only the lower 16 bits are stored.
458	* - 0x6	458	* - 0x6
459	- \_\_be16	459	- __be16
460	- t\_flags	460	- t_flags
461	- Flags that go with the descriptor. See the table jbd2_tag_flags_ for	461	- Flags that go with the descriptor. See the table jbd2_tag_flags_ for
462	more info.	462	more info.
463	* -	463	* -
@@ -466,8 +466,8 @@ following. The size is 8, 12, 24, or 28 bytes: · 2 unmodified lines
466	- This next field is only present if the super block indicates support for	466	- This next field is only present if the super block indicates support for
467	64-bit block numbers.	467	64-bit block numbers.
468	* - 0x8	468	* - 0x8
469	- \_\_be32	469	- __be32
470	- t\_blocknr\_high	470	- t_blocknr_high
471	- Upper 32-bits of the location of where the corresponding data block	471	- Upper 32-bits of the location of where the corresponding data block
472	should end up on disk.	472	should end up on disk.
473	* -	473	* -
@@ -483,8 +483,8 @@ following. The size is 8, 12, 24, or 28 bytes: · 9 unmodified lines
483	``j_uuid`` field in ``struct journal_s``, but only tune2fs touches that	483	``j_uuid`` field in ``struct journal_s``, but only tune2fs touches that
484	field.	484	field.
485		485
486	If JBD2\_FEATURE\_INCOMPAT\_CSUM\_V2 or	486	If JBD2_FEATURE_INCOMPAT_CSUM_V2 or
487	JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3 are set, the end of the block is a	487	JBD2_FEATURE_INCOMPAT_CSUM_V3 are set, the end of the block is a
488	``struct jbd2_journal_block_tail``, which looks like this:	488	``struct jbd2_journal_block_tail``, which looks like this:
489		489
490	.. list-table::	490	.. list-table::
@@ -496,8 +496,8 @@ JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3 are set, the end of the block is a · 5 unmodified lines
496	- Name	496	- Name
497	- Descriptor	497	- Descriptor
498	* - 0x0	498	* - 0x0
499	- \_\_be32	499	- __be32
500	- t\_checksum	500	- t_checksum
501	- Checksum of the journal UUID + the descriptor block, with this field set	501	- Checksum of the journal UUID + the descriptor block, with this field set
502	to zero.	502	to zero.
503		503
@@ -538,25 +538,25 @@ length, but use a full block: · 34 unmodified lines
538	- Name	538	- Name
539	- Description	539	- Description
540	* - 0x0	540	* - 0x0
541	- journal\_header\_t	541	- journal_header_t
542	- r\_header	542	- r_header
543	- Common block header.	543	- Common block header.
544	* - 0xC	544	* - 0xC
545	- \_\_be32	545	- __be32
546	- r\_count	546	- r_count
547	- Number of bytes used in this block.	547	- Number of bytes used in this block.
548	* - 0x10	548	* - 0x10
549	- \_\_be32 or \_\_be64	549	- __be32 or __be64
550	- blocks[0]	550	- blocks[0]
551	- Blocks to revoke.	551	- Blocks to revoke.
552		552
553	After r\_count is a linear array of block numbers that are effectively	553	After r_count is a linear array of block numbers that are effectively
554	revoked by this transaction. The size of each block number is 8 bytes if	554	revoked by this transaction. The size of each block number is 8 bytes if
555	the superblock advertises 64-bit block number support, or 4 bytes	555	the superblock advertises 64-bit block number support, or 4 bytes
556	otherwise.	556	otherwise.
557		557
558	If JBD2\_FEATURE\_INCOMPAT\_CSUM\_V2 or	558	If JBD2_FEATURE_INCOMPAT_CSUM_V2 or
559	JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3 are set, the end of the revocation	559	JBD2_FEATURE_INCOMPAT_CSUM_V3 are set, the end of the revocation
560	block is a ``struct jbd2_journal_revoke_tail``, which has this format:	560	block is a ``struct jbd2_journal_revoke_tail``, which has this format:
561		561
562	.. list-table::	562	.. list-table::
@@ -568,8 +568,8 @@ block is a ``struct jbd2_journal_revoke_tail``, which has this format: · 5 unmodified lines
568	- Name	568	- Name
569	- Description	569	- Description
570	* - 0x0	570	* - 0x0
571	- \_\_be32	571	- __be32
572	- r\_checksum	572	- r_checksum
573	- Checksum of the journal UUID + revocation block	573	- Checksum of the journal UUID + revocation block
574		574
575	Commit Block	575	Commit Block
@@ -592,38 +592,38 @@ bytes long (but uses a full block): · 16 unmodified lines
592	- Name	592	- Name
593	- Descriptor	593	- Descriptor
594	* - 0x0	594	* - 0x0
595	- journal\_header\_s	595	- journal_header_s
596	- (open coded)	596	- (open coded)
597	- Common block header.	597	- Common block header.
598	* - 0xC	598	* - 0xC
599	- unsigned char	599	- unsigned char
600	- h\_chksum\_type	600	- h_chksum_type
601	- The type of checksum to use to verify the integrity of the data blocks	601	- The type of checksum to use to verify the integrity of the data blocks
602	in the transaction. See jbd2_checksum_type_ for more info.	602	in the transaction. See jbd2_checksum_type_ for more info.
603	* - 0xD	603	* - 0xD
604	- unsigned char	604	- unsigned char
605	- h\_chksum\_size	605	- h_chksum_size
606	- The number of bytes used by the checksum. Most likely 4.	606	- The number of bytes used by the checksum. Most likely 4.
607	* - 0xE	607	* - 0xE
608	- unsigned char	608	- unsigned char
609	- h\_padding[2]	609	- h_padding[2]
610	-	610	-
611	* - 0x10	611	* - 0x10
612	- \_\_be32	612	- __be32
613	- h\_chksum[JBD2\_CHECKSUM\_BYTES]	613	- h_chksum[JBD2_CHECKSUM_BYTES]
614	- 32 bytes of space to store checksums. If	614	- 32 bytes of space to store checksums. If
615	JBD2\_FEATURE\_INCOMPAT\_CSUM\_V2 or JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3	615	JBD2_FEATURE_INCOMPAT_CSUM_V2 or JBD2_FEATURE_INCOMPAT_CSUM_V3
616	are set, the first ``__be32`` is the checksum of the journal UUID and	616	are set, the first ``__be32`` is the checksum of the journal UUID and
617	the entire commit block, with this field zeroed. If	617	the entire commit block, with this field zeroed. If
618	JBD2\_FEATURE\_COMPAT\_CHECKSUM is set, the first ``__be32`` is the	618	JBD2_FEATURE_COMPAT_CHECKSUM is set, the first ``__be32`` is the
619	crc32 of all the blocks already written to the transaction.	619	crc32 of all the blocks already written to the transaction.
620	* - 0x30	620	* - 0x30
621	- \_\_be64	621	- __be64
622	- h\_commit\_sec	622	- h_commit_sec
623	- The time that the transaction was committed, in seconds since the epoch.	623	- The time that the transaction was committed, in seconds since the epoch.
624	* - 0x38	624	* - 0x38
625	- \_\_be32	625	- __be32
626	- h\_commit\_nsec	626	- h_commit_nsec
627	- Nanoseconds component of the above timestamp.	627	- Nanoseconds component of the above timestamp.
628		628
629	Fast commits	629	Fast commits

Documentation/filesystems/ext4/mmp.rst+18−18

@@ -7,8 +7,8 @@ Multiple mount protection (MMP) is a feature that protects the · 6 unmodified lines
7	filesystem against multiple hosts trying to use the filesystem	7	filesystem against multiple hosts trying to use the filesystem
8	simultaneously. When a filesystem is opened (for mounting, or fsck,	8	simultaneously. When a filesystem is opened (for mounting, or fsck,
9	etc.), the MMP code running on the node (call it node A) checks a	9	etc.), the MMP code running on the node (call it node A) checks a
10	sequence number. If the sequence number is EXT4\_MMP\_SEQ\_CLEAN, the	10	sequence number. If the sequence number is EXT4_MMP_SEQ_CLEAN, the
11	open continues. If the sequence number is EXT4\_MMP\_SEQ\_FSCK, then	11	open continues. If the sequence number is EXT4_MMP_SEQ_FSCK, then
12	fsck is (hopefully) running, and open fails immediately. Otherwise, the	12	fsck is (hopefully) running, and open fails immediately. Otherwise, the
13	open code will wait for twice the specified MMP check interval and check	13	open code will wait for twice the specified MMP check interval and check
14	the sequence number again. If the sequence number has changed, then the	14	the sequence number again. If the sequence number has changed, then the
@@ -40,38 +40,38 @@ The MMP structure (``struct mmp_struct``) is as follows: · 25 unmodified lines
40	- Name	40	- Name
41	- Description	41	- Description
42	* - 0x0	42	* - 0x0
43	- \_\_le32	43	- __le32
44	- mmp\_magic	44	- mmp_magic
45	- Magic number for MMP, 0x004D4D50 (“MMP”).	45	- Magic number for MMP, 0x004D4D50 (“MMP”).
46	* - 0x4	46	* - 0x4
47	- \_\_le32	47	- __le32
48	- mmp\_seq	48	- mmp_seq
49	- Sequence number, updated periodically.	49	- Sequence number, updated periodically.
50	* - 0x8	50	* - 0x8
51	- \_\_le64	51	- __le64
52	- mmp\_time	52	- mmp_time
53	- Time that the MMP block was last updated.	53	- Time that the MMP block was last updated.
54	* - 0x10	54	* - 0x10
55	- char[64]	55	- char[64]
56	- mmp\_nodename	56	- mmp_nodename
57	- Hostname of the node that opened the filesystem.	57	- Hostname of the node that opened the filesystem.
58	* - 0x50	58	* - 0x50
59	- char[32]	59	- char[32]
60	- mmp\_bdevname	60	- mmp_bdevname
61	- Block device name of the filesystem.	61	- Block device name of the filesystem.
62	* - 0x70	62	* - 0x70
63	- \_\_le16	63	- __le16
64	- mmp\_check\_interval	64	- mmp_check_interval
65	- The MMP re-check interval, in seconds.	65	- The MMP re-check interval, in seconds.
66	* - 0x72	66	* - 0x72
67	- \_\_le16	67	- __le16
68	- mmp\_pad1	68	- mmp_pad1
69	- Zero.	69	- Zero.
70	* - 0x74	70	* - 0x74
71	- \_\_le32[226]	71	- __le32[226]
72	- mmp\_pad2	72	- mmp_pad2
73	- Zero.	73	- Zero.
74	* - 0x3FC	74	* - 0x3FC
75	- \_\_le32	75	- __le32
76	- mmp\_checksum	76	- mmp_checksum
77	- Checksum of the MMP block.	77	- Checksum of the MMP block.

Documentation/filesystems/ext4/overview.rst+1−1

@@ -7,7 +7,7 @@ An ext4 file system is split into a series of block groups. To reduce · 6 unmodified lines
7	performance difficulties due to fragmentation, the block allocator tries	7	performance difficulties due to fragmentation, the block allocator tries
8	very hard to keep each file's blocks within the same group, thereby	8	very hard to keep each file's blocks within the same group, thereby
9	reducing seek times. The size of a block group is specified in	9	reducing seek times. The size of a block group is specified in
10	``sb.s_blocks_per_group`` blocks, though it can also calculated as 8 \*	10	``sb.s_blocks_per_group`` blocks, though it can also calculated as 8 *
11	``block_size_in_bytes``. With the default block size of 4KiB, each group	11	``block_size_in_bytes``. With the default block size of 4KiB, each group
12	will contain 32,768 blocks, for a length of 128MiB. The number of block	12	will contain 32,768 blocks, for a length of 128MiB. The number of block
13	groups is the size of the device divided by the size of a block group.	13	groups is the size of the device divided by the size of a block group.

Documentation/filesystems/ext4/special_inodes.rst+4−4

@@ -34,7 +34,7 @@ ext4 reserves some inode for special features, as follows: · 33 unmodified lines
34	* - 10	34	* - 10
35	- Replica inode, used for some non-upstream feature?	35	- Replica inode, used for some non-upstream feature?
36	* - 11	36	* - 11
37	- Traditional first non-reserved inode. Usually this is the lost+found directory. See s\_first\_ino in the superblock.	37	- Traditional first non-reserved inode. Usually this is the lost+found directory. See s_first_ino in the superblock.
38		38
39	Note that there are also some inodes allocated from non-reserved inode numbers	39	Note that there are also some inodes allocated from non-reserved inode numbers
40	for other filesystem features which are not referenced from standard directory	40	for other filesystem features which are not referenced from standard directory
@@ -47,9 +47,9 @@ hierarchy. These are generally reference from the superblock. They are: · 6 unmodified lines
47	* - Superblock field	47	* - Superblock field
48	- Description	48	- Description
49		49
50	* - s\_lpf\_ino	50	* - s_lpf_ino
51	- Inode number of lost+found directory.	51	- Inode number of lost+found directory.
52	* - s\_prj\_quota\_inum	52	* - s_prj_quota_inum
53	- Inode number of quota file tracking project quotas	53	- Inode number of quota file tracking project quotas
54	* - s\_orphan\_file\_inum	54	* - s_orphan_file_inum
55	- Inode number of file tracking orphan inodes.	55	- Inode number of file tracking orphan inodes.

Documentation/filesystems/ext4/super.rst+275−275

@@ -7,7 +7,7 @@ The superblock records various information about the enclosing · 6 unmodified lines
7	filesystem, such as block counts, inode counts, supported features,	7	filesystem, such as block counts, inode counts, supported features,
8	maintenance information, and more.	8	maintenance information, and more.
9		9
10	If the sparse\_super feature flag is set, redundant copies of the	10	If the sparse_super feature flag is set, redundant copies of the
11	superblock and group descriptors are kept only in the groups whose group	11	superblock and group descriptors are kept only in the groups whose group
12	number is either 0 or a power of 3, 5, or 7. If the flag is not set,	12	number is either 0 or a power of 3, 5, or 7. If the flag is not set,
13	redundant copies are kept in all groups.	13	redundant copies are kept in all groups.
@@ -27,107 +27,107 @@ The ext4 superblock is laid out as follows in · 13 unmodified lines
27	- Name	27	- Name
28	- Description	28	- Description
29	* - 0x0	29	* - 0x0
30	- \_\_le32	30	- __le32
31	- s\_inodes\_count	31	- s_inodes_count
32	- Total inode count.	32	- Total inode count.
33	* - 0x4	33	* - 0x4
34	- \_\_le32	34	- __le32
35	- s\_blocks\_count\_lo	35	- s_blocks_count_lo
36	- Total block count.	36	- Total block count.
37	* - 0x8	37	* - 0x8
38	- \_\_le32	38	- __le32
39	- s\_r\_blocks\_count\_lo	39	- s_r_blocks_count_lo
40	- This number of blocks can only be allocated by the super-user.	40	- This number of blocks can only be allocated by the super-user.
41	* - 0xC	41	* - 0xC
42	- \_\_le32	42	- __le32
43	- s\_free\_blocks\_count\_lo	43	- s_free_blocks_count_lo
44	- Free block count.	44	- Free block count.
45	* - 0x10	45	* - 0x10
46	- \_\_le32	46	- __le32
47	- s\_free\_inodes\_count	47	- s_free_inodes_count
48	- Free inode count.	48	- Free inode count.
49	* - 0x14	49	* - 0x14
50	- \_\_le32	50	- __le32
51	- s\_first\_data\_block	51	- s_first_data_block
52	- First data block. This must be at least 1 for 1k-block filesystems and	52	- First data block. This must be at least 1 for 1k-block filesystems and
53	is typically 0 for all other block sizes.	53	is typically 0 for all other block sizes.
54	* - 0x18	54	* - 0x18
55	- \_\_le32	55	- __le32
56	- s\_log\_block\_size	56	- s_log_block_size
57	- Block size is 2 ^ (10 + s\_log\_block\_size).	57	- Block size is 2 ^ (10 + s_log_block_size).
58	* - 0x1C	58	* - 0x1C
59	- \_\_le32	59	- __le32
60	- s\_log\_cluster\_size	60	- s_log_cluster_size
61	- Cluster size is 2 ^ (10 + s\_log\_cluster\_size) blocks if bigalloc is	61	- Cluster size is 2 ^ (10 + s_log_cluster_size) blocks if bigalloc is
62	enabled. Otherwise s\_log\_cluster\_size must equal s\_log\_block\_size.	62	enabled. Otherwise s_log_cluster_size must equal s_log_block_size.
63	* - 0x20	63	* - 0x20
64	- \_\_le32	64	- __le32
65	- s\_blocks\_per\_group	65	- s_blocks_per_group
66	- Blocks per group.	66	- Blocks per group.
67	* - 0x24	67	* - 0x24
68	- \_\_le32	68	- __le32
69	- s\_clusters\_per\_group	69	- s_clusters_per_group
70	- Clusters per group, if bigalloc is enabled. Otherwise	70	- Clusters per group, if bigalloc is enabled. Otherwise
71	s\_clusters\_per\_group must equal s\_blocks\_per\_group.	71	s_clusters_per_group must equal s_blocks_per_group.
72	* - 0x28	72	* - 0x28
73	- \_\_le32	73	- __le32
74	- s\_inodes\_per\_group	74	- s_inodes_per_group
75	- Inodes per group.	75	- Inodes per group.
76	* - 0x2C	76	* - 0x2C
77	- \_\_le32	77	- __le32
78	- s\_mtime	78	- s_mtime
79	- Mount time, in seconds since the epoch.	79	- Mount time, in seconds since the epoch.
80	* - 0x30	80	* - 0x30
81	- \_\_le32	81	- __le32
82	- s\_wtime	82	- s_wtime
83	- Write time, in seconds since the epoch.	83	- Write time, in seconds since the epoch.
84	* - 0x34	84	* - 0x34
85	- \_\_le16	85	- __le16
86	- s\_mnt\_count	86	- s_mnt_count
87	- Number of mounts since the last fsck.	87	- Number of mounts since the last fsck.
88	* - 0x36	88	* - 0x36
89	- \_\_le16	89	- __le16
90	- s\_max\_mnt\_count	90	- s_max_mnt_count
91	- Number of mounts beyond which a fsck is needed.	91	- Number of mounts beyond which a fsck is needed.
92	* - 0x38	92	* - 0x38
93	- \_\_le16	93	- __le16
94	- s\_magic	94	- s_magic
95	- Magic signature, 0xEF53	95	- Magic signature, 0xEF53
96	* - 0x3A	96	* - 0x3A
97	- \_\_le16	97	- __le16
98	- s\_state	98	- s_state
99	- File system state. See super_state_ for more info.	99	- File system state. See super_state_ for more info.
100	* - 0x3C	100	* - 0x3C
101	- \_\_le16	101	- __le16
102	- s\_errors	102	- s_errors
103	- Behaviour when detecting errors. See super_errors_ for more info.	103	- Behaviour when detecting errors. See super_errors_ for more info.
104	* - 0x3E	104	* - 0x3E
105	- \_\_le16	105	- __le16
106	- s\_minor\_rev\_level	106	- s_minor_rev_level
107	- Minor revision level.	107	- Minor revision level.
108	* - 0x40	108	* - 0x40
109	- \_\_le32	109	- __le32
110	- s\_lastcheck	110	- s_lastcheck
111	- Time of last check, in seconds since the epoch.	111	- Time of last check, in seconds since the epoch.
112	* - 0x44	112	* - 0x44
113	- \_\_le32	113	- __le32
114	- s\_checkinterval	114	- s_checkinterval
115	- Maximum time between checks, in seconds.	115	- Maximum time between checks, in seconds.
116	* - 0x48	116	* - 0x48
117	- \_\_le32	117	- __le32
118	- s\_creator\_os	118	- s_creator_os
119	- Creator OS. See the table super_creator_ for more info.	119	- Creator OS. See the table super_creator_ for more info.
120	* - 0x4C	120	* - 0x4C
121	- \_\_le32	121	- __le32
122	- s\_rev\_level	122	- s_rev_level
123	- Revision level. See the table super_revision_ for more info.	123	- Revision level. See the table super_revision_ for more info.
124	* - 0x50	124	* - 0x50
125	- \_\_le16	125	- __le16
126	- s\_def\_resuid	126	- s_def_resuid
127	- Default uid for reserved blocks.	127	- Default uid for reserved blocks.
128	* - 0x52	128	* - 0x52
129	- \_\_le16	129	- __le16
130	- s\_def\_resgid	130	- s_def_resgid
131	- Default gid for reserved blocks.	131	- Default gid for reserved blocks.
132	* -	132	* -
133	-	133	-
@@ -143,50 +143,50 @@ The ext4 superblock is laid out as follows in · 9 unmodified lines
143	about a feature in either the compatible or incompatible feature set, it	143	about a feature in either the compatible or incompatible feature set, it
144	must abort and not try to meddle with things it doesn't understand...	144	must abort and not try to meddle with things it doesn't understand...
145	* - 0x54	145	* - 0x54
146	- \_\_le32	146	- __le32
147	- s\_first\_ino	147	- s_first_ino
148	- First non-reserved inode.	148	- First non-reserved inode.
149	* - 0x58	149	* - 0x58
150	- \_\_le16	150	- __le16
151	- s\_inode\_size	151	- s_inode_size
152	- Size of inode structure, in bytes.	152	- Size of inode structure, in bytes.
153	* - 0x5A	153	* - 0x5A
154	- \_\_le16	154	- __le16
155	- s\_block\_group\_nr	155	- s_block_group_nr
156	- Block group # of this superblock.	156	- Block group # of this superblock.
157	* - 0x5C	157	* - 0x5C
158	- \_\_le32	158	- __le32
159	- s\_feature\_compat	159	- s_feature_compat
160	- Compatible feature set flags. Kernel can still read/write this fs even	160	- Compatible feature set flags. Kernel can still read/write this fs even
161	if it doesn't understand a flag; fsck should not do that. See the	161	if it doesn't understand a flag; fsck should not do that. See the
162	super_compat_ table for more info.	162	super_compat_ table for more info.
163	* - 0x60	163	* - 0x60
164	- \_\_le32	164	- __le32
165	- s\_feature\_incompat	165	- s_feature_incompat
166	- Incompatible feature set. If the kernel or fsck doesn't understand one	166	- Incompatible feature set. If the kernel or fsck doesn't understand one
167	of these bits, it should stop. See the super_incompat_ table for more	167	of these bits, it should stop. See the super_incompat_ table for more
168	info.	168	info.
169	* - 0x64	169	* - 0x64
170	- \_\_le32	170	- __le32
171	- s\_feature\_ro\_compat	171	- s_feature_ro_compat
172	- Readonly-compatible feature set. If the kernel doesn't understand one of	172	- Readonly-compatible feature set. If the kernel doesn't understand one of
173	these bits, it can still mount read-only. See the super_rocompat_ table	173	these bits, it can still mount read-only. See the super_rocompat_ table
174	for more info.	174	for more info.
175	* - 0x68	175	* - 0x68
176	- \_\_u8	176	- __u8
177	- s\_uuid[16]	177	- s_uuid[16]
178	- 128-bit UUID for volume.	178	- 128-bit UUID for volume.
179	* - 0x78	179	* - 0x78
180	- char	180	- char
181	- s\_volume\_name[16]	181	- s_volume_name[16]
182	- Volume label.	182	- Volume label.
183	* - 0x88	183	* - 0x88
184	- char	184	- char
185	- s\_last\_mounted[64]	185	- s_last_mounted[64]
186	- Directory where filesystem was last mounted.	186	- Directory where filesystem was last mounted.
187	* - 0xC8	187	* - 0xC8
188	- \_\_le32	188	- __le32
189	- s\_algorithm\_usage\_bitmap	189	- s_algorithm_usage_bitmap
190	- For compression (Not used in e2fsprogs/Linux)	190	- For compression (Not used in e2fsprogs/Linux)
191	* -	191	* -
192	-	192	-
@@ -194,18 +194,18 @@ The ext4 superblock is laid out as follows in · 1 unmodified line
194	- Performance hints. Directory preallocation should only happen if the	194	- Performance hints. Directory preallocation should only happen if the
195	EXT4_FEATURE_COMPAT_DIR_PREALLOC flag is on.	195	EXT4_FEATURE_COMPAT_DIR_PREALLOC flag is on.
196	* - 0xCC	196	* - 0xCC
197	- \_\_u8	197	- __u8
198	- s\_prealloc\_blocks	198	- s_prealloc_blocks
199	- #. of blocks to try to preallocate for ... files? (Not used in	199	- #. of blocks to try to preallocate for ... files? (Not used in
200	e2fsprogs/Linux)	200	e2fsprogs/Linux)
201	* - 0xCD	201	* - 0xCD
202	- \_\_u8	202	- __u8
203	- s\_prealloc\_dir\_blocks	203	- s_prealloc_dir_blocks
204	- #. of blocks to preallocate for directories. (Not used in	204	- #. of blocks to preallocate for directories. (Not used in
205	e2fsprogs/Linux)	205	e2fsprogs/Linux)
206	* - 0xCE	206	* - 0xCE
207	- \_\_le16	207	- __le16
208	- s\_reserved\_gdt\_blocks	208	- s_reserved_gdt_blocks
209	- Number of reserved GDT entries for future filesystem expansion.	209	- Number of reserved GDT entries for future filesystem expansion.
210	* -	210	* -
211	-	211	-
@@ -213,281 +213,281 @@ The ext4 superblock is laid out as follows in · 1 unmodified line
213	- Journalling support is valid only if EXT4_FEATURE_COMPAT_HAS_JOURNAL is	213	- Journalling support is valid only if EXT4_FEATURE_COMPAT_HAS_JOURNAL is
214	set.	214	set.
215	* - 0xD0	215	* - 0xD0
216	- \_\_u8	216	- __u8
217	- s\_journal\_uuid[16]	217	- s_journal_uuid[16]
218	- UUID of journal superblock	218	- UUID of journal superblock
219	* - 0xE0	219	* - 0xE0
220	- \_\_le32	220	- __le32
221	- s\_journal\_inum	221	- s_journal_inum
222	- inode number of journal file.	222	- inode number of journal file.
223	* - 0xE4	223	* - 0xE4
224	- \_\_le32	224	- __le32
225	- s\_journal\_dev	225	- s_journal_dev
226	- Device number of journal file, if the external journal feature flag is	226	- Device number of journal file, if the external journal feature flag is
227	set.	227	set.
228	* - 0xE8	228	* - 0xE8
229	- \_\_le32	229	- __le32
230	- s\_last\_orphan	230	- s_last_orphan
231	- Start of list of orphaned inodes to delete.	231	- Start of list of orphaned inodes to delete.
232	* - 0xEC	232	* - 0xEC
233	- \_\_le32	233	- __le32
234	- s\_hash\_seed[4]	234	- s_hash_seed[4]
235	- HTREE hash seed.	235	- HTREE hash seed.
236	* - 0xFC	236	* - 0xFC
237	- \_\_u8	237	- __u8
238	- s\_def\_hash\_version	238	- s_def_hash_version
239	- Default hash algorithm to use for directory hashes. See super_def_hash_	239	- Default hash algorithm to use for directory hashes. See super_def_hash_
240	for more info.	240	for more info.
241	* - 0xFD	241	* - 0xFD
242	- \_\_u8	242	- __u8
243	- s\_jnl\_backup\_type	243	- s_jnl_backup_type
244	- If this value is 0 or EXT3\_JNL\_BACKUP\_BLOCKS (1), then the	244	- If this value is 0 or EXT3_JNL_BACKUP_BLOCKS (1), then the
245	``s_jnl_blocks`` field contains a duplicate copy of the inode's	245	``s_jnl_blocks`` field contains a duplicate copy of the inode's
246	``i_block[]`` array and ``i_size``.	246	``i_block[]`` array and ``i_size``.
247	* - 0xFE	247	* - 0xFE
248	- \_\_le16	248	- __le16
249	- s\_desc\_size	249	- s_desc_size
250	- Size of group descriptors, in bytes, if the 64bit incompat feature flag	250	- Size of group descriptors, in bytes, if the 64bit incompat feature flag
251	is set.	251	is set.
252	* - 0x100	252	* - 0x100
253	- \_\_le32	253	- __le32
254	- s\_default\_mount\_opts	254	- s_default_mount_opts
255	- Default mount options. See the super_mountopts_ table for more info.	255	- Default mount options. See the super_mountopts_ table for more info.
256	* - 0x104	256	* - 0x104
257	- \_\_le32	257	- __le32
258	- s\_first\_meta\_bg	258	- s_first_meta_bg
259	- First metablock block group, if the meta\_bg feature is enabled.	259	- First metablock block group, if the meta_bg feature is enabled.
260	* - 0x108	260	* - 0x108
261	- \_\_le32	261	- __le32
262	- s\_mkfs\_time	262	- s_mkfs_time
263	- When the filesystem was created, in seconds since the epoch.	263	- When the filesystem was created, in seconds since the epoch.
264	* - 0x10C	264	* - 0x10C
265	- \_\_le32	265	- __le32
266	- s\_jnl\_blocks[17]	266	- s_jnl_blocks[17]
267	- Backup copy of the journal inode's ``i_block[]`` array in the first 15	267	- Backup copy of the journal inode's ``i_block[]`` array in the first 15
268	elements and i\_size\_high and i\_size in the 16th and 17th elements,	268	elements and i_size_high and i_size in the 16th and 17th elements,
269	respectively.	269	respectively.
270	* -	270	* -
271	-	271	-
272	-	272	-
273	- 64bit support is valid only if EXT4_FEATURE_COMPAT_64BIT is set.	273	- 64bit support is valid only if EXT4_FEATURE_COMPAT_64BIT is set.
274	* - 0x150	274	* - 0x150
275	- \_\_le32	275	- __le32
276	- s\_blocks\_count\_hi	276	- s_blocks_count_hi
277	- High 32-bits of the block count.	277	- High 32-bits of the block count.
278	* - 0x154	278	* - 0x154
279	- \_\_le32	279	- __le32
280	- s\_r\_blocks\_count\_hi	280	- s_r_blocks_count_hi
281	- High 32-bits of the reserved block count.	281	- High 32-bits of the reserved block count.
282	* - 0x158	282	* - 0x158
283	- \_\_le32	283	- __le32
284	- s\_free\_blocks\_count\_hi	284	- s_free_blocks_count_hi
285	- High 32-bits of the free block count.	285	- High 32-bits of the free block count.
286	* - 0x15C	286	* - 0x15C
287	- \_\_le16	287	- __le16
288	- s\_min\_extra\_isize	288	- s_min_extra_isize
289	- All inodes have at least # bytes.	289	- All inodes have at least # bytes.
290	* - 0x15E	290	* - 0x15E
291	- \_\_le16	291	- __le16
292	- s\_want\_extra\_isize	292	- s_want_extra_isize
293	- New inodes should reserve # bytes.	293	- New inodes should reserve # bytes.
294	* - 0x160	294	* - 0x160
295	- \_\_le32	295	- __le32
296	- s\_flags	296	- s_flags
297	- Miscellaneous flags. See the super_flags_ table for more info.	297	- Miscellaneous flags. See the super_flags_ table for more info.
298	* - 0x164	298	* - 0x164
299	- \_\_le16	299	- __le16
300	- s\_raid\_stride	300	- s_raid_stride
301	- RAID stride. This is the number of logical blocks read from or written	301	- RAID stride. This is the number of logical blocks read from or written
302	to the disk before moving to the next disk. This affects the placement	302	to the disk before moving to the next disk. This affects the placement
303	of filesystem metadata, which will hopefully make RAID storage faster.	303	of filesystem metadata, which will hopefully make RAID storage faster.
304	* - 0x166	304	* - 0x166
305	- \_\_le16	305	- __le16
306	- s\_mmp\_interval	306	- s_mmp_interval
307	- #. seconds to wait in multi-mount prevention (MMP) checking. In theory,	307	- #. seconds to wait in multi-mount prevention (MMP) checking. In theory,
308	MMP is a mechanism to record in the superblock which host and device	308	MMP is a mechanism to record in the superblock which host and device
309	have mounted the filesystem, in order to prevent multiple mounts. This	309	have mounted the filesystem, in order to prevent multiple mounts. This
310	feature does not seem to be implemented...	310	feature does not seem to be implemented...
311	* - 0x168	311	* - 0x168
312	- \_\_le64	312	- __le64
313	- s\_mmp\_block	313	- s_mmp_block
314	- Block # for multi-mount protection data.	314	- Block # for multi-mount protection data.
315	* - 0x170	315	* - 0x170
316	- \_\_le32	316	- __le32
317	- s\_raid\_stripe\_width	317	- s_raid_stripe_width
318	- RAID stripe width. This is the number of logical blocks read from or	318	- RAID stripe width. This is the number of logical blocks read from or
319	written to the disk before coming back to the current disk. This is used	319	written to the disk before coming back to the current disk. This is used
320	by the block allocator to try to reduce the number of read-modify-write	320	by the block allocator to try to reduce the number of read-modify-write
321	operations in a RAID5/6.	321	operations in a RAID5/6.
322	* - 0x174	322	* - 0x174
323	- \_\_u8	323	- __u8
324	- s\_log\_groups\_per\_flex	324	- s_log_groups_per_flex
325	- Size of a flexible block group is 2 ^ ``s_log_groups_per_flex``.	325	- Size of a flexible block group is 2 ^ ``s_log_groups_per_flex``.
326	* - 0x175	326	* - 0x175
327	- \_\_u8	327	- __u8
328	- s\_checksum\_type	328	- s_checksum_type
329	- Metadata checksum algorithm type. The only valid value is 1 (crc32c).	329	- Metadata checksum algorithm type. The only valid value is 1 (crc32c).
330	* - 0x176	330	* - 0x176
331	- \_\_le16	331	- __le16
332	- s\_reserved\_pad	332	- s_reserved_pad
333	-	333	-
334	* - 0x178	334	* - 0x178
335	- \_\_le64	335	- __le64
336	- s\_kbytes\_written	336	- s_kbytes_written
337	- Number of KiB written to this filesystem over its lifetime.	337	- Number of KiB written to this filesystem over its lifetime.
338	* - 0x180	338	* - 0x180
339	- \_\_le32	339	- __le32
340	- s\_snapshot\_inum	340	- s_snapshot_inum
341	- inode number of active snapshot. (Not used in e2fsprogs/Linux.)	341	- inode number of active snapshot. (Not used in e2fsprogs/Linux.)
342	* - 0x184	342	* - 0x184
343	- \_\_le32	343	- __le32
344	- s\_snapshot\_id	344	- s_snapshot_id
345	- Sequential ID of active snapshot. (Not used in e2fsprogs/Linux.)	345	- Sequential ID of active snapshot. (Not used in e2fsprogs/Linux.)
346	* - 0x188	346	* - 0x188
347	- \_\_le64	347	- __le64
348	- s\_snapshot\_r\_blocks\_count	348	- s_snapshot_r_blocks_count
349	- Number of blocks reserved for active snapshot's future use. (Not used in	349	- Number of blocks reserved for active snapshot's future use. (Not used in
350	e2fsprogs/Linux.)	350	e2fsprogs/Linux.)
351	* - 0x190	351	* - 0x190
352	- \_\_le32	352	- __le32
353	- s\_snapshot\_list	353	- s_snapshot_list
354	- inode number of the head of the on-disk snapshot list. (Not used in	354	- inode number of the head of the on-disk snapshot list. (Not used in
355	e2fsprogs/Linux.)	355	e2fsprogs/Linux.)
356	* - 0x194	356	* - 0x194
357	- \_\_le32	357	- __le32
358	- s\_error\_count	358	- s_error_count
359	- Number of errors seen.	359	- Number of errors seen.
360	* - 0x198	360	* - 0x198
361	- \_\_le32	361	- __le32
362	- s\_first\_error\_time	362	- s_first_error_time
363	- First time an error happened, in seconds since the epoch.	363	- First time an error happened, in seconds since the epoch.
364	* - 0x19C	364	* - 0x19C
365	- \_\_le32	365	- __le32
366	- s\_first\_error\_ino	366	- s_first_error_ino
367	- inode involved in first error.	367	- inode involved in first error.
368	* - 0x1A0	368	* - 0x1A0
369	- \_\_le64	369	- __le64
370	- s\_first\_error\_block	370	- s_first_error_block
371	- Number of block involved of first error.	371	- Number of block involved of first error.
372	* - 0x1A8	372	* - 0x1A8
373	- \_\_u8	373	- __u8
374	- s\_first\_error\_func[32]	374	- s_first_error_func[32]
375	- Name of function where the error happened.	375	- Name of function where the error happened.
376	* - 0x1C8	376	* - 0x1C8
377	- \_\_le32	377	- __le32
378	- s\_first\_error\_line	378	- s_first_error_line
379	- Line number where error happened.	379	- Line number where error happened.
380	* - 0x1CC	380	* - 0x1CC
381	- \_\_le32	381	- __le32
382	- s\_last\_error\_time	382	- s_last_error_time
383	- Time of most recent error, in seconds since the epoch.	383	- Time of most recent error, in seconds since the epoch.
384	* - 0x1D0	384	* - 0x1D0
385	- \_\_le32	385	- __le32
386	- s\_last\_error\_ino	386	- s_last_error_ino
387	- inode involved in most recent error.	387	- inode involved in most recent error.
388	* - 0x1D4	388	* - 0x1D4
389	- \_\_le32	389	- __le32
390	- s\_last\_error\_line	390	- s_last_error_line
391	- Line number where most recent error happened.	391	- Line number where most recent error happened.
392	* - 0x1D8	392	* - 0x1D8
393	- \_\_le64	393	- __le64
394	- s\_last\_error\_block	394	- s_last_error_block
395	- Number of block involved in most recent error.	395	- Number of block involved in most recent error.
396	* - 0x1E0	396	* - 0x1E0
397	- \_\_u8	397	- __u8
398	- s\_last\_error\_func[32]	398	- s_last_error_func[32]
399	- Name of function where the most recent error happened.	399	- Name of function where the most recent error happened.
400	* - 0x200	400	* - 0x200
401	- \_\_u8	401	- __u8
402	- s\_mount\_opts[64]	402	- s_mount_opts[64]
403	- ASCIIZ string of mount options.	403	- ASCIIZ string of mount options.
404	* - 0x240	404	* - 0x240
405	- \_\_le32	405	- __le32
406	- s\_usr\_quota\_inum	406	- s_usr_quota_inum
407	- Inode number of user `quota <quota>`__ file.	407	- Inode number of user `quota <quota>`__ file.
408	* - 0x244	408	* - 0x244
409	- \_\_le32	409	- __le32
410	- s\_grp\_quota\_inum	410	- s_grp_quota_inum
411	- Inode number of group `quota <quota>`__ file.	411	- Inode number of group `quota <quota>`__ file.
412	* - 0x248	412	* - 0x248
413	- \_\_le32	413	- __le32
414	- s\_overhead\_blocks	414	- s_overhead_blocks
415	- Overhead blocks/clusters in fs. (Huh? This field is always zero, which	415	- Overhead blocks/clusters in fs. (Huh? This field is always zero, which
416	means that the kernel calculates it dynamically.)	416	means that the kernel calculates it dynamically.)
417	* - 0x24C	417	* - 0x24C
418	- \_\_le32	418	- __le32
419	- s\_backup\_bgs[2]	419	- s_backup_bgs[2]
420	- Block groups containing superblock backups (if sparse\_super2)	420	- Block groups containing superblock backups (if sparse_super2)
421	* - 0x254	421	* - 0x254
422	- \_\_u8	422	- __u8
423	- s\_encrypt\_algos[4]	423	- s_encrypt_algos[4]
424	- Encryption algorithms in use. There can be up to four algorithms in use	424	- Encryption algorithms in use. There can be up to four algorithms in use
425	at any time; valid algorithm codes are given in the super_encrypt_ table	425	at any time; valid algorithm codes are given in the super_encrypt_ table
426	below.	426	below.
427	* - 0x258	427	* - 0x258
428	- \_\_u8	428	- __u8
429	- s\_encrypt\_pw\_salt[16]	429	- s_encrypt_pw_salt[16]
430	- Salt for the string2key algorithm for encryption.	430	- Salt for the string2key algorithm for encryption.
431	* - 0x268	431	* - 0x268
432	- \_\_le32	432	- __le32
433	- s\_lpf\_ino	433	- s_lpf_ino
434	- Inode number of lost+found	434	- Inode number of lost+found
435	* - 0x26C	435	* - 0x26C
436	- \_\_le32	436	- __le32
437	- s\_prj\_quota\_inum	437	- s_prj_quota_inum
438	- Inode that tracks project quotas.	438	- Inode that tracks project quotas.
439	* - 0x270	439	* - 0x270
440	- \_\_le32	440	- __le32
441	- s\_checksum\_seed	441	- s_checksum_seed
442	- Checksum seed used for metadata\_csum calculations. This value is	442	- Checksum seed used for metadata_csum calculations. This value is
443	crc32c(~0, $orig\_fs\_uuid).	443	crc32c(~0, $orig_fs_uuid).
444	* - 0x274	444	* - 0x274
445	- \_\_u8	445	- __u8
446	- s\_wtime_hi	446	- s_wtime_hi
447	- Upper 8 bits of the s_wtime field.	447	- Upper 8 bits of the s_wtime field.
448	* - 0x275	448	* - 0x275
449	- \_\_u8	449	- __u8
450	- s\_mtime_hi	450	- s_mtime_hi
451	- Upper 8 bits of the s_mtime field.	451	- Upper 8 bits of the s_mtime field.
452	* - 0x276	452	* - 0x276
453	- \_\_u8	453	- __u8
454	- s\_mkfs_time_hi	454	- s_mkfs_time_hi
455	- Upper 8 bits of the s_mkfs_time field.	455	- Upper 8 bits of the s_mkfs_time field.
456	* - 0x277	456	* - 0x277
457	- \_\_u8	457	- __u8
458	- s\_lastcheck_hi	458	- s_lastcheck_hi
459	- Upper 8 bits of the s_lastcheck_hi field.	459	- Upper 8 bits of the s_lastcheck_hi field.
460	* - 0x278	460	* - 0x278
461	- \_\_u8	461	- __u8
462	- s\_first_error_time_hi	462	- s_first_error_time_hi
463	- Upper 8 bits of the s_first_error_time_hi field.	463	- Upper 8 bits of the s_first_error_time_hi field.
464	* - 0x279	464	* - 0x279
465	- \_\_u8	465	- __u8
466	- s\_last_error_time_hi	466	- s_last_error_time_hi
467	- Upper 8 bits of the s_last_error_time_hi field.	467	- Upper 8 bits of the s_last_error_time_hi field.
468	* - 0x27A	468	* - 0x27A
469	- \_\_u8	469	- __u8
470	- s\_pad[2]	470	- s_pad[2]
471	- Zero padding.	471	- Zero padding.
472	* - 0x27C	472	* - 0x27C
473	- \_\_le16	473	- __le16
474	- s\_encoding	474	- s_encoding
475	- Filename charset encoding.	475	- Filename charset encoding.
476	* - 0x27E	476	* - 0x27E
477	- \_\_le16	477	- __le16
478	- s\_encoding_flags	478	- s_encoding_flags
479	- Filename charset encoding flags.	479	- Filename charset encoding flags.
480	* - 0x280	480	* - 0x280
481	- \_\_le32	481	- __le32
482	- s\_orphan\_file\_inum	482	- s_orphan_file_inum
483	- Orphan file inode number.	483	- Orphan file inode number.
484	* - 0x284	484	* - 0x284
485	- \_\_le32	485	- __le32
486	- s\_reserved[94]	486	- s_reserved[94]
487	- Padding to the end of the block.	487	- Padding to the end of the block.
488	* - 0x3FC	488	* - 0x3FC
489	- \_\_le32	489	- __le32
490	- s\_checksum	490	- s_checksum
491	- Superblock checksum.	491	- Superblock checksum.
492		492
493	.. _super_state:	493	.. _super_state:
@@ -574,44 +574,44 @@ following: · 80 unmodified lines
574	* - Value	574	* - Value
575	- Description	575	- Description
576	* - 0x1	576	* - 0x1
577	- Directory preallocation (COMPAT\_DIR\_PREALLOC).	577	- Directory preallocation (COMPAT_DIR_PREALLOC).
578	* - 0x2	578	* - 0x2
579	- “imagic inodes”. Not clear from the code what this does	579	- “imagic inodes”. Not clear from the code what this does
580	(COMPAT\_IMAGIC\_INODES).	580	(COMPAT_IMAGIC_INODES).
581	* - 0x4	581	* - 0x4
582	- Has a journal (COMPAT\_HAS\_JOURNAL).	582	- Has a journal (COMPAT_HAS_JOURNAL).
583	* - 0x8	583	* - 0x8
584	- Supports extended attributes (COMPAT\_EXT\_ATTR).	584	- Supports extended attributes (COMPAT_EXT_ATTR).
585	* - 0x10	585	* - 0x10
586	- Has reserved GDT blocks for filesystem expansion	586	- Has reserved GDT blocks for filesystem expansion
587	(COMPAT\_RESIZE\_INODE). Requires RO\_COMPAT\_SPARSE\_SUPER.	587	(COMPAT_RESIZE_INODE). Requires RO_COMPAT_SPARSE_SUPER.
588	* - 0x20	588	* - 0x20
589	- Has directory indices (COMPAT\_DIR\_INDEX).	589	- Has directory indices (COMPAT_DIR_INDEX).
590	* - 0x40	590	* - 0x40
591	- “Lazy BG”. Not in Linux kernel, seems to have been for uninitialized	591	- “Lazy BG”. Not in Linux kernel, seems to have been for uninitialized
592	block groups? (COMPAT\_LAZY\_BG)	592	block groups? (COMPAT_LAZY_BG)
593	* - 0x80	593	* - 0x80
594	- “Exclude inode”. Not used. (COMPAT\_EXCLUDE\_INODE).	594	- “Exclude inode”. Not used. (COMPAT_EXCLUDE_INODE).
595	* - 0x100	595	* - 0x100
596	- “Exclude bitmap”. Seems to be used to indicate the presence of	596	- “Exclude bitmap”. Seems to be used to indicate the presence of
597	snapshot-related exclude bitmaps? Not defined in kernel or used in	597	snapshot-related exclude bitmaps? Not defined in kernel or used in
598	e2fsprogs (COMPAT\_EXCLUDE\_BITMAP).	598	e2fsprogs (COMPAT_EXCLUDE_BITMAP).
599	* - 0x200	599	* - 0x200
600	- Sparse Super Block, v2. If this flag is set, the SB field s\_backup\_bgs	600	- Sparse Super Block, v2. If this flag is set, the SB field s_backup_bgs
601	points to the two block groups that contain backup superblocks	601	points to the two block groups that contain backup superblocks
602	(COMPAT\_SPARSE\_SUPER2).	602	(COMPAT_SPARSE_SUPER2).
603	* - 0x400	603	* - 0x400
604	- Fast commits supported. Although fast commits blocks are	604	- Fast commits supported. Although fast commits blocks are
605	backward incompatible, fast commit blocks are not always	605	backward incompatible, fast commit blocks are not always
606	present in the journal. If fast commit blocks are present in	606	present in the journal. If fast commit blocks are present in
607	the journal, JBD2 incompat feature	607	the journal, JBD2 incompat feature
608	(JBD2\_FEATURE\_INCOMPAT\_FAST\_COMMIT) gets	608	(JBD2_FEATURE_INCOMPAT_FAST_COMMIT) gets
609	set (COMPAT\_FAST\_COMMIT).	609	set (COMPAT_FAST_COMMIT).
610	* - 0x1000	610	* - 0x1000
611	- Orphan file allocated. This is the special file for more efficient	611	- Orphan file allocated. This is the special file for more efficient
612	tracking of unlinked but still open inodes. When there may be any	612	tracking of unlinked but still open inodes. When there may be any
613	entries in the file, we additionally set proper rocompat feature	613	entries in the file, we additionally set proper rocompat feature
614	(RO\_COMPAT\_ORPHAN\_PRESENT).	614	(RO_COMPAT_ORPHAN_PRESENT).
615		615
616	.. _super_incompat:	616	.. _super_incompat:
617		617
@@ -625,45 +625,45 @@ following: · 7 unmodified lines
625	* - Value	625	* - Value
626	- Description	626	- Description
627	* - 0x1	627	* - 0x1
628	- Compression (INCOMPAT\_COMPRESSION).	628	- Compression (INCOMPAT_COMPRESSION).
629	* - 0x2	629	* - 0x2
630	- Directory entries record the file type. See ext4\_dir\_entry\_2 below	630	- Directory entries record the file type. See ext4_dir_entry_2 below
631	(INCOMPAT\_FILETYPE).	631	(INCOMPAT_FILETYPE).
632	* - 0x4	632	* - 0x4
633	- Filesystem needs recovery (INCOMPAT\_RECOVER).	633	- Filesystem needs recovery (INCOMPAT_RECOVER).
634	* - 0x8	634	* - 0x8
635	- Filesystem has a separate journal device (INCOMPAT\_JOURNAL\_DEV).	635	- Filesystem has a separate journal device (INCOMPAT_JOURNAL_DEV).
636	* - 0x10	636	* - 0x10
637	- Meta block groups. See the earlier discussion of this feature	637	- Meta block groups. See the earlier discussion of this feature
638	(INCOMPAT\_META\_BG).	638	(INCOMPAT_META_BG).
639	* - 0x40	639	* - 0x40
640	- Files in this filesystem use extents (INCOMPAT\_EXTENTS).	640	- Files in this filesystem use extents (INCOMPAT_EXTENTS).
641	* - 0x80	641	* - 0x80
642	- Enable a filesystem size of 2^64 blocks (INCOMPAT\_64BIT).	642	- Enable a filesystem size of 2^64 blocks (INCOMPAT_64BIT).
643	* - 0x100	643	* - 0x100
644	- Multiple mount protection (INCOMPAT\_MMP).	644	- Multiple mount protection (INCOMPAT_MMP).
645	* - 0x200	645	* - 0x200
646	- Flexible block groups. See the earlier discussion of this feature	646	- Flexible block groups. See the earlier discussion of this feature
647	(INCOMPAT\_FLEX\_BG).	647	(INCOMPAT_FLEX_BG).
648	* - 0x400	648	* - 0x400
649	- Inodes can be used to store large extended attribute values	649	- Inodes can be used to store large extended attribute values
650	(INCOMPAT\_EA\_INODE).	650	(INCOMPAT_EA_INODE).
651	* - 0x1000	651	* - 0x1000
652	- Data in directory entry (INCOMPAT\_DIRDATA). (Not implemented?)	652	- Data in directory entry (INCOMPAT_DIRDATA). (Not implemented?)
653	* - 0x2000	653	* - 0x2000
654	- Metadata checksum seed is stored in the superblock. This feature enables	654	- Metadata checksum seed is stored in the superblock. This feature enables
655	the administrator to change the UUID of a metadata\_csum filesystem	655	the administrator to change the UUID of a metadata_csum filesystem
656	while the filesystem is mounted; without it, the checksum definition	656	while the filesystem is mounted; without it, the checksum definition
657	requires all metadata blocks to be rewritten (INCOMPAT\_CSUM\_SEED).	657	requires all metadata blocks to be rewritten (INCOMPAT_CSUM_SEED).
658	* - 0x4000	658	* - 0x4000
659	- Large directory >2GB or 3-level htree (INCOMPAT\_LARGEDIR). Prior to	659	- Large directory >2GB or 3-level htree (INCOMPAT_LARGEDIR). Prior to
660	this feature, directories could not be larger than 4GiB and could not	660	this feature, directories could not be larger than 4GiB and could not
661	have an htree more than 2 levels deep. If this feature is enabled,	661	have an htree more than 2 levels deep. If this feature is enabled,
662	directories can be larger than 4GiB and have a maximum htree depth of 3.	662	directories can be larger than 4GiB and have a maximum htree depth of 3.
663	* - 0x8000	663	* - 0x8000
664	- Data in inode (INCOMPAT\_INLINE\_DATA).	664	- Data in inode (INCOMPAT_INLINE_DATA).
665	* - 0x10000	665	* - 0x10000
666	- Encrypted inodes are present on the filesystem. (INCOMPAT\_ENCRYPT).	666	- Encrypted inodes are present on the filesystem. (INCOMPAT_ENCRYPT).
667		667
668	.. _super_rocompat:	668	.. _super_rocompat:
669		669
@@ -678,54 +678,54 @@ the following: · 8 unmodified lines
678	- Description	678	- Description
679	* - 0x1	679	* - 0x1
680	- Sparse superblocks. See the earlier discussion of this feature	680	- Sparse superblocks. See the earlier discussion of this feature
681	(RO\_COMPAT\_SPARSE\_SUPER).	681	(RO_COMPAT_SPARSE_SUPER).
682	* - 0x2	682	* - 0x2
683	- This filesystem has been used to store a file greater than 2GiB	683	- This filesystem has been used to store a file greater than 2GiB
684	(RO\_COMPAT\_LARGE\_FILE).	684	(RO_COMPAT_LARGE_FILE).
685	* - 0x4	685	* - 0x4
686	- Not used in kernel or e2fsprogs (RO\_COMPAT\_BTREE\_DIR).	686	- Not used in kernel or e2fsprogs (RO_COMPAT_BTREE_DIR).
687	* - 0x8	687	* - 0x8
688	- This filesystem has files whose sizes are represented in units of	688	- This filesystem has files whose sizes are represented in units of
689	logical blocks, not 512-byte sectors. This implies a very large file	689	logical blocks, not 512-byte sectors. This implies a very large file
690	indeed! (RO\_COMPAT\_HUGE\_FILE)	690	indeed! (RO_COMPAT_HUGE_FILE)
691	* - 0x10	691	* - 0x10
692	- Group descriptors have checksums. In addition to detecting corruption,	692	- Group descriptors have checksums. In addition to detecting corruption,
693	this is useful for lazy formatting with uninitialized groups	693	this is useful for lazy formatting with uninitialized groups
694	(RO\_COMPAT\_GDT\_CSUM).	694	(RO_COMPAT_GDT_CSUM).
695	* - 0x20	695	* - 0x20
696	- Indicates that the old ext3 32,000 subdirectory limit no longer applies	696	- Indicates that the old ext3 32,000 subdirectory limit no longer applies
697	(RO\_COMPAT\_DIR\_NLINK). A directory's i\_links\_count will be set to 1	697	(RO_COMPAT_DIR_NLINK). A directory's i_links_count will be set to 1
698	if it is incremented past 64,999.	698	if it is incremented past 64,999.
699	* - 0x40	699	* - 0x40
700	- Indicates that large inodes exist on this filesystem	700	- Indicates that large inodes exist on this filesystem
701	(RO\_COMPAT\_EXTRA\_ISIZE).	701	(RO_COMPAT_EXTRA_ISIZE).
702	* - 0x80	702	* - 0x80
703	- This filesystem has a snapshot (RO\_COMPAT\_HAS\_SNAPSHOT).	703	- This filesystem has a snapshot (RO_COMPAT_HAS_SNAPSHOT).
704	* - 0x100	704	* - 0x100
705	- `Quota <Quota>`__ (RO\_COMPAT\_QUOTA).	705	- `Quota <Quota>`__ (RO_COMPAT_QUOTA).
706	* - 0x200	706	* - 0x200
707	- This filesystem supports “bigalloc”, which means that file extents are	707	- This filesystem supports “bigalloc”, which means that file extents are
708	tracked in units of clusters (of blocks) instead of blocks	708	tracked in units of clusters (of blocks) instead of blocks
709	(RO\_COMPAT\_BIGALLOC).	709	(RO_COMPAT_BIGALLOC).
710	* - 0x400	710	* - 0x400
711	- This filesystem supports metadata checksumming.	711	- This filesystem supports metadata checksumming.
712	(RO\_COMPAT\_METADATA\_CSUM; implies RO\_COMPAT\_GDT\_CSUM, though	712	(RO_COMPAT_METADATA_CSUM; implies RO_COMPAT_GDT_CSUM, though
713	GDT\_CSUM must not be set)	713	GDT_CSUM must not be set)
714	* - 0x800	714	* - 0x800
715	- Filesystem supports replicas. This feature is neither in the kernel nor	715	- Filesystem supports replicas. This feature is neither in the kernel nor
716	e2fsprogs. (RO\_COMPAT\_REPLICA)	716	e2fsprogs. (RO_COMPAT_REPLICA)
717	* - 0x1000	717	* - 0x1000
718	- Read-only filesystem image; the kernel will not mount this image	718	- Read-only filesystem image; the kernel will not mount this image
719	read-write and most tools will refuse to write to the image.	719	read-write and most tools will refuse to write to the image.
720	(RO\_COMPAT\_READONLY)	720	(RO_COMPAT_READONLY)
721	* - 0x2000	721	* - 0x2000
722	- Filesystem tracks project quotas. (RO\_COMPAT\_PROJECT)	722	- Filesystem tracks project quotas. (RO_COMPAT_PROJECT)
723	* - 0x8000	723	* - 0x8000
724	- Verity inodes may be present on the filesystem. (RO\_COMPAT\_VERITY)	724	- Verity inodes may be present on the filesystem. (RO_COMPAT_VERITY)
725	* - 0x10000	725	* - 0x10000
726	- Indicates orphan file may have valid orphan entries and thus we need	726	- Indicates orphan file may have valid orphan entries and thus we need
727	to clean them up when mounting the filesystem	727	to clean them up when mounting the filesystem
728	(RO\_COMPAT\_ORPHAN\_PRESENT).	728	(RO_COMPAT_ORPHAN_PRESENT).
729		729
730	.. _super_def_hash:	730	.. _super_def_hash:
731		731
@@ -761,36 +761,36 @@ The ``s_default_mount_opts`` field is any combination of the following: · 29 unmodified lines
761	* - Value	761	* - Value
762	- Description	762	- Description
763	* - 0x0001	763	* - 0x0001
764	- Print debugging info upon (re)mount. (EXT4\_DEFM\_DEBUG)	764	- Print debugging info upon (re)mount. (EXT4_DEFM_DEBUG)
765	* - 0x0002	765	* - 0x0002
766	- New files take the gid of the containing directory (instead of the fsgid	766	- New files take the gid of the containing directory (instead of the fsgid
767	of the current process). (EXT4\_DEFM\_BSDGROUPS)	767	of the current process). (EXT4_DEFM_BSDGROUPS)
768	* - 0x0004	768	* - 0x0004
769	- Support userspace-provided extended attributes. (EXT4\_DEFM\_XATTR\_USER)	769	- Support userspace-provided extended attributes. (EXT4_DEFM_XATTR_USER)
770	* - 0x0008	770	* - 0x0008
771	- Support POSIX access control lists (ACLs). (EXT4\_DEFM\_ACL)	771	- Support POSIX access control lists (ACLs). (EXT4_DEFM_ACL)
772	* - 0x0010	772	* - 0x0010
773	- Do not support 32-bit UIDs. (EXT4\_DEFM\_UID16)	773	- Do not support 32-bit UIDs. (EXT4_DEFM_UID16)
774	* - 0x0020	774	* - 0x0020
775	- All data and metadata are commited to the journal.	775	- All data and metadata are commited to the journal.
776	(EXT4\_DEFM\_JMODE\_DATA)	776	(EXT4_DEFM_JMODE_DATA)
777	* - 0x0040	777	* - 0x0040
778	- All data are flushed to the disk before metadata are committed to the	778	- All data are flushed to the disk before metadata are committed to the
779	journal. (EXT4\_DEFM\_JMODE\_ORDERED)	779	journal. (EXT4_DEFM_JMODE_ORDERED)
780	* - 0x0060	780	* - 0x0060
781	- Data ordering is not preserved; data may be written after the metadata	781	- Data ordering is not preserved; data may be written after the metadata
782	has been written. (EXT4\_DEFM\_JMODE\_WBACK)	782	has been written. (EXT4_DEFM_JMODE_WBACK)
783	* - 0x0100	783	* - 0x0100
784	- Disable write flushes. (EXT4\_DEFM\_NOBARRIER)	784	- Disable write flushes. (EXT4_DEFM_NOBARRIER)
785	* - 0x0200	785	* - 0x0200
786	- Track which blocks in a filesystem are metadata and therefore should not	786	- Track which blocks in a filesystem are metadata and therefore should not
787	be used as data blocks. This option will be enabled by default on 3.18,	787	be used as data blocks. This option will be enabled by default on 3.18,
788	hopefully. (EXT4\_DEFM\_BLOCK\_VALIDITY)	788	hopefully. (EXT4_DEFM_BLOCK_VALIDITY)
789	* - 0x0400	789	* - 0x0400
790	- Enable DISCARD support, where the storage device is told about blocks	790	- Enable DISCARD support, where the storage device is told about blocks
791	becoming unused. (EXT4\_DEFM\_DISCARD)	791	becoming unused. (EXT4_DEFM_DISCARD)
792	* - 0x0800	792	* - 0x0800
793	- Disable delayed allocation. (EXT4\_DEFM\_NODELALLOC)	793	- Disable delayed allocation. (EXT4_DEFM_NODELALLOC)
794		794
795	.. _super_flags:	795	.. _super_flags:
796		796
@@ -820,12 +820,12 @@ The ``s_encrypt_algos`` list can contain any of the following: · 23 unmodified lines
820	* - Value	820	* - Value
821	- Description	821	- Description
822	* - 0	822	* - 0
823	- Invalid algorithm (ENCRYPTION\_MODE\_INVALID).	823	- Invalid algorithm (ENCRYPTION_MODE_INVALID).
824	* - 1	824	* - 1
825	- 256-bit AES in XTS mode (ENCRYPTION\_MODE\_AES\_256\_XTS).	825	- 256-bit AES in XTS mode (ENCRYPTION_MODE_AES_256_XTS).
826	* - 2	826	* - 2
827	- 256-bit AES in GCM mode (ENCRYPTION\_MODE\_AES\_256\_GCM).	827	- 256-bit AES in GCM mode (ENCRYPTION_MODE_AES_256_GCM).
828	* - 3	828	* - 3
829	- 256-bit AES in CBC mode (ENCRYPTION\_MODE\_AES\_256\_CBC).	829	- 256-bit AES in CBC mode (ENCRYPTION_MODE_AES_256_CBC).
830		830
831	Total size of the superblock is 1024 bytes.	831	Total size of the superblock is 1024 bytes.

Documentation/kbuild/llvm.rst+8−2

    * - arm64
      - Supported
      - ``LLVM=1``
+   * - hexagon
+     - Maintained
+     - ``LLVM=1``
    * - mips
      - Maintained
-     - ``CC=clang``
+     - ``LLVM=1``
    * - powerpc
      - Maintained
      - ``CC=clang``
    * - riscv
      - Maintained
-     - ``CC=clang``
+     - ``LLVM=1``
    * - s390
      - Maintained
      - ``CC=clang``
+   * - um (User Mode)
+     - Maintained
+     - ``LLVM=1``
    * - x86
      - Supported
      - ``LLVM=1``

Documentation/loongarch/introduction.rst+9−6

 ``$r23``-``$r31`` ``$s0``-``$s8`` Static registers    Yes
 ================= =============== =================== ============
-Note: The register ``$r21`` is reserved in the ELF psABI, but used by the Linux
+.. Note::
-kernel for storing the percpu base address. It normally has no ABI name, but is
+    The register ``$r21`` is reserved in the ELF psABI, but used by the Linux
-called ``$u0`` in the kernel. You may also see ``$v0`` or ``$v1`` in some old code,
+    kernel for storing the percpu base address. It normally has no ABI name,
-however they are deprecated aliases of ``$a0`` and ``$a1`` respectively.
+    but is called ``$u0`` in the kernel. You may also see ``$v0`` or ``$v1``
+    in some old code,however they are deprecated aliases of ``$a0`` and ``$a1``
+    respectively.
 FPRs
 ----
 ``$f24``-``$f31`` ``$fs0``-``$fs7``  Static registers    Yes
 ================= ================== =================== ============
-Note: You may see ``$fv0`` or ``$fv1`` in some old code, however they are deprecated
+.. Note::
-aliases of ``$fa0`` and ``$fa1`` respectively.
+    You may see ``$fv0`` or ``$fv1`` in some old code, however they are
+    deprecated aliases of ``$fa0`` and ``$fa1`` respectively.
 VRs
 ----

Documentation/loongarch/irq-chip-model.rst+13−9

@@ -145,12 +145,16 @@ Documentation of Loongson's LS7A chipset: · 144 unmodified lines
145		145
146	https://github.com/loongson/LoongArch-Documentation/releases/latest/download/Loongson-7A1000-usermanual-2.00-EN.pdf (in English)	146	https://github.com/loongson/LoongArch-Documentation/releases/latest/download/Loongson-7A1000-usermanual-2.00-EN.pdf (in English)
147		147
148	Note: CPUINTC is CSR.ECFG/CSR.ESTAT and its interrupt controller described	148	.. Note::
149	in Section 7.4 of "LoongArch Reference Manual, Vol 1"; LIOINTC is "Legacy I/O	149	- CPUINTC is CSR.ECFG/CSR.ESTAT and its interrupt controller described
150	Interrupts" described in Section 11.1 of "Loongson 3A5000 Processor Reference	150	in Section 7.4 of "LoongArch Reference Manual, Vol 1";
151	Manual"; EIOINTC is "Extended I/O Interrupts" described in Section 11.2 of	151	- LIOINTC is "Legacy I/OInterrupts" described in Section 11.1 of
152	"Loongson 3A5000 Processor Reference Manual"; HTVECINTC is "HyperTransport	152	"Loongson 3A5000 Processor Reference Manual";
153	Interrupts" described in Section 14.3 of "Loongson 3A5000 Processor Reference	153	- EIOINTC is "Extended I/O Interrupts" described in Section 11.2 of
154	Manual"; PCH-PIC/PCH-MSI is "Interrupt Controller" described in Section 5 of	154	"Loongson 3A5000 Processor Reference Manual";
155	"Loongson 7A1000 Bridge User Manual"; PCH-LPC is "LPC Interrupts" described in	155	- HTVECINTC is "HyperTransport Interrupts" described in Section 14.3 of
156	Section 24.3 of "Loongson 7A1000 Bridge User Manual".	156	"Loongson 3A5000 Processor Reference Manual";
		157	- PCH-PIC/PCH-MSI is "Interrupt Controller" described in Section 5 of
		158	"Loongson 7A1000 Bridge User Manual";
		159	- PCH-LPC is "LPC Interrupts" described in Section 24.3 of
		160	"Loongson 7A1000 Bridge User Manual".

Documentation/networking/ip-sysctl.rst+37−0

@@ -2925,6 +2925,43 @@ plpmtud_probe_interval - INTEGER · 2924 unmodified lines
2925		2925
2926	Default: 0	2926	Default: 0
2927		2927
		2928	reconf_enable - BOOLEAN
		2929	Enable or disable extension of Stream Reconfiguration functionality
		2930	specified in RFC6525. This extension provides the ability to "reset"
		2931	a stream, and it includes the Parameters of "Outgoing/Incoming SSN
		2932	Reset", "SSN/TSN Reset" and "Add Outgoing/Incoming Streams".
		2933
		2934	- 1: Enable extension.
		2935	- 0: Disable extension.
		2936
		2937	Default: 0
		2938
		2939	intl_enable - BOOLEAN
		2940	Enable or disable extension of User Message Interleaving functionality
		2941	specified in RFC8260. This extension allows the interleaving of user
		2942	messages sent on different streams. With this feature enabled, I-DATA
		2943	chunk will replace DATA chunk to carry user messages if also supported
		2944	by the peer. Note that to use this feature, one needs to set this option
		2945	to 1 and also needs to set socket options SCTP_FRAGMENT_INTERLEAVE to 2
		2946	and SCTP_INTERLEAVING_SUPPORTED to 1.
		2947
		2948	- 1: Enable extension.
		2949	- 0: Disable extension.
		2950
		2951	Default: 0
		2952
		2953	ecn_enable - BOOLEAN
		2954	Control use of Explicit Congestion Notification (ECN) by SCTP.
		2955	Like in TCP, ECN is used only when both ends of the SCTP connection
		2956	indicate support for it. This feature is useful in avoiding losses
		2957	due to congestion by allowing supporting routers to signal congestion
		2958	before having to drop packets.
		2959
		2960	1: Enable ecn.
		2961	0: Disable ecn.
		2962
		2963	Default: 1
		2964
2928		2965
2929	``/proc/sys/net/core/*``	2966	``/proc/sys/net/core/*``
2930	========================	2967	========================

Documentation/networking/phy.rst+1−1

@@ -104,7 +104,7 @@ Whenever possible, use the PHY side RGMII delay for these reasons: · 103 unmodified lines
104		104
105	* PHY device drivers in PHYLIB being reusable by nature, being able to	105	* PHY device drivers in PHYLIB being reusable by nature, being able to
106	configure correctly a specified delay enables more designs with similar delay	106	configure correctly a specified delay enables more designs with similar delay
107	requirements to be operate correctly	107	requirements to be operated correctly
108		108
109	For cases where the PHY is not capable of providing this delay, but the	109	For cases where the PHY is not capable of providing this delay, but the
110	Ethernet MAC driver is capable of doing so, the correct phy_interface_t value	110	Ethernet MAC driver is capable of doing so, the correct phy_interface_t value

Documentation/translations/zh_CN/loongarch/introduction.rst+8−6

 ``$r23``-``$r31`` ``$s0``-``$s8`` 静态寄存器          是
 ================= =============== =================== ==========
-注意：``$r21``寄存器在ELF psABI中保留未使用，但是在Linux内核用于保存每CPU
+.. note::
-变量基地址。该寄存器没有ABI命名，不过在内核中称为``$u0``。在一些遗留代码
+    注意： ``$r21`` 寄存器在ELF psABI中保留未使用，但是在Linux内核用于保
-中有时可能见到``$v0``和``$v1``，它们是``$a0``和``$a1``的别名，属于已经废弃
+    存每CPU变量基地址。该寄存器没有ABI命名，不过在内核中称为 ``$u0`` 。在
-的用法。
+    一些遗留代码中有时可能见到 ``$v0`` 和 ``$v1`` ，它们是 ``$a0`` 和
+    ``$a1`` 的别名，属于已经废弃的用法。
 浮点寄存器
 ----------
 ``$f24``-``$f31`` ``$fs0``-``$fs7``  静态寄存器          是
 ================= ================== =================== ==========
-注意：在一些遗留代码中有时可能见到 ``$v0`` 和 ``$v1`` ，它们是 ``$a0``
+.. note::
-和 ``$a1`` 的别名，属于已经废弃的用法。
+    注意：在一些遗留代码中有时可能见到 ``$v0`` 和 ``$v1`` ，它们是
+    ``$a0`` 和 ``$a1`` 的别名，属于已经废弃的用法。
 向量寄存器

Documentation/translations/zh_CN/loongarch/irq-chip-model.rst+8−6

@@ -147,9 +147,11 @@ PCH-LPC:: · 146 unmodified lines
147		147
148	https://github.com/loongson/LoongArch-Documentation/releases/latest/download/Loongson-7A1000-usermanual-2.00-EN.pdf (英文版)	148	https://github.com/loongson/LoongArch-Documentation/releases/latest/download/Loongson-7A1000-usermanual-2.00-EN.pdf (英文版)
149		149
150	注：CPUINTC即《龙芯架构参考手册卷一》第7.4节所描述的CSR.ECFG/CSR.ESTAT寄存器及其中断	150	.. note::
151	控制逻辑；LIOINTC即《龙芯3A5000处理器使用手册》第11.1节所描述的“传统I/O中断”；EIOINTC	151	- CPUINTC：即《龙芯架构参考手册卷一》第7.4节所描述的CSR.ECFG/CSR.ESTAT寄存器及其
152	即《龙芯3A5000处理器使用手册》第11.2节所描述的“扩展I/O中断”；HTVECINTC即《龙芯3A5000	152	中断控制逻辑；
153	处理器使用手册》第14.3节所描述的“HyperTransport中断”；PCH-PIC/PCH-MSI即《龙芯7A1000桥	153	- LIOINTC：即《龙芯3A5000处理器使用手册》第11.1节所描述的“传统I/O中断”；
154	片用户手册》第5章所描述的“中断控制器”；PCH-LPC即《龙芯7A1000桥片用户手册》第24.3节所	154	- EIOINTC：即《龙芯3A5000处理器使用手册》第11.2节所描述的“扩展I/O中断”；
155	描述的“LPC中断”。	155	- HTVECINTC：即《龙芯3A5000处理器使用手册》第14.3节所描述的“HyperTransport中断”；
		156	- PCH-PIC/PCH-MSI：即《龙芯7A1000桥片用户手册》第5章所描述的“中断控制器”；
		157	- PCH-LPC：即《龙芯7A1000桥片用户手册》第24.3节所描述的“LPC中断”。

Documentation/vm/hwpoison.rst+2−1

@@ -120,7 +120,8 @@ Testing · 119 unmodified lines
120	unpoison-pfn	120	unpoison-pfn
121	Software-unpoison page at PFN echoed into this file. This way	121	Software-unpoison page at PFN echoed into this file. This way
122	a page can be reused again. This only works for Linux	122	a page can be reused again. This only works for Linux
123	injected failures, not for real memory failures.	123	injected failures, not for real memory failures. Once any hardware
		124	memory failure happens, this feature is disabled.
124		125
125	Note these injection interfaces are not stable and might change between	126	Note these injection interfaces are not stable and might change between
126	kernel versions	127	kernel versions

MAINTAINERS+93−40

 M:	Jean-Philippe Brucker <jean-philippe@linaro.org>
 L:	linux-acpi@vger.kernel.org
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 S:	Maintained
 F:	drivers/acpi/viot.c
 F:	include/linux/acpi_viot.h
 M:	Joerg Roedel <joro@8bytes.org>
 R:	Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 F:	drivers/iommu/amd/
 M:	Chester Lin <clin@suse.com>
 R:	Andreas Färber <afaerber@suse.de>
 R:	Matthias Brugger <mbrugger@suse.com>
+R:	NXP S32 Linux Team <s32@nxp.com>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm64/boot/dts/freescale/s32g*.dts*
 M:	Shubham Bansal <illusionist.neo@gmail.com>
 L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
-S:	Maintained
+S:	Odd Fixes
 F:	arch/arm/net/
 BPF JIT for ARM64
 M:	Jakub Kicinski <kuba@kernel.org>
 L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
-S:	Supported
+S:	Odd Fixes
 F:	drivers/net/ethernet/netronome/nfp/bpf/
 BPF JIT for POWERPC (32-BIT AND 64-BIT)
 M:	Naveen N. Rao <naveen.n.rao@linux.ibm.com>
+M:	Michael Ellerman <mpe@ellerman.id.au>
 L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
-S:	Maintained
+S:	Supported
 F:	arch/powerpc/net/
 BPF JIT for RISC-V (32-bit)
 M:	Vasily Gorbik <gor@linux.ibm.com>
 L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
-S:	Maintained
+S:	Supported
 F:	arch/s390/net/
 X:	arch/s390/net/pnet.c
 M:	David S. Miller <davem@davemloft.net>
 L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
-S:	Maintained
+S:	Odd Fixes
 F:	arch/sparc/net/
 BPF JIT for X86 32-BIT
 M:	Wang YanQing <udknight@gmail.com>
 L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
-S:	Maintained
+S:	Odd Fixes
 F:	arch/x86/net/bpf_jit_comp32.c
 BPF JIT for X86 64-BIT
 F:	kernel/bpf/bpf_lsm.c
 F:	security/bpf/
+BPF L7 FRAMEWORK
+M:	John Fastabend <john.fastabend@gmail.com>
+M:	Jakub Sitnicki <jakub@cloudflare.com>
+L:	netdev@vger.kernel.org
+L:	bpf@vger.kernel.org
+S:	Maintained
+F:	include/linux/skmsg.h
+F:	net/core/skmsg.c
+F:	net/core/sock_map.c
+F:	net/ipv4/tcp_bpf.c
+F:	net/ipv4/udp_bpf.c
+F:	net/unix/unix_bpf.c
 BPFTOOL
 M:	Quentin Monnet <quentin@isovalent.com>
 L:	bpf@vger.kernel.org
 N:	bcm[9]?47622
 BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
-M:	Nicolas Saenz Julienne <nsaenz@kernel.org>
+M:	Florian Fainelli <f.fainelli@gmail.com>
 R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
 L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git
+T:	git git://github.com/broadcom/stblinux.git
 F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
 F:	drivers/pci/controller/pcie-brcmstb.c
 F:	drivers/staging/vc04_services
 M:	Marek Szyprowski <m.szyprowski@samsung.com>
 R:	Robin Murphy <robin.murphy@arm.com>
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 S:	Supported
 W:	http://git.infradead.org/users/hch/dma-mapping.git
 T:	git git://git.infradead.org/users/hch/dma-mapping.git
 DMA MAPPING BENCHMARK
 M:	Xiang Chen <chenxiang66@hisilicon.com>
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 F:	kernel/dma/map_benchmark.c
 F:	tools/testing/selftests/dma/
 EXYNOS SYSMMU (IOMMU) driver
 M:	Marek Szyprowski <m.szyprowski@samsung.com>
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 S:	Maintained
 F:	drivers/iommu/exynos-iommu.c
 F:	Documentation/driver-api/gpio/
 F:	drivers/gpio/
 F:	include/asm-generic/gpio.h
+F:	include/dt-bindings/gpio/
 F:	include/linux/gpio.h
 F:	include/linux/gpio/
 F:	include/linux/of_gpio.h
 HWPOISON MEMORY FAILURE HANDLING
 M:	Naoya Horiguchi <naoya.horiguchi@nec.com>
+R:	Miaohe Lin <linmiaohe@huawei.com>
 L:	linux-mm@kvack.org
 S:	Maintained
 F:	mm/hwpoison-inject.c
 F:	Documentation/devicetree/bindings/i2c/i2c.txt
 F:	Documentation/i2c/
 F:	drivers/i2c/*
+F:	include/dt-bindings/i2c/i2c.h
 F:	include/linux/i2c-dev.h
 F:	include/linux/i2c-smbus.h
 F:	include/linux/i2c.h
 F:	Documentation/devicetree/bindings/i2c/
 F:	drivers/i2c/algos/
 F:	drivers/i2c/busses/
+F:	include/dt-bindings/i2c/
 I2C-TAOS-EVM DRIVER
 M:	Jean Delvare <jdelvare@suse.com>
 M:	David Woodhouse <dwmw2@infradead.org>
 M:	Lu Baolu <baolu.lu@linux.intel.com>
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 S:	Supported
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 F:	drivers/iommu/intel/
 M:	Joerg Roedel <joro@8bytes.org>
 M:	Will Deacon <will@kernel.org>
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 F:	Documentation/devicetree/bindings/iommu/
 R:	James Morse <james.morse@arm.com>
 R:	Alexandru Elisei <alexandru.elisei@arm.com>
 R:	Suzuki K Poulose <suzuki.poulose@arm.com>
+R:	Oliver Upton <oliver.upton@linux.dev>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:	kvmarm@lists.cs.columbia.edu (moderated for non-subscribers)
 S:	Maintained
 F:	arch/riscv/include/uapi/asm/kvm*
 F:	arch/riscv/kvm/
 F:	tools/testing/selftests/kvm/*/riscv/
-F:	tools/testing/selftests/kvm/riscv/
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 M:	Christian Borntraeger <borntraeger@linux.ibm.com>
 F:	tools/testing/selftests/kvm/s390x/
 KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
+M:	Sean Christopherson <seanjc@google.com>
 M:	Paolo Bonzini <pbonzini@redhat.com>
-R:	Sean Christopherson <seanjc@google.com>
-R:	Vitaly Kuznetsov <vkuznets@redhat.com>
-R:	Wanpeng Li <wanpengli@tencent.com>
-R:	Jim Mattson <jmattson@google.com>
-R:	Joerg Roedel <joro@8bytes.org>
 L:	kvm@vger.kernel.org
 S:	Supported
-W:	http://www.linux-kvm.org
 T:	git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 F:	arch/x86/include/asm/kvm*
-F:	arch/x86/include/asm/pvclock-abi.h
 F:	arch/x86/include/asm/svm.h
 F:	arch/x86/include/asm/vmx*.h
 F:	arch/x86/include/uapi/asm/kvm*
 F:	arch/x86/include/uapi/asm/svm.h
 F:	arch/x86/include/uapi/asm/vmx.h
-F:	arch/x86/kernel/kvm.c
-F:	arch/x86/kernel/kvmclock.c
 F:	arch/x86/kvm/
 F:	arch/x86/kvm/*/
+KVM PARAVIRT (KVM/paravirt)
+M:	Paolo Bonzini <pbonzini@redhat.com>
+R:	Wanpeng Li <wanpengli@tencent.com>
+R:	Vitaly Kuznetsov <vkuznets@redhat.com>
+L:	kvm@vger.kernel.org
+S:	Supported
+T:	git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+F:	arch/x86/kernel/kvm.c
+F:	arch/x86/kernel/kvmclock.c
+F:	arch/x86/include/asm/pvclock-abi.h
+F:	include/linux/kvm_para.h
+F:	include/uapi/linux/kvm_para.h
+F:	include/uapi/asm-generic/kvm_para.h
+F:	include/asm-generic/kvm_para.h
+F:	arch/um/include/asm/kvm_para.h
+F:	arch/x86/include/asm/kvm_para.h
+F:	arch/x86/include/uapi/asm/kvm_para.h
+KVM X86 HYPER-V (KVM/hyper-v)
+M:	Vitaly Kuznetsov <vkuznets@redhat.com>
+M:	Sean Christopherson <seanjc@google.com>
+M:	Paolo Bonzini <pbonzini@redhat.com>
+L:	kvm@vger.kernel.org
+S:	Supported
+T:	git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+F:	arch/x86/kvm/hyperv.*
+F:	arch/x86/kvm/kvm_onhyperv.*
+F:	arch/x86/kvm/svm/hyperv.*
+F:	arch/x86/kvm/svm/svm_onhyperv.*
+F:	arch/x86/kvm/vmx/evmcs.*
 KERNFS
 M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 M:	Tejun Heo <tj@kernel.org>
 F:	include/net/l3mdev.h
 F:	net/l3mdev
-L7 BPF FRAMEWORK
-M:	John Fastabend <john.fastabend@gmail.com>
-M:	Daniel Borkmann <daniel@iogearbox.net>
-M:	Jakub Sitnicki <jakub@cloudflare.com>
-L:	netdev@vger.kernel.org
-L:	bpf@vger.kernel.org
-S:	Maintained
-F:	include/linux/skmsg.h
-F:	net/core/skmsg.c
-F:	net/core/sock_map.c
-F:	net/ipv4/tcp_bpf.c
-F:	net/ipv4/udp_bpf.c
-F:	net/unix/unix_bpf.c
 LANDLOCK SECURITY MODULE
 M:	Mickaël Salaün <mic@digikod.net>
 L:	linux-security-module@vger.kernel.org
 LOONGARCH
 M:	Huacai Chen <chenhuacai@kernel.org>
 R:	WANG Xuerui <kernel@xen0n.name>
+L:	loongarch@lists.linux.dev
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
 F:	arch/loongarch/
 MEDIATEK IOMMU DRIVER
 M:	Yong Wu <yong.wu@mediatek.com>
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:	Supported
 F:	Documentation/devicetree/bindings/iommu/mediatek*
 L:	linux-mm@kvack.org
 S:	Maintained
 W:	http://www.linux-mm.org
-T:	quilt https://ozlabs.org/~akpm/mmotm/
+T:	git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
-T:	quilt https://ozlabs.org/~akpm/mmots/
+T:	quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new
-T:	git git://github.com/hnaz/linux-mm.git
 F:	include/linux/gfp.h
 F:	include/linux/memory_hotplug.h
 F:	include/linux/mm.h
 F:	mm/
 F:	tools/testing/selftests/vm/
+MEMORY HOT(UN)PLUG
+M:	David Hildenbrand <david@redhat.com>
+M:	Oscar Salvador <osalvador@suse.de>
+L:	linux-mm@kvack.org
+S:	Maintained
+F:	Documentation/admin-guide/mm/memory-hotplug.rst
+F:	Documentation/core-api/memory-hotplug.rst
+F:	drivers/base/memory.c
+F:	include/linux/memory_hotplug.h
+F:	mm/memory_hotplug.c
+F:	tools/testing/selftests/memory-hotplug/
 MEMORY TECHNOLOGY DEVICES (MTD)
 M:	Miquel Raynal <miquel.raynal@bootlin.com>
 M:	Richard Weinberger <richard@nod.at>
 F:	Documentation/devicetree/bindings/net/
 F:	drivers/connector/
 F:	drivers/net/
+F:	include/dt-bindings/net/
 F:	include/linux/etherdevice.h
 F:	include/linux/fcdevice.h
 F:	include/linux/fddidevice.h
 NETWORKING [TLS]
 M:	Boris Pismenny <borisp@nvidia.com>
 M:	John Fastabend <john.fastabend@gmail.com>
-M:	Daniel Borkmann <daniel@iogearbox.net>
 M:	Jakub Kicinski <kuba@kernel.org>
 L:	netdev@vger.kernel.org
 S:	Maintained
 F:	drivers/iio/gyro/fxas21002c_spi.c
 NXP i.MX CLOCK DRIVERS
-M:	Abel Vesa <abel.vesa@nxp.com>
+M:	Abel Vesa <abelvesa@kernel.org>
 L:	linux-clk@vger.kernel.org
 L:	linux-imx@nxp.com
 S:	Maintained
 OPENCOMPUTE PTP CLOCK DRIVER
 M:	Jonathan Lemon <jonathan.lemon@gmail.com>
+M:	Vadim Fedorenko <vadfed@fb.com>
 L:	netdev@vger.kernel.org
 S:	Maintained
 F:	drivers/ptp/ptp_ocp.c
 F:	drivers/cpufreq/qcom-cpufreq-nvmem.c
 QUALCOMM CRYPTO DRIVERS
-M:	Thara Gopinath <thara.gopinath@linaro.org>
+M:	Thara Gopinath <thara.gopinath@gmail.com>
 L:	linux-crypto@vger.kernel.org
 L:	linux-arm-msm@vger.kernel.org
 S:	Maintained
 QUALCOMM IOMMU
 M:	Rob Clark <robdclark@gmail.com>
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 L:	linux-arm-msm@vger.kernel.org
 S:	Maintained
 F:	drivers/iommu/arm/arm-smmu/qcom_iommu.c
 QUALCOMM TSENS THERMAL DRIVER
 M:	Amit Kucheria <amitk@kernel.org>
-M:	Thara Gopinath <thara.gopinath@linaro.org>
+M:	Thara Gopinath <thara.gopinath@gmail.com>
 L:	linux-pm@vger.kernel.org
 L:	linux-arm-msm@vger.kernel.org
 S:	Maintained
 SWIOTLB SUBSYSTEM
 M:	Christoph Hellwig <hch@infradead.org>
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 S:	Supported
 W:	http://git.infradead.org/users/hch/dma-mapping.git
 T:	git git://git.infradead.org/users/hch/dma-mapping.git
 R:	Mika Westerberg <mika.westerberg@linux.intel.com>
 R:	Jan Dabros <jsd@semihalf.com>
 L:	linux-i2c@vger.kernel.org
-S:	Maintained
+S:	Supported
 F:	drivers/i2c/busses/i2c-designware-*
 SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
 F:	Documentation/devicetree/bindings/usb/
 F:	Documentation/usb/
 F:	drivers/usb/
+F:	include/dt-bindings/usb/
 F:	include/linux/usb.h
 F:	include/linux/usb/
 M:	Stefano Stabellini <sstabellini@kernel.org>
 L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)
 L:	iommu@lists.linux-foundation.org
+L:	iommu@lists.linux.dev
 S:	Supported
 F:	arch/x86/xen/*swiotlb*
 F:	drivers/xen/*swiotlb*

Makefile+2−2

@@ -2,7 +2,7 @@ · 1 unmodified line
2	VERSION = 5	2	VERSION = 5
3	PATCHLEVEL = 19	3	PATCHLEVEL = 19
4	SUBLEVEL = 0	4	SUBLEVEL = 0
5	EXTRAVERSION = -rc2	5	EXTRAVERSION = -rc4
6	NAME = Superb Owl	6	NAME = Superb Owl
7		7
8	# DOCUMENTATION	8	# DOCUMENTATION
@@ -1141,7 +1141,7 @@ KBUILD_MODULES := 1 · 1132 unmodified lines
1141		1141
1142	autoksyms_recursive: descend modules.order	1142	autoksyms_recursive: descend modules.order
1143	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \	1143	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
1144	"$(MAKE) -f $(srctree)/Makefile vmlinux"	1144	"$(MAKE) -f $(srctree)/Makefile autoksyms_recursive"
1145	endif	1145	endif
1146		1146
1147	autoksyms_h := $(if $(CONFIG_TRIM_UNUSED_KSYMS), include/generated/autoksyms.h)	1147	autoksyms_h := $(if $(CONFIG_TRIM_UNUSED_KSYMS), include/generated/autoksyms.h)

arch/arm/boot/dts/Makefile+1−1

 	aspeed-bmc-lenovo-hr630.dtb \
 	aspeed-bmc-lenovo-hr855xg2.dtb \
 	aspeed-bmc-microsoft-olympus.dtb \
-	aspeed-bmc-nuvia-dc-scm.dtb \
 	aspeed-bmc-opp-lanyang.dtb \
 	aspeed-bmc-opp-mihawk.dtb \
 	aspeed-bmc-opp-mowgli.dtb \
 	aspeed-bmc-opp-witherspoon.dtb \
 	aspeed-bmc-opp-zaius.dtb \
 	aspeed-bmc-portwell-neptune.dtb \
+	aspeed-bmc-qcom-dc-scm-v1.dtb \
 	aspeed-bmc-quanta-q71l.dtb \
 	aspeed-bmc-quanta-s6q.dtb \
 	aspeed-bmc-supermicro-x11spi.dtb \

arch/arm/boot/dts/aspeed-bmc-qcom-dc-scm-v1.dtsrenamed from arch/arm/boot/dts/aspeed-bmc-nuvia-dc-scm.dts+2−2

@@ -6,8 +6,8 @@ · 5 unmodified lines
6	#include "aspeed-g6.dtsi"	6	#include "aspeed-g6.dtsi"
7		7
8	/ {	8	/ {
9	model = "Nuvia DC-SCM BMC";	9	model = "Qualcomm DC-SCM V1 BMC";
10	compatible = "nuvia,dc-scm-bmc", "aspeed,ast2600";	10	compatible = "qcom,dc-scm-v1-bmc", "aspeed,ast2600";
11		11
12	aliases {	12	aliases {
13	serial4 = &uart5;	13	serial4 = &uart5;

arch/arm/boot/dts/at91-sama5d3_ksz9477_evb.dts+5−0

 			port@0 {
 				reg = <0>;
 				label = "lan1";
+				phy-mode = "internal";
 			};
 			port@1 {
 				reg = <1>;
 				label = "lan2";
+				phy-mode = "internal";
 			};
 			port@2 {
 				reg = <2>;
 				label = "lan3";
+				phy-mode = "internal";
 			};
 			port@3 {
 				reg = <3>;
 				label = "lan4";
+				phy-mode = "internal";
 			};
 			port@4 {
 				reg = <4>;
 				label = "lan5";
+				phy-mode = "internal";
 			};
 			port@5 {

arch/arm/boot/dts/bcm2711-rpi-400.dts+3−3

@@ -28,12 +28,12 @@ · 27 unmodified lines
28	&expgpio {	28	&expgpio {
29	gpio-line-names = "BT_ON",	29	gpio-line-names = "BT_ON",
30	"WL_ON",	30	"WL_ON",
31	"",	31	"PWR_LED_OFF",
32	"GLOBAL_RESET",	32	"GLOBAL_RESET",
33	"VDD_SD_IO_SEL",	33	"VDD_SD_IO_SEL",
34	"CAM_GPIO",	34	"GLOBAL_SHUTDOWN",
35	"SD_PWR_ON",	35	"SD_PWR_ON",
36	"SD_OC_N";	36	"SHUTDOWN_REQUEST";
37	};	37	};
38		38
39	&genet_mdio {	39	&genet_mdio {

arch/arm/boot/dts/imx6qdl-colibri.dtsi+1−1

@@ -593,7 +593,7 @@ · 592 unmodified lines
593	pinctrl-names = "default";	593	pinctrl-names = "default";
594	pinctrl-0 = <&pinctrl_atmel_conn>;	594	pinctrl-0 = <&pinctrl_atmel_conn>;
595	reg = <0x4a>;	595	reg = <0x4a>;
596	reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */	596	reset-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* SODIMM 106 */
597	status = "disabled";	597	status = "disabled";
598	};	598	};
599	};	599	};

arch/arm/boot/dts/imx6qdl.dtsi+1−1

@@ -762,7 +762,7 @@ · 761 unmodified lines
762	regulator-name = "vddpu";	762	regulator-name = "vddpu";
763	regulator-min-microvolt = <725000>;	763	regulator-min-microvolt = <725000>;
764	regulator-max-microvolt = <1450000>;	764	regulator-max-microvolt = <1450000>;
765	regulator-enable-ramp-delay = <150>;	765	regulator-enable-ramp-delay = <380>;
766	anatop-reg-offset = <0x140>;	766	anatop-reg-offset = <0x140>;
767	anatop-vol-bit-shift = <9>;	767	anatop-vol-bit-shift = <9>;
768	anatop-vol-bit-width = <5>;	768	anatop-vol-bit-width = <5>;

arch/arm/boot/dts/imx7s.dtsi+1−1

 		compatible = "usb-nop-xceiv";
 		clocks = <&clks IMX7D_USB_HSIC_ROOT_CLK>;
 		clock-names = "main_clk";
+		power-domains = <&pgc_hsic_phy>;
 		#phy-cells = <0>;
 	};
 				compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
 				reg = <0x30b30000 0x200>;
 				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
-				power-domains = <&pgc_hsic_phy>;
 				clocks = <&clks IMX7D_USB_CTRL_CLK>;
 				fsl,usbphy = <&usbphynop3>;
 				fsl,usbmisc = <&usbmisc3 0>;

arch/arm/boot/dts/stm32mp15-scmi.dtsi+47−0

@@ -0,0 +1,47 @@
	1	// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
	2	/*
	3	* Copyright (C) STMicroelectronics 2022 - All Rights Reserved
	4	* Author: Alexandre Torgue <alexandre.torgue@foss.st.com> for STMicroelectronics.
	5	*/
	6
	7	/ {
	8	firmware {
	9	optee: optee {
	10	compatible = "linaro,optee-tz";
	11	method = "smc";
	12	};
	13
	14	scmi: scmi {
	15	compatible = "linaro,scmi-optee";
	16	#address-cells = <1>;
	17	#size-cells = <0>;
	18	linaro,optee-channel-id = <0>;
	19	shmem = <&scmi_shm>;
	20
	21	scmi_clk: protocol@14 {
	22	reg = <0x14>;
	23	#clock-cells = <1>;
	24	};
	25
	26	scmi_reset: protocol@16 {
	27	reg = <0x16>;
	28	#reset-cells = <1>;
	29	};
	30	};
	31	};
	32
	33	soc {
	34	scmi_sram: sram@2ffff000 {
	35	compatible = "mmio-sram";
	36	reg = <0x2ffff000 0x1000>;
	37	#address-cells = <1>;
	38	#size-cells = <1>;
	39	ranges = <0 0x2ffff000 0x1000>;
	40
	41	scmi_shm: scmi-sram@0 {
	42	compatible = "arm,scmi-shmem";
	43	reg = <0 0x80>;
	44	};
	45	};
	46	};
	47	};

arch/arm/boot/dts/stm32mp151.dtsi+0−41

@@ -115,33 +115,6 @@ · 114 unmodified lines
115	status = "disabled";	115	status = "disabled";
116	};	116	};
117		117
118	firmware {
119	optee: optee {
120	compatible = "linaro,optee-tz";
121	method = "smc";
122	status = "disabled";
123	};
124
125	scmi: scmi {
126	compatible = "linaro,scmi-optee";
127	#address-cells = <1>;
128	#size-cells = <0>;
129	linaro,optee-channel-id = <0>;
130	shmem = <&scmi_shm>;
131	status = "disabled";
132
133	scmi_clk: protocol@14 {
134	reg = <0x14>;
135	#clock-cells = <1>;
136	};
137
138	scmi_reset: protocol@16 {
139	reg = <0x16>;
140	#reset-cells = <1>;
141	};
142	};
143	};
144
145	soc {	118	soc {
146	compatible = "simple-bus";	119	compatible = "simple-bus";
147	#address-cells = <1>;	120	#address-cells = <1>;
@@ -149,20 +122,6 @@ · 1 unmodified line
149	interrupt-parent = <&intc>;	122	interrupt-parent = <&intc>;
150	ranges;	123	ranges;
151		124
152	scmi_sram: sram@2ffff000 {
153	compatible = "mmio-sram";
154	reg = <0x2ffff000 0x1000>;
155	#address-cells = <1>;
156	#size-cells = <1>;
157	ranges = <0 0x2ffff000 0x1000>;
158
159	scmi_shm: scmi-sram@0 {
160	compatible = "arm,scmi-shmem";
161	reg = <0 0x80>;
162	status = "disabled";
163	};
164	};
165
166	timers2: timer@40000000 {	125	timers2: timer@40000000 {
167	#address-cells = <1>;	126	#address-cells = <1>;
168	#size-cells = <0>;	127	#size-cells = <0>;

arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts+1−12

 /dts-v1/;
 #include "stm32mp157a-dk1.dts"
+#include "stm32mp15-scmi.dtsi"
 / {
 	model = "STMicroelectronics STM32MP157A-DK1 SCMI Discovery Board";
 	resets = <&scmi_reset RST_SCMI_MCU>;
 };
-&optee {
-	status = "okay";
-};
 &rcc {
 	compatible = "st,stm32mp1-rcc-secure", "syscon";
 	clock-names = "hse", "hsi", "csi", "lse", "lsi";
 &rtc {
 	clocks = <&scmi_clk CK_SCMI_RTCAPB>, <&scmi_clk CK_SCMI_RTC>;
 };
-&scmi {
-	status = "okay";
-};
-&scmi_shm {
-	status = "okay";
-};

arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts+1−12

 /dts-v1/;
 #include "stm32mp157c-dk2.dts"
+#include "stm32mp15-scmi.dtsi"
 / {
 	model = "STMicroelectronics STM32MP157C-DK2 SCMI Discovery Board";
 	resets = <&scmi_reset RST_SCMI_MCU>;
 };
-&optee {
-	status = "okay";
-};
 &rcc {
 	compatible = "st,stm32mp1-rcc-secure", "syscon";
 	clock-names = "hse", "hsi", "csi", "lse", "lsi";
 &rtc {
 	clocks = <&scmi_clk CK_SCMI_RTCAPB>, <&scmi_clk CK_SCMI_RTC>;
 };
-&scmi {
-	status = "okay";
-};
-&scmi_shm {
-	status = "okay";
-};

arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts+1−12

 /dts-v1/;
 #include "stm32mp157c-ed1.dts"
+#include "stm32mp15-scmi.dtsi"
 / {
 	model = "STMicroelectronics STM32MP157C-ED1 SCMI eval daughter";
 	resets = <&scmi_reset RST_SCMI_MCU>;
 };
-&optee {
-	status = "okay";
-};
 &rcc {
 	compatible = "st,stm32mp1-rcc-secure", "syscon";
 	clock-names = "hse", "hsi", "csi", "lse", "lsi";
 &rtc {
 	clocks = <&scmi_clk CK_SCMI_RTCAPB>, <&scmi_clk CK_SCMI_RTC>;
 };
-&scmi {
-	status = "okay";
-};
-&scmi_shm {
-	status = "okay";
-};

arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts+1−12

 /dts-v1/;
 #include "stm32mp157c-ev1.dts"
+#include "stm32mp15-scmi.dtsi"
 / {
 	model = "STMicroelectronics STM32MP157C-EV1 SCMI eval daughter on eval mother";
 	resets = <&scmi_reset RST_SCMI_MCU>;
 };
-&optee {
-	status = "okay";
-};
 &rcc {
 	compatible = "st,stm32mp1-rcc-secure", "syscon";
 	clock-names = "hse", "hsi", "csi", "lse", "lsi";
 &rtc {
 	clocks = <&scmi_clk CK_SCMI_RTCAPB>, <&scmi_clk CK_SCMI_RTC>;
 };
-&scmi {
-	status = "okay";
-};
-&scmi_shm {
-	status = "okay";
-};

arch/arm/mach-axxia/platsmp.c+1−0

@@ -39,6 +39,7 @@ static int axxia_boot_secondary(unsigned int cpu, struct task_struct *idle) · 38 unmodified lines
39	return -ENOENT;	39	return -ENOENT;
40		40
41	syscon = of_iomap(syscon_np, 0);	41	syscon = of_iomap(syscon_np, 0);
		42	of_node_put(syscon_np);
42	if (!syscon)	43	if (!syscon)
43	return -ENOMEM;	44	return -ENOMEM;
44		45

arch/arm/mach-cns3xxx/core.c+2−0

 		/* De-Asscer SATA Reset */
 		cns3xxx_pwr_soft_rst(CNS3XXX_PWR_SOFTWARE_RST(SATA));
 	}
+	of_node_put(dn);
 	dn = of_find_compatible_node(NULL, NULL, "cavium,cns3420-sdhci");
 	if (of_device_is_available(dn)) {
 		cns3xxx_pwr_clk_en(CNS3XXX_PWR_CLK_EN(SDIO));
 		cns3xxx_pwr_soft_rst(CNS3XXX_PWR_SOFTWARE_RST(SDIO));
 	}
+	of_node_put(dn);
 	pm_power_off = cns3xxx_power_off;

arch/arm/mach-exynos/exynos.c+1−0

@@ -149,6 +149,7 @@ static void exynos_map_pmu(void) · 148 unmodified lines
149	np = of_find_matching_node(NULL, exynos_dt_pmu_match);	149	np = of_find_matching_node(NULL, exynos_dt_pmu_match);
150	if (np)	150	if (np)
151	pmu_base_addr = of_iomap(np, 0);	151	pmu_base_addr = of_iomap(np, 0);
		152	of_node_put(np);
152	}	153	}
153		154
154	static void __init exynos_init_irq(void)	155	static void __init exynos_init_irq(void)

arch/arm/mach-spear/time.c+6−2

 	irq = irq_of_parse_and_map(np, 0);
 	if (!irq) {
 		pr_err("%s: No irq passed for timer via DT\n", __func__);
-		return;
+		goto err_put_np;
 	}
 	gpt_base = of_iomap(np, 0);
 	if (!gpt_base) {
 		pr_err("%s: of iomap failed\n", __func__);
-		return;
+		goto err_put_np;
 	}
 	gpt_clk = clk_get_sys("gpt0", NULL);
 		goto err_prepare_enable_clk;
 	}
+	of_node_put(np);
 	spear_clockevent_init(irq);
 	spear_clocksource_init();
 	clk_put(gpt_clk);
 err_iomap:
 	iounmap(gpt_base);
+err_put_np:
+	of_node_put(np);
 }

arch/arm64/boot/dts/exynos/exynos7885.dtsi+6−6

@@ -280,8 +280,8 @@ · 279 unmodified lines
280	interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;	280	interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
281	pinctrl-names = "default";	281	pinctrl-names = "default";
282	pinctrl-0 = <&uart0_bus>;	282	pinctrl-0 = <&uart0_bus>;
283	clocks = <&cmu_peri CLK_GOUT_UART0_EXT_UCLK>,	283	clocks = <&cmu_peri CLK_GOUT_UART0_PCLK>,
284	<&cmu_peri CLK_GOUT_UART0_PCLK>;	284	<&cmu_peri CLK_GOUT_UART0_EXT_UCLK>;
285	clock-names = "uart", "clk_uart_baud0";	285	clock-names = "uart", "clk_uart_baud0";
286	samsung,uart-fifosize = <64>;	286	samsung,uart-fifosize = <64>;
287	status = "disabled";	287	status = "disabled";
@@ -293,8 +293,8 @@ · 5 unmodified lines
293	interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;	293	interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
294	pinctrl-names = "default";	294	pinctrl-names = "default";
295	pinctrl-0 = <&uart1_bus>;	295	pinctrl-0 = <&uart1_bus>;
296	clocks = <&cmu_peri CLK_GOUT_UART1_EXT_UCLK>,	296	clocks = <&cmu_peri CLK_GOUT_UART1_PCLK>,
297	<&cmu_peri CLK_GOUT_UART1_PCLK>;	297	<&cmu_peri CLK_GOUT_UART1_EXT_UCLK>;
298	clock-names = "uart", "clk_uart_baud0";	298	clock-names = "uart", "clk_uart_baud0";
299	samsung,uart-fifosize = <256>;	299	samsung,uart-fifosize = <256>;
300	status = "disabled";	300	status = "disabled";
@@ -306,8 +306,8 @@ · 5 unmodified lines
306	interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>;	306	interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>;
307	pinctrl-names = "default";	307	pinctrl-names = "default";
308	pinctrl-0 = <&uart2_bus>;	308	pinctrl-0 = <&uart2_bus>;
309	clocks = <&cmu_peri CLK_GOUT_UART2_EXT_UCLK>,	309	clocks = <&cmu_peri CLK_GOUT_UART2_PCLK>,
310	<&cmu_peri CLK_GOUT_UART2_PCLK>;	310	<&cmu_peri CLK_GOUT_UART2_EXT_UCLK>;
311	clock-names = "uart", "clk_uart_baud0";	311	clock-names = "uart", "clk_uart_baud0";
312	samsung,uart-fifosize = <256>;	312	samsung,uart-fifosize = <256>;
313	status = "disabled";	313	status = "disabled";

arch/arm64/boot/dts/freescale/s32g2.dtsi+1−1

@@ -79,7 +79,7 @@ · 78 unmodified lines
79	};	79	};
80	};	80	};
81		81
82	soc {	82	soc@0 {
83	compatible = "simple-bus";	83	compatible = "simple-bus";
84	#address-cells = <1>;	84	#address-cells = <1>;
85	#size-cells = <1>;	85	#size-cells = <1>;

arch/arm64/boot/dts/ti/k3-am64-main.dtsi+0−2

 		clock-names = "clk_ahb", "clk_xin";
 		mmc-ddr-1_8v;
 		mmc-hs200-1_8v;
-		mmc-hs400-1_8v;
 		ti,trm-icp = <0x2>;
 		ti,otap-del-sel-legacy = <0x0>;
 		ti,otap-del-sel-mmc-hs = <0x0>;
 		ti,otap-del-sel-ddr52 = <0x6>;
 		ti,otap-del-sel-hs200 = <0x7>;
-		ti,otap-del-sel-hs400 = <0x4>;
 	};
 	sdhci1: mmc@fa00000 {

arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi+1−1

@@ -33,7 +33,7 @@ · 32 unmodified lines
33	ranges;	33	ranges;
34	#interrupt-cells = <3>;	34	#interrupt-cells = <3>;
35	interrupt-controller;	35	interrupt-controller;
36	reg = <0x00 0x01800000 0x00 0x200000>, /* GICD */	36	reg = <0x00 0x01800000 0x00 0x100000>, /* GICD */
37	<0x00 0x01900000 0x00 0x100000>, /* GICR */	37	<0x00 0x01900000 0x00 0x100000>, /* GICR */
38	<0x00 0x6f000000 0x00 0x2000>, /* GICC */	38	<0x00 0x6f000000 0x00 0x2000>, /* GICC */
39	<0x00 0x6f010000 0x00 0x1000>, /* GICH */	39	<0x00 0x6f010000 0x00 0x1000>, /* GICH */

arch/arm64/include/asm/kvm_host.h+0−5

 	struct arch_timer_cpu timer_cpu;
 	struct kvm_pmu pmu;
-	/*
-	 * Anything that is not used directly from assembly code goes
-	 * here.
-	 */
 	/*
 	 * Guest registers we preserve during guest debugging.
 	 *

arch/arm64/include/asm/virt.h+3−0

 	/*
 	 * Code only run in VHE/NVHE hyp context can assume VHE is present or
 	 * absent. Otherwise fall back to caps.
+	 * This allows the compiler to discard VHE-specific code from the
+	 * nVHE object, reducing the number of external symbol references
+	 * needed to link.
 	 */
 	if (is_vhe_hyp_code())
 		return true;

arch/arm64/kernel/cpufeature.c+1−10

 #ifdef CONFIG_KVM
 static bool is_kvm_protected_mode(const struct arm64_cpu_capabilities *entry, int __unused)
 {
-	if (kvm_get_mode() != KVM_MODE_PROTECTED)
+	return kvm_get_mode() == KVM_MODE_PROTECTED;
-		return false;
-	if (is_kernel_in_hyp_mode()) {
-		pr_warn("Protected KVM not available with VHE\n");
-		return false;
-	}
-	return true;
 }
 #endif /* CONFIG_KVM */
 	WARN_ON(num >= MAX_CPU_FEATURES);
 	elf_hwcap |= BIT(num);
 }
-EXPORT_SYMBOL_GPL(cpu_set_feature);
 bool cpu_have_feature(unsigned int num)
 {

arch/arm64/kernel/entry-ftrace.S+0−1

@@ -102,7 +102,6 @@ SYM_INNER_LABEL(ftrace_call, SYM_L_GLOBAL) · 101 unmodified lines
102	* x19-x29 per the AAPCS, and we created frame records upon entry, so we need	102	* x19-x29 per the AAPCS, and we created frame records upon entry, so we need
103	* to restore x0-x8, x29, and x30.	103	* to restore x0-x8, x29, and x30.
104	*/	104	*/
105	ftrace_common_return:
106	/* Restore function arguments */	105	/* Restore function arguments */
107	ldp x0, x1, [sp]	106	ldp x0, x1, [sp]
108	ldp x2, x3, [sp, #S_X2]	107	ldp x2, x3, [sp, #S_X2]

arch/arm64/kernel/ftrace.c+66−71

 }
 /*
- * Turn on the call to ftrace_caller() in instrumented function
+ * Find the address the callsite must branch to in order to reach '*addr'.
+ *
+ * Due to the limited range of 'BL' instructions, modules may be placed too far
+ * away to branch directly and must use a PLT.
+ *
+ * Returns true when '*addr' contains a reachable target address, or has been
+ * modified to contain a PLT address. Returns false otherwise.
  */
-int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
+static bool ftrace_find_callable_addr(struct dyn_ftrace *rec,
+				      struct module *mod,
+				      unsigned long *addr)
 {
 	unsigned long pc = rec->ip;
-	u32 old, new;
+	long offset = (long)*addr - (long)pc;
-	long offset = (long)pc - (long)addr;
+	struct plt_entry *plt;
-	if (offset < -SZ_128M || offset >= SZ_128M) {
+	/*
-		struct module *mod;
+	 * When the target is within range of the 'BL' instruction, use 'addr'
-		struct plt_entry *plt;
+	 * as-is and branch to that directly.
+	 */
+	if (offset >= -SZ_128M && offset < SZ_128M)
+		return true;
-		if (!IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))
+	/*
-			return -EINVAL;
+	 * When the target is outside of the range of a 'BL' instruction, we
+	 * must use a PLT to reach it. We can only place PLTs for modules, and
+	 * only when module PLT support is built-in.
+	 */
+	if (!IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))
+		return false;
-		/*
+	/*
-		 * On kernels that support module PLTs, the offset between the
+	 * 'mod' is only set at module load time, but if we end up
-		 * branch instruction and its target may legally exceed the
+	 * dealing with an out-of-range condition, we can assume it
-		 * range of an ordinary relative 'bl' opcode. In this case, we
+	 * is due to a module being loaded far away from the kernel.
-		 * need to branch via a trampoline in the module.
+	 *
-		 *
+	 * NOTE: __module_text_address() must be called with preemption
-		 * NOTE: __module_text_address() must be called with preemption
+	 * disabled, but we can rely on ftrace_lock to ensure that 'mod'
-		 * disabled, but we can rely on ftrace_lock to ensure that 'mod'
+	 * retains its validity throughout the remainder of this code.
-		 * retains its validity throughout the remainder of this code.
+	 */
-		 */
+	if (!mod) {
 		preempt_disable();
 		mod = __module_text_address(pc);
 		preempt_enable();
+	}
-		if (WARN_ON(!mod))
+	if (WARN_ON(!mod))
-			return -EINVAL;
+		return false;
-		plt = get_ftrace_plt(mod, addr);
+	plt = get_ftrace_plt(mod, *addr);
-		if (!plt) {
+	if (!plt) {
-			pr_err("ftrace: no module PLT for %ps\n", (void *)addr);
+		pr_err("ftrace: no module PLT for %ps\n", (void *)*addr);
-			return -EINVAL;
+		return false;
-		}
-		addr = (unsigned long)plt;
 	}
+	*addr = (unsigned long)plt;
+	return true;
+}
+/*
+ * Turn on the call to ftrace_caller() in instrumented function
+ */
+int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
+{
+	unsigned long pc = rec->ip;
+	u32 old, new;
+	if (!ftrace_find_callable_addr(rec, NULL, &addr))
+		return -EINVAL;
 	old = aarch64_insn_gen_nop();
 	new = aarch64_insn_gen_branch_imm(pc, addr, AARCH64_INSN_BRANCH_LINK);
 	unsigned long pc = rec->ip;
 	u32 old, new;
+	if (!ftrace_find_callable_addr(rec, NULL, &old_addr))
+		return -EINVAL;
+	if (!ftrace_find_callable_addr(rec, NULL, &addr))
+		return -EINVAL;
 	old = aarch64_insn_gen_branch_imm(pc, old_addr,
 					  AARCH64_INSN_BRANCH_LINK);
 	new = aarch64_insn_gen_branch_imm(pc, addr, AARCH64_INSN_BRANCH_LINK);
 		    unsigned long addr)
 {
 	unsigned long pc = rec->ip;
-	bool validate = true;
 	u32 old = 0, new;
-	long offset = (long)pc - (long)addr;
-	if (offset < -SZ_128M || offset >= SZ_128M) {
+	if (!ftrace_find_callable_addr(rec, mod, &addr))
-		u32 replaced;
+		return -EINVAL;
-		if (!IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))
-			return -EINVAL;
-		/*
-		 * 'mod' is only set at module load time, but if we end up
-		 * dealing with an out-of-range condition, we can assume it
-		 * is due to a module being loaded far away from the kernel.
-		 */
-		if (!mod) {
-			preempt_disable();
-			mod = __module_text_address(pc);
-			preempt_enable();
-			if (WARN_ON(!mod))
-				return -EINVAL;
-		}
-		/*
-		 * The instruction we are about to patch may be a branch and
-		 * link instruction that was redirected via a PLT entry. In
-		 * this case, the normal validation will fail, but we can at
-		 * least check that we are dealing with a branch and link
-		 * instruction that points into the right module.
-		 */
-		if (aarch64_insn_read((void *)pc, &replaced))
-			return -EFAULT;
-		if (!aarch64_insn_is_bl(replaced) ||
-		    !within_module(pc + aarch64_get_branch_offset(replaced),
-				   mod))
-			return -EINVAL;
-		validate = false;
-	} else {
-		old = aarch64_insn_gen_branch_imm(pc, addr,
-						  AARCH64_INSN_BRANCH_LINK);
-	}
+	old = aarch64_insn_gen_branch_imm(pc, addr, AARCH64_INSN_BRANCH_LINK);
 	new = aarch64_insn_gen_nop();
-	return ftrace_modify_code(pc, old, new, validate);
+	return ftrace_modify_code(pc, old, new, true);
 }
 void arch_ftrace_update_code(int command)

arch/arm64/kernel/setup.c+3−4

 	early_fixmap_init();
 	early_ioremap_init();
+	setup_machine_fdt(__fdt_pointer);
 	/*
 	 * Initialise the static keys early as they may be enabled by the
-	 * cpufeature code, early parameters, and DT setup.
+	 * cpufeature code and early parameters.
 	 */
 	jump_label_init();
-	setup_machine_fdt(__fdt_pointer);
 	parse_early_param();
 	/*

arch/arm64/kvm/arch_timer.c+3−0

@@ -1230,6 +1230,9 @@ bool kvm_arch_timer_get_input_level(int vintid) · 1229 unmodified lines
1230	struct kvm_vcpu *vcpu = kvm_get_running_vcpu();	1230	struct kvm_vcpu *vcpu = kvm_get_running_vcpu();
1231	struct arch_timer_context *timer;	1231	struct arch_timer_context *timer;
1232		1232
		1233	if (WARN(!vcpu, "No vcpu context!\n"))
		1234	return false;
		1235
1233	if (vintid == vcpu_vtimer(vcpu)->irq.irq)	1236	if (vintid == vcpu_vtimer(vcpu)->irq.irq)
1234	timer = vcpu_vtimer(vcpu);	1237	timer = vcpu_vtimer(vcpu);
1235	else if (vintid == vcpu_ptimer(vcpu)->irq.irq)	1238	else if (vintid == vcpu_ptimer(vcpu)->irq.irq)

arch/arm64/kvm/arm.c+11−5

 	if (ret)
 		goto out_free_stage2_pgd;
-	if (!zalloc_cpumask_var(&kvm->arch.supported_cpus, GFP_KERNEL))
+	if (!zalloc_cpumask_var(&kvm->arch.supported_cpus, GFP_KERNEL)) {
+		ret = -ENOMEM;
 		goto out_free_stage2_pgd;
+	}
 	cpumask_copy(kvm->arch.supported_cpus, cpu_possible_mask);
 	kvm_vgic_early_init(kvm);
 		return 0;
 	/*
-	 * Exclude HYP BSS from kmemleak so that it doesn't get peeked
+	 * Exclude HYP sections from kmemleak so that they don't get peeked
-	 * at, which would end badly once the section is inaccessible.
+	 * at, which would end badly once inaccessible.
-	 * None of other sections should ever be introspected.
 	 */
 	kmemleak_free_part(__hyp_bss_start, __hyp_bss_end - __hyp_bss_start);
+	kmemleak_free_part(__va(hyp_mem_base), hyp_mem_size);
 	return pkvm_drop_host_privileges();
 }
 		return -EINVAL;
 	if (strcmp(arg, "protected") == 0) {
-		kvm_mode = KVM_MODE_PROTECTED;
+		if (!is_kernel_in_hyp_mode())
+			kvm_mode = KVM_MODE_PROTECTED;
+		else
+			pr_warn_once("Protected KVM not available with VHE\n");
 		return 0;
 	}

arch/arm64/kvm/fpsimd.c+2−0

 	vcpu->arch.flags &= ~KVM_ARM64_FP_ENABLED;
 	vcpu->arch.flags |= KVM_ARM64_FP_HOST;
+	vcpu->arch.flags &= ~KVM_ARM64_HOST_SVE_ENABLED;
 	if (read_sysreg(cpacr_el1) & CPACR_EL1_ZEN_EL0EN)
 		vcpu->arch.flags |= KVM_ARM64_HOST_SVE_ENABLED;
 	 * operations. Do this for ZA as well for now for simplicity.
 	 */
 	if (system_supports_sme()) {
+		vcpu->arch.flags &= ~KVM_ARM64_HOST_SME_ENABLED;
 		if (read_sysreg(cpacr_el1) & CPACR_EL1_SMEN_EL0EN)
 			vcpu->arch.flags |= KVM_ARM64_HOST_SME_ENABLED;

arch/arm64/kvm/hyp/nvhe/mem_protect.c+0−4

 int host_stage2_idmap_locked(phys_addr_t addr, u64 size,
 			     enum kvm_pgtable_prot prot)
 {
-	hyp_assert_lock_held(&host_kvm.lock);
 	return host_stage2_try(__host_stage2_idmap, addr, addr + size, prot);
 }
 int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id)
 {
-	hyp_assert_lock_held(&host_kvm.lock);
 	return host_stage2_try(kvm_pgtable_stage2_set_owner, &host_kvm.pgt,
 			       addr, size, &host_s2_pool, owner_id);
 }

arch/arm64/kvm/hyp/nvhe/sys_regs.c+34−8

 	case SYS_ID_AA64MMFR2_EL1:
 		return get_pvm_id_aa64mmfr2(vcpu);
 	default:
-		/*
+		/* Unhandled ID register, RAZ */
-		 * Should never happen because all cases are covered in
+		return 0;
-		 * pvm_sys_reg_descs[].
-		 */
-		WARN_ON(1);
-		break;
 	}
-	return 0;
 }
 static u64 read_id_reg(const struct kvm_vcpu *vcpu,
 /* Mark the specified system register as an AArch64 feature id register. */
 #define AARCH64(REG) { SYS_DESC(REG), .access = pvm_access_id_aarch64 }
+/*
+ * sys_reg_desc initialiser for architecturally unallocated cpufeature ID
+ * register with encoding Op0=3, Op1=0, CRn=0, CRm=crm, Op2=op2
+ * (1 <= crm < 8, 0 <= Op2 < 8).
+ */
+#define ID_UNALLOCATED(crm, op2) {			\
+	Op0(3), Op1(0), CRn(0), CRm(crm), Op2(op2),	\
+	.access = pvm_access_id_aarch64,		\
+}
 /* Mark the specified system register as Read-As-Zero/Write-Ignored */
 #define RAZ_WI(REG) { SYS_DESC(REG), .access = pvm_access_raz_wi }
 	AARCH32(SYS_MVFR0_EL1),
 	AARCH32(SYS_MVFR1_EL1),
 	AARCH32(SYS_MVFR2_EL1),
+	ID_UNALLOCATED(3,3),
 	AARCH32(SYS_ID_PFR2_EL1),
 	AARCH32(SYS_ID_DFR1_EL1),
 	AARCH32(SYS_ID_MMFR5_EL1),
+	ID_UNALLOCATED(3,7),
 	/* AArch64 ID registers */
 	/* CRm=4 */
 	AARCH64(SYS_ID_AA64PFR0_EL1),
 	AARCH64(SYS_ID_AA64PFR1_EL1),
+	ID_UNALLOCATED(4,2),
+	ID_UNALLOCATED(4,3),
 	AARCH64(SYS_ID_AA64ZFR0_EL1),
+	ID_UNALLOCATED(4,5),
+	ID_UNALLOCATED(4,6),
+	ID_UNALLOCATED(4,7),
 	AARCH64(SYS_ID_AA64DFR0_EL1),
 	AARCH64(SYS_ID_AA64DFR1_EL1),
+	ID_UNALLOCATED(5,2),
+	ID_UNALLOCATED(5,3),
 	AARCH64(SYS_ID_AA64AFR0_EL1),
 	AARCH64(SYS_ID_AA64AFR1_EL1),
+	ID_UNALLOCATED(5,6),
+	ID_UNALLOCATED(5,7),
 	AARCH64(SYS_ID_AA64ISAR0_EL1),
 	AARCH64(SYS_ID_AA64ISAR1_EL1),
+	AARCH64(SYS_ID_AA64ISAR2_EL1),
+	ID_UNALLOCATED(6,3),
+	ID_UNALLOCATED(6,4),
+	ID_UNALLOCATED(6,5),
+	ID_UNALLOCATED(6,6),
+	ID_UNALLOCATED(6,7),
 	AARCH64(SYS_ID_AA64MMFR0_EL1),
 	AARCH64(SYS_ID_AA64MMFR1_EL1),
 	AARCH64(SYS_ID_AA64MMFR2_EL1),
+	ID_UNALLOCATED(7,3),
+	ID_UNALLOCATED(7,4),
+	ID_UNALLOCATED(7,5),
+	ID_UNALLOCATED(7,6),
+	ID_UNALLOCATED(7,7),
 	/* Scalable Vector Registers are restricted. */

arch/arm64/kvm/vgic/vgic-mmio-v2.c+2−2

@@ -429,11 +429,11 @@ static const struct vgic_register_region vgic_v2_dist_registers[] = { · 428 unmodified lines
429	VGIC_ACCESS_32bit),	429	VGIC_ACCESS_32bit),
430	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_SET,	430	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_SET,
431	vgic_mmio_read_pending, vgic_mmio_write_spending,	431	vgic_mmio_read_pending, vgic_mmio_write_spending,
432	NULL, vgic_uaccess_write_spending, 1,	432	vgic_uaccess_read_pending, vgic_uaccess_write_spending, 1,
433	VGIC_ACCESS_32bit),	433	VGIC_ACCESS_32bit),
434	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_CLEAR,	434	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_CLEAR,
435	vgic_mmio_read_pending, vgic_mmio_write_cpending,	435	vgic_mmio_read_pending, vgic_mmio_write_cpending,
436	NULL, vgic_uaccess_write_cpending, 1,	436	vgic_uaccess_read_pending, vgic_uaccess_write_cpending, 1,
437	VGIC_ACCESS_32bit),	437	VGIC_ACCESS_32bit),
438	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_ACTIVE_SET,	438	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_ACTIVE_SET,
439	vgic_mmio_read_active, vgic_mmio_write_sactive,	439	vgic_mmio_read_active, vgic_mmio_write_sactive,

arch/arm64/kvm/vgic/vgic-mmio-v3.c+2−38

@@ -353,42 +353,6 @@ static unsigned long vgic_mmio_read_v3_idregs(struct kvm_vcpu *vcpu, · 352 unmodified lines
353	return 0;	353	return 0;
354	}	354	}
355		355
356	static unsigned long vgic_v3_uaccess_read_pending(struct kvm_vcpu *vcpu,
357	gpa_t addr, unsigned int len)
358	{
359	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);
360	u32 value = 0;
361	int i;
362
363	/*
364	* pending state of interrupt is latched in pending_latch variable.
365	* Userspace will save and restore pending state and line_level
366	* separately.
367	* Refer to Documentation/virt/kvm/devices/arm-vgic-v3.rst
368	* for handling of ISPENDR and ICPENDR.
369	*/
370	for (i = 0; i < len * 8; i++) {
371	struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
372	bool state = irq->pending_latch;
373
374	if (irq->hw && vgic_irq_is_sgi(irq->intid)) {
375	int err;
376
377	err = irq_get_irqchip_state(irq->host_irq,
378	IRQCHIP_STATE_PENDING,
379	&state);
380	WARN_ON(err);
381	}
382
383	if (state)
384	value \|= (1U << i);
385
386	vgic_put_irq(vcpu->kvm, irq);
387	}
388
389	return value;
390	}
391
392	static int vgic_v3_uaccess_write_pending(struct kvm_vcpu *vcpu,	356	static int vgic_v3_uaccess_write_pending(struct kvm_vcpu *vcpu,
393	gpa_t addr, unsigned int len,	357	gpa_t addr, unsigned int len,
394	unsigned long val)	358	unsigned long val)
@@ -666,7 +630,7 @@ static const struct vgic_register_region vgic_v3_dist_registers[] = { · 271 unmodified lines
666	VGIC_ACCESS_32bit),	630	VGIC_ACCESS_32bit),
667	REGISTER_DESC_WITH_BITS_PER_IRQ_SHARED(GICD_ISPENDR,	631	REGISTER_DESC_WITH_BITS_PER_IRQ_SHARED(GICD_ISPENDR,
668	vgic_mmio_read_pending, vgic_mmio_write_spending,	632	vgic_mmio_read_pending, vgic_mmio_write_spending,
669	vgic_v3_uaccess_read_pending, vgic_v3_uaccess_write_pending, 1,	633	vgic_uaccess_read_pending, vgic_v3_uaccess_write_pending, 1,
670	VGIC_ACCESS_32bit),	634	VGIC_ACCESS_32bit),
671	REGISTER_DESC_WITH_BITS_PER_IRQ_SHARED(GICD_ICPENDR,	635	REGISTER_DESC_WITH_BITS_PER_IRQ_SHARED(GICD_ICPENDR,
672	vgic_mmio_read_pending, vgic_mmio_write_cpending,	636	vgic_mmio_read_pending, vgic_mmio_write_cpending,
@@ -750,7 +714,7 @@ static const struct vgic_register_region vgic_v3_rd_registers[] = { · 77 unmodified lines
750	VGIC_ACCESS_32bit),	714	VGIC_ACCESS_32bit),
751	REGISTER_DESC_WITH_LENGTH_UACCESS(SZ_64K + GICR_ISPENDR0,	715	REGISTER_DESC_WITH_LENGTH_UACCESS(SZ_64K + GICR_ISPENDR0,
752	vgic_mmio_read_pending, vgic_mmio_write_spending,	716	vgic_mmio_read_pending, vgic_mmio_write_spending,
753	vgic_v3_uaccess_read_pending, vgic_v3_uaccess_write_pending, 4,	717	vgic_uaccess_read_pending, vgic_v3_uaccess_write_pending, 4,
754	VGIC_ACCESS_32bit),	718	VGIC_ACCESS_32bit),
755	REGISTER_DESC_WITH_LENGTH_UACCESS(SZ_64K + GICR_ICPENDR0,	719	REGISTER_DESC_WITH_LENGTH_UACCESS(SZ_64K + GICR_ICPENDR0,
756	vgic_mmio_read_pending, vgic_mmio_write_cpending,	720	vgic_mmio_read_pending, vgic_mmio_write_cpending,

arch/arm64/kvm/vgic/vgic-mmio.c+36−4

@@ -226,8 +226,9 @@ int vgic_uaccess_write_cenable(struct kvm_vcpu *vcpu, · 225 unmodified lines
226	return 0;	226	return 0;
227	}	227	}
228		228
229	unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,	229	static unsigned long __read_pending(struct kvm_vcpu *vcpu,
230	gpa_t addr, unsigned int len)	230	gpa_t addr, unsigned int len,
		231	bool is_user)
231	{	232	{
232	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);	233	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);
233	u32 value = 0;	234	u32 value = 0;
@@ -239,6 +240,15 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, · 5 unmodified lines
239	unsigned long flags;	240	unsigned long flags;
240	bool val;	241	bool val;
241		242
		243	/*
		244	* When used from userspace with a GICv3 model:
		245	*
		246	* Pending state of interrupt is latched in pending_latch
		247	* variable. Userspace will save and restore pending state
		248	* and line_level separately.
		249	* Refer to Documentation/virt/kvm/devices/arm-vgic-v3.rst
		250	* for handling of ISPENDR and ICPENDR.
		251	*/
242	raw_spin_lock_irqsave(&irq->irq_lock, flags);	252	raw_spin_lock_irqsave(&irq->irq_lock, flags);
243	if (irq->hw && vgic_irq_is_sgi(irq->intid)) {	253	if (irq->hw && vgic_irq_is_sgi(irq->intid)) {
244	int err;	254	int err;
@@ -248,10 +258,20 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, · 3 unmodified lines
248	IRQCHIP_STATE_PENDING,	258	IRQCHIP_STATE_PENDING,
249	&val);	259	&val);
250	WARN_RATELIMIT(err, "IRQ %d", irq->host_irq);	260	WARN_RATELIMIT(err, "IRQ %d", irq->host_irq);
251	} else if (vgic_irq_is_mapped_level(irq)) {	261	} else if (!is_user && vgic_irq_is_mapped_level(irq)) {
252	val = vgic_get_phys_line_level(irq);	262	val = vgic_get_phys_line_level(irq);
253	} else {	263	} else {
254	val = irq_is_pending(irq);	264	switch (vcpu->kvm->arch.vgic.vgic_model) {
		265	case KVM_DEV_TYPE_ARM_VGIC_V3:
		266	if (is_user) {
		267	val = irq->pending_latch;
		268	break;
		269	}
		270	fallthrough;
		271	default:
		272	val = irq_is_pending(irq);
		273	break;
		274	}
255	}	275	}
256		276
257	value \|= ((u32)val << i);	277	value \|= ((u32)val << i);
@@ -263,6 +283,18 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, · 5 unmodified lines
263	return value;	283	return value;
264	}	284	}
265		285
		286	unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,
		287	gpa_t addr, unsigned int len)
		288	{
		289	return __read_pending(vcpu, addr, len, false);
		290	}
		291
		292	unsigned long vgic_uaccess_read_pending(struct kvm_vcpu *vcpu,
		293	gpa_t addr, unsigned int len)
		294	{
		295	return __read_pending(vcpu, addr, len, true);
		296	}
		297
266	static bool is_vgic_v2_sgi(struct kvm_vcpu vcpu, struct vgic_irq irq)	298	static bool is_vgic_v2_sgi(struct kvm_vcpu vcpu, struct vgic_irq irq)
267	{	299	{
268	return (vgic_irq_is_sgi(irq->intid) &&	300	return (vgic_irq_is_sgi(irq->intid) &&

arch/arm64/kvm/vgic/vgic-mmio.h+3−0

@@ -149,6 +149,9 @@ int vgic_uaccess_write_cenable(struct kvm_vcpu *vcpu, · 148 unmodified lines
149	unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,	149	unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,
150	gpa_t addr, unsigned int len);	150	gpa_t addr, unsigned int len);
151		151
		152	unsigned long vgic_uaccess_read_pending(struct kvm_vcpu *vcpu,
		153	gpa_t addr, unsigned int len);
		154
152	void vgic_mmio_write_spending(struct kvm_vcpu *vcpu,	155	void vgic_mmio_write_spending(struct kvm_vcpu *vcpu,
153	gpa_t addr, unsigned int len,	156	gpa_t addr, unsigned int len,
154	unsigned long val);	157	unsigned long val);

arch/arm64/kvm/vmid.c+1−1

@@ -66,7 +66,7 @@ static void flush_context(void) · 65 unmodified lines
66	* the next context-switch, we broadcast TLB flush + I-cache	66	* the next context-switch, we broadcast TLB flush + I-cache
67	* invalidation over the inner shareable domain on rollover.	67	* invalidation over the inner shareable domain on rollover.
68	*/	68	*/
69	kvm_call_hyp(__kvm_flush_vm_context);	69	kvm_call_hyp(__kvm_flush_vm_context);
70	}	70	}
71		71
72	static bool check_update_reserved_vmid(u64 vmid, u64 newvmid)	72	static bool check_update_reserved_vmid(u64 vmid, u64 newvmid)

arch/arm64/mm/cache.S+0−2

  */
 SYM_FUNC_START(__pi___dma_map_area)
 	add	x1, x0, x1
-	cmp	w2, #DMA_FROM_DEVICE
-	b.eq	__pi_dcache_inval_poc
 	b	__pi_dcache_clean_poc
 SYM_FUNC_END(__pi___dma_map_area)
 SYM_FUNC_ALIAS(__dma_map_area, __pi___dma_map_area)

arch/loongarch/include/asm/branch.h+1−2

 	return regs->csr_era;
 }
-static inline int compute_return_era(struct pt_regs *regs)
+static inline void compute_return_era(struct pt_regs *regs)
 {
 	regs->csr_era += 4;
-	return 0;
 }
 #endif /* _ASM_BRANCH_H */

arch/loongarch/include/asm/pgtable.h+5−5

 #define kern_addr_valid(addr)	(1)
+static inline unsigned long pmd_pfn(pmd_t pmd)
+{
+	return (pmd_val(pmd) & _PFN_MASK) >> _PFN_SHIFT;
+}
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 /* We don't have hardware dirty/accessed bits, generic_pmdp_establish is fine.*/
 	return pmd;
 }
-static inline unsigned long pmd_pfn(pmd_t pmd)
-{
-	return (pmd_val(pmd) & _PFN_MASK) >> _PFN_SHIFT;
-}
 static inline struct page *pmd_page(pmd_t pmd)
 {
 	if (pmd_trans_huge(pmd))

arch/loongarch/kernel/cpu-probe.c+1−1

@@ -263,7 +263,7 @@ void cpu_probe(void) · 262 unmodified lines
263		263
264	c->cputype = CPU_UNKNOWN;	264	c->cputype = CPU_UNKNOWN;
265	c->processor_id = read_cpucfg(LOONGARCH_CPUCFG0);	265	c->processor_id = read_cpucfg(LOONGARCH_CPUCFG0);
266	c->fpu_vers = (read_cpucfg(LOONGARCH_CPUCFG2) >> 3) & 0x3;	266	c->fpu_vers = (read_cpucfg(LOONGARCH_CPUCFG2) & CPUCFG2_FPVERS) >> 3;
267		267
268	c->fpu_csr0 = FPU_CSR_RN;	268	c->fpu_csr0 = FPU_CSR_RN;
269	c->fpu_mask = FPU_CSR_RSVD;	269	c->fpu_mask = FPU_CSR_RSVD;

arch/loongarch/kernel/head.S+0−2

@@ -14,8 +14,6 @@ · 13 unmodified lines
14		14
15	__REF	15	__REF
16		16
17	SYM_ENTRY(_stext, SYM_L_GLOBAL, SYM_A_NONE)
18
19	SYM_CODE_START(kernel_entry) # kernel entry point	17	SYM_CODE_START(kernel_entry) # kernel entry point
20		18
21	/* Config direct window and set PG */	19	/* Config direct window and set PG */

arch/loongarch/kernel/traps.c+1−2

@@ -475,8 +475,7 @@ asmlinkage void noinstr do_ri(struct pt_regs *regs) · 474 unmodified lines
475		475
476	die_if_kernel("Reserved instruction in kernel code", regs);	476	die_if_kernel("Reserved instruction in kernel code", regs);
477		477
478	if (unlikely(compute_return_era(regs) < 0))	478	compute_return_era(regs);
479	goto out;
480		479
481	if (unlikely(get_user(opcode, era) < 0)) {	480	if (unlikely(get_user(opcode, era) < 0)) {
482	status = SIGSEGV;	481	status = SIGSEGV;

arch/loongarch/kernel/vmlinux.lds.S+2−0

 	HEAD_TEXT_SECTION
 	. = ALIGN(PECOFF_SEGMENT_ALIGN);
+	_stext = .;
 	.text : {
 		TEXT_TEXT
 		SCHED_TEXT
 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS
 	.gptab.sdata : {
 		*(.gptab.data)

arch/loongarch/mm/tlb.c+4−3

 		if (pcpu_handlers[cpu])
 			return;
-		page = alloc_pages_node(cpu_to_node(cpu), GFP_KERNEL, get_order(vec_sz));
+		page = alloc_pages_node(cpu_to_node(cpu), GFP_ATOMIC, get_order(vec_sz));
 		if (!page)
 			return;
 		addr = page_address(page);
-		pcpu_handlers[cpu] = virt_to_phys(addr);
+		pcpu_handlers[cpu] = (unsigned long)addr;
 		memcpy((void *)addr, (void *)eentry, vec_sz);
 		local_flush_icache_range((unsigned long)addr, (unsigned long)addr + vec_sz);
-		csr_write64(pcpu_handlers[cpu], LOONGARCH_CSR_TLBRENTRY);
+		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

arch/mips/boot/dts/ingenic/x1000.dtsi+3−2

@@ -111,8 +111,9 @@ · 110 unmodified lines
111		111
112	clocks = <&cgu X1000_CLK_RTCLK>,	112	clocks = <&cgu X1000_CLK_RTCLK>,
113	<&cgu X1000_CLK_EXCLK>,	113	<&cgu X1000_CLK_EXCLK>,
114	<&cgu X1000_CLK_PCLK>;	114	<&cgu X1000_CLK_PCLK>,
115	clock-names = "rtc", "ext", "pclk";	115	<&cgu X1000_CLK_TCU>;
		116	clock-names = "rtc", "ext", "pclk", "tcu";
116		117
117	interrupt-controller;	118	interrupt-controller;
118	#interrupt-cells = <1>;	119	#interrupt-cells = <1>;

arch/mips/boot/dts/ingenic/x1830.dtsi+3−2

@@ -104,8 +104,9 @@ · 103 unmodified lines
104		104
105	clocks = <&cgu X1830_CLK_RTCLK>,	105	clocks = <&cgu X1830_CLK_RTCLK>,
106	<&cgu X1830_CLK_EXCLK>,	106	<&cgu X1830_CLK_EXCLK>,
107	<&cgu X1830_CLK_PCLK>;	107	<&cgu X1830_CLK_PCLK>,
108	clock-names = "rtc", "ext", "pclk";	108	<&cgu X1830_CLK_TCU>;
		109	clock-names = "rtc", "ext", "pclk", "tcu";
109		110
110	interrupt-controller;	111	interrupt-controller;
111	#interrupt-cells = <1>;	112	#interrupt-cells = <1>;

arch/mips/generic/board-ranchu.c+1−0

@@ -44,6 +44,7 @@ static __init unsigned int ranchu_measure_hpt_freq(void) · 43 unmodified lines
44	__func__);	44	__func__);
45		45
46	rtc_base = of_iomap(np, 0);	46	rtc_base = of_iomap(np, 0);
		47	of_node_put(np);
47	if (!rtc_base)	48	if (!rtc_base)
48	panic("%s(): Failed to ioremap Goldfish RTC base!", __func__);	49	panic("%s(): Failed to ioremap Goldfish RTC base!", __func__);
49		50

arch/mips/lantiq/falcon/sysctrl.c+6−0

 			of_address_to_resource(np_sysgpe, 0, &res_sys[2]))
 		panic("Failed to get core resources");
+	of_node_put(np_status);
+	of_node_put(np_ebu);
+	of_node_put(np_sys1);
+	of_node_put(np_syseth);
+	of_node_put(np_sysgpe);
 	if ((request_mem_region(res_status.start, resource_size(&res_status),
 				res_status.name) < 0) ||
 		(request_mem_region(res_ebu.start, resource_size(&res_ebu),

arch/mips/lantiq/irq.c+1−0

@@ -408,6 +408,7 @@ int __init icu_of_init(struct device_node node, struct device_node parent) · 407 unmodified lines
408	if (!ltq_eiu_membase)	408	if (!ltq_eiu_membase)
409	panic("Failed to remap eiu memory");	409	panic("Failed to remap eiu memory");
410	}	410	}
		411	of_node_put(eiu_node);
411		412
412	return 0;	413	return 0;
413	}	414	}

arch/mips/lantiq/xway/sysctrl.c+4−0

 			of_address_to_resource(np_ebu, 0, &res_ebu))
 		panic("Failed to get core resources");
+	of_node_put(np_pmu);
+	of_node_put(np_cgu);
+	of_node_put(np_ebu);
 	if (!request_mem_region(res_pmu.start, resource_size(&res_pmu),
 				res_pmu.name) ||
 		!request_mem_region(res_cgu.start, resource_size(&res_cgu),

arch/mips/mti-malta/malta-time.c+2−0

@@ -214,6 +214,8 @@ static void update_gic_frequency_dt(void) · 213 unmodified lines
214		214
215	if (of_update_property(node, &gic_frequency_prop) < 0)	215	if (of_update_property(node, &gic_frequency_prop) < 0)
216	pr_err("error updating gic frequency property\n");	216	pr_err("error updating gic frequency property\n");
		217
		218	of_node_put(node);
217	}	219	}
218		220
219	#endif	221	#endif

arch/mips/pic32/pic32mzda/init.c+6−1

 		np = of_find_compatible_node(NULL, NULL, lookup->compatible);
 		if (np) {
 			lookup->name = (char *)np->name;
-			if (lookup->phys_addr)
+			if (lookup->phys_addr) {
+				of_node_put(np);
 				continue;
+			}
 			if (!of_address_to_resource(np, 0, &res))
 				lookup->phys_addr = res.start;
+			of_node_put(np);
 		}
 	}
+	of_node_put(root);
 	return 0;
 }

arch/mips/pic32/pic32mzda/time.c+3−0

@@ -32,6 +32,9 @@ static unsigned int pic32_xlate_core_timer_irq(void) · 31 unmodified lines
32	goto default_map;	32	goto default_map;
33		33
34	irq = irq_of_parse_and_map(node, 0);	34	irq = irq_of_parse_and_map(node, 0);
		35
		36	of_node_put(node);
		37
35	if (!irq)	38	if (!irq)
36	goto default_map;	39	goto default_map;
37		40

arch/mips/ralink/of.c+2−0

@@ -40,6 +40,8 @@ __iomem void plat_of_remap_node(const char node) · 39 unmodified lines
40	if (of_address_to_resource(np, 0, &res))	40	if (of_address_to_resource(np, 0, &res))
41	panic("Failed to get resource for %s", node);	41	panic("Failed to get resource for %s", node);
42		42
		43	of_node_put(np);
		44
43	if (!request_mem_region(res.start,	45	if (!request_mem_region(res.start,
44	resource_size(&res),	46	resource_size(&res),
45	res.name))	47	res.name))

arch/mips/vr41xx/common/icu.c+0−2

@@ -640,8 +640,6 @@ static int icu_get_irq(unsigned int irq) · 639 unmodified lines
640		640
641	printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);	641	printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
642		642
643	atomic_inc(&irq_err_count);
644
645	return -1;	643	return -1;
646	}	644	}
647		645

arch/parisc/Kconfig+1−0

@@ -10,6 +10,7 @@ config PARISC · 9 unmodified lines
10	select ARCH_WANT_FRAME_POINTERS	10	select ARCH_WANT_FRAME_POINTERS
11	select ARCH_HAS_ELF_RANDOMIZE	11	select ARCH_HAS_ELF_RANDOMIZE
12	select ARCH_HAS_STRICT_KERNEL_RWX	12	select ARCH_HAS_STRICT_KERNEL_RWX
		13	select ARCH_HAS_STRICT_MODULE_RWX
13	select ARCH_HAS_UBSAN_SANITIZE_ALL	14	select ARCH_HAS_UBSAN_SANITIZE_ALL
14	select ARCH_HAS_PTE_SPECIAL	15	select ARCH_HAS_PTE_SPECIAL
15	select ARCH_NO_SG_CHAIN	16	select ARCH_NO_SG_CHAIN

arch/parisc/include/asm/fb.h+1−1

@@ -12,7 +12,7 @@ static inline void fb_pgprotect(struct file file, struct vm_area_struct vma, · 11 unmodified lines
12	pgprot_val(vma->vm_page_prot) \|= _PAGE_NO_CACHE;	12	pgprot_val(vma->vm_page_prot) \|= _PAGE_NO_CACHE;
13	}	13	}
14		14
15	#if defined(CONFIG_STI_CONSOLE) \|\| defined(CONFIG_FB_STI)	15	#if defined(CONFIG_FB_STI)
16	int fb_is_primary_device(struct fb_info *info);	16	int fb_is_primary_device(struct fb_info *info);
17	#else	17	#else
18	static inline int fb_is_primary_device(struct fb_info *info)	18	static inline int fb_is_primary_device(struct fb_info *info)

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

 		return;
 	if (parisc_requires_coherency()) {
-		flush_user_cache_page(vma, vmaddr);
+		if (vma->vm_flags & VM_SHARED)
+			flush_data_cache();
+		else
+			flush_user_cache_page(vma, vmaddr);
 		return;
 	}

arch/parisc/math-emu/decode_exc.c+1−1

@@ -102,7 +102,7 @@ decode_fpu(unsigned int Fpu_register[], unsigned int trap_counts[]) · 101 unmodified lines
102	* that happen. Want to keep this overhead low, but still provide	102	* that happen. Want to keep this overhead low, but still provide
103	* some information to the customer. All exits from this routine	103	* some information to the customer. All exits from this routine
104	* need to restore Fpu_register[0]	104	* need to restore Fpu_register[0]
105	*/	105	*/
106		106
107	bflags=(Fpu_register[0] & 0xf8000000);	107	bflags=(Fpu_register[0] & 0xf8000000);
108	Fpu_register[0] &= 0x07ffffff;	108	Fpu_register[0] &= 0x07ffffff;

arch/powerpc/kernel/process.c+1−1

@@ -1855,7 +1855,7 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp) · 1854 unmodified lines
1855	tm_reclaim_current(0);	1855	tm_reclaim_current(0);
1856	#endif	1856	#endif
1857		1857
1858	memset(regs->gpr, 0, sizeof(regs->gpr));	1858	memset(&regs->gpr[1], 0, sizeof(regs->gpr) - sizeof(regs->gpr[0]));
1859	regs->ctr = 0;	1859	regs->ctr = 0;
1860	regs->link = 0;	1860	regs->link = 0;
1861	regs->xer = 0;	1861	regs->xer = 0;

arch/powerpc/kernel/prom_init.c+1−1

@@ -2302,7 +2302,7 @@ static void __init prom_init_stdout(void) · 2301 unmodified lines
2302		2302
2303	static int __init prom_find_machine_type(void)	2303	static int __init prom_find_machine_type(void)
2304	{	2304	{
2305	char compat[256];	2305	static char compat[256] __prombss;
2306	int len, i = 0;	2306	int len, i = 0;
2307	#ifdef CONFIG_PPC64	2307	#ifdef CONFIG_PPC64
2308	phandle rtas;	2308	phandle rtas;

arch/powerpc/kernel/rtas.c+10−1

 	{ "get-time-of-day", -1, -1, -1, -1, -1 },
 	{ "ibm,get-vpd", -1, 0, -1, 1, 2 },
 	{ "ibm,lpar-perftools", -1, 2, 3, -1, -1 },
-	{ "ibm,platform-dump", -1, 4, 5, -1, -1 },
+	{ "ibm,platform-dump", -1, 4, 5, -1, -1 },		/* Special cased */
 	{ "ibm,read-slot-reset-state", -1, -1, -1, -1, -1 },
 	{ "ibm,scan-log-dump", -1, 0, 1, -1, -1 },
 	{ "ibm,set-dynamic-indicator", -1, 2, -1, -1, -1 },
 				size = 1;
 			end = base + size - 1;
+			/*
+			 * Special case for ibm,platform-dump - NULL buffer
+			 * address is used to indicate end of dump processing
+			 */
+			if (!strcmp(f->name, "ibm,platform-dump") &&
+			    base == 0)
+				return false;
 			if (!in_rmo_buf(base, end))
 				goto err;
 		}

arch/powerpc/kernel/setup-common.c+7−6

 	/* Print various info about the machine that has been gathered so far. */
 	print_system_info();
-	/* Reserve large chunks of memory for use by CMA for KVM. */
-	kvm_cma_reserve();
-	/*  Reserve large chunks of memory for us by CMA for hugetlb */
-	gigantic_hugetlb_cma_reserve();
 	klp_init_thread_info(&init_task);
 	setup_initial_init_mm(_stext, _etext, _edata, _end);
 	initmem_init();
+	/*
+	 * Reserve large chunks of memory for use by CMA for KVM and hugetlb. These must
+	 * be called after initmem_init(), so that pageblock_order is initialised.
+	 */
+	kvm_cma_reserve();
+	gigantic_hugetlb_cma_reserve();
 	early_memtest(min_low_pfn << PAGE_SHIFT, max_low_pfn << PAGE_SHIFT);
 	if (ppc_md.setup_arch)

arch/powerpc/platforms/microwatt/microwatt.h+7−0

@@ -0,0 +1,7 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2	#ifndef _MICROWATT_H
	3	#define _MICROWATT_H
	4
	5	void microwatt_rng_init(void);
	6
	7	#endif /* _MICROWATT_H */

arch/powerpc/platforms/microwatt/rng.c+3−7

 #include <asm/archrandom.h>
 #include <asm/cputable.h>
 #include <asm/machdep.h>
+#include "microwatt.h"
 #define DARN_ERR 0xFFFFFFFFFFFFFFFFul
 	return 1;
 }
-static __init int rng_init(void)
+void __init microwatt_rng_init(void)
 {
 	unsigned long val;
 	int i;
 	for (i = 0; i < 10; i++) {
 		if (microwatt_get_random_darn(&val)) {
 			ppc_md.get_random_seed = microwatt_get_random_darn;
-			return 0;
+			return;
 		}
 	}
-	pr_warn("Unable to use DARN for get_random_seed()\n");
-	return -EIO;
 }
-machine_subsys_initcall(, rng_init);

arch/powerpc/platforms/microwatt/setup.c+8−0

 #include <asm/xics.h>
 #include <asm/udbg.h>
+#include "microwatt.h"
 static void __init microwatt_init_IRQ(void)
 {
 	xics_init();
 }
 machine_arch_initcall(microwatt, microwatt_populate);
+static void __init microwatt_setup_arch(void)
+{
+	microwatt_rng_init();
+}
 define_machine(microwatt) {
 	.name			= "microwatt",
 	.probe			= microwatt_probe,
 	.init_IRQ		= microwatt_init_IRQ,
+	.setup_arch		= microwatt_setup_arch,
 	.progress		= udbg_progress,
 	.calibrate_decr		= generic_calibrate_decr,
 };

arch/powerpc/platforms/powernv/powernv.h+2−0

@@ -42,4 +42,6 @@ ssize_t memcons_copy(struct memcons mc, char to, loff_t pos, size_t count); · 41 unmodified lines
42	u32 __init memcons_get_size(struct memcons *mc);	42	u32 __init memcons_get_size(struct memcons *mc);
43	struct memcons __init memcons_init(struct device_node node, const char *mc_prop_name);	43	struct memcons __init memcons_init(struct device_node node, const char *mc_prop_name);
44		44
		45	void pnv_rng_init(void);
		46
45	#endif /* _POWERNV_H */	47	#endif /* _POWERNV_H */

arch/powerpc/platforms/powernv/rng.c+36−16

@@ -17,6 +17,7 @@ · 16 unmodified lines
17	#include <asm/prom.h>	17	#include <asm/prom.h>
18	#include <asm/machdep.h>	18	#include <asm/machdep.h>
19	#include <asm/smp.h>	19	#include <asm/smp.h>
		20	#include "powernv.h"
20		21
21	#define DARN_ERR 0xFFFFFFFFFFFFFFFFul	22	#define DARN_ERR 0xFFFFFFFFFFFFFFFFul
22		23
@@ -28,7 +29,6 @@ struct powernv_rng { · 5 unmodified lines
28		29
29	static DEFINE_PER_CPU(struct powernv_rng *, powernv_rng);	30	static DEFINE_PER_CPU(struct powernv_rng *, powernv_rng);
30		31
31
32	int powernv_hwrng_present(void)	32	int powernv_hwrng_present(void)
33	{	33	{
34	struct powernv_rng *rng;	34	struct powernv_rng *rng;
@@ -98,9 +98,6 @@ static int __init initialise_darn(void) · 63 unmodified lines
98	return 0;	98	return 0;
99	}	99	}
100	}	100	}
101
102	pr_warn("Unable to use DARN for get_random_seed()\n");
103
104	return -EIO;	101	return -EIO;
105	}	102	}
106		103
@@ -163,32 +160,55 @@ static __init int rng_create(struct device_node *dn) · 56 unmodified lines
163		160
164	rng_init_per_cpu(rng, dn);	161	rng_init_per_cpu(rng, dn);
165		162
166	pr_info_once("Registering arch random hook.\n");
167
168	ppc_md.get_random_seed = powernv_get_random_long;	163	ppc_md.get_random_seed = powernv_get_random_long;
169		164
170	return 0;	165	return 0;
171	}	166	}
172		167
173	static __init int rng_init(void)	168	static int __init pnv_get_random_long_early(unsigned long *v)
174	{	169	{
175	struct device_node *dn;	170	struct device_node *dn;
176	int rc;	171
		172	if (!slab_is_available())
		173	return 0;
		174
		175	if (cmpxchg(&ppc_md.get_random_seed, pnv_get_random_long_early,
		176	NULL) != pnv_get_random_long_early)
		177	return 0;
177		178
178	for_each_compatible_node(dn, NULL, "ibm,power-rng") {	179	for_each_compatible_node(dn, NULL, "ibm,power-rng") {
179	rc = rng_create(dn);	180	if (rng_create(dn))
180	if (rc) {
181	pr_err("Failed creating rng for %pOF (%d).\n",
182	dn, rc);
183	continue;	181	continue;
184	}
185
186	/* Create devices for hwrng driver */	182	/* Create devices for hwrng driver */
187	of_platform_device_create(dn, NULL, NULL);	183	of_platform_device_create(dn, NULL, NULL);
188	}	184	}
189		185
190	initialise_darn();	186	if (!ppc_md.get_random_seed)
		187	return 0;
		188	return ppc_md.get_random_seed(v);
		189	}
		190
		191	void __init pnv_rng_init(void)
		192	{
		193	struct device_node *dn;
191		194
		195	/* Prefer darn over the rest. */
		196	if (!initialise_darn())
		197	return;
		198
		199	dn = of_find_compatible_node(NULL, NULL, "ibm,power-rng");
		200	if (dn)
		201	ppc_md.get_random_seed = pnv_get_random_long_early;
		202
		203	of_node_put(dn);
		204	}
		205
		206	static int __init pnv_rng_late_init(void)
		207	{
		208	unsigned long v;
		209	/* In case it wasn't called during init for some other reason. */
		210	if (ppc_md.get_random_seed == pnv_get_random_long_early)
		211	pnv_get_random_long_early(&v);
192	return 0;	212	return 0;
193	}	213	}
194	machine_subsys_initcall(powernv, rng_init);	214	machine_subsys_initcall(powernv, pnv_rng_late_init);

arch/powerpc/platforms/powernv/setup.c+2−0

@@ -203,6 +203,8 @@ static void __init pnv_setup_arch(void) · 202 unmodified lines
203	pnv_check_guarded_cores();	203	pnv_check_guarded_cores();
204		204
205	/* XXX PMCS */	205	/* XXX PMCS */
		206
		207	pnv_rng_init();
206	}	208	}
207		209
208	static void __init pnv_init(void)	210	static void __init pnv_init(void)

arch/powerpc/platforms/pseries/pseries.h+2−0

@@ -122,4 +122,6 @@ void pseries_lpar_read_hblkrm_characteristics(void); · 121 unmodified lines
122	static inline void pseries_lpar_read_hblkrm_characteristics(void) { }	122	static inline void pseries_lpar_read_hblkrm_characteristics(void) { }
123	#endif	123	#endif
124		124
		125	void pseries_rng_init(void);
		126
125	#endif /* _PSERIES_PSERIES_H */	127	#endif /* _PSERIES_PSERIES_H */

arch/powerpc/platforms/pseries/rng.c+3−8

 #include <asm/archrandom.h>
 #include <asm/machdep.h>
 #include <asm/plpar_wrappers.h>
+#include "pseries.h"
 static int pseries_get_random_long(unsigned long *v)
 	return 0;
 }
-static __init int rng_init(void)
+void __init pseries_rng_init(void)
 {
 	struct device_node *dn;
 	dn = of_find_compatible_node(NULL, NULL, "ibm,random");
 	if (!dn)
-		return -ENODEV;
+		return;
-	pr_info("Registering arch random hook.\n");
 	ppc_md.get_random_seed = pseries_get_random_long;
 	of_node_put(dn);
-	return 0;
 }
-machine_subsys_initcall(pseries, rng_init);

arch/powerpc/platforms/pseries/setup.c+1−0

@@ -839,6 +839,7 @@ static void __init pSeries_setup_arch(void) · 838 unmodified lines
839	}	839	}
840		840
841	ppc_md.pcibios_root_bridge_prepare = pseries_root_bridge_prepare;	841	ppc_md.pcibios_root_bridge_prepare = pseries_root_bridge_prepare;
		842	pseries_rng_init();
842	}	843	}
843		844
844	static void pseries_panic(char *str)	845	static void pseries_panic(char *str)

arch/riscv/Kconfig+7−2

 	select RISCV_ALTERNATIVE
 	default y
 	help
-	   Adds support to dynamically detect the presence of the SVPBMT extension
+	   Adds support to dynamically detect the presence of the SVPBMT
-	   (Supervisor-mode: page-based memory types) and enable its usage.
+	   ISA-extension (Supervisor-mode: page-based memory types) and
+	   enable its usage.
+	   The memory type for a page contains a combination of attributes
+	   that indicate the cacheability, idempotency, and ordering
+	   properties for access to that page.
 	   The SVPBMT extension is only available on 64Bit cpus.

arch/riscv/Kconfig.erratas+1−0

@@ -35,6 +35,7 @@ config ERRATA_SIFIVE_CIP_1200 · 34 unmodified lines
35		35
36	config ERRATA_THEAD	36	config ERRATA_THEAD
37	bool "T-HEAD errata"	37	bool "T-HEAD errata"
		38	depends on !XIP_KERNEL
38	select RISCV_ALTERNATIVE	39	select RISCV_ALTERNATIVE
39	help	40	help
40	All T-HEAD errata Kconfig depend on this Kconfig. Disabling	41	All T-HEAD errata Kconfig depend on this Kconfig. Disabling

arch/riscv/boot/dts/microchip/mpfs.dtsi+9−0

@@ -192,6 +192,15 @@ · 191 unmodified lines
192	riscv,ndev = <186>;	192	riscv,ndev = <186>;
193	};	193	};
194		194
		195	pdma: dma-controller@3000000 {
		196	compatible = "sifive,fu540-c000-pdma", "sifive,pdma0";
		197	reg = <0x0 0x3000000 0x0 0x8000>;
		198	interrupt-parent = <&plic>;
		199	interrupts = <5 6>, <7 8>, <9 10>, <11 12>;
		200	dma-channels = <4>;
		201	#dma-cells = <1>;
		202	};
		203
195	clkcfg: clkcfg@20002000 {	204	clkcfg: clkcfg@20002000 {
196	compatible = "microchip,mpfs-clkcfg";	205	compatible = "microchip,mpfs-clkcfg";
197	reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>;	206	reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>;

arch/riscv/include/asm/errata_list.h+7−7

 	"nop\n\t"							\
 	"nop\n\t"							\
 	"nop",								\
-	"li      t3, %2\n\t"						\
+	"li      t3, %1\n\t"						\
-	"slli    t3, t3, %4\n\t"					\
+	"slli    t3, t3, %3\n\t"					\
 	"and     t3, %0, t3\n\t"					\
 	"bne     t3, zero, 2f\n\t"					\
-	"li      t3, %3\n\t"						\
+	"li      t3, %2\n\t"						\
-	"slli    t3, t3, %4\n\t"					\
+	"slli    t3, t3, %3\n\t"					\
 	"or      %0, %0, t3\n\t"					\
 	"2:",  THEAD_VENDOR_ID,						\
 		ERRATA_THEAD_PBMT, CONFIG_ERRATA_THEAD_PBMT)		\
 	: "+r"(_val)							\
-	: "0"(_val),							\
+	: "I"(_PAGE_MTMASK_THEAD >> ALT_THEAD_PBMT_SHIFT),		\
-	  "I"(_PAGE_MTMASK_THEAD >> ALT_THEAD_PBMT_SHIFT),		\
 	  "I"(_PAGE_PMA_THEAD >> ALT_THEAD_PBMT_SHIFT),			\
-	  "I"(ALT_THEAD_PBMT_SHIFT))
+	  "I"(ALT_THEAD_PBMT_SHIFT)					\
+	: "t3")
 #else
 #define ALT_THEAD_PMA(_val)
 #endif

arch/riscv/kernel/cpufeature.c+1−4

 						  unsigned int stage)
 {
 	u32 cpu_req_feature = cpufeature_probe(stage);
-	u32 cpu_apply_feature = 0;
 	struct alt_entry *alt;
 	u32 tmp;
 		}
 		tmp = (1U << alt->errata_id);
-		if (cpu_req_feature & tmp) {
+		if (cpu_req_feature & tmp)
 			patch_text_nosync(alt->old_ptr, alt->alt_ptr, alt->alt_len);
-			cpu_apply_feature |= tmp;
-		}
 	}
 }
 #endif

arch/riscv/kvm/vmid.c+1−1

@@ -97,7 +97,7 @@ void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu) · 96 unmodified lines
97	* We ran out of VMIDs so we increment vmid_version and	97	* We ran out of VMIDs so we increment vmid_version and
98	* start assigning VMIDs from 1.	98	* start assigning VMIDs from 1.
99	*	99	*
100	* This also means existing VMIDs assignement to all Guest	100	* This also means existing VMIDs assignment to all Guest
101	* instances is invalid and we have force VMID re-assignement	101	* instances is invalid and we have force VMID re-assignement
102	* for all Guest instances. The Guest instances that were not	102	* for all Guest instances. The Guest instances that were not
103	* running will automatically pick-up new VMIDs because will	103	* running will automatically pick-up new VMIDs because will

arch/s390/kernel/crash_dump.c+9−1

 	unsigned long src;
 	int rc;
+	if (!(iter_is_iovec(iter) || iov_iter_is_kvec(iter)))
+		return -EINVAL;
+	/* Multi-segment iterators are not supported */
+	if (iter->nr_segs > 1)
+		return -EINVAL;
 	if (!csize)
 		return 0;
 	src = pfn_to_phys(pfn) + offset;
 		rc = copy_oldmem_user(iter->iov->iov_base, src, csize);
 	else
 		rc = copy_oldmem_kernel(iter->kvec->iov_base, src, csize);
-	return rc;
+	if (rc < 0)
+		return rc;
+	iov_iter_advance(iter, csize);
+	return csize;
 }
 /*

arch/s390/kernel/perf_cpum_cf.c+21−1

@@ -516,6 +516,26 @@ static int __hw_perf_event_init(struct perf_event *event, unsigned int type) · 515 unmodified lines
516	return err;	516	return err;
517	}	517	}
518		518
		519	/* Events CPU_CYLCES and INSTRUCTIONS can be submitted with two different
		520	* attribute::type values:
		521	* - PERF_TYPE_HARDWARE:
		522	* - pmu->type:
		523	* Handle both type of invocations identical. They address the same hardware.
		524	* The result is different when event modifiers exclude_kernel and/or
		525	* exclude_user are also set.
		526	*/
		527	static int cpumf_pmu_event_type(struct perf_event *event)
		528	{
		529	u64 ev = event->attr.config;
		530
		531	if (cpumf_generic_events_basic[PERF_COUNT_HW_CPU_CYCLES] == ev \|\|
		532	cpumf_generic_events_basic[PERF_COUNT_HW_INSTRUCTIONS] == ev \|\|
		533	cpumf_generic_events_user[PERF_COUNT_HW_CPU_CYCLES] == ev \|\|
		534	cpumf_generic_events_user[PERF_COUNT_HW_INSTRUCTIONS] == ev)
		535	return PERF_TYPE_HARDWARE;
		536	return PERF_TYPE_RAW;
		537	}
		538
519	static int cpumf_pmu_event_init(struct perf_event *event)	539	static int cpumf_pmu_event_init(struct perf_event *event)
520	{	540	{
521	unsigned int type = event->attr.type;	541	unsigned int type = event->attr.type;
@@ -525,7 +545,7 @@ static int cpumf_pmu_event_init(struct perf_event *event) · 3 unmodified lines
525	err = __hw_perf_event_init(event, type);	545	err = __hw_perf_event_init(event, type);
526	else if (event->pmu->type == type)	546	else if (event->pmu->type == type)
527	/* Registered as unknown PMU */	547	/* Registered as unknown PMU */
528	err = __hw_perf_event_init(event, PERF_TYPE_RAW);	548	err = __hw_perf_event_init(event, cpumf_pmu_event_type(event));
529	else	549	else
530	return -ENOENT;	550	return -ENOENT;
531		551

arch/s390/kernel/perf_pai_crypto.c+15−5

 	/* PAI crypto PMU registered as PERF_TYPE_RAW, check event type */
 	if (a->type != PERF_TYPE_RAW && event->pmu->type != a->type)
 		return -ENOENT;
-	/* PAI crypto event must be valid */
+	/* PAI crypto event must be in valid range */
-	if (a->config > PAI_CRYPTO_BASE + paicrypt_cnt)
+	if (a->config < PAI_CRYPTO_BASE ||
+	    a->config > PAI_CRYPTO_BASE + paicrypt_cnt)
 		return -EINVAL;
 	/* Allow only CPU wide operation, no process context for now. */
 	if (event->hw.target || event->cpu == -1)
 	if (rc)
 		return rc;
+	/* Event initialization sets last_tag to 0. When later on the events
+	 * are deleted and re-added, do not reset the event count value to zero.
+	 * Events are added, deleted and re-added when 2 or more events
+	 * are active at the same time.
+	 */
+	event->hw.last_tag = 0;
 	cpump->event = event;
 	event->destroy = paicrypt_event_destroy;
 {
 	u64 sum;
-	sum = paicrypt_getall(event);		/* Get current value */
+	if (!event->hw.last_tag) {
-	local64_set(&event->hw.prev_count, sum);
+		event->hw.last_tag = 1;
-	local64_set(&event->count, 0);
+		sum = paicrypt_getall(event);		/* Get current value */
+		local64_set(&event->count, 0);
+		local64_set(&event->hw.prev_count, sum);
+	}
 }
 static int paicrypt_add(struct perf_event *event, int flags)

arch/x86/coco/tdx/tdx.c+136−51

 	return BIT_ULL(gpa_width - 1);
 }
+/*
+ * The TDX module spec states that #VE may be injected for a limited set of
+ * reasons:
+ *
+ *  - Emulation of the architectural #VE injection on EPT violation;
+ *
+ *  - As a result of guest TD execution of a disallowed instruction,
+ *    a disallowed MSR access, or CPUID virtualization;
+ *
+ *  - A notification to the guest TD about anomalous behavior;
+ *
+ * The last one is opt-in and is not used by the kernel.
+ *
+ * The Intel Software Developer's Manual describes cases when instruction
+ * length field can be used in section "Information for VM Exits Due to
+ * Instruction Execution".
+ *
+ * For TDX, it ultimately means GET_VEINFO provides reliable instruction length
+ * information if #VE occurred due to instruction execution, but not for EPT
+ * violations.
+ */
+static int ve_instr_len(struct ve_info *ve)
+{
+	switch (ve->exit_reason) {
+	case EXIT_REASON_HLT:
+	case EXIT_REASON_MSR_READ:
+	case EXIT_REASON_MSR_WRITE:
+	case EXIT_REASON_CPUID:
+	case EXIT_REASON_IO_INSTRUCTION:
+		/* It is safe to use ve->instr_len for #VE due instructions */
+		return ve->instr_len;
+	case EXIT_REASON_EPT_VIOLATION:
+		/*
+		 * For EPT violations, ve->insn_len is not defined. For those,
+		 * the kernel must decode instructions manually and should not
+		 * be using this function.
+		 */
+		WARN_ONCE(1, "ve->instr_len is not defined for EPT violations");
+		return 0;
+	default:
+		WARN_ONCE(1, "Unexpected #VE-type: %lld\n", ve->exit_reason);
+		return ve->instr_len;
+	}
+}
 static u64 __cpuidle __halt(const bool irq_disabled, const bool do_sti)
 {
 	struct tdx_hypercall_args args = {
 	return __tdx_hypercall(&args, do_sti ? TDX_HCALL_ISSUE_STI : 0);
 }
-static bool handle_halt(void)
+static int handle_halt(struct ve_info *ve)
 {
 	/*
 	 * Since non safe halt is mainly used in CPU offlining
 	const bool do_sti = false;
 	if (__halt(irq_disabled, do_sti))
-		return false;
+		return -EIO;
-	return true;
+	return ve_instr_len(ve);
 }
 void __cpuidle tdx_safe_halt(void)
 		WARN_ONCE(1, "HLT instruction emulation failed\n");
 }
-static bool read_msr(struct pt_regs *regs)
+static int read_msr(struct pt_regs *regs, struct ve_info *ve)
 {
 	struct tdx_hypercall_args args = {
 		.r10 = TDX_HYPERCALL_STANDARD,
 	 * (GHCI), section titled "TDG.VP.VMCALL<Instruction.RDMSR>".
 	 */
 	if (__tdx_hypercall(&args, TDX_HCALL_HAS_OUTPUT))
-		return false;
+		return -EIO;
 	regs->ax = lower_32_bits(args.r11);
 	regs->dx = upper_32_bits(args.r11);
-	return true;
+	return ve_instr_len(ve);
 }
-static bool write_msr(struct pt_regs *regs)
+static int write_msr(struct pt_regs *regs, struct ve_info *ve)
 {
 	struct tdx_hypercall_args args = {
 		.r10 = TDX_HYPERCALL_STANDARD,
 	 * can be found in TDX Guest-Host-Communication Interface
 	 * (GHCI) section titled "TDG.VP.VMCALL<Instruction.WRMSR>".
 	 */
-	return !__tdx_hypercall(&args, 0);
+	if (__tdx_hypercall(&args, 0))
+		return -EIO;
+	return ve_instr_len(ve);
 }
-static bool handle_cpuid(struct pt_regs *regs)
+static int handle_cpuid(struct pt_regs *regs, struct ve_info *ve)
 {
 	struct tdx_hypercall_args args = {
 		.r10 = TDX_HYPERCALL_STANDARD,
 	 */
 	if (regs->ax < 0x40000000 || regs->ax > 0x4FFFFFFF) {
 		regs->ax = regs->bx = regs->cx = regs->dx = 0;
-		return true;
+		return ve_instr_len(ve);
 	}
 	/*
 	 * (GHCI), section titled "VP.VMCALL<Instruction.CPUID>".
 	 */
 	if (__tdx_hypercall(&args, TDX_HCALL_HAS_OUTPUT))
-		return false;
+		return -EIO;
 	/*
 	 * As per TDX GHCI CPUID ABI, r12-r15 registers contain contents of
 	regs->cx = args.r14;
 	regs->dx = args.r15;
-	return true;
+	return ve_instr_len(ve);
 }
 static bool mmio_read(int size, unsigned long addr, unsigned long *val)
 			       EPT_WRITE, addr, val);
 }
-static bool handle_mmio(struct pt_regs *regs, struct ve_info *ve)
+static int handle_mmio(struct pt_regs *regs, struct ve_info *ve)
 {
+	unsigned long *reg, val, vaddr;
 	char buffer[MAX_INSN_SIZE];
-	unsigned long *reg, val;
 	struct insn insn = {};
 	enum mmio_type mmio;
 	int size, extend_size;
 	/* Only in-kernel MMIO is supported */
 	if (WARN_ON_ONCE(user_mode(regs)))
-		return false;
+		return -EFAULT;
 	if (copy_from_kernel_nofault(buffer, (void *)regs->ip, MAX_INSN_SIZE))
-		return false;
+		return -EFAULT;
 	if (insn_decode(&insn, buffer, MAX_INSN_SIZE, INSN_MODE_64))
-		return false;
+		return -EINVAL;
 	mmio = insn_decode_mmio(&insn, &size);
 	if (WARN_ON_ONCE(mmio == MMIO_DECODE_FAILED))
-		return false;
+		return -EINVAL;
 	if (mmio != MMIO_WRITE_IMM && mmio != MMIO_MOVS) {
 		reg = insn_get_modrm_reg_ptr(&insn, regs);
 		if (!reg)
-			return false;
+			return -EINVAL;
 	}
-	ve->instr_len = insn.length;
+	/*
+	 * Reject EPT violation #VEs that split pages.
+	 *
+	 * MMIO accesses are supposed to be naturally aligned and therefore
+	 * never cross page boundaries. Seeing split page accesses indicates
+	 * a bug or a load_unaligned_zeropad() that stepped into an MMIO page.
+	 *
+	 * load_unaligned_zeropad() will recover using exception fixups.
+	 */
+	vaddr = (unsigned long)insn_get_addr_ref(&insn, regs);
+	if (vaddr / PAGE_SIZE != (vaddr + size - 1) / PAGE_SIZE)
+		return -EFAULT;
 	/* Handle writes first */
 	switch (mmio) {
 	case MMIO_WRITE:
 		memcpy(&val, reg, size);
-		return mmio_write(size, ve->gpa, val);
+		if (!mmio_write(size, ve->gpa, val))
+			return -EIO;
+		return insn.length;
 	case MMIO_WRITE_IMM:
 		val = insn.immediate.value;
-		return mmio_write(size, ve->gpa, val);
+		if (!mmio_write(size, ve->gpa, val))
+			return -EIO;
+		return insn.length;
 	case MMIO_READ:
 	case MMIO_READ_ZERO_EXTEND:
 	case MMIO_READ_SIGN_EXTEND:
 		 * decoded or handled properly. It was likely not using io.h
 		 * helpers or accessed MMIO accidentally.
 		 */
-		return false;
+		return -EINVAL;
 	default:
 		WARN_ONCE(1, "Unknown insn_decode_mmio() decode value?");
-		return false;
+		return -EINVAL;
 	}
 	/* Handle reads */
 	if (!mmio_read(size, ve->gpa, &val))
-		return false;
+		return -EIO;
 	switch (mmio) {
 	case MMIO_READ:
 	default:
 		/* All other cases has to be covered with the first switch() */
 		WARN_ON_ONCE(1);
-		return false;
+		return -EINVAL;
 	}
 	if (extend_size)
 		memset(reg, extend_val, extend_size);
 	memcpy(reg, &val, size);
-	return true;
+	return insn.length;
 }
 static bool handle_in(struct pt_regs *regs, int size, int port)
  *
  * Return True on success or False on failure.
  */
-static bool handle_io(struct pt_regs *regs, u32 exit_qual)
+static int handle_io(struct pt_regs *regs, struct ve_info *ve)
 {
+	u32 exit_qual = ve->exit_qual;
 	int size, port;
-	bool in;
+	bool in, ret;
 	if (VE_IS_IO_STRING(exit_qual))
-		return false;
+		return -EIO;
 	in   = VE_IS_IO_IN(exit_qual);
 	size = VE_GET_IO_SIZE(exit_qual);
 	if (in)
-		return handle_in(regs, size, port);
+		ret = handle_in(regs, size, port);
 	else
-		return handle_out(regs, size, port);
+		ret = handle_out(regs, size, port);
+	if (!ret)
+		return -EIO;
+	return ve_instr_len(ve);
 }
 /*
 __init bool tdx_early_handle_ve(struct pt_regs *regs)
 {
 	struct ve_info ve;
+	int insn_len;
 	tdx_get_ve_info(&ve);
 	if (ve.exit_reason != EXIT_REASON_IO_INSTRUCTION)
 		return false;
-	return handle_io(regs, ve.exit_qual);
+	insn_len = handle_io(regs, &ve);
+	if (insn_len < 0)
+		return false;
+	regs->ip += insn_len;
+	return true;
 }
 void tdx_get_ve_info(struct ve_info *ve)
 	ve->instr_info  = upper_32_bits(out.r10);
 }
-/* Handle the user initiated #VE */
+/*
-static bool virt_exception_user(struct pt_regs *regs, struct ve_info *ve)
+ * Handle the user initiated #VE.
+ *
+ * On success, returns the number of bytes RIP should be incremented (>=0)
+ * or -errno on error.
+ */
+static int virt_exception_user(struct pt_regs *regs, struct ve_info *ve)
 {
 	switch (ve->exit_reason) {
 	case EXIT_REASON_CPUID:
-		return handle_cpuid(regs);
+		return handle_cpuid(regs, ve);
 	default:
 		pr_warn("Unexpected #VE: %lld\n", ve->exit_reason);
-		return false;
+		return -EIO;
 	}
 }
-/* Handle the kernel #VE */
+/*
-static bool virt_exception_kernel(struct pt_regs *regs, struct ve_info *ve)
+ * Handle the kernel #VE.
+ *
+ * On success, returns the number of bytes RIP should be incremented (>=0)
+ * or -errno on error.
+ */
+static int virt_exception_kernel(struct pt_regs *regs, struct ve_info *ve)
 {
 	switch (ve->exit_reason) {
 	case EXIT_REASON_HLT:
-		return handle_halt();
+		return handle_halt(ve);
 	case EXIT_REASON_MSR_READ:
-		return read_msr(regs);
+		return read_msr(regs, ve);
 	case EXIT_REASON_MSR_WRITE:
-		return write_msr(regs);
+		return write_msr(regs, ve);
 	case EXIT_REASON_CPUID:
-		return handle_cpuid(regs);
+		return handle_cpuid(regs, ve);
 	case EXIT_REASON_EPT_VIOLATION:
 		return handle_mmio(regs, ve);
 	case EXIT_REASON_IO_INSTRUCTION:
-		return handle_io(regs, ve->exit_qual);
+		return handle_io(regs, ve);
 	default:
 		pr_warn("Unexpected #VE: %lld\n", ve->exit_reason);
-		return false;
+		return -EIO;
 	}
 }
 bool tdx_handle_virt_exception(struct pt_regs *regs, struct ve_info *ve)
 {
-	bool ret;
+	int insn_len;
 	if (user_mode(regs))
-		ret = virt_exception_user(regs, ve);
+		insn_len = virt_exception_user(regs, ve);
 	else
-		ret = virt_exception_kernel(regs, ve);
+		insn_len = virt_exception_kernel(regs, ve);
+	if (insn_len < 0)
+		return false;
 	/* After successful #VE handling, move the IP */
-	if (ret)
+	regs->ip += insn_len;
-		regs->ip += ve->instr_len;
-	return ret;
+	return true;
 }
 static bool tdx_tlb_flush_required(bool private)

arch/x86/hyperv/hv_init.c+6−0

 #include <linux/io.h>
 #include <asm/apic.h>
 #include <asm/desc.h>
+#include <asm/sev.h>
 #include <asm/hypervisor.h>
 #include <asm/hyperv-tlfs.h>
 #include <asm/mshyperv.h>
 	}
 	if (hv_isolation_type_snp()) {
+		/* Negotiate GHCB Version. */
+		if (!hv_ghcb_negotiate_protocol())
+			hv_ghcb_terminate(SEV_TERM_SET_GEN,
+					  GHCB_SEV_ES_PROT_UNSUPPORTED);
 		hv_ghcb_pg = alloc_percpu(union hv_ghcb *);
 		if (!hv_ghcb_pg)
 			goto free_vp_assist_page;

arch/x86/hyperv/ivm.c+78−6

@@ -53,6 +53,8 @@ union hv_ghcb { · 52 unmodified lines
53	} hypercall;	53	} hypercall;
54	} __packed __aligned(HV_HYP_PAGE_SIZE);	54	} __packed __aligned(HV_HYP_PAGE_SIZE);
55		55
		56	static u16 hv_ghcb_version __ro_after_init;
		57
56	u64 hv_ghcb_hypercall(u64 control, void input, void output, u32 input_size)	58	u64 hv_ghcb_hypercall(u64 control, void input, void output, u32 input_size)
57	{	59	{
58	union hv_ghcb *hv_ghcb;	60	union hv_ghcb *hv_ghcb;
@@ -96,12 +98,85 @@ u64 hv_ghcb_hypercall(u64 control, void input, void output, u32 input_size) · 37 unmodified lines
96	return status;	98	return status;
97	}	99	}
98		100
		101	static inline u64 rd_ghcb_msr(void)
		102	{
		103	return __rdmsr(MSR_AMD64_SEV_ES_GHCB);
		104	}
		105
		106	static inline void wr_ghcb_msr(u64 val)
		107	{
		108	native_wrmsrl(MSR_AMD64_SEV_ES_GHCB, val);
		109	}
		110
		111	static enum es_result hv_ghcb_hv_call(struct ghcb *ghcb, u64 exit_code,
		112	u64 exit_info_1, u64 exit_info_2)
		113	{
		114	/* Fill in protocol and format specifiers */
		115	ghcb->protocol_version = hv_ghcb_version;
		116	ghcb->ghcb_usage = GHCB_DEFAULT_USAGE;
		117
		118	ghcb_set_sw_exit_code(ghcb, exit_code);
		119	ghcb_set_sw_exit_info_1(ghcb, exit_info_1);
		120	ghcb_set_sw_exit_info_2(ghcb, exit_info_2);
		121
		122	VMGEXIT();
		123
		124	if (ghcb->save.sw_exit_info_1 & GENMASK_ULL(31, 0))
		125	return ES_VMM_ERROR;
		126	else
		127	return ES_OK;
		128	}
		129
		130	void hv_ghcb_terminate(unsigned int set, unsigned int reason)
		131	{
		132	u64 val = GHCB_MSR_TERM_REQ;
		133
		134	/* Tell the hypervisor what went wrong. */
		135	val \|= GHCB_SEV_TERM_REASON(set, reason);
		136
		137	/* Request Guest Termination from Hypvervisor */
		138	wr_ghcb_msr(val);
		139	VMGEXIT();
		140
		141	while (true)
		142	asm volatile("hlt\n" : : : "memory");
		143	}
		144
		145	bool hv_ghcb_negotiate_protocol(void)
		146	{
		147	u64 ghcb_gpa;
		148	u64 val;
		149
		150	/* Save ghcb page gpa. */
		151	ghcb_gpa = rd_ghcb_msr();
		152
		153	/* Do the GHCB protocol version negotiation */
		154	wr_ghcb_msr(GHCB_MSR_SEV_INFO_REQ);
		155	VMGEXIT();
		156	val = rd_ghcb_msr();
		157
		158	if (GHCB_MSR_INFO(val) != GHCB_MSR_SEV_INFO_RESP)
		159	return false;
		160
		161	if (GHCB_MSR_PROTO_MAX(val) < GHCB_PROTOCOL_MIN \|\|
		162	GHCB_MSR_PROTO_MIN(val) > GHCB_PROTOCOL_MAX)
		163	return false;
		164
		165	hv_ghcb_version = min_t(size_t, GHCB_MSR_PROTO_MAX(val),
		166	GHCB_PROTOCOL_MAX);
		167
		168	/* Write ghcb page back after negotiating protocol. */
		169	wr_ghcb_msr(ghcb_gpa);
		170	VMGEXIT();
		171
		172	return true;
		173	}
		174
99	void hv_ghcb_msr_write(u64 msr, u64 value)	175	void hv_ghcb_msr_write(u64 msr, u64 value)
100	{	176	{
101	union hv_ghcb *hv_ghcb;	177	union hv_ghcb *hv_ghcb;
102	void **ghcb_base;	178	void **ghcb_base;
103	unsigned long flags;	179	unsigned long flags;
104	struct es_em_ctxt ctxt;
105		180
106	if (!hv_ghcb_pg)	181	if (!hv_ghcb_pg)
107	return;	182	return;
@@ -120,8 +195,7 @@ void hv_ghcb_msr_write(u64 msr, u64 value) · 12 unmodified lines
120	ghcb_set_rax(&hv_ghcb->ghcb, lower_32_bits(value));	195	ghcb_set_rax(&hv_ghcb->ghcb, lower_32_bits(value));
121	ghcb_set_rdx(&hv_ghcb->ghcb, upper_32_bits(value));	196	ghcb_set_rdx(&hv_ghcb->ghcb, upper_32_bits(value));
122		197
123	if (sev_es_ghcb_hv_call(&hv_ghcb->ghcb, false, &ctxt,	198	if (hv_ghcb_hv_call(&hv_ghcb->ghcb, SVM_EXIT_MSR, 1, 0))
124	SVM_EXIT_MSR, 1, 0))
125	pr_warn("Fail to write msr via ghcb %llx.\n", msr);	199	pr_warn("Fail to write msr via ghcb %llx.\n", msr);
126		200
127	local_irq_restore(flags);	201	local_irq_restore(flags);
@@ -133,7 +207,6 @@ void hv_ghcb_msr_read(u64 msr, u64 *value) · 5 unmodified lines
133	union hv_ghcb *hv_ghcb;	207	union hv_ghcb *hv_ghcb;
134	void **ghcb_base;	208	void **ghcb_base;
135	unsigned long flags;	209	unsigned long flags;
136	struct es_em_ctxt ctxt;
137		210
138	/* Check size of union hv_ghcb here. */	211	/* Check size of union hv_ghcb here. */
139	BUILD_BUG_ON(sizeof(union hv_ghcb) != HV_HYP_PAGE_SIZE);	212	BUILD_BUG_ON(sizeof(union hv_ghcb) != HV_HYP_PAGE_SIZE);
@@ -152,8 +225,7 @@ void hv_ghcb_msr_read(u64 msr, u64 *value) · 12 unmodified lines
152	}	225	}
153		226
154	ghcb_set_rcx(&hv_ghcb->ghcb, msr);	227	ghcb_set_rcx(&hv_ghcb->ghcb, msr);
155	if (sev_es_ghcb_hv_call(&hv_ghcb->ghcb, false, &ctxt,	228	if (hv_ghcb_hv_call(&hv_ghcb->ghcb, SVM_EXIT_MSR, 0, 0))
156	SVM_EXIT_MSR, 0, 0))
157	pr_warn("Fail to read msr via ghcb %llx.\n", msr);	229	pr_warn("Fail to read msr via ghcb %llx.\n", msr);
158	else	230	else
159	*value = (u64)lower_32_bits(hv_ghcb->ghcb.save.rax)	231	*value = (u64)lower_32_bits(hv_ghcb->ghcb.save.rax)

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

@@ -446,5 +446,6 @@ · 445 unmodified lines
446	#define X86_BUG_TAA X86_BUG(22) /* CPU is affected by TSX Async Abort(TAA) */	446	#define X86_BUG_TAA X86_BUG(22) /* CPU is affected by TSX Async Abort(TAA) */
447	#define X86_BUG_ITLB_MULTIHIT X86_BUG(23) /* CPU may incur MCE during certain page attribute changes */	447	#define X86_BUG_ITLB_MULTIHIT X86_BUG(23) /* CPU may incur MCE during certain page attribute changes */
448	#define X86_BUG_SRBDS X86_BUG(24) /* CPU may leak RNG bits if not mitigated */	448	#define X86_BUG_SRBDS X86_BUG(24) /* CPU may leak RNG bits if not mitigated */
		449	#define X86_BUG_MMIO_STALE_DATA X86_BUG(25) /* CPU is affected by Processor MMIO Stale Data vulnerabilities */
449		450
450	#endif /* _ASM_X86_CPUFEATURES_H */	451	#endif /* _ASM_X86_CPUFEATURES_H */

arch/x86/include/asm/e820/api.h+0−5

 #include <asm/e820/types.h>
-struct device;
-struct resource;
 extern struct e820_table *e820_table;
 extern struct e820_table *e820_table_kexec;
 extern struct e820_table *e820_table_firmware;
 extern int  e820__get_entry_type(u64 start, u64 end);
-extern void remove_e820_regions(struct device *dev, struct resource *avail);
 /*
  * Returns true iff the specified range [start,end) is completely contained inside
  * the ISA region.

arch/x86/include/asm/efi.h+1−1

@@ -323,7 +323,7 @@ static inline u32 efi64_convert_status(efi_status_t status) · 322 unmodified lines
323	#define __efi64_argmap_get_memory_space_descriptor(phys, desc) \	323	#define __efi64_argmap_get_memory_space_descriptor(phys, desc) \
324	(__efi64_split(phys), (desc))	324	(__efi64_split(phys), (desc))
325		325
326	#define __efi64_argmap_set_memory_space_descriptor(phys, size, flags) \	326	#define __efi64_argmap_set_memory_space_attributes(phys, size, flags) \
327	(__efi64_split(phys), __efi64_split(size), __efi64_split(flags))	327	(__efi64_split(phys), __efi64_split(size), __efi64_split(flags))
328		328
329	/*	329	/*

arch/x86/include/asm/kvm_host.h+65−2

@@ -1047,14 +1047,77 @@ struct kvm_x86_msr_filter { · 1046 unmodified lines
1047	};	1047	};
1048		1048
1049	enum kvm_apicv_inhibit {	1049	enum kvm_apicv_inhibit {
		1050
		1051	/********************************************************************/
		1052	/* INHIBITs that are relevant to both Intel's APICv and AMD's AVIC. */
		1053	/********************************************************************/
		1054
		1055	/*
		1056	* APIC acceleration is disabled by a module parameter
		1057	* and/or not supported in hardware.
		1058	*/
1050	APICV_INHIBIT_REASON_DISABLE,	1059	APICV_INHIBIT_REASON_DISABLE,
		1060
		1061	/*
		1062	* APIC acceleration is inhibited because AutoEOI feature is
		1063	* being used by a HyperV guest.
		1064	*/
1051	APICV_INHIBIT_REASON_HYPERV,	1065	APICV_INHIBIT_REASON_HYPERV,
		1066
		1067	/*
		1068	* APIC acceleration is inhibited because the userspace didn't yet
		1069	* enable the kernel/split irqchip.
		1070	*/
		1071	APICV_INHIBIT_REASON_ABSENT,
		1072
		1073	/* APIC acceleration is inhibited because KVM_GUESTDBG_BLOCKIRQ
		1074	* (out of band, debug measure of blocking all interrupts on this vCPU)
		1075	* was enabled, to avoid AVIC/APICv bypassing it.
		1076	*/
		1077	APICV_INHIBIT_REASON_BLOCKIRQ,
		1078
		1079	/*
		1080	* For simplicity, the APIC acceleration is inhibited
		1081	* first time either APIC ID or APIC base are changed by the guest
		1082	* from their reset values.
		1083	*/
		1084	APICV_INHIBIT_REASON_APIC_ID_MODIFIED,
		1085	APICV_INHIBIT_REASON_APIC_BASE_MODIFIED,
		1086
		1087	/******************************************************/
		1088	/* INHIBITs that are relevant only to the AMD's AVIC. */
		1089	/******************************************************/
		1090
		1091	/*
		1092	* AVIC is inhibited on a vCPU because it runs a nested guest.
		1093	*
		1094	* This is needed because unlike APICv, the peers of this vCPU
		1095	* cannot use the doorbell mechanism to signal interrupts via AVIC when
		1096	* a vCPU runs nested.
		1097	*/
1052	APICV_INHIBIT_REASON_NESTED,	1098	APICV_INHIBIT_REASON_NESTED,
		1099
		1100	/*
		1101	* On SVM, the wait for the IRQ window is implemented with pending vIRQ,
		1102	* which cannot be injected when the AVIC is enabled, thus AVIC
		1103	* is inhibited while KVM waits for IRQ window.
		1104	*/
1053	APICV_INHIBIT_REASON_IRQWIN,	1105	APICV_INHIBIT_REASON_IRQWIN,
		1106
		1107	/*
		1108	* PIT (i8254) 're-inject' mode, relies on EOI intercept,
		1109	* which AVIC doesn't support for edge triggered interrupts.
		1110	*/
1054	APICV_INHIBIT_REASON_PIT_REINJ,	1111	APICV_INHIBIT_REASON_PIT_REINJ,
		1112
		1113	/*
		1114	* AVIC is inhibited because the guest has x2apic in its CPUID.
		1115	*/
1055	APICV_INHIBIT_REASON_X2APIC,	1116	APICV_INHIBIT_REASON_X2APIC,
1056	APICV_INHIBIT_REASON_BLOCKIRQ,	1117
1057	APICV_INHIBIT_REASON_ABSENT,	1118	/*
		1119	* AVIC is disabled because SEV doesn't support it.
		1120	*/
1058	APICV_INHIBIT_REASON_SEV,	1121	APICV_INHIBIT_REASON_SEV,
1059	};	1122	};
1060		1123

arch/x86/include/asm/mshyperv.h+4−0

 #ifdef CONFIG_AMD_MEM_ENCRYPT
 void hv_ghcb_msr_write(u64 msr, u64 value);
 void hv_ghcb_msr_read(u64 msr, u64 *value);
+bool hv_ghcb_negotiate_protocol(void);
+void hv_ghcb_terminate(unsigned int set, unsigned int reason);
 #else
 static inline void hv_ghcb_msr_write(u64 msr, u64 value) {}
 static inline void hv_ghcb_msr_read(u64 msr, u64 *value) {}
+static inline bool hv_ghcb_negotiate_protocol(void) { return false; }
+static inline void hv_ghcb_terminate(unsigned int set, unsigned int reason) {}
 #endif
 extern bool hv_isolation_type_snp(void);

arch/x86/include/asm/msr-index.h+25−0

@@ -116,6 +116,30 @@ · 115 unmodified lines
116	* Not susceptible to	116	* Not susceptible to
117	* TSX Async Abort (TAA) vulnerabilities.	117	* TSX Async Abort (TAA) vulnerabilities.
118	*/	118	*/
		119	#define ARCH_CAP_SBDR_SSDP_NO BIT(13) /*
		120	* Not susceptible to SBDR and SSDP
		121	* variants of Processor MMIO stale data
		122	* vulnerabilities.
		123	*/
		124	#define ARCH_CAP_FBSDP_NO BIT(14) /*
		125	* Not susceptible to FBSDP variant of
		126	* Processor MMIO stale data
		127	* vulnerabilities.
		128	*/
		129	#define ARCH_CAP_PSDP_NO BIT(15) /*
		130	* Not susceptible to PSDP variant of
		131	* Processor MMIO stale data
		132	* vulnerabilities.
		133	*/
		134	#define ARCH_CAP_FB_CLEAR BIT(17) /*
		135	* VERW clears CPU fill buffer
		136	* even on MDS_NO CPUs.
		137	*/
		138	#define ARCH_CAP_FB_CLEAR_CTRL BIT(18) /*
		139	* MSR_IA32_MCU_OPT_CTRL[FB_CLEAR_DIS]
		140	* bit available to control VERW
		141	* behavior.
		142	*/
119		143
120	#define MSR_IA32_FLUSH_CMD 0x0000010b	144	#define MSR_IA32_FLUSH_CMD 0x0000010b
121	#define L1D_FLUSH BIT(0) /*	145	#define L1D_FLUSH BIT(0) /*
@@ -133,6 +157,7 @@ · 11 unmodified lines
133	#define MSR_IA32_MCU_OPT_CTRL 0x00000123	157	#define MSR_IA32_MCU_OPT_CTRL 0x00000123
134	#define RNGDS_MITG_DIS BIT(0) /* SRBDS support */	158	#define RNGDS_MITG_DIS BIT(0) /* SRBDS support */
135	#define RTM_ALLOW BIT(1) /* TSX development mode */	159	#define RTM_ALLOW BIT(1) /* TSX development mode */
		160	#define FB_CLEAR_DIS BIT(3) /* CPU Fill buffer clear disable */
136		161
137	#define MSR_IA32_SYSENTER_CS 0x00000174	162	#define MSR_IA32_SYSENTER_CS 0x00000174
138	#define MSR_IA32_SYSENTER_ESP 0x00000175	163	#define MSR_IA32_SYSENTER_ESP 0x00000175

arch/x86/include/asm/nospec-branch.h+2−0

@@ -269,6 +269,8 @@ DECLARE_STATIC_KEY_FALSE(mds_idle_clear); · 268 unmodified lines
269		269
270	DECLARE_STATIC_KEY_FALSE(switch_mm_cond_l1d_flush);	270	DECLARE_STATIC_KEY_FALSE(switch_mm_cond_l1d_flush);
271		271
		272	DECLARE_STATIC_KEY_FALSE(mmio_stale_data_clear);
		273
272	#include <asm/segment.h>	274	#include <asm/segment.h>
273		275
274	/**	276	/**

arch/x86/include/asm/pci_x86.h+8−0

 /* pci-irq.c */
+struct pci_dev;
 struct irq_info {
 	u8 bus, devfn;			/* Bus, device and function */
 	struct {
 # define x86_default_pci_init_irq	NULL
 # define x86_default_pci_fixup_irqs	NULL
 #endif
+#if defined(CONFIG_PCI) && defined(CONFIG_ACPI)
+extern bool pci_use_e820;
+#else
+#define pci_use_e820 false
+#endif

arch/x86/include/asm/setup.h+21−17

@@ -108,19 +108,16 @@ extern unsigned long _brk_end; · 107 unmodified lines
108	void *extend_brk(size_t size, size_t align);	108	void *extend_brk(size_t size, size_t align);
109		109
110	/*	110	/*
111	* Reserve space in the brk section. The name must be unique within the file,	111	* Reserve space in the .brk section, which is a block of memory from which the
112	* and somewhat descriptive. The size is in bytes.	112	* caller is allowed to allocate very early (before even memblock is available)
		113	* by calling extend_brk(). All allocated memory will be eventually converted
		114	* to memblock. Any leftover unallocated memory will be freed.
113	*	115	*
114	* The allocation is done using inline asm (rather than using a section	116	* The size is in bytes.
115	* attribute on a normal variable) in order to allow the use of @nobits, so
116	* that it doesn't take up any space in the vmlinux file.
117	*/	117	*/
118	#define RESERVE_BRK(name, size) \	118	#define RESERVE_BRK(name, size) \
119	asm(".pushsection .brk_reservation,\"aw\",@nobits\n\t" \	119	__section(".bss..brk") __aligned(1) __used \
120	".brk." #name ":\n\t" \	120	static char __brk_##name[size]
121	".skip " __stringify(size) "\n\t" \
122	".size .brk." #name ", " __stringify(size) "\n\t" \
123	".popsection\n\t")
124		121
125	extern void probe_roms(void);	122	extern void probe_roms(void);
126	#ifdef __i386__	123	#ifdef __i386__
@@ -133,12 +130,19 @@ asmlinkage void __init x86_64_start_reservations(char *real_mode_data); · 6 unmodified lines
133		130
134	#endif /* __i386__ */	131	#endif /* __i386__ */
135	#endif /* _SETUP */	132	#endif /* _SETUP */
136	#else	133
137	#define RESERVE_BRK(name,sz) \	134	#else /* __ASSEMBLY */
138	.pushsection .brk_reservation,"aw",@nobits; \	135
139	.brk.name: \	136	.macro __RESERVE_BRK name, size
140	1: .skip sz; \	137	.pushsection .bss..brk, "aw"
141	.size .brk.name,.-1b; \	138	SYM_DATA_START(__brk_\name)
		139	.skip \size
		140	SYM_DATA_END(__brk_\name)
142	.popsection	141	.popsection
		142	.endm
		143
		144	#define RESERVE_BRK(name, size) __RESERVE_BRK name, size
		145
143	#endif /* __ASSEMBLY__ */	146	#endif /* __ASSEMBLY__ */
		147
144	#endif /* _ASM_X86_SETUP_H */	148	#endif /* _ASM_X86_SETUP_H */

arch/x86/kernel/Makefile+0−4

@@ -36,10 +36,6 @@ KCSAN_SANITIZE := n · 35 unmodified lines
36		36
37	OBJECT_FILES_NON_STANDARD_test_nx.o := y	37	OBJECT_FILES_NON_STANDARD_test_nx.o := y
38		38
39	ifdef CONFIG_FRAME_POINTER
40	OBJECT_FILES_NON_STANDARD_ftrace_$(BITS).o := y
41	endif
42
43	# If instrumentation of this dir is enabled, boot hangs during first second.	39	# If instrumentation of this dir is enabled, boot hangs during first second.
44	# Probably could be more selective here, but note that files related to irqs,	40	# Probably could be more selective here, but note that files related to irqs,
45	# boot, dumpstack/stacktrace, etc are either non-interesting or can lead to	41	# boot, dumpstack/stacktrace, etc are either non-interesting or can lead to

arch/x86/kernel/cpu/bugs.c+199−36

@@ -41,8 +41,10 @@ static void __init spectre_v2_select_mitigation(void); · 40 unmodified lines
41	static void __init ssb_select_mitigation(void);	41	static void __init ssb_select_mitigation(void);
42	static void __init l1tf_select_mitigation(void);	42	static void __init l1tf_select_mitigation(void);
43	static void __init mds_select_mitigation(void);	43	static void __init mds_select_mitigation(void);
44	static void __init mds_print_mitigation(void);	44	static void __init md_clear_update_mitigation(void);
		45	static void __init md_clear_select_mitigation(void);
45	static void __init taa_select_mitigation(void);	46	static void __init taa_select_mitigation(void);
		47	static void __init mmio_select_mitigation(void);
46	static void __init srbds_select_mitigation(void);	48	static void __init srbds_select_mitigation(void);
47	static void __init l1d_flush_select_mitigation(void);	49	static void __init l1d_flush_select_mitigation(void);
48		50
@@ -85,6 +87,10 @@ EXPORT_SYMBOL_GPL(mds_idle_clear); · 36 unmodified lines
85	*/	87	*/
86	DEFINE_STATIC_KEY_FALSE(switch_mm_cond_l1d_flush);	88	DEFINE_STATIC_KEY_FALSE(switch_mm_cond_l1d_flush);
87		89
		90	/* Controls CPU Fill buffer clear before KVM guest MMIO accesses */
		91	DEFINE_STATIC_KEY_FALSE(mmio_stale_data_clear);
		92	EXPORT_SYMBOL_GPL(mmio_stale_data_clear);
		93
88	void __init check_bugs(void)	94	void __init check_bugs(void)
89	{	95	{
90	identify_boot_cpu();	96	identify_boot_cpu();
@@ -117,17 +123,10 @@ void __init check_bugs(void) · 26 unmodified lines
117	spectre_v2_select_mitigation();	123	spectre_v2_select_mitigation();
118	ssb_select_mitigation();	124	ssb_select_mitigation();
119	l1tf_select_mitigation();	125	l1tf_select_mitigation();
120	mds_select_mitigation();	126	md_clear_select_mitigation();
121	taa_select_mitigation();
122	srbds_select_mitigation();	127	srbds_select_mitigation();
123	l1d_flush_select_mitigation();	128	l1d_flush_select_mitigation();
124		129
125	/*
126	* As MDS and TAA mitigations are inter-related, print MDS
127	* mitigation until after TAA mitigation selection is done.
128	*/
129	mds_print_mitigation();
130
131	arch_smt_update();	130	arch_smt_update();
132		131
133	#ifdef CONFIG_X86_32	132	#ifdef CONFIG_X86_32
@@ -267,14 +266,6 @@ static void __init mds_select_mitigation(void) · 133 unmodified lines
267	}	266	}
268	}	267	}
269		268
270	static void __init mds_print_mitigation(void)
271	{
272	if (!boot_cpu_has_bug(X86_BUG_MDS) \|\| cpu_mitigations_off())
273	return;
274
275	pr_info("%s\n", mds_strings[mds_mitigation]);
276	}
277
278	static int __init mds_cmdline(char *str)	269	static int __init mds_cmdline(char *str)
279	{	270	{
280	if (!boot_cpu_has_bug(X86_BUG_MDS))	271	if (!boot_cpu_has_bug(X86_BUG_MDS))
@@ -329,7 +320,7 @@ static void __init taa_select_mitigation(void) · 48 unmodified lines
329	/* TSX previously disabled by tsx=off */	320	/* TSX previously disabled by tsx=off */
330	if (!boot_cpu_has(X86_FEATURE_RTM)) {	321	if (!boot_cpu_has(X86_FEATURE_RTM)) {
331	taa_mitigation = TAA_MITIGATION_TSX_DISABLED;	322	taa_mitigation = TAA_MITIGATION_TSX_DISABLED;
332	goto out;	323	return;
333	}	324	}
334		325
335	if (cpu_mitigations_off()) {	326	if (cpu_mitigations_off()) {
@@ -343,7 +334,7 @@ static void __init taa_select_mitigation(void) · 7 unmodified lines
343	*/	334	*/
344	if (taa_mitigation == TAA_MITIGATION_OFF &&	335	if (taa_mitigation == TAA_MITIGATION_OFF &&
345	mds_mitigation == MDS_MITIGATION_OFF)	336	mds_mitigation == MDS_MITIGATION_OFF)
346	goto out;	337	return;
347		338
348	if (boot_cpu_has(X86_FEATURE_MD_CLEAR))	339	if (boot_cpu_has(X86_FEATURE_MD_CLEAR))
349	taa_mitigation = TAA_MITIGATION_VERW;	340	taa_mitigation = TAA_MITIGATION_VERW;
@@ -375,18 +366,6 @@ static void __init taa_select_mitigation(void) · 25 unmodified lines
375		366
376	if (taa_nosmt \|\| cpu_mitigations_auto_nosmt())	367	if (taa_nosmt \|\| cpu_mitigations_auto_nosmt())
377	cpu_smt_disable(false);	368	cpu_smt_disable(false);
378
379	/*
380	* Update MDS mitigation, if necessary, as the mds_user_clear is
381	* now enabled for TAA mitigation.
382	*/
383	if (mds_mitigation == MDS_MITIGATION_OFF &&
384	boot_cpu_has_bug(X86_BUG_MDS)) {
385	mds_mitigation = MDS_MITIGATION_FULL;
386	mds_select_mitigation();
387	}
388	out:
389	pr_info("%s\n", taa_strings[taa_mitigation]);
390	}	369	}
391		370
392	static int __init tsx_async_abort_parse_cmdline(char *str)	371	static int __init tsx_async_abort_parse_cmdline(char *str)
@@ -410,6 +389,151 @@ static int __init tsx_async_abort_parse_cmdline(char *str) · 17 unmodified lines
410	}	389	}
411	early_param("tsx_async_abort", tsx_async_abort_parse_cmdline);	390	early_param("tsx_async_abort", tsx_async_abort_parse_cmdline);
412		391
		392	#undef pr_fmt
		393	#define pr_fmt(fmt) "MMIO Stale Data: " fmt
		394
		395	enum mmio_mitigations {
		396	MMIO_MITIGATION_OFF,
		397	MMIO_MITIGATION_UCODE_NEEDED,
		398	MMIO_MITIGATION_VERW,
		399	};
		400
		401	/* Default mitigation for Processor MMIO Stale Data vulnerabilities */
		402	static enum mmio_mitigations mmio_mitigation __ro_after_init = MMIO_MITIGATION_VERW;
		403	static bool mmio_nosmt __ro_after_init = false;
		404
		405	static const char * const mmio_strings[] = {
		406	[MMIO_MITIGATION_OFF] = "Vulnerable",
		407	[MMIO_MITIGATION_UCODE_NEEDED] = "Vulnerable: Clear CPU buffers attempted, no microcode",
		408	[MMIO_MITIGATION_VERW] = "Mitigation: Clear CPU buffers",
		409	};
		410
		411	static void __init mmio_select_mitigation(void)
		412	{
		413	u64 ia32_cap;
		414
		415	if (!boot_cpu_has_bug(X86_BUG_MMIO_STALE_DATA) \|\|
		416	cpu_mitigations_off()) {
		417	mmio_mitigation = MMIO_MITIGATION_OFF;
		418	return;
		419	}
		420
		421	if (mmio_mitigation == MMIO_MITIGATION_OFF)
		422	return;
		423
		424	ia32_cap = x86_read_arch_cap_msr();
		425
		426	/*
		427	* Enable CPU buffer clear mitigation for host and VMM, if also affected
		428	* by MDS or TAA. Otherwise, enable mitigation for VMM only.
		429	*/
		430	if (boot_cpu_has_bug(X86_BUG_MDS) \|\| (boot_cpu_has_bug(X86_BUG_TAA) &&
		431	boot_cpu_has(X86_FEATURE_RTM)))
		432	static_branch_enable(&mds_user_clear);
		433	else
		434	static_branch_enable(&mmio_stale_data_clear);
		435
		436	/*
		437	* If Processor-MMIO-Stale-Data bug is present and Fill Buffer data can
		438	* be propagated to uncore buffers, clearing the Fill buffers on idle
		439	* is required irrespective of SMT state.
		440	*/
		441	if (!(ia32_cap & ARCH_CAP_FBSDP_NO))
		442	static_branch_enable(&mds_idle_clear);
		443
		444	/*
		445	* Check if the system has the right microcode.
		446	*
		447	* CPU Fill buffer clear mitigation is enumerated by either an explicit
		448	* FB_CLEAR or by the presence of both MD_CLEAR and L1D_FLUSH on MDS
		449	* affected systems.
		450	*/
		451	if ((ia32_cap & ARCH_CAP_FB_CLEAR) \|\|
		452	(boot_cpu_has(X86_FEATURE_MD_CLEAR) &&
		453	boot_cpu_has(X86_FEATURE_FLUSH_L1D) &&
		454	!(ia32_cap & ARCH_CAP_MDS_NO)))
		455	mmio_mitigation = MMIO_MITIGATION_VERW;
		456	else
		457	mmio_mitigation = MMIO_MITIGATION_UCODE_NEEDED;
		458
		459	if (mmio_nosmt \|\| cpu_mitigations_auto_nosmt())
		460	cpu_smt_disable(false);
		461	}
		462
		463	static int __init mmio_stale_data_parse_cmdline(char *str)
		464	{
		465	if (!boot_cpu_has_bug(X86_BUG_MMIO_STALE_DATA))
		466	return 0;
		467
		468	if (!str)
		469	return -EINVAL;
		470
		471	if (!strcmp(str, "off")) {
		472	mmio_mitigation = MMIO_MITIGATION_OFF;
		473	} else if (!strcmp(str, "full")) {
		474	mmio_mitigation = MMIO_MITIGATION_VERW;
		475	} else if (!strcmp(str, "full,nosmt")) {
		476	mmio_mitigation = MMIO_MITIGATION_VERW;
		477	mmio_nosmt = true;
		478	}
		479
		480	return 0;
		481	}
		482	early_param("mmio_stale_data", mmio_stale_data_parse_cmdline);
		483
		484	#undef pr_fmt
		485	#define pr_fmt(fmt) "" fmt
		486
		487	static void __init md_clear_update_mitigation(void)
		488	{
		489	if (cpu_mitigations_off())
		490	return;
		491
		492	if (!static_key_enabled(&mds_user_clear))
		493	goto out;
		494
		495	/*
		496	* mds_user_clear is now enabled. Update MDS, TAA and MMIO Stale Data
		497	* mitigation, if necessary.
		498	*/
		499	if (mds_mitigation == MDS_MITIGATION_OFF &&
		500	boot_cpu_has_bug(X86_BUG_MDS)) {
		501	mds_mitigation = MDS_MITIGATION_FULL;
		502	mds_select_mitigation();
		503	}
		504	if (taa_mitigation == TAA_MITIGATION_OFF &&
		505	boot_cpu_has_bug(X86_BUG_TAA)) {
		506	taa_mitigation = TAA_MITIGATION_VERW;
		507	taa_select_mitigation();
		508	}
		509	if (mmio_mitigation == MMIO_MITIGATION_OFF &&
		510	boot_cpu_has_bug(X86_BUG_MMIO_STALE_DATA)) {
		511	mmio_mitigation = MMIO_MITIGATION_VERW;
		512	mmio_select_mitigation();
		513	}
		514	out:
		515	if (boot_cpu_has_bug(X86_BUG_MDS))
		516	pr_info("MDS: %s\n", mds_strings[mds_mitigation]);
		517	if (boot_cpu_has_bug(X86_BUG_TAA))
		518	pr_info("TAA: %s\n", taa_strings[taa_mitigation]);
		519	if (boot_cpu_has_bug(X86_BUG_MMIO_STALE_DATA))
		520	pr_info("MMIO Stale Data: %s\n", mmio_strings[mmio_mitigation]);
		521	}
		522
		523	static void __init md_clear_select_mitigation(void)
		524	{
		525	mds_select_mitigation();
		526	taa_select_mitigation();
		527	mmio_select_mitigation();
		528
		529	/*
		530	* As MDS, TAA and MMIO Stale Data mitigations are inter-related, update
		531	* and print their mitigation after MDS, TAA and MMIO Stale Data
		532	* mitigation selection is done.
		533	*/
		534	md_clear_update_mitigation();
		535	}
		536
413	#undef pr_fmt	537	#undef pr_fmt
414	#define pr_fmt(fmt) "SRBDS: " fmt	538	#define pr_fmt(fmt) "SRBDS: " fmt
415		539
@@ -478,11 +602,13 @@ static void __init srbds_select_mitigation(void) · 62 unmodified lines
478	return;	602	return;
479		603
480	/*	604	/*
481	* Check to see if this is one of the MDS_NO systems supporting	605	* Check to see if this is one of the MDS_NO systems supporting TSX that
482	* TSX that are only exposed to SRBDS when TSX is enabled.	606	* are only exposed to SRBDS when TSX is enabled or when CPU is affected
		607	* by Processor MMIO Stale Data vulnerability.
483	*/	608	*/
484	ia32_cap = x86_read_arch_cap_msr();	609	ia32_cap = x86_read_arch_cap_msr();
485	if ((ia32_cap & ARCH_CAP_MDS_NO) && !boot_cpu_has(X86_FEATURE_RTM))	610	if ((ia32_cap & ARCH_CAP_MDS_NO) && !boot_cpu_has(X86_FEATURE_RTM) &&
		611	!boot_cpu_has_bug(X86_BUG_MMIO_STALE_DATA))
486	srbds_mitigation = SRBDS_MITIGATION_TSX_OFF;	612	srbds_mitigation = SRBDS_MITIGATION_TSX_OFF;
487	else if (boot_cpu_has(X86_FEATURE_HYPERVISOR))	613	else if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
488	srbds_mitigation = SRBDS_MITIGATION_HYPERVISOR;	614	srbds_mitigation = SRBDS_MITIGATION_HYPERVISOR;
@@ -1116,6 +1242,8 @@ static void update_indir_branch_cond(void) · 627 unmodified lines
1116	/* Update the static key controlling the MDS CPU buffer clear in idle */	1242	/* Update the static key controlling the MDS CPU buffer clear in idle */
1117	static void update_mds_branch_idle(void)	1243	static void update_mds_branch_idle(void)
1118	{	1244	{
		1245	u64 ia32_cap = x86_read_arch_cap_msr();
		1246
1119	/*	1247	/*
1120	* Enable the idle clearing if SMT is active on CPUs which are	1248	* Enable the idle clearing if SMT is active on CPUs which are
1121	* affected only by MSBDS and not any other MDS variant.	1249	* affected only by MSBDS and not any other MDS variant.
@@ -1127,14 +1255,17 @@ static void update_mds_branch_idle(void) · 5 unmodified lines
1127	if (!boot_cpu_has_bug(X86_BUG_MSBDS_ONLY))	1255	if (!boot_cpu_has_bug(X86_BUG_MSBDS_ONLY))
1128	return;	1256	return;
1129		1257
1130	if (sched_smt_active())	1258	if (sched_smt_active()) {
1131	static_branch_enable(&mds_idle_clear);	1259	static_branch_enable(&mds_idle_clear);
1132	else	1260	} else if (mmio_mitigation == MMIO_MITIGATION_OFF \|\|
		1261	(ia32_cap & ARCH_CAP_FBSDP_NO)) {
1133	static_branch_disable(&mds_idle_clear);	1262	static_branch_disable(&mds_idle_clear);
		1263	}
1134	}	1264	}
1135		1265
1136	#define MDS_MSG_SMT "MDS CPU bug present and SMT on, data leak possible. See https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html for more details.\n"	1266	#define MDS_MSG_SMT "MDS CPU bug present and SMT on, data leak possible. See https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html for more details.\n"
1137	#define TAA_MSG_SMT "TAA CPU bug present and SMT on, data leak possible. See https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/tsx_async_abort.html for more details.\n"	1267	#define TAA_MSG_SMT "TAA CPU bug present and SMT on, data leak possible. See https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/tsx_async_abort.html for more details.\n"
		1268	#define MMIO_MSG_SMT "MMIO Stale Data CPU bug present and SMT on, data leak possible. See https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/processor_mmio_stale_data.html for more details.\n"
1138		1269
1139	void cpu_bugs_smt_update(void)	1270	void cpu_bugs_smt_update(void)
1140	{	1271	{
@@ -1179,6 +1310,16 @@ void cpu_bugs_smt_update(void) · 38 unmodified lines
1179	break;	1310	break;
1180	}	1311	}
1181		1312
		1313	switch (mmio_mitigation) {
		1314	case MMIO_MITIGATION_VERW:
		1315	case MMIO_MITIGATION_UCODE_NEEDED:
		1316	if (sched_smt_active())
		1317	pr_warn_once(MMIO_MSG_SMT);
		1318	break;
		1319	case MMIO_MITIGATION_OFF:
		1320	break;
		1321	}
		1322
1182	mutex_unlock(&spec_ctrl_mutex);	1323	mutex_unlock(&spec_ctrl_mutex);
1183	}	1324	}
1184		1325
@@ -1781,6 +1922,20 @@ static ssize_t tsx_async_abort_show_state(char *buf) · 596 unmodified lines
1781	sched_smt_active() ? "vulnerable" : "disabled");	1922	sched_smt_active() ? "vulnerable" : "disabled");
1782	}	1923	}
1783		1924
		1925	static ssize_t mmio_stale_data_show_state(char *buf)
		1926	{
		1927	if (mmio_mitigation == MMIO_MITIGATION_OFF)
		1928	return sysfs_emit(buf, "%s\n", mmio_strings[mmio_mitigation]);
		1929
		1930	if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) {
		1931	return sysfs_emit(buf, "%s; SMT Host state unknown\n",
		1932	mmio_strings[mmio_mitigation]);
		1933	}
		1934
		1935	return sysfs_emit(buf, "%s; SMT %s\n", mmio_strings[mmio_mitigation],
		1936	sched_smt_active() ? "vulnerable" : "disabled");
		1937	}
		1938
1784	static char *stibp_state(void)	1939	static char *stibp_state(void)
1785	{	1940	{
1786	if (spectre_v2_in_eibrs_mode(spectre_v2_enabled))	1941	if (spectre_v2_in_eibrs_mode(spectre_v2_enabled))
@@ -1881,6 +2036,9 @@ static ssize_t cpu_show_common(struct device dev, struct device_attribute attr · 94 unmodified lines
1881	case X86_BUG_SRBDS:	2036	case X86_BUG_SRBDS:
1882	return srbds_show_state(buf);	2037	return srbds_show_state(buf);
1883		2038
		2039	case X86_BUG_MMIO_STALE_DATA:
		2040	return mmio_stale_data_show_state(buf);
		2041
1884	default:	2042	default:
1885	break;	2043	break;
1886	}	2044	}
@@ -1932,4 +2090,9 @@ ssize_t cpu_show_srbds(struct device dev, struct device_attribute attr, char * · 45 unmodified lines
1932	{	2090	{
1933	return cpu_show_common(dev, attr, buf, X86_BUG_SRBDS);	2091	return cpu_show_common(dev, attr, buf, X86_BUG_SRBDS);
1934	}	2092	}
		2093
		2094	ssize_t cpu_show_mmio_stale_data(struct device dev, struct device_attribute attr, char *buf)
		2095	{
		2096	return cpu_show_common(dev, attr, buf, X86_BUG_MMIO_STALE_DATA);
		2097	}
1935	#endif	2098	#endif

arch/x86/kernel/cpu/common.c+49−3

@@ -1211,18 +1211,42 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = { · 1210 unmodified lines
1211	X86_FEATURE_ANY, issues)	1211	X86_FEATURE_ANY, issues)
1212		1212
1213	#define SRBDS BIT(0)	1213	#define SRBDS BIT(0)
		1214	/* CPU is affected by X86_BUG_MMIO_STALE_DATA */
		1215	#define MMIO BIT(1)
		1216	/* CPU is affected by Shared Buffers Data Sampling (SBDS), a variant of X86_BUG_MMIO_STALE_DATA */
		1217	#define MMIO_SBDS BIT(2)
1214		1218
1215	static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {	1219	static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {
1216	VULNBL_INTEL_STEPPINGS(IVYBRIDGE, X86_STEPPING_ANY, SRBDS),	1220	VULNBL_INTEL_STEPPINGS(IVYBRIDGE, X86_STEPPING_ANY, SRBDS),
1217	VULNBL_INTEL_STEPPINGS(HASWELL, X86_STEPPING_ANY, SRBDS),	1221	VULNBL_INTEL_STEPPINGS(HASWELL, X86_STEPPING_ANY, SRBDS),
1218	VULNBL_INTEL_STEPPINGS(HASWELL_L, X86_STEPPING_ANY, SRBDS),	1222	VULNBL_INTEL_STEPPINGS(HASWELL_L, X86_STEPPING_ANY, SRBDS),
1219	VULNBL_INTEL_STEPPINGS(HASWELL_G, X86_STEPPING_ANY, SRBDS),	1223	VULNBL_INTEL_STEPPINGS(HASWELL_G, X86_STEPPING_ANY, SRBDS),
		1224	VULNBL_INTEL_STEPPINGS(HASWELL_X, BIT(2) \| BIT(4), MMIO),
		1225	VULNBL_INTEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x3, 0x5), MMIO),
1220	VULNBL_INTEL_STEPPINGS(BROADWELL_G, X86_STEPPING_ANY, SRBDS),	1226	VULNBL_INTEL_STEPPINGS(BROADWELL_G, X86_STEPPING_ANY, SRBDS),
		1227	VULNBL_INTEL_STEPPINGS(BROADWELL_X, X86_STEPPING_ANY, MMIO),
1221	VULNBL_INTEL_STEPPINGS(BROADWELL, X86_STEPPING_ANY, SRBDS),	1228	VULNBL_INTEL_STEPPINGS(BROADWELL, X86_STEPPING_ANY, SRBDS),
		1229	VULNBL_INTEL_STEPPINGS(SKYLAKE_L, X86_STEPPINGS(0x3, 0x3), SRBDS \| MMIO),
1222	VULNBL_INTEL_STEPPINGS(SKYLAKE_L, X86_STEPPING_ANY, SRBDS),	1230	VULNBL_INTEL_STEPPINGS(SKYLAKE_L, X86_STEPPING_ANY, SRBDS),
		1231	VULNBL_INTEL_STEPPINGS(SKYLAKE_X, BIT(3) \| BIT(4) \| BIT(6) \|
		1232	BIT(7) \| BIT(0xB), MMIO),
		1233	VULNBL_INTEL_STEPPINGS(SKYLAKE, X86_STEPPINGS(0x3, 0x3), SRBDS \| MMIO),
1223	VULNBL_INTEL_STEPPINGS(SKYLAKE, X86_STEPPING_ANY, SRBDS),	1234	VULNBL_INTEL_STEPPINGS(SKYLAKE, X86_STEPPING_ANY, SRBDS),
1224	VULNBL_INTEL_STEPPINGS(KABYLAKE_L, X86_STEPPINGS(0x0, 0xC), SRBDS),	1235	VULNBL_INTEL_STEPPINGS(KABYLAKE_L, X86_STEPPINGS(0x9, 0xC), SRBDS \| MMIO),
1225	VULNBL_INTEL_STEPPINGS(KABYLAKE, X86_STEPPINGS(0x0, 0xD), SRBDS),	1236	VULNBL_INTEL_STEPPINGS(KABYLAKE_L, X86_STEPPINGS(0x0, 0x8), SRBDS),
		1237	VULNBL_INTEL_STEPPINGS(KABYLAKE, X86_STEPPINGS(0x9, 0xD), SRBDS \| MMIO),
		1238	VULNBL_INTEL_STEPPINGS(KABYLAKE, X86_STEPPINGS(0x0, 0x8), SRBDS),
		1239	VULNBL_INTEL_STEPPINGS(ICELAKE_L, X86_STEPPINGS(0x5, 0x5), MMIO \| MMIO_SBDS),
		1240	VULNBL_INTEL_STEPPINGS(ICELAKE_D, X86_STEPPINGS(0x1, 0x1), MMIO),
		1241	VULNBL_INTEL_STEPPINGS(ICELAKE_X, X86_STEPPINGS(0x4, 0x6), MMIO),
		1242	VULNBL_INTEL_STEPPINGS(COMETLAKE, BIT(2) \| BIT(3) \| BIT(5), MMIO \| MMIO_SBDS),
		1243	VULNBL_INTEL_STEPPINGS(COMETLAKE_L, X86_STEPPINGS(0x1, 0x1), MMIO \| MMIO_SBDS),
		1244	VULNBL_INTEL_STEPPINGS(COMETLAKE_L, X86_STEPPINGS(0x0, 0x0), MMIO),
		1245	VULNBL_INTEL_STEPPINGS(LAKEFIELD, X86_STEPPINGS(0x1, 0x1), MMIO \| MMIO_SBDS),
		1246	VULNBL_INTEL_STEPPINGS(ROCKETLAKE, X86_STEPPINGS(0x1, 0x1), MMIO),
		1247	VULNBL_INTEL_STEPPINGS(ATOM_TREMONT, X86_STEPPINGS(0x1, 0x1), MMIO \| MMIO_SBDS),
		1248	VULNBL_INTEL_STEPPINGS(ATOM_TREMONT_D, X86_STEPPING_ANY, MMIO),
		1249	VULNBL_INTEL_STEPPINGS(ATOM_TREMONT_L, X86_STEPPINGS(0x0, 0x0), MMIO \| MMIO_SBDS),
1226	{}	1250	{}
1227	};	1251	};
1228		1252
@@ -1243,6 +1267,13 @@ u64 x86_read_arch_cap_msr(void) · 14 unmodified lines
1243	return ia32_cap;	1267	return ia32_cap;
1244	}	1268	}
1245		1269
		1270	static bool arch_cap_mmio_immune(u64 ia32_cap)
		1271	{
		1272	return (ia32_cap & ARCH_CAP_FBSDP_NO &&
		1273	ia32_cap & ARCH_CAP_PSDP_NO &&
		1274	ia32_cap & ARCH_CAP_SBDR_SSDP_NO);
		1275	}
		1276
1246	static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c)	1277	static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c)
1247	{	1278	{
1248	u64 ia32_cap = x86_read_arch_cap_msr();	1279	u64 ia32_cap = x86_read_arch_cap_msr();
@@ -1296,12 +1327,27 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c) · 47 unmodified lines
1296	/*	1327	/*
1297	* SRBDS affects CPUs which support RDRAND or RDSEED and are listed	1328	* SRBDS affects CPUs which support RDRAND or RDSEED and are listed
1298	* in the vulnerability blacklist.	1329	* in the vulnerability blacklist.
		1330	*
		1331	* Some of the implications and mitigation of Shared Buffers Data
		1332	* Sampling (SBDS) are similar to SRBDS. Give SBDS same treatment as
		1333	* SRBDS.
1299	*/	1334	*/
1300	if ((cpu_has(c, X86_FEATURE_RDRAND) \|\|	1335	if ((cpu_has(c, X86_FEATURE_RDRAND) \|\|
1301	cpu_has(c, X86_FEATURE_RDSEED)) &&	1336	cpu_has(c, X86_FEATURE_RDSEED)) &&
1302	cpu_matches(cpu_vuln_blacklist, SRBDS))	1337	cpu_matches(cpu_vuln_blacklist, SRBDS \| MMIO_SBDS))
1303	setup_force_cpu_bug(X86_BUG_SRBDS);	1338	setup_force_cpu_bug(X86_BUG_SRBDS);
1304		1339
		1340	/*
		1341	* Processor MMIO Stale Data bug enumeration
		1342	*
		1343	* Affected CPU list is generally enough to enumerate the vulnerability,
		1344	* but for virtualization case check for ARCH_CAP MSR bits also, VMM may
		1345	* not want the guest to enumerate the bug.
		1346	*/
		1347	if (cpu_matches(cpu_vuln_blacklist, MMIO) &&
		1348	!arch_cap_mmio_immune(ia32_cap))
		1349	setup_force_cpu_bug(X86_BUG_MMIO_STALE_DATA);
		1350
1305	if (cpu_matches(cpu_vuln_whitelist, NO_MELTDOWN))	1351	if (cpu_matches(cpu_vuln_whitelist, NO_MELTDOWN))
1306	return;	1352	return;
1307		1353

arch/x86/kernel/ftrace_64.S+8−3

 	jmp ftrace_epilogue
 SYM_FUNC_END(ftrace_caller);
+STACK_FRAME_NON_STANDARD_FP(ftrace_caller)
 SYM_FUNC_START(ftrace_epilogue)
 /*
 	jmp	ftrace_epilogue
 SYM_FUNC_END(ftrace_regs_caller)
+STACK_FRAME_NON_STANDARD_FP(ftrace_regs_caller)
 #else /* ! CONFIG_DYNAMIC_FTRACE */
 	jmp ftrace_stub
 SYM_FUNC_END(__fentry__)
 EXPORT_SYMBOL(__fentry__)
+STACK_FRAME_NON_STANDARD_FP(__fentry__)
 #endif /* CONFIG_DYNAMIC_FTRACE */
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-SYM_FUNC_START(return_to_handler)
+SYM_CODE_START(return_to_handler)
+	UNWIND_HINT_EMPTY
+	ANNOTATE_NOENDBR
 	subq  $16, %rsp
 	/* Save the return values */
 	int3
 .Ldo_rop:
 	mov %rdi, (%rsp)
-	UNWIND_HINT_FUNC
 	RET
-SYM_FUNC_END(return_to_handler)
+SYM_CODE_END(return_to_handler)
 #endif

arch/x86/kernel/resource.c+9−5

 // SPDX-License-Identifier: GPL-2.0
-#include <linux/dev_printk.h>
 #include <linux/ioport.h>
+#include <linux/printk.h>
 #include <asm/e820/api.h>
+#include <asm/pci_x86.h>
 static void resource_clip(struct resource *res, resource_size_t start,
 			  resource_size_t end)
 		res->start = end + 1;
 }
-void remove_e820_regions(struct device *dev, struct resource *avail)
+static void remove_e820_regions(struct resource *avail)
 {
 	int i;
 	struct e820_entry *entry;
 	u64 e820_start, e820_end;
 	struct resource orig = *avail;
-	if (!(avail->flags & IORESOURCE_MEM))
+	if (!pci_use_e820)
 		return;
 	for (i = 0; i < e820_table->nr_entries; i++) {
 		resource_clip(avail, e820_start, e820_end);
 		if (orig.start != avail->start || orig.end != avail->end) {
-			dev_info(dev, "clipped %pR to %pR for e820 entry [mem %#010Lx-%#010Lx]\n",
+			pr_info("clipped %pR to %pR for e820 entry [mem %#010Lx-%#010Lx]\n",
 				 &orig, avail, e820_start, e820_end);
 			orig = *avail;
 		}
 	 * the low 1MB unconditionally, as this area is needed for some ISA
 	 * cards requiring a memory range, e.g. the i82365 PCMCIA controller.
 	 */
-	if (avail->flags & IORESOURCE_MEM)
+	if (avail->flags & IORESOURCE_MEM) {
 		resource_clip(avail, BIOS_ROM_BASE, BIOS_ROM_END);
+		remove_e820_regions(avail);
+	}
 }

arch/x86/kernel/setup.c+0−5

 #endif
-/*
- * Range of the BSS area. The size of the BSS area is determined
- * at link time, with RESERVE_BRK() facility reserving additional
- * chunks.
- */
 unsigned long _brk_start = (unsigned long)__brk_base;
 unsigned long _brk_end   = (unsigned long)__brk_base;

arch/x86/kernel/vmlinux.lds.S+2−2

@@ -385,10 +385,10 @@ SECTIONS · 384 unmodified lines
385	__end_of_kernel_reserve = .;	385	__end_of_kernel_reserve = .;
386		386
387	. = ALIGN(PAGE_SIZE);	387	. = ALIGN(PAGE_SIZE);
388	.brk : AT(ADDR(.brk) - LOAD_OFFSET) {	388	.brk (NOLOAD) : AT(ADDR(.brk) - LOAD_OFFSET) {
389	__brk_base = .;	389	__brk_base = .;
390	. += 64 * 1024; /* 64k alignment slop space */	390	. += 64 * 1024; /* 64k alignment slop space */
391	(.brk_reservation) / areas brk users have reserved */	391	(.bss..brk) / areas brk users have reserved */
392	__brk_limit = .;	392	__brk_limit = .;
393	}	393	}
394		394

arch/x86/kvm/lapic.c+23−4

 	}
 }
+static void kvm_lapic_xapic_id_updated(struct kvm_lapic *apic)
+{
+	struct kvm *kvm = apic->vcpu->kvm;
+	if (KVM_BUG_ON(apic_x2apic_mode(apic), kvm))
+		return;
+	if (kvm_xapic_id(apic) == apic->vcpu->vcpu_id)
+		return;
+	kvm_set_apicv_inhibit(apic->vcpu->kvm, APICV_INHIBIT_REASON_APIC_ID_MODIFIED);
+}
 static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
 {
 	int ret = 0;
 	switch (reg) {
 	case APIC_ID:		/* Local APIC ID */
-		if (!apic_x2apic_mode(apic))
+		if (!apic_x2apic_mode(apic)) {
 			kvm_apic_set_xapic_id(apic, val >> 24);
-		else
+			kvm_lapic_xapic_id_updated(apic);
+		} else {
 			ret = 1;
+		}
 		break;
 	case APIC_TASKPRI:
 			     MSR_IA32_APICBASE_BASE;
 	if ((value & MSR_IA32_APICBASE_ENABLE) &&
-	     apic->base_address != APIC_DEFAULT_PHYS_BASE)
+	     apic->base_address != APIC_DEFAULT_PHYS_BASE) {
-		pr_warn_once("APIC base relocation is unsupported by KVM");
+		kvm_set_apicv_inhibit(apic->vcpu->kvm,
+				      APICV_INHIBIT_REASON_APIC_BASE_MODIFIED);
+	}
 }
 void kvm_apic_update_apicv(struct kvm_vcpu *vcpu)
 			icr = __kvm_lapic_get_reg64(s->regs, APIC_ICR);
 			__kvm_lapic_set_reg(s->regs, APIC_ICR2, icr >> 32);
 		}
+	} else {
+		kvm_lapic_xapic_id_updated(vcpu->arch.apic);
 	}
 	return 0;

arch/x86/kvm/mmu/mmu.c+1−1

@@ -3411,7 +3411,7 @@ static int mmu_alloc_direct_roots(struct kvm_vcpu *vcpu) · 3410 unmodified lines
3411	root = mmu_alloc_root(vcpu, i << (30 - PAGE_SHIFT),	3411	root = mmu_alloc_root(vcpu, i << (30 - PAGE_SHIFT),
3412	i << 30, PT32_ROOT_LEVEL, true);	3412	i << 30, PT32_ROOT_LEVEL, true);
3413	mmu->pae_root[i] = root \| PT_PRESENT_MASK \|	3413	mmu->pae_root[i] = root \| PT_PRESENT_MASK \|
3414	shadow_me_mask;	3414	shadow_me_value;
3415	}	3415	}
3416	mmu->root.hpa = __pa(mmu->pae_root);	3416	mmu->root.hpa = __pa(mmu->pae_root);
3417	} else {	3417	} else {

arch/x86/kvm/svm/avic.c+76−95

@@ -291,58 +291,91 @@ void avic_ring_doorbell(struct kvm_vcpu *vcpu) · 290 unmodified lines
291	static int avic_kick_target_vcpus_fast(struct kvm kvm, struct kvm_lapic source,	291	static int avic_kick_target_vcpus_fast(struct kvm kvm, struct kvm_lapic source,
292	u32 icrl, u32 icrh, u32 index)	292	u32 icrl, u32 icrh, u32 index)
293	{	293	{
294	u32 dest, apic_id;	294	u32 l1_physical_id, dest;
295	struct kvm_vcpu *vcpu;	295	struct kvm_vcpu *target_vcpu;
296	int dest_mode = icrl & APIC_DEST_MASK;	296	int dest_mode = icrl & APIC_DEST_MASK;
297	int shorthand = icrl & APIC_SHORT_MASK;	297	int shorthand = icrl & APIC_SHORT_MASK;
298	struct kvm_svm *kvm_svm = to_kvm_svm(kvm);	298	struct kvm_svm *kvm_svm = to_kvm_svm(kvm);
299	u32 *avic_logical_id_table = page_address(kvm_svm->avic_logical_id_table_page);
300		299
301	if (shorthand != APIC_DEST_NOSHORT)	300	if (shorthand != APIC_DEST_NOSHORT)
302	return -EINVAL;	301	return -EINVAL;
303		302
304	/*	303	if (apic_x2apic_mode(source))
305	* The AVIC incomplete IPI #vmexit info provides index into	304	dest = icrh;
306	* the physical APIC ID table, which can be used to derive	305	else
307	* guest physical APIC ID.	306	dest = GET_APIC_DEST_FIELD(icrh);
308	*/	307
309	if (dest_mode == APIC_DEST_PHYSICAL) {	308	if (dest_mode == APIC_DEST_PHYSICAL) {
310	apic_id = index;	309	/* broadcast destination, use slow path */
		310	if (apic_x2apic_mode(source) && dest == X2APIC_BROADCAST)
		311	return -EINVAL;
		312	if (!apic_x2apic_mode(source) && dest == APIC_BROADCAST)
		313	return -EINVAL;
		314
		315	l1_physical_id = dest;
		316
		317	if (WARN_ON_ONCE(l1_physical_id != index))
		318	return -EINVAL;
		319
311	} else {	320	} else {
312	if (!apic_x2apic_mode(source)) {	321	u32 bitmap, cluster;
313	/* For xAPIC logical mode, the index is for logical APIC table. */	322	int logid_index;
314	apic_id = avic_logical_id_table[index] & 0x1ff;	323
		324	if (apic_x2apic_mode(source)) {
		325	/* 16 bit dest mask, 16 bit cluster id */
		326	bitmap = dest & 0xFFFF0000;
		327	cluster = (dest >> 16) << 4;
		328	} else if (kvm_lapic_get_reg(source, APIC_DFR) == APIC_DFR_FLAT) {
		329	/* 8 bit dest mask*/
		330	bitmap = dest;
		331	cluster = 0;
315	} else {	332	} else {
316	return -EINVAL;	333	/* 4 bit desk mask, 4 bit cluster id */
		334	bitmap = dest & 0xF;
		335	cluster = (dest >> 4) << 2;
317	}	336	}
318	}
319		337
320	/*	338	if (unlikely(!bitmap))
321	* Assuming vcpu ID is the same as physical apic ID,	339	/* guest bug: nobody to send the logical interrupt to */
322	* and use it to retrieve the target vCPU.	340	return 0;
323	*/
324	vcpu = kvm_get_vcpu_by_id(kvm, apic_id);
325	if (!vcpu)
326	return -EINVAL;
327		341
328	if (apic_x2apic_mode(vcpu->arch.apic))	342	if (!is_power_of_2(bitmap))
329	dest = icrh;	343	/* multiple logical destinations, use slow path */
330	else	344	return -EINVAL;
331	dest = GET_APIC_DEST_FIELD(icrh);
332		345
333	/*	346	logid_index = cluster + __ffs(bitmap);
334	* Try matching the destination APIC ID with the vCPU.	347
335	*/	348	if (apic_x2apic_mode(source)) {
336	if (kvm_apic_match_dest(vcpu, source, shorthand, dest, dest_mode)) {	349	l1_physical_id = logid_index;
337	vcpu->arch.apic->irr_pending = true;	350	} else {
338	svm_complete_interrupt_delivery(vcpu,	351	u32 *avic_logical_id_table =
339	icrl & APIC_MODE_MASK,	352	page_address(kvm_svm->avic_logical_id_table_page);
340	icrl & APIC_INT_LEVELTRIG,	353
341	icrl & APIC_VECTOR_MASK);	354	u32 logid_entry = avic_logical_id_table[logid_index];
342	return 0;	355
		356	if (WARN_ON_ONCE(index != logid_index))
		357	return -EINVAL;
		358
		359	/* guest bug: non existing/reserved logical destination */
		360	if (unlikely(!(logid_entry & AVIC_LOGICAL_ID_ENTRY_VALID_MASK)))
		361	return 0;
		362
		363	l1_physical_id = logid_entry &
		364	AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK;
		365	}
343	}	366	}
344		367
345	return -EINVAL;	368	target_vcpu = kvm_get_vcpu_by_id(kvm, l1_physical_id);
		369	if (unlikely(!target_vcpu))
		370	/* guest bug: non existing vCPU is a target of this IPI*/
		371	return 0;
		372
		373	target_vcpu->arch.apic->irr_pending = true;
		374	svm_complete_interrupt_delivery(target_vcpu,
		375	icrl & APIC_MODE_MASK,
		376	icrl & APIC_INT_LEVELTRIG,
		377	icrl & APIC_VECTOR_MASK);
		378	return 0;
346	}	379	}
347		380
348	static void avic_kick_target_vcpus(struct kvm kvm, struct kvm_lapic source,	381	static void avic_kick_target_vcpus(struct kvm kvm, struct kvm_lapic source,
@@ -508,35 +541,6 @@ static int avic_handle_ldr_update(struct kvm_vcpu *vcpu) · 159 unmodified lines
508	return ret;	541	return ret;
509	}	542	}
510		543
511	static int avic_handle_apic_id_update(struct kvm_vcpu *vcpu)
512	{
513	u64 old, new;
514	struct vcpu_svm *svm = to_svm(vcpu);
515	u32 id = kvm_xapic_id(vcpu->arch.apic);
516
517	if (vcpu->vcpu_id == id)
518	return 0;
519
520	old = avic_get_physical_id_entry(vcpu, vcpu->vcpu_id);
521	new = avic_get_physical_id_entry(vcpu, id);
522	if (!new \|\| !old)
523	return 1;
524
525	/* We need to move physical_id_entry to new offset */
526	new = old;
527	*old = 0ULL;
528	to_svm(vcpu)->avic_physical_id_cache = new;
529
530	/*
531	* Also update the guest physical APIC ID in the logical
532	* APIC ID table entry if already setup the LDR.
533	*/
534	if (svm->ldr_reg)
535	avic_handle_ldr_update(vcpu);
536
537	return 0;
538	}
539
540	static void avic_handle_dfr_update(struct kvm_vcpu *vcpu)	544	static void avic_handle_dfr_update(struct kvm_vcpu *vcpu)
541	{	545	{
542	struct vcpu_svm *svm = to_svm(vcpu);	546	struct vcpu_svm *svm = to_svm(vcpu);
@@ -555,10 +559,6 @@ static int avic_unaccel_trap_write(struct kvm_vcpu *vcpu) · 12 unmodified lines
555	AVIC_UNACCEL_ACCESS_OFFSET_MASK;	559	AVIC_UNACCEL_ACCESS_OFFSET_MASK;
556		560
557	switch (offset) {	561	switch (offset) {
558	case APIC_ID:
559	if (avic_handle_apic_id_update(vcpu))
560	return 0;
561	break;
562	case APIC_LDR:	562	case APIC_LDR:
563	if (avic_handle_ldr_update(vcpu))	563	if (avic_handle_ldr_update(vcpu))
564	return 0;	564	return 0;
@@ -650,8 +650,6 @@ int avic_init_vcpu(struct vcpu_svm *svm) · 85 unmodified lines
650		650
651	void avic_apicv_post_state_restore(struct kvm_vcpu *vcpu)	651	void avic_apicv_post_state_restore(struct kvm_vcpu *vcpu)
652	{	652	{
653	if (avic_handle_apic_id_update(vcpu) != 0)
654	return;
655	avic_handle_dfr_update(vcpu);	653	avic_handle_dfr_update(vcpu);
656	avic_handle_ldr_update(vcpu);	654	avic_handle_ldr_update(vcpu);
657	}	655	}
@@ -910,7 +908,9 @@ bool avic_check_apicv_inhibit_reasons(enum kvm_apicv_inhibit reason) · 252 unmodified lines
910	BIT(APICV_INHIBIT_REASON_PIT_REINJ) \|	908	BIT(APICV_INHIBIT_REASON_PIT_REINJ) \|
911	BIT(APICV_INHIBIT_REASON_X2APIC) \|	909	BIT(APICV_INHIBIT_REASON_X2APIC) \|
912	BIT(APICV_INHIBIT_REASON_BLOCKIRQ) \|	910	BIT(APICV_INHIBIT_REASON_BLOCKIRQ) \|
913	BIT(APICV_INHIBIT_REASON_SEV);	911	BIT(APICV_INHIBIT_REASON_SEV) \|
		912	BIT(APICV_INHIBIT_REASON_APIC_ID_MODIFIED) \|
		913	BIT(APICV_INHIBIT_REASON_APIC_BASE_MODIFIED);
914		914
915	return supported & BIT(reason);	915	return supported & BIT(reason);
916	}	916	}
@@ -946,7 +946,7 @@ out: · 29 unmodified lines
946	return ret;	946	return ret;
947	}	947	}
948		948
949	void __avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu)	949	void avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
950	{	950	{
951	u64 entry;	951	u64 entry;
952	int h_physical_id = kvm_cpu_get_apicid(cpu);	952	int h_physical_id = kvm_cpu_get_apicid(cpu);
@@ -978,7 +978,7 @@ void __avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu) · 25 unmodified lines
978	avic_update_iommu_vcpu_affinity(vcpu, h_physical_id, true);	978	avic_update_iommu_vcpu_affinity(vcpu, h_physical_id, true);
979	}	979	}
980		980
981	void __avic_vcpu_put(struct kvm_vcpu *vcpu)	981	void avic_vcpu_put(struct kvm_vcpu *vcpu)
982	{	982	{
983	u64 entry;	983	u64 entry;
984	struct vcpu_svm *svm = to_svm(vcpu);	984	struct vcpu_svm *svm = to_svm(vcpu);
@@ -997,25 +997,6 @@ void __avic_vcpu_put(struct kvm_vcpu *vcpu) · 12 unmodified lines
997	WRITE_ONCE(*(svm->avic_physical_id_cache), entry);	997	WRITE_ONCE(*(svm->avic_physical_id_cache), entry);
998	}	998	}
999		999
1000	static void avic_vcpu_load(struct kvm_vcpu *vcpu)
1001	{
1002	int cpu = get_cpu();
1003
1004	WARN_ON(cpu != vcpu->cpu);
1005
1006	__avic_vcpu_load(vcpu, cpu);
1007
1008	put_cpu();
1009	}
1010
1011	static void avic_vcpu_put(struct kvm_vcpu *vcpu)
1012	{
1013	preempt_disable();
1014
1015	__avic_vcpu_put(vcpu);
1016
1017	preempt_enable();
1018	}
1019		1000
1020	void avic_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu)	1001	void avic_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu)
1021	{	1002	{
@@ -1042,7 +1023,7 @@ void avic_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu) · 20 unmodified lines
1042	vmcb_mark_dirty(vmcb, VMCB_AVIC);	1023	vmcb_mark_dirty(vmcb, VMCB_AVIC);
1043		1024
1044	if (activated)	1025	if (activated)
1045	avic_vcpu_load(vcpu);	1026	avic_vcpu_load(vcpu, vcpu->cpu);
1046	else	1027	else
1047	avic_vcpu_put(vcpu);	1028	avic_vcpu_put(vcpu);
1048		1029
@@ -1075,5 +1056,5 @@ void avic_vcpu_unblocking(struct kvm_vcpu *vcpu) · 26 unmodified lines
1075	if (!kvm_vcpu_apicv_active(vcpu))	1056	if (!kvm_vcpu_apicv_active(vcpu))
1076	return;	1057	return;
1077		1058
1078	avic_vcpu_load(vcpu);	1059	avic_vcpu_load(vcpu, vcpu->cpu);
1079	}	1060	}

arch/x86/kvm/svm/nested.c+21−18

@@ -616,6 +616,8 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm) · 615 unmodified lines
616	struct kvm_vcpu *vcpu = &svm->vcpu;	616	struct kvm_vcpu *vcpu = &svm->vcpu;
617	struct vmcb *vmcb01 = svm->vmcb01.ptr;	617	struct vmcb *vmcb01 = svm->vmcb01.ptr;
618	struct vmcb *vmcb02 = svm->nested.vmcb02.ptr;	618	struct vmcb *vmcb02 = svm->nested.vmcb02.ptr;
		619	u32 pause_count12;
		620	u32 pause_thresh12;
619		621
620	/*	622	/*
621	* Filled at exit: exit_code, exit_code_hi, exit_info_1, exit_info_2,	623	* Filled at exit: exit_code, exit_code_hi, exit_info_1, exit_info_2,
@@ -671,27 +673,25 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm) · 49 unmodified lines
671	if (!nested_vmcb_needs_vls_intercept(svm))	673	if (!nested_vmcb_needs_vls_intercept(svm))
672	vmcb02->control.virt_ext \|= VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK;	674	vmcb02->control.virt_ext \|= VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK;
673		675
		676	pause_count12 = svm->pause_filter_enabled ? svm->nested.ctl.pause_filter_count : 0;
		677	pause_thresh12 = svm->pause_threshold_enabled ? svm->nested.ctl.pause_filter_thresh : 0;
674	if (kvm_pause_in_guest(svm->vcpu.kvm)) {	678	if (kvm_pause_in_guest(svm->vcpu.kvm)) {
675	/* use guest values since host doesn't use them */	679	/* use guest values since host doesn't intercept PAUSE */
676	vmcb02->control.pause_filter_count =	680	vmcb02->control.pause_filter_count = pause_count12;
677	svm->pause_filter_enabled ?	681	vmcb02->control.pause_filter_thresh = pause_thresh12;
678	svm->nested.ctl.pause_filter_count : 0;
679		682
680	vmcb02->control.pause_filter_thresh =	683	} else {
681	svm->pause_threshold_enabled ?	684	/* start from host values otherwise */
682	svm->nested.ctl.pause_filter_thresh : 0;
683
684	} else if (!vmcb12_is_intercept(&svm->nested.ctl, INTERCEPT_PAUSE)) {
685	/* use host values when guest doesn't use them */
686	vmcb02->control.pause_filter_count = vmcb01->control.pause_filter_count;	685	vmcb02->control.pause_filter_count = vmcb01->control.pause_filter_count;
687	vmcb02->control.pause_filter_thresh = vmcb01->control.pause_filter_thresh;	686	vmcb02->control.pause_filter_thresh = vmcb01->control.pause_filter_thresh;
688	} else {	687
689	/*	688	/* ... but ensure filtering is disabled if so requested. */
690	* Intercept every PAUSE otherwise and	689	if (vmcb12_is_intercept(&svm->nested.ctl, INTERCEPT_PAUSE)) {
691	* ignore both host and guest values	690	if (!pause_count12)
692	*/	691	vmcb02->control.pause_filter_count = 0;
693	vmcb02->control.pause_filter_count = 0;	692	if (!pause_thresh12)
694	vmcb02->control.pause_filter_thresh = 0;	693	vmcb02->control.pause_filter_thresh = 0;
		694	}
695	}	695	}
696		696
697	nested_svm_transition_tlb_flush(vcpu);	697	nested_svm_transition_tlb_flush(vcpu);
@@ -951,8 +951,11 @@ int nested_svm_vmexit(struct vcpu_svm *svm) · 253 unmodified lines
951	vmcb12->control.event_inj = svm->nested.ctl.event_inj;	951	vmcb12->control.event_inj = svm->nested.ctl.event_inj;
952	vmcb12->control.event_inj_err = svm->nested.ctl.event_inj_err;	952	vmcb12->control.event_inj_err = svm->nested.ctl.event_inj_err;
953		953
954	if (!kvm_pause_in_guest(vcpu->kvm) && vmcb02->control.pause_filter_count)	954	if (!kvm_pause_in_guest(vcpu->kvm)) {
955	vmcb01->control.pause_filter_count = vmcb02->control.pause_filter_count;	955	vmcb01->control.pause_filter_count = vmcb02->control.pause_filter_count;
		956	vmcb_mark_dirty(vmcb01, VMCB_INTERCEPTS);
		957
		958	}
956		959
957	nested_svm_copy_common_state(svm->nested.vmcb02.ptr, svm->vmcb01.ptr);	960	nested_svm_copy_common_state(svm->nested.vmcb02.ptr, svm->vmcb01.ptr);
958		961

arch/x86/kvm/svm/sev.c+47−25

@@ -844,7 +844,7 @@ static int __sev_dbg_encrypt_user(struct kvm *kvm, unsigned long paddr, · 843 unmodified lines
844		844
845	/* If source buffer is not aligned then use an intermediate buffer */	845	/* If source buffer is not aligned then use an intermediate buffer */
846	if (!IS_ALIGNED((unsigned long)vaddr, 16)) {	846	if (!IS_ALIGNED((unsigned long)vaddr, 16)) {
847	src_tpage = alloc_page(GFP_KERNEL);	847	src_tpage = alloc_page(GFP_KERNEL_ACCOUNT);
848	if (!src_tpage)	848	if (!src_tpage)
849	return -ENOMEM;	849	return -ENOMEM;
850		850
@@ -865,7 +865,7 @@ static int __sev_dbg_encrypt_user(struct kvm *kvm, unsigned long paddr, · 14 unmodified lines
865	if (!IS_ALIGNED((unsigned long)dst_vaddr, 16) \|\| !IS_ALIGNED(size, 16)) {	865	if (!IS_ALIGNED((unsigned long)dst_vaddr, 16) \|\| !IS_ALIGNED(size, 16)) {
866	int dst_offset;	866	int dst_offset;
867		867
868	dst_tpage = alloc_page(GFP_KERNEL);	868	dst_tpage = alloc_page(GFP_KERNEL_ACCOUNT);
869	if (!dst_tpage) {	869	if (!dst_tpage) {
870	ret = -ENOMEM;	870	ret = -ENOMEM;
871	goto e_free;	871	goto e_free;
@@ -1665,19 +1665,24 @@ static void sev_migrate_from(struct kvm dst_kvm, struct kvm src_kvm) · 793 unmodified lines
1665	{	1665	{
1666	struct kvm_sev_info *dst = &to_kvm_svm(dst_kvm)->sev_info;	1666	struct kvm_sev_info *dst = &to_kvm_svm(dst_kvm)->sev_info;
1667	struct kvm_sev_info *src = &to_kvm_svm(src_kvm)->sev_info;	1667	struct kvm_sev_info *src = &to_kvm_svm(src_kvm)->sev_info;
		1668	struct kvm_vcpu dst_vcpu, src_vcpu;
		1669	struct vcpu_svm dst_svm, src_svm;
1668	struct kvm_sev_info *mirror;	1670	struct kvm_sev_info *mirror;
		1671	unsigned long i;
1669		1672
1670	dst->active = true;	1673	dst->active = true;
1671	dst->asid = src->asid;	1674	dst->asid = src->asid;
1672	dst->handle = src->handle;	1675	dst->handle = src->handle;
1673	dst->pages_locked = src->pages_locked;	1676	dst->pages_locked = src->pages_locked;
1674	dst->enc_context_owner = src->enc_context_owner;	1677	dst->enc_context_owner = src->enc_context_owner;
		1678	dst->es_active = src->es_active;
1675		1679
1676	src->asid = 0;	1680	src->asid = 0;
1677	src->active = false;	1681	src->active = false;
1678	src->handle = 0;	1682	src->handle = 0;
1679	src->pages_locked = 0;	1683	src->pages_locked = 0;
1680	src->enc_context_owner = NULL;	1684	src->enc_context_owner = NULL;
		1685	src->es_active = false;
1681		1686
1682	list_cut_before(&dst->regions_list, &src->regions_list, &src->regions_list);	1687	list_cut_before(&dst->regions_list, &src->regions_list, &src->regions_list);
1683		1688
@@ -1704,26 +1709,21 @@ static void sev_migrate_from(struct kvm dst_kvm, struct kvm src_kvm) · 20 unmodified lines
1704	list_del(&src->mirror_entry);	1709	list_del(&src->mirror_entry);
1705	list_add_tail(&dst->mirror_entry, &owner_sev_info->mirror_vms);	1710	list_add_tail(&dst->mirror_entry, &owner_sev_info->mirror_vms);
1706	}	1711	}
1707	}
1708		1712
1709	static int sev_es_migrate_from(struct kvm dst, struct kvm src)	1713	kvm_for_each_vcpu(i, dst_vcpu, dst_kvm) {
1710	{	1714	dst_svm = to_svm(dst_vcpu);
1711	unsigned long i;
1712	struct kvm_vcpu dst_vcpu, src_vcpu;
1713	struct vcpu_svm dst_svm, src_svm;
1714		1715
1715	if (atomic_read(&src->online_vcpus) != atomic_read(&dst->online_vcpus))	1716	sev_init_vmcb(dst_svm);
1716	return -EINVAL;
1717		1717
1718	kvm_for_each_vcpu(i, src_vcpu, src) {	1718	if (!dst->es_active)
1719	if (!src_vcpu->arch.guest_state_protected)	1719	continue;
1720	return -EINVAL;
1721	}
1722		1720
1723	kvm_for_each_vcpu(i, src_vcpu, src) {	1721	/*
		1722	* Note, the source is not required to have the same number of
		1723	* vCPUs as the destination when migrating a vanilla SEV VM.
		1724	*/
		1725	src_vcpu = kvm_get_vcpu(dst_kvm, i);
1724	src_svm = to_svm(src_vcpu);	1726	src_svm = to_svm(src_vcpu);
1725	dst_vcpu = kvm_get_vcpu(dst, i);
1726	dst_svm = to_svm(dst_vcpu);
1727		1727
1728	/*	1728	/*
1729	* Transfer VMSA and GHCB state to the destination. Nullify and	1729	* Transfer VMSA and GHCB state to the destination. Nullify and
@@ -1740,8 +1740,23 @@ static int sev_es_migrate_from(struct kvm dst, struct kvm src) · 10 unmodified lines
1740	src_svm->vmcb->control.vmsa_pa = INVALID_PAGE;	1740	src_svm->vmcb->control.vmsa_pa = INVALID_PAGE;
1741	src_vcpu->arch.guest_state_protected = false;	1741	src_vcpu->arch.guest_state_protected = false;
1742	}	1742	}
1743	to_kvm_svm(src)->sev_info.es_active = false;	1743	}
1744	to_kvm_svm(dst)->sev_info.es_active = true;	1744
		1745	static int sev_check_source_vcpus(struct kvm dst, struct kvm src)
		1746	{
		1747	struct kvm_vcpu *src_vcpu;
		1748	unsigned long i;
		1749
		1750	if (!sev_es_guest(src))
		1751	return 0;
		1752
		1753	if (atomic_read(&src->online_vcpus) != atomic_read(&dst->online_vcpus))
		1754	return -EINVAL;
		1755
		1756	kvm_for_each_vcpu(i, src_vcpu, src) {
		1757	if (!src_vcpu->arch.guest_state_protected)
		1758	return -EINVAL;
		1759	}
1745		1760
1746	return 0;	1761	return 0;
1747	}	1762	}
@@ -1789,11 +1804,9 @@ int sev_vm_move_enc_context_from(struct kvm *kvm, unsigned int source_fd) · 41 unmodified lines
1789	if (ret)	1804	if (ret)
1790	goto out_dst_vcpu;	1805	goto out_dst_vcpu;
1791		1806
1792	if (sev_es_guest(source_kvm)) {	1807	ret = sev_check_source_vcpus(kvm, source_kvm);
1793	ret = sev_es_migrate_from(kvm, source_kvm);	1808	if (ret)
1794	if (ret)	1809	goto out_source_vcpu;
1795	goto out_source_vcpu;
1796	}
1797		1810
1798	sev_migrate_from(kvm, source_kvm);	1811	sev_migrate_from(kvm, source_kvm);
1799	kvm_vm_dead(source_kvm);	1812	kvm_vm_dead(source_kvm);
@@ -2914,7 +2927,7 @@ int sev_es_string_io(struct vcpu_svm *svm, int size, unsigned int port, int in) · 1114 unmodified lines
2914	count, in);	2927	count, in);
2915	}	2928	}
2916		2929
2917	void sev_es_init_vmcb(struct vcpu_svm *svm)	2930	static void sev_es_init_vmcb(struct vcpu_svm *svm)
2918	{	2931	{
2919	struct kvm_vcpu *vcpu = &svm->vcpu;	2932	struct kvm_vcpu *vcpu = &svm->vcpu;
2920		2933
@@ -2967,6 +2980,15 @@ void sev_es_init_vmcb(struct vcpu_svm *svm) · 46 unmodified lines
2967	}	2980	}
2968	}	2981	}
2969		2982
		2983	void sev_init_vmcb(struct vcpu_svm *svm)
		2984	{
		2985	svm->vmcb->control.nested_ctl \|= SVM_NESTED_CTL_SEV_ENABLE;
		2986	clr_exception_intercept(svm, UD_VECTOR);
		2987
		2988	if (sev_es_guest(svm->vcpu.kvm))
		2989	sev_es_init_vmcb(svm);
		2990	}
		2991
2970	void sev_es_vcpu_reset(struct vcpu_svm *svm)	2992	void sev_es_vcpu_reset(struct vcpu_svm *svm)
2971	{	2993	{
2972	/*	2994	/*

arch/x86/kvm/svm/svm.c+6−13

 	struct vmcb_control_area *control = &svm->vmcb->control;
 	int old = control->pause_filter_count;
-	if (kvm_pause_in_guest(vcpu->kvm) || !old)
+	if (kvm_pause_in_guest(vcpu->kvm))
 		return;
 	control->pause_filter_count = __grow_ple_window(old,
 	struct vmcb_control_area *control = &svm->vmcb->control;
 	int old = control->pause_filter_count;
-	if (kvm_pause_in_guest(vcpu->kvm) || !old)
+	if (kvm_pause_in_guest(vcpu->kvm))
 		return;
 	control->pause_filter_count =
 		svm->vmcb->control.int_ctl |= V_GIF_ENABLE_MASK;
 	}
-	if (sev_guest(vcpu->kvm)) {
+	if (sev_guest(vcpu->kvm))
-		svm->vmcb->control.nested_ctl |= SVM_NESTED_CTL_SEV_ENABLE;
+		sev_init_vmcb(svm);
-		clr_exception_intercept(svm, UD_VECTOR);
-		if (sev_es_guest(vcpu->kvm)) {
-			/* Perform SEV-ES specific VMCB updates */
-			sev_es_init_vmcb(svm);
-		}
-	}
 	svm_hv_init_vmcb(vmcb);
 	init_vmcb_after_set_cpuid(vcpu);
 		indirect_branch_prediction_barrier();
 	}
 	if (kvm_vcpu_apicv_active(vcpu))
-		__avic_vcpu_load(vcpu, cpu);
+		avic_vcpu_load(vcpu, cpu);
 }
 static void svm_vcpu_put(struct kvm_vcpu *vcpu)
 {
 	if (kvm_vcpu_apicv_active(vcpu))
-		__avic_vcpu_put(vcpu);
+		avic_vcpu_put(vcpu);
 	svm_prepare_host_switch(vcpu);

arch/x86/kvm/svm/svm.h+3−3

 int avic_incomplete_ipi_interception(struct kvm_vcpu *vcpu);
 int avic_unaccelerated_access_interception(struct kvm_vcpu *vcpu);
 int avic_init_vcpu(struct vcpu_svm *svm);
-void __avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu);
+void avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu);
-void __avic_vcpu_put(struct kvm_vcpu *vcpu);
+void avic_vcpu_put(struct kvm_vcpu *vcpu);
 void avic_apicv_post_state_restore(struct kvm_vcpu *vcpu);
 void avic_set_virtual_apic_mode(struct kvm_vcpu *vcpu);
 void avic_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu);
 void __init sev_hardware_setup(void);
 void sev_hardware_unsetup(void);
 int sev_cpu_init(struct svm_cpu_data *sd);
+void sev_init_vmcb(struct vcpu_svm *svm);
 void sev_free_vcpu(struct kvm_vcpu *vcpu);
 int sev_handle_vmgexit(struct kvm_vcpu *vcpu);
 int sev_es_string_io(struct vcpu_svm *svm, int size, unsigned int port, int in);
-void sev_es_init_vmcb(struct vcpu_svm *svm);
 void sev_es_vcpu_reset(struct vcpu_svm *svm);
 void sev_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector);
 void sev_es_prepare_switch_to_guest(struct sev_es_save_area *hostsa);

arch/x86/kvm/vmx/vmx.c+75−1

@@ -229,6 +229,9 @@ static const struct { · 228 unmodified lines
229	#define L1D_CACHE_ORDER 4	229	#define L1D_CACHE_ORDER 4
230	static void *vmx_l1d_flush_pages;	230	static void *vmx_l1d_flush_pages;
231		231
		232	/* Control for disabling CPU Fill buffer clear */
		233	static bool __read_mostly vmx_fb_clear_ctrl_available;
		234
232	static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf)	235	static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf)
233	{	236	{
234	struct page *page;	237	struct page *page;
@@ -360,6 +363,60 @@ static int vmentry_l1d_flush_get(char s, const struct kernel_param kp) · 125 unmodified lines
360	return sprintf(s, "%s\n", vmentry_l1d_param[l1tf_vmx_mitigation].option);	363	return sprintf(s, "%s\n", vmentry_l1d_param[l1tf_vmx_mitigation].option);
361	}	364	}
362		365
		366	static void vmx_setup_fb_clear_ctrl(void)
		367	{
		368	u64 msr;
		369
		370	if (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES) &&
		371	!boot_cpu_has_bug(X86_BUG_MDS) &&
		372	!boot_cpu_has_bug(X86_BUG_TAA)) {
		373	rdmsrl(MSR_IA32_ARCH_CAPABILITIES, msr);
		374	if (msr & ARCH_CAP_FB_CLEAR_CTRL)
		375	vmx_fb_clear_ctrl_available = true;
		376	}
		377	}
		378
		379	static __always_inline void vmx_disable_fb_clear(struct vcpu_vmx *vmx)
		380	{
		381	u64 msr;
		382
		383	if (!vmx->disable_fb_clear)
		384	return;
		385
		386	rdmsrl(MSR_IA32_MCU_OPT_CTRL, msr);
		387	msr \|= FB_CLEAR_DIS;
		388	wrmsrl(MSR_IA32_MCU_OPT_CTRL, msr);
		389	/* Cache the MSR value to avoid reading it later */
		390	vmx->msr_ia32_mcu_opt_ctrl = msr;
		391	}
		392
		393	static __always_inline void vmx_enable_fb_clear(struct vcpu_vmx *vmx)
		394	{
		395	if (!vmx->disable_fb_clear)
		396	return;
		397
		398	vmx->msr_ia32_mcu_opt_ctrl &= ~FB_CLEAR_DIS;
		399	wrmsrl(MSR_IA32_MCU_OPT_CTRL, vmx->msr_ia32_mcu_opt_ctrl);
		400	}
		401
		402	static void vmx_update_fb_clear_dis(struct kvm_vcpu vcpu, struct vcpu_vmx vmx)
		403	{
		404	vmx->disable_fb_clear = vmx_fb_clear_ctrl_available;
		405
		406	/*
		407	* If guest will not execute VERW, there is no need to set FB_CLEAR_DIS
		408	* at VMEntry. Skip the MSR read/write when a guest has no use case to
		409	* execute VERW.
		410	*/
		411	if ((vcpu->arch.arch_capabilities & ARCH_CAP_FB_CLEAR) \|\|
		412	((vcpu->arch.arch_capabilities & ARCH_CAP_MDS_NO) &&
		413	(vcpu->arch.arch_capabilities & ARCH_CAP_TAA_NO) &&
		414	(vcpu->arch.arch_capabilities & ARCH_CAP_PSDP_NO) &&
		415	(vcpu->arch.arch_capabilities & ARCH_CAP_FBSDP_NO) &&
		416	(vcpu->arch.arch_capabilities & ARCH_CAP_SBDR_SSDP_NO)))
		417	vmx->disable_fb_clear = false;
		418	}
		419
363	static const struct kernel_param_ops vmentry_l1d_flush_ops = {	420	static const struct kernel_param_ops vmentry_l1d_flush_ops = {
364	.set = vmentry_l1d_flush_set,	421	.set = vmentry_l1d_flush_set,
365	.get = vmentry_l1d_flush_get,	422	.get = vmentry_l1d_flush_get,
@@ -2252,6 +2309,10 @@ static int vmx_set_msr(struct kvm_vcpu vcpu, struct msr_data msr_info) · 1886 unmodified lines
2252	ret = kvm_set_msr_common(vcpu, msr_info);	2309	ret = kvm_set_msr_common(vcpu, msr_info);
2253	}	2310	}
2254		2311
		2312	/* FB_CLEAR may have changed, also update the FB_CLEAR_DIS behavior */
		2313	if (msr_index == MSR_IA32_ARCH_CAPABILITIES)
		2314	vmx_update_fb_clear_dis(vcpu, vmx);
		2315
2255	return ret;	2316	return ret;
2256	}	2317	}
2257		2318
@@ -4553,6 +4614,8 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) · 2295 unmodified lines
4553	kvm_make_request(KVM_REQ_APIC_PAGE_RELOAD, vcpu);	4614	kvm_make_request(KVM_REQ_APIC_PAGE_RELOAD, vcpu);
4554		4615
4555	vpid_sync_context(vmx->vpid);	4616	vpid_sync_context(vmx->vpid);
		4617
		4618	vmx_update_fb_clear_dis(vcpu, vmx);
4556	}	4619	}
4557		4620
4558	static void vmx_enable_irq_window(struct kvm_vcpu *vcpu)	4621	static void vmx_enable_irq_window(struct kvm_vcpu *vcpu)
@@ -6772,6 +6835,11 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu, · 2213 unmodified lines
6772	vmx_l1d_flush(vcpu);	6835	vmx_l1d_flush(vcpu);
6773	else if (static_branch_unlikely(&mds_user_clear))	6836	else if (static_branch_unlikely(&mds_user_clear))
6774	mds_clear_cpu_buffers();	6837	mds_clear_cpu_buffers();
		6838	else if (static_branch_unlikely(&mmio_stale_data_clear) &&
		6839	kvm_arch_has_assigned_device(vcpu->kvm))
		6840	mds_clear_cpu_buffers();
		6841
		6842	vmx_disable_fb_clear(vmx);
6775		6843
6776	if (vcpu->arch.cr2 != native_read_cr2())	6844	if (vcpu->arch.cr2 != native_read_cr2())
6777	native_write_cr2(vcpu->arch.cr2);	6845	native_write_cr2(vcpu->arch.cr2);
@@ -6781,6 +6849,8 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu, · 3 unmodified lines
6781		6849
6782	vcpu->arch.cr2 = native_read_cr2();	6850	vcpu->arch.cr2 = native_read_cr2();
6783		6851
		6852	vmx_enable_fb_clear(vmx);
		6853
6784	guest_state_exit_irqoff();	6854	guest_state_exit_irqoff();
6785	}	6855	}
6786		6856
@@ -7709,7 +7779,9 @@ static bool vmx_check_apicv_inhibit_reasons(enum kvm_apicv_inhibit reason) · 922 unmodified lines
7709	ulong supported = BIT(APICV_INHIBIT_REASON_DISABLE) \|	7779	ulong supported = BIT(APICV_INHIBIT_REASON_DISABLE) \|
7710	BIT(APICV_INHIBIT_REASON_ABSENT) \|	7780	BIT(APICV_INHIBIT_REASON_ABSENT) \|
7711	BIT(APICV_INHIBIT_REASON_HYPERV) \|	7781	BIT(APICV_INHIBIT_REASON_HYPERV) \|
7712	BIT(APICV_INHIBIT_REASON_BLOCKIRQ);	7782	BIT(APICV_INHIBIT_REASON_BLOCKIRQ) \|
		7783	BIT(APICV_INHIBIT_REASON_APIC_ID_MODIFIED) \|
		7784	BIT(APICV_INHIBIT_REASON_APIC_BASE_MODIFIED);
7713		7785
7714	return supported & BIT(reason);	7786	return supported & BIT(reason);
7715	}	7787	}
@@ -8212,6 +8284,8 @@ static int __init vmx_init(void) · 496 unmodified lines
8212	return r;	8284	return r;
8213	}	8285	}
8214		8286
		8287	vmx_setup_fb_clear_ctrl();
		8288
8215	for_each_possible_cpu(cpu) {	8289	for_each_possible_cpu(cpu) {
8216	INIT_LIST_HEAD(&per_cpu(loaded_vmcss_on_cpu, cpu));	8290	INIT_LIST_HEAD(&per_cpu(loaded_vmcss_on_cpu, cpu));
8217		8291

arch/x86/kvm/vmx/vmx.h+2−0

@@ -348,6 +348,8 @@ struct vcpu_vmx { · 347 unmodified lines
348	u64 msr_ia32_feature_control_valid_bits;	348	u64 msr_ia32_feature_control_valid_bits;
349	/* SGX Launch Control public key hash */	349	/* SGX Launch Control public key hash */
350	u64 msr_ia32_sgxlepubkeyhash[4];	350	u64 msr_ia32_sgxlepubkeyhash[4];
		351	u64 msr_ia32_mcu_opt_ctrl;
		352	bool disable_fb_clear;
351		353
352	struct pt_desc pt_desc;	354	struct pt_desc pt_desc;
353	struct lbr_desc lbr_desc;	355	struct lbr_desc lbr_desc;

arch/x86/kvm/x86.c+5−0

 		 */
 	}
+	/* Guests don't need to know "Fill buffer clear control" exists */
+	data &= ~ARCH_CAP_FB_CLEAR_CTRL;
 	return data;
 }
 		return;
 	down_read(&vcpu->kvm->arch.apicv_update_lock);
+	preempt_disable();
 	activate = kvm_vcpu_apicv_activated(vcpu);
 		kvm_make_request(KVM_REQ_EVENT, vcpu);
 out:
+	preempt_enable();
 	up_read(&vcpu->kvm->arch.apicv_update_lock);
 }
 EXPORT_SYMBOL_GPL(kvm_vcpu_update_apicv);

arch/x86/net/bpf_jit_comp.c+2−1

 		case BPF_JMP | BPF_CALL:
 			func = (u8 *) __bpf_call_base + imm32;
 			if (tail_call_reachable) {
+				/* mov rax, qword ptr [rbp - rounded_stack_depth - 8] */
 				EMIT3_off32(0x48, 0x8B, 0x85,
-					    -(bpf_prog->aux->stack_depth + 8));
+					    -round_up(bpf_prog->aux->stack_depth, 8) - 8);
 				if (!imm32 || emit_call(&prog, func, image + addrs[i - 1] + 7))
 					return -EINVAL;
 			} else {

arch/x86/pci/acpi.c+1−7

 #include <linux/pci-acpi.h>
 #include <asm/numa.h>
 #include <asm/pci_x86.h>
-#include <asm/e820/api.h>
 struct pci_root_info {
 	struct acpi_pci_root_info common;
 #endif
 };
-static bool pci_use_e820 = true;
+bool pci_use_e820 = true;
 static bool pci_use_crs = true;
 static bool pci_ignore_seg;
 	status = acpi_pci_probe_root_resources(ci);
-	if (pci_use_e820) {
-		resource_list_for_each_entry(entry, &ci->resources)
-			remove_e820_regions(&device->dev, entry->res);
-	}
 	if (pci_use_crs) {
 		resource_list_for_each_entry_safe(entry, tmp, &ci->resources)
 			if (resource_is_pcicfg_ioport(entry->res))

arch/xtensa/kernel/entry.S+1−1

@@ -2173,7 +2173,7 @@ ENDPROC(ret_from_kernel_thread) · 2172 unmodified lines
2173		2173
2174	#ifdef CONFIG_HIBERNATION	2174	#ifdef CONFIG_HIBERNATION
2175		2175
2176	.bss	2176	.section .bss, "aw"
2177	.align 4	2177	.align 4
2178	.Lsaved_regs:	2178	.Lsaved_regs:
2179	#if defined(__XTENSA_WINDOWED_ABI__)	2179	#if defined(__XTENSA_WINDOWED_ABI__)

arch/xtensa/kernel/time.c+1−0

@@ -154,6 +154,7 @@ static void __init calibrate_ccount(void) · 153 unmodified lines
154	cpu = of_find_compatible_node(NULL, NULL, "cdns,xtensa-cpu");	154	cpu = of_find_compatible_node(NULL, NULL, "cdns,xtensa-cpu");
155	if (cpu) {	155	if (cpu) {
156	clk = of_clk_get(cpu, 0);	156	clk = of_clk_get(cpu, 0);
		157	of_node_put(cpu);
157	if (!IS_ERR(clk)) {	158	if (!IS_ERR(clk)) {
158	ccount_freq = clk_get_rate(clk);	159	ccount_freq = clk_get_rate(clk);
159	return;	160	return;

arch/xtensa/platforms/xtfpga/setup.c+1−0

@@ -133,6 +133,7 @@ static int __init machine_setup(void) · 132 unmodified lines
133		133
134	if ((eth = of_find_compatible_node(eth, NULL, "opencores,ethoc")))	134	if ((eth = of_find_compatible_node(eth, NULL, "opencores,ethoc")))
135	update_local_mac(eth);	135	update_local_mac(eth);
		136	of_node_put(eth);
136	return 0;	137	return 0;
137	}	138	}
138	arch_initcall(machine_setup);	139	arch_initcall(machine_setup);

block/bfq-iosched.c+6−0

 	spin_unlock_irq(&bfqd->lock);
 #endif
+	blk_stat_disable_accounting(bfqd->queue);
 	wbt_enable_default(bfqd->queue);
 	kfree(bfqd);
 	bfq_init_root_group(bfqd->root_group, bfqd);
 	bfq_init_entity(&bfqd->oom_bfqq.entity, bfqd->root_group);
+	/* We dispatch from request queue wide instead of hw queue */
+	blk_queue_flag_set(QUEUE_FLAG_SQ_SCHED, q);
 	wbt_disable_default(q);
+	blk_stat_enable_accounting(q);
 	return 0;
 out_free:

block/blk-core.c+0−13

@@ -322,19 +322,6 @@ void blk_cleanup_queue(struct request_queue *q) · 321 unmodified lines
322	blk_mq_exit_queue(q);	322	blk_mq_exit_queue(q);
323	}	323	}
324		324
325	/*
326	* In theory, request pool of sched_tags belongs to request queue.
327	* However, the current implementation requires tag_set for freeing
328	* requests, so free the pool now.
329	*
330	* Queue has become frozen, there can't be any in-queue requests, so
331	* it is safe to free requests now.
332	*/
333	mutex_lock(&q->sysfs_lock);
334	if (q->elevator)
335	blk_mq_sched_free_rqs(q);
336	mutex_unlock(&q->sysfs_lock);
337
338	/* @q is and will stay empty, shutdown and put */	325	/* @q is and will stay empty, shutdown and put */
339	blk_put_queue(q);	326	blk_put_queue(q);
340	}	327	}

block/blk-ia-ranges.c+0−1

@@ -144,7 +144,6 @@ int disk_register_independent_access_ranges(struct gendisk *disk, · 143 unmodified lines
144	}	144	}
145		145
146	for (i = 0; i < iars->nr_ia_ranges; i++) {	146	for (i = 0; i < iars->nr_ia_ranges; i++) {
147	iars->ia_range[i].queue = q;
148	ret = kobject_init_and_add(&iars->ia_range[i].kobj,	147	ret = kobject_init_and_add(&iars->ia_range[i].kobj,
149	&blk_ia_range_ktype, &iars->kobj,	148	&blk_ia_range_ktype, &iars->kobj,
150	"%d", i);	149	"%d", i);

block/blk-mq-debugfs.c+18−11

 	}
 }
-void blk_mq_debugfs_unregister(struct request_queue *q)
-{
-	q->sched_debugfs_dir = NULL;
-}
 static void blk_mq_debugfs_register_ctx(struct blk_mq_hw_ctx *hctx,
 					struct blk_mq_ctx *ctx)
 {
 void blk_mq_debugfs_unregister_hctx(struct blk_mq_hw_ctx *hctx)
 {
+	if (!hctx->queue->debugfs_dir)
+		return;
 	debugfs_remove_recursive(hctx->debugfs_dir);
 	hctx->sched_debugfs_dir = NULL;
 	hctx->debugfs_dir = NULL;
 {
 	struct elevator_type *e = q->elevator->type;
+	lockdep_assert_held(&q->debugfs_mutex);
 	/*
 	 * If the parent directory has not been created yet, return, we will be
 	 * called again later on and the directory/files will be created then.
 void blk_mq_debugfs_unregister_sched(struct request_queue *q)
 {
+	lockdep_assert_held(&q->debugfs_mutex);
 	debugfs_remove_recursive(q->sched_debugfs_dir);
 	q->sched_debugfs_dir = NULL;
 }
 void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos)
 {
+	lockdep_assert_held(&rqos->q->debugfs_mutex);
+	if (!rqos->q->debugfs_dir)
+		return;
 	debugfs_remove_recursive(rqos->debugfs_dir);
 	rqos->debugfs_dir = NULL;
 }
 	struct request_queue *q = rqos->q;
 	const char *dir_name = rq_qos_id_to_name(rqos->id);
+	lockdep_assert_held(&q->debugfs_mutex);
 	if (rqos->debugfs_dir || !rqos->ops->debugfs_attrs)
 		return;
 	debugfs_create_files(rqos->debugfs_dir, rqos, rqos->ops->debugfs_attrs);
 }
-void blk_mq_debugfs_unregister_queue_rqos(struct request_queue *q)
-{
-	debugfs_remove_recursive(q->rqos_debugfs_dir);
-	q->rqos_debugfs_dir = NULL;
-}
 void blk_mq_debugfs_register_sched_hctx(struct request_queue *q,
 					struct blk_mq_hw_ctx *hctx)
 {
 	struct elevator_type *e = q->elevator->type;
+	lockdep_assert_held(&q->debugfs_mutex);
 	/*
 	 * If the parent debugfs directory has not been created yet, return;
 	 * We will be called again later on with appropriate parent debugfs
 void blk_mq_debugfs_unregister_sched_hctx(struct blk_mq_hw_ctx *hctx)
 {
+	lockdep_assert_held(&hctx->queue->debugfs_mutex);
+	if (!hctx->queue->debugfs_dir)
+		return;
 	debugfs_remove_recursive(hctx->sched_debugfs_dir);
 	hctx->sched_debugfs_dir = NULL;
 }

block/blk-mq-debugfs.h+0−10

 int blk_mq_debugfs_rq_show(struct seq_file *m, void *v);
 void blk_mq_debugfs_register(struct request_queue *q);
-void blk_mq_debugfs_unregister(struct request_queue *q);
 void blk_mq_debugfs_register_hctx(struct request_queue *q,
 				  struct blk_mq_hw_ctx *hctx);
 void blk_mq_debugfs_unregister_hctx(struct blk_mq_hw_ctx *hctx);
 void blk_mq_debugfs_register_rqos(struct rq_qos *rqos);
 void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos);
-void blk_mq_debugfs_unregister_queue_rqos(struct request_queue *q);
 #else
 static inline void blk_mq_debugfs_register(struct request_queue *q)
 {
 }
-static inline void blk_mq_debugfs_unregister(struct request_queue *q)
-{
-}
 static inline void blk_mq_debugfs_register_hctx(struct request_queue *q,
 						struct blk_mq_hw_ctx *hctx)
 {
 static inline void blk_mq_debugfs_unregister_rqos(struct rq_qos *rqos)
 {
 }
-static inline void blk_mq_debugfs_unregister_queue_rqos(struct request_queue *q)
-{
-}
 #endif
 #ifdef CONFIG_BLK_DEBUG_FS_ZONED

block/blk-mq-sched.c+12−0

 	int ret;
 	if (!e) {
+		blk_queue_flag_clear(QUEUE_FLAG_SQ_SCHED, q);
 		q->elevator = NULL;
 		q->nr_requests = q->tag_set->queue_depth;
 		return 0;
 	if (ret)
 		goto err_free_map_and_rqs;
+	mutex_lock(&q->debugfs_mutex);
 	blk_mq_debugfs_register_sched(q);
+	mutex_unlock(&q->debugfs_mutex);
 	queue_for_each_hw_ctx(q, hctx, i) {
 		if (e->ops.init_hctx) {
 				return ret;
 			}
 		}
+		mutex_lock(&q->debugfs_mutex);
 		blk_mq_debugfs_register_sched_hctx(q, hctx);
+		mutex_unlock(&q->debugfs_mutex);
 	}
 	return 0;
 	unsigned int flags = 0;
 	queue_for_each_hw_ctx(q, hctx, i) {
+		mutex_lock(&q->debugfs_mutex);
 		blk_mq_debugfs_unregister_sched_hctx(hctx);
+		mutex_unlock(&q->debugfs_mutex);
 		if (e->type->ops.exit_hctx && hctx->sched_data) {
 			e->type->ops.exit_hctx(hctx, i);
 			hctx->sched_data = NULL;
 		}
 		flags = hctx->flags;
 	}
+	mutex_lock(&q->debugfs_mutex);
 	blk_mq_debugfs_unregister_sched(q);
+	mutex_unlock(&q->debugfs_mutex);
 	if (e->type->ops.exit_sched)
 		e->type->ops.exit_sched(e);
 	blk_mq_sched_tags_teardown(q, flags);

block/blk-mq.c+18−22

 	if (!blk_mq_hw_queue_mapped(data.hctx))
 		goto out_queue_exit;
 	cpu = cpumask_first_and(data.hctx->cpumask, cpu_online_mask);
+	if (cpu >= nr_cpu_ids)
+		goto out_queue_exit;
 	data.ctx = __blk_mq_get_ctx(q, cpu);
 	if (!q->elevator)
 }
 EXPORT_SYMBOL(blk_mq_run_hw_queue);
-/*
- * Is the request queue handled by an IO scheduler that does not respect
- * hardware queues when dispatching?
- */
-static bool blk_mq_has_sqsched(struct request_queue *q)
-{
-	struct elevator_queue *e = q->elevator;
-	if (e && e->type->ops.dispatch_request &&
-	    !(e->type->elevator_features & ELEVATOR_F_MQ_AWARE))
-		return true;
-	return false;
-}
 /*
  * Return prefered queue to dispatch from (if any) for non-mq aware IO
  * scheduler.
 	unsigned long i;
 	sq_hctx = NULL;
-	if (blk_mq_has_sqsched(q))
+	if (blk_queue_sq_sched(q))
 		sq_hctx = blk_mq_get_sq_hctx(q);
 	queue_for_each_hw_ctx(q, hctx, i) {
 		if (blk_mq_hctx_stopped(hctx))
 	unsigned long i;
 	sq_hctx = NULL;
-	if (blk_mq_has_sqsched(q))
+	if (blk_queue_sq_sched(q))
 		sq_hctx = blk_mq_get_sq_hctx(q);
 	queue_for_each_hw_ctx(q, hctx, i) {
 		if (blk_mq_hctx_stopped(hctx))
 		return NULL;
 	}
-	rq_qos_throttle(q, *bio);
 	if (blk_mq_get_hctx_type((*bio)->bi_opf) != rq->mq_hctx->type)
 		return NULL;
 	if (op_is_flush(rq->cmd_flags) != op_is_flush((*bio)->bi_opf))
 		return NULL;
-	rq->cmd_flags = (*bio)->bi_opf;
+	/*
+	 * If any qos ->throttle() end up blocking, we will have flushed the
+	 * plug and hence killed the cached_rq list as well. Pop this entry
+	 * before we throttle.
+	 */
 	plug->cached_rq = rq_list_next(rq);
+	rq_qos_throttle(q, *bio);
+	rq->cmd_flags = (*bio)->bi_opf;
 	INIT_LIST_HEAD(&rq->queuelist);
 	return rq;
 }
 	if (blk_mq_hw_queue_mapped(hctx))
 		blk_mq_tag_idle(hctx);
-	blk_mq_clear_flush_rq_mapping(set->tags[hctx_idx],
+	if (blk_queue_init_done(q))
-			set->queue_depth, flush_rq);
+		blk_mq_clear_flush_rq_mapping(set->tags[hctx_idx],
+				set->queue_depth, flush_rq);
 	if (set->ops->exit_request)
 		set->ops->exit_request(set, flush_rq, hctx_idx);
 	if (!qe)
 		return false;
+	/* q->elevator needs protection from ->sysfs_lock */
+	mutex_lock(&q->sysfs_lock);
 	INIT_LIST_HEAD(&qe->node);
 	qe->q = q;
 	qe->type = q->elevator->type;
 	list_add(&qe->node, head);
-	mutex_lock(&q->sysfs_lock);
 	/*
 	 * After elevator_switch_mq, the previous elevator_queue will be
 	 * released by elevator_release. The reference of the io scheduler

block/blk-rq-qos.c+0−2

@@ -294,8 +294,6 @@ void rq_qos_wait(struct rq_wait rqw, void private_data, · 293 unmodified lines
294		294
295	void rq_qos_exit(struct request_queue *q)	295	void rq_qos_exit(struct request_queue *q)
296	{	296	{
297	blk_mq_debugfs_unregister_queue_rqos(q);
298
299	while (q->rq_qos) {	297	while (q->rq_qos) {
300	struct rq_qos *rqos = q->rq_qos;	298	struct rq_qos *rqos = q->rq_qos;
301	q->rq_qos = rqos->next;	299	q->rq_qos = rqos->next;

block/blk-rq-qos.h+6−1

 	blk_mq_unfreeze_queue(q);
-	if (rqos->ops->debugfs_attrs)
+	if (rqos->ops->debugfs_attrs) {
+		mutex_lock(&q->debugfs_mutex);
 		blk_mq_debugfs_register_rqos(rqos);
+		mutex_unlock(&q->debugfs_mutex);
+	}
 }
 static inline void rq_qos_del(struct request_queue *q, struct rq_qos *rqos)
 	blk_mq_unfreeze_queue(q);
+	mutex_lock(&q->debugfs_mutex);
 	blk_mq_debugfs_unregister_rqos(rqos);
+	mutex_unlock(&q->debugfs_mutex);
 }
 typedef bool (acquire_inflight_cb_t)(struct rq_wait *rqw, void *private_data);

block/blk-sysfs.c+14−16

 	if (queue_is_mq(q))
 		blk_mq_release(q);
-	blk_trace_shutdown(q);
-	mutex_lock(&q->debugfs_mutex);
-	debugfs_remove_recursive(q->debugfs_dir);
-	mutex_unlock(&q->debugfs_mutex);
-	if (queue_is_mq(q))
-		blk_mq_debugfs_unregister(q);
 	bioset_exit(&q->bio_split);
 	if (blk_queue_has_srcu(q))
 		goto unlock;
 	}
+	if (queue_is_mq(q))
+		__blk_mq_register_dev(dev, q);
+	mutex_lock(&q->sysfs_lock);
 	mutex_lock(&q->debugfs_mutex);
 	q->debugfs_dir = debugfs_create_dir(kobject_name(q->kobj.parent),
 					    blk_debugfs_root);
-	mutex_unlock(&q->debugfs_mutex);
+	if (queue_is_mq(q))
-	if (queue_is_mq(q)) {
-		__blk_mq_register_dev(dev, q);
 		blk_mq_debugfs_register(q);
-	}
+	mutex_unlock(&q->debugfs_mutex);
-	mutex_lock(&q->sysfs_lock);
 	ret = disk_register_independent_access_ranges(disk, NULL);
 	if (ret)
 	/* Now that we've deleted all child objects, we can delete the queue. */
 	kobject_uevent(&q->kobj, KOBJ_REMOVE);
 	kobject_del(&q->kobj);
 	mutex_unlock(&q->sysfs_dir_lock);
+	mutex_lock(&q->debugfs_mutex);
+	blk_trace_shutdown(q);
+	debugfs_remove_recursive(q->debugfs_dir);
+	q->debugfs_dir = NULL;
+	q->sched_debugfs_dir = NULL;
+	q->rqos_debugfs_dir = NULL;
+	mutex_unlock(&q->debugfs_mutex);
 	kobject_put(&disk_to_dev(disk)->kobj);
 }

block/genhd.c+12−30

 	 * Prevent new I/O from crossing bio_queue_enter().
 	 */
 	blk_queue_start_drain(q);
+	blk_mq_freeze_queue_wait(q);
 	if (!(disk->flags & GENHD_FL_HIDDEN)) {
 		sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi");
 	pm_runtime_set_memalloc_noio(disk_to_dev(disk), false);
 	device_del(disk_to_dev(disk));
-	blk_mq_freeze_queue_wait(q);
 	blk_throtl_cancel_bios(disk->queue);
 	blk_sync_queue(q);
 	blk_flush_integrity();
+	blk_mq_cancel_work_sync(q);
+	blk_mq_quiesce_queue(q);
+	if (q->elevator) {
+		mutex_lock(&q->sysfs_lock);
+		elevator_exit(q);
+		mutex_unlock(&q->sysfs_lock);
+	}
+	rq_qos_exit(q);
+	blk_mq_unquiesce_queue(q);
 	/*
 	 * Allow using passthrough request again after the queue is torn down.
 	 */
 	NULL
 };
-static void disk_release_mq(struct request_queue *q)
-{
-	blk_mq_cancel_work_sync(q);
-	/*
-	 * There can't be any non non-passthrough bios in flight here, but
-	 * requests stay around longer, including passthrough ones so we
-	 * still need to freeze the queue here.
-	 */
-	blk_mq_freeze_queue(q);
-	/*
-	 * Since the I/O scheduler exit code may access cgroup information,
-	 * perform I/O scheduler exit before disassociating from the block
-	 * cgroup controller.
-	 */
-	if (q->elevator) {
-		mutex_lock(&q->sysfs_lock);
-		elevator_exit(q);
-		mutex_unlock(&q->sysfs_lock);
-	}
-	rq_qos_exit(q);
-	__blk_mq_unfreeze_queue(q, true);
-}
 /**
  * disk_release - releases all allocated resources of the gendisk
  * @dev: the device representing this disk
 	might_sleep();
 	WARN_ON_ONCE(disk_live(disk));
-	if (queue_is_mq(disk->queue))
-		disk_release_mq(disk->queue);
 	blkcg_exit_queue(disk->queue);
 	disk_release_events(disk);

block/holder.c+0−4

@@ -79,10 +79,6 @@ int bd_link_disk_holder(struct block_device bdev, struct gendisk disk) · 78 unmodified lines
79		79
80	WARN_ON_ONCE(!bdev->bd_holder);	80	WARN_ON_ONCE(!bdev->bd_holder);
81		81
82	/* FIXME: remove the following once add_disk() handles errors */
83	if (WARN_ON(!bdev->bd_holder_dir))
84	goto out_unlock;
85
86	holder = bd_find_holder_disk(bdev, disk);	82	holder = bd_find_holder_disk(bdev, disk);
87	if (holder) {	83	if (holder) {
88	holder->refcnt++;	84	holder->refcnt++;

block/kyber-iosched.c+2−1

 	blk_stat_enable_accounting(q);
+	blk_queue_flag_clear(QUEUE_FLAG_SQ_SCHED, q);
 	eq->elevator_data = kqd;
 	q->elevator = eq;
 #endif
 	.elevator_attrs = kyber_sched_attrs,
 	.elevator_name = "kyber",
-	.elevator_features = ELEVATOR_F_MQ_AWARE,
 	.elevator_owner = THIS_MODULE,
 };

block/mq-deadline.c+3−0

@@ -642,6 +642,9 @@ static int dd_init_sched(struct request_queue q, struct elevator_type e) · 641 unmodified lines
642	spin_lock_init(&dd->lock);	642	spin_lock_init(&dd->lock);
643	spin_lock_init(&dd->zone_lock);	643	spin_lock_init(&dd->zone_lock);
644		644
		645	/* We dispatch from request queue wide instead of hw queue */
		646	blk_queue_flag_set(QUEUE_FLAG_SQ_SCHED, q);
		647
645	q->elevator = eq;	648	q->elevator = eq;
646	return 0;	649	return 0;
647		650

certs/.gitignore+1−1

@@ -1,5 +1,5 @@
1	# SPDX-License-Identifier: GPL-2.0-only	1	# SPDX-License-Identifier: GPL-2.0-only
2	/blacklist_hashes_checked	2	/blacklist_hash_list
3	/extract-cert	3	/extract-cert
4	/x509_certificate_list	4	/x509_certificate_list
5	/x509_revocation_list	5	/x509_revocation_list

certs/Makefile+12−12

@@ -3,26 +3,26 @@ · 2 unmodified lines
3	# Makefile for the linux kernel signature checking certificates.	3	# Makefile for the linux kernel signature checking certificates.
4	#	4	#
5		5
6	obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o	6	obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o
7	obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o	7	obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o
8	obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o	8	obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o
9	ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),)	9	ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),)
10	quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2))
11	cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@
12		10
13	$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST))	11	$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list
		12	CFLAGS_blacklist_hashes.o := -I $(obj)
14		13
15	$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked	14	quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@
		15	cmd_check_and_copy_blacklist_hash_list = \
		16	$(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \
		17	cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@
16		18
17	CFLAGS_blacklist_hashes.o += -I$(srctree)	19	$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE
18		20	$(call if_changed,check_and_copy_blacklist_hash_list)
19	targets += blacklist_hashes_checked
20	$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE
21	$(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
22	obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o	21	obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
23	else	22	else
24	obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o	23	obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
25	endif	24	endif
		25	targets += blacklist_hash_list
26		26
27	quiet_cmd_extract_certs = CERT $@	27	quiet_cmd_extract_certs = CERT $@
28	cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@	28	cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@
@@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list · 4 unmodified lines
33	$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE	33	$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE
34	$(call if_changed,extract_certs)	34	$(call if_changed,extract_certs)
35		35
36	targets += x509_certificate_list blacklist_hashes_checked	36	targets += x509_certificate_list
37		37
38	# If module signing is requested, say by allyesconfig, but a key has not been	38	# If module signing is requested, say by allyesconfig, but a key has not been
39	# supplied, then one will need to be generated to make sure the build does not	39	# supplied, then one will need to be generated to make sure the build does not

certs/blacklist.c+4−4

 #include <linux/err.h>
 #include <linux/seq_file.h>
 #include <linux/uidgid.h>
-#include <linux/verification.h>
+#include <keys/asymmetric-type.h>
 #include <keys/system_keyring.h>
 #include "blacklist.h"
-#include "common.h"
 /*
  * According to crypto/asymmetric_keys/x509_cert_parser.c:x509_note_pkey_algo(),
 	if (revocation_certificate_list_size)
 		pr_notice("Loading compiled-in revocation X.509 certificates\n");
-	return load_certificate_list(revocation_certificate_list, revocation_certificate_list_size,
+	return x509_load_certificate_list(revocation_certificate_list,
-				     blacklist_keyring);
+					  revocation_certificate_list_size,
+					  blacklist_keyring);
 }
 late_initcall(load_revocation_certificate_list);
 #endif

certs/blacklist_hashes.c+2−2

@@ -1,7 +1,7 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	#include "blacklist.h"	2	#include "blacklist.h"
3		3
4	const char __initdata *const blacklist_hashes[] = {	4	const char __initconst *const blacklist_hashes[] = {
5	#include CONFIG_SYSTEM_BLACKLIST_HASH_LIST	5	#include "blacklist_hash_list"
6	, NULL	6	, NULL
7	};	7	};

certs/common.h+0−9

@@ -1,9 +0,0 @@
1	/* SPDX-License-Identifier: GPL-2.0-or-later */
2
3	#ifndef _CERT_COMMON_H
4	#define _CERT_COMMON_H
5
6	int load_certificate_list(const u8 cert_list[], const unsigned long list_size,
7	const struct key *keyring);
8
9	#endif

certs/system_keyring.c+3−3

 #include <keys/asymmetric-type.h>
 #include <keys/system_keyring.h>
 #include <crypto/pkcs7.h>
-#include "common.h"
 static struct key *builtin_trusted_keys;
 #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING
 	pr_notice("Loading compiled-in module X.509 certificates\n");
-	return load_certificate_list(system_certificate_list, module_cert_size, keyring);
+	return x509_load_certificate_list(system_certificate_list,
+					  module_cert_size, keyring);
 }
 /*
 	size = system_certificate_list_size - module_cert_size;
 #endif
-	return load_certificate_list(p, size, builtin_trusted_keys);
+	return x509_load_certificate_list(p, size, builtin_trusted_keys);
 }
 late_initcall(load_system_certificate_list);

crypto/Kconfig+1−0

@@ -15,6 +15,7 @@ source "crypto/async_tx/Kconfig" · 14 unmodified lines
15	#	15	#
16	menuconfig CRYPTO	16	menuconfig CRYPTO
17	tristate "Cryptographic API"	17	tristate "Cryptographic API"
		18	select LIB_MEMNEQ
18	help	19	help
19	This option provides the core Cryptographic API.	20	This option provides the core Cryptographic API.
20		21

crypto/Makefile+1−1

@@ -4,7 +4,7 @@ · 3 unmodified lines
4	#	4	#
5		5
6	obj-$(CONFIG_CRYPTO) += crypto.o	6	obj-$(CONFIG_CRYPTO) += crypto.o
7	crypto-y := api.o cipher.o compress.o memneq.o	7	crypto-y := api.o cipher.o compress.o
8		8
9	obj-$(CONFIG_CRYPTO_ENGINE) += crypto_engine.o	9	obj-$(CONFIG_CRYPTO_ENGINE) += crypto_engine.o
10	obj-$(CONFIG_CRYPTO_FIPS) += fips.o	10	obj-$(CONFIG_CRYPTO_FIPS) += fips.o

crypto/asymmetric_keys/Kconfig+10−0

@@ -75,4 +75,14 @@ config SIGNED_PE_FILE_VERIFICATION · 74 unmodified lines
75	This option provides support for verifying the signature(s) on a	75	This option provides support for verifying the signature(s) on a
76	signed PE binary.	76	signed PE binary.
77		77
		78	config FIPS_SIGNATURE_SELFTEST
		79	bool "Run FIPS selftests on the X.509+PKCS7 signature verification"
		80	help
		81	This option causes some selftests to be run on the signature
		82	verification code, using some built in data. This is required
		83	for FIPS.
		84	depends on KEYS
		85	depends on ASYMMETRIC_KEY_TYPE
		86	depends on PKCS7_MESSAGE_PARSER
		87
78	endif # ASYMMETRIC_KEY_TYPE	88	endif # ASYMMETRIC_KEY_TYPE

crypto/asymmetric_keys/Makefile+2−0

 	x509.asn1.o \
 	x509_akid.asn1.o \
 	x509_cert_parser.o \
+	x509_loader.o \
 	x509_public_key.o
+x509_key_parser-$(CONFIG_FIPS_SIGNATURE_SELFTEST) += selftest.o
 $(obj)/x509_cert_parser.o: \
 	$(obj)/x509.asn1.h \

crypto/asymmetric_keys/selftest.c+224−0

@@ -0,0 +1,224 @@
	1	/* Self-testing for signature checking.
	2	*
	3	* Copyright (C) 2022 Red Hat, Inc. All Rights Reserved.
	4	* Written by David Howells (dhowells@redhat.com)
	5	*/
	6
	7	#include <linux/kernel.h>
	8	#include <linux/cred.h>
	9	#include <linux/key.h>
	10	#include <crypto/pkcs7.h>
	11	#include "x509_parser.h"
	12
	13	struct certs_test {
	14	const u8 *data;
	15	size_t data_len;
	16	const u8 *pkcs7;
	17	size_t pkcs7_len;
	18	};
	19
	20	/*
	21	* Set of X.509 certificates to provide public keys for the tests. These will
	22	* be loaded into a temporary keyring for the duration of the testing.
	23	*/
	24	static const __initconst u8 certs_selftest_keys[] = {
	25	"\x30\x82\x05\x55\x30\x82\x03\x3d\xa0\x03\x02\x01\x02\x02\x14\x73"
	26	"\x98\xea\x98\x2d\xd0\x2e\xa8\xb1\xcf\x57\xc7\xf2\x97\xb3\xe6\x1a"
	27	"\xfc\x8c\x0a\x30\x0d\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01\x01\x0b"
	28	"\x05\x00\x30\x34\x31\x32\x30\x30\x06\x03\x55\x04\x03\x0c\x29\x43"
	29	"\x65\x72\x74\x69\x66\x69\x63\x61\x74\x65\x20\x76\x65\x72\x69\x66"
	30	"\x69\x63\x61\x74\x69\x6f\x6e\x20\x73\x65\x6c\x66\x2d\x74\x65\x73"
	31	"\x74\x69\x6e\x67\x20\x6b\x65\x79\x30\x20\x17\x0d\x32\x32\x30\x35"
	32	"\x31\x38\x32\x32\x33\x32\x34\x31\x5a\x18\x0f\x32\x31\x32\x32\x30"
	33	"\x34\x32\x34\x32\x32\x33\x32\x34\x31\x5a\x30\x34\x31\x32\x30\x30"
	34	"\x06\x03\x55\x04\x03\x0c\x29\x43\x65\x72\x74\x69\x66\x69\x63\x61"
	35	"\x74\x65\x20\x76\x65\x72\x69\x66\x69\x63\x61\x74\x69\x6f\x6e\x20"
	36	"\x73\x65\x6c\x66\x2d\x74\x65\x73\x74\x69\x6e\x67\x20\x6b\x65\x79"
	37	"\x30\x82\x02\x22\x30\x0d\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01\x01"
	38	"\x01\x05\x00\x03\x82\x02\x0f\x00\x30\x82\x02\x0a\x02\x82\x02\x01"
	39	"\x00\xcc\xac\x49\xdd\x3b\xca\xb0\x15\x7e\x84\x6a\xb2\x0a\x69\x5f"
	40	"\x1c\x0a\x61\x82\x3b\x4f\x2c\xa3\x95\x2c\x08\x58\x4b\xb1\x5d\x99"
	41	"\xe0\xc3\xc1\x79\xc2\xb3\xeb\xc0\x1e\x6d\x3e\x54\x1d\xbd\xb7\x92"
	42	"\x7b\x4d\xb5\x95\x58\xb2\x52\x2e\xc6\x24\x4b\x71\x63\x80\x32\x77"
	43	"\xa7\x38\x5e\xdb\x72\xae\x6e\x0d\xec\xfb\xb6\x6d\x01\x7f\xe9\x55"
	44	"\x66\xdf\xbf\x1d\x76\x78\x02\x31\xe8\xe5\x07\xf8\xb7\x82\x5c\x0d"
	45	"\xd4\xbb\xfb\xa2\x59\x0d\x2e\x3a\x78\x95\x3a\x8b\x46\x06\x47\x44"
	46	"\x46\xd7\xcd\x06\x6a\x41\x13\xe3\x19\xf6\xbb\x6e\x38\xf4\x83\x01"
	47	"\xa3\xbf\x4a\x39\x4f\xd7\x0a\xe9\x38\xb3\xf5\x94\x14\x4e\xdd\xf7"
	48	"\x43\xfd\x24\xb2\x49\x3c\xa5\xf7\x7a\x7c\xd4\x45\x3d\x97\x75\x68"
	49	"\xf1\xed\x4c\x42\x0b\x70\xca\x85\xf3\xde\xe5\x88\x2c\xc5\xbe\xb6"
	50	"\x97\x34\xba\x24\x02\xcd\x8b\x86\x9f\xa9\x73\xca\x73\xcf\x92\x81"
	51	"\xee\x75\x55\xbb\x18\x67\x5c\xff\x3f\xb5\xdd\x33\x1b\x0c\xe9\x78"
	52	"\xdb\x5c\xcf\xaa\x5c\x43\x42\xdf\x5e\xa9\x6d\xec\xd7\xd7\xff\xe6"
	53	"\xa1\x3a\x92\x1a\xda\xae\xf6\x8c\x6f\x7b\xd5\xb4\x6e\x06\xe9\x8f"
	54	"\xe8\xde\x09\x31\x89\xed\x0e\x11\xa1\xfa\x8a\xe9\xe9\x64\x59\x62"
	55	"\x53\xda\xd1\x70\xbe\x11\xd4\x99\x97\x11\xcf\x99\xde\x0b\x9d\x94"
	56	"\x7e\xaa\xb8\x52\xea\x37\xdb\x90\x7e\x35\xbd\xd9\xfe\x6d\x0a\x48"
	57	"\x70\x28\xdd\xd5\x0d\x7f\x03\x80\x93\x14\x23\x8f\xb9\x22\xcd\x7c"
	58	"\x29\xfe\xf1\x72\xb5\x5c\x0b\x12\xcf\x9c\x15\xf6\x11\x4c\x7a\x45"
	59	"\x25\x8c\x45\x0a\x34\xac\x2d\x9a\x81\xca\x0b\x13\x22\xcd\xeb\x1a"
	60	"\x38\x88\x18\x97\x96\x08\x81\xaa\xcc\x8f\x0f\x8a\x32\x7b\x76\x68"
	61	"\x03\x68\x43\xbf\x11\xba\x55\x60\xfd\x80\x1c\x0d\x9b\x69\xb6\x09"
	62	"\x72\xbc\x0f\x41\x2f\x07\x82\xc6\xe3\xb2\x13\x91\xc4\x6d\x14\x95"
	63	"\x31\xbe\x19\xbd\xbc\xed\xe1\x4c\x74\xa2\xe0\x78\x0b\xbb\x94\xec"
	64	"\x4c\x53\x3a\xa2\xb5\x84\x1d\x4b\x65\x7e\xdc\xf7\xdb\x36\x7d\xbe"
	65	"\x9e\x3b\x36\x66\x42\x66\x76\x35\xbf\xbe\xf0\xc1\x3c\x7c\xe9\x42"
	66	"\x5c\x24\x53\x03\x05\xa8\x67\x24\x50\x02\x75\xff\x24\x46\x3b\x35"
	67	"\x89\x76\xe6\x70\xda\xc5\x51\x8c\x9a\xe5\x05\xb0\x0b\xd0\x2d\xd4"
	68	"\x7d\x57\x75\x94\x6b\xf9\x0a\xad\x0e\x41\x00\x15\xd0\x4f\xc0\x7f"
	69	"\x90\x2d\x18\x48\x8f\x28\xfe\x5d\xa7\xcd\x99\x9e\xbd\x02\x6c\x8a"
	70	"\x31\xf3\x1c\xc7\x4b\xe6\x93\xcd\x42\xa2\xe4\x68\x10\x47\x9d\xfc"
	71	"\x21\x02\x03\x01\x00\x01\xa3\x5d\x30\x5b\x30\x0c\x06\x03\x55\x1d"
	72	"\x13\x01\x01\xff\x04\x02\x30\x00\x30\x0b\x06\x03\x55\x1d\x0f\x04"
	73	"\x04\x03\x02\x07\x80\x30\x1d\x06\x03\x55\x1d\x0e\x04\x16\x04\x14"
	74	"\xf5\x87\x03\xbb\x33\xce\x1b\x73\xee\x02\xec\xcd\xee\x5b\x88\x17"
	75	"\x51\x8f\xe3\xdb\x30\x1f\x06\x03\x55\x1d\x23\x04\x18\x30\x16\x80"
	76	"\x14\xf5\x87\x03\xbb\x33\xce\x1b\x73\xee\x02\xec\xcd\xee\x5b\x88"
	77	"\x17\x51\x8f\xe3\xdb\x30\x0d\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01"
	78	"\x01\x0b\x05\x00\x03\x82\x02\x01\x00\xc0\x2e\x12\x41\x7b\x73\x85"
	79	"\x16\xc8\xdb\x86\x79\xe8\xf5\xcd\x44\xf4\xc6\xe2\x81\x23\x5e\x47"
	80	"\xcb\xab\x25\xf1\x1e\x58\x3e\x31\x7f\x78\xad\x85\xeb\xfe\x14\x88"
	81	"\x60\xf7\x7f\xd2\x26\xa2\xf4\x98\x2a\xfd\xba\x05\x0c\x20\x33\x12"
	82	"\xcc\x4d\x14\x61\x64\x81\x93\xd3\x33\xed\xc8\xff\xf1\x78\xcc\x5f"
	83	"\x51\x9f\x09\xd7\xbe\x0d\x5c\x74\xfd\x9b\xdf\x52\x4a\xc9\xa8\x71"
	84	"\x25\x33\x04\x10\x67\x36\xd0\xb3\x0b\xc9\xa1\x40\x72\xae\x41\x7b"
	85	"\x68\xe6\xe4\x7b\xd0\x28\xf7\x6d\xe7\x3f\x50\xfc\x91\x7c\x91\x56"
	86	"\xd4\xdf\xa6\xbb\xe8\x4d\x1b\x58\xaa\x28\xfa\xc1\x19\xeb\x11\x2f"
	87	"\x24\x8b\x7c\xc5\xa9\x86\x26\xaa\x6e\xb7\x9b\xd5\xf8\x06\xfb\x02"
	88	"\x52\x7b\x9c\x9e\xa1\xe0\x07\x8b\x5e\xe4\xb8\x55\x29\xf6\x48\x52"
	89	"\x1c\x1b\x54\x2d\x46\xd8\xe5\x71\xb9\x60\xd1\x45\xb5\x92\x89\x8a"
	90	"\x63\x58\x2a\xb3\xc6\xb2\x76\xe2\x3c\x82\x59\x04\xae\x5a\xc4\x99"
	91	"\x7b\x2e\x4b\x46\x57\xb8\x29\x24\xb2\xfd\xee\x2c\x0d\xa4\x83\xfa"
	92	"\x65\x2a\x07\x35\x8b\x97\xcf\xbd\x96\x2e\xd1\x7e\x6c\xc2\x1e\x87"
	93	"\xb6\x6c\x76\x65\xb5\xb2\x62\xda\x8b\xe9\x73\xe3\xdb\x33\xdd\x13"
	94	"\x3a\x17\x63\x6a\x76\xde\x8d\x8f\xe0\x47\x61\x28\x3a\x83\xff\x8f"
	95	"\xe7\xc7\xe0\x4a\xa3\xe5\x07\xcf\xe9\x8c\x35\x35\x2e\xe7\x80\x66"
	96	"\x31\xbf\x91\x58\x0a\xe1\x25\x3d\x38\xd3\xa4\xf0\x59\x34\x47\x07"
	97	"\x62\x0f\xbe\x30\xdd\x81\x88\x58\xf0\x28\xb0\x96\xe5\x82\xf8\x05"
	98	"\xb7\x13\x01\xbc\xfa\xc6\x1f\x86\x72\xcc\xf9\xee\x8e\xd9\xd6\x04"
	99	"\x8c\x24\x6c\xbf\x0f\x5d\x37\x39\xcf\x45\xc1\x93\x3a\xd2\xed\x5c"
	100	"\x58\x79\x74\x86\x62\x30\x7e\x8e\xbb\xdd\x7a\xa9\xed\xca\x40\xcb"
	101	"\x62\x47\xf4\xb4\x9f\x52\x7f\x72\x63\xa8\xf0\x2b\xaf\x45\x2a\x48"
	102	"\x19\x6d\xe3\xfb\xf9\x19\x66\x69\xc8\xcc\x62\x87\x6c\x53\x2b\x2d"
	103	"\x6e\x90\x6c\x54\x3a\x82\x25\x41\xcb\x18\x6a\xa4\x22\xa8\xa1\xc4"
	104	"\x47\xd7\x81\x00\x1c\x15\x51\x0f\x1a\xaf\xef\x9f\xa6\x61\x8c\xbd"
	105	"\x6b\x8b\xed\xe6\xac\x0e\xb6\x3a\x4c\x92\xe6\x0f\x91\x0a\x0f\x71"
	106	"\xc7\xa0\xb9\x0d\x3a\x17\x5a\x6f\x35\xc8\xe7\x50\x4f\x46\xe8\x70"
	107	"\x60\x48\x06\x82\x8b\x66\x58\xe6\x73\x91\x9c\x12\x3d\x35\x8e\x46"
	108	"\xad\x5a\xf5\xb3\xdb\x69\x21\x04\xfd\xd3\x1c\xdf\x94\x9d\x56\xb0"
	109	"\x0a\xd1\x95\x76\x8d\xec\x9e\xdd\x0b\x15\x97\x64\xad\xe5\xf2\x62"
	110	"\x02\xfc\x9e\x5f\x56\x42\x39\x05\xb3"
	111	};
	112
	113	/*
	114	* Signed data and detached signature blobs that form the verification tests.
	115	*/
	116	static const __initconst u8 certs_selftest_1_data[] = {
	117	"\x54\x68\x69\x73\x20\x69\x73\x20\x73\x6f\x6d\x65\x20\x74\x65\x73"
	118	"\x74\x20\x64\x61\x74\x61\x20\x75\x73\x65\x64\x20\x66\x6f\x72\x20"
	119	"\x73\x65\x6c\x66\x2d\x74\x65\x73\x74\x69\x6e\x67\x20\x63\x65\x72"
	120	"\x74\x69\x66\x69\x63\x61\x74\x65\x20\x76\x65\x72\x69\x66\x69\x63"
	121	"\x61\x74\x69\x6f\x6e\x2e\x0a"
	122	};
	123
	124	static const __initconst u8 certs_selftest_1_pkcs7[] = {
	125	"\x30\x82\x02\xab\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01\x07\x02\xa0"
	126	"\x82\x02\x9c\x30\x82\x02\x98\x02\x01\x01\x31\x0d\x30\x0b\x06\x09"
	127	"\x60\x86\x48\x01\x65\x03\x04\x02\x01\x30\x0b\x06\x09\x2a\x86\x48"
	128	"\x86\xf7\x0d\x01\x07\x01\x31\x82\x02\x75\x30\x82\x02\x71\x02\x01"
	129	"\x01\x30\x4c\x30\x34\x31\x32\x30\x30\x06\x03\x55\x04\x03\x0c\x29"
	130	"\x43\x65\x72\x74\x69\x66\x69\x63\x61\x74\x65\x20\x76\x65\x72\x69"
	131	"\x66\x69\x63\x61\x74\x69\x6f\x6e\x20\x73\x65\x6c\x66\x2d\x74\x65"
	132	"\x73\x74\x69\x6e\x67\x20\x6b\x65\x79\x02\x14\x73\x98\xea\x98\x2d"
	133	"\xd0\x2e\xa8\xb1\xcf\x57\xc7\xf2\x97\xb3\xe6\x1a\xfc\x8c\x0a\x30"
	134	"\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x30\x0d\x06\x09"
	135	"\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01\x05\x00\x04\x82\x02\x00\xac"
	136	"\xb0\xf2\x07\xd6\x99\x6d\xc0\xc0\xd9\x8d\x31\x0d\x7e\x04\xeb\xc3"
	137	"\x88\x90\xc4\x58\x46\xd4\xe2\xa0\xa3\x25\xe3\x04\x50\x37\x85\x8c"
	138	"\x91\xc6\xfc\xc5\xd4\x92\xfd\x05\xd8\xb8\xa3\xb8\xba\x89\x13\x00"
	139	"\x88\x79\x99\x51\x6b\x5b\x28\x31\xc0\xb3\x1b\x7a\x68\x2c\x00\xdb"
	140	"\x4b\x46\x11\xf3\xfa\x50\x8e\x19\x89\xa2\x4c\xda\x4c\x89\x01\x11"
	141	"\x89\xee\xd3\xc8\xc1\xe7\xa7\xf6\xb2\xa2\xf8\x65\xb8\x35\x20\x33"
	142	"\xba\x12\x62\xd5\xbd\xaa\x71\xe5\x5b\xc0\x6a\x32\xff\x6a\x2e\x23"
	143	"\xef\x2b\xb6\x58\xb1\xfb\x5f\x82\x34\x40\x6d\x9f\xbc\x27\xac\x37"
	144	"\x23\x99\xcf\x7d\x20\xb2\x39\x01\xc0\x12\xce\xd7\x5d\x2f\xb6\xab"
	145	"\xb5\x56\x4f\xef\xf4\x72\x07\x58\x65\xa9\xeb\x1f\x75\x1c\x5f\x0c"
	146	"\x88\xe0\xa4\xe2\xcd\x73\x2b\x9e\xb2\x05\x7e\x12\xf8\xd0\x66\x41"
	147	"\xcc\x12\x63\xd4\xd6\xac\x9b\x1d\x14\x77\x8d\x1c\x57\xd5\x27\xc6"
	148	"\x49\xa2\x41\x43\xf3\x59\x29\xe5\xcb\xd1\x75\xbc\x3a\x97\x2a\x72"
	149	"\x22\x66\xc5\x3b\xc1\xba\xfc\x53\x18\x98\xe2\x21\x64\xc6\x52\x87"
	150	"\x13\xd5\x7c\x42\xe8\xfb\x9c\x9a\x45\x32\xd5\xa5\x22\x62\x9d\xd4"
	151	"\xcb\xa4\xfa\x77\xbb\x50\x24\x0b\x8b\x88\x99\x15\x56\xa9\x1e\x92"
	152	"\xbf\x5d\x94\x77\xb6\xf1\x67\x01\x60\x06\x58\x5c\xdf\x18\x52\x79"
	153	"\x37\x30\x93\x7d\x87\x04\xf1\xe0\x55\x59\x52\xf3\xc2\xb1\x1c\x5b"
	154	"\x12\x7c\x49\x87\xfb\xf7\xed\xdd\x95\x71\xec\x4b\x1a\x85\x08\xb0"
	155	"\xa0\x36\xc4\x7b\xab\x40\xe0\xf1\x98\xcc\xaf\x19\x40\x8f\x47\x6f"
	156	"\xf0\x6c\x84\x29\x7f\x7f\x04\x46\xcb\x08\x0f\xe0\xc1\xc9\x70\x6e"
	157	"\x95\x3b\xa4\xbc\x29\x2b\x53\x67\x45\x1b\x0d\xbc\x13\xa5\x76\x31"
	158	"\xaf\xb9\xd0\xe0\x60\x12\xd2\xf4\xb7\x7c\x58\x7e\xf6\x2d\xbb\x24"
	159	"\x14\x5a\x20\x24\xa8\x12\xdf\x25\xbd\x42\xce\x96\x7c\x2e\xba\x14"
	160	"\x1b\x81\x9f\x18\x45\xa4\xc6\x70\x3e\x0e\xf0\xd3\x7b\x9c\x10\xbe"
	161	"\xb8\x7a\x89\xc5\x9e\xd9\x97\xdf\xd7\xe7\xc6\x1d\xc0\x20\x6c\xb8"
	162	"\x1e\x3a\x63\xb8\x39\x8e\x8e\x62\xd5\xd2\xb4\xcd\xff\x46\xfc\x8e"
	163	"\xec\x07\x35\x0c\xff\xb0\x05\xe6\xf4\xe5\xfe\xa2\xe3\x0a\xe6\x36"
	164	"\xa7\x4a\x7e\x62\x1d\xc4\x50\x39\x35\x4e\x28\xcb\x4a\xfb\x9d\xdb"
	165	"\xdd\x23\xd6\x53\xb1\x74\x77\x12\xf7\x9c\xf0\x9a\x6b\xf7\xa9\x64"
	166	"\x2d\x86\x21\x2a\xcf\xc6\x54\xf5\xc9\xad\xfa\xb5\x12\xb4\xf3\x51"
	167	"\x77\x55\x3c\x6f\x0c\x32\xd3\x8c\x44\x39\x71\x25\xfe\x96\xd2"
	168	};
	169
	170	/*
	171	* List of tests to be run.
	172	*/
	173	#define TEST(data, pkcs7) { data, sizeof(data) - 1, pkcs7, sizeof(pkcs7) - 1 }
	174	static const struct certs_test certs_tests[] __initconst = {
	175	TEST(certs_selftest_1_data, certs_selftest_1_pkcs7),
	176	};
	177
	178	int __init fips_signature_selftest(void)
	179	{
	180	struct key *keyring;
	181	int ret, i;
	182
	183	pr_notice("Running certificate verification selftests\n");
	184
	185	keyring = keyring_alloc(".certs_selftest",
	186	GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, current_cred(),
	187	(KEY_POS_ALL & ~KEY_POS_SETATTR) \|
	188	KEY_USR_VIEW \| KEY_USR_READ \|
	189	KEY_USR_SEARCH,
	190	KEY_ALLOC_NOT_IN_QUOTA,
	191	NULL, NULL);
	192	if (IS_ERR(keyring))
	193	panic("Can't allocate certs selftest keyring: %ld\n",
	194	PTR_ERR(keyring));
	195
	196	ret = x509_load_certificate_list(certs_selftest_keys,
	197	sizeof(certs_selftest_keys) - 1, keyring);
	198	if (ret < 0)
	199	panic("Can't allocate certs selftest keyring: %d\n", ret);
	200
	201	for (i = 0; i < ARRAY_SIZE(certs_tests); i++) {
	202	const struct certs_test *test = &certs_tests[i];
	203	struct pkcs7_message *pkcs7;
	204
	205	pkcs7 = pkcs7_parse_message(test->pkcs7, test->pkcs7_len);
	206	if (IS_ERR(pkcs7))
	207	panic("Certs selftest %d: pkcs7_parse_message() = %d\n", i, ret);
	208
	209	pkcs7_supply_detached_data(pkcs7, test->data, test->data_len);
	210
	211	ret = pkcs7_verify(pkcs7, VERIFYING_MODULE_SIGNATURE);
	212	if (ret < 0)
	213	panic("Certs selftest %d: pkcs7_verify() = %d\n", i, ret);
	214
	215	ret = pkcs7_validate_trust(pkcs7, keyring);
	216	if (ret < 0)
	217	panic("Certs selftest %d: pkcs7_validate_trust() = %d\n", i, ret);
	218
	219	pkcs7_free_message(pkcs7);
	220	}
	221
	222	key_put(keyring);
	223	return 0;
	224	}

crypto/asymmetric_keys/x509_loader.crenamed from certs/common.c+4−4

@@ -2,11 +2,11 @@ · 1 unmodified line
2		2
3	#include <linux/kernel.h>	3	#include <linux/kernel.h>
4	#include <linux/key.h>	4	#include <linux/key.h>
5	#include "common.h"	5	#include <keys/asymmetric-type.h>
6		6
7	int load_certificate_list(const u8 cert_list[],	7	int x509_load_certificate_list(const u8 cert_list[],
8	const unsigned long list_size,	8	const unsigned long list_size,
9	const struct key *keyring)	9	const struct key *keyring)
10	{	10	{
11	key_ref_t key;	11	key_ref_t key;
12	const u8 p, end;	12	const u8 p, end;

crypto/asymmetric_keys/x509_parser.h+9−0

@@ -40,6 +40,15 @@ struct x509_certificate { · 39 unmodified lines
40	bool blacklisted;	40	bool blacklisted;
41	};	41	};
42		42
		43	/*
		44	* selftest.c
		45	*/
		46	#ifdef CONFIG_FIPS_SIGNATURE_SELFTEST
		47	extern int __init fips_signature_selftest(void);
		48	#else
		49	static inline int fips_signature_selftest(void) { return 0; }
		50	#endif
		51
43	/*	52	/*
44	* x509_cert_parser.c	53	* x509_cert_parser.c
45	*/	54	*/

crypto/asymmetric_keys/x509_public_key.c+7−1

 /*
  * Module stuff
  */
+extern int __init certs_selftest(void);
 static int __init x509_key_init(void)
 {
-	return register_asymmetric_key_parser(&x509_key_parser);
+	int ret;
+	ret = register_asymmetric_key_parser(&x509_key_parser);
+	if (ret < 0)
+		return ret;
+	return fips_signature_selftest();
 }
 static void __exit x509_key_exit(void)

drivers/base/cpu.c+8−0

 	return sysfs_emit(buf, "Not affected\n");
 }
+ssize_t __weak cpu_show_mmio_stale_data(struct device *dev,
+					struct device_attribute *attr, char *buf)
+{
+	return sysfs_emit(buf, "Not affected\n");
+}
 static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL);
 static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL);
 static DEVICE_ATTR(spectre_v2, 0444, cpu_show_spectre_v2, NULL);
 static DEVICE_ATTR(tsx_async_abort, 0444, cpu_show_tsx_async_abort, NULL);
 static DEVICE_ATTR(itlb_multihit, 0444, cpu_show_itlb_multihit, NULL);
 static DEVICE_ATTR(srbds, 0444, cpu_show_srbds, NULL);
+static DEVICE_ATTR(mmio_stale_data, 0444, cpu_show_mmio_stale_data, NULL);
 static struct attribute *cpu_root_vulnerabilities_attrs[] = {
 	&dev_attr_meltdown.attr,
 	&dev_attr_tsx_async_abort.attr,
 	&dev_attr_itlb_multihit.attr,
 	&dev_attr_srbds.attr,
+	&dev_attr_mmio_stale_data.attr,
 	NULL
 };

drivers/base/init.c+2−0

 #include <linux/init.h>
 #include <linux/memory.h>
 #include <linux/of.h>
+#include <linux/backing-dev.h>
 #include "base.h"
 void __init driver_init(void)
 {
 	/* These are the core pieces */
+	bdi_init(&noop_backing_dev_info);
 	devtmpfs_init();
 	devices_init();
 	buses_init();

drivers/base/memory.c+1−1

@@ -558,7 +558,7 @@ static ssize_t hard_offline_page_store(struct device *dev, · 557 unmodified lines
558	if (kstrtoull(buf, 0, &pfn) < 0)	558	if (kstrtoull(buf, 0, &pfn) < 0)
559	return -EINVAL;	559	return -EINVAL;
560	pfn >>= PAGE_SHIFT;	560	pfn >>= PAGE_SHIFT;
561	ret = memory_failure(pfn, 0);	561	ret = memory_failure(pfn, MF_SW_SIMULATED);
562	if (ret == -EOPNOTSUPP)	562	if (ret == -EOPNOTSUPP)
563	ret = 0;	563	ret = 0;
564	return ret ? ret : count;	564	return ret ? ret : count;

drivers/base/regmap/regmap-irq.c+5−3

 	struct regmap_irq_chip_data *d = irq_data_get_irq_chip_data(data);
 	struct regmap *map = d->map;
 	const struct regmap_irq *irq_data = irq_to_regmap_irq(d, data->hwirq);
+	unsigned int reg = irq_data->reg_offset / map->reg_stride;
 	unsigned int mask, type;
 	type = irq_data->type.type_falling_val | irq_data->type.type_rising_val;
 	 * at the corresponding offset in regmap_irq_set_type().
 	 */
 	if (d->chip->type_in_mask && type)
-		mask = d->type_buf[irq_data->reg_offset / map->reg_stride];
+		mask = d->type_buf[reg] & irq_data->mask;
 	else
 		mask = irq_data->mask;
 	if (d->chip->clear_on_unmask)
 		d->clear_status = true;
-	d->mask_buf[irq_data->reg_offset / map->reg_stride] &= ~mask;
+	d->mask_buf[reg] &= ~mask;
 }
 static void regmap_irq_disable(struct irq_data *data)
 		subreg = &chip->sub_reg_offsets[b];
 		for (i = 0; i < subreg->num_regs; i++) {
 			unsigned int offset = subreg->offset[i];
+			unsigned int index = offset / map->reg_stride;
 			if (chip->not_fixed_stride)
 				ret = regmap_read(map,
 			else
 				ret = regmap_read(map,
 						chip->status_base + offset,
-						&data->status_buf[offset]);
+						&data->status_buf[index]);
 			if (ret)
 				break;

drivers/base/regmap/regmap.c+8−7

  */
 bool regmap_can_raw_write(struct regmap *map)
 {
-	return map->bus && map->bus->write && map->format.format_val &&
+	return map->write && map->format.format_val && map->format.format_reg;
-		map->format.format_reg;
 }
 EXPORT_SYMBOL_GPL(regmap_can_raw_write);
 	size_t write_len;
 	int ret;
-	if (!map->bus)
+	if (!map->write)
-		return -EINVAL;
-	if (!map->bus->write)
 		return -ENOTSUPP;
 	if (val_len % map->format.val_bytes)
 		return -EINVAL;
 	if (!IS_ALIGNED(reg, map->reg_stride))
 	 * Some devices don't support bulk write, for them we have a series of
 	 * single write operations.
 	 */
-	if (!map->bus || !map->format.parse_inplace) {
+	if (!map->write || !map->format.parse_inplace) {
 		map->lock(map->lock_arg);
 		for (i = 0; i < val_count; i++) {
 			unsigned int ival;
 	size_t read_len;
 	int ret;
+	if (!map->read)
+		return -ENOTSUPP;
 	if (val_len % map->format.val_bytes)
 		return -EINVAL;
 	if (!IS_ALIGNED(reg, map->reg_stride))
 	if (val_count == 0)
 		return -EINVAL;
-	if (map->format.parse_inplace && (vol || map->cache_type == REGCACHE_NONE)) {
+	if (map->read && map->format.parse_inplace && (vol || map->cache_type == REGCACHE_NONE)) {
 		ret = regmap_raw_read(map, reg, val, val_bytes * val_count);
 		if (ret != 0)
 			return ret;

drivers/block/xen-blkfront.c+12−7

 		return;
 	/* No more blkif_request(). */
-	blk_mq_stop_hw_queues(info->rq);
+	if (info->rq && info->gd) {
-	blk_mark_disk_dead(info->gd);
+		blk_mq_stop_hw_queues(info->rq);
-	set_capacity(info->gd, 0);
+		blk_mark_disk_dead(info->gd);
+		set_capacity(info->gd, 0);
+	}
 	for_each_rinfo(info, rinfo, i) {
 		/* No more gnttab callback work. */
 	dev_dbg(&xbdev->dev, "%s removed", xbdev->nodename);
-	del_gendisk(info->gd);
+	if (info->gd)
+		del_gendisk(info->gd);
 	mutex_lock(&blkfront_mutex);
 	list_del(&info->info_list);
 	mutex_unlock(&blkfront_mutex);
 	blkif_free(info, 0);
-	xlbd_release_minors(info->gd->first_minor, info->gd->minors);
+	if (info->gd) {
-	blk_cleanup_disk(info->gd);
+		xlbd_release_minors(info->gd->first_minor, info->gd->minors);
-	blk_mq_free_tag_set(&info->tag_set);
+		blk_cleanup_disk(info->gd);
+		blk_mq_free_tag_set(&info->tag_set);
+	}
 	kfree(info);
 	return 0;

drivers/bus/bt1-apb.c+6−8

 	int ret;
 	apb->prst = devm_reset_control_get_optional_exclusive(apb->dev, "prst");
-	if (IS_ERR(apb->prst)) {
+	if (IS_ERR(apb->prst))
-		dev_warn(apb->dev, "Couldn't get reset control line\n");
+		return dev_err_probe(apb->dev, PTR_ERR(apb->prst),
-		return PTR_ERR(apb->prst);
+				     "Couldn't get reset control line\n");
-	}
 	ret = reset_control_deassert(apb->prst);
 	if (ret)
 	int ret;
 	apb->pclk = devm_clk_get(apb->dev, "pclk");
-	if (IS_ERR(apb->pclk)) {
+	if (IS_ERR(apb->pclk))
-		dev_err(apb->dev, "Couldn't get APB clock descriptor\n");
+		return dev_err_probe(apb->dev, PTR_ERR(apb->pclk),
-		return PTR_ERR(apb->pclk);
+				     "Couldn't get APB clock descriptor\n");
-	}
 	ret = clk_prepare_enable(apb->pclk);
 	if (ret) {

drivers/bus/bt1-axi.c+6−8

 	int ret;
 	axi->arst = devm_reset_control_get_optional_exclusive(axi->dev, "arst");
-	if (IS_ERR(axi->arst)) {
+	if (IS_ERR(axi->arst))
-		dev_warn(axi->dev, "Couldn't get reset control line\n");
+		return dev_err_probe(axi->dev, PTR_ERR(axi->arst),
-		return PTR_ERR(axi->arst);
+				     "Couldn't get reset control line\n");
-	}
 	ret = reset_control_deassert(axi->arst);
 	if (ret)
 	int ret;
 	axi->aclk = devm_clk_get(axi->dev, "aclk");
-	if (IS_ERR(axi->aclk)) {
+	if (IS_ERR(axi->aclk))
-		dev_err(axi->dev, "Couldn't get AXI Interconnect clock\n");
+		return dev_err_probe(axi->dev, PTR_ERR(axi->aclk),
-		return PTR_ERR(axi->aclk);
+				     "Couldn't get AXI Interconnect clock\n");
-	}
 	ret = clk_prepare_enable(axi->aclk);
 	if (ret) {

drivers/bus/fsl-mc/fsl-mc-bus.c+3−3

@@ -1239,14 +1239,14 @@ error_cleanup_mc_io: · 1238 unmodified lines
1239	static int fsl_mc_bus_remove(struct platform_device *pdev)	1239	static int fsl_mc_bus_remove(struct platform_device *pdev)
1240	{	1240	{
1241	struct fsl_mc *mc = platform_get_drvdata(pdev);	1241	struct fsl_mc *mc = platform_get_drvdata(pdev);
		1242	struct fsl_mc_io *mc_io;
1242		1243
1243	if (!fsl_mc_is_root_dprc(&mc->root_mc_bus_dev->dev))	1244	if (!fsl_mc_is_root_dprc(&mc->root_mc_bus_dev->dev))
1244	return -EINVAL;	1245	return -EINVAL;
1245		1246
		1247	mc_io = mc->root_mc_bus_dev->mc_io;
1246	fsl_mc_device_remove(mc->root_mc_bus_dev);	1248	fsl_mc_device_remove(mc->root_mc_bus_dev);
1247		1249	fsl_destroy_mc_io(mc_io);
1248	fsl_destroy_mc_io(mc->root_mc_bus_dev->mc_io);
1249	mc->root_mc_bus_dev->mc_io = NULL;
1250		1250
1251	bus_unregister_notifier(&fsl_mc_bus_type, &fsl_mc_nb);	1251	bus_unregister_notifier(&fsl_mc_bus_type, &fsl_mc_nb);
1252		1252

drivers/char/lp.c+1−1

@@ -1019,7 +1019,7 @@ static struct parport_driver lp_driver = { · 1018 unmodified lines
1019		1019
1020	static int __init lp_init(void)	1020	static int __init lp_init(void)
1021	{	1021	{
1022	int i, err = 0;	1022	int i, err;
1023		1023
1024	if (parport_nr[0] == LP_PARPORT_OFF)	1024	if (parport_nr[0] == LP_PARPORT_OFF)
1025	return 0;	1025	return 0;

drivers/char/random.c+3−3

drivers/clocksource/hyperv_timer.c+0−1

@@ -565,4 +565,3 @@ void __init hv_init_clocksource(void) · 564 unmodified lines
565	hv_sched_clock_offset = hv_read_reference_counter();	565	hv_sched_clock_offset = hv_read_reference_counter();
566	hv_setup_sched_clock(read_hv_sched_clock_msr);	566	hv_setup_sched_clock(read_hv_sched_clock_msr);
567	}	567	}
568	EXPORT_SYMBOL_GPL(hv_init_clocksource);

drivers/comedi/drivers/vmk80xx.c+1−1

@@ -684,7 +684,7 @@ static int vmk80xx_alloc_usb_buffers(struct comedi_device *dev) · 683 unmodified lines
684	if (!devpriv->usb_rx_buf)	684	if (!devpriv->usb_rx_buf)
685	return -ENOMEM;	685	return -ENOMEM;
686		686
687	size = max(usb_endpoint_maxp(devpriv->ep_rx), MIN_BUF_SIZE);	687	size = max(usb_endpoint_maxp(devpriv->ep_tx), MIN_BUF_SIZE);
688	devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL);	688	devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL);
689	if (!devpriv->usb_tx_buf)	689	if (!devpriv->usb_tx_buf)
690	return -ENOMEM;	690	return -ENOMEM;

drivers/dma-buf/udmabuf.c+4−1

 {
 	struct vm_area_struct *vma = vmf->vma;
 	struct udmabuf *ubuf = vma->vm_private_data;
+	pgoff_t pgoff = vmf->pgoff;
-	vmf->page = ubuf->pages[vmf->pgoff];
+	if (pgoff >= ubuf->pagecount)
+		return VM_FAULT_SIGBUS;
+	vmf->page = ubuf->pages[pgoff];
 	get_page(vmf->page);
 	return 0;
 }

drivers/firewire/core-cdev.c+1−1

@@ -1211,7 +1211,7 @@ static int ioctl_get_cycle_timer2(struct client client, union ioctl_arg arg) · 1210 unmodified lines
1211	struct fw_cdev_get_cycle_timer2 *a = &arg->get_cycle_timer2;	1211	struct fw_cdev_get_cycle_timer2 *a = &arg->get_cycle_timer2;
1212	struct fw_card *card = client->device->card;	1212	struct fw_card *card = client->device->card;
1213	struct timespec64 ts = {0, 0};	1213	struct timespec64 ts = {0, 0};
1214	u32 cycle_time;	1214	u32 cycle_time = 0;
1215	int ret = 0;	1215	int ret = 0;
1216		1216
1217	local_irq_disable();	1217	local_irq_disable();

drivers/firewire/core-device.c+2−4

 	struct fw_device *device = fw_device(dev->parent);
 	struct fw_unit *unit = fw_unit(dev);
-	return snprintf(buf, PAGE_SIZE, "%d\n",
+	return sysfs_emit(buf, "%td\n", unit->directory - device->config_rom);
-			(int)(unit->directory - device->config_rom));
 }
 static struct device_attribute fw_unit_attributes[] = {
 	int ret;
 	down_read(&fw_device_rwsem);
-	ret = snprintf(buf, PAGE_SIZE, "0x%08x%08x\n",
+	ret = sysfs_emit(buf, "0x%08x%08x\n", device->config_rom[3], device->config_rom[4]);
-		       device->config_rom[3], device->config_rom[4]);
 	up_read(&fw_device_rwsem);
 	return ret;

drivers/firmware/arm_scmi/base.c+15−9

 struct scmi_msg_resp_base_discover_agent {
 	__le32 agent_id;
-	u8 name[SCMI_MAX_STR_SIZE];
+	u8 name[SCMI_SHORT_NAME_MAX_SIZE];
 };
 	ret = ph->xops->do_xfer(ph, t);
 	if (!ret)
-		memcpy(vendor_id, t->rx.buf, size);
+		strscpy(vendor_id, t->rx.buf, size);
 	ph->xops->xfer_put(ph, t);
 		calc_list_sz = (1 + (loop_num_ret - 1) / sizeof(u32)) *
 				sizeof(u32);
 		if (calc_list_sz != real_list_sz) {
-			dev_err(dev,
+			dev_warn(dev,
-				"Malformed reply - real_sz:%zd  calc_sz:%u\n",
+				 "Malformed reply - real_sz:%zd  calc_sz:%u  (loop_num_ret:%d)\n",
-				real_list_sz, calc_list_sz);
+				 real_list_sz, calc_list_sz, loop_num_ret);
-			ret = -EPROTO;
+			/*
-			break;
+			 * Bail out if the expected list size is bigger than the
+			 * total payload size of the received reply.
+			 */
+			if (calc_list_sz > real_list_sz) {
+				ret = -EPROTO;
+				break;
+			}
 		}
 		for (loop = 0; loop < loop_num_ret; loop++)
 	ret = ph->xops->do_xfer(ph, t);
 	if (!ret) {
 		agent_info = t->rx.buf;
-		strlcpy(name, agent_info->name, SCMI_MAX_STR_SIZE);
+		strscpy(name, agent_info->name, SCMI_SHORT_NAME_MAX_SIZE);
 	}
 	ph->xops->xfer_put(ph, t);
 	int id, ret;
 	u8 *prot_imp;
 	u32 version;
-	char name[SCMI_MAX_STR_SIZE];
+	char name[SCMI_SHORT_NAME_MAX_SIZE];
 	struct device *dev = ph->dev;
 	struct scmi_revision_info *rev = scmi_revision_area_get(ph);

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

 	if (!ret) {
 		u32 latency = 0;
 		attributes = le32_to_cpu(attr->attributes);
-		strlcpy(clk->name, attr->name, SCMI_MAX_STR_SIZE);
+		strscpy(clk->name, attr->name, SCMI_SHORT_NAME_MAX_SIZE);
 		/* clock_enable_latency field is present only since SCMI v3.1 */
 		if (PROTOCOL_REV_MAJOR(version) >= 0x2)
 			latency = le32_to_cpu(attr->clock_enable_latency);
 			      struct scmi_clock_info *clk)
 {
 	int ret;
 	void *iter;
-	struct scmi_msg_clock_describe_rates *msg;
 	struct scmi_iterator_ops ops = {
 		.prepare_message = iter_clk_describe_prepare_message,
 		.update_state = iter_clk_describe_update_state,
 	iter = ph->hops->iter_response_init(ph, &ops, SCMI_MAX_NUM_RATES,
 					    CLOCK_DESCRIBE_RATES,
-					    sizeof(*msg), &cpriv);
+					    sizeof(struct scmi_msg_clock_describe_rates),
+					    &cpriv);
 	if (IS_ERR(iter))
 		return PTR_ERR(iter);

drivers/firmware/arm_scmi/perf.c+3−3

 			dom_info->mult_factor =
 					(dom_info->sustained_freq_khz * 1000) /
 					dom_info->sustained_perf_level;
-		strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE);
+		strscpy(dom_info->name, attr->name, SCMI_SHORT_NAME_MAX_SIZE);
 	}
 	ph->xops->xfer_put(ph, t);
 {
 	int ret;
 	void *iter;
-	struct scmi_msg_perf_describe_levels *msg;
 	struct scmi_iterator_ops ops = {
 		.prepare_message = iter_perf_levels_prepare_message,
 		.update_state = iter_perf_levels_update_state,
 	iter = ph->hops->iter_response_init(ph, &ops, MAX_OPPS,
 					    PERF_DESCRIBE_LEVELS,
-					    sizeof(*msg), &ppriv);
+					    sizeof(struct scmi_msg_perf_describe_levels),
+					    &ppriv);
 	if (IS_ERR(iter))
 		return PTR_ERR(iter);

drivers/firmware/arm_scmi/power.c+1−1

@@ -122,7 +122,7 @@ scmi_power_domain_attributes_get(const struct scmi_protocol_handle *ph, · 121 unmodified lines
122	dom_info->state_set_notify = SUPPORTS_STATE_SET_NOTIFY(flags);	122	dom_info->state_set_notify = SUPPORTS_STATE_SET_NOTIFY(flags);
123	dom_info->state_set_async = SUPPORTS_STATE_SET_ASYNC(flags);	123	dom_info->state_set_async = SUPPORTS_STATE_SET_ASYNC(flags);
124	dom_info->state_set_sync = SUPPORTS_STATE_SET_SYNC(flags);	124	dom_info->state_set_sync = SUPPORTS_STATE_SET_SYNC(flags);
125	strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE);	125	strscpy(dom_info->name, attr->name, SCMI_SHORT_NAME_MAX_SIZE);
126	}	126	}
127	ph->xops->xfer_put(ph, t);	127	ph->xops->xfer_put(ph, t);
128		128

drivers/firmware/arm_scmi/protocols.h+0−2

@@ -24,8 +24,6 @@ · 23 unmodified lines
24		24
25	#include <asm/unaligned.h>	25	#include <asm/unaligned.h>
26		26
27	#define SCMI_SHORT_NAME_MAX_SIZE 16
28
29	#define PROTOCOL_REV_MINOR_MASK GENMASK(15, 0)	27	#define PROTOCOL_REV_MINOR_MASK GENMASK(15, 0)
30	#define PROTOCOL_REV_MAJOR_MASK GENMASK(31, 16)	28	#define PROTOCOL_REV_MAJOR_MASK GENMASK(31, 16)
31	#define PROTOCOL_REV_MAJOR(x) ((u16)(FIELD_GET(PROTOCOL_REV_MAJOR_MASK, (x))))	29	#define PROTOCOL_REV_MAJOR(x) ((u16)(FIELD_GET(PROTOCOL_REV_MAJOR_MASK, (x))))

drivers/firmware/arm_scmi/reset.c+1−1

@@ -116,7 +116,7 @@ scmi_reset_domain_attributes_get(const struct scmi_protocol_handle *ph, · 115 unmodified lines
116	dom_info->latency_us = le32_to_cpu(attr->latency);	116	dom_info->latency_us = le32_to_cpu(attr->latency);
117	if (dom_info->latency_us == U32_MAX)	117	if (dom_info->latency_us == U32_MAX)
118	dom_info->latency_us = 0;	118	dom_info->latency_us = 0;
119	strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE);	119	strscpy(dom_info->name, attr->name, SCMI_SHORT_NAME_MAX_SIZE);
120	}	120	}
121		121
122	ph->xops->xfer_put(ph, t);	122	ph->xops->xfer_put(ph, t);

drivers/firmware/arm_scmi/sensors.c+52−16

 					struct scmi_sensor_info *s)
 {
 	void *iter;
-	struct scmi_msg_sensor_list_update_intervals *msg;
 	struct scmi_iterator_ops ops = {
 		.prepare_message = iter_intervals_prepare_message,
 		.update_state = iter_intervals_update_state,
 	iter = ph->hops->iter_response_init(ph, &ops, s->intervals.count,
 					    SENSOR_LIST_UPDATE_INTERVALS,
-					    sizeof(*msg), &upriv);
+					    sizeof(struct scmi_msg_sensor_list_update_intervals),
+					    &upriv);
 	if (IS_ERR(iter))
 		return PTR_ERR(iter);
 	return ph->hops->iter_response_run(iter);
 }
+struct scmi_apriv {
+	bool any_axes_support_extended_names;
+	struct scmi_sensor_info *s;
+};
 static void iter_axes_desc_prepare_message(void *message,
 					   const unsigned int desc_index,
 					   const void *priv)
 {
 	struct scmi_msg_sensor_axis_description_get *msg = message;
-	const struct scmi_sensor_info *s = priv;
+	const struct scmi_apriv *apriv = priv;
 	/* Set the number of sensors to be skipped/already read */
-	msg->id = cpu_to_le32(s->id);
+	msg->id = cpu_to_le32(apriv->s->id);
 	msg->axis_desc_index = cpu_to_le32(desc_index);
 }
 	u32 attrh, attrl;
 	struct scmi_sensor_axis_info *a;
 	size_t dsize = SCMI_MSG_RESP_AXIS_DESCR_BASE_SZ;
-	struct scmi_sensor_info *s = priv;
+	struct scmi_apriv *apriv = priv;
 	const struct scmi_axis_descriptor *adesc = st->priv;
 	attrl = le32_to_cpu(adesc->attributes_low);
+	if (SUPPORTS_EXTENDED_AXIS_NAMES(attrl))
+		apriv->any_axes_support_extended_names = true;
-	a = &s->axis[st->desc_index + st->loop_idx];
+	a = &apriv->s->axis[st->desc_index + st->loop_idx];
 	a->id = le32_to_cpu(adesc->id);
 	a->extended_attrs = SUPPORTS_EXTEND_ATTRS(attrl);
 	attrh = le32_to_cpu(adesc->attributes_high);
 	a->scale = S32_EXT(SENSOR_SCALE(attrh));
 	a->type = SENSOR_TYPE(attrh);
-	strscpy(a->name, adesc->name, SCMI_MAX_STR_SIZE);
+	strscpy(a->name, adesc->name, SCMI_SHORT_NAME_MAX_SIZE);
 	if (a->extended_attrs) {
 		unsigned int ares = le32_to_cpu(adesc->resolution);
 					 void *priv)
 {
 	struct scmi_sensor_axis_info *a;
-	const struct scmi_sensor_info *s = priv;
+	const struct scmi_apriv *apriv = priv;
 	struct scmi_sensor_axis_name_descriptor *adesc = st->priv;
+	u32 axis_id = le32_to_cpu(adesc->axis_id);
-	a = &s->axis[st->desc_index + st->loop_idx];
+	if (axis_id >= st->max_resources)
+		return -EPROTO;
+	/*
+	 * Pick the corresponding descriptor based on the axis_id embedded
+	 * in the reply since the list of axes supporting extended names
+	 * can be a subset of all the axes.
+	 */
+	a = &apriv->s->axis[axis_id];
 	strscpy(a->name, adesc->name, SCMI_MAX_STR_SIZE);
 	st->priv = ++adesc;
 scmi_sensor_axis_extended_names_get(const struct scmi_protocol_handle *ph,
 				    struct scmi_sensor_info *s)
 {
+	int ret;
 	void *iter;
-	struct scmi_msg_sensor_axis_description_get *msg;
 	struct scmi_iterator_ops ops = {
 		.prepare_message = iter_axes_desc_prepare_message,
 		.update_state = iter_axes_extended_name_update_state,
 		.process_response = iter_axes_extended_name_process_response,
 	};
+	struct scmi_apriv apriv = {
+		.any_axes_support_extended_names = false,
+		.s = s,
+	};
 	iter = ph->hops->iter_response_init(ph, &ops, s->num_axis,
 					    SENSOR_AXIS_NAME_GET,
-					    sizeof(*msg), s);
+					    sizeof(struct scmi_msg_sensor_axis_description_get),
+					    &apriv);
 	if (IS_ERR(iter))
 		return PTR_ERR(iter);
-	return ph->hops->iter_response_run(iter);
+	/*
+	 * Do not cause whole protocol initialization failure when failing to
+	 * get extended names for axes.
+	 */
+	ret = ph->hops->iter_response_run(iter);
+	if (ret)
+		dev_warn(ph->dev,
+			 "Failed to get axes extended names for %s (ret:%d).\n",
+			 s->name, ret);
+	return 0;
 }
 static int scmi_sensor_axis_description(const struct scmi_protocol_handle *ph,
 {
 	int ret;
 	void *iter;
-	struct scmi_msg_sensor_axis_description_get *msg;
 	struct scmi_iterator_ops ops = {
 		.prepare_message = iter_axes_desc_prepare_message,
 		.update_state = iter_axes_desc_update_state,
 		.process_response = iter_axes_desc_process_response,
 	};
+	struct scmi_apriv apriv = {
+		.any_axes_support_extended_names = false,
+		.s = s,
+	};
 	s->axis = devm_kcalloc(ph->dev, s->num_axis,
 			       sizeof(*s->axis), GFP_KERNEL);
 	iter = ph->hops->iter_response_init(ph, &ops, s->num_axis,
 					    SENSOR_AXIS_DESCRIPTION_GET,
-					    sizeof(*msg), s);
+					    sizeof(struct scmi_msg_sensor_axis_description_get),
+					    &apriv);
 	if (IS_ERR(iter))
 		return PTR_ERR(iter);
 	if (ret)
 		return ret;
-	if (PROTOCOL_REV_MAJOR(version) >= 0x3)
+	if (PROTOCOL_REV_MAJOR(version) >= 0x3 &&
+	    apriv.any_axes_support_extended_names)
 		ret = scmi_sensor_axis_extended_names_get(ph, s);
 	return ret;
 			    SUPPORTS_AXIS(attrh) ?
 			    SENSOR_AXIS_NUMBER(attrh) : 0,
 			    SCMI_MAX_NUM_SENSOR_AXIS);
-	strscpy(s->name, sdesc->name, SCMI_MAX_STR_SIZE);
+	strscpy(s->name, sdesc->name, SCMI_SHORT_NAME_MAX_SIZE);
 	/*
 	 * If supported overwrite short name with the extended

drivers/firmware/arm_scmi/voltage.c+5−10

 {
 	int ret;
 	void *iter;
-	struct scmi_msg_cmd_describe_levels *msg;
 	struct scmi_iterator_ops ops = {
 		.prepare_message = iter_volt_levels_prepare_message,
 		.update_state = iter_volt_levels_update_state,
 	iter = ph->hops->iter_response_init(ph, &ops, v->num_levels,
 					    VOLTAGE_DESCRIBE_LEVELS,
-					    sizeof(*msg), &vpriv);
+					    sizeof(struct scmi_msg_cmd_describe_levels),
+					    &vpriv);
 	if (IS_ERR(iter))
 		return PTR_ERR(iter);
 		/* Retrieve domain attributes at first ... */
 		put_unaligned_le32(dom, td->tx.buf);
-		ret = ph->xops->do_xfer(ph, td);
 		/* Skip domain on comms error */
-		if (ret)
+		if (ph->xops->do_xfer(ph, td))
 			continue;
 		v = vinfo->domains + dom;
 		v->id = dom;
 		attributes = le32_to_cpu(resp_dom->attr);
-		strlcpy(v->name, resp_dom->name, SCMI_MAX_STR_SIZE);
+		strscpy(v->name, resp_dom->name, SCMI_SHORT_NAME_MAX_SIZE);
 		/*
 		 * If supported overwrite short name with the extended one;
 				v->async_level_set = true;
 		}
-		ret = scmi_voltage_levels_get(ph, v);
 		/* Skip invalid voltage descriptors */
-		if (ret)
+		scmi_voltage_levels_get(ph, v);
-			continue;
-		ph->xops->reset_rx_to_maxsz(ph, td);
 	}
 	ph->xops->xfer_put(ph, td);

drivers/firmware/efi/sysfb_efi.c+0−2

@@ -26,8 +26,6 @@ · 25 unmodified lines
26	#include <linux/sysfb.h>	26	#include <linux/sysfb.h>
27	#include <video/vga.h>	27	#include <video/vga.h>
28		28
29	#include <asm/efi.h>
30
31	enum {	29	enum {
32	OVERRIDE_NONE = 0x0,	30	OVERRIDE_NONE = 0x0,
33	OVERRIDE_BASE = 0x1,	31	OVERRIDE_BASE = 0x1,

drivers/gpio/gpio-grgpio.c+1−13

 static int grgpio_remove(struct platform_device *ofdev)
 {
 	struct grgpio_priv *priv = platform_get_drvdata(ofdev);
-	int i;
-	int ret = 0;
-	if (priv->domain) {
-		for (i = 0; i < GRGPIO_MAX_NGPIO; i++) {
-			if (priv->uirqs[i].refcnt != 0) {
-				ret = -EBUSY;
-				goto out;
-			}
-		}
-	}
 	gpiochip_remove(&priv->gc);
 	if (priv->domain)
 		irq_domain_remove(priv->domain);
-out:
+	return 0;
-	return ret;
 }
 static const struct of_device_id grgpio_match[] = {

drivers/gpio/gpio-mxs.c+1−1

@@ -1,6 +1,6 @@
1	// SPDX-License-Identifier: GPL-2.0+	1	// SPDX-License-Identifier: GPL-2.0+
2	//	2	//
3	// MXC GPIO support. (c) 2008 Daniel Mack <daniel@caiaq.de>	3	// MXS GPIO support. (c) 2008 Daniel Mack <daniel@caiaq.de>
4	// Copyright 2008 Juergen Beisert, kernel@pengutronix.de	4	// Copyright 2008 Juergen Beisert, kernel@pengutronix.de
5	//	5	//
6	// Based on code from Freescale,	6	// Based on code from Freescale,

drivers/gpio/gpio-realtek-otto.c+8−2

 	unsigned long flags;
 	u16 m;
+	gpiochip_enable_irq(&ctrl->gc, line);
 	raw_spin_lock_irqsave(&ctrl->lock, flags);
 	m = ctrl->intr_mask[port];
 	m |= realtek_gpio_imr_bits(port_pin, REALTEK_GPIO_IMR_LINE_MASK);
 	ctrl->intr_mask[port] = m;
 	realtek_gpio_write_imr(ctrl, port, ctrl->intr_type[port], m);
 	raw_spin_unlock_irqrestore(&ctrl->lock, flags);
+	gpiochip_disable_irq(&ctrl->gc, line);
 }
 static int realtek_gpio_irq_set_type(struct irq_data *data, unsigned int flow_type)
 	return 0;
 }
-static struct irq_chip realtek_gpio_irq_chip = {
+static const struct irq_chip realtek_gpio_irq_chip = {
 	.name = "realtek-otto-gpio",
 	.irq_ack = realtek_gpio_irq_ack,
 	.irq_mask = realtek_gpio_irq_mask,
 	.irq_unmask = realtek_gpio_irq_unmask,
 	.irq_set_type = realtek_gpio_irq_set_type,
 	.irq_set_affinity = realtek_gpio_irq_set_affinity,
+	.flags = IRQCHIP_IMMUTABLE,
+	GPIOCHIP_IRQ_RESOURCE_HELPERS,
 };
 static const struct of_device_id realtek_gpio_of_match[] = {
 	irq = platform_get_irq_optional(pdev, 0);
 	if (!(dev_flags & GPIO_INTERRUPTS_DISABLED) && irq > 0) {
 		girq = &ctrl->gc.irq;
-		girq->chip = &realtek_gpio_irq_chip;
+		gpio_irq_chip_set_chip(girq, &realtek_gpio_irq_chip);
 		girq->default_type = IRQ_TYPE_NONE;
 		girq->handler = handle_bad_irq;
 		girq->parent_handler = realtek_gpio_irq_handler;

drivers/gpio/gpio-vr41xx.c+0−2

@@ -217,8 +217,6 @@ static int giu_get_irq(unsigned int irq) · 216 unmodified lines
217	printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",	217	printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
218	maskl, pendl, maskh, pendh);	218	maskl, pendl, maskh, pendh);
219		219
220	atomic_inc(&irq_err_count);
221
222	return -EINVAL;	220	return -EINVAL;
223	}	221	}
224		222

drivers/gpio/gpio-winbond.c+4−3

 	unsigned long *base = gpiochip_get_data(gc);
 	const struct winbond_gpio_info *info;
 	bool val;
+	int ret;
 	winbond_gpio_get_info(&offset, &info);
-	val = winbond_sio_enter(*base);
+	ret = winbond_sio_enter(*base);
-	if (val)
+	if (ret)
-		return val;
+		return ret;
 	winbond_sio_select_logical(*base, info->dev);

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c+0−2

 			    atomic64_read(&adev->visible_pin_size),
 			    vram_gtt.vram_size);
 		vram_gtt.gtt_size = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT)->size;
-		vram_gtt.gtt_size *= PAGE_SIZE;
 		vram_gtt.gtt_size -= atomic64_read(&adev->gart_pin_size);
 		return copy_to_user(out, &vram_gtt,
 				    min((size_t)size, sizeof(vram_gtt))) ? -EFAULT : 0;
 			mem.cpu_accessible_vram.usable_heap_size * 3 / 4;
 		mem.gtt.total_heap_size = gtt_man->size;
-		mem.gtt.total_heap_size *= PAGE_SIZE;
 		mem.gtt.usable_heap_size = mem.gtt.total_heap_size -
 			atomic64_read(&adev->gart_pin_size);
 		mem.gtt.heap_usage = ttm_resource_manager_usage(gtt_man);

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c+14−6

 	DRM_INFO("amdgpu: %uM of VRAM memory ready\n",
 		 (unsigned) (adev->gmc.real_vram_size / (1024 * 1024)));
-	/* Compute GTT size, either bsaed on 3/4th the size of RAM size
+	/* Compute GTT size, either based on 1/2 the size of RAM size
 	 * or whatever the user passed on module init */
 	if (amdgpu_gtt_size == -1) {
 		struct sysinfo si;
 		si_meminfo(&si);
-		gtt_size = min(max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),
+		/* Certain GL unit tests for large textures can cause problems
-			       adev->gmc.mc_vram_size),
+		 * with the OOM killer since there is no way to link this memory
-			       ((uint64_t)si.totalram * si.mem_unit * 3/4));
+		 * to a process.  This was originally mitigated (but not necessarily
-	}
+		 * eliminated) by limiting the GTT size.  The problem is this limit
-	else
+		 * is often too low for many modern games so just make the limit 1/2
+		 * of system memory which aligns with TTM. The OOM accounting needs
+		 * to be addressed, but we shouldn't prevent common 3D applications
+		 * from being usable just to potentially mitigate that corner case.
+		 */
+		gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),
+			       (u64)si.totalram * si.mem_unit / 2);
+	} else {
 		gtt_size = (uint64_t)amdgpu_gtt_size << 20;
+	}
 	/* Initialize GTT memory pool */
 	r = amdgpu_gtt_mgr_init(adev, gtt_size);

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

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c+1−1

@@ -550,7 +550,7 @@ static void dcn315_clk_mgr_helper_populate_bw_params( · 549 unmodified lines
550	if (!bw_params->clk_table.entries[i].dtbclk_mhz)	550	if (!bw_params->clk_table.entries[i].dtbclk_mhz)
551	bw_params->clk_table.entries[i].dtbclk_mhz = def_max.dtbclk_mhz;	551	bw_params->clk_table.entries[i].dtbclk_mhz = def_max.dtbclk_mhz;
552	}	552	}
553	ASSERT(bw_params->clk_table.entries[i].dcfclk_mhz);	553	ASSERT(bw_params->clk_table.entries[i-1].dcfclk_mhz);
554	bw_params->vram_type = bios_info->memory_type;	554	bw_params->vram_type = bios_info->memory_type;
555	bw_params->num_channels = bios_info->ma_channel_number;	555	bw_params->num_channels = bios_info->ma_channel_number;
556	if (!bw_params->num_channels)	556	if (!bw_params->num_channels)

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c+1−1

@@ -944,7 +944,7 @@ static void override_lane_settings(const struct link_training_settings *lt_setti · 943 unmodified lines
944		944
945	return;	945	return;
946		946
947	for (lane = 1; lane < LANE_COUNT_DP_MAX; lane++) {	947	for (lane = 0; lane < LANE_COUNT_DP_MAX; lane++) {
948	if (lt_settings->voltage_swing)	948	if (lt_settings->voltage_swing)
949	lane_settings[lane].VOLTAGE_SWING = *lt_settings->voltage_swing;	949	lane_settings[lane].VOLTAGE_SWING = *lt_settings->voltage_swing;
950	if (lt_settings->pre_emphasis)	950	if (lt_settings->pre_emphasis)

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c+2−22

@@ -1766,29 +1766,9 @@ void dce110_enable_accelerated_mode(struct dc dc, struct dc_state context) · 1765 unmodified lines
1766	break;	1766	break;
1767	}	1767	}
1768	}	1768	}
1769		1769	// We are trying to enable eDP, don't power down VDD
1770	/*	1770	if (can_apply_edp_fast_boot)
1771	* TO-DO: So far the code logic below only addresses single eDP case.
1772	* For dual eDP case, there are a few things that need to be
1773	* implemented first:
1774	*
1775	* 1. Change the fastboot logic above, so eDP link[0 or 1]'s
1776	* stream[0 or 1] will all be checked.
1777	*
1778	* 2. Change keep_edp_vdd_on to an array, and maintain keep_edp_vdd_on
1779	* for each eDP.
1780	*
1781	* Once above 2 things are completed, we can then change the logic below
1782	* correspondingly, so dual eDP case will be fully covered.
1783	*/
1784
1785	// We are trying to enable eDP, don't power down VDD if eDP stream is existing
1786	if ((edp_stream_num == 1 && edp_streams[0] != NULL) \|\| can_apply_edp_fast_boot) {
1787	keep_edp_vdd_on = true;	1771	keep_edp_vdd_on = true;
1788	DC_LOG_EVENT_LINK_TRAINING("Keep eDP Vdd on\n");
1789	} else {
1790	DC_LOG_EVENT_LINK_TRAINING("No eDP stream enabled, turn eDP Vdd off\n");
1791	}
1792	}	1772	}
1793		1773
1794	// Check seamless boot support	1774	// Check seamless boot support

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c+3−0

@@ -212,6 +212,9 @@ static void dpp2_cnv_setup ( · 211 unmodified lines
212	break;	212	break;
213	}	213	}
214		214
		215	/* Set default color space based on format if none is given. */
		216	color_space = input_color_space ? input_color_space : color_space;
		217
215	if (is_2bit == 1 && alpha_2bit_lut != NULL) {	218	if (is_2bit == 1 && alpha_2bit_lut != NULL) {
216	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT0, alpha_2bit_lut->lut0);	219	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT0, alpha_2bit_lut->lut0);
217	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT1, alpha_2bit_lut->lut1);	220	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT1, alpha_2bit_lut->lut1);

drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c+3−0

@@ -153,6 +153,9 @@ static void dpp201_cnv_setup( · 152 unmodified lines
153	break;	153	break;
154	}	154	}
155		155
		156	/* Set default color space based on format if none is given. */
		157	color_space = input_color_space ? input_color_space : color_space;
		158
156	if (is_2bit == 1 && alpha_2bit_lut != NULL) {	159	if (is_2bit == 1 && alpha_2bit_lut != NULL) {
157	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT0, alpha_2bit_lut->lut0);	160	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT0, alpha_2bit_lut->lut0);
158	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT1, alpha_2bit_lut->lut1);	161	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT1, alpha_2bit_lut->lut1);

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c+3−0

@@ -294,6 +294,9 @@ static void dpp3_cnv_setup ( · 293 unmodified lines
294	break;	294	break;
295	}	295	}
296		296
		297	/* Set default color space based on format if none is given. */
		298	color_space = input_color_space ? input_color_space : color_space;
		299
297	if (is_2bit == 1 && alpha_2bit_lut != NULL) {	300	if (is_2bit == 1 && alpha_2bit_lut != NULL) {
298	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT0, alpha_2bit_lut->lut0);	301	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT0, alpha_2bit_lut->lut0);
299	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT1, alpha_2bit_lut->lut1);	302	REG_UPDATE(ALPHA_2BIT_LUT, ALPHA_2BIT_LUT1, alpha_2bit_lut->lut1);

drivers/gpu/drm/drm_panel_orientation_quirks.c+6−0

 		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "AYA NEO 2021"),
 		},
 		.driver_data = (void *)&lcd800x1280_rightside_up,
+	}, {	/* AYA NEO NEXT */
+		.matches = {
+		  DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
+		  DMI_MATCH(DMI_BOARD_NAME, "NEXT"),
+		},
+		.driver_data = (void *)&lcd800x1280_rightside_up,
 	}, {	/* Chuwi HiBook (CWI514) */
 		.matches = {
 			DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"),

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

 	}, {
 		DRV_PTR(mixer_driver, CONFIG_DRM_EXYNOS_MIXER),
 		DRM_COMPONENT_DRIVER
-	}, {
-		DRV_PTR(mic_driver, CONFIG_DRM_EXYNOS_MIC),
-		DRM_COMPONENT_DRIVER
 	}, {
 		DRV_PTR(dp_driver, CONFIG_DRM_EXYNOS_DP),
 		DRM_COMPONENT_DRIVER
 	}, {
 		DRV_PTR(dsi_driver, CONFIG_DRM_EXYNOS_DSI),
 		DRM_COMPONENT_DRIVER
+	}, {
+		DRV_PTR(mic_driver, CONFIG_DRM_EXYNOS_MIC),
+		DRM_COMPONENT_DRIVER
 	}, {
 		DRV_PTR(hdmi_driver, CONFIG_DRM_EXYNOS_HDMI),
 		DRM_COMPONENT_DRIVER

drivers/gpu/drm/exynos/exynos_drm_mic.c+12−30

 #include <drm/drm_print.h>
 #include "exynos_drm_drv.h"
+#include "exynos_drm_crtc.h"
 /* Sysreg registers for MIC */
 #define DSD_CFG_MUX	0x1004
 	bool i80_mode;
 	struct videomode vm;
-	struct drm_encoder *encoder;
 	struct drm_bridge bridge;
-	struct drm_bridge *next_bridge;
 	bool enabled;
 };
 	writel(reg, mic->reg + MIC_OP);
 }
-static void mic_disable(struct drm_bridge *bridge) { }
 static void mic_post_disable(struct drm_bridge *bridge)
 {
 	struct exynos_mic *mic = bridge->driver_private;
 	mutex_unlock(&mic_mutex);
 }
-static void mic_enable(struct drm_bridge *bridge) { }
-static int mic_attach(struct drm_bridge *bridge,
-		      enum drm_bridge_attach_flags flags)
-{
-	struct exynos_mic *mic = bridge->driver_private;
-	return drm_bridge_attach(bridge->encoder, mic->next_bridge,
-				 &mic->bridge, flags);
-}
 static const struct drm_bridge_funcs mic_bridge_funcs = {
-	.disable = mic_disable,
 	.post_disable = mic_post_disable,
 	.mode_set = mic_mode_set,
 	.pre_enable = mic_pre_enable,
-	.enable = mic_enable,
-	.attach = mic_attach,
 };
 static int exynos_mic_bind(struct device *dev, struct device *master,
 			   void *data)
 {
 	struct exynos_mic *mic = dev_get_drvdata(dev);
+	struct drm_device *drm_dev = data;
+	struct exynos_drm_crtc *crtc = exynos_drm_crtc_get_by_type(drm_dev,
+						       EXYNOS_DISPLAY_TYPE_LCD);
+	struct drm_encoder *e, *encoder = NULL;
+	drm_for_each_encoder(e, drm_dev)
+		if (e->possible_crtcs == drm_crtc_mask(&crtc->base))
+			encoder = e;
+	if (!encoder)
+		return -ENODEV;
 	mic->bridge.driver_private = mic;
-	return 0;
+	return drm_bridge_attach(encoder, &mic->bridge, NULL, 0);
 }
 static void exynos_mic_unbind(struct device *dev, struct device *master,
 {
 	struct device *dev = &pdev->dev;
 	struct exynos_mic *mic;
-	struct device_node *remote;
 	struct resource res;
 	int ret, i;
 		}
 	}
-	remote = of_graph_get_remote_node(dev->of_node, 1, 0);
-	mic->next_bridge = of_drm_find_bridge(remote);
-	if (IS_ERR(mic->next_bridge)) {
-		DRM_DEV_ERROR(dev, "mic: Failed to find next bridge\n");
-		ret = PTR_ERR(mic->next_bridge);
-		goto err;
-	}
-	of_node_put(remote);
 	platform_set_drvdata(pdev, mic);
 	mic->bridge.funcs = &mic_bridge_funcs;

drivers/gpu/drm/i915/display/intel_dp.c+29−3

 	return intel_dp_is_edp(intel_dp) ? 810000 : 1350000;
 }
+static bool is_low_voltage_sku(struct drm_i915_private *i915, enum phy phy)
+{
+	u32 voltage;
+	voltage = intel_de_read(i915, ICL_PORT_COMP_DW3(phy)) & VOLTAGE_INFO_MASK;
+	return voltage == VOLTAGE_INFO_0_85V;
+}
 static int icl_max_source_rate(struct intel_dp *intel_dp)
 {
 	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
 	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
 	enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port);
-	if (intel_phy_is_combo(dev_priv, phy) && !intel_dp_is_edp(intel_dp))
+	if (intel_phy_is_combo(dev_priv, phy) &&
+	    (is_low_voltage_sku(dev_priv, phy) || !intel_dp_is_edp(intel_dp)))
 		return 540000;
 	return 810000;
 static int ehl_max_source_rate(struct intel_dp *intel_dp)
 {
-	if (intel_dp_is_edp(intel_dp))
+	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
+	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
+	enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port);
+	if (intel_dp_is_edp(intel_dp) || is_low_voltage_sku(dev_priv, phy))
+		return 540000;
+	return 810000;
+}
+static int dg1_max_source_rate(struct intel_dp *intel_dp)
+{
+	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
+	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
+	enum phy phy = intel_port_to_phy(i915, dig_port->base.port);
+	if (intel_phy_is_combo(i915, phy) && is_low_voltage_sku(i915, phy))
 		return 540000;
 	return 810000;
 			max_rate = dg2_max_source_rate(intel_dp);
 		else if (IS_ALDERLAKE_P(dev_priv) || IS_ALDERLAKE_S(dev_priv) ||
 			 IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv))
-			max_rate = 810000;
+			max_rate = dg1_max_source_rate(intel_dp);
 		else if (IS_JSL_EHL(dev_priv))
 			max_rate = ehl_max_source_rate(intel_dp);
 		else

drivers/gpu/drm/i915/display/intel_dpll_mgr.c+2−2

@@ -2396,7 +2396,7 @@ static void icl_wrpll_params_populate(struct skl_wrpll_params *params, · 2395 unmodified lines
2396	}	2396	}
2397		2397
2398	/*	2398	/*
2399	* Display WA #22010492432: ehl, tgl, adl-p	2399	* Display WA #22010492432: ehl, tgl, adl-s, adl-p
2400	* Program half of the nominal DCO divider fraction value.	2400	* Program half of the nominal DCO divider fraction value.
2401	*/	2401	*/
2402	static bool	2402	static bool
@@ -2404,7 +2404,7 @@ ehl_combo_pll_div_frac_wa_needed(struct drm_i915_private *i915) · 1 unmodified line
2404	{	2404	{
2405	return ((IS_PLATFORM(i915, INTEL_ELKHARTLAKE) &&	2405	return ((IS_PLATFORM(i915, INTEL_ELKHARTLAKE) &&
2406	IS_JSL_EHL_DISPLAY_STEP(i915, STEP_B0, STEP_FOREVER)) \|\|	2406	IS_JSL_EHL_DISPLAY_STEP(i915, STEP_B0, STEP_FOREVER)) \|\|
2407	IS_TIGERLAKE(i915) \|\| IS_ALDERLAKE_P(i915)) &&	2407	IS_TIGERLAKE(i915) \|\| IS_ALDERLAKE_S(i915) \|\| IS_ALDERLAKE_P(i915)) &&
2408	i915->dpll.ref_clks.nssc == 38400;	2408	i915->dpll.ref_clks.nssc == 38400;
2409	}	2409	}
2410		2410

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c+2−1

@@ -999,7 +999,8 @@ static int eb_validate_vmas(struct i915_execbuffer *eb) · 998 unmodified lines
999	}	999	}
1000	}	1000	}
1001		1001
1002	err = dma_resv_reserve_fences(vma->obj->base.resv, 1);	1002	/* Reserve enough slots to accommodate composite fences */
		1003	err = dma_resv_reserve_fences(vma->obj->base.resv, eb->num_batches);
1003	if (err)	1004	if (err)
1004	return err;	1005	return err;
1005		1006

drivers/gpu/drm/i915/gt/intel_gt.c+1−0

@@ -785,6 +785,7 @@ void intel_gt_driver_unregister(struct intel_gt *gt) · 784 unmodified lines
785	{	785	{
786	intel_wakeref_t wakeref;	786	intel_wakeref_t wakeref;
787		787
		788	intel_gt_sysfs_unregister(gt);
788	intel_rps_driver_unregister(&gt->rps);	789	intel_rps_driver_unregister(&gt->rps);
789	intel_gsc_fini(&gt->gsc);	790	intel_gsc_fini(&gt->gsc);
790		791

drivers/gpu/drm/i915/gt/intel_gt_sysfs.c+12−17

 static struct intel_gt *kobj_to_gt(struct kobject *kobj)
 {
-	return container_of(kobj, struct kobj_gt, base)->gt;
+	return container_of(kobj, struct intel_gt, sysfs_gt);
 }
 struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,
 };
 ATTRIBUTE_GROUPS(id);
+/* A kobject needs a release() method even if it does nothing */
 static void kobj_gt_release(struct kobject *kobj)
 {
-	kfree(kobj);
 }
 static struct kobj_type kobj_gt_type = {
 void intel_gt_sysfs_register(struct intel_gt *gt)
 {
-	struct kobj_gt *kg;
 	/*
 	 * We need to make things right with the
 	 * ABI compatibility. The files were originally
 	if (gt_is_root(gt))
 		intel_gt_sysfs_pm_init(gt, gt_get_parent_obj(gt));
-	kg = kzalloc(sizeof(*kg), GFP_KERNEL);
+	/* init and xfer ownership to sysfs tree */
-	if (!kg)
+	if (kobject_init_and_add(&gt->sysfs_gt, &kobj_gt_type,
+				 gt->i915->sysfs_gt, "gt%d", gt->info.id))
 		goto exit_fail;
-	kobject_init(&kg->base, &kobj_gt_type);
+	intel_gt_sysfs_pm_init(gt, &gt->sysfs_gt);
-	kg->gt = gt;
-	/* xfer ownership to sysfs tree */
-	if (kobject_add(&kg->base, gt->i915->sysfs_gt, "gt%d", gt->info.id))
-		goto exit_kobj_put;
-	intel_gt_sysfs_pm_init(gt, &kg->base);
 	return;
-exit_kobj_put:
-	kobject_put(&kg->base);
 exit_fail:
+	kobject_put(&gt->sysfs_gt);
 	drm_warn(&gt->i915->drm,
 		 "failed to initialize gt%d sysfs root\n", gt->info.id);
 }
+void intel_gt_sysfs_unregister(struct intel_gt *gt)
+{
+	kobject_put(&gt->sysfs_gt);
+}

drivers/gpu/drm/i915/gt/intel_gt_sysfs.h+1−5

 struct intel_gt;
-struct kobj_gt {
-	struct kobject base;
-	struct intel_gt *gt;
-};
 bool is_object_gt(struct kobject *kobj);
 struct drm_i915_private *kobj_to_i915(struct kobject *kobj);
 		     const char *name);
 void intel_gt_sysfs_register(struct intel_gt *gt);
+void intel_gt_sysfs_unregister(struct intel_gt *gt);
 struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,
 					    const char *name);

drivers/gpu/drm/i915/gt/intel_gt_types.h+3−0

@@ -224,6 +224,9 @@ struct intel_gt { · 223 unmodified lines
224	} mocs;	224	} mocs;
225		225
226	struct intel_pxp pxp;	226	struct intel_pxp pxp;
		227
		228	/* gt/gtN sysfs */
		229	struct kobject sysfs_gt;
227	};	230	};
228		231
229	enum intel_gt_scratch_field {	232	enum intel_gt_scratch_field {

drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c+1−1

@@ -156,7 +156,7 @@ __uc_fw_auto_select(struct drm_i915_private i915, struct intel_uc_fw uc_fw) · 155 unmodified lines
156	[INTEL_UC_FW_TYPE_GUC] = { blobs_guc, ARRAY_SIZE(blobs_guc) },	156	[INTEL_UC_FW_TYPE_GUC] = { blobs_guc, ARRAY_SIZE(blobs_guc) },
157	[INTEL_UC_FW_TYPE_HUC] = { blobs_huc, ARRAY_SIZE(blobs_huc) },	157	[INTEL_UC_FW_TYPE_HUC] = { blobs_huc, ARRAY_SIZE(blobs_huc) },
158	};	158	};
159	static const struct uc_fw_platform_requirement *fw_blobs;	159	const struct uc_fw_platform_requirement *fw_blobs;
160	enum intel_platform p = INTEL_INFO(i915)->platform;	160	enum intel_platform p = INTEL_INFO(i915)->platform;
161	u32 fw_count;	161	u32 fw_count;
162	u8 rev = INTEL_REVID(i915);	162	u8 rev = INTEL_REVID(i915);

drivers/gpu/drm/i915/i915_drm_client.c+3−2

@@ -116,8 +116,9 @@ show_client_class(struct seq_file *m, · 115 unmodified lines
116	total += busy_add(ctx, class);	116	total += busy_add(ctx, class);
117	rcu_read_unlock();	117	rcu_read_unlock();
118		118
119	seq_printf(m, "drm-engine-%s:\t%llu ns\n",	119	if (capacity)
120	uabi_class_names[class], total);	120	seq_printf(m, "drm-engine-%s:\t%llu ns\n",
		121	uabi_class_names[class], total);
121		122
122	if (capacity > 1)	123	if (capacity > 1)
123	seq_printf(m, "drm-engine-capacity-%s:\t%u\n",	124	seq_printf(m, "drm-engine-capacity-%s:\t%u\n",

drivers/gpu/drm/i915/i915_sysfs.c+14−3

 	struct device *kdev = kobj_to_dev(kobj);
 	struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);
 	struct i915_gpu_coredump *gpu;
-	ssize_t ret;
+	ssize_t ret = 0;
+	/*
+	 * FIXME: Concurrent clients triggering resets and reading + clearing
+	 * dumps can cause inconsistent sysfs reads when a user calls in with a
+	 * non-zero offset to complete a prior partial read but the
+	 * gpu_coredump has been cleared or replaced.
+	 */
 	gpu = i915_first_error_state(i915);
 	if (IS_ERR(gpu)) {
 		const char *str = "No error state collected\n";
 		size_t len = strlen(str);
-		ret = min_t(size_t, count, len - off);
+		if (off < len) {
-		memcpy(buf, str + off, ret);
+			ret = min_t(size_t, count, len - off);
+			memcpy(buf, str + off, ret);
+		}
 	}
 	return ret;
 	device_remove_bin_file(kdev,  &dpf_attrs_1);
 	device_remove_bin_file(kdev,  &dpf_attrs);
+	kobject_put(dev_priv->sysfs_gt);
 }

drivers/gpu/drm/i915/i915_vma.c+28−20

  */
 #include <linux/sched/mm.h>
+#include <linux/dma-fence-array.h>
 #include <drm/drm_gem.h>
 #include "display/intel_frontbuffer.h"
 	if (unlikely(err))
 		return err;
+	/*
+	 * Reserve fences slot early to prevent an allocation after preparing
+	 * the workload and associating fences with dma_resv.
+	 */
+	if (fence && !(flags & __EXEC_OBJECT_NO_RESERVE)) {
+		struct dma_fence *curr;
+		int idx;
+		dma_fence_array_for_each(curr, idx, fence)
+			;
+		err = dma_resv_reserve_fences(vma->obj->base.resv, idx);
+		if (unlikely(err))
+			return err;
+	}
 	if (flags & EXEC_OBJECT_WRITE) {
 		struct intel_frontbuffer *front;
 				i915_active_add_request(&front->write, rq);
 			intel_frontbuffer_put(front);
 		}
+	}
-		if (!(flags & __EXEC_OBJECT_NO_RESERVE)) {
+	if (fence) {
-			err = dma_resv_reserve_fences(vma->obj->base.resv, 1);
+		struct dma_fence *curr;
-			if (unlikely(err))
+		enum dma_resv_usage usage;
-				return err;
+		int idx;
-		}
-		if (fence) {
+		obj->read_domains = 0;
-			dma_resv_add_fence(vma->obj->base.resv, fence,
+		if (flags & EXEC_OBJECT_WRITE) {
-					   DMA_RESV_USAGE_WRITE);
+			usage = DMA_RESV_USAGE_WRITE;
 			obj->write_domain = I915_GEM_DOMAIN_RENDER;
-			obj->read_domains = 0;
+		} else {
-		}
+			usage = DMA_RESV_USAGE_READ;
-	} else {
-		if (!(flags & __EXEC_OBJECT_NO_RESERVE)) {
-			err = dma_resv_reserve_fences(vma->obj->base.resv, 1);
-			if (unlikely(err))
-				return err;
 		}
-		if (fence) {
+		dma_fence_array_for_each(curr, idx, fence)
-			dma_resv_add_fence(vma->obj->base.resv, fence,
+			dma_resv_add_fence(vma->obj->base.resv, curr, usage);
-					   DMA_RESV_USAGE_READ);
-			obj->write_domain = 0;
-		}
 	}
 	if (flags & EXEC_OBJECT_NEEDS_FENCE && vma->fence)

drivers/gpu/drm/msm/adreno/adreno_gpu.c+10−4

 		ring->cur = ring->start;
 		ring->next = ring->start;
-		/* reset completed fence seqno: */
-		ring->memptrs->fence = ring->fctx->completed_fence;
 		ring->memptrs->rptr = 0;
+		/* Detect and clean up an impossible fence, ie. if GPU managed
+		 * to scribble something invalid, we don't want that to confuse
+		 * us into mistakingly believing that submits have completed.
+		 */
+		if (fence_before(ring->fctx->last_fence, ring->memptrs->fence)) {
+			ring->memptrs->fence = ring->fctx->last_fence;
+		}
 	}
 	return 0;
 	for (i = 0; i < ARRAY_SIZE(adreno_gpu->info->fw); i++)
 		release_firmware(adreno_gpu->fw[i]);
-	pm_runtime_disable(&priv->gpu_pdev->dev);
+	if (pm_runtime_enabled(&priv->gpu_pdev->dev))
+		pm_runtime_disable(&priv->gpu_pdev->dev);
 	msm_gpu_cleanup(&adreno_gpu->base);
 }

drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c+8−1

 	struct msm_drm_private *priv = dev->dev_private;
 	struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms);
-	return drm_add_modes_noedid(connector, dpu_kms->catalog->caps->max_linewidth,
+	/*
+	 * We should ideally be limiting the modes only to the maxlinewidth but
+	 * on some chipsets this will allow even 4k modes to be added which will
+	 * fail the per SSPP bandwidth checks. So, till we have dual-SSPP support
+	 * and source split support added lets limit the modes based on max_mixer_width
+	 * as 4K modes can then be supported.
+	 */
+	return drm_add_modes_noedid(connector, dpu_kms->catalog->caps->max_mixer_width,
 			dev->mode_config.max_height);
 }

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c+2−0

 		encoder = mdp4_lcdc_encoder_init(dev, panel_node);
 		if (IS_ERR(encoder)) {
 			DRM_DEV_ERROR(dev->dev, "failed to construct LCDC encoder\n");
+			of_node_put(panel_node);
 			return PTR_ERR(encoder);
 		}
 		connector = mdp4_lvds_connector_init(dev, panel_node, encoder);
 		if (IS_ERR(connector)) {
 			DRM_DEV_ERROR(dev->dev, "failed to initialize LVDS connector\n");
+			of_node_put(panel_node);
 			return PTR_ERR(connector);
 		}

drivers/gpu/drm/msm/dp/dp_ctrl.c+25−8

 	return ret;
 }
+static int dp_ctrl_on_stream_phy_test_report(struct dp_ctrl *dp_ctrl);
 static int dp_ctrl_process_phy_test_request(struct dp_ctrl_private *ctrl)
 {
 	int ret = 0;
 	ret = dp_ctrl_on_link(&ctrl->dp_ctrl);
 	if (!ret)
-		ret = dp_ctrl_on_stream(&ctrl->dp_ctrl);
+		ret = dp_ctrl_on_stream_phy_test_report(&ctrl->dp_ctrl);
 	else
 		DRM_ERROR("failed to enable DP link controller\n");
 	return dp_ctrl_setup_main_link(ctrl, &training_step);
 }
-int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl)
+static int dp_ctrl_on_stream_phy_test_report(struct dp_ctrl *dp_ctrl)
+{
+	int ret;
+	struct dp_ctrl_private *ctrl;
+	ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl);
+	ctrl->dp_ctrl.pixel_rate = ctrl->panel->dp_mode.drm_mode.clock;
+	ret = dp_ctrl_enable_stream_clocks(ctrl);
+	if (ret) {
+		DRM_ERROR("Failed to start pixel clocks. ret=%d\n", ret);
+		return ret;
+	}
+	dp_ctrl_send_phy_test_pattern(ctrl);
+	return 0;
+}
+int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl, bool force_link_train)
 {
 	int ret = 0;
 	bool mainlink_ready = false;
 		goto end;
 	}
-	if (ctrl->link->sink_request & DP_TEST_LINK_PHY_TEST_PATTERN) {
+	if (force_link_train || !dp_ctrl_channel_eq_ok(ctrl))
-		dp_ctrl_send_phy_test_pattern(ctrl);
-		return 0;
-	}
-	if (!dp_ctrl_channel_eq_ok(ctrl))
 		dp_ctrl_link_retrain(ctrl);
 	/* stop txing train pattern to end link training */

drivers/gpu/drm/msm/dp/dp_ctrl.h+1−1

@@ -21,7 +21,7 @@ struct dp_ctrl { · 20 unmodified lines
21	};	21	};
22		22
23	int dp_ctrl_on_link(struct dp_ctrl *dp_ctrl);	23	int dp_ctrl_on_link(struct dp_ctrl *dp_ctrl);
24	int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl);	24	int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl, bool force_link_train);
25	int dp_ctrl_off_link_stream(struct dp_ctrl *dp_ctrl);	25	int dp_ctrl_off_link_stream(struct dp_ctrl *dp_ctrl);
26	int dp_ctrl_off_link(struct dp_ctrl *dp_ctrl);	26	int dp_ctrl_off_link(struct dp_ctrl *dp_ctrl);
27	int dp_ctrl_off(struct dp_ctrl *dp_ctrl);	27	int dp_ctrl_off(struct dp_ctrl *dp_ctrl);

drivers/gpu/drm/msm/dp/dp_display.c+8−8

 	struct msm_drm_private *priv = dev_get_drvdata(master);
 	/* disable all HPD interrupts */
-	dp_catalog_hpd_config_intr(dp->catalog, DP_DP_HPD_INT_MASK, false);
+	if (dp->core_initialized)
+		dp_catalog_hpd_config_intr(dp->catalog, DP_DP_HPD_INT_MASK, false);
 	kthread_stop(dp->ev_tsk);
 		return 0;
 	}
-	rc = dp_ctrl_on_stream(dp->ctrl);
+	rc = dp_ctrl_on_stream(dp->ctrl, data);
 	if (!rc)
 		dp_display->power_on = true;
 	int rc = 0;
 	struct dp_display_private *dp_display;
 	u32 state;
+	bool force_link_train = false;
 	dp_display = container_of(dp, struct dp_display_private, dp_display);
 	if (!dp_display->dp_mode.drm_mode.clock) {
 	state =  dp_display->hpd_state;
-	if (state == ST_DISPLAY_OFF)
+	if (state == ST_DISPLAY_OFF) {
 		dp_display_host_phy_init(dp_display);
+		force_link_train = true;
+	}
-	dp_display_enable(dp_display, 0);
+	dp_display_enable(dp_display, force_link_train);
 	rc = dp_display_post_enable(dp);
 	if (rc) {
 		dp_display_unprepare(dp);
 	}
-	/* manual kick off plug event to train link */
-	if (state == ST_DISPLAY_OFF)
-		dp_add_event(dp_display, EV_IRQ_HPD_INT, 0, 0);
 	/* completed connection */
 	dp_display->hpd_state = ST_CONNECTED;

drivers/gpu/drm/msm/msm_drv.c+1−1

@@ -964,7 +964,7 @@ static const struct drm_driver msm_driver = { · 963 unmodified lines
964	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,	964	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
965	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,	965	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
966	.gem_prime_import_sg_table = msm_gem_prime_import_sg_table,	966	.gem_prime_import_sg_table = msm_gem_prime_import_sg_table,
967	.gem_prime_mmap = drm_gem_prime_mmap,	967	.gem_prime_mmap = msm_gem_prime_mmap,
968	#ifdef CONFIG_DEBUG_FS	968	#ifdef CONFIG_DEBUG_FS
969	.debugfs_init = msm_debugfs_init,	969	.debugfs_init = msm_debugfs_init,
970	#endif	970	#endif

drivers/gpu/drm/msm/msm_drv.h+1−0

@@ -246,6 +246,7 @@ unsigned long msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_t · 245 unmodified lines
246	void msm_gem_shrinker_init(struct drm_device *dev);	246	void msm_gem_shrinker_init(struct drm_device *dev);
247	void msm_gem_shrinker_cleanup(struct drm_device *dev);	247	void msm_gem_shrinker_cleanup(struct drm_device *dev);
248		248
		249	int msm_gem_prime_mmap(struct drm_gem_object obj, struct vm_area_struct vma);
249	struct sg_table msm_gem_prime_get_sg_table(struct drm_gem_object obj);	250	struct sg_table msm_gem_prime_get_sg_table(struct drm_gem_object obj);
250	int msm_gem_prime_vmap(struct drm_gem_object obj, struct iosys_map map);	251	int msm_gem_prime_vmap(struct drm_gem_object obj, struct iosys_map map);
251	void msm_gem_prime_vunmap(struct drm_gem_object obj, struct iosys_map map);	252	void msm_gem_prime_vunmap(struct drm_gem_object obj, struct iosys_map map);

drivers/gpu/drm/msm/msm_fence.c+5−3

 		(int32_t)(*fctx->fenceptr - fence) >= 0;
 }
-/* called from workqueue */
+/* called from irq handler and workqueue (in recover path) */
 void msm_update_fence(struct msm_fence_context *fctx, uint32_t fence)
 {
-	spin_lock(&fctx->spinlock);
+	unsigned long flags;
+	spin_lock_irqsave(&fctx->spinlock, flags);
 	fctx->completed_fence = max(fence, fctx->completed_fence);
-	spin_unlock(&fctx->spinlock);
+	spin_unlock_irqrestore(&fctx->spinlock, flags);
 }
 struct msm_fence {

drivers/gpu/drm/msm/msm_gem.c+3−4

 	return ret;
 }
-void msm_gem_unpin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma *vma)
+void msm_gem_unpin_locked(struct drm_gem_object *obj)
 {
 	struct msm_gem_object *msm_obj = to_msm_bo(obj);
 	GEM_WARN_ON(!msm_gem_is_locked(obj));
-	msm_gem_unpin_vma(vma);
 	msm_obj->pin_count--;
 	GEM_WARN_ON(msm_obj->pin_count < 0);
 	msm_gem_lock(obj);
 	vma = lookup_vma(obj, aspace);
 	if (!GEM_WARN_ON(!vma)) {
-		msm_gem_unpin_vma_locked(obj, vma);
+		msm_gem_unpin_vma(vma);
+		msm_gem_unpin_locked(obj);
 	}
 	msm_gem_unlock(obj);
 }

drivers/gpu/drm/msm/msm_gem.h+6−5

 uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);
 int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma *vma);
-void msm_gem_unpin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma *vma);
+void msm_gem_unpin_locked(struct drm_gem_object *obj);
 struct msm_gem_vma *msm_gem_get_vma_locked(struct drm_gem_object *obj,
 					   struct msm_gem_address_space *aspace);
 int msm_gem_get_iova(struct drm_gem_object *obj,
 	} *cmd;  /* array of size nr_cmds */
 	struct {
 /* make sure these don't conflict w/ MSM_SUBMIT_BO_x */
-#define BO_VALID    0x8000   /* is current addr in cmdstream correct/valid? */
+#define BO_VALID	0x8000	/* is current addr in cmdstream correct/valid? */
-#define BO_LOCKED   0x4000   /* obj lock is held */
+#define BO_LOCKED	0x4000	/* obj lock is held */
-#define BO_ACTIVE   0x2000   /* active refcnt is held */
+#define BO_ACTIVE	0x2000	/* active refcnt is held */
-#define BO_PINNED   0x1000   /* obj is pinned and on active list */
+#define BO_OBJ_PINNED	0x1000	/* obj (pages) is pinned and on active list */
+#define BO_VMA_PINNED	0x0800	/* vma (virtual address) is pinned */
 		uint32_t flags;
 		union {
 			struct msm_gem_object *obj;

drivers/gpu/drm/msm/msm_gem_prime.c+15−0

@@ -11,6 +11,21 @@ · 10 unmodified lines
11	#include "msm_drv.h"	11	#include "msm_drv.h"
12	#include "msm_gem.h"	12	#include "msm_gem.h"
13		13
		14	int msm_gem_prime_mmap(struct drm_gem_object obj, struct vm_area_struct vma)
		15	{
		16	int ret;
		17
		18	/* Ensure the mmap offset is initialized. We lazily initialize it,
		19	* so if it has not been first mmap'd directly as a GEM object, the
		20	* mmap offset will not be already initialized.
		21	*/
		22	ret = drm_gem_create_mmap_offset(obj);
		23	if (ret)
		24	return ret;
		25
		26	return drm_gem_prime_mmap(obj, vma);
		27	}
		28
14	struct sg_table msm_gem_prime_get_sg_table(struct drm_gem_object obj)	29	struct sg_table msm_gem_prime_get_sg_table(struct drm_gem_object obj)
15	{	30	{
16	struct msm_gem_object *msm_obj = to_msm_bo(obj);	31	struct msm_gem_object *msm_obj = to_msm_bo(obj);

drivers/gpu/drm/msm/msm_gem_submit.c+12−6

 	 */
 	submit->bos[i].flags &= ~cleanup_flags;
-	if (flags & BO_PINNED)
+	if (flags & BO_VMA_PINNED)
-		msm_gem_unpin_vma_locked(obj, submit->bos[i].vma);
+		msm_gem_unpin_vma(submit->bos[i].vma);
+	if (flags & BO_OBJ_PINNED)
+		msm_gem_unpin_locked(obj);
 	if (flags & BO_ACTIVE)
 		msm_gem_active_put(obj);
 static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i)
 {
-	submit_cleanup_bo(submit, i, BO_PINNED | BO_ACTIVE | BO_LOCKED);
+	unsigned cleanup_flags = BO_VMA_PINNED | BO_OBJ_PINNED |
+				 BO_ACTIVE | BO_LOCKED;
+	submit_cleanup_bo(submit, i, cleanup_flags);
 	if (!(submit->bos[i].flags & BO_VALID))
 		submit->bos[i].iova = 0;
 		if (ret)
 			break;
-		submit->bos[i].flags |= BO_PINNED;
+		submit->bos[i].flags |= BO_OBJ_PINNED | BO_VMA_PINNED;
 		submit->bos[i].vma = vma;
 		if (vma->iova == submit->bos[i].iova) {
 	unsigned i;
 	if (error)
-		cleanup_flags |= BO_PINNED | BO_ACTIVE;
+		cleanup_flags |= BO_VMA_PINNED | BO_OBJ_PINNED | BO_ACTIVE;
 	for (i = 0; i < submit->nr_bos; i++) {
 		struct msm_gem_object *msm_obj = submit->bos[i].obj;
 		struct drm_gem_object *obj = &submit->bos[i].obj->base;
 		msm_gem_lock(obj);
-		submit_cleanup_bo(submit, i, BO_PINNED | BO_ACTIVE);
+		/* Note, VMA already fence-unpinned before submit: */
+		submit_cleanup_bo(submit, i, BO_OBJ_PINNED | BO_ACTIVE);
 		msm_gem_unlock(obj);
 		drm_gem_object_put(obj);
 	}

drivers/gpu/drm/msm/msm_gem_vma.c+2−4

 	unsigned size = vma->node.size;
 	/* Print a message if we try to purge a vma in use */
-	if (GEM_WARN_ON(msm_gem_vma_inuse(vma)))
+	GEM_WARN_ON(msm_gem_vma_inuse(vma));
-		return;
 	/* Don't do anything if the memory isn't mapped */
 	if (!vma->mapped)
 void msm_gem_close_vma(struct msm_gem_address_space *aspace,
 		struct msm_gem_vma *vma)
 {
-	if (GEM_WARN_ON(msm_gem_vma_inuse(vma) || vma->mapped))
+	GEM_WARN_ON(msm_gem_vma_inuse(vma) || vma->mapped);
-		return;
 	spin_lock(&aspace->lock);
 	if (vma->iova)

drivers/gpu/drm/msm/msm_gpu.c+5−22

 	return ret;
 }
-static void update_fences(struct msm_gpu *gpu, struct msm_ringbuffer *ring,
-		uint32_t fence)
-{
-	struct msm_gem_submit *submit;
-	unsigned long flags;
-	spin_lock_irqsave(&ring->submit_lock, flags);
-	list_for_each_entry(submit, &ring->submits, node) {
-		if (fence_after(submit->seqno, fence))
-			break;
-		msm_update_fence(submit->ring->fctx,
-			submit->hw_fence->seqno);
-		dma_fence_signal(submit->hw_fence);
-	}
-	spin_unlock_irqrestore(&ring->submit_lock, flags);
-}
 #ifdef CONFIG_DEV_COREDUMP
 static ssize_t msm_gpu_devcoredump_read(char *buffer, loff_t offset,
 		size_t count, void *data, size_t datalen)
 		 * one more to clear the faulting submit
 		 */
 		if (ring == cur_ring)
-			fence++;
+			ring->memptrs->fence = ++fence;
-		update_fences(gpu, ring, fence);
+		msm_update_fence(ring->fctx, fence);
 	}
 	if (msm_gpu_active(gpu)) {
 	msm_submit_retire(submit);
 	pm_runtime_mark_last_busy(&gpu->pdev->dev);
-	pm_runtime_put_autosuspend(&gpu->pdev->dev);
 	spin_lock_irqsave(&ring->submit_lock, flags);
 	list_del(&submit->node);
 		msm_devfreq_idle(gpu);
 	mutex_unlock(&gpu->active_lock);
+	pm_runtime_put_autosuspend(&gpu->pdev->dev);
 	msm_gem_submit_put(submit);
 }
 	int i;
 	for (i = 0; i < gpu->nr_rings; i++)
-		update_fences(gpu, gpu->rb[i], gpu->rb[i]->memptrs->fence);
+		msm_update_fence(gpu->rb[i]->fctx, gpu->rb[i]->memptrs->fence);
 	kthread_queue_work(gpu->worker, &gpu->retire_work);
 	update_sw_cntrs(gpu);

drivers/gpu/drm/msm/msm_iommu.c+1−1

@@ -58,7 +58,7 @@ static int msm_iommu_pagetable_map(struct msm_mmu *mmu, u64 iova, · 57 unmodified lines
58	u64 addr = iova;	58	u64 addr = iova;
59	unsigned int i;	59	unsigned int i;
60		60
61	for_each_sg(sgt->sgl, sg, sgt->nents, i) {	61	for_each_sgtable_sg(sgt, sg, i) {
62	size_t size = sg->length;	62	size_t size = sg->length;
63	phys_addr_t phys = sg_phys(sg);	63	phys_addr_t phys = sg_phys(sg);
64		64

drivers/gpu/drm/msm/msm_ringbuffer.c+1−1

@@ -25,7 +25,7 @@ static struct dma_fence msm_job_run(struct drm_sched_job job) · 24 unmodified lines
25		25
26	msm_gem_lock(obj);	26	msm_gem_lock(obj);
27	msm_gem_unpin_vma_fenced(submit->bos[i].vma, fctx);	27	msm_gem_unpin_vma_fenced(submit->bos[i].vma, fctx);
28	submit->bos[i].flags &= ~BO_PINNED;	28	submit->bos[i].flags &= ~BO_VMA_PINNED;
29	msm_gem_unlock(obj);	29	msm_gem_unlock(obj);
30	}	30	}
31		31

drivers/gpu/drm/sun4i/sun4i_drv.c+11−1

  */
 #include <linux/component.h>
+#include <linux/dma-mapping.h>
 #include <linux/kfifo.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 		goto free_drm;
 	}
-	dev_set_drvdata(dev, drm);
 	drm->dev_private = drv;
 	INIT_LIST_HEAD(&drv->frontend_list);
 	INIT_LIST_HEAD(&drv->engine_list);
 	drm_fbdev_generic_setup(drm, 32);
+	dev_set_drvdata(dev, drm);
 	return 0;
 finish_poll:
 {
 	struct drm_device *drm = dev_get_drvdata(dev);
+	dev_set_drvdata(dev, NULL);
 	drm_dev_unregister(drm);
 	drm_kms_helper_poll_fini(drm);
 	drm_atomic_helper_shutdown(drm);
 	INIT_KFIFO(list.fifo);
+	/*
+	 * DE2 and DE3 cores actually supports 40-bit addresses, but
+	 * driver does not.
+	 */
+	dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+	dma_set_max_seg_size(&pdev->dev, UINT_MAX);
 	for (i = 0;; i++) {
 		struct device_node *pipeline = of_parse_phandle(np,
 								"allwinner,pipelines",

drivers/gpu/drm/sun4i/sun4i_layer.c+1−1

@@ -117,7 +117,7 @@ static bool sun4i_layer_format_mod_supported(struct drm_plane *plane, · 116 unmodified lines
117	struct sun4i_layer *layer = plane_to_sun4i_layer(plane);	117	struct sun4i_layer *layer = plane_to_sun4i_layer(plane);
118		118
119	if (IS_ERR_OR_NULL(layer->backend->frontend))	119	if (IS_ERR_OR_NULL(layer->backend->frontend))
120	sun4i_backend_format_is_supported(format, modifier);	120	return sun4i_backend_format_is_supported(format, modifier);
121		121
122	return sun4i_backend_format_is_supported(format, modifier) \|\|	122	return sun4i_backend_format_is_supported(format, modifier) \|\|
123	sun4i_frontend_format_is_supported(format, modifier);	123	sun4i_frontend_format_is_supported(format, modifier);

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c+4−50

@@ -93,34 +93,10 @@ crtcs_exit: · 92 unmodified lines
93	return crtcs;	93	return crtcs;
94	}	94	}
95		95
96	static int sun8i_dw_hdmi_find_connector_pdev(struct device *dev,
97	struct platform_device **pdev_out)
98	{
99	struct platform_device *pdev;
100	struct device_node *remote;
101
102	remote = of_graph_get_remote_node(dev->of_node, 1, -1);
103	if (!remote)
104	return -ENODEV;
105
106	if (!of_device_is_compatible(remote, "hdmi-connector")) {
107	of_node_put(remote);
108	return -ENODEV;
109	}
110
111	pdev = of_find_device_by_node(remote);
112	of_node_put(remote);
113	if (!pdev)
114	return -ENODEV;
115
116	*pdev_out = pdev;
117	return 0;
118	}
119
120	static int sun8i_dw_hdmi_bind(struct device dev, struct device master,	96	static int sun8i_dw_hdmi_bind(struct device dev, struct device master,
121	void *data)	97	void *data)
122	{	98	{
123	struct platform_device pdev = to_platform_device(dev), connector_pdev;	99	struct platform_device *pdev = to_platform_device(dev);
124	struct dw_hdmi_plat_data *plat_data;	100	struct dw_hdmi_plat_data *plat_data;
125	struct drm_device *drm = data;	101	struct drm_device *drm = data;
126	struct device_node *phy_node;	102	struct device_node *phy_node;
@@ -167,30 +143,16 @@ static int sun8i_dw_hdmi_bind(struct device dev, struct device master, · 40 unmodified lines
167	return dev_err_probe(dev, PTR_ERR(hdmi->regulator),	143	return dev_err_probe(dev, PTR_ERR(hdmi->regulator),
168	"Couldn't get regulator\n");	144	"Couldn't get regulator\n");
169		145
170	ret = sun8i_dw_hdmi_find_connector_pdev(dev, &connector_pdev);
171	if (!ret) {
172	hdmi->ddc_en = gpiod_get_optional(&connector_pdev->dev,
173	"ddc-en", GPIOD_OUT_HIGH);
174	platform_device_put(connector_pdev);
175
176	if (IS_ERR(hdmi->ddc_en)) {
177	dev_err(dev, "Couldn't get ddc-en gpio\n");
178	return PTR_ERR(hdmi->ddc_en);
179	}
180	}
181
182	ret = regulator_enable(hdmi->regulator);	146	ret = regulator_enable(hdmi->regulator);
183	if (ret) {	147	if (ret) {
184	dev_err(dev, "Failed to enable regulator\n");	148	dev_err(dev, "Failed to enable regulator\n");
185	goto err_unref_ddc_en;	149	return ret;
186	}	150	}
187		151
188	gpiod_set_value(hdmi->ddc_en, 1);
189
190	ret = reset_control_deassert(hdmi->rst_ctrl);	152	ret = reset_control_deassert(hdmi->rst_ctrl);
191	if (ret) {	153	if (ret) {
192	dev_err(dev, "Could not deassert ctrl reset control\n");	154	dev_err(dev, "Could not deassert ctrl reset control\n");
193	goto err_disable_ddc_en;	155	goto err_disable_regulator;
194	}	156	}
195		157
196	ret = clk_prepare_enable(hdmi->clk_tmds);	158	ret = clk_prepare_enable(hdmi->clk_tmds);
@@ -245,12 +207,8 @@ err_disable_clk_tmds: · 48 unmodified lines
245	clk_disable_unprepare(hdmi->clk_tmds);	207	clk_disable_unprepare(hdmi->clk_tmds);
246	err_assert_ctrl_reset:	208	err_assert_ctrl_reset:
247	reset_control_assert(hdmi->rst_ctrl);	209	reset_control_assert(hdmi->rst_ctrl);
248	err_disable_ddc_en:	210	err_disable_regulator:
249	gpiod_set_value(hdmi->ddc_en, 0);
250	regulator_disable(hdmi->regulator);	211	regulator_disable(hdmi->regulator);
251	err_unref_ddc_en:
252	if (hdmi->ddc_en)
253	gpiod_put(hdmi->ddc_en);
254		212
255	return ret;	213	return ret;
256	}	214	}
@@ -264,11 +222,7 @@ static void sun8i_dw_hdmi_unbind(struct device dev, struct device master, · 7 unmodified lines
264	sun8i_hdmi_phy_deinit(hdmi->phy);	222	sun8i_hdmi_phy_deinit(hdmi->phy);
265	clk_disable_unprepare(hdmi->clk_tmds);	223	clk_disable_unprepare(hdmi->clk_tmds);
266	reset_control_assert(hdmi->rst_ctrl);	224	reset_control_assert(hdmi->rst_ctrl);
267	gpiod_set_value(hdmi->ddc_en, 0);
268	regulator_disable(hdmi->regulator);	225	regulator_disable(hdmi->regulator);
269
270	if (hdmi->ddc_en)
271	gpiod_put(hdmi->ddc_en);
272	}	226	}
273		227
274	static const struct component_ops sun8i_dw_hdmi_ops = {	228	static const struct component_ops sun8i_dw_hdmi_ops = {

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h+0−2

 #include <drm/bridge/dw_hdmi.h>
 #include <drm/drm_encoder.h>
 #include <linux/clk.h>
-#include <linux/gpio/consumer.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/reset.h>
 	struct regulator		*regulator;
 	const struct sun8i_dw_hdmi_quirks *quirks;
 	struct reset_control		*rst_ctrl;
-	struct gpio_desc		*ddc_en;
 };
 extern struct platform_driver sun8i_hdmi_phy_driver;

drivers/gpu/drm/ttm/ttm_bo.c+14−8

 		return;
 	spin_lock(&bo->bdev->lru_lock);
-	if (bo->bulk_move && bo->resource)
+	if (bo->resource)
-		ttm_lru_bulk_move_del(bo->bulk_move, bo->resource);
+		ttm_resource_del_bulk_move(bo->resource, bo);
 	bo->bulk_move = bulk;
-	if (bo->bulk_move && bo->resource)
+	if (bo->resource)
-		ttm_lru_bulk_move_add(bo->bulk_move, bo->resource);
+		ttm_resource_add_bulk_move(bo->resource, bo);
 	spin_unlock(&bo->bdev->lru_lock);
 }
 EXPORT_SYMBOL(ttm_bo_set_bulk_move);
 {
 	dma_resv_assert_held(bo->base.resv);
 	WARN_ON_ONCE(!kref_read(&bo->kref));
-	if (!(bo->pin_count++) && bo->bulk_move && bo->resource)
+	spin_lock(&bo->bdev->lru_lock);
-		ttm_lru_bulk_move_del(bo->bulk_move, bo->resource);
+	if (bo->resource)
+		ttm_resource_del_bulk_move(bo->resource, bo);
+	++bo->pin_count;
+	spin_unlock(&bo->bdev->lru_lock);
 }
 EXPORT_SYMBOL(ttm_bo_pin);
 	if (WARN_ON_ONCE(!bo->pin_count))
 		return;
-	if (!(--bo->pin_count) && bo->bulk_move && bo->resource)
+	spin_lock(&bo->bdev->lru_lock);
-		ttm_lru_bulk_move_add(bo->bulk_move, bo->resource);
+	--bo->pin_count;
+	if (bo->resource)
+		ttm_resource_add_bulk_move(bo->resource, bo);
+	spin_unlock(&bo->bdev->lru_lock);
 }
 EXPORT_SYMBOL(ttm_bo_unpin);

drivers/gpu/drm/ttm/ttm_device.c+5−1

 		ttm_resource_manager_for_each_res(man, &cursor, res) {
 			struct ttm_buffer_object *bo = res->bo;
-			uint32_t num_pages = PFN_UP(bo->base.size);
+			uint32_t num_pages;
+			if (!bo)
+				continue;
+			num_pages = PFN_UP(bo->base.size);
 			ret = ttm_bo_swapout(bo, ctx, gfp_flags);
 			/* ttm_bo_swapout has dropped the lru_lock */
 			if (!ret)

drivers/gpu/drm/ttm/ttm_resource.c+36−16

 }
 /* Add the resource to a bulk_move cursor */
-void ttm_lru_bulk_move_add(struct ttm_lru_bulk_move *bulk,
+static void ttm_lru_bulk_move_add(struct ttm_lru_bulk_move *bulk,
-			   struct ttm_resource *res)
+				  struct ttm_resource *res)
 {
 	struct ttm_lru_bulk_move_pos *pos = ttm_lru_bulk_move_pos(bulk, res);
 }
 /* Remove the resource from a bulk_move range */
-void ttm_lru_bulk_move_del(struct ttm_lru_bulk_move *bulk,
+static void ttm_lru_bulk_move_del(struct ttm_lru_bulk_move *bulk,
-			   struct ttm_resource *res)
+				  struct ttm_resource *res)
 {
 	struct ttm_lru_bulk_move_pos *pos = ttm_lru_bulk_move_pos(bulk, res);
 	}
 }
+/* Add the resource to a bulk move if the BO is configured for it */
+void ttm_resource_add_bulk_move(struct ttm_resource *res,
+				struct ttm_buffer_object *bo)
+{
+	if (bo->bulk_move && !bo->pin_count)
+		ttm_lru_bulk_move_add(bo->bulk_move, res);
+}
+/* Remove the resource from a bulk move if the BO is configured for it */
+void ttm_resource_del_bulk_move(struct ttm_resource *res,
+				struct ttm_buffer_object *bo)
+{
+	if (bo->bulk_move && !bo->pin_count)
+		ttm_lru_bulk_move_del(bo->bulk_move, res);
+}
 /* Move a resource to the LRU or bulk tail */
 void ttm_resource_move_to_lru_tail(struct ttm_resource *res)
 {
 	res->bus.is_iomem = false;
 	res->bus.caching = ttm_cached;
 	res->bo = bo;
-	INIT_LIST_HEAD(&res->lru);
 	man = ttm_manager_type(bo->bdev, place->mem_type);
 	spin_lock(&bo->bdev->lru_lock);
-	man->usage += res->num_pages << PAGE_SHIFT;
+	if (bo->pin_count)
-	if (bo->bulk_move)
+		list_add_tail(&res->lru, &bo->bdev->pinned);
-		ttm_lru_bulk_move_add(bo->bulk_move, res);
 	else
-		ttm_resource_move_to_lru_tail(res);
+		list_add_tail(&res->lru, &man->lru[bo->priority]);
+	man->usage += res->num_pages << PAGE_SHIFT;
 	spin_unlock(&bo->bdev->lru_lock);
 }
 EXPORT_SYMBOL(ttm_resource_init);
 {
 	struct ttm_resource_manager *man =
 		ttm_manager_type(bo->bdev, place->mem_type);
+	int ret;
+	ret = man->func->alloc(man, bo, place, res_ptr);
+	if (ret)
+		return ret;
-	return man->func->alloc(man, bo, place, res_ptr);
+	spin_lock(&bo->bdev->lru_lock);
+	ttm_resource_add_bulk_move(*res_ptr, bo);
+	spin_unlock(&bo->bdev->lru_lock);
+	return 0;
 }
 void ttm_resource_free(struct ttm_buffer_object *bo, struct ttm_resource **res)
 	if (!*res)
 		return;
-	if (bo->bulk_move) {
+	spin_lock(&bo->bdev->lru_lock);
-		spin_lock(&bo->bdev->lru_lock);
+	ttm_resource_del_bulk_move(*res, bo);
-		ttm_lru_bulk_move_del(bo->bulk_move, *res);
+	spin_unlock(&bo->bdev->lru_lock);
-		spin_unlock(&bo->bdev->lru_lock);
-	}
 	man = ttm_manager_type(bo->bdev, (*res)->mem_type);
 	man->func->free(man, *res);
 	*res = NULL;

drivers/gpu/drm/vc4/vc4_bo.c+54−8

 {
 	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	mutex_lock(&vc4->purgeable.lock);
 	list_add_tail(&bo->size_head, &vc4->purgeable.list);
 	vc4->purgeable.num++;
 {
 	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	/* list_del_init() is used here because the caller might release
 	 * the purgeable lock in order to acquire the madv one and update the
 	 * madv status.
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct vc4_bo *bo;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return ERR_PTR(-ENODEV);
 	bo = kzalloc(sizeof(*bo), GFP_KERNEL);
 	if (!bo)
 		return ERR_PTR(-ENOMEM);
 	struct drm_gem_cma_object *cma_obj;
 	struct vc4_bo *bo;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return ERR_PTR(-ENODEV);
 	if (size == 0)
 		return ERR_PTR(-EINVAL);
 	return bo;
 }
-int vc4_dumb_create(struct drm_file *file_priv,
+int vc4_bo_dumb_create(struct drm_file *file_priv,
-		    struct drm_device *dev,
+		       struct drm_device *dev,
-		    struct drm_mode_create_dumb *args)
+		       struct drm_mode_create_dumb *args)
 {
-	int min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct vc4_bo *bo = NULL;
 	int ret;
-	if (args->pitch < min_pitch)
+	if (WARN_ON_ONCE(vc4->is_vc5))
-		args->pitch = min_pitch;
+		return -ENODEV;
-	if (args->size < args->pitch * args->height)
+	ret = vc4_dumb_fixup_args(args);
-		args->size = args->pitch * args->height;
+	if (ret)
+		return ret;
 	bo = vc4_bo_create(dev, args->size, false, VC4_BO_TYPE_DUMB);
 	if (IS_ERR(bo))
 int vc4_bo_inc_usecnt(struct vc4_bo *bo)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
 	int ret;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	/* Fast path: if the BO is already retained by someone, no need to
 	 * check the madv status.
 	 */
 void vc4_bo_dec_usecnt(struct vc4_bo *bo)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	/* Fast path: if the BO is still retained by someone, no need to test
 	 * the madv value.
 	 */
 	struct vc4_bo *bo = NULL;
 	int ret;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	ret = vc4_grab_bin_bo(vc4, vc4file);
 	if (ret)
 		return ret;
 int vc4_mmap_bo_ioctl(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct drm_vc4_mmap_bo *args = data;
 	struct drm_gem_object *gem_obj;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	gem_obj = drm_gem_object_lookup(file_priv, args->handle);
 	if (!gem_obj) {
 		DRM_DEBUG("Failed to look up GEM BO %d\n", args->handle);
 	struct vc4_bo *bo = NULL;
 	int ret;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (args->size == 0)
 		return -EINVAL;
 int vc4_set_tiling_ioctl(struct drm_device *dev, void *data,
 			 struct drm_file *file_priv)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct drm_vc4_set_tiling *args = data;
 	struct drm_gem_object *gem_obj;
 	struct vc4_bo *bo;
 	bool t_format;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (args->flags != 0)
 		return -EINVAL;
 int vc4_get_tiling_ioctl(struct drm_device *dev, void *data,
 			 struct drm_file *file_priv)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct drm_vc4_get_tiling *args = data;
 	struct drm_gem_object *gem_obj;
 	struct vc4_bo *bo;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (args->flags != 0 || args->modifier != 0)
 		return -EINVAL;
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	int i;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	/* Create the initial set of BO labels that the kernel will
 	 * use.  This lets us avoid a bunch of string reallocation in
 	 * the kernel's draw and BO allocation paths.
 	struct drm_gem_object *gem_obj;
 	int ret = 0, label;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (!args->len)
 		return -EINVAL;

drivers/gpu/drm/vc4/vc4_crtc.c+145−51

@@ -256,7 +256,7 @@ static u32 vc4_get_fifo_full_level(struct vc4_crtc *vc4_crtc, u32 format) · 255 unmodified lines
256	* Removing 1 from the FIFO full level however	256	* Removing 1 from the FIFO full level however
257	* seems to completely remove that issue.	257	* seems to completely remove that issue.
258	*/	258	*/
259	if (!vc4->hvs->hvs5)	259	if (!vc4->is_vc5)
260	return fifo_len_bytes - 3 * HVS_FIFO_LATENCY_PIX - 1;	260	return fifo_len_bytes - 3 * HVS_FIFO_LATENCY_PIX - 1;
261		261
262	return fifo_len_bytes - 3 * HVS_FIFO_LATENCY_PIX;	262	return fifo_len_bytes - 3 * HVS_FIFO_LATENCY_PIX;
@@ -389,7 +389,7 @@ static void vc4_crtc_config_pv(struct drm_crtc crtc, struct drm_encoder encode · 126 unmodified lines
389	if (is_dsi)	389	if (is_dsi)
390	CRTC_WRITE(PV_HACT_ACT, mode->hdisplay * pixel_rep);	390	CRTC_WRITE(PV_HACT_ACT, mode->hdisplay * pixel_rep);
391		391
392	if (vc4->hvs->hvs5)	392	if (vc4->is_vc5)
393	CRTC_WRITE(PV_MUX_CFG,	393	CRTC_WRITE(PV_MUX_CFG,
394	VC4_SET_FIELD(PV_MUX_CFG_RGB_PIXEL_MUX_MODE_NO_SWAP,	394	VC4_SET_FIELD(PV_MUX_CFG_RGB_PIXEL_MUX_MODE_NO_SWAP,
395	PV_MUX_CFG_RGB_PIXEL_MUX_MODE));	395	PV_MUX_CFG_RGB_PIXEL_MUX_MODE));
@@ -775,17 +775,18 @@ struct vc4_async_flip_state { · 379 unmodified lines
775	struct drm_framebuffer *old_fb;	775	struct drm_framebuffer *old_fb;
776	struct drm_pending_vblank_event *event;	776	struct drm_pending_vblank_event *event;
777		777
778	struct vc4_seqno_cb cb;	778	union {
		779	struct dma_fence_cb fence;
		780	struct vc4_seqno_cb seqno;
		781	} cb;
779	};	782	};
780		783
781	/* Called when the V3D execution for the BO being flipped to is done, so that	784	/* Called when the V3D execution for the BO being flipped to is done, so that
782	* we can actually update the plane's address to point to it.	785	* we can actually update the plane's address to point to it.
783	*/	786	*/
784	static void	787	static void
785	vc4_async_page_flip_complete(struct vc4_seqno_cb *cb)	788	vc4_async_page_flip_complete(struct vc4_async_flip_state *flip_state)
786	{	789	{
787	struct vc4_async_flip_state *flip_state =
788	container_of(cb, struct vc4_async_flip_state, cb);
789	struct drm_crtc *crtc = flip_state->crtc;	790	struct drm_crtc *crtc = flip_state->crtc;
790	struct drm_device *dev = crtc->dev;	791	struct drm_device *dev = crtc->dev;
791	struct drm_plane *plane = crtc->primary;	792	struct drm_plane *plane = crtc->primary;
@@ -802,59 +803,96 @@ vc4_async_page_flip_complete(struct vc4_seqno_cb *cb) · 10 unmodified lines
802	drm_crtc_vblank_put(crtc);	803	drm_crtc_vblank_put(crtc);
803	drm_framebuffer_put(flip_state->fb);	804	drm_framebuffer_put(flip_state->fb);
804		805
805	/* Decrement the BO usecnt in order to keep the inc/dec calls balanced	806	if (flip_state->old_fb)
806	* when the planes are updated through the async update path.	807	drm_framebuffer_put(flip_state->old_fb);
807	* FIXME: we should move to generic async-page-flip when it's	808
808	* available, so that we can get rid of this hand-made cleanup_fb()	809	kfree(flip_state);
809	* logic.	810	}
810	*/	811
811	if (flip_state->old_fb) {	812	static void vc4_async_page_flip_seqno_complete(struct vc4_seqno_cb *cb)
812	struct drm_gem_cma_object *cma_bo;	813	{
813	struct vc4_bo *bo;	814	struct vc4_async_flip_state *flip_state =
		815	container_of(cb, struct vc4_async_flip_state, cb.seqno);
		816	struct vc4_bo *bo = NULL;
814		817
815	cma_bo = drm_fb_cma_get_gem_obj(flip_state->old_fb, 0);	818	if (flip_state->old_fb) {
		819	struct drm_gem_cma_object *cma_bo =
		820	drm_fb_cma_get_gem_obj(flip_state->old_fb, 0);
816	bo = to_vc4_bo(&cma_bo->base);	821	bo = to_vc4_bo(&cma_bo->base);
817	vc4_bo_dec_usecnt(bo);
818	drm_framebuffer_put(flip_state->old_fb);
819	}	822	}
820		823
821	kfree(flip_state);	824	vc4_async_page_flip_complete(flip_state);
		825
		826	/*
		827	* Decrement the BO usecnt in order to keep the inc/dec
		828	* calls balanced when the planes are updated through
		829	* the async update path.
		830	*
		831	* FIXME: we should move to generic async-page-flip when
		832	* it's available, so that we can get rid of this
		833	* hand-made cleanup_fb() logic.
		834	*/
		835	if (bo)
		836	vc4_bo_dec_usecnt(bo);
822	}	837	}
823		838
824	/* Implements async (non-vblank-synced) page flips.	839	static void vc4_async_page_flip_fence_complete(struct dma_fence *fence,
825	*	840	struct dma_fence_cb *cb)
826	* The page flip ioctl needs to return immediately, so we grab the
827	* modeset semaphore on the pipe, and queue the address update for
828	* when V3D is done with the BO being flipped to.
829	*/
830	static int vc4_async_page_flip(struct drm_crtc *crtc,
831	struct drm_framebuffer *fb,
832	struct drm_pending_vblank_event *event,
833	uint32_t flags)
834	{	841	{
835	struct drm_device *dev = crtc->dev;	842	struct vc4_async_flip_state *flip_state =
836	struct drm_plane *plane = crtc->primary;	843	container_of(cb, struct vc4_async_flip_state, cb.fence);
837	int ret = 0;	844
838	struct vc4_async_flip_state *flip_state;	845	vc4_async_page_flip_complete(flip_state);
		846	dma_fence_put(fence);
		847	}
		848
		849	static int vc4_async_set_fence_cb(struct drm_device *dev,
		850	struct vc4_async_flip_state *flip_state)
		851	{
		852	struct drm_framebuffer *fb = flip_state->fb;
839	struct drm_gem_cma_object *cma_bo = drm_fb_cma_get_gem_obj(fb, 0);	853	struct drm_gem_cma_object *cma_bo = drm_fb_cma_get_gem_obj(fb, 0);
840	struct vc4_bo *bo = to_vc4_bo(&cma_bo->base);	854	struct vc4_dev *vc4 = to_vc4_dev(dev);
		855	struct dma_fence *fence;
		856	int ret;
841		857
842	/* Increment the BO usecnt here, so that we never end up with an	858	if (!vc4->is_vc5) {
843	* unbalanced number of vc4_bo_{dec,inc}_usecnt() calls when the	859	struct vc4_bo *bo = to_vc4_bo(&cma_bo->base);
844	* plane is later updated through the non-async path.	860
845	* FIXME: we should move to generic async-page-flip when it's	861	return vc4_queue_seqno_cb(dev, &flip_state->cb.seqno, bo->seqno,
846	* available, so that we can get rid of this hand-made prepare_fb()	862	vc4_async_page_flip_seqno_complete);
847	* logic.	863	}
848	*/	864
849	ret = vc4_bo_inc_usecnt(bo);	865	ret = dma_resv_get_singleton(cma_bo->base.resv, DMA_RESV_USAGE_READ, &fence);
850	if (ret)	866	if (ret)
851	return ret;	867	return ret;
852		868
		869	/* If there's no fence, complete the page flip immediately */
		870	if (!fence) {
		871	vc4_async_page_flip_fence_complete(fence, &flip_state->cb.fence);
		872	return 0;
		873	}
		874
		875	/* If the fence has already been completed, complete the page flip */
		876	if (dma_fence_add_callback(fence, &flip_state->cb.fence,
		877	vc4_async_page_flip_fence_complete))
		878	vc4_async_page_flip_fence_complete(fence, &flip_state->cb.fence);
		879
		880	return 0;
		881	}
		882
		883	static int
		884	vc4_async_page_flip_common(struct drm_crtc *crtc,
		885	struct drm_framebuffer *fb,
		886	struct drm_pending_vblank_event *event,
		887	uint32_t flags)
		888	{
		889	struct drm_device *dev = crtc->dev;
		890	struct drm_plane *plane = crtc->primary;
		891	struct vc4_async_flip_state *flip_state;
		892
853	flip_state = kzalloc(sizeof(*flip_state), GFP_KERNEL);	893	flip_state = kzalloc(sizeof(*flip_state), GFP_KERNEL);
854	if (!flip_state) {	894	if (!flip_state)
855	vc4_bo_dec_usecnt(bo);
856	return -ENOMEM;	895	return -ENOMEM;
857	}
858		896
859	drm_framebuffer_get(fb);	897	drm_framebuffer_get(fb);
860	flip_state->fb = fb;	898	flip_state->fb = fb;
@@ -881,23 +919,79 @@ static int vc4_async_page_flip(struct drm_crtc *crtc, · 20 unmodified lines
881	*/	919	*/
882	drm_atomic_set_fb_for_plane(plane->state, fb);	920	drm_atomic_set_fb_for_plane(plane->state, fb);
883		921
884	vc4_queue_seqno_cb(dev, &flip_state->cb, bo->seqno,	922	vc4_async_set_fence_cb(dev, flip_state);
885	vc4_async_page_flip_complete);
886		923
887	/* Driver takes ownership of state on successful async commit. */	924	/* Driver takes ownership of state on successful async commit. */
888	return 0;	925	return 0;
889	}	926	}
890		927
		928	/* Implements async (non-vblank-synced) page flips.
		929	*
		930	* The page flip ioctl needs to return immediately, so we grab the
		931	* modeset semaphore on the pipe, and queue the address update for
		932	* when V3D is done with the BO being flipped to.
		933	*/
		934	static int vc4_async_page_flip(struct drm_crtc *crtc,
		935	struct drm_framebuffer *fb,
		936	struct drm_pending_vblank_event *event,
		937	uint32_t flags)
		938	{
		939	struct drm_device *dev = crtc->dev;
		940	struct vc4_dev *vc4 = to_vc4_dev(dev);
		941	struct drm_gem_cma_object *cma_bo = drm_fb_cma_get_gem_obj(fb, 0);
		942	struct vc4_bo *bo = to_vc4_bo(&cma_bo->base);
		943	int ret;
		944
		945	if (WARN_ON_ONCE(vc4->is_vc5))
		946	return -ENODEV;
		947
		948	/*
		949	* Increment the BO usecnt here, so that we never end up with an
		950	* unbalanced number of vc4_bo_{dec,inc}_usecnt() calls when the
		951	* plane is later updated through the non-async path.
		952	*
		953	* FIXME: we should move to generic async-page-flip when
		954	* it's available, so that we can get rid of this
		955	* hand-made prepare_fb() logic.
		956	*/
		957	ret = vc4_bo_inc_usecnt(bo);
		958	if (ret)
		959	return ret;
		960
		961	ret = vc4_async_page_flip_common(crtc, fb, event, flags);
		962	if (ret) {
		963	vc4_bo_dec_usecnt(bo);
		964	return ret;
		965	}
		966
		967	return 0;
		968	}
		969
		970	static int vc5_async_page_flip(struct drm_crtc *crtc,
		971	struct drm_framebuffer *fb,
		972	struct drm_pending_vblank_event *event,
		973	uint32_t flags)
		974	{
		975	return vc4_async_page_flip_common(crtc, fb, event, flags);
		976	}
		977
891	int vc4_page_flip(struct drm_crtc *crtc,	978	int vc4_page_flip(struct drm_crtc *crtc,
892	struct drm_framebuffer *fb,	979	struct drm_framebuffer *fb,
893	struct drm_pending_vblank_event *event,	980	struct drm_pending_vblank_event *event,
894	uint32_t flags,	981	uint32_t flags,
895	struct drm_modeset_acquire_ctx *ctx)	982	struct drm_modeset_acquire_ctx *ctx)
896	{	983	{
897	if (flags & DRM_MODE_PAGE_FLIP_ASYNC)	984	if (flags & DRM_MODE_PAGE_FLIP_ASYNC) {
898	return vc4_async_page_flip(crtc, fb, event, flags);	985	struct drm_device *dev = crtc->dev;
899	else	986	struct vc4_dev *vc4 = to_vc4_dev(dev);
		987
		988	if (vc4->is_vc5)
		989	return vc5_async_page_flip(crtc, fb, event, flags);
		990	else
		991	return vc4_async_page_flip(crtc, fb, event, flags);
		992	} else {
900	return drm_atomic_helper_page_flip(crtc, fb, event, flags, ctx);	993	return drm_atomic_helper_page_flip(crtc, fb, event, flags, ctx);
		994	}
901	}	995	}
902		996
903	struct drm_crtc_state vc4_crtc_duplicate_state(struct drm_crtc crtc)	997	struct drm_crtc_state vc4_crtc_duplicate_state(struct drm_crtc crtc)
@@ -1149,7 +1243,7 @@ int vc4_crtc_init(struct drm_device drm, struct vc4_crtc vc4_crtc, · 245 unmodified lines
1149	crtc_funcs, NULL);	1243	crtc_funcs, NULL);
1150	drm_crtc_helper_add(crtc, crtc_helper_funcs);	1244	drm_crtc_helper_add(crtc, crtc_helper_funcs);
1151		1245
1152	if (!vc4->hvs->hvs5) {	1246	if (!vc4->is_vc5) {
1153	drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));	1247	drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));
1154		1248
1155	drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);	1249	drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);

drivers/gpu/drm/vc4/vc4_drv.c+81−16

 	return map;
 }
+int vc4_dumb_fixup_args(struct drm_mode_create_dumb *args)
+{
+	int min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
+	if (args->pitch < min_pitch)
+		args->pitch = min_pitch;
+	if (args->size < args->pitch * args->height)
+		args->size = args->pitch * args->height;
+	return 0;
+}
+static int vc5_dumb_create(struct drm_file *file_priv,
+			   struct drm_device *dev,
+			   struct drm_mode_create_dumb *args)
+{
+	int ret;
+	ret = vc4_dumb_fixup_args(args);
+	if (ret)
+		return ret;
+	return drm_gem_cma_dumb_create_internal(file_priv, dev, args);
+}
 static int vc4_get_param_ioctl(struct drm_device *dev, void *data,
 			       struct drm_file *file_priv)
 {
 	if (args->pad != 0)
 		return -EINVAL;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (!vc4->v3d)
 		return -ENODEV;
 static int vc4_open(struct drm_device *dev, struct drm_file *file)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct vc4_file *vc4file;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	vc4file = kzalloc(sizeof(*vc4file), GFP_KERNEL);
 	if (!vc4file)
 		return -ENOMEM;
+	vc4file->dev = vc4;
 	vc4_perfmon_open_file(vc4file);
 	file->driver_priv = vc4file;
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct vc4_file *vc4file = file->driver_priv;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	if (vc4file->bin_bo_used)
 		vc4_v3d_bin_bo_put(vc4);
 	DRM_IOCTL_DEF_DRV(VC4_PERFMON_GET_VALUES, vc4_perfmon_get_values_ioctl, DRM_RENDER_ALLOW),
 };
-static struct drm_driver vc4_drm_driver = {
+static const struct drm_driver vc4_drm_driver = {
 	.driver_features = (DRIVER_MODESET |
 			    DRIVER_ATOMIC |
 			    DRIVER_GEM |
 	.gem_create_object = vc4_create_object,
-	DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(vc4_dumb_create),
+	DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(vc4_bo_dumb_create),
 	.ioctls = vc4_drm_ioctls,
 	.num_ioctls = ARRAY_SIZE(vc4_drm_ioctls),
 	.patchlevel = DRIVER_PATCHLEVEL,
 };
+static const struct drm_driver vc5_drm_driver = {
+	.driver_features = (DRIVER_MODESET |
+			    DRIVER_ATOMIC |
+			    DRIVER_GEM),
+#if defined(CONFIG_DEBUG_FS)
+	.debugfs_init = vc4_debugfs_init,
+#endif
+	DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(vc5_dumb_create),
+	.fops = &vc4_drm_fops,
+	.name = DRIVER_NAME,
+	.desc = DRIVER_DESC,
+	.date = DRIVER_DATE,
+	.major = DRIVER_MAJOR,
+	.minor = DRIVER_MINOR,
+	.patchlevel = DRIVER_PATCHLEVEL,
+};
 static void vc4_match_add_drivers(struct device *dev,
 				  struct component_match **match,
 				  struct platform_driver *const *drivers,
 static int vc4_drm_bind(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
+	const struct drm_driver *driver;
 	struct rpi_firmware *firmware = NULL;
 	struct drm_device *drm;
 	struct vc4_dev *vc4;
 	struct device_node *node;
 	struct drm_crtc *crtc;
+	bool is_vc5;
 	int ret = 0;
 	dev->coherent_dma_mask = DMA_BIT_MASK(32);
-	/* If VC4 V3D is missing, don't advertise render nodes. */
+	is_vc5 = of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5");
-	node = of_find_matching_node_and_match(NULL, vc4_v3d_dt_match, NULL);
+	if (is_vc5)
-	if (!node || !of_device_is_available(node))
+		driver = &vc5_drm_driver;
-		vc4_drm_driver.driver_features &= ~DRIVER_RENDER;
+	else
-	of_node_put(node);
+		driver = &vc4_drm_driver;
-	vc4 = devm_drm_dev_alloc(dev, &vc4_drm_driver, struct vc4_dev, base);
+	vc4 = devm_drm_dev_alloc(dev, driver, struct vc4_dev, base);
 	if (IS_ERR(vc4))
 		return PTR_ERR(vc4);
+	vc4->is_vc5 = is_vc5;
 	drm = &vc4->base;
 	platform_set_drvdata(pdev, drm);
 	INIT_LIST_HEAD(&vc4->debugfs_list);
-	mutex_init(&vc4->bin_bo_lock);
+	if (!is_vc5) {
+		mutex_init(&vc4->bin_bo_lock);
-	ret = vc4_bo_cache_init(drm);
+		ret = vc4_bo_cache_init(drm);
-	if (ret)
+		if (ret)
-		return ret;
+			return ret;
+	}
 	ret = drmm_mode_config_init(drm);
 	if (ret)
 		return ret;
-	ret = vc4_gem_init(drm);
+	if (!is_vc5) {
-	if (ret)
+		ret = vc4_gem_init(drm);
-		return ret;
+		if (ret)
+			return ret;
+	}
 	node = of_find_compatible_node(NULL, NULL, "raspberrypi,bcm2835-firmware");
 	if (node) {
 			return -EPROBE_DEFER;
 	}
-	ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver);
+	ret = drm_aperture_remove_framebuffers(false, driver);
 	if (ret)
 		return ret;

drivers/gpu/drm/vc4/vc4_drv.h+13−6

  * done. This way, only events related to a specific job will be counted.
  */
 struct vc4_perfmon {
+	struct vc4_dev *dev;
 	/* Tracks the number of users of the perfmon, when this counter reaches
 	 * zero the perfmon is destroyed.
 	 */
 struct vc4_dev {
 	struct drm_device base;
+	bool is_vc5;
 	unsigned int irq;
 	struct vc4_hvs *hvs;
 };
 struct vc4_hvs {
+	struct vc4_dev *vc4;
 	struct platform_device *pdev;
 	void __iomem *regs;
 	u32 __iomem *dlist;
 	struct drm_mm_node mitchell_netravali_filter;
 	struct debugfs_regset32 regset;
-	/* HVS version 5 flag, therefore requires updated dlist structures */
-	bool hvs5;
 };
 struct vc4_plane {
 #define VC4_REG32(reg) { .name = #reg, .offset = reg }
 struct vc4_exec_info {
+	struct vc4_dev *dev;
 	/* Sequence number for this bin/render job. */
 	uint64_t seqno;
  * released when the DRM file is closed should be placed here.
  */
 struct vc4_file {
+	struct vc4_dev *dev;
 	struct {
 		struct idr idr;
 		struct mutex lock;
 struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size);
 struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t size,
 			     bool from_cache, enum vc4_kernel_bo_type type);
-int vc4_dumb_create(struct drm_file *file_priv,
+int vc4_bo_dumb_create(struct drm_file *file_priv,
-		    struct drm_device *dev,
+		       struct drm_device *dev,
-		    struct drm_mode_create_dumb *args);
+		       struct drm_mode_create_dumb *args);
 int vc4_create_bo_ioctl(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 int vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data,
 /* vc4_drv.c */
 void __iomem *vc4_ioremap_regs(struct platform_device *dev, int index);
+int vc4_dumb_fixup_args(struct drm_mode_create_dumb *args);
 /* vc4_dpi.c */
 extern struct platform_driver vc4_dpi_driver;

drivers/gpu/drm/vc4/vc4_gem.c+40−0

 	u32 i;
 	int ret = 0;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (!vc4->v3d) {
 		DRM_DEBUG("VC4_GET_HANG_STATE with no VC4 V3D probed\n");
 		return -ENODEV;
 	unsigned long timeout_expire;
 	DEFINE_WAIT(wait);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (vc4->finished_seqno >= seqno)
 		return 0;
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct vc4_exec_info *exec;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 again:
 	exec = vc4_first_bin_job(vc4);
 	if (!exec)
 	if (!exec)
 		return;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	/* A previous RCL may have written to one of our textures, and
 	 * our full cache flush at bin time may have occurred before
 	 * that RCL completed.  Flush the texture cache now, but not
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	bool was_empty = list_empty(&vc4->render_job_list);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	list_move_tail(&exec->head, &vc4->render_job_list);
 	if (was_empty)
 		vc4_submit_next_render_job(dev);
 	unsigned long irqflags;
 	struct vc4_seqno_cb *cb, *cb_temp;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	spin_lock_irqsave(&vc4->job_lock, irqflags);
 	while (!list_empty(&vc4->job_done_list)) {
 		struct vc4_exec_info *exec =
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	unsigned long irqflags;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	cb->func = func;
 	INIT_WORK(&cb->work, vc4_seqno_cb_work);
 vc4_wait_seqno_ioctl(struct drm_device *dev, void *data,
 		     struct drm_file *file_priv)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct drm_vc4_wait_seqno *args = data;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	return vc4_wait_for_seqno_ioctl_helper(dev, args->seqno,
 					       &args->timeout_ns);
 }
 vc4_wait_bo_ioctl(struct drm_device *dev, void *data,
 		  struct drm_file *file_priv)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	int ret;
 	struct drm_vc4_wait_bo *args = data;
 	struct drm_gem_object *gem_obj;
 	struct vc4_bo *bo;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (args->pad != 0)
 		return -EINVAL;
 				  args->shader_rec_size,
 				  args->bo_handle_count);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (!vc4->v3d) {
 		DRM_DEBUG("VC4_SUBMIT_CL with no VC4 V3D probed\n");
 		return -ENODEV;
 		DRM_ERROR("malloc failure on exec struct\n");
 		return -ENOMEM;
 	}
+	exec->dev = vc4;
 	ret = vc4_v3d_pm_get(vc4);
 	if (ret) {
 {
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	vc4->dma_fence_context = dma_fence_context_alloc(1);
 	INIT_LIST_HEAD(&vc4->bin_job_list);
 int vc4_gem_madvise_ioctl(struct drm_device *dev, void *data,
 			  struct drm_file *file_priv)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct drm_vc4_gem_madvise *args = data;
 	struct drm_gem_object *gem_obj;
 	struct vc4_bo *bo;
 	int ret;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	switch (args->madv) {
 	case VC4_MADV_DONTNEED:
 	case VC4_MADV_WILLNEED:

drivers/gpu/drm/vc4/vc4_hdmi.c+1−1

@@ -1481,7 +1481,7 @@ vc4_hdmi_encoder_compute_mode_clock(const struct drm_display_mode *mode, · 1480 unmodified lines
1481	unsigned int bpc,	1481	unsigned int bpc,
1482	enum vc4_hdmi_output_format fmt)	1482	enum vc4_hdmi_output_format fmt)
1483	{	1483	{
1484	unsigned long long clock = mode->clock * 1000;	1484	unsigned long long clock = mode->clock * 1000ULL;
1485		1485
1486	if (mode->flags & DRM_MODE_FLAG_DBLCLK)	1486	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
1487	clock = clock * 2;	1487	clock = clock * 2;

drivers/gpu/drm/vc4/vc4_hvs.c+9−9

 int vc4_hvs_get_fifo_from_output(struct vc4_hvs *hvs, unsigned int output)
 {
+	struct vc4_dev *vc4 = hvs->vc4;
 	u32 reg;
 	int ret;
-	if (!hvs->hvs5)
+	if (!vc4->is_vc5)
 		return output;
 	switch (output) {
 static int vc4_hvs_init_channel(struct vc4_hvs *hvs, struct drm_crtc *crtc,
 				struct drm_display_mode *mode, bool oneshot)
 {
+	struct vc4_dev *vc4 = hvs->vc4;
 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
 	struct vc4_crtc_state *vc4_crtc_state = to_vc4_crtc_state(crtc->state);
 	unsigned int chan = vc4_crtc_state->assigned_channel;
 	 */
 	dispctrl = SCALER_DISPCTRLX_ENABLE;
-	if (!hvs->hvs5)
+	if (!vc4->is_vc5)
 		dispctrl |= VC4_SET_FIELD(mode->hdisplay,
 					  SCALER_DISPCTRLX_WIDTH) |
 			    VC4_SET_FIELD(mode->vdisplay,
 	HVS_WRITE(SCALER_DISPBKGNDX(chan), dispbkgndx |
 		  SCALER_DISPBKGND_AUTOHS |
-		  ((!hvs->hvs5) ? SCALER_DISPBKGND_GAMMA : 0) |
+		  ((!vc4->is_vc5) ? SCALER_DISPBKGND_GAMMA : 0) |
 		  (interlace ? SCALER_DISPBKGND_INTERLACE : 0));
 	/* Reload the LUT, since the SRAMs would have been disabled if
 	if (!hvs)
 		return -ENOMEM;
+	hvs->vc4 = vc4;
 	hvs->pdev = pdev;
-	if (of_device_is_compatible(pdev->dev.of_node, "brcm,bcm2711-hvs"))
-		hvs->hvs5 = true;
 	hvs->regs = vc4_ioremap_regs(pdev, 0);
 	if (IS_ERR(hvs->regs))
 		return PTR_ERR(hvs->regs);
 	hvs->regset.regs = hvs_regs;
 	hvs->regset.nregs = ARRAY_SIZE(hvs_regs);
-	if (hvs->hvs5) {
+	if (vc4->is_vc5) {
 		hvs->core_clk = devm_clk_get(&pdev->dev, NULL);
 		if (IS_ERR(hvs->core_clk)) {
 			dev_err(&pdev->dev, "Couldn't get core clock\n");
 		}
 	}
-	if (!hvs->hvs5)
+	if (!vc4->is_vc5)
 		hvs->dlist = hvs->regs + SCALER_DLIST_START;
 	else
 		hvs->dlist = hvs->regs + SCALER5_DLIST_START;
 	 * between planes when they don't overlap on the screen, but
 	 * for now we just allocate globally.
 	 */
-	if (!hvs->hvs5)
+	if (!vc4->is_vc5)
 		/* 48k words of 2x12-bit pixels */
 		drm_mm_init(&hvs->lbm_mm, 0, 48 * 1024);
 	else

drivers/gpu/drm/vc4/vc4_irq.c+16−0

 {
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	if (!vc4->v3d)
 		return;
 {
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	if (!vc4->v3d)
 		return;
 int vc4_irq_install(struct drm_device *dev, int irq)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	int ret;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (irq == IRQ_NOTCONNECTED)
 		return -ENOTCONN;
 {
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	vc4_irq_disable(dev);
 	free_irq(vc4->irq, dev);
 }
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	unsigned long irqflags;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	/* Acknowledge any stale IRQs. */
 	V3D_WRITE(V3D_INTCTL, V3D_DRIVER_IRQS);

drivers/gpu/drm/vc4/vc4_kms.c+16−8

 		old_hvs_state->fifo_state[channel].pending_commit = NULL;
 	}
-	if (vc4->hvs->hvs5) {
+	if (vc4->is_vc5) {
 		unsigned long state_rate = max(old_hvs_state->core_clock_rate,
 					       new_hvs_state->core_clock_rate);
 		unsigned long core_rate = max_t(unsigned long,
 	vc4_ctm_commit(vc4, state);
-	if (vc4->hvs->hvs5)
+	if (vc4->is_vc5)
 		vc5_hvs_pv_muxing_commit(vc4, state);
 	else
 		vc4_hvs_pv_muxing_commit(vc4, state);
 	drm_atomic_helper_cleanup_planes(dev, state);
-	if (vc4->hvs->hvs5) {
+	if (vc4->is_vc5) {
 		drm_dbg(dev, "Running the core clock at %lu Hz\n",
 			new_hvs_state->core_clock_rate);
 					     struct drm_file *file_priv,
 					     const struct drm_mode_fb_cmd2 *mode_cmd)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct drm_mode_fb_cmd2 mode_cmd_local;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return ERR_PTR(-ENODEV);
 	/* If the user didn't specify a modifier, use the
 	 * vc4_set_tiling_ioctl() state for the BO.
 	 */
 	.fb_create = vc4_fb_create,
 };
+static const struct drm_mode_config_funcs vc5_mode_funcs = {
+	.atomic_check = vc4_atomic_check,
+	.atomic_commit = drm_atomic_helper_commit,
+	.fb_create = drm_gem_fb_create,
+};
 int vc4_kms_load(struct drm_device *dev)
 {
 	struct vc4_dev *vc4 = to_vc4_dev(dev);
-	bool is_vc5 = of_device_is_compatible(dev->dev->of_node,
-					      "brcm,bcm2711-vc5");
 	int ret;
 	/*
 	 * the BCM2711, but the load tracker computations are used for
 	 * the core clock rate calculation.
 	 */
-	if (!is_vc5) {
+	if (!vc4->is_vc5) {
 		/* Start with the load tracker enabled. Can be
 		 * disabled through the debugfs load_tracker file.
 		 */
 		return ret;
 	}
-	if (is_vc5) {
+	if (vc4->is_vc5) {
 		dev->mode_config.max_width = 7680;
 		dev->mode_config.max_height = 7680;
 	} else {
 		dev->mode_config.max_height = 2048;
 	}
-	dev->mode_config.funcs = &vc4_mode_funcs;
+	dev->mode_config.funcs = vc4->is_vc5 ? &vc5_mode_funcs : &vc4_mode_funcs;
 	dev->mode_config.helper_private = &vc4_mode_config_helpers;
 	dev->mode_config.preferred_depth = 24;
 	dev->mode_config.async_page_flip = true;

drivers/gpu/drm/vc4/vc4_perfmon.c+46−1

 void vc4_perfmon_get(struct vc4_perfmon *perfmon)
 {
+	struct vc4_dev *vc4 = perfmon->dev;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	if (perfmon)
 		refcount_inc(&perfmon->refcnt);
 }
 void vc4_perfmon_put(struct vc4_perfmon *perfmon)
 {
-	if (perfmon && refcount_dec_and_test(&perfmon->refcnt))
+	struct vc4_dev *vc4;
+	if (!perfmon)
+		return;
+	vc4 = perfmon->dev;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
+	if (refcount_dec_and_test(&perfmon->refcnt))
 		kfree(perfmon);
 }
 	unsigned int i;
 	u32 mask;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	if (WARN_ON_ONCE(!perfmon || vc4->active_perfmon))
 		return;
 {
 	unsigned int i;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	if (WARN_ON_ONCE(!vc4->active_perfmon ||
 			 perfmon != vc4->active_perfmon))
 		return;
 struct vc4_perfmon *vc4_perfmon_find(struct vc4_file *vc4file, int id)
 {
+	struct vc4_dev *vc4 = vc4file->dev;
 	struct vc4_perfmon *perfmon;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return NULL;
 	mutex_lock(&vc4file->perfmon.lock);
 	perfmon = idr_find(&vc4file->perfmon.idr, id);
 	vc4_perfmon_get(perfmon);
 void vc4_perfmon_open_file(struct vc4_file *vc4file)
 {
+	struct vc4_dev *vc4 = vc4file->dev;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	mutex_init(&vc4file->perfmon.lock);
 	idr_init_base(&vc4file->perfmon.idr, VC4_PERFMONID_MIN);
+	vc4file->dev = vc4;
 }
 static int vc4_perfmon_idr_del(int id, void *elem, void *data)
 void vc4_perfmon_close_file(struct vc4_file *vc4file)
 {
+	struct vc4_dev *vc4 = vc4file->dev;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	mutex_lock(&vc4file->perfmon.lock);
 	idr_for_each(&vc4file->perfmon.idr, vc4_perfmon_idr_del, NULL);
 	idr_destroy(&vc4file->perfmon.idr);
 	unsigned int i;
 	int ret;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (!vc4->v3d) {
 		DRM_DEBUG("Creating perfmon no VC4 V3D probed\n");
 		return -ENODEV;
 			  GFP_KERNEL);
 	if (!perfmon)
 		return -ENOMEM;
+	perfmon->dev = vc4;
 	for (i = 0; i < req->ncounters; i++)
 		perfmon->events[i] = req->events[i];
 	struct drm_vc4_perfmon_destroy *req = data;
 	struct vc4_perfmon *perfmon;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (!vc4->v3d) {
 		DRM_DEBUG("Destroying perfmon no VC4 V3D probed\n");
 		return -ENODEV;
 	struct vc4_perfmon *perfmon;
 	int ret;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (!vc4->v3d) {
 		DRM_DEBUG("Getting perfmon no VC4 V3D probed\n");
 		return -ENODEV;

drivers/gpu/drm/vc4/vc4_plane.c+21−8

 	}
 	/* Align it to 64 or 128 (hvs5) bytes */
-	lbm = roundup(lbm, vc4->hvs->hvs5 ? 128 : 64);
+	lbm = roundup(lbm, vc4->is_vc5 ? 128 : 64);
 	/* Each "word" of the LBM memory contains 2 or 4 (hvs5) pixels */
-	lbm /= vc4->hvs->hvs5 ? 4 : 2;
+	lbm /= vc4->is_vc5 ? 4 : 2;
 	return lbm;
 }
 		ret = drm_mm_insert_node_generic(&vc4->hvs->lbm_mm,
 						 &vc4_state->lbm,
 						 lbm_size,
-						 vc4->hvs->hvs5 ? 64 : 32,
+						 vc4->is_vc5 ? 64 : 32,
 						 0, 0);
 		spin_unlock_irqrestore(&vc4->hvs->mm_lock, irqflags);
 	mix_plane_alpha = state->alpha != DRM_BLEND_ALPHA_OPAQUE &&
 			  fb->format->has_alpha;
-	if (!vc4->hvs->hvs5) {
+	if (!vc4->is_vc5) {
 	/* Control word */
 		vc4_dlist_write(vc4_state,
 				SCALER_CTL0_VALID |
 	old_vc4_state = to_vc4_plane_state(plane->state);
 	new_vc4_state = to_vc4_plane_state(new_plane_state);
+	if (!new_vc4_state->hw_dlist)
+		return -EINVAL;
 	if (old_vc4_state->dlist_count != new_vc4_state->dlist_count ||
 	    old_vc4_state->pos0_offset != new_vc4_state->pos0_offset ||
 	    old_vc4_state->pos2_offset != new_vc4_state->pos2_offset ||
 	.atomic_async_update = vc4_plane_atomic_async_update,
 };
+static const struct drm_plane_helper_funcs vc5_plane_helper_funcs = {
+	.atomic_check = vc4_plane_atomic_check,
+	.atomic_update = vc4_plane_atomic_update,
+	.atomic_async_check = vc4_plane_atomic_async_check,
+	.atomic_async_update = vc4_plane_atomic_async_update,
+};
 static bool vc4_format_mod_supported(struct drm_plane *plane,
 				     uint32_t format,
 				     uint64_t modifier)
 struct drm_plane *vc4_plane_init(struct drm_device *dev,
 				 enum drm_plane_type type)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct drm_plane *plane = NULL;
 	struct vc4_plane *vc4_plane;
 	u32 formats[ARRAY_SIZE(hvs_formats)];
 	int num_formats = 0;
 	int ret = 0;
 	unsigned i;
-	bool hvs5 = of_device_is_compatible(dev->dev->of_node,
-					    "brcm,bcm2711-vc5");
 	static const uint64_t modifiers[] = {
 		DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
 		DRM_FORMAT_MOD_BROADCOM_SAND128,
 		return ERR_PTR(-ENOMEM);
 	for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) {
-		if (!hvs_formats[i].hvs5_only || hvs5) {
+		if (!hvs_formats[i].hvs5_only || vc4->is_vc5) {
 			formats[num_formats] = hvs_formats[i].drm;
 			num_formats++;
 		}
 	if (ret)
 		return ERR_PTR(ret);
-	drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
+	if (vc4->is_vc5)
+		drm_plane_helper_add(plane, &vc5_plane_helper_funcs);
+	else
+		drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
 	drm_plane_create_alpha_property(plane);
 	drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0,

drivers/gpu/drm/vc4/vc4_render_cl.c+4−0

 int vc4_get_rcl(struct drm_device *dev, struct vc4_exec_info *exec)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	struct vc4_rcl_setup setup = {0};
 	struct drm_vc4_submit_cl *args = exec->args;
 	bool has_bin = args->bin_cl_size != 0;
 	int ret;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	if (args->min_x_tile > args->max_x_tile ||
 	    args->min_y_tile > args->max_y_tile) {
 		DRM_DEBUG("Bad render tile set (%d,%d)-(%d,%d)\n",

drivers/gpu/drm/vc4/vc4_v3d.c+15−0

 int
 vc4_v3d_pm_get(struct vc4_dev *vc4)
 {
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	mutex_lock(&vc4->power_lock);
 	if (vc4->power_refcount++ == 0) {
 		int ret = pm_runtime_get_sync(&vc4->v3d->pdev->dev);
 void
 vc4_v3d_pm_put(struct vc4_dev *vc4)
 {
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	mutex_lock(&vc4->power_lock);
 	if (--vc4->power_refcount == 0) {
 		pm_runtime_mark_last_busy(&vc4->v3d->pdev->dev);
 	uint64_t seqno = 0;
 	struct vc4_exec_info *exec;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 try_again:
 	spin_lock_irqsave(&vc4->job_lock, irqflags);
 	slot = ffs(~vc4->bin_alloc_used);
 {
 	int ret = 0;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	mutex_lock(&vc4->bin_bo_lock);
 	if (used && *used)
 void vc4_v3d_bin_bo_put(struct vc4_dev *vc4)
 {
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return;
 	mutex_lock(&vc4->bin_bo_lock);
 	kref_put(&vc4->bin_bo_kref, bin_bo_release);
 	mutex_unlock(&vc4->bin_bo_lock);

drivers/gpu/drm/vc4/vc4_validate.c+16−0

 struct drm_gem_cma_object *
 vc4_use_bo(struct vc4_exec_info *exec, uint32_t hindex)
 {
+	struct vc4_dev *vc4 = exec->dev;
 	struct drm_gem_cma_object *obj;
 	struct vc4_bo *bo;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return NULL;
 	if (hindex >= exec->bo_count) {
 		DRM_DEBUG("BO index %d greater than BO count %d\n",
 			  hindex, exec->bo_count);
 		   uint32_t offset, uint8_t tiling_format,
 		   uint32_t width, uint32_t height, uint8_t cpp)
 {
+	struct vc4_dev *vc4 = exec->dev;
 	uint32_t aligned_width, aligned_height, stride, size;
 	uint32_t utile_w = utile_width(cpp);
 	uint32_t utile_h = utile_height(cpp);
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return false;
 	/* The shaded vertex format stores signed 12.4 fixed point
 	 * (-2048,2047) offsets from the viewport center, so we should
 	 * never have a render target larger than 4096.  The texture
 		    void *unvalidated,
 		    struct vc4_exec_info *exec)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	uint32_t len = exec->args->bin_cl_size;
 	uint32_t dst_offset = 0;
 	uint32_t src_offset = 0;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	while (src_offset < len) {
 		void *dst_pkt = validated + dst_offset;
 		void *src_pkt = unvalidated + src_offset;
 vc4_validate_shader_recs(struct drm_device *dev,
 			 struct vc4_exec_info *exec)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(dev);
 	uint32_t i;
 	int ret = 0;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return -ENODEV;
 	for (i = 0; i < exec->shader_state_count; i++) {
 		ret = validate_gl_shader_rec(dev, exec, &exec->shader_state[i]);
 		if (ret)

drivers/gpu/drm/vc4/vc4_validate_shaders.c+4−0

 struct vc4_validated_shader_info *
 vc4_validate_shader(struct drm_gem_cma_object *shader_obj)
 {
+	struct vc4_dev *vc4 = to_vc4_dev(shader_obj->base.dev);
 	bool found_shader_end = false;
 	int shader_end_ip = 0;
 	uint32_t last_thread_switch_ip = -3;
 	struct vc4_validated_shader_info *validated_shader = NULL;
 	struct vc4_shader_validation_state validation_state;
+	if (WARN_ON_ONCE(vc4->is_vc5))
+		return NULL;
 	memset(&validation_state, 0, sizeof(validation_state));
 	validation_state.shader = shader_obj->vaddr;
 	validation_state.max_ip = shader_obj->base.size / sizeof(uint64_t);

drivers/gpu/drm/xen/xen_drm_front_gem.c+1−1

@@ -71,7 +71,7 @@ static int xen_drm_front_gem_object_mmap(struct drm_gem_object *gem_obj, · 70 unmodified lines
71	* the whole buffer.	71	* the whole buffer.
72	*/	72	*/
73	vma->vm_flags &= ~VM_PFNMAP;	73	vma->vm_flags &= ~VM_PFNMAP;
74	vma->vm_flags \|= VM_MIXEDMAP;	74	vma->vm_flags \|= VM_MIXEDMAP \| VM_DONTEXPAND;
75	vma->vm_pgoff = 0;	75	vma->vm_pgoff = 0;
76		76
77	/*	77	/*

drivers/hid/hid-hyperv.c+3−2

 	if (!input_device->hid_desc)
 		goto cleanup;
-	input_device->report_desc_size = desc->desc[0].wDescriptorLength;
+	input_device->report_desc_size = le16_to_cpu(
+					desc->desc[0].wDescriptorLength);
 	if (input_device->report_desc_size == 0) {
 		input_device->dev_info_status = -EINVAL;
 		goto cleanup;
 	memcpy(input_device->report_desc,
 	       ((unsigned char *)desc) + desc->bLength,
-	       desc->desc[0].wDescriptorLength);
+	       le16_to_cpu(desc->desc[0].wDescriptorLength));
 	/* Send the ack */
 	memset(&ack, 0, sizeof(struct mousevsc_prt_msg));

drivers/hv/channel_mgmt.c+13−5

 #include <linux/cpu.h>
 #include <linux/hyperv.h>
 #include <asm/mshyperv.h>
+#include <linux/sched/isolation.h>
 #include "hyperv_vmbus.h"
 		 */
 		if (newchannel->offermsg.offer.sub_channel_index == 0) {
 			mutex_unlock(&vmbus_connection.channel_mutex);
+			cpus_read_unlock();
 			/*
 			 * Don't call free_channel(), because newchannel->kobj
 			 * is not initialized yet.
 	u32 i, ncpu = num_online_cpus();
 	cpumask_var_t available_mask;
 	struct cpumask *allocated_mask;
+	const struct cpumask *hk_mask = housekeeping_cpumask(HK_TYPE_MANAGED_IRQ);
 	u32 target_cpu;
 	int numa_node;
 	if (!perf_chn ||
-	    !alloc_cpumask_var(&available_mask, GFP_KERNEL)) {
+	    !alloc_cpumask_var(&available_mask, GFP_KERNEL) ||
+	    cpumask_empty(hk_mask)) {
 		/*
 		 * If the channel is not a performance critical
 		 * channel, bind it to VMBUS_CONNECT_CPU.
 		 * In case alloc_cpumask_var() fails, bind it to
 		 * VMBUS_CONNECT_CPU.
+		 * If all the cpus are isolated, bind it to
+		 * VMBUS_CONNECT_CPU.
 		 */
 		channel->target_cpu = VMBUS_CONNECT_CPU;
 		if (perf_chn)
 		}
 		allocated_mask = &hv_context.hv_numa_map[numa_node];
-		if (cpumask_equal(allocated_mask, cpumask_of_node(numa_node))) {
+retry:
+		cpumask_xor(available_mask, allocated_mask, cpumask_of_node(numa_node));
+		cpumask_and(available_mask, available_mask, hk_mask);
+		if (cpumask_empty(available_mask)) {
 			/*
 			 * We have cycled through all the CPUs in the node;
 			 * reset the allocated map.
 			 */
 			cpumask_clear(allocated_mask);
+			goto retry;
 		}
-		cpumask_xor(available_mask, allocated_mask,
-			    cpumask_of_node(numa_node));
 		target_cpu = cpumask_first(available_mask);
 		cpumask_set_cpu(target_cpu, allocated_mask);

drivers/hv/hv_kvp.c+1−1

@@ -394,7 +394,7 @@ kvp_send_key(struct work_struct *dummy) · 393 unmodified lines
394	in_msg = kvp_transaction.kvp_msg;	394	in_msg = kvp_transaction.kvp_msg;
395		395
396	/*	396	/*
397	* The key/value strings sent from the host are encoded in	397	* The key/value strings sent from the host are encoded
398	* in utf16; convert it to utf8 strings.	398	* in utf16; convert it to utf8 strings.
399	* The host assures us that the utf16 strings will not exceed	399	* The host assures us that the utf16 strings will not exceed
400	* the max lengths specified. We will however, reserve room	400	* the max lengths specified. We will however, reserve room

drivers/hv/vmbus_drv.c+4−0

 #include <linux/kernel_stat.h>
 #include <linux/clockchips.h>
 #include <linux/cpu.h>
+#include <linux/sched/isolation.h>
 #include <linux/sched/task_stack.h>
 #include <linux/delay.h>
 	if (target_cpu >= nr_cpumask_bits)
 		return -EINVAL;
+	if (!cpumask_test_cpu(target_cpu, housekeeping_cpumask(HK_TYPE_MANAGED_IRQ)))
+		return -EINVAL;
 	/* No CPUs should come up or down during this. */
 	cpus_read_lock();

drivers/hwmon/asus-ec-sensors.c+1−1

@@ -259,7 +259,7 @@ static const struct ec_board_info board_info[] = { · 258 unmodified lines
259	},	259	},
260	{	260	{
261	.board_names = {	261	.board_names = {
262	"ROG CROSSHAIR VIII FORMULA"	262	"ROG CROSSHAIR VIII FORMULA",
263	"ROG CROSSHAIR VIII HERO",	263	"ROG CROSSHAIR VIII HERO",
264	"ROG CROSSHAIR VIII HERO (WI-FI)",	264	"ROG CROSSHAIR VIII HERO (WI-FI)",
265	},	265	},

drivers/hwmon/occ/common.c+5−0

 void occ_shutdown(struct occ *occ)
 {
+	mutex_lock(&occ->lock);
 	occ_shutdown_sysfs(occ);
 	if (occ->hwmon)
 		hwmon_device_unregister(occ->hwmon);
+	occ->hwmon = NULL;
+	mutex_unlock(&occ->lock);
 }
 EXPORT_SYMBOL_GPL(occ_shutdown);

drivers/i2c/busses/i2c-designware-common.c+0−3

@@ -477,9 +477,6 @@ int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare) · 476 unmodified lines
477	{	477	{
478	int ret;	478	int ret;
479		479
480	if (IS_ERR(dev->clk))
481	return PTR_ERR(dev->clk);
482
483	if (prepare) {	480	if (prepare) {
484	/* Optional interface clock */	481	/* Optional interface clock */
485	ret = clk_prepare_enable(dev->pclk);	482	ret = clk_prepare_enable(dev->pclk);

drivers/i2c/busses/i2c-designware-platdrv.c+11−2

@@ -320,8 +320,17 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) · 319 unmodified lines
320	goto exit_reset;	320	goto exit_reset;
321	}	321	}
322		322
323	dev->clk = devm_clk_get(&pdev->dev, NULL);	323	dev->clk = devm_clk_get_optional(&pdev->dev, NULL);
324	if (!i2c_dw_prepare_clk(dev, true)) {	324	if (IS_ERR(dev->clk)) {
		325	ret = PTR_ERR(dev->clk);
		326	goto exit_reset;
		327	}
		328
		329	ret = i2c_dw_prepare_clk(dev, true);
		330	if (ret)
		331	goto exit_reset;
		332
		333	if (dev->clk) {
325	u64 clk_khz;	334	u64 clk_khz;
326		335
327	dev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;	336	dev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;

drivers/i2c/busses/i2c-mt65xx.c+7−2

 	if (ret < 0) {
 		dev_err(&pdev->dev,
 			"Request I2C IRQ %d fail\n", irq);
-		return ret;
+		goto err_bulk_unprepare;
 	}
 	i2c_set_adapdata(&i2c->adap, i2c);
 	ret = i2c_add_adapter(&i2c->adap);
 	if (ret)
-		return ret;
+		goto err_bulk_unprepare;
 	platform_set_drvdata(pdev, i2c);
 	return 0;
+err_bulk_unprepare:
+	clk_bulk_unprepare(I2C_MT65XX_CLK_MAX, i2c->clocks);
+	return ret;
 }
 static int mtk_i2c_remove(struct platform_device *pdev)

drivers/i2c/busses/i2c-npcm7xx.c+1−2

@@ -2372,8 +2372,7 @@ static struct platform_driver npcm_i2c_bus_driver = { · 2371 unmodified lines
2372	static int __init npcm_i2c_init(void)	2372	static int __init npcm_i2c_init(void)
2373	{	2373	{
2374	npcm_i2c_debugfs_dir = debugfs_create_dir("npcm_i2c", NULL);	2374	npcm_i2c_debugfs_dir = debugfs_create_dir("npcm_i2c", NULL);
2375	platform_driver_register(&npcm_i2c_bus_driver);	2375	return platform_driver_register(&npcm_i2c_bus_driver);
2376	return 0;
2377	}	2376	}
2378	module_init(npcm_i2c_init);	2377	module_init(npcm_i2c_init);
2379		2378

drivers/iio/accel/bma180.c+2−1

 		data->trig->ops = &bma180_trigger_ops;
 		iio_trigger_set_drvdata(data->trig, indio_dev);
-		indio_dev->trig = iio_trigger_get(data->trig);
 		ret = iio_trigger_register(data->trig);
 		if (ret)
 			goto err_trigger_free;
+		indio_dev->trig = iio_trigger_get(data->trig);
 	}
 	ret = iio_triggered_buffer_setup(indio_dev, NULL,

drivers/iio/accel/kxcjk-1013.c+2−2

 		data->dready_trig->ops = &kxcjk1013_trigger_ops;
 		iio_trigger_set_drvdata(data->dready_trig, indio_dev);
-		indio_dev->trig = data->dready_trig;
-		iio_trigger_get(indio_dev->trig);
 		ret = iio_trigger_register(data->dready_trig);
 		if (ret)
 			goto err_poweroff;
+		indio_dev->trig = iio_trigger_get(data->dready_trig);
 		data->motion_trig->ops = &kxcjk1013_trigger_ops;
 		iio_trigger_set_drvdata(data->motion_trig, indio_dev);
 		ret = iio_trigger_register(data->motion_trig);

drivers/iio/accel/mma8452.c+14−8

 	int i;
 	int ret;
-	ret = i2c_smbus_write_byte_data(client,	MMA8452_CTRL_REG2,
+	/*
+	 * Find on fxls8471, after config reset bit, it reset immediately,
+	 * and will not give ACK, so here do not check the return value.
+	 * The following code will read the reset register, and check whether
+	 * this reset works.
+	 */
+	i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG2,
 					MMA8452_CTRL_REG2_RST);
-	if (ret < 0)
-		return ret;
 	for (i = 0; i < 10; i++) {
 		usleep_range(100, 200);
 	mutex_init(&data->lock);
 	data->chip_info = device_get_match_data(&client->dev);
-	if (!data->chip_info && id) {
+	if (!data->chip_info) {
-		data->chip_info = &mma_chip_info_table[id->driver_data];
+		if (id) {
-	} else {
+			data->chip_info = &mma_chip_info_table[id->driver_data];
-		dev_err(&client->dev, "unknown device model\n");
+		} else {
-		return -ENODEV;
+			dev_err(&client->dev, "unknown device model\n");
+			return -ENODEV;
+		}
 	}
 	ret = iio_read_mount_matrix(&client->dev, &data->orientation);

drivers/iio/accel/mxc4005.c+2−2

 		data->dready_trig->ops = &mxc4005_trigger_ops;
 		iio_trigger_set_drvdata(data->dready_trig, indio_dev);
-		indio_dev->trig = data->dready_trig;
-		iio_trigger_get(indio_dev->trig);
 		ret = devm_iio_trigger_register(&client->dev,
 						data->dready_trig);
 		if (ret) {
 				"failed to register trigger\n");
 			return ret;
 		}
+		indio_dev->trig = iio_trigger_get(data->dready_trig);
 	}
 	return devm_iio_device_register(&client->dev, indio_dev);

drivers/iio/adc/adi-axi-adc.c+3−0

 		if (!try_module_get(cl->dev->driver->owner)) {
 			mutex_unlock(&registered_clients_lock);
+			of_node_put(cln);
 			return ERR_PTR(-ENODEV);
 		}
 		get_device(cl->dev);
 		cl->info = info;
 		mutex_unlock(&registered_clients_lock);
+		of_node_put(cln);
 		return cl;
 	}
 	mutex_unlock(&registered_clients_lock);
+	of_node_put(cln);
 	return ERR_PTR(-EPROBE_DEFER);
 }

drivers/iio/adc/aspeed_adc.c+1−0

@@ -186,6 +186,7 @@ static int aspeed_adc_set_trim_data(struct iio_dev *indio_dev) · 185 unmodified lines
186	return -EOPNOTSUPP;	186	return -EOPNOTSUPP;
187	}	187	}
188	scu = syscon_node_to_regmap(syscon);	188	scu = syscon_node_to_regmap(syscon);
		189	of_node_put(syscon);
189	if (IS_ERR(scu)) {	190	if (IS_ERR(scu)) {
190	dev_warn(data->dev, "Failed to get syscon regmap\n");	191	dev_warn(data->dev, "Failed to get syscon regmap\n");
191	return -EOPNOTSUPP;	192	return -EOPNOTSUPP;

drivers/iio/adc/axp288_adc.c+8−0

@@ -196,6 +196,14 @@ static const struct dmi_system_id axp288_adc_ts_bias_override[] = { · 195 unmodified lines
196	},	196	},
197	.driver_data = (void *)(uintptr_t)AXP288_ADC_TS_BIAS_80UA,	197	.driver_data = (void *)(uintptr_t)AXP288_ADC_TS_BIAS_80UA,
198	},	198	},
		199	{
		200	/* Nuvision Solo 10 Draw */
		201	.matches = {
		202	DMI_MATCH(DMI_SYS_VENDOR, "TMAX"),
		203	DMI_MATCH(DMI_PRODUCT_NAME, "TM101W610L"),
		204	},
		205	.driver_data = (void *)(uintptr_t)AXP288_ADC_TS_BIAS_80UA,
		206	},
199	{}	207	{}
200	};	208	};
201		209

drivers/iio/adc/rzg2l_adc.c+6−2

 	i = 0;
 	device_for_each_child_node(&pdev->dev, fwnode) {
 		ret = fwnode_property_read_u32(fwnode, "reg", &channel);
-		if (ret)
+		if (ret) {
+			fwnode_handle_put(fwnode);
 			return ret;
+		}
-		if (channel >= RZG2L_ADC_MAX_CHANNELS)
+		if (channel >= RZG2L_ADC_MAX_CHANNELS) {
+			fwnode_handle_put(fwnode);
 			return -EINVAL;
+		}
 		chan_array[i].type = IIO_VOLTAGE;
 		chan_array[i].indexed = 1;

drivers/iio/adc/stm32-adc-core.c+7−2

  * @max_clk_rate_hz: maximum analog clock rate (Hz, from datasheet)
  * @has_syscfg: SYSCFG capability flags
  * @num_irqs:	number of interrupt lines
+ * @num_adcs:   maximum number of ADC instances in the common registers
  */
 struct stm32_adc_priv_cfg {
 	const struct stm32_adc_common_regs *regs;
 	u32 max_clk_rate_hz;
 	unsigned int has_syscfg;
 	unsigned int num_irqs;
+	unsigned int num_adcs;
 };
 /**
 	 * before invoking the interrupt handler (e.g. call ISR only for
 	 * IRQ-enabled ADCs).
 	 */
-	for (i = 0; i < priv->cfg->num_irqs; i++) {
+	for (i = 0; i < priv->cfg->num_adcs; i++) {
 		if ((status & priv->cfg->regs->eoc_msk[i] &&
 		     stm32_adc_eoc_enabled(priv, i)) ||
 		     (status & priv->cfg->regs->ovr_msk[i]))
 	.clk_sel = stm32f4_adc_clk_sel,
 	.max_clk_rate_hz = 36000000,
 	.num_irqs = 1,
+	.num_adcs = 3,
 };
 static const struct stm32_adc_priv_cfg stm32h7_adc_priv_cfg = {
 	.max_clk_rate_hz = 36000000,
 	.has_syscfg = HAS_VBOOSTER,
 	.num_irqs = 1,
+	.num_adcs = 2,
 };
 static const struct stm32_adc_priv_cfg stm32mp1_adc_priv_cfg = {
 	.regs = &stm32h7_adc_common_regs,
 	.clk_sel = stm32h7_adc_clk_sel,
-	.max_clk_rate_hz = 40000000,
+	.max_clk_rate_hz = 36000000,
 	.has_syscfg = HAS_VBOOSTER | HAS_ANASWVDD,
 	.num_irqs = 2,
+	.num_adcs = 2,
 };
 static const struct of_device_id stm32_adc_of_match[] = {

drivers/iio/adc/stm32-adc.c+17−20

@@ -1365,7 +1365,7 @@ static int stm32_adc_read_raw(struct iio_dev *indio_dev, · 1364 unmodified lines
1365	else	1365	else
1366	ret = -EINVAL;	1366	ret = -EINVAL;
1367		1367
1368	if (mask == IIO_CHAN_INFO_PROCESSED && adc->vrefint.vrefint_cal)	1368	if (mask == IIO_CHAN_INFO_PROCESSED)
1369	val = STM32_ADC_VREFINT_VOLTAGE adc->vrefint.vrefint_cal / *val;	1369	val = STM32_ADC_VREFINT_VOLTAGE adc->vrefint.vrefint_cal / *val;
1370		1370
1371	iio_device_release_direct_mode(indio_dev);	1371	iio_device_release_direct_mode(indio_dev);
@@ -1407,7 +1407,6 @@ static irqreturn_t stm32_adc_threaded_isr(int irq, void *data) · 35 unmodified lines
1407	struct stm32_adc *adc = iio_priv(indio_dev);	1407	struct stm32_adc *adc = iio_priv(indio_dev);
1408	const struct stm32_adc_regspec *regs = adc->cfg->regs;	1408	const struct stm32_adc_regspec *regs = adc->cfg->regs;
1409	u32 status = stm32_adc_readl(adc, regs->isr_eoc.reg);	1409	u32 status = stm32_adc_readl(adc, regs->isr_eoc.reg);
1410	u32 mask = stm32_adc_readl(adc, regs->ier_eoc.reg);
1411		1410
1412	/* Check ovr status right now, as ovr mask should be already disabled */	1411	/* Check ovr status right now, as ovr mask should be already disabled */
1413	if (status & regs->isr_ovr.mask) {	1412	if (status & regs->isr_ovr.mask) {
@@ -1422,11 +1421,6 @@ static irqreturn_t stm32_adc_threaded_isr(int irq, void *data) · 8 unmodified lines
1422	return IRQ_HANDLED;	1421	return IRQ_HANDLED;
1423	}	1422	}
1424		1423
1425	if (!(status & mask))
1426	dev_err_ratelimited(&indio_dev->dev,
1427	"Unexpected IRQ: IER=0x%08x, ISR=0x%08x\n",
1428	mask, status);
1429
1430	return IRQ_NONE;	1424	return IRQ_NONE;
1431	}	1425	}
1432		1426
@@ -1436,10 +1430,6 @@ static irqreturn_t stm32_adc_isr(int irq, void *data) · 3 unmodified lines
1436	struct stm32_adc *adc = iio_priv(indio_dev);	1430	struct stm32_adc *adc = iio_priv(indio_dev);
1437	const struct stm32_adc_regspec *regs = adc->cfg->regs;	1431	const struct stm32_adc_regspec *regs = adc->cfg->regs;
1438	u32 status = stm32_adc_readl(adc, regs->isr_eoc.reg);	1432	u32 status = stm32_adc_readl(adc, regs->isr_eoc.reg);
1439	u32 mask = stm32_adc_readl(adc, regs->ier_eoc.reg);
1440
1441	if (!(status & mask))
1442	return IRQ_WAKE_THREAD;
1443		1433
1444	if (status & regs->isr_ovr.mask) {	1434	if (status & regs->isr_ovr.mask) {
1445	/*	1435	/*
@@ -1979,10 +1969,10 @@ static int stm32_adc_populate_int_ch(struct iio_dev indio_dev, const char ch_n · 533 unmodified lines
1979		1969
1980	for (i = 0; i < STM32_ADC_INT_CH_NB; i++) {	1970	for (i = 0; i < STM32_ADC_INT_CH_NB; i++) {
1981	if (!strncmp(stm32_adc_ic[i].name, ch_name, STM32_ADC_CH_SZ)) {	1971	if (!strncmp(stm32_adc_ic[i].name, ch_name, STM32_ADC_CH_SZ)) {
1982	adc->int_ch[i] = chan;	1972	if (stm32_adc_ic[i].idx != STM32_ADC_INT_CH_VREFINT) {
1983		1973	adc->int_ch[i] = chan;
1984	if (stm32_adc_ic[i].idx != STM32_ADC_INT_CH_VREFINT)	1974	break;
1985	continue;	1975	}
1986		1976
1987	/* Get calibration data for vrefint channel */	1977	/* Get calibration data for vrefint channel */
1988	ret = nvmem_cell_read_u16(&indio_dev->dev, "vrefint", &vrefint);	1978	ret = nvmem_cell_read_u16(&indio_dev->dev, "vrefint", &vrefint);
@@ -1990,10 +1980,15 @@ static int stm32_adc_populate_int_ch(struct iio_dev indio_dev, const char ch_n · 1 unmodified line
1990	return dev_err_probe(indio_dev->dev.parent, ret,	1980	return dev_err_probe(indio_dev->dev.parent, ret,
1991	"nvmem access error\n");	1981	"nvmem access error\n");
1992	}	1982	}
1993	if (ret == -ENOENT)	1983	if (ret == -ENOENT) {
1994	dev_dbg(&indio_dev->dev, "vrefint calibration not found\n");	1984	dev_dbg(&indio_dev->dev, "vrefint calibration not found. Skip vrefint channel\n");
1995	else	1985	return ret;
1996	adc->vrefint.vrefint_cal = vrefint;	1986	} else if (!vrefint) {
		1987	dev_dbg(&indio_dev->dev, "Null vrefint calibration value. Skip vrefint channel\n");
		1988	return -ENOENT;
		1989	}
		1990	adc->int_ch[i] = chan;
		1991	adc->vrefint.vrefint_cal = vrefint;
1997	}	1992	}
1998	}	1993	}
1999		1994
@@ -2030,7 +2025,9 @@ static int stm32_adc_generic_chan_init(struct iio_dev *indio_dev, · 30 unmodified lines
2030	}	2025	}
2031	strncpy(adc->chan_name[val], name, STM32_ADC_CH_SZ);	2026	strncpy(adc->chan_name[val], name, STM32_ADC_CH_SZ);
2032	ret = stm32_adc_populate_int_ch(indio_dev, name, val);	2027	ret = stm32_adc_populate_int_ch(indio_dev, name, val);
2033	if (ret)	2028	if (ret == -ENOENT)
		2029	continue;
		2030	else if (ret)
2034	goto err;	2031	goto err;
2035	} else if (ret != -EINVAL) {	2032	} else if (ret != -EINVAL) {
2036	dev_err(&indio_dev->dev, "Invalid label %d\n", ret);	2033	dev_err(&indio_dev->dev, "Invalid label %d\n", ret);

drivers/iio/adc/ti-ads131e08.c+7−3

 	device_for_each_child_node(dev, node) {
 		ret = fwnode_property_read_u32(node, "reg", &channel);
 		if (ret)
-			return ret;
+			goto err_child_out;
 		ret = fwnode_property_read_u32(node, "ti,gain", &tmp);
 		if (ret) {
 		} else {
 			ret = ads131e08_pga_gain_to_field_value(st, tmp);
 			if (ret < 0)
-				return ret;
+				goto err_child_out;
 			channel_config[i].pga_gain = tmp;
 		}
 		} else {
 			ret = ads131e08_validate_channel_mux(st, tmp);
 			if (ret)
-				return ret;
+				goto err_child_out;
 			channel_config[i].mux = tmp;
 		}
 	st->channel_config = channel_config;
 	return 0;
+err_child_out:
+	fwnode_handle_put(node);
+	return ret;
 }
 static void ads131e08_regulator_disable(void *data)

drivers/iio/adc/xilinx-ams.c+1−1

@@ -1409,7 +1409,7 @@ static int ams_probe(struct platform_device *pdev) · 1408 unmodified lines
1409		1409
1410	irq = platform_get_irq(pdev, 0);	1410	irq = platform_get_irq(pdev, 0);
1411	if (irq < 0)	1411	if (irq < 0)
1412	return ret;	1412	return irq;
1413		1413
1414	ret = devm_request_irq(&pdev->dev, irq, &ams_irq, 0, "ams-irq",	1414	ret = devm_request_irq(&pdev->dev, irq, &ams_irq, 0, "ams-irq",
1415	indio_dev);	1415	indio_dev);

drivers/iio/afe/iio-rescale.c+1−1

@@ -277,7 +277,7 @@ static int rescale_configure_channel(struct device *dev, · 276 unmodified lines
277	chan->ext_info = rescale->ext_info;	277	chan->ext_info = rescale->ext_info;
278	chan->type = rescale->cfg->type;	278	chan->type = rescale->cfg->type;
279		279
280	if (iio_channel_has_info(schan, IIO_CHAN_INFO_RAW) \|\|	280	if (iio_channel_has_info(schan, IIO_CHAN_INFO_RAW) &&
281	iio_channel_has_info(schan, IIO_CHAN_INFO_SCALE)) {	281	iio_channel_has_info(schan, IIO_CHAN_INFO_SCALE)) {
282	dev_info(dev, "using raw+scale source channel\n");	282	dev_info(dev, "using raw+scale source channel\n");
283	} else if (iio_channel_has_info(schan, IIO_CHAN_INFO_PROCESSED)) {	283	} else if (iio_channel_has_info(schan, IIO_CHAN_INFO_PROCESSED)) {

drivers/iio/chemical/ccs811.c+2−2

 		data->drdy_trig->ops = &ccs811_trigger_ops;
 		iio_trigger_set_drvdata(data->drdy_trig, indio_dev);
-		indio_dev->trig = data->drdy_trig;
-		iio_trigger_get(indio_dev->trig);
 		ret = iio_trigger_register(data->drdy_trig);
 		if (ret)
 			goto err_poweroff;
+		indio_dev->trig = iio_trigger_get(data->drdy_trig);
 	}
 	ret = iio_triggered_buffer_setup(indio_dev, NULL,

drivers/iio/frequency/admv1014.c+4−2

 			 ADMV1014_DET_EN_MSK;
 	enable_reg = FIELD_PREP(ADMV1014_P1DB_COMPENSATION_MSK, st->p1db_comp ? 3 : 0) |
-		     FIELD_PREP(ADMV1014_IF_AMP_PD_MSK, !(st->input_mode)) |
+		     FIELD_PREP(ADMV1014_IF_AMP_PD_MSK,
-		     FIELD_PREP(ADMV1014_BB_AMP_PD_MSK, st->input_mode) |
+				(st->input_mode == ADMV1014_IF_MODE) ? 0 : 1) |
+		     FIELD_PREP(ADMV1014_BB_AMP_PD_MSK,
+				(st->input_mode == ADMV1014_IF_MODE) ? 1 : 0) |
 		     FIELD_PREP(ADMV1014_DET_EN_MSK, st->det_en);
 	return __admv1014_spi_update_bits(st, ADMV1014_REG_ENABLE, enable_reg_msk, enable_reg);

drivers/iio/gyro/mpu3050-core.c+1−0

@@ -875,6 +875,7 @@ static int mpu3050_power_up(struct mpu3050 *mpu3050) · 874 unmodified lines
875	ret = regmap_update_bits(mpu3050->map, MPU3050_PWR_MGM,	875	ret = regmap_update_bits(mpu3050->map, MPU3050_PWR_MGM,
876	MPU3050_PWR_MGM_SLEEP, 0);	876	MPU3050_PWR_MGM_SLEEP, 0);
877	if (ret) {	877	if (ret) {
		878	regulator_bulk_disable(ARRAY_SIZE(mpu3050->regs), mpu3050->regs);
878	dev_err(mpu3050->dev, "error setting power mode\n");	879	dev_err(mpu3050->dev, "error setting power mode\n");
879	return ret;	880	return ret;
880	}	881	}

drivers/iio/humidity/hts221_buffer.c+4−1

@@ -135,9 +135,12 @@ int hts221_allocate_trigger(struct iio_dev *iio_dev) · 134 unmodified lines
135		135
136	iio_trigger_set_drvdata(hw->trig, iio_dev);	136	iio_trigger_set_drvdata(hw->trig, iio_dev);
137	hw->trig->ops = &hts221_trigger_ops;	137	hw->trig->ops = &hts221_trigger_ops;
		138
		139	err = devm_iio_trigger_register(hw->dev, hw->trig);
		140
138	iio_dev->trig = iio_trigger_get(hw->trig);	141	iio_dev->trig = iio_trigger_get(hw->trig);
139		142
140	return devm_iio_trigger_register(hw->dev, hw->trig);	143	return err;
141	}	144	}
142		145
143	static int hts221_buffer_preenable(struct iio_dev *iio_dev)	146	static int hts221_buffer_preenable(struct iio_dev *iio_dev)

drivers/iio/imu/inv_icm42600/inv_icm42600.h+1−0

@@ -17,6 +17,7 @@ · 16 unmodified lines
17	#include "inv_icm42600_buffer.h"	17	#include "inv_icm42600_buffer.h"
18		18
19	enum inv_icm42600_chip {	19	enum inv_icm42600_chip {
		20	INV_CHIP_INVALID,
20	INV_CHIP_ICM42600,	21	INV_CHIP_ICM42600,
21	INV_CHIP_ICM42602,	22	INV_CHIP_ICM42602,
22	INV_CHIP_ICM42605,	23	INV_CHIP_ICM42605,

drivers/iio/imu/inv_icm42600/inv_icm42600_core.c+1−1

@@ -565,7 +565,7 @@ int inv_icm42600_core_probe(struct regmap *regmap, int chip, int irq, · 564 unmodified lines
565	bool open_drain;	565	bool open_drain;
566	int ret;	566	int ret;
567		567
568	if (chip < 0 \|\| chip >= INV_CHIP_NB) {	568	if (chip <= INV_CHIP_INVALID \|\| chip >= INV_CHIP_NB) {
569	dev_err(dev, "invalid chip = %d\n", chip);	569	dev_err(dev, "invalid chip = %d\n", chip);
570	return -ENODEV;	570	return -ENODEV;
571	}	571	}

drivers/iio/magnetometer/yamaha-yas530.c+1−1

@@ -639,7 +639,7 @@ static int yas532_get_calibration_data(struct yas5xx *yas5xx) · 638 unmodified lines
639	dev_dbg(yas5xx->dev, "calibration data: %*ph\n", 14, data);	639	dev_dbg(yas5xx->dev, "calibration data: %*ph\n", 14, data);
640		640
641	/* Sanity check, is this all zeroes? */	641	/* Sanity check, is this all zeroes? */
642	if (memchr_inv(data, 0x00, 13)) {	642	if (memchr_inv(data, 0x00, 13) == NULL) {
643	if (!(data[13] & BIT(7)))	643	if (!(data[13] & BIT(7)))
644	dev_warn(yas5xx->dev, "calibration is blank!\n");	644	dev_warn(yas5xx->dev, "calibration is blank!\n");
645	}	645	}

drivers/iio/proximity/sx9324.c+3−0

 			break;
 		ret = device_property_read_u32_array(dev, prop, pin_defs,
 						     ARRAY_SIZE(pin_defs));
+		if (ret)
+			break;
 		for (pin = 0; pin < SX9324_NUM_PINS; pin++)
 			raw |= (pin_defs[pin] << (2 * pin)) &
 			       SX9324_REG_AFE_PH0_PIN_MASK(pin);

drivers/iio/test/Kconfig+1−1

@@ -6,7 +6,7 @@ · 5 unmodified lines
6	# Keep in alphabetical order	6	# Keep in alphabetical order
7	config IIO_RESCALE_KUNIT_TEST	7	config IIO_RESCALE_KUNIT_TEST
8	bool "Test IIO rescale conversion functions"	8	bool "Test IIO rescale conversion functions"
9	depends on KUNIT=y && !IIO_RESCALE	9	depends on KUNIT=y && IIO_RESCALE=y
10	default KUNIT_ALL_TESTS	10	default KUNIT_ALL_TESTS
11	help	11	help
12	If you want to run tests on the iio-rescale code say Y here.	12	If you want to run tests on the iio-rescale code say Y here.

drivers/iio/test/Makefile+1−1

@@ -4,6 +4,6 @@ · 3 unmodified lines
4	#	4	#
5		5
6	# Keep in alphabetical order	6	# Keep in alphabetical order
7	obj-$(CONFIG_IIO_RESCALE_KUNIT_TEST) += iio-test-rescale.o ../afe/iio-rescale.o	7	obj-$(CONFIG_IIO_RESCALE_KUNIT_TEST) += iio-test-rescale.o
8	obj-$(CONFIG_IIO_TEST_FORMAT) += iio-test-format.o	8	obj-$(CONFIG_IIO_TEST_FORMAT) += iio-test-format.o
9	CFLAGS_iio-test-format.o += $(DISABLE_STRUCTLEAK_PLUGIN)	9	CFLAGS_iio-test-format.o += $(DISABLE_STRUCTLEAK_PLUGIN)

drivers/iio/trigger/iio-trig-sysfs.c+1−0

@@ -190,6 +190,7 @@ static int iio_sysfs_trigger_remove(int id) · 189 unmodified lines
190	}	190	}
191		191
192	iio_trigger_unregister(t->trig);	192	iio_trigger_unregister(t->trig);
		193	irq_work_sync(&t->work);
193	iio_trigger_free(t->trig);	194	iio_trigger_free(t->trig);
194		195
195	list_del(&t->l);	196	list_del(&t->l);

drivers/iommu/ipmmu-vmsa.c+1−1

@@ -987,7 +987,7 @@ static const struct of_device_id ipmmu_of_ids[] = { · 986 unmodified lines
987	.compatible = "renesas,ipmmu-r8a779a0",	987	.compatible = "renesas,ipmmu-r8a779a0",
988	.data = &ipmmu_features_rcar_gen4,	988	.data = &ipmmu_features_rcar_gen4,
989	}, {	989	}, {
990	.compatible = "renesas,rcar-gen4-ipmmu",	990	.compatible = "renesas,rcar-gen4-ipmmu-vmsa",
991	.data = &ipmmu_features_rcar_gen4,	991	.data = &ipmmu_features_rcar_gen4,
992	}, {	992	}, {
993	/* Terminator */	993	/* Terminator */

drivers/irqchip/Kconfig+1−1

@@ -298,7 +298,7 @@ config XTENSA_MX · 297 unmodified lines
298		298
299	config XILINX_INTC	299	config XILINX_INTC
300	bool "Xilinx Interrupt Controller IP"	300	bool "Xilinx Interrupt Controller IP"
301	depends on MICROBLAZE \|\| ARCH_ZYNQ \|\| ARCH_ZYNQMP	301	depends on OF
302	select IRQ_DOMAIN	302	select IRQ_DOMAIN
303	help	303	help
304	Support for the Xilinx Interrupt Controller IP core.	304	Support for the Xilinx Interrupt Controller IP core.

drivers/irqchip/irq-apple-aic.c+2−0

 			continue;
 		cpu = of_cpu_node_to_id(cpu_node);
+		of_node_put(cpu_node);
 		if (WARN_ON(cpu < 0))
 			continue;
 		for_each_child_of_node(affs, chld)
 			build_fiq_affinity(irqc, chld);
 	}
+	of_node_put(affs);
 	set_handle_irq(aic_handle_irq);
 	set_handle_fiq(aic_handle_fiq);

drivers/irqchip/irq-gic-realview.c+1−0

@@ -57,6 +57,7 @@ realview_gic_of_init(struct device_node node, struct device_node parent) · 56 unmodified lines
57		57
58	/* The PB11MPCore GIC needs to be configured in the syscon */	58	/* The PB11MPCore GIC needs to be configured in the syscon */
59	map = syscon_node_to_regmap(np);	59	map = syscon_node_to_regmap(np);
		60	of_node_put(np);
60	if (!IS_ERR(map)) {	61	if (!IS_ERR(map)) {
61	/* new irq mode with no DCC */	62	/* new irq mode with no DCC */
62	regmap_write(map, REALVIEW_SYS_LOCK_OFFSET,	63	regmap_write(map, REALVIEW_SYS_LOCK_OFFSET,

drivers/irqchip/irq-gic-v3.c+5−2

 	gic_data.ppi_descs = kcalloc(gic_data.ppi_nr, sizeof(*gic_data.ppi_descs), GFP_KERNEL);
 	if (!gic_data.ppi_descs)
-		return;
+		goto out_put_node;
 	nr_parts = of_get_child_count(parts_node);
 				continue;
 			cpu = of_cpu_node_to_id(cpu_node);
-			if (WARN_ON(cpu < 0))
+			if (WARN_ON(cpu < 0)) {
+				of_node_put(cpu_node);
 				continue;
+			}
 			pr_cont("%pOF[%d] ", cpu_node, cpu);
 			cpumask_set_cpu(cpu, &part->mask);
+			of_node_put(cpu_node);
 		}
 		pr_cont("}\n");

drivers/irqchip/irq-loongson-liointc.c+7−1

 #define LIOINTC_ERRATA_IRQ	10
+#if defined(CONFIG_MIPS)
+#define liointc_core_id get_ebase_cpunum()
+#else
+#define liointc_core_id get_csr_cpuid()
+#endif
 struct liointc_handler_data {
 	struct liointc_priv	*priv;
 	u32			parent_int_map;
 	struct liointc_handler_data *handler = irq_desc_get_handler_data(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	struct irq_chip_generic *gc = handler->priv->gc;
-	int core = cpu_logical_map(smp_processor_id()) % LIOINTC_NUM_CORES;
+	int core = liointc_core_id % LIOINTC_NUM_CORES;
 	u32 pending;
 	chained_irq_enter(chip, desc);

drivers/irqchip/irq-realtek-rtl.c+1−1

 		if (!cpu_ictl)
 			return -EINVAL;
 		ret = of_property_read_u32(cpu_ictl, "#interrupt-cells", &tmp);
+		of_node_put(cpu_ictl);
 		if (ret || tmp != 1)
 			return -EINVAL;
-		of_node_put(cpu_ictl);
 		cpu_int = be32_to_cpup(imap + 2);
 		if (cpu_int > 7 || cpu_int < 2)

drivers/irqchip/irq-uniphier-aidet.c+1−0

@@ -237,6 +237,7 @@ static const struct of_device_id uniphier_aidet_match[] = { · 236 unmodified lines
237	{ .compatible = "socionext,uniphier-ld11-aidet" },	237	{ .compatible = "socionext,uniphier-ld11-aidet" },
238	{ .compatible = "socionext,uniphier-ld20-aidet" },	238	{ .compatible = "socionext,uniphier-ld20-aidet" },
239	{ .compatible = "socionext,uniphier-pxs3-aidet" },	239	{ .compatible = "socionext,uniphier-pxs3-aidet" },
		240	{ .compatible = "socionext,uniphier-nx1-aidet" },
240	{ /* sentinel */ }	241	{ /* sentinel */ }
241	};	242	};
242		243

drivers/md/dm-core.h+1−0

@@ -272,6 +272,7 @@ struct dm_io { · 271 unmodified lines
272	atomic_t io_count;	272	atomic_t io_count;
273	struct mapped_device *md;	273	struct mapped_device *md;
274		274
		275	struct bio *split_bio;
275	/* The three fields represent mapped part of original bio */	276	/* The three fields represent mapped part of original bio */
276	struct bio *orig_bio;	277	struct bio *orig_bio;
277	unsigned int sector_offset; /* offset to end of orig_bio */	278	unsigned int sector_offset; /* offset to end of orig_bio */

drivers/md/dm-era-target.c+7−1

 static void stop_worker(struct era *era)
 {
 	atomic_set(&era->suspended, 1);
-	flush_workqueue(era->wq);
+	drain_workqueue(era->wq);
 }
 /*----------------------------------------------------------------
 	}
 	stop_worker(era);
+	r = metadata_commit(era->md);
+	if (r) {
+		DMERR("%s: metadata_commit failed", __func__);
+		/* FIXME: fail mode */
+	}
 }
 static int era_preresume(struct dm_target *ti)

drivers/md/dm-log.c+2−3

 	/*
 	 * Work out how many "unsigned long"s we need to hold the bitset.
 	 */
-	bitset_size = dm_round_up(region_count,
+	bitset_size = dm_round_up(region_count, BITS_PER_LONG);
-				  sizeof(*lc->clean_bits) << BYTE_SHIFT);
 	bitset_size >>= BYTE_SHIFT;
 	lc->bitset_uint32_count = bitset_size / sizeof(*lc->clean_bits);
 			log_clear_bit(lc, lc->clean_bits, i);
 	/* clear any old bits -- device has shrunk */
-	for (i = lc->region_count; i % (sizeof(*lc->clean_bits) << BYTE_SHIFT); i++)
+	for (i = lc->region_count; i % BITS_PER_LONG; i++)
 		log_clear_bit(lc, lc->clean_bits, i);
 	/* copy clean across to sync */

drivers/md/dm-raid.c+1−1

@@ -3725,7 +3725,7 @@ static int raid_message(struct dm_target ti, unsigned int argc, char *argv, · 3724 unmodified lines
3725	if (!strcasecmp(argv[0], "idle") \|\| !strcasecmp(argv[0], "frozen")) {	3725	if (!strcasecmp(argv[0], "idle") \|\| !strcasecmp(argv[0], "frozen")) {
3726	if (mddev->sync_thread) {	3726	if (mddev->sync_thread) {
3727	set_bit(MD_RECOVERY_INTR, &mddev->recovery);	3727	set_bit(MD_RECOVERY_INTR, &mddev->recovery);
3728	md_reap_sync_thread(mddev, false);	3728	md_reap_sync_thread(mddev);
3729	}	3729	}
3730	} else if (decipher_sync_action(mddev, mddev->recovery) != st_idle)	3730	} else if (decipher_sync_action(mddev, mddev->recovery) != st_idle)
3731	return -EBUSY;	3731	return -EBUSY;

drivers/md/dm.c+27−12

@@ -555,6 +555,10 @@ static void dm_start_io_acct(struct dm_io io, struct bio clone) · 554 unmodified lines
555	unsigned long flags;	555	unsigned long flags;
556	/* Can afford locking given DM_TIO_IS_DUPLICATE_BIO */	556	/* Can afford locking given DM_TIO_IS_DUPLICATE_BIO */
557	spin_lock_irqsave(&io->lock, flags);	557	spin_lock_irqsave(&io->lock, flags);
		558	if (dm_io_flagged(io, DM_IO_ACCOUNTED)) {
		559	spin_unlock_irqrestore(&io->lock, flags);
		560	return;
		561	}
558	dm_io_set_flag(io, DM_IO_ACCOUNTED);	562	dm_io_set_flag(io, DM_IO_ACCOUNTED);
559	spin_unlock_irqrestore(&io->lock, flags);	563	spin_unlock_irqrestore(&io->lock, flags);
560	}	564	}
@@ -590,6 +594,7 @@ static struct dm_io alloc_io(struct mapped_device md, struct bio *bio) · 29 unmodified lines
590	atomic_set(&io->io_count, 2);	594	atomic_set(&io->io_count, 2);
591	this_cpu_inc(*md->pending_io);	595	this_cpu_inc(*md->pending_io);
592	io->orig_bio = bio;	596	io->orig_bio = bio;
		597	io->split_bio = NULL;
593	io->md = md;	598	io->md = md;
594	spin_lock_init(&io->lock);	599	spin_lock_init(&io->lock);
595	io->start_time = jiffies;	600	io->start_time = jiffies;
@@ -711,18 +716,18 @@ static void dm_put_live_table_fast(struct mapped_device *md) __releases(RCU) · 115 unmodified lines
711	}	716	}
712		717
713	static inline struct dm_table dm_get_live_table_bio(struct mapped_device md,	718	static inline struct dm_table dm_get_live_table_bio(struct mapped_device md,
714	int srcu_idx, struct bio bio)	719	int *srcu_idx, unsigned bio_opf)
715	{	720	{
716	if (bio->bi_opf & REQ_NOWAIT)	721	if (bio_opf & REQ_NOWAIT)
717	return dm_get_live_table_fast(md);	722	return dm_get_live_table_fast(md);
718	else	723	else
719	return dm_get_live_table(md, srcu_idx);	724	return dm_get_live_table(md, srcu_idx);
720	}	725	}
721		726
722	static inline void dm_put_live_table_bio(struct mapped_device *md, int srcu_idx,	727	static inline void dm_put_live_table_bio(struct mapped_device *md, int srcu_idx,
723	struct bio *bio)	728	unsigned bio_opf)
724	{	729	{
725	if (bio->bi_opf & REQ_NOWAIT)	730	if (bio_opf & REQ_NOWAIT)
726	dm_put_live_table_fast(md);	731	dm_put_live_table_fast(md);
727	else	732	else
728	dm_put_live_table(md, srcu_idx);	733	dm_put_live_table(md, srcu_idx);
@@ -883,7 +888,7 @@ static void dm_io_complete(struct dm_io *io) · 154 unmodified lines
883	{	888	{
884	blk_status_t io_error;	889	blk_status_t io_error;
885	struct mapped_device *md = io->md;	890	struct mapped_device *md = io->md;
886	struct bio *bio = io->orig_bio;	891	struct bio *bio = io->split_bio ? io->split_bio : io->orig_bio;
887		892
888	if (io->status == BLK_STS_DM_REQUEUE) {	893	if (io->status == BLK_STS_DM_REQUEUE) {
889	unsigned long flags;	894	unsigned long flags;
@@ -935,9 +940,11 @@ static void dm_io_complete(struct dm_io *io) · 45 unmodified lines
935	if (io_error == BLK_STS_AGAIN) {	940	if (io_error == BLK_STS_AGAIN) {
936	/* io_uring doesn't handle BLK_STS_AGAIN (yet) */	941	/* io_uring doesn't handle BLK_STS_AGAIN (yet) */
937	queue_io(md, bio);	942	queue_io(md, bio);
		943	return;
938	}	944	}
939	}	945	}
940	return;	946	if (io_error == BLK_STS_DM_REQUEUE)
		947	return;
941	}	948	}
942		949
943	if (bio_is_flush_with_data(bio)) {	950	if (bio_is_flush_with_data(bio)) {
@@ -1609,7 +1616,12 @@ static blk_status_t __split_and_process_bio(struct clone_info *ci) · 665 unmodified lines
1609	ti = dm_table_find_target(ci->map, ci->sector);	1616	ti = dm_table_find_target(ci->map, ci->sector);
1610	if (unlikely(!ti))	1617	if (unlikely(!ti))
1611	return BLK_STS_IOERR;	1618	return BLK_STS_IOERR;
1612	else if (unlikely(ci->is_abnormal_io))	1619
		1620	if (unlikely((ci->bio->bi_opf & REQ_NOWAIT) != 0) &&
		1621	unlikely(!dm_target_supports_nowait(ti->type)))
		1622	return BLK_STS_NOTSUPP;
		1623
		1624	if (unlikely(ci->is_abnormal_io))
1613	return __process_abnormal_io(ci, ti);	1625	return __process_abnormal_io(ci, ti);
1614		1626
1615	/*	1627	/*
@@ -1682,9 +1694,11 @@ static void dm_split_and_process_bio(struct mapped_device *md, · 66 unmodified lines
1682	* Remainder must be passed to submit_bio_noacct() so it gets handled	1694	* Remainder must be passed to submit_bio_noacct() so it gets handled
1683	* after bios already submitted have been completely processed.	1695	* after bios already submitted have been completely processed.
1684	*/	1696	*/
1685	bio_trim(bio, io->sectors, ci.sector_count);	1697	WARN_ON_ONCE(!dm_io_flagged(io, DM_IO_WAS_SPLIT));
1686	trace_block_split(bio, bio->bi_iter.bi_sector);	1698	io->split_bio = bio_split(bio, io->sectors, GFP_NOIO,
1687	bio_inc_remaining(bio);	1699	&md->queue->bio_split);
		1700	bio_chain(io->split_bio, bio);
		1701	trace_block_split(io->split_bio, bio->bi_iter.bi_sector);
1688	submit_bio_noacct(bio);	1702	submit_bio_noacct(bio);
1689	out:	1703	out:
1690	/*	1704	/*
@@ -1711,8 +1725,9 @@ static void dm_submit_bio(struct bio *bio) · 20 unmodified lines
1711	struct mapped_device *md = bio->bi_bdev->bd_disk->private_data;	1725	struct mapped_device *md = bio->bi_bdev->bd_disk->private_data;
1712	int srcu_idx;	1726	int srcu_idx;
1713	struct dm_table *map;	1727	struct dm_table *map;
		1728	unsigned bio_opf = bio->bi_opf;
1714		1729
1715	map = dm_get_live_table_bio(md, &srcu_idx, bio);	1730	map = dm_get_live_table_bio(md, &srcu_idx, bio_opf);
1716		1731
1717	/* If suspended, or map not yet available, queue this IO for later */	1732	/* If suspended, or map not yet available, queue this IO for later */
1718	if (unlikely(test_bit(DMF_BLOCK_IO_FOR_SUSPEND, &md->flags)) \|\|	1733	if (unlikely(test_bit(DMF_BLOCK_IO_FOR_SUSPEND, &md->flags)) \|\|
@@ -1728,7 +1743,7 @@ static void dm_submit_bio(struct bio *bio) · 9 unmodified lines
1728		1743
1729	dm_split_and_process_bio(md, map, bio);	1744	dm_split_and_process_bio(md, map, bio);
1730	out:	1745	out:
1731	dm_put_live_table_bio(md, srcu_idx, bio);	1746	dm_put_live_table_bio(md, srcu_idx, bio_opf);
1732	}	1747	}
1733		1748
1734	static bool dm_poll_dm_io(struct dm_io io, struct io_comp_batch iob,	1749	static bool dm_poll_dm_io(struct dm_io io, struct io_comp_batch iob,

drivers/md/md.c+5−9

 				flush_workqueue(md_misc_wq);
 			if (mddev->sync_thread) {
 				set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-				md_reap_sync_thread(mddev, true);
+				md_reap_sync_thread(mddev);
 			}
 			mddev_unlock(mddev);
 		}
 		flush_workqueue(md_misc_wq);
 	if (mddev->sync_thread) {
 		set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-		md_reap_sync_thread(mddev, true);
+		md_reap_sync_thread(mddev);
 	}
 	del_timer_sync(&mddev->safemode_timer);
 			 * ->spare_active and clear saved_raid_disk
 			 */
 			set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-			md_reap_sync_thread(mddev, true);
+			md_reap_sync_thread(mddev);
 			clear_bit(MD_RECOVERY_RECOVER, &mddev->recovery);
 			clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
 			clear_bit(MD_SB_CHANGE_PENDING, &mddev->sb_flags);
 			goto unlock;
 		}
 		if (mddev->sync_thread) {
-			md_reap_sync_thread(mddev, true);
+			md_reap_sync_thread(mddev);
 			goto unlock;
 		}
 		/* Set RUNNING before clearing NEEDED to avoid
 }
 EXPORT_SYMBOL(md_check_recovery);
-void md_reap_sync_thread(struct mddev *mddev, bool reconfig_mutex_held)
+void md_reap_sync_thread(struct mddev *mddev)
 {
 	struct md_rdev *rdev;
 	sector_t old_dev_sectors = mddev->dev_sectors;
 	bool is_reshaped = false;
-	if (reconfig_mutex_held)
-		mddev_unlock(mddev);
 	/* resync has finished, collect result */
 	md_unregister_thread(&mddev->sync_thread);
-	if (reconfig_mutex_held)
-		mddev_lock_nointr(mddev);
 	if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery) &&
 	    !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery) &&
 	    mddev->degraded != mddev->raid_disks) {

drivers/md/md.h+1−1

@@ -719,7 +719,7 @@ extern struct md_thread *md_register_thread( · 718 unmodified lines
719	extern void md_unregister_thread(struct md_thread **threadp);	719	extern void md_unregister_thread(struct md_thread **threadp);
720	extern void md_wakeup_thread(struct md_thread *thread);	720	extern void md_wakeup_thread(struct md_thread *thread);
721	extern void md_check_recovery(struct mddev *mddev);	721	extern void md_check_recovery(struct mddev *mddev);
722	extern void md_reap_sync_thread(struct mddev *mddev, bool reconfig_mutex_held);	722	extern void md_reap_sync_thread(struct mddev *mddev);
723	extern int mddev_init_writes_pending(struct mddev *mddev);	723	extern int mddev_init_writes_pending(struct mddev *mddev);
724	extern bool md_write_start(struct mddev mddev, struct bio bi);	724	extern bool md_write_start(struct mddev mddev, struct bio bi);
725	extern void md_write_inc(struct mddev mddev, struct bio bi);	725	extern void md_write_inc(struct mddev mddev, struct bio bi);

drivers/md/raid5-ppl.c+2−2

@@ -629,9 +629,9 @@ static void ppl_do_flush(struct ppl_io_unit *io) · 628 unmodified lines
629	if (bdev) {	629	if (bdev) {
630	struct bio *bio;	630	struct bio *bio;
631		631
632	bio = bio_alloc_bioset(bdev, 0, GFP_NOIO,	632	bio = bio_alloc_bioset(bdev, 0,
633	REQ_OP_WRITE \| REQ_PREFLUSH,	633	REQ_OP_WRITE \| REQ_PREFLUSH,
634	&ppl_conf->flush_bs);	634	GFP_NOIO, &ppl_conf->flush_bs);
635	bio->bi_private = io;	635	bio->bi_private = io;
636	bio->bi_end_io = ppl_flush_endio;	636	bio->bi_end_io = ppl_flush_endio;
637		637

drivers/memory/Kconfig+1−0

@@ -105,6 +105,7 @@ config TI_EMIF · 104 unmodified lines
105	config OMAP_GPMC	105	config OMAP_GPMC
106	tristate "Texas Instruments OMAP SoC GPMC driver"	106	tristate "Texas Instruments OMAP SoC GPMC driver"
107	depends on OF_ADDRESS	107	depends on OF_ADDRESS
		108	depends on ARCH_OMAP2PLUS \|\| ARCH_KEYSTONE \|\| ARCH_K3 \|\| COMPILE_TEST
108	select GPIOLIB	109	select GPIOLIB
109	help	110	help
110	This driver is for the General Purpose Memory Controller (GPMC)	111	This driver is for the General Purpose Memory Controller (GPMC)

drivers/memory/mtk-smi.c+4−1

 	of_node_put(smi_com_node);
 	if (smi_com_pdev) {
 		/* smi common is the supplier, Make sure it is ready before */
-		if (!platform_get_drvdata(smi_com_pdev))
+		if (!platform_get_drvdata(smi_com_pdev)) {
+			put_device(&smi_com_pdev->dev);
 			return -EPROBE_DEFER;
+		}
 		smi_com_dev = &smi_com_pdev->dev;
 		link = device_link_add(dev, smi_com_dev,
 				       DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS);
 		if (!link) {
 			dev_err(dev, "Unable to link smi-common dev\n");
+			put_device(&smi_com_pdev->dev);
 			return -ENODEV;
 		}
 		*com_dev = smi_com_dev;

drivers/memory/samsung/exynos5422-dmc.c+18−11

 	dmc->timing_row = devm_kmalloc_array(dmc->dev, TIMING_COUNT,
 					     sizeof(u32), GFP_KERNEL);
-	if (!dmc->timing_row)
+	if (!dmc->timing_row) {
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto put_node;
+	}
 	dmc->timing_data = devm_kmalloc_array(dmc->dev, TIMING_COUNT,
 					      sizeof(u32), GFP_KERNEL);
-	if (!dmc->timing_data)
+	if (!dmc->timing_data) {
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto put_node;
+	}
 	dmc->timing_power = devm_kmalloc_array(dmc->dev, TIMING_COUNT,
 					       sizeof(u32), GFP_KERNEL);
-	if (!dmc->timing_power)
+	if (!dmc->timing_power) {
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto put_node;
+	}
 	dmc->timings = of_lpddr3_get_ddr_timings(np_ddr, dmc->dev,
 						 DDR_TYPE_LPDDR3,
 						 &dmc->timings_arr_size);
 	if (!dmc->timings) {
-		of_node_put(np_ddr);
 		dev_warn(dmc->dev, "could not get timings from DT\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto put_node;
 	}
 	dmc->min_tck = of_lpddr3_get_min_tck(np_ddr, dmc->dev);
 	if (!dmc->min_tck) {
-		of_node_put(np_ddr);
 		dev_warn(dmc->dev, "could not get tck from DT\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto put_node;
 	}
 	/* Sorted array of OPPs with frequency ascending */
 					     clk_period_ps);
 	}
-	of_node_put(np_ddr);
 	/* Take the highest frequency's timings as 'bypass' */
 	dmc->bypass_timing_row = dmc->timing_row[idx - 1];
 	dmc->bypass_timing_data = dmc->timing_data[idx - 1];
 	dmc->bypass_timing_power = dmc->timing_power[idx - 1];
+put_node:
+	of_node_put(np_ddr);
 	return ret;
 }

drivers/misc/atmel-ssc.c+2−2

@@ -232,9 +232,9 @@ static int ssc_probe(struct platform_device *pdev) · 231 unmodified lines
232	clk_disable_unprepare(ssc->clk);	232	clk_disable_unprepare(ssc->clk);
233		233
234	ssc->irq = platform_get_irq(pdev, 0);	234	ssc->irq = platform_get_irq(pdev, 0);
235	if (!ssc->irq) {	235	if (ssc->irq < 0) {
236	dev_dbg(&pdev->dev, "could not get irq\n");	236	dev_dbg(&pdev->dev, "could not get irq\n");
237	return -ENXIO;	237	return ssc->irq;
238	}	238	}
239		239
240	mutex_lock(&user_lock);	240	mutex_lock(&user_lock);

drivers/misc/cardreader/rts5261.c+2−0

@@ -407,6 +407,8 @@ static void rts5261_init_from_hw(struct rtsx_pcr *pcr) · 406 unmodified lines
407	// default	407	// default
408	setting_reg1 = PCR_SETTING_REG1;	408	setting_reg1 = PCR_SETTING_REG1;
409	setting_reg2 = PCR_SETTING_REG2;	409	setting_reg2 = PCR_SETTING_REG2;
		410	} else {
		411	return;
410	}	412	}
411		413
412	pci_read_config_dword(pdev, setting_reg2, &lval2);	414	pci_read_config_dword(pdev, setting_reg2, &lval2);

drivers/misc/eeprom/at25.c+53−40

@@ -79,6 +79,11 @@ static int at25_ee_read(void *priv, unsigned int offset, · 78 unmodified lines
79	{	79	{
80	struct at25_data *at25 = priv;	80	struct at25_data *at25 = priv;
81	char *buf = val;	81	char *buf = val;
		82	size_t max_chunk = spi_max_transfer_size(at25->spi);
		83	size_t num_msgs = DIV_ROUND_UP(count, max_chunk);
		84	size_t nr_bytes = 0;
		85	unsigned int msg_offset;
		86	size_t msg_count;
82	u8 *cp;	87	u8 *cp;
83	ssize_t status;	88	ssize_t status;
84	struct spi_transfer t[2];	89	struct spi_transfer t[2];
@@ -92,54 +97,59 @@ static int at25_ee_read(void *priv, unsigned int offset, · 7 unmodified lines
92	if (unlikely(!count))	97	if (unlikely(!count))
93	return -EINVAL;	98	return -EINVAL;
94		99
95	cp = at25->command;	100	msg_offset = (unsigned int)offset;
		101	msg_count = min(count, max_chunk);
		102	while (num_msgs) {
		103	cp = at25->command;
96		104
97	instr = AT25_READ;	105	instr = AT25_READ;
98	if (at25->chip.flags & EE_INSTR_BIT3_IS_ADDR)	106	if (at25->chip.flags & EE_INSTR_BIT3_IS_ADDR)
99	if (offset >= BIT(at25->addrlen * 8))	107	if (msg_offset >= BIT(at25->addrlen * 8))
100	instr \|= AT25_INSTR_BIT3;	108	instr \|= AT25_INSTR_BIT3;
101		109
102	mutex_lock(&at25->lock);	110	mutex_lock(&at25->lock);
103		111
104	*cp++ = instr;	112	*cp++ = instr;
105
106	/* 8/16/24-bit address is written MSB first */
107	switch (at25->addrlen) {
108	default: /* case 3 */
109	*cp++ = offset >> 16;
110	fallthrough;
111	case 2:
112	*cp++ = offset >> 8;
113	fallthrough;
114	case 1:
115	case 0: /* can't happen: for better code generation */
116	*cp++ = offset >> 0;
117	}
118		113
119	spi_message_init(&m);	114	/* 8/16/24-bit address is written MSB first */
120	memset(t, 0, sizeof(t));	115	switch (at25->addrlen) {
		116	default: /* case 3 */
		117	*cp++ = msg_offset >> 16;
		118	fallthrough;
		119	case 2:
		120	*cp++ = msg_offset >> 8;
		121	fallthrough;
		122	case 1:
		123	case 0: /* can't happen: for better code generation */
		124	*cp++ = msg_offset >> 0;
		125	}
121		126
122	t[0].tx_buf = at25->command;	127	spi_message_init(&m);
123	t[0].len = at25->addrlen + 1;	128	memset(t, 0, sizeof(t));
124	spi_message_add_tail(&t[0], &m);
125		129
126	t[1].rx_buf = buf;	130	t[0].tx_buf = at25->command;
127	t[1].len = count;	131	t[0].len = at25->addrlen + 1;
128	spi_message_add_tail(&t[1], &m);	132	spi_message_add_tail(&t[0], &m);
129		133
130	/*	134	t[1].rx_buf = buf + nr_bytes;
131	* Read it all at once.	135	t[1].len = msg_count;
132	*	136	spi_message_add_tail(&t[1], &m);
133	* REVISIT that's potentially a problem with large chips, if
134	* other devices on the bus need to be accessed regularly or
135	* this chip is clocked very slowly.
136	*/
137	status = spi_sync(at25->spi, &m);
138	dev_dbg(&at25->spi->dev, "read %zu bytes at %d --> %zd\n",
139	count, offset, status);
140		137
141	mutex_unlock(&at25->lock);	138	status = spi_sync(at25->spi, &m);
142	return status;	139
		140	mutex_unlock(&at25->lock);
		141
		142	if (status)
		143	return status;
		144
		145	--num_msgs;
		146	msg_offset += msg_count;
		147	nr_bytes += msg_count;
		148	}
		149
		150	dev_dbg(&at25->spi->dev, "read %zu bytes at %d\n",
		151	count, offset);
		152	return 0;
143	}	153	}
144		154
145	/* Read extra registers as ID or serial number */	155	/* Read extra registers as ID or serial number */
@@ -190,6 +200,7 @@ ATTRIBUTE_GROUPS(sernum); · 44 unmodified lines
190	static int at25_ee_write(void priv, unsigned int off, void val, size_t count)	200	static int at25_ee_write(void priv, unsigned int off, void val, size_t count)
191	{	201	{
192	struct at25_data *at25 = priv;	202	struct at25_data *at25 = priv;
		203	size_t maxsz = spi_max_transfer_size(at25->spi);
193	const char *buf = val;	204	const char *buf = val;
194	int status = 0;	205	int status = 0;
195	unsigned buf_size;	206	unsigned buf_size;
@@ -253,6 +264,8 @@ static int at25_ee_write(void priv, unsigned int off, void val, size_t count) · 57 unmodified lines
253	segment = buf_size - (offset % buf_size);	264	segment = buf_size - (offset % buf_size);
254	if (segment > count)	265	if (segment > count)
255	segment = count;	266	segment = count;
		267	if (segment > maxsz)
		268	segment = maxsz;
256	memcpy(cp, buf, segment);	269	memcpy(cp, buf, segment);
257	status = spi_write(at25->spi, bounce,	270	status = spi_write(at25->spi, bounce,
258	segment + at25->addrlen + 1);	271	segment + at25->addrlen + 1);

drivers/misc/mei/hbm.c+2−1

@@ -1351,7 +1351,8 @@ int mei_hbm_dispatch(struct mei_device dev, struct mei_msg_hdr hdr) · 1350 unmodified lines
1351		1351
1352	if (dev->dev_state != MEI_DEV_INIT_CLIENTS \|\|	1352	if (dev->dev_state != MEI_DEV_INIT_CLIENTS \|\|
1353	dev->hbm_state != MEI_HBM_CAP_SETUP) {	1353	dev->hbm_state != MEI_HBM_CAP_SETUP) {
1354	if (dev->dev_state == MEI_DEV_POWER_DOWN) {	1354	if (dev->dev_state == MEI_DEV_POWER_DOWN \|\|
		1355	dev->dev_state == MEI_DEV_POWERING_DOWN) {
1355	dev_dbg(dev->dev, "hbm: capabilities response: on shutdown, ignoring\n");	1356	dev_dbg(dev->dev, "hbm: capabilities response: on shutdown, ignoring\n");
1356	return 0;	1357	return 0;
1357	}	1358	}

drivers/misc/mei/hw-me-regs.h+2−0

@@ -109,6 +109,8 @@ · 108 unmodified lines
109	#define MEI_DEV_ID_ADP_P 0x51E0 /* Alder Lake Point P */	109	#define MEI_DEV_ID_ADP_P 0x51E0 /* Alder Lake Point P */
110	#define MEI_DEV_ID_ADP_N 0x54E0 /* Alder Lake Point N */	110	#define MEI_DEV_ID_ADP_N 0x54E0 /* Alder Lake Point N */
111		111
		112	#define MEI_DEV_ID_RPL_S 0x7A68 /* Raptor Lake Point S */
		113
112	/*	114	/*
113	* MEI HW Section	115	* MEI HW Section
114	*/	116	*/

drivers/misc/mei/hw-me.c+2−0

@@ -1154,6 +1154,8 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable) · 1153 unmodified lines
1154	ret = mei_me_d0i3_exit_sync(dev);	1154	ret = mei_me_d0i3_exit_sync(dev);
1155	if (ret)	1155	if (ret)
1156	return ret;	1156	return ret;
		1157	} else {
		1158	hw->pg_state = MEI_PG_OFF;
1157	}	1159	}
1158	}	1160	}
1159		1161

drivers/misc/mei/pci-me.c+2−0

@@ -116,6 +116,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = { · 115 unmodified lines
116	{MEI_PCI_DEVICE(MEI_DEV_ID_ADP_P, MEI_ME_PCH15_CFG)},	116	{MEI_PCI_DEVICE(MEI_DEV_ID_ADP_P, MEI_ME_PCH15_CFG)},
117	{MEI_PCI_DEVICE(MEI_DEV_ID_ADP_N, MEI_ME_PCH15_CFG)},	117	{MEI_PCI_DEVICE(MEI_DEV_ID_ADP_N, MEI_ME_PCH15_CFG)},
118		118
		119	{MEI_PCI_DEVICE(MEI_DEV_ID_RPL_S, MEI_ME_PCH15_CFG)},
		120
119	/* required last entry */	121	/* required last entry */
120	{0, }	122	{0, }
121	};	123	};

drivers/mmc/host/mtk-sd.c+12−8

 		msdc_request_done(host, mrq);
 }
-static bool msdc_data_xfer_done(struct msdc_host *host, u32 events,
+static void msdc_data_xfer_done(struct msdc_host *host, u32 events,
 				struct mmc_request *mrq, struct mmc_data *data)
 {
 	struct mmc_command *stop;
 	spin_unlock_irqrestore(&host->lock, flags);
 	if (done)
-		return true;
+		return;
 	stop = data->stop;
 	if (check_data || (stop && stop->error)) {
 		sdr_set_field(host->base + MSDC_DMA_CTRL, MSDC_DMA_CTRL_STOP,
 				1);
+		ret = readl_poll_timeout_atomic(host->base + MSDC_DMA_CTRL, val,
+						!(val & MSDC_DMA_CTRL_STOP), 1, 20000);
+		if (ret)
+			dev_dbg(host->dev, "DMA stop timed out\n");
 		ret = readl_poll_timeout_atomic(host->base + MSDC_DMA_CFG, val,
 						!(val & MSDC_DMA_CFG_STS), 1, 20000);
-		if (ret) {
+		if (ret)
-			dev_dbg(host->dev, "DMA stop timed out\n");
+			dev_dbg(host->dev, "DMA inactive timed out\n");
-			return false;
-		}
 		sdr_clr_bits(host->base + MSDC_INTEN, data_ints_mask);
 		dev_dbg(host->dev, "DMA stop\n");
 		}
 		msdc_data_xfer_next(host, mrq);
-		done = true;
 	}
-	return done;
 }
 static void msdc_set_buswidth(struct msdc_host *host, u32 width)
 	if (recovery) {
 		sdr_set_field(host->base + MSDC_DMA_CTRL,
 			      MSDC_DMA_CTRL_STOP, 1);
+		if (WARN_ON(readl_poll_timeout(host->base + MSDC_DMA_CTRL, val,
+			!(val & MSDC_DMA_CTRL_STOP), 1, 3000)))
+			return;
 		if (WARN_ON(readl_poll_timeout(host->base + MSDC_DMA_CFG, val,
 			!(val & MSDC_DMA_CFG_STS), 1, 3000)))
 			return;

drivers/mmc/host/sdhci-pci-o2micro.c+2−0

@@ -152,6 +152,8 @@ static int sdhci_o2_get_cd(struct mmc_host *mmc) · 151 unmodified lines
152		152
153	if (!(sdhci_readw(host, O2_PLL_DLL_WDT_CONTROL1) & O2_PLL_LOCK_STATUS))	153	if (!(sdhci_readw(host, O2_PLL_DLL_WDT_CONTROL1) & O2_PLL_LOCK_STATUS))
154	sdhci_o2_enable_internal_clock(host);	154	sdhci_o2_enable_internal_clock(host);
		155	else
		156	sdhci_o2_wait_card_detect_stable(host);
155		157
156	return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);	158	return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);
157	}	159	}

drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c+1−1

@@ -890,7 +890,7 @@ static int gpmi_nfc_compute_timings(struct gpmi_nand_data *this, · 889 unmodified lines
890	hw->timing0 = BF_GPMI_TIMING0_ADDRESS_SETUP(addr_setup_cycles) \|	890	hw->timing0 = BF_GPMI_TIMING0_ADDRESS_SETUP(addr_setup_cycles) \|
891	BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) \|	891	BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) \|
892	BF_GPMI_TIMING0_DATA_SETUP(data_setup_cycles);	892	BF_GPMI_TIMING0_DATA_SETUP(data_setup_cycles);
893	hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(busy_timeout_cycles * 4096);	893	hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(DIV_ROUND_UP(busy_timeout_cycles, 4096));
894		894
895	/*	895	/*
896	* Derive NFC ideal delay from {3}:	896	* Derive NFC ideal delay from {3}:

drivers/mtd/nand/raw/nand_ids.c+0−3

 	{"TC58NVG0S3E 1G 3.3V 8-bit",
 		{ .id = {0x98, 0xd1, 0x90, 0x15, 0x76, 0x14, 0x01, 0x00} },
 		  SZ_2K, SZ_128, SZ_128K, 0, 8, 64, NAND_ECC_INFO(1, SZ_512), },
-	{"TC58NVG0S3HTA00 1G 3.3V 8-bit",
-		{ .id = {0x98, 0xf1, 0x80, 0x15} },
-		  SZ_2K, SZ_128, SZ_128K, 0, 4, 128, NAND_ECC_INFO(8, SZ_512), },
 	{"TC58NVG2S0F 4G 3.3V 8-bit",
 		{ .id = {0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08} },
 		  SZ_4K, SZ_512, SZ_256K, 0, 8, 224, NAND_ECC_INFO(4, SZ_512) },

drivers/net/bonding/bond_main.c+3−1

 		if (!rtnl_trylock())
 			return;
-		if (should_notify_peers)
+		if (should_notify_peers) {
+			bond->send_peer_notif--;
 			call_netdevice_notifiers(NETDEV_NOTIFY_PEERS,
 						 bond->dev);
+		}
 		if (should_notify_rtnl) {
 			bond_slave_state_notify(bond);
 			bond_slave_link_notify(bond);

drivers/net/dsa/qca8k.c+21−1

@@ -2334,6 +2334,7 @@ static int · 2333 unmodified lines
2334	qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)	2334	qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
2335	{	2335	{
2336	struct qca8k_priv *priv = ds->priv;	2336	struct qca8k_priv *priv = ds->priv;
		2337	int ret;
2337		2338
2338	/* We have only have a general MTU setting.	2339	/* We have only have a general MTU setting.
2339	* DSA always set the CPU port's MTU to the largest MTU of the slave	2340	* DSA always set the CPU port's MTU to the largest MTU of the slave
@@ -2344,8 +2345,27 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) · 4 unmodified lines
2344	if (!dsa_is_cpu_port(ds, port))	2345	if (!dsa_is_cpu_port(ds, port))
2345	return 0;	2346	return 0;
2346		2347
		2348	/* To change the MAX_FRAME_SIZE the cpu ports must be off or
		2349	* the switch panics.
		2350	* Turn off both cpu ports before applying the new value to prevent
		2351	* this.
		2352	*/
		2353	if (priv->port_enabled_map & BIT(0))
		2354	qca8k_port_set_status(priv, 0, 0);
		2355
		2356	if (priv->port_enabled_map & BIT(6))
		2357	qca8k_port_set_status(priv, 6, 0);
		2358
2347	/* Include L2 header / FCS length */	2359	/* Include L2 header / FCS length */
2348	return qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, new_mtu + ETH_HLEN + ETH_FCS_LEN);	2360	ret = qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, new_mtu + ETH_HLEN + ETH_FCS_LEN);
		2361
		2362	if (priv->port_enabled_map & BIT(0))
		2363	qca8k_port_set_status(priv, 0, 1);
		2364
		2365	if (priv->port_enabled_map & BIT(6))
		2366	qca8k_port_set_status(priv, 6, 1);
		2367
		2368	return ret;
2349	}	2369	}
2350		2370
2351	static int	2371	static int

drivers/net/dsa/qca8k.h+1−1

@@ -15,7 +15,7 @@ · 14 unmodified lines
15		15
16	#define QCA8K_ETHERNET_MDIO_PRIORITY 7	16	#define QCA8K_ETHERNET_MDIO_PRIORITY 7
17	#define QCA8K_ETHERNET_PHY_PRIORITY 6	17	#define QCA8K_ETHERNET_PHY_PRIORITY 6
18	#define QCA8K_ETHERNET_TIMEOUT 100	18	#define QCA8K_ETHERNET_TIMEOUT 5
19		19
20	#define QCA8K_NUM_PORTS 7	20	#define QCA8K_NUM_PORTS 7
21	#define QCA8K_NUM_CPU_PORTS 2	21	#define QCA8K_NUM_CPU_PORTS 2

drivers/net/ethernet/amd/xgbe/xgbe-platform.c+2−2

@@ -338,7 +338,7 @@ static int xgbe_platform_probe(struct platform_device *pdev) · 337 unmodified lines
338	* the PHY resources listed last	338	* the PHY resources listed last
339	*/	339	*/
340	phy_memnum = xgbe_resource_count(pdev, IORESOURCE_MEM) - 3;	340	phy_memnum = xgbe_resource_count(pdev, IORESOURCE_MEM) - 3;
341	phy_irqnum = xgbe_resource_count(pdev, IORESOURCE_IRQ) - 1;	341	phy_irqnum = platform_irq_count(pdev) - 1;
342	dma_irqnum = 1;	342	dma_irqnum = 1;
343	dma_irqend = phy_irqnum;	343	dma_irqend = phy_irqnum;
344	} else {	344	} else {
@@ -348,7 +348,7 @@ static int xgbe_platform_probe(struct platform_device *pdev) · 3 unmodified lines
348	phy_memnum = 0;	348	phy_memnum = 0;
349	phy_irqnum = 0;	349	phy_irqnum = 0;
350	dma_irqnum = 1;	350	dma_irqnum = 1;
351	dma_irqend = xgbe_resource_count(pdev, IORESOURCE_IRQ);	351	dma_irqend = platform_irq_count(pdev);
352	}	352	}
353		353
354	/* Obtain the mmio areas for the device */	354	/* Obtain the mmio areas for the device */

drivers/net/ethernet/broadcom/bgmac-bcma.c+0−1

@@ -332,7 +332,6 @@ static void bgmac_remove(struct bcma_device *core) · 331 unmodified lines
332	bcma_mdio_mii_unregister(bgmac->mii_bus);	332	bcma_mdio_mii_unregister(bgmac->mii_bus);
333	bgmac_enet_remove(bgmac);	333	bgmac_enet_remove(bgmac);
334	bcma_set_drvdata(core, NULL);	334	bcma_set_drvdata(core, NULL);
335	kfree(bgmac);
336	}	335	}
337		336
338	static struct bcma_driver bgmac_bcma_driver = {	337	static struct bcma_driver bgmac_bcma_driver = {

drivers/net/ethernet/hisilicon/hns3/hnae3.h+1−0

@@ -769,6 +769,7 @@ struct hnae3_tc_info { · 768 unmodified lines
769	u8 prio_tc[HNAE3_MAX_USER_PRIO]; /* TC indexed by prio */	769	u8 prio_tc[HNAE3_MAX_USER_PRIO]; /* TC indexed by prio */
770	u16 tqp_count[HNAE3_MAX_TC];	770	u16 tqp_count[HNAE3_MAX_TC];
771	u16 tqp_offset[HNAE3_MAX_TC];	771	u16 tqp_offset[HNAE3_MAX_TC];
		772	u8 max_tc; /* Total number of TCs */
772	u8 num_tc; /* Total number of enabled TCs */	773	u8 num_tc; /* Total number of enabled TCs */
773	bool mqprio_active;	774	bool mqprio_active;
774	};	775	};

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c+1−1

@@ -1129,7 +1129,7 @@ hns3_is_ringparam_changed(struct net_device *ndev, · 1128 unmodified lines
1129	if (old_ringparam->tx_desc_num == new_ringparam->tx_desc_num &&	1129	if (old_ringparam->tx_desc_num == new_ringparam->tx_desc_num &&
1130	old_ringparam->rx_desc_num == new_ringparam->rx_desc_num &&	1130	old_ringparam->rx_desc_num == new_ringparam->rx_desc_num &&
1131	old_ringparam->rx_buf_len == new_ringparam->rx_buf_len) {	1131	old_ringparam->rx_buf_len == new_ringparam->rx_buf_len) {
1132	netdev_info(ndev, "ringparam not changed\n");	1132	netdev_info(ndev, "descriptor number and rx buffer length not changed\n");
1133	return false;	1133	return false;
1134	}	1134	}
1135		1135

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c+15−3

 static int hclge_update_port_info(struct hclge_dev *hdev)
 {
 	struct hclge_mac *mac = &hdev->hw.mac;
-	int speed = HCLGE_MAC_SPEED_UNKNOWN;
+	int speed;
 	int ret;
 	/* get the port info from SFP cmd if not copper port */
 	if (!hdev->support_sfp_query)
 		return 0;
-	if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2)
+	if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) {
+		speed = mac->speed;
 		ret = hclge_get_sfp_info(hdev, mac);
-	else
+	} else {
+		speed = HCLGE_MAC_SPEED_UNKNOWN;
 		ret = hclge_get_sfp_speed(hdev, &speed);
+	}
 	if (ret == -EOPNOTSUPP) {
 		hdev->support_sfp_query = false;
 	if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) {
 		if (mac->speed_type == QUERY_ACTIVE_SPEED) {
 			hclge_update_port_capability(hdev, mac);
+			if (mac->speed != speed)
+				(void)hclge_tm_port_shaper_cfg(hdev);
 			return 0;
 		}
 		return hclge_cfg_mac_speed_dup(hdev, mac->speed,
 	link_state_old = vport->vf_info.link_state;
 	vport->vf_info.link_state = link_state;
+	/* return success directly if the VF is unalive, VF will
+	 * query link state itself when it starts work.
+	 */
+	if (!test_bit(HCLGE_VPORT_STATE_ALIVE, &vport->state))
+		return 0;
 	ret = hclge_push_vf_link_status(vport);
 	if (ret) {
 		vport->vf_info.link_state = link_state_old;
 	if (ret)
 		return ret;
+	vport->port_base_vlan_cfg.tbl_sta = false;
 	/* remove old VLAN tag */
 	if (old_info->vlan_tag == 0)
 		ret = hclge_set_vf_vlan_common(hdev, vport->vport_id,

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c+68−33

@@ -282,8 +282,8 @@ static int hclge_tm_pg_to_pri_map_cfg(struct hclge_dev *hdev, · 281 unmodified lines
282	return hclge_cmd_send(&hdev->hw, &desc, 1);	282	return hclge_cmd_send(&hdev->hw, &desc, 1);
283	}	283	}
284		284
285	static int hclge_tm_qs_to_pri_map_cfg(struct hclge_dev *hdev,	285	static int hclge_tm_qs_to_pri_map_cfg(struct hclge_dev *hdev, u16 qs_id, u8 pri,
286	u16 qs_id, u8 pri)	286	bool link_vld)
287	{	287	{
288	struct hclge_qs_to_pri_link_cmd *map;	288	struct hclge_qs_to_pri_link_cmd *map;
289	struct hclge_desc desc;	289	struct hclge_desc desc;
@@ -294,7 +294,7 @@ static int hclge_tm_qs_to_pri_map_cfg(struct hclge_dev *hdev, · 4 unmodified lines
294		294
295	map->qs_id = cpu_to_le16(qs_id);	295	map->qs_id = cpu_to_le16(qs_id);
296	map->priority = pri;	296	map->priority = pri;
297	map->link_vld = HCLGE_TM_QS_PRI_LINK_VLD_MSK;	297	map->link_vld = link_vld ? HCLGE_TM_QS_PRI_LINK_VLD_MSK : 0;
298		298
299	return hclge_cmd_send(&hdev->hw, &desc, 1);	299	return hclge_cmd_send(&hdev->hw, &desc, 1);
300	}	300	}
@@ -420,7 +420,7 @@ static int hclge_tm_pg_shapping_cfg(struct hclge_dev *hdev, · 119 unmodified lines
420	return hclge_cmd_send(&hdev->hw, &desc, 1);	420	return hclge_cmd_send(&hdev->hw, &desc, 1);
421	}	421	}
422		422
423	static int hclge_tm_port_shaper_cfg(struct hclge_dev *hdev)	423	int hclge_tm_port_shaper_cfg(struct hclge_dev *hdev)
424	{	424	{
425	struct hclge_port_shapping_cmd *shap_cfg_cmd;	425	struct hclge_port_shapping_cmd *shap_cfg_cmd;
426	struct hclge_shaper_ir_para ir_para;	426	struct hclge_shaper_ir_para ir_para;
@@ -642,11 +642,13 @@ static void hclge_tm_update_kinfo_rss_size(struct hclge_vport *vport) · 215 unmodified lines
642	* one tc for VF for simplicity. VF's vport_id is non zero.	642	* one tc for VF for simplicity. VF's vport_id is non zero.
643	*/	643	*/
644	if (vport->vport_id) {	644	if (vport->vport_id) {
		645	kinfo->tc_info.max_tc = 1;
645	kinfo->tc_info.num_tc = 1;	646	kinfo->tc_info.num_tc = 1;
646	vport->qs_offset = HNAE3_MAX_TC +	647	vport->qs_offset = HNAE3_MAX_TC +
647	vport->vport_id - HCLGE_VF_VPORT_START_NUM;	648	vport->vport_id - HCLGE_VF_VPORT_START_NUM;
648	vport_max_rss_size = hdev->vf_rss_size_max;	649	vport_max_rss_size = hdev->vf_rss_size_max;
649	} else {	650	} else {
		651	kinfo->tc_info.max_tc = hdev->tc_max;
650	kinfo->tc_info.num_tc =	652	kinfo->tc_info.num_tc =
651	min_t(u16, vport->alloc_tqps, hdev->tm_info.num_tc);	653	min_t(u16, vport->alloc_tqps, hdev->tm_info.num_tc);
652	vport->qs_offset = 0;	654	vport->qs_offset = 0;
@@ -679,7 +681,9 @@ static void hclge_tm_vport_tc_info_update(struct hclge_vport *vport) · 26 unmodified lines
679	kinfo->num_tqps = hclge_vport_get_tqp_num(vport);	681	kinfo->num_tqps = hclge_vport_get_tqp_num(vport);
680	vport->dwrr = 100; /* 100 percent as init */	682	vport->dwrr = 100; /* 100 percent as init */
681	vport->bw_limit = hdev->tm_info.pg_info[0].bw_limit;	683	vport->bw_limit = hdev->tm_info.pg_info[0].bw_limit;
682	hdev->rss_cfg.rss_size = kinfo->rss_size;	684
		685	if (vport->vport_id == PF_VPORT_ID)
		686	hdev->rss_cfg.rss_size = kinfo->rss_size;
683		687
684	/* when enable mqprio, the tc_info has been updated. */	688	/* when enable mqprio, the tc_info has been updated. */
685	if (kinfo->tc_info.mqprio_active)	689	if (kinfo->tc_info.mqprio_active)
@@ -714,14 +718,22 @@ static void hclge_tm_vport_info_update(struct hclge_dev *hdev) · 28 unmodified lines
714		718
715	static void hclge_tm_tc_info_init(struct hclge_dev *hdev)	719	static void hclge_tm_tc_info_init(struct hclge_dev *hdev)
716	{	720	{
717	u8 i;	721	u8 i, tc_sch_mode;
		722	u32 bw_limit;
		723
		724	for (i = 0; i < hdev->tc_max; i++) {
		725	if (i < hdev->tm_info.num_tc) {
		726	tc_sch_mode = HCLGE_SCH_MODE_DWRR;
		727	bw_limit = hdev->tm_info.pg_info[0].bw_limit;
		728	} else {
		729	tc_sch_mode = HCLGE_SCH_MODE_SP;
		730	bw_limit = 0;
		731	}
718		732
719	for (i = 0; i < hdev->tm_info.num_tc; i++) {
720	hdev->tm_info.tc_info[i].tc_id = i;	733	hdev->tm_info.tc_info[i].tc_id = i;
721	hdev->tm_info.tc_info[i].tc_sch_mode = HCLGE_SCH_MODE_DWRR;	734	hdev->tm_info.tc_info[i].tc_sch_mode = tc_sch_mode;
722	hdev->tm_info.tc_info[i].pgid = 0;	735	hdev->tm_info.tc_info[i].pgid = 0;
723	hdev->tm_info.tc_info[i].bw_limit =	736	hdev->tm_info.tc_info[i].bw_limit = bw_limit;
724	hdev->tm_info.pg_info[0].bw_limit;
725	}	737	}
726		738
727	for (i = 0; i < HNAE3_MAX_USER_PRIO; i++)	739	for (i = 0; i < HNAE3_MAX_USER_PRIO; i++)
@@ -926,10 +938,13 @@ static int hclge_tm_pri_q_qs_cfg_tc_base(struct hclge_dev *hdev) · 198 unmodified lines
926	for (k = 0; k < hdev->num_alloc_vport; k++) {	938	for (k = 0; k < hdev->num_alloc_vport; k++) {
927	struct hnae3_knic_private_info *kinfo = &vport[k].nic.kinfo;	939	struct hnae3_knic_private_info *kinfo = &vport[k].nic.kinfo;
928		940
929	for (i = 0; i < kinfo->tc_info.num_tc; i++) {	941	for (i = 0; i < kinfo->tc_info.max_tc; i++) {
		942	u8 pri = i < kinfo->tc_info.num_tc ? i : 0;
		943	bool link_vld = i < kinfo->tc_info.num_tc;
		944
930	ret = hclge_tm_qs_to_pri_map_cfg(hdev,	945	ret = hclge_tm_qs_to_pri_map_cfg(hdev,
931	vport[k].qs_offset + i,	946	vport[k].qs_offset + i,
932	i);	947	pri, link_vld);
933	if (ret)	948	if (ret)
934	return ret;	949	return ret;
935	}	950	}
@@ -949,7 +964,7 @@ static int hclge_tm_pri_q_qs_cfg_vnet_base(struct hclge_dev *hdev) · 13 unmodified lines
949	for (i = 0; i < HNAE3_MAX_TC; i++) {	964	for (i = 0; i < HNAE3_MAX_TC; i++) {
950	ret = hclge_tm_qs_to_pri_map_cfg(hdev,	965	ret = hclge_tm_qs_to_pri_map_cfg(hdev,
951	vport[k].qs_offset + i,	966	vport[k].qs_offset + i,
952	k);	967	k, true);
953	if (ret)	968	if (ret)
954	return ret;	969	return ret;
955	}	970	}
@@ -989,33 +1004,39 @@ static int hclge_tm_pri_tc_base_shaper_cfg(struct hclge_dev *hdev) · 33 unmodified lines
989	{	1004	{
990	u32 max_tm_rate = hdev->ae_dev->dev_specs.max_tm_rate;	1005	u32 max_tm_rate = hdev->ae_dev->dev_specs.max_tm_rate;
991	struct hclge_shaper_ir_para ir_para;	1006	struct hclge_shaper_ir_para ir_para;
992	u32 shaper_para;	1007	u32 shaper_para_c, shaper_para_p;
993	int ret;	1008	int ret;
994	u32 i;	1009	u32 i;
995		1010
996	for (i = 0; i < hdev->tm_info.num_tc; i++) {	1011	for (i = 0; i < hdev->tc_max; i++) {
997	u32 rate = hdev->tm_info.tc_info[i].bw_limit;	1012	u32 rate = hdev->tm_info.tc_info[i].bw_limit;
998		1013
999	ret = hclge_shaper_para_calc(rate, HCLGE_SHAPER_LVL_PRI,	1014	if (rate) {
1000	&ir_para, max_tm_rate);	1015	ret = hclge_shaper_para_calc(rate, HCLGE_SHAPER_LVL_PRI,
1001	if (ret)	1016	&ir_para, max_tm_rate);
1002	return ret;	1017	if (ret)
		1018	return ret;
		1019
		1020	shaper_para_c = hclge_tm_get_shapping_para(0, 0, 0,
		1021	HCLGE_SHAPER_BS_U_DEF,
		1022	HCLGE_SHAPER_BS_S_DEF);
		1023	shaper_para_p = hclge_tm_get_shapping_para(ir_para.ir_b,
		1024	ir_para.ir_u,
		1025	ir_para.ir_s,
		1026	HCLGE_SHAPER_BS_U_DEF,
		1027	HCLGE_SHAPER_BS_S_DEF);
		1028	} else {
		1029	shaper_para_c = 0;
		1030	shaper_para_p = 0;
		1031	}
1003		1032
1004	shaper_para = hclge_tm_get_shapping_para(0, 0, 0,
1005	HCLGE_SHAPER_BS_U_DEF,
1006	HCLGE_SHAPER_BS_S_DEF);
1007	ret = hclge_tm_pri_shapping_cfg(hdev, HCLGE_TM_SHAP_C_BUCKET, i,	1033	ret = hclge_tm_pri_shapping_cfg(hdev, HCLGE_TM_SHAP_C_BUCKET, i,
1008	shaper_para, rate);	1034	shaper_para_c, rate);
1009	if (ret)	1035	if (ret)
1010	return ret;	1036	return ret;
1011		1037
1012	shaper_para = hclge_tm_get_shapping_para(ir_para.ir_b,
1013	ir_para.ir_u,
1014	ir_para.ir_s,
1015	HCLGE_SHAPER_BS_U_DEF,
1016	HCLGE_SHAPER_BS_S_DEF);
1017	ret = hclge_tm_pri_shapping_cfg(hdev, HCLGE_TM_SHAP_P_BUCKET, i,	1038	ret = hclge_tm_pri_shapping_cfg(hdev, HCLGE_TM_SHAP_P_BUCKET, i,
1018	shaper_para, rate);	1039	shaper_para_p, rate);
1019	if (ret)	1040	if (ret)
1020	return ret;	1041	return ret;
1021	}	1042	}
@@ -1125,7 +1146,7 @@ static int hclge_tm_pri_tc_base_dwrr_cfg(struct hclge_dev *hdev) · 103 unmodified lines
1125	int ret;	1146	int ret;
1126	u32 i, k;	1147	u32 i, k;
1127		1148
1128	for (i = 0; i < hdev->tm_info.num_tc; i++) {	1149	for (i = 0; i < hdev->tc_max; i++) {
1129	pg_info =	1150	pg_info =
1130	&hdev->tm_info.pg_info[hdev->tm_info.tc_info[i].pgid];	1151	&hdev->tm_info.pg_info[hdev->tm_info.tc_info[i].pgid];
1131	dwrr = pg_info->tc_dwrr[i];	1152	dwrr = pg_info->tc_dwrr[i];
@@ -1135,9 +1156,15 @@ static int hclge_tm_pri_tc_base_dwrr_cfg(struct hclge_dev *hdev) · 3 unmodified lines
1135	return ret;	1156	return ret;
1136		1157
1137	for (k = 0; k < hdev->num_alloc_vport; k++) {	1158	for (k = 0; k < hdev->num_alloc_vport; k++) {
		1159	struct hnae3_knic_private_info *kinfo = &vport[k].nic.kinfo;
		1160
		1161	if (i >= kinfo->tc_info.max_tc)
		1162	continue;
		1163
		1164	dwrr = i < kinfo->tc_info.num_tc ? vport[k].dwrr : 0;
1138	ret = hclge_tm_qs_weight_cfg(	1165	ret = hclge_tm_qs_weight_cfg(
1139	hdev, vport[k].qs_offset + i,	1166	hdev, vport[k].qs_offset + i,
1140	vport[k].dwrr);	1167	dwrr);
1141	if (ret)	1168	if (ret)
1142	return ret;	1169	return ret;
1143	}	1170	}
@@ -1303,6 +1330,7 @@ static int hclge_tm_schd_mode_tc_base_cfg(struct hclge_dev *hdev, u8 pri_id) · 159 unmodified lines
1303	{	1330	{
1304	struct hclge_vport *vport = hdev->vport;	1331	struct hclge_vport *vport = hdev->vport;
1305	int ret;	1332	int ret;
		1333	u8 mode;
1306	u16 i;	1334	u16 i;
1307		1335
1308	ret = hclge_tm_pri_schd_mode_cfg(hdev, pri_id);	1336	ret = hclge_tm_pri_schd_mode_cfg(hdev, pri_id);
@@ -1310,9 +1338,16 @@ static int hclge_tm_schd_mode_tc_base_cfg(struct hclge_dev *hdev, u8 pri_id) · 1 unmodified line
1310	return ret;	1338	return ret;
1311		1339
1312	for (i = 0; i < hdev->num_alloc_vport; i++) {	1340	for (i = 0; i < hdev->num_alloc_vport; i++) {
		1341	struct hnae3_knic_private_info *kinfo = &vport[i].nic.kinfo;
		1342
		1343	if (pri_id >= kinfo->tc_info.max_tc)
		1344	continue;
		1345
		1346	mode = pri_id < kinfo->tc_info.num_tc ? HCLGE_SCH_MODE_DWRR :
		1347	HCLGE_SCH_MODE_SP;
1313	ret = hclge_tm_qs_schd_mode_cfg(hdev,	1348	ret = hclge_tm_qs_schd_mode_cfg(hdev,
1314	vport[i].qs_offset + pri_id,	1349	vport[i].qs_offset + pri_id,
1315	HCLGE_SCH_MODE_DWRR);	1350	mode);
1316	if (ret)	1351	if (ret)
1317	return ret;	1352	return ret;
1318	}	1353	}
@@ -1353,7 +1388,7 @@ static int hclge_tm_lvl34_schd_mode_cfg(struct hclge_dev *hdev) · 34 unmodified lines
1353	u8 i;	1388	u8 i;
1354		1389
1355	if (hdev->tx_sch_mode == HCLGE_FLAG_TC_BASE_SCH_MODE) {	1390	if (hdev->tx_sch_mode == HCLGE_FLAG_TC_BASE_SCH_MODE) {
1356	for (i = 0; i < hdev->tm_info.num_tc; i++) {	1391	for (i = 0; i < hdev->tc_max; i++) {
1357	ret = hclge_tm_schd_mode_tc_base_cfg(hdev, i);	1392	ret = hclge_tm_schd_mode_tc_base_cfg(hdev, i);
1358	if (ret)	1393	if (ret)
1359	return ret;	1394	return ret;

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h+1−0

@@ -237,6 +237,7 @@ int hclge_pause_addr_cfg(struct hclge_dev hdev, const u8 mac_addr); · 236 unmodified lines
237	void hclge_pfc_rx_stats_get(struct hclge_dev hdev, u64 stats);	237	void hclge_pfc_rx_stats_get(struct hclge_dev hdev, u64 stats);
238	void hclge_pfc_tx_stats_get(struct hclge_dev hdev, u64 stats);	238	void hclge_pfc_tx_stats_get(struct hclge_dev hdev, u64 stats);
239	int hclge_tm_qs_shaper_cfg(struct hclge_vport *vport, int max_tx_rate);	239	int hclge_tm_qs_shaper_cfg(struct hclge_vport *vport, int max_tx_rate);
		240	int hclge_tm_port_shaper_cfg(struct hclge_dev *hdev);
240	int hclge_tm_get_qset_num(struct hclge_dev hdev, u16 qset_num);	241	int hclge_tm_get_qset_num(struct hclge_dev hdev, u16 qset_num);
241	int hclge_tm_get_pri_num(struct hclge_dev hdev, u8 pri_num);	242	int hclge_tm_get_pri_num(struct hclge_dev hdev, u8 pri_num);
242	int hclge_tm_get_qset_map_pri(struct hclge_dev hdev, u16 qset_id, u8 priority,	243	int hclge_tm_get_qset_map_pri(struct hclge_dev hdev, u16 qset_id, u8 priority,

drivers/net/ethernet/huawei/hinic/hinic_devlink.c+1−3

@@ -43,9 +43,7 @@ static bool check_image_valid(struct hinic_devlink_priv priv, const u8 buf, · 42 unmodified lines
43		43
44	for (i = 0; i < fw_image->fw_info.fw_section_cnt; i++) {	44	for (i = 0; i < fw_image->fw_info.fw_section_cnt; i++) {
45	len += fw_image->fw_section_info[i].fw_section_len;	45	len += fw_image->fw_section_info[i].fw_section_len;
46	memcpy(&host_image->image_section_info[i],	46	host_image->image_section_info[i] = fw_image->fw_section_info[i];
47	&fw_image->fw_section_info[i],
48	sizeof(struct fw_section_info_st));
49	}	47	}
50		48
51	if (len != fw_image->fw_len \|\|	49	if (len != fw_image->fw_len \|\|

drivers/net/ethernet/intel/i40e/i40e_ethtool.c+17−8

 		set_bit(__I40E_TESTING, pf->state);
+		if (test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state) ||
+		    test_bit(__I40E_RESET_INTR_RECEIVED, pf->state)) {
+			dev_warn(&pf->pdev->dev,
+				 "Cannot start offline testing when PF is in reset state.\n");
+			goto skip_ol_tests;
+		}
 		if (i40e_active_vfs(pf) || i40e_active_vmdqs(pf)) {
 			dev_warn(&pf->pdev->dev,
 				 "Please take active VFs and Netqueues offline and restart the adapter before running NIC diagnostics\n");
-			data[I40E_ETH_TEST_REG]		= 1;
-			data[I40E_ETH_TEST_EEPROM]	= 1;
-			data[I40E_ETH_TEST_INTR]	= 1;
-			data[I40E_ETH_TEST_LINK]	= 1;
-			eth_test->flags |= ETH_TEST_FL_FAILED;
-			clear_bit(__I40E_TESTING, pf->state);
 			goto skip_ol_tests;
 		}
 		data[I40E_ETH_TEST_INTR] = 0;
 	}
-skip_ol_tests:
 	netif_info(pf, drv, netdev, "testing finished\n");
+	return;
+skip_ol_tests:
+	data[I40E_ETH_TEST_REG]		= 1;
+	data[I40E_ETH_TEST_EEPROM]	= 1;
+	data[I40E_ETH_TEST_INTR]	= 1;
+	data[I40E_ETH_TEST_LINK]	= 1;
+	eth_test->flags |= ETH_TEST_FL_FAILED;
+	clear_bit(__I40E_TESTING, pf->state);
+	netif_info(pf, drv, netdev, "testing failed\n");
 }
 static void i40e_get_wol(struct net_device *netdev,

drivers/net/ethernet/intel/i40e/i40e_main.c+5−0

 		return -EOPNOTSUPP;
 	}
+	if (!tc) {
+		dev_err(&pf->pdev->dev, "Unable to add filter because of invalid destination");
+		return -EINVAL;
+	}
 	if (test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state) ||
 	    test_bit(__I40E_RESET_INTR_RECEIVED, pf->state))
 		return -EBUSY;

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c+1−1

@@ -2282,7 +2282,7 @@ static int i40e_vc_config_queues_msg(struct i40e_vf vf, u8 msg) · 2281 unmodified lines
2282	}	2282	}
2283		2283
2284	if (vf->adq_enabled) {	2284	if (vf->adq_enabled) {
2285	for (i = 0; i < I40E_MAX_VF_VSI; i++)	2285	for (i = 0; i < vf->num_tc; i++)
2286	num_qps_all += vf->ch[i].num_qps;	2286	num_qps_all += vf->ch[i].num_qps;
2287	if (num_qps_all != qci->num_queue_pairs) {	2287	if (num_qps_all != qci->num_queue_pairs) {
2288	aq_ret = I40E_ERR_PARAM;	2288	aq_ret = I40E_ERR_PARAM;

drivers/net/ethernet/intel/iavf/iavf_main.c+1−1

@@ -984,7 +984,7 @@ struct iavf_mac_filter iavf_add_filter(struct iavf_adapter adapter, · 983 unmodified lines
984	list_add_tail(&f->list, &adapter->mac_filter_list);	984	list_add_tail(&f->list, &adapter->mac_filter_list);
985	f->add = true;	985	f->add = true;
986	f->is_new_mac = true;	986	f->is_new_mac = true;
987	f->is_primary = false;	987	f->is_primary = ether_addr_equal(macaddr, adapter->hw.mac.addr);
988	adapter->aq_required \|= IAVF_FLAG_AQ_ADD_MAC_FILTER;	988	adapter->aq_required \|= IAVF_FLAG_AQ_ADD_MAC_FILTER;
989	} else {	989	} else {
990	f->remove = false;	990	f->remove = false;

drivers/net/ethernet/intel/ice/ice_ethtool.c+48−1

@@ -2189,6 +2189,42 @@ ice_setup_autoneg(struct ice_port_info p, struct ethtool_link_ksettings ks, · 2188 unmodified lines
2189	return err;	2189	return err;
2190	}	2190	}
2191		2191
		2192	/**
		2193	* ice_set_phy_type_from_speed - set phy_types based on speeds
		2194	* and advertised modes
		2195	* @ks: ethtool link ksettings struct
		2196	* @phy_type_low: pointer to the lower part of phy_type
		2197	* @phy_type_high: pointer to the higher part of phy_type
		2198	* @adv_link_speed: targeted link speeds bitmap
		2199	*/
		2200	static void
		2201	ice_set_phy_type_from_speed(const struct ethtool_link_ksettings *ks,
		2202	u64 phy_type_low, u64 phy_type_high,
		2203	u16 adv_link_speed)
		2204	{
		2205	/* Handle 1000M speed in a special way because ice_update_phy_type
		2206	* enables all link modes, but having mixed copper and optical
		2207	* standards is not supported.
		2208	*/
		2209	adv_link_speed &= ~ICE_AQ_LINK_SPEED_1000MB;
		2210
		2211	if (ethtool_link_ksettings_test_link_mode(ks, advertising,
		2212	1000baseT_Full))
		2213	*phy_type_low \|= ICE_PHY_TYPE_LOW_1000BASE_T \|
		2214	ICE_PHY_TYPE_LOW_1G_SGMII;
		2215
		2216	if (ethtool_link_ksettings_test_link_mode(ks, advertising,
		2217	1000baseKX_Full))
		2218	*phy_type_low \|= ICE_PHY_TYPE_LOW_1000BASE_KX;
		2219
		2220	if (ethtool_link_ksettings_test_link_mode(ks, advertising,
		2221	1000baseX_Full))
		2222	*phy_type_low \|= ICE_PHY_TYPE_LOW_1000BASE_SX \|
		2223	ICE_PHY_TYPE_LOW_1000BASE_LX;
		2224
		2225	ice_update_phy_type(phy_type_low, phy_type_high, adv_link_speed);
		2226	}
		2227
2192	/**	2228	/**
2193	* ice_set_link_ksettings - Set Speed and Duplex	2229	* ice_set_link_ksettings - Set Speed and Duplex
2194	* @netdev: network interface device structure	2230	* @netdev: network interface device structure
@@ -2320,7 +2356,8 @@ ice_set_link_ksettings(struct net_device *netdev, · 125 unmodified lines
2320	adv_link_speed = curr_link_speed;	2356	adv_link_speed = curr_link_speed;
2321		2357
2322	/* Convert the advertise link speeds to their corresponded PHY_TYPE */	2358	/* Convert the advertise link speeds to their corresponded PHY_TYPE */
2323	ice_update_phy_type(&phy_type_low, &phy_type_high, adv_link_speed);	2359	ice_set_phy_type_from_speed(ks, &phy_type_low, &phy_type_high,
		2360	adv_link_speed);
2324		2361
2325	if (!autoneg_changed && adv_link_speed == curr_link_speed) {	2362	if (!autoneg_changed && adv_link_speed == curr_link_speed) {
2326	netdev_info(netdev, "Nothing changed, exiting without setting anything.\n");	2363	netdev_info(netdev, "Nothing changed, exiting without setting anything.\n");
@@ -3470,6 +3507,16 @@ static int ice_set_channels(struct net_device dev, struct ethtool_channels ch) · 1143 unmodified lines
3470	new_rx = ch->combined_count + ch->rx_count;	3507	new_rx = ch->combined_count + ch->rx_count;
3471	new_tx = ch->combined_count + ch->tx_count;	3508	new_tx = ch->combined_count + ch->tx_count;
3472		3509
		3510	if (new_rx < vsi->tc_cfg.numtc) {
		3511	netdev_err(dev, "Cannot set less Rx channels, than Traffic Classes you have (%u)\n",
		3512	vsi->tc_cfg.numtc);
		3513	return -EINVAL;
		3514	}
		3515	if (new_tx < vsi->tc_cfg.numtc) {
		3516	netdev_err(dev, "Cannot set less Tx channels, than Traffic Classes you have (%u)\n",
		3517	vsi->tc_cfg.numtc);
		3518	return -EINVAL;
		3519	}
3473	if (new_rx > ice_get_max_rxq(pf)) {	3520	if (new_rx > ice_get_max_rxq(pf)) {
3474	netdev_err(dev, "Maximum allowed Rx channels is %d\n",	3521	netdev_err(dev, "Maximum allowed Rx channels is %d\n",
3475	ice_get_max_rxq(pf));	3522	ice_get_max_rxq(pf));

drivers/net/ethernet/intel/ice/ice_lib.c+37−5

  * @vsi: the VSI being configured
  * @ctxt: VSI context structure
  */
-static void ice_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt)
+static int ice_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt)
 {
 	u16 offset = 0, qmap = 0, tx_count = 0, pow = 0;
 	u16 num_txq_per_tc, num_rxq_per_tc;
 	else
 		vsi->num_rxq = num_rxq_per_tc;
+	if (vsi->num_rxq > vsi->alloc_rxq) {
+		dev_err(ice_pf_to_dev(vsi->back), "Trying to use more Rx queues (%u), than were allocated (%u)!\n",
+			vsi->num_rxq, vsi->alloc_rxq);
+		return -EINVAL;
+	}
 	vsi->num_txq = tx_count;
+	if (vsi->num_txq > vsi->alloc_txq) {
+		dev_err(ice_pf_to_dev(vsi->back), "Trying to use more Tx queues (%u), than were allocated (%u)!\n",
+			vsi->num_txq, vsi->alloc_txq);
+		return -EINVAL;
+	}
 	if (vsi->type == ICE_VSI_VF && vsi->num_txq != vsi->num_rxq) {
 		dev_dbg(ice_pf_to_dev(vsi->back), "VF VSI should have same number of Tx and Rx queues. Hence making them equal\n");
 	 */
 	ctxt->info.q_mapping[0] = cpu_to_le16(vsi->rxq_map[0]);
 	ctxt->info.q_mapping[1] = cpu_to_le16(vsi->num_rxq);
+	return 0;
 }
 /**
 	if (vsi->type == ICE_VSI_CHNL) {
 		ice_chnl_vsi_setup_q_map(vsi, ctxt);
 	} else {
-		ice_vsi_setup_q_map(vsi, ctxt);
+		ret = ice_vsi_setup_q_map(vsi, ctxt);
+		if (ret)
+			goto out;
 		if (!init_vsi) /* means VSI being updated */
 			/* must to indicate which section of VSI context are
 			 * being modified
  *
  * Prepares VSI tc_config to have queue configurations based on MQPRIO options.
  */
-static void
+static int
 ice_vsi_setup_q_map_mqprio(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt,
 			   u8 ena_tc)
 {
 	/* Set actual Tx/Rx queue pairs */
 	vsi->num_txq = offset + qcount_tx;
+	if (vsi->num_txq > vsi->alloc_txq) {
+		dev_err(ice_pf_to_dev(vsi->back), "Trying to use more Tx queues (%u), than were allocated (%u)!\n",
+			vsi->num_txq, vsi->alloc_txq);
+		return -EINVAL;
+	}
 	vsi->num_rxq = offset + qcount_rx;
+	if (vsi->num_rxq > vsi->alloc_rxq) {
+		dev_err(ice_pf_to_dev(vsi->back), "Trying to use more Rx queues (%u), than were allocated (%u)!\n",
+			vsi->num_rxq, vsi->alloc_rxq);
+		return -EINVAL;
+	}
 	/* Setup queue TC[0].qmap for given VSI context */
 	ctxt->info.tc_mapping[0] = cpu_to_le16(qmap);
 	dev_dbg(ice_pf_to_dev(vsi->back), "vsi->num_rxq = %d\n",  vsi->num_rxq);
 	dev_dbg(ice_pf_to_dev(vsi->back), "all_numtc %u, all_enatc: 0x%04x, tc_cfg.numtc %u\n",
 		vsi->all_numtc, vsi->all_enatc, vsi->tc_cfg.numtc);
+	return 0;
 }
 /**
 	if (vsi->type == ICE_VSI_PF &&
 	    test_bit(ICE_FLAG_TC_MQPRIO, pf->flags))
-		ice_vsi_setup_q_map_mqprio(vsi, ctx, ena_tc);
+		ret = ice_vsi_setup_q_map_mqprio(vsi, ctx, ena_tc);
 	else
-		ice_vsi_setup_q_map(vsi, ctx);
+		ret = ice_vsi_setup_q_map(vsi, ctx);
+	if (ret)
+		goto out;
 	/* must to indicate which section of VSI context are being modified */
 	ctx->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_RXQ_MAP_VALID);

drivers/net/ethernet/intel/ice/ice_main.c+31−18

@@ -5763,25 +5763,38 @@ static netdev_features_t · 5762 unmodified lines
5763	ice_fix_features(struct net_device *netdev, netdev_features_t features)	5763	ice_fix_features(struct net_device *netdev, netdev_features_t features)
5764	{	5764	{
5765	struct ice_netdev_priv *np = netdev_priv(netdev);	5765	struct ice_netdev_priv *np = netdev_priv(netdev);
5766	netdev_features_t supported_vlan_filtering;	5766	netdev_features_t req_vlan_fltr, cur_vlan_fltr;
5767	netdev_features_t requested_vlan_filtering;	5767	bool cur_ctag, cur_stag, req_ctag, req_stag;
5768	struct ice_vsi *vsi = np->vsi;	5768
5769		5769	cur_vlan_fltr = netdev->features & NETIF_VLAN_FILTERING_FEATURES;
5770	requested_vlan_filtering = features & NETIF_VLAN_FILTERING_FEATURES;	5770	cur_ctag = cur_vlan_fltr & NETIF_F_HW_VLAN_CTAG_FILTER;
5771		5771	cur_stag = cur_vlan_fltr & NETIF_F_HW_VLAN_STAG_FILTER;
5772	/* make sure supported_vlan_filtering works for both SVM and DVM */	5772
5773	supported_vlan_filtering = NETIF_F_HW_VLAN_CTAG_FILTER;	5773	req_vlan_fltr = features & NETIF_VLAN_FILTERING_FEATURES;
5774	if (ice_is_dvm_ena(&vsi->back->hw))	5774	req_ctag = req_vlan_fltr & NETIF_F_HW_VLAN_CTAG_FILTER;
5775	supported_vlan_filtering \|= NETIF_F_HW_VLAN_STAG_FILTER;	5775	req_stag = req_vlan_fltr & NETIF_F_HW_VLAN_STAG_FILTER;
5776		5776
5777	if (requested_vlan_filtering &&	5777	if (req_vlan_fltr != cur_vlan_fltr) {
5778	requested_vlan_filtering != supported_vlan_filtering) {	5778	if (ice_is_dvm_ena(&np->vsi->back->hw)) {
5779	if (requested_vlan_filtering & NETIF_F_HW_VLAN_CTAG_FILTER) {	5779	if (req_ctag && req_stag) {
5780	netdev_warn(netdev, "cannot support requested VLAN filtering settings, enabling all supported VLAN filtering settings\n");	5780	features \|= NETIF_VLAN_FILTERING_FEATURES;
5781	features \|= supported_vlan_filtering;	5781	} else if (!req_ctag && !req_stag) {
		5782	features &= ~NETIF_VLAN_FILTERING_FEATURES;
		5783	} else if ((!cur_ctag && req_ctag && !cur_stag) \|\|
		5784	(!cur_stag && req_stag && !cur_ctag)) {
		5785	features \|= NETIF_VLAN_FILTERING_FEATURES;
		5786	netdev_warn(netdev, "802.1Q and 802.1ad VLAN filtering must be either both on or both off. VLAN filtering has been enabled for both types.\n");
		5787	} else if ((cur_ctag && !req_ctag && cur_stag) \|\|
		5788	(cur_stag && !req_stag && cur_ctag)) {
		5789	features &= ~NETIF_VLAN_FILTERING_FEATURES;
		5790	netdev_warn(netdev, "802.1Q and 802.1ad VLAN filtering must be either both on or both off. VLAN filtering has been disabled for both types.\n");
		5791	}
5782	} else {	5792	} else {
5783	netdev_warn(netdev, "cannot support requested VLAN filtering settings, clearing all supported VLAN filtering settings\n");	5793	if (req_vlan_fltr & NETIF_F_HW_VLAN_STAG_FILTER)
5784	features &= ~supported_vlan_filtering;	5794	netdev_warn(netdev, "cannot support requested 802.1ad filtering setting in SVM mode\n");
		5795
		5796	if (req_vlan_fltr & NETIF_F_HW_VLAN_CTAG_FILTER)
		5797	features \|= NETIF_F_HW_VLAN_CTAG_FILTER;
5785	}	5798	}
5786	}	5799	}
5787		5800

drivers/net/ethernet/intel/ice/ice_ptp.c+1−1

@@ -2271,7 +2271,7 @@ static int · 2270 unmodified lines
2271	ice_ptp_init_tx_e822(struct ice_pf pf, struct ice_ptp_tx tx, u8 port)	2271	ice_ptp_init_tx_e822(struct ice_pf pf, struct ice_ptp_tx tx, u8 port)
2272	{	2272	{
2273	tx->quad = port / ICE_PORTS_PER_QUAD;	2273	tx->quad = port / ICE_PORTS_PER_QUAD;
2274	tx->quad_offset = tx->quad * INDEX_PER_PORT;	2274	tx->quad_offset = (port % ICE_PORTS_PER_QUAD) * INDEX_PER_PORT;
2275	tx->len = INDEX_PER_PORT;	2275	tx->len = INDEX_PER_PORT;
2276		2276
2277	return ice_ptp_alloc_tx_tracker(tx);	2277	return ice_ptp_alloc_tx_tracker(tx);

drivers/net/ethernet/intel/ice/ice_ptp.h+31−0

@@ -49,6 +49,37 @@ struct ice_perout_channel { · 48 unmodified lines
49	* To allow multiple ports to access the shared register block independently,	49	* To allow multiple ports to access the shared register block independently,
50	* the blocks are split up so that indexes are assigned to each port based on	50	* the blocks are split up so that indexes are assigned to each port based on
51	* hardware logical port number.	51	* hardware logical port number.
		52	*
		53	* The timestamp blocks are handled differently for E810- and E822-based
		54	* devices. In E810 devices, each port has its own block of timestamps, while in
		55	* E822 there is a need to logically break the block of registers into smaller
		56	* chunks based on the port number to avoid collisions.
		57	*
		58	* Example for port 5 in E810:
		59	* +--------+--------+--------+--------+--------+--------+--------+--------+
		60	* \|register\|register\|register\|register\|register\|register\|register\|register\|
		61	* \| block \| block \| block \| block \| block \| block \| block \| block \|
		62	* \| for \| for \| for \| for \| for \| for \| for \| for \|
		63	* \| port 0 \| port 1 \| port 2 \| port 3 \| port 4 \| port 5 \| port 6 \| port 7 \|
		64	* +--------+--------+--------+--------+--------+--------+--------+--------+
		65	* ^^
		66	* \|\|
		67	* \|--- quad offset is always 0
		68	* ---- quad number
		69	*
		70	* Example for port 5 in E822:
		71	* +-----------------------------+-----------------------------+
		72	* \| register block for quad 0 \| register block for quad 1 \|
		73	* \|+------+------+------+------+\|+------+------+------+------+\|
		74	* \|\|port 0\|port 1\|port 2\|port 3\|\|\|port 0\|port 1\|port 2\|port 3\|\|
		75	* \|+------+------+------+------+\|+------+------+------+------+\|
		76	* +-----------------------------+-------^---------------------+
		77	* ^ \|
		78	* \| --- quad offset*
		79	* ---- quad number
		80	*
		81	* * PHY port 5 is port 1 in quad 1
		82	*
52	*/	83	*/
53		84
54	/**	85	/**

drivers/net/ethernet/intel/ice/ice_tc_lib.c+4−1

 	 */
 	fltr->rid = rule_added.rid;
 	fltr->rule_id = rule_added.rule_id;
+	fltr->dest_id = rule_added.vsi_handle;
 exit:
 	kfree(list);
 		n_proto_key = ntohs(match.key->n_proto);
 		n_proto_mask = ntohs(match.mask->n_proto);
-		if (n_proto_key == ETH_P_ALL || n_proto_key == 0) {
+		if (n_proto_key == ETH_P_ALL || n_proto_key == 0 ||
+		    fltr->tunnel_type == TNL_GTPU ||
+		    fltr->tunnel_type == TNL_GTPC) {
 			n_proto_key = 0;
 			n_proto_mask = 0;
 		} else {

drivers/net/ethernet/intel/ice/ice_vf_lib.c+5−0

 	}
 	if (ice_is_vf_disabled(vf)) {
+		vsi = ice_get_vf_vsi(vf);
+		if (WARN_ON(!vsi))
+			return -EINVAL;
+		ice_vsi_stop_lan_tx_rings(vsi, ICE_NO_RESET, vf->vf_id);
+		ice_vsi_stop_all_rx_rings(vsi);
 		dev_dbg(dev, "VF is already disabled, there is no need for resetting it, telling VM, all is fine %d\n",
 			vf->vf_id);
 		return 0;

drivers/net/ethernet/intel/ice/ice_virtchnl.c+26−27

  */
 static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)
 {
-	enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;
 	struct virtchnl_vsi_queue_config_info *qci =
 	    (struct virtchnl_vsi_queue_config_info *)msg;
 	struct virtchnl_queue_pair_info *qpi;
 	struct ice_pf *pf = vf->pf;
 	struct ice_vsi *vsi;
-	int i, q_idx;
+	int i = -1, q_idx;
-	if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {
+	if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states))
-		v_ret = VIRTCHNL_STATUS_ERR_PARAM;
 		goto error_param;
-	}
-	if (!ice_vc_isvalid_vsi_id(vf, qci->vsi_id)) {
+	if (!ice_vc_isvalid_vsi_id(vf, qci->vsi_id))
-		v_ret = VIRTCHNL_STATUS_ERR_PARAM;
 		goto error_param;
-	}
 	vsi = ice_get_vf_vsi(vf);
-	if (!vsi) {
+	if (!vsi)
-		v_ret = VIRTCHNL_STATUS_ERR_PARAM;
 		goto error_param;
-	}
 	if (qci->num_queue_pairs > ICE_MAX_RSS_QS_PER_VF ||
 	    qci->num_queue_pairs > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) {
 		dev_err(ice_pf_to_dev(pf), "VF-%d requesting more than supported number of queues: %d\n",
 			vf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq));
-		v_ret = VIRTCHNL_STATUS_ERR_PARAM;
 		goto error_param;
 	}
 		    !ice_vc_isvalid_ring_len(qpi->txq.ring_len) ||
 		    !ice_vc_isvalid_ring_len(qpi->rxq.ring_len) ||
 		    !ice_vc_isvalid_q_id(vf, qci->vsi_id, qpi->txq.queue_id)) {
-			v_ret = VIRTCHNL_STATUS_ERR_PARAM;
 			goto error_param;
 		}
 		 * for selected "vsi"
 		 */
 		if (q_idx >= vsi->alloc_txq || q_idx >= vsi->alloc_rxq) {
-			v_ret = VIRTCHNL_STATUS_ERR_PARAM;
 			goto error_param;
 		}
 			vsi->tx_rings[i]->count = qpi->txq.ring_len;
 			/* Disable any existing queue first */
-			if (ice_vf_vsi_dis_single_txq(vf, vsi, q_idx)) {
+			if (ice_vf_vsi_dis_single_txq(vf, vsi, q_idx))
-				v_ret = VIRTCHNL_STATUS_ERR_PARAM;
 				goto error_param;
-			}
 			/* Configure a queue with the requested settings */
 			if (ice_vsi_cfg_single_txq(vsi, vsi->tx_rings, q_idx)) {
-				v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+				dev_warn(ice_pf_to_dev(pf), "VF-%d failed to configure TX queue %d\n",
+					 vf->vf_id, i);
 				goto error_param;
 			}
 		}
 			if (qpi->rxq.databuffer_size != 0 &&
 			    (qpi->rxq.databuffer_size > ((16 * 1024) - 128) ||
-			     qpi->rxq.databuffer_size < 1024)) {
+			     qpi->rxq.databuffer_size < 1024))
-				v_ret = VIRTCHNL_STATUS_ERR_PARAM;
 				goto error_param;
-			}
 			vsi->rx_buf_len = qpi->rxq.databuffer_size;
 			vsi->rx_rings[i]->rx_buf_len = vsi->rx_buf_len;
 			if (qpi->rxq.max_pkt_size > max_frame_size ||
-			    qpi->rxq.max_pkt_size < 64) {
+			    qpi->rxq.max_pkt_size < 64)
-				v_ret = VIRTCHNL_STATUS_ERR_PARAM;
 				goto error_param;
-			}
 			vsi->max_frame = qpi->rxq.max_pkt_size;
 			/* add space for the port VLAN since the VF driver is
 				vsi->max_frame += VLAN_HLEN;
 			if (ice_vsi_cfg_single_rxq(vsi, q_idx)) {
-				v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+				dev_warn(ice_pf_to_dev(pf), "VF-%d failed to configure RX queue %d\n",
+					 vf->vf_id, i);
 				goto error_param;
 			}
 		}
 	}
+	/* send the response to the VF */
+	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_VSI_QUEUES,
+				     VIRTCHNL_STATUS_SUCCESS, NULL, 0);
 error_param:
+	/* disable whatever we can */
+	for (; i >= 0; i--) {
+		if (ice_vsi_ctrl_one_rx_ring(vsi, false, i, true))
+			dev_err(ice_pf_to_dev(pf), "VF-%d could not disable RX queue %d\n",
+				vf->vf_id, i);
+		if (ice_vf_vsi_dis_single_txq(vf, vsi, i))
+			dev_err(ice_pf_to_dev(pf), "VF-%d could not disable TX queue %d\n",
+				vf->vf_id, i);
+	}
 	/* send the response to the VF */
-	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_VSI_QUEUES, v_ret,
+	return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_VSI_QUEUES,
-				     NULL, 0);
+				     VIRTCHNL_STATUS_ERR_PARAM, NULL, 0);
 }
 /**

drivers/net/ethernet/intel/igb/igb_main.c+10−9

 	while (i != tx_ring->next_to_use) {
 		union e1000_adv_tx_desc *eop_desc, *tx_desc;
-		/* Free all the Tx ring sk_buffs */
+		/* Free all the Tx ring sk_buffs or xdp frames */
-		dev_kfree_skb_any(tx_buffer->skb);
+		if (tx_buffer->type == IGB_TYPE_SKB)
+			dev_kfree_skb_any(tx_buffer->skb);
+		else
+			xdp_return_frame(tx_buffer->xdpf);
 		/* unmap skb header data */
 		dma_unmap_single(tx_ring->dev,
 	struct e1000_hw *hw = &adapter->hw;
 	u32 dmac_thr;
 	u16 hwm;
+	u32 reg;
 	if (hw->mac.type > e1000_82580) {
 		if (adapter->flags & IGB_FLAG_DMAC) {
-			u32 reg;
 			/* force threshold to 0. */
 			wr32(E1000_DMCTXTH, 0);
 			/* Disable BMC-to-OS Watchdog Enable */
 			if (hw->mac.type != e1000_i354)
 				reg &= ~E1000_DMACR_DC_BMC2OSW_EN;
 			wr32(E1000_DMACR, reg);
 			/* no lower threshold to disable
 			 */
 			wr32(E1000_DMCTXTH, (IGB_MIN_TXPBSIZE -
 			     (IGB_TX_BUF_4096 + adapter->max_frame_size)) >> 6);
+		}
-			/* make low power state decision controlled
+		if (hw->mac.type >= e1000_i210 ||
-			 * by DMA coal
+		    (adapter->flags & IGB_FLAG_DMAC)) {
-			 */
 			reg = rd32(E1000_PCIEMISC);
-			reg &= ~E1000_PCIEMISC_LX_DECISION;
+			reg |= E1000_PCIEMISC_LX_DECISION;
 			wr32(E1000_PCIEMISC, reg);
 		} /* endif adapter->dmac is not disabled */
 	} else if (hw->mac.type == e1000_82580) {

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

@@ -1390,7 +1390,8 @@ static int otx2vf_get_link_ksettings(struct net_device *netdev, · 1389 unmodified lines
1390		1390
1391	static const struct ethtool_ops otx2vf_ethtool_ops = {	1391	static const struct ethtool_ops otx2vf_ethtool_ops = {
1392	.supported_coalesce_params = ETHTOOL_COALESCE_USECS \|	1392	.supported_coalesce_params = ETHTOOL_COALESCE_USECS \|
1393	ETHTOOL_COALESCE_MAX_FRAMES,	1393	ETHTOOL_COALESCE_MAX_FRAMES \|
		1394	ETHTOOL_COALESCE_USE_ADAPTIVE,
1394	.supported_ring_params = ETHTOOL_RING_USE_RX_BUF_LEN \|	1395	.supported_ring_params = ETHTOOL_RING_USE_RX_BUF_LEN \|
1395	ETHTOOL_RING_USE_CQE_SIZE,	1396	ETHTOOL_RING_USE_CQE_SIZE,
1396	.get_link = otx2_get_link,	1397	.get_link = otx2_get_link,

drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.h+1−1

@@ -8,8 +8,8 @@ · 7 unmodified lines
8	#include "spectrum.h"	8	#include "spectrum.h"
9		9
10	enum mlxsw_sp_counter_sub_pool_id {	10	enum mlxsw_sp_counter_sub_pool_id {
11	MLXSW_SP_COUNTER_SUB_POOL_FLOW,
12	MLXSW_SP_COUNTER_SUB_POOL_RIF,	11	MLXSW_SP_COUNTER_SUB_POOL_RIF,
		12	MLXSW_SP_COUNTER_SUB_POOL_FLOW,
13	};	13	};
14		14
15	int mlxsw_sp_counter_alloc(struct mlxsw_sp *mlxsw_sp,	15	int mlxsw_sp_counter_alloc(struct mlxsw_sp *mlxsw_sp,

drivers/net/ethernet/xilinx/xilinx_axienet.h+51−0

@@ -547,6 +547,57 @@ static inline void axienet_iow(struct axienet_local *lp, off_t offset, · 546 unmodified lines
547	iowrite32(value, lp->regs + offset);	547	iowrite32(value, lp->regs + offset);
548	}	548	}
549		549
		550	/**
		551	* axienet_dma_out32 - Memory mapped Axi DMA register write.
		552	* @lp: Pointer to axienet local structure
		553	* @reg: Address offset from the base address of the Axi DMA core
		554	* @value: Value to be written into the Axi DMA register
		555	*
		556	* This function writes the desired value into the corresponding Axi DMA
		557	* register.
		558	*/
		559
		560	static inline void axienet_dma_out32(struct axienet_local *lp,
		561	off_t reg, u32 value)
		562	{
		563	iowrite32(value, lp->dma_regs + reg);
		564	}
		565
		566	#if defined(CONFIG_64BIT) && defined(iowrite64)
		567	/**
		568	* axienet_dma_out64 - Memory mapped Axi DMA register write.
		569	* @lp: Pointer to axienet local structure
		570	* @reg: Address offset from the base address of the Axi DMA core
		571	* @value: Value to be written into the Axi DMA register
		572	*
		573	* This function writes the desired value into the corresponding Axi DMA
		574	* register.
		575	*/
		576	static inline void axienet_dma_out64(struct axienet_local *lp,
		577	off_t reg, u64 value)
		578	{
		579	iowrite64(value, lp->dma_regs + reg);
		580	}
		581
		582	static inline void axienet_dma_out_addr(struct axienet_local *lp, off_t reg,
		583	dma_addr_t addr)
		584	{
		585	if (lp->features & XAE_FEATURE_DMA_64BIT)
		586	axienet_dma_out64(lp, reg, addr);
		587	else
		588	axienet_dma_out32(lp, reg, lower_32_bits(addr));
		589	}
		590
		591	#else /* CONFIG_64BIT */
		592
		593	static inline void axienet_dma_out_addr(struct axienet_local *lp, off_t reg,
		594	dma_addr_t addr)
		595	{
		596	axienet_dma_out32(lp, reg, lower_32_bits(addr));
		597	}
		598
		599	#endif /* CONFIG_64BIT */
		600
550	/* Function prototypes visible in xilinx_axienet_mdio.c for other files */	601	/* Function prototypes visible in xilinx_axienet_mdio.c for other files */
551	int axienet_mdio_enable(struct axienet_local *lp);	602	int axienet_mdio_enable(struct axienet_local *lp);
552	void axienet_mdio_disable(struct axienet_local *lp);	603	void axienet_mdio_disable(struct axienet_local *lp);

drivers/net/ethernet/xilinx/xilinx_axienet_main.c+5−24

@@ -133,30 +133,6 @@ static inline u32 axienet_dma_in32(struct axienet_local *lp, off_t reg) · 132 unmodified lines
133	return ioread32(lp->dma_regs + reg);	133	return ioread32(lp->dma_regs + reg);
134	}	134	}
135		135
136	/**
137	* axienet_dma_out32 - Memory mapped Axi DMA register write.
138	* @lp: Pointer to axienet local structure
139	* @reg: Address offset from the base address of the Axi DMA core
140	* @value: Value to be written into the Axi DMA register
141	*
142	* This function writes the desired value into the corresponding Axi DMA
143	* register.
144	*/
145	static inline void axienet_dma_out32(struct axienet_local *lp,
146	off_t reg, u32 value)
147	{
148	iowrite32(value, lp->dma_regs + reg);
149	}
150
151	static void axienet_dma_out_addr(struct axienet_local *lp, off_t reg,
152	dma_addr_t addr)
153	{
154	axienet_dma_out32(lp, reg, lower_32_bits(addr));
155
156	if (lp->features & XAE_FEATURE_DMA_64BIT)
157	axienet_dma_out32(lp, reg + 4, upper_32_bits(addr));
158	}
159
160	static void desc_set_phys_addr(struct axienet_local *lp, dma_addr_t addr,	136	static void desc_set_phys_addr(struct axienet_local *lp, dma_addr_t addr,
161	struct axidma_bd *desc)	137	struct axidma_bd *desc)
162	{	138	{
@@ -2061,6 +2037,11 @@ static int axienet_probe(struct platform_device *pdev) · 1898 unmodified lines
2061	iowrite32(0x0, desc);	2037	iowrite32(0x0, desc);
2062	}	2038	}
2063	}	2039	}
		2040	if (!IS_ENABLED(CONFIG_64BIT) && lp->features & XAE_FEATURE_DMA_64BIT) {
		2041	dev_err(&pdev->dev, "64-bit addressable DMA is not compatible with 32-bit archecture\n");
		2042	ret = -EINVAL;
		2043	goto cleanup_clk;
		2044	}
2064		2045
2065	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(addr_width));	2046	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(addr_width));
2066	if (ret) {	2047	if (ret) {

drivers/net/hamradio/6pack.c+8−1

 	unsigned int		rx_count;
 	unsigned int		rx_count_cooked;
+	spinlock_t		rxlock;
 	int			mtu;		/* Our mtu (to spot changes!) */
 	int			buffsize;       /* Max buffers sizes */
 	sp->dev = dev;
 	spin_lock_init(&sp->lock);
+	spin_lock_init(&sp->rxlock);
 	refcount_set(&sp->refcnt, 1);
 	init_completion(&sp->dead);
 			sp->led_state = 0x60;
 			/* fill trailing bytes with zeroes */
 			sp->tty->ops->write(sp->tty, &sp->led_state, 1);
+			spin_lock_bh(&sp->rxlock);
 			rest = sp->rx_count;
 			if (rest != 0)
 				 for (i = rest; i <= 3; i++)
 				sp_bump(sp, 0);
 			}
 			sp->rx_count_cooked = 0;
+			spin_unlock_bh(&sp->rxlock);
 		}
 		break;
 	case SIXP_TX_URUN: printk(KERN_DEBUG "6pack: TX underrun\n");
 			decode_prio_command(sp, inbyte);
 		else if ((inbyte & SIXP_STD_CMD_MASK) != 0)
 			decode_std_command(sp, inbyte);
-		else if ((sp->status & SIXP_RX_DCD_MASK) == SIXP_RX_DCD_MASK)
+		else if ((sp->status & SIXP_RX_DCD_MASK) == SIXP_RX_DCD_MASK) {
+			spin_lock_bh(&sp->rxlock);
 			decode_data(sp, inbyte);
+			spin_unlock_bh(&sp->rxlock);
+		}
 	}
 }

drivers/net/phy/aquantia_main.c+14−1

 #define MDIO_AN_VEND_PROV			0xc400
 #define MDIO_AN_VEND_PROV_1000BASET_FULL	BIT(15)
 #define MDIO_AN_VEND_PROV_1000BASET_HALF	BIT(14)
+#define MDIO_AN_VEND_PROV_5000BASET_FULL	BIT(11)
+#define MDIO_AN_VEND_PROV_2500BASET_FULL	BIT(10)
 #define MDIO_AN_VEND_PROV_DOWNSHIFT_EN		BIT(4)
 #define MDIO_AN_VEND_PROV_DOWNSHIFT_MASK	GENMASK(3, 0)
 #define MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT	4
 			      phydev->advertising))
 		reg |= MDIO_AN_VEND_PROV_1000BASET_HALF;
+	/* Handle the case when the 2.5G and 5G speeds are not advertised */
+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
+			      phydev->advertising))
+		reg |= MDIO_AN_VEND_PROV_2500BASET_FULL;
+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
+			      phydev->advertising))
+		reg |= MDIO_AN_VEND_PROV_5000BASET_FULL;
 	ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_VEND_PROV,
 				     MDIO_AN_VEND_PROV_1000BASET_HALF |
-				     MDIO_AN_VEND_PROV_1000BASET_FULL, reg);
+				     MDIO_AN_VEND_PROV_1000BASET_FULL |
+				     MDIO_AN_VEND_PROV_2500BASET_FULL |
+				     MDIO_AN_VEND_PROV_5000BASET_FULL, reg);
 	if (ret < 0)
 		return ret;
 	if (ret > 0)

drivers/net/phy/at803x.c+6−0

 	/* ATHEROS AR9331 */
 	PHY_ID_MATCH_EXACT(ATH9331_PHY_ID),
 	.name			= "Qualcomm Atheros AR9331 built-in PHY",
+	.probe			= at803x_probe,
+	.remove			= at803x_remove,
 	.suspend		= at803x_suspend,
 	.resume			= at803x_resume,
 	.flags			= PHY_POLL_CABLE_TEST,
 	/* Qualcomm Atheros QCA9561 */
 	PHY_ID_MATCH_EXACT(QCA9561_PHY_ID),
 	.name			= "Qualcomm Atheros QCA9561 built-in PHY",
+	.probe			= at803x_probe,
+	.remove			= at803x_remove,
 	.suspend		= at803x_suspend,
 	.resume			= at803x_resume,
 	.flags			= PHY_POLL_CABLE_TEST,
 	PHY_ID_MATCH_EXACT(QCA8081_PHY_ID),
 	.name			= "Qualcomm QCA8081",
 	.flags			= PHY_POLL_CABLE_TEST,
+	.probe			= at803x_probe,
+	.remove			= at803x_remove,
 	.config_intr		= at803x_config_intr,
 	.handle_interrupt	= at803x_handle_interrupt,
 	.get_tunable		= at803x_get_tunable,

drivers/net/phy/smsc.c+4−2

 	struct smsc_phy_priv *priv = phydev->priv;
 	int rc;
-	if (!priv->energy_enable)
+	if (!priv->energy_enable || phydev->irq != PHY_POLL)
 		return 0;
 	rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
  * response on link pulses to detect presence of plugged Ethernet cable.
  * The Energy Detect Power-Down mode is enabled again in the end of procedure to
  * save approximately 220 mW of power if cable is unplugged.
+ * The workaround is only applicable to poll mode. Energy Detect Power-Down may
+ * not be used in interrupt mode lest link change detection becomes unreliable.
  */
 static int lan87xx_read_status(struct phy_device *phydev)
 {
 	int err = genphy_read_status(phydev);
-	if (!phydev->link && priv->energy_enable) {
+	if (!phydev->link && priv->energy_enable && phydev->irq == PHY_POLL) {
 		/* Disable EDPD to wake up PHY */
 		int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
 		if (rc < 0)

drivers/net/usb/ax88179_178a.c+13−13

@@ -1750,7 +1750,7 @@ static const struct driver_info ax88179_info = { · 1749 unmodified lines
1750	.link_reset = ax88179_link_reset,	1750	.link_reset = ax88179_link_reset,
1751	.reset = ax88179_reset,	1751	.reset = ax88179_reset,
1752	.stop = ax88179_stop,	1752	.stop = ax88179_stop,
1753	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1753	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1754	.rx_fixup = ax88179_rx_fixup,	1754	.rx_fixup = ax88179_rx_fixup,
1755	.tx_fixup = ax88179_tx_fixup,	1755	.tx_fixup = ax88179_tx_fixup,
1756	};	1756	};
@@ -1763,7 +1763,7 @@ static const struct driver_info ax88178a_info = { · 6 unmodified lines
1763	.link_reset = ax88179_link_reset,	1763	.link_reset = ax88179_link_reset,
1764	.reset = ax88179_reset,	1764	.reset = ax88179_reset,
1765	.stop = ax88179_stop,	1765	.stop = ax88179_stop,
1766	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1766	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1767	.rx_fixup = ax88179_rx_fixup,	1767	.rx_fixup = ax88179_rx_fixup,
1768	.tx_fixup = ax88179_tx_fixup,	1768	.tx_fixup = ax88179_tx_fixup,
1769	};	1769	};
@@ -1776,7 +1776,7 @@ static const struct driver_info cypress_GX3_info = { · 6 unmodified lines
1776	.link_reset = ax88179_link_reset,	1776	.link_reset = ax88179_link_reset,
1777	.reset = ax88179_reset,	1777	.reset = ax88179_reset,
1778	.stop = ax88179_stop,	1778	.stop = ax88179_stop,
1779	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1779	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1780	.rx_fixup = ax88179_rx_fixup,	1780	.rx_fixup = ax88179_rx_fixup,
1781	.tx_fixup = ax88179_tx_fixup,	1781	.tx_fixup = ax88179_tx_fixup,
1782	};	1782	};
@@ -1789,7 +1789,7 @@ static const struct driver_info dlink_dub1312_info = { · 6 unmodified lines
1789	.link_reset = ax88179_link_reset,	1789	.link_reset = ax88179_link_reset,
1790	.reset = ax88179_reset,	1790	.reset = ax88179_reset,
1791	.stop = ax88179_stop,	1791	.stop = ax88179_stop,
1792	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1792	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1793	.rx_fixup = ax88179_rx_fixup,	1793	.rx_fixup = ax88179_rx_fixup,
1794	.tx_fixup = ax88179_tx_fixup,	1794	.tx_fixup = ax88179_tx_fixup,
1795	};	1795	};
@@ -1802,7 +1802,7 @@ static const struct driver_info sitecom_info = { · 6 unmodified lines
1802	.link_reset = ax88179_link_reset,	1802	.link_reset = ax88179_link_reset,
1803	.reset = ax88179_reset,	1803	.reset = ax88179_reset,
1804	.stop = ax88179_stop,	1804	.stop = ax88179_stop,
1805	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1805	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1806	.rx_fixup = ax88179_rx_fixup,	1806	.rx_fixup = ax88179_rx_fixup,
1807	.tx_fixup = ax88179_tx_fixup,	1807	.tx_fixup = ax88179_tx_fixup,
1808	};	1808	};
@@ -1815,7 +1815,7 @@ static const struct driver_info samsung_info = { · 6 unmodified lines
1815	.link_reset = ax88179_link_reset,	1815	.link_reset = ax88179_link_reset,
1816	.reset = ax88179_reset,	1816	.reset = ax88179_reset,
1817	.stop = ax88179_stop,	1817	.stop = ax88179_stop,
1818	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1818	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1819	.rx_fixup = ax88179_rx_fixup,	1819	.rx_fixup = ax88179_rx_fixup,
1820	.tx_fixup = ax88179_tx_fixup,	1820	.tx_fixup = ax88179_tx_fixup,
1821	};	1821	};
@@ -1828,7 +1828,7 @@ static const struct driver_info lenovo_info = { · 6 unmodified lines
1828	.link_reset = ax88179_link_reset,	1828	.link_reset = ax88179_link_reset,
1829	.reset = ax88179_reset,	1829	.reset = ax88179_reset,
1830	.stop = ax88179_stop,	1830	.stop = ax88179_stop,
1831	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1831	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1832	.rx_fixup = ax88179_rx_fixup,	1832	.rx_fixup = ax88179_rx_fixup,
1833	.tx_fixup = ax88179_tx_fixup,	1833	.tx_fixup = ax88179_tx_fixup,
1834	};	1834	};
@@ -1841,7 +1841,7 @@ static const struct driver_info belkin_info = { · 6 unmodified lines
1841	.link_reset = ax88179_link_reset,	1841	.link_reset = ax88179_link_reset,
1842	.reset = ax88179_reset,	1842	.reset = ax88179_reset,
1843	.stop = ax88179_stop,	1843	.stop = ax88179_stop,
1844	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1844	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1845	.rx_fixup = ax88179_rx_fixup,	1845	.rx_fixup = ax88179_rx_fixup,
1846	.tx_fixup = ax88179_tx_fixup,	1846	.tx_fixup = ax88179_tx_fixup,
1847	};	1847	};
@@ -1854,7 +1854,7 @@ static const struct driver_info toshiba_info = { · 6 unmodified lines
1854	.link_reset = ax88179_link_reset,	1854	.link_reset = ax88179_link_reset,
1855	.reset = ax88179_reset,	1855	.reset = ax88179_reset,
1856	.stop = ax88179_stop,	1856	.stop = ax88179_stop,
1857	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1857	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1858	.rx_fixup = ax88179_rx_fixup,	1858	.rx_fixup = ax88179_rx_fixup,
1859	.tx_fixup = ax88179_tx_fixup,	1859	.tx_fixup = ax88179_tx_fixup,
1860	};	1860	};
@@ -1867,7 +1867,7 @@ static const struct driver_info mct_info = { · 6 unmodified lines
1867	.link_reset = ax88179_link_reset,	1867	.link_reset = ax88179_link_reset,
1868	.reset = ax88179_reset,	1868	.reset = ax88179_reset,
1869	.stop = ax88179_stop,	1869	.stop = ax88179_stop,
1870	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1870	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1871	.rx_fixup = ax88179_rx_fixup,	1871	.rx_fixup = ax88179_rx_fixup,
1872	.tx_fixup = ax88179_tx_fixup,	1872	.tx_fixup = ax88179_tx_fixup,
1873	};	1873	};
@@ -1880,7 +1880,7 @@ static const struct driver_info at_umc2000_info = { · 6 unmodified lines
1880	.link_reset = ax88179_link_reset,	1880	.link_reset = ax88179_link_reset,
1881	.reset = ax88179_reset,	1881	.reset = ax88179_reset,
1882	.stop = ax88179_stop,	1882	.stop = ax88179_stop,
1883	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1883	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1884	.rx_fixup = ax88179_rx_fixup,	1884	.rx_fixup = ax88179_rx_fixup,
1885	.tx_fixup = ax88179_tx_fixup,	1885	.tx_fixup = ax88179_tx_fixup,
1886	};	1886	};
@@ -1893,7 +1893,7 @@ static const struct driver_info at_umc200_info = { · 6 unmodified lines
1893	.link_reset = ax88179_link_reset,	1893	.link_reset = ax88179_link_reset,
1894	.reset = ax88179_reset,	1894	.reset = ax88179_reset,
1895	.stop = ax88179_stop,	1895	.stop = ax88179_stop,
1896	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1896	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1897	.rx_fixup = ax88179_rx_fixup,	1897	.rx_fixup = ax88179_rx_fixup,
1898	.tx_fixup = ax88179_tx_fixup,	1898	.tx_fixup = ax88179_tx_fixup,
1899	};	1899	};
@@ -1906,7 +1906,7 @@ static const struct driver_info at_umc2000sp_info = { · 6 unmodified lines
1906	.link_reset = ax88179_link_reset,	1906	.link_reset = ax88179_link_reset,
1907	.reset = ax88179_reset,	1907	.reset = ax88179_reset,
1908	.stop = ax88179_stop,	1908	.stop = ax88179_stop,
1909	.flags = FLAG_ETHER \| FLAG_FRAMING_AX,	1909	.flags = FLAG_ETHER \| FLAG_FRAMING_AX \| FLAG_SEND_ZLP,
1910	.rx_fixup = ax88179_rx_fixup,	1910	.rx_fixup = ax88179_rx_fixup,
1911	.tx_fixup = ax88179_tx_fixup,	1911	.tx_fixup = ax88179_tx_fixup,
1912	};	1912	};

drivers/net/veth.c+4−0

 static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct veth_priv *rcv_priv, *priv = netdev_priv(dev);
+	struct netdev_queue *queue = NULL;
 	struct veth_rq *rq = NULL;
 	struct net_device *rcv;
 	int length = skb->len;
 	rxq = skb_get_queue_mapping(skb);
 	if (rxq < rcv->real_num_rx_queues) {
 		rq = &rcv_priv->rq[rxq];
+		queue = netdev_get_tx_queue(dev, rxq);
 		/* The napi pointer is available when an XDP program is
 		 * attached or when GRO is enabled
 	skb_tx_timestamp(skb);
 	if (likely(veth_forward_skb(rcv, skb, rq, use_napi) == NET_RX_SUCCESS)) {
+		if (queue)
+			txq_trans_cond_update(queue);
 		if (!use_napi)
 			dev_lstats_add(dev, length);
 	} else {

drivers/net/virtio_net.c+6−19

@@ -2768,7 +2768,6 @@ static const struct ethtool_ops virtnet_ethtool_ops = { · 2767 unmodified lines
2768	static void virtnet_freeze_down(struct virtio_device *vdev)	2768	static void virtnet_freeze_down(struct virtio_device *vdev)
2769	{	2769	{
2770	struct virtnet_info *vi = vdev->priv;	2770	struct virtnet_info *vi = vdev->priv;
2771	int i;
2772		2771
2773	/* Make sure no work handler is accessing the device */	2772	/* Make sure no work handler is accessing the device */
2774	flush_work(&vi->config_work);	2773	flush_work(&vi->config_work);
@@ -2776,14 +2775,8 @@ static void virtnet_freeze_down(struct virtio_device *vdev) · 1 unmodified line
2776	netif_tx_lock_bh(vi->dev);	2775	netif_tx_lock_bh(vi->dev);
2777	netif_device_detach(vi->dev);	2776	netif_device_detach(vi->dev);
2778	netif_tx_unlock_bh(vi->dev);	2777	netif_tx_unlock_bh(vi->dev);
2779	cancel_delayed_work_sync(&vi->refill);	2778	if (netif_running(vi->dev))
2780		2779	virtnet_close(vi->dev);
2781	if (netif_running(vi->dev)) {
2782	for (i = 0; i < vi->max_queue_pairs; i++) {
2783	napi_disable(&vi->rq[i].napi);
2784	virtnet_napi_tx_disable(&vi->sq[i].napi);
2785	}
2786	}
2787	}	2780	}
2788		2781
2789	static int init_vqs(struct virtnet_info *vi);	2782	static int init_vqs(struct virtnet_info *vi);
@@ -2791,7 +2784,7 @@ static int init_vqs(struct virtnet_info *vi); · 1 unmodified line
2791	static int virtnet_restore_up(struct virtio_device *vdev)	2784	static int virtnet_restore_up(struct virtio_device *vdev)
2792	{	2785	{
2793	struct virtnet_info *vi = vdev->priv;	2786	struct virtnet_info *vi = vdev->priv;
2794	int err, i;	2787	int err;
2795		2788
2796	err = init_vqs(vi);	2789	err = init_vqs(vi);
2797	if (err)	2790	if (err)
@@ -2800,15 +2793,9 @@ static int virtnet_restore_up(struct virtio_device *vdev) · 2 unmodified lines
2800	virtio_device_ready(vdev);	2793	virtio_device_ready(vdev);
2801		2794
2802	if (netif_running(vi->dev)) {	2795	if (netif_running(vi->dev)) {
2803	for (i = 0; i < vi->curr_queue_pairs; i++)	2796	err = virtnet_open(vi->dev);
2804	if (!try_fill_recv(vi, &vi->rq[i], GFP_KERNEL))	2797	if (err)
2805	schedule_delayed_work(&vi->refill, 0);	2798	return err;
2806
2807	for (i = 0; i < vi->max_queue_pairs; i++) {
2808	virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi);
2809	virtnet_napi_tx_enable(vi, vi->sq[i].vq,
2810	&vi->sq[i].napi);
2811	}
2812	}	2799	}
2813		2800
2814	netif_tx_lock_bh(vi->dev);	2801	netif_tx_lock_bh(vi->dev);

drivers/nvme/host/core.c+17−2

 		.vid = 0x1e0f,
 		.mn = "KCD6XVUL6T40",
 		.quirks = NVME_QUIRK_NO_APST,
+	},
+	{
+		/*
+		 * The external Samsung X5 SSD fails initialization without a
+		 * delay before checking if it is ready and has a whole set of
+		 * other problems.  To make this even more interesting, it
+		 * shares the PCI ID with internal Samsung 970 Evo Plus that
+		 * does not need or want these quirks.
+		 */
+		.vid = 0x144d,
+		.mn = "Samsung Portable SSD X5",
+		.quirks = NVME_QUIRK_DELAY_BEFORE_CHK_RDY |
+			  NVME_QUIRK_NO_DEEPEST_PS |
+			  NVME_QUIRK_IGNORE_DEV_SUBNQN,
 	}
 };
 	 * we have no UUID set
 	 */
 	if (uuid_is_null(&ids->uuid)) {
-		printk_ratelimited(KERN_WARNING
+		dev_warn_ratelimited(dev,
-				   "No UUID available providing old NGUID\n");
+			"No UUID available providing old NGUID\n");
 		return sysfs_emit(buf, "%pU\n", ids->nguid);
 	}
 	return sysfs_emit(buf, "%pU\n", &ids->uuid);
 	if (ret) {
 		dev_err(ctrl->device,
 			"globally duplicate IDs for nsid %d\n", nsid);
+		nvme_print_device_info(ctrl);
 		return ret;
 	}

drivers/nvme/host/nvme.h+28−0

@@ -503,6 +503,7 @@ struct nvme_ctrl_ops { · 502 unmodified lines
503	void (submit_async_event)(struct nvme_ctrl ctrl);	503	void (submit_async_event)(struct nvme_ctrl ctrl);
504	void (delete_ctrl)(struct nvme_ctrl ctrl);	504	void (delete_ctrl)(struct nvme_ctrl ctrl);
505	int (get_address)(struct nvme_ctrl ctrl, char *buf, int size);	505	int (get_address)(struct nvme_ctrl ctrl, char *buf, int size);
		506	void (print_device_info)(struct nvme_ctrl ctrl);
506	};	507	};
507		508
508	/*	509	/*
@@ -548,6 +549,33 @@ static inline struct request nvme_cid_to_rq(struct blk_mq_tags tags, · 39 unmodified lines
548	return blk_mq_tag_to_rq(tags, nvme_tag_from_cid(command_id));	549	return blk_mq_tag_to_rq(tags, nvme_tag_from_cid(command_id));
549	}	550	}
550		551
		552	/*
		553	* Return the length of the string without the space padding
		554	*/
		555	static inline int nvme_strlen(char *s, int len)
		556	{
		557	while (s[len - 1] == ' ')
		558	len--;
		559	return len;
		560	}
		561
		562	static inline void nvme_print_device_info(struct nvme_ctrl *ctrl)
		563	{
		564	struct nvme_subsystem *subsys = ctrl->subsys;
		565
		566	if (ctrl->ops->print_device_info) {
		567	ctrl->ops->print_device_info(ctrl);
		568	return;
		569	}
		570
		571	dev_err(ctrl->device,
		572	"VID:%04x model:%.s firmware:%.s\n", subsys->vendor_id,
		573	nvme_strlen(subsys->model, sizeof(subsys->model)),
		574	subsys->model, nvme_strlen(subsys->firmware_rev,
		575	sizeof(subsys->firmware_rev)),
		576	subsys->firmware_rev);
		577	}
		578
551	#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS	579	#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
552	void nvme_fault_inject_init(struct nvme_fault_inject *fault_inj,	580	void nvme_fault_inject_init(struct nvme_fault_inject *fault_inj,
553	const char *dev_name);	581	const char *dev_name);

drivers/nvme/host/pci.c+44−5

 		dev_warn(dev->ctrl.device,
 			 "controller is down; will reset: CSTS=0x%x, PCI_STATUS read failed (%d)\n",
 			 csts, result);
+	if (csts != ~0)
+		return;
+	dev_warn(dev->ctrl.device,
+		 "Does your device have a faulty power saving mode enabled?\n");
+	dev_warn(dev->ctrl.device,
+		 "Try \"nvme_core.default_ps_max_latency_us=0 pcie_aspm=off\" and report a bug\n");
 }
 static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
 	return snprintf(buf, size, "%s\n", dev_name(&pdev->dev));
 }
+static void nvme_pci_print_device_info(struct nvme_ctrl *ctrl)
+{
+	struct pci_dev *pdev = to_pci_dev(to_nvme_dev(ctrl)->dev);
+	struct nvme_subsystem *subsys = ctrl->subsys;
+	dev_err(ctrl->device,
+		"VID:DID %04x:%04x model:%.*s firmware:%.*s\n",
+		pdev->vendor, pdev->device,
+		nvme_strlen(subsys->model, sizeof(subsys->model)),
+		subsys->model, nvme_strlen(subsys->firmware_rev,
+					   sizeof(subsys->firmware_rev)),
+		subsys->firmware_rev);
+}
 static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = {
 	.name			= "pcie",
 	.module			= THIS_MODULE,
 	.free_ctrl		= nvme_pci_free_ctrl,
 	.submit_async_event	= nvme_pci_submit_async_event,
 	.get_address		= nvme_pci_get_address,
+	.print_device_info	= nvme_pci_print_device_info,
 };
 static int nvme_dev_map(struct nvme_dev *dev)
 	{ PCI_VDEVICE(REDHAT, 0x0010),	/* Qemu emulated controller */
 		.driver_data = NVME_QUIRK_BOGUS_NID, },
 	{ PCI_DEVICE(0x126f, 0x2263),	/* Silicon Motion unidentified */
-		.driver_data = NVME_QUIRK_NO_NS_DESC_LIST, },
+		.driver_data = NVME_QUIRK_NO_NS_DESC_LIST |
+				NVME_QUIRK_BOGUS_NID, },
 	{ PCI_DEVICE(0x1bb1, 0x0100),   /* Seagate Nytro Flash Storage */
 		.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY |
 				NVME_QUIRK_NO_NS_DESC_LIST, },
 		.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY |
 				NVME_QUIRK_DISABLE_WRITE_ZEROES|
 				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
+	{ PCI_DEVICE(0x1987, 0x5012),	/* Phison E12 */
+		.driver_data = NVME_QUIRK_BOGUS_NID, },
 	{ PCI_DEVICE(0x1987, 0x5016),	/* Phison E16 */
 		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },
 	{ PCI_DEVICE(0x1b4b, 0x1092),	/* Lexar 256 GB SSD */
 	{ PCI_DEVICE(0x1cc1, 0x8201),   /* ADATA SX8200PNP 512GB */
 		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |
 				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
+	 { PCI_DEVICE(0x1344, 0x5407), /* Micron Technology Inc NVMe SSD */
+		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN },
 	{ PCI_DEVICE(0x1c5c, 0x1504),   /* SK Hynix PC400 */
 		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
+	{ PCI_DEVICE(0x1c5c, 0x174a),   /* SK Hynix P31 SSD */
+		.driver_data = NVME_QUIRK_BOGUS_NID, },
 	{ PCI_DEVICE(0x15b7, 0x2001),   /*  Sandisk Skyhawk */
 		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
 	{ PCI_DEVICE(0x1d97, 0x2263),   /* SPCC */
 		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
+	{ PCI_DEVICE(0x144d, 0xa80b),   /* Samsung PM9B1 256G and 512G */
+		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
+	{ PCI_DEVICE(0x144d, 0xa809),   /* Samsung MZALQ256HBJD 256G */
+		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
+	{ PCI_DEVICE(0x1cc4, 0x6303),   /* UMIS RPJTJ512MGE1QDY 512G */
+		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
+	{ PCI_DEVICE(0x1cc4, 0x6302),   /* UMIS RPJTJ256MGE1QDY 256G */
+		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
 	{ PCI_DEVICE(0x2646, 0x2262),   /* KINGSTON SKC2000 NVMe SSD */
 		.driver_data = NVME_QUIRK_NO_DEEPEST_PS, },
 	{ PCI_DEVICE(0x2646, 0x2263),   /* KINGSTON A2000 NVMe SSD  */
 		.driver_data = NVME_QUIRK_BOGUS_NID, },
 	{ PCI_DEVICE(0x1e4B, 0x1202),   /* MAXIO MAP1202 */
 		.driver_data = NVME_QUIRK_BOGUS_NID, },
+	{ PCI_DEVICE(0x1cc1, 0x5350),   /* ADATA XPG GAMMIX S50 */
+		.driver_data = NVME_QUIRK_BOGUS_NID, },
+	{ PCI_DEVICE(0x1e49, 0x0041),   /* ZHITAI TiPro7000 NVMe SSD */
+		.driver_data = NVME_QUIRK_NO_DEEPEST_PS, },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061),
 		.driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),
 				NVME_QUIRK_128_BYTES_SQES |
 				NVME_QUIRK_SHARED_TAGS |
 				NVME_QUIRK_SKIP_CID_GEN },
-	{ PCI_DEVICE(0x144d, 0xa808),   /* Samsung X5 */
-		.driver_data =  NVME_QUIRK_DELAY_BEFORE_CHK_RDY|
-				NVME_QUIRK_NO_DEEPEST_PS |
-				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
 	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
 	{ 0, }
 };

drivers/regulator/qcom_smd-regulator.c+4−4

@@ -723,19 +723,19 @@ static const struct regulator_desc pms405_pldo600 = { · 722 unmodified lines
723		723
724	static const struct regulator_desc mp5496_smpa2 = {	724	static const struct regulator_desc mp5496_smpa2 = {
725	.linear_ranges = (struct linear_range[]) {	725	.linear_ranges = (struct linear_range[]) {
726	REGULATOR_LINEAR_RANGE(725000, 0, 27, 12500),	726	REGULATOR_LINEAR_RANGE(600000, 0, 127, 12500),
727	},	727	},
728	.n_linear_ranges = 1,	728	.n_linear_ranges = 1,
729	.n_voltages = 28,	729	.n_voltages = 128,
730	.ops = &rpm_mp5496_ops,	730	.ops = &rpm_mp5496_ops,
731	};	731	};
732		732
733	static const struct regulator_desc mp5496_ldoa2 = {	733	static const struct regulator_desc mp5496_ldoa2 = {
734	.linear_ranges = (struct linear_range[]) {	734	.linear_ranges = (struct linear_range[]) {
735	REGULATOR_LINEAR_RANGE(1800000, 0, 60, 25000),	735	REGULATOR_LINEAR_RANGE(800000, 0, 127, 25000),
736	},	736	},
737	.n_linear_ranges = 1,	737	.n_linear_ranges = 1,
738	.n_voltages = 61,	738	.n_voltages = 128,
739	.ops = &rpm_mp5496_ops,	739	.ops = &rpm_mp5496_ops,
740	};	740	};
741		741

drivers/scsi/ibmvscsi/ibmvfc.c+64−18

@@ -160,8 +160,8 @@ static void ibmvfc_npiv_logout(struct ibmvfc_host *); · 159 unmodified lines
160	static void ibmvfc_tgt_implicit_logout_and_del(struct ibmvfc_target *);	160	static void ibmvfc_tgt_implicit_logout_and_del(struct ibmvfc_target *);
161	static void ibmvfc_tgt_move_login(struct ibmvfc_target *);	161	static void ibmvfc_tgt_move_login(struct ibmvfc_target *);
162		162
163	static void ibmvfc_release_sub_crqs(struct ibmvfc_host *);	163	static void ibmvfc_dereg_sub_crqs(struct ibmvfc_host *);
164	static void ibmvfc_init_sub_crqs(struct ibmvfc_host *);	164	static void ibmvfc_reg_sub_crqs(struct ibmvfc_host *);
165		165
166	static const char *unknown_error = "unknown error";	166	static const char *unknown_error = "unknown error";
167		167
@@ -917,7 +917,7 @@ static int ibmvfc_reenable_crq_queue(struct ibmvfc_host *vhost) · 749 unmodified lines
917	struct vio_dev *vdev = to_vio_dev(vhost->dev);	917	struct vio_dev *vdev = to_vio_dev(vhost->dev);
918	unsigned long flags;	918	unsigned long flags;
919		919
920	ibmvfc_release_sub_crqs(vhost);	920	ibmvfc_dereg_sub_crqs(vhost);
921		921
922	/* Re-enable the CRQ */	922	/* Re-enable the CRQ */
923	do {	923	do {
@@ -936,7 +936,7 @@ static int ibmvfc_reenable_crq_queue(struct ibmvfc_host *vhost) · 12 unmodified lines
936	spin_unlock(vhost->crq.q_lock);	936	spin_unlock(vhost->crq.q_lock);
937	spin_unlock_irqrestore(vhost->host->host_lock, flags);	937	spin_unlock_irqrestore(vhost->host->host_lock, flags);
938		938
939	ibmvfc_init_sub_crqs(vhost);	939	ibmvfc_reg_sub_crqs(vhost);
940		940
941	return rc;	941	return rc;
942	}	942	}
@@ -955,7 +955,7 @@ static int ibmvfc_reset_crq(struct ibmvfc_host *vhost) · 12 unmodified lines
955	struct vio_dev *vdev = to_vio_dev(vhost->dev);	955	struct vio_dev *vdev = to_vio_dev(vhost->dev);
956	struct ibmvfc_queue *crq = &vhost->crq;	956	struct ibmvfc_queue *crq = &vhost->crq;
957		957
958	ibmvfc_release_sub_crqs(vhost);	958	ibmvfc_dereg_sub_crqs(vhost);
959		959
960	/* Close the CRQ */	960	/* Close the CRQ */
961	do {	961	do {
@@ -988,7 +988,7 @@ static int ibmvfc_reset_crq(struct ibmvfc_host *vhost) · 26 unmodified lines
988	spin_unlock(vhost->crq.q_lock);	988	spin_unlock(vhost->crq.q_lock);
989	spin_unlock_irqrestore(vhost->host->host_lock, flags);	989	spin_unlock_irqrestore(vhost->host->host_lock, flags);
990		990
991	ibmvfc_init_sub_crqs(vhost);	991	ibmvfc_reg_sub_crqs(vhost);
992		992
993	return rc;	993	return rc;
994	}	994	}
@@ -5682,6 +5682,8 @@ static int ibmvfc_alloc_queue(struct ibmvfc_host *vhost, · 4687 unmodified lines
5682	queue->cur = 0;	5682	queue->cur = 0;
5683	queue->fmt = fmt;	5683	queue->fmt = fmt;
5684	queue->size = PAGE_SIZE / fmt_size;	5684	queue->size = PAGE_SIZE / fmt_size;
		5685
		5686	queue->vhost = vhost;
5685	return 0;	5687	return 0;
5686	}	5688	}
5687		5689
@@ -5757,9 +5759,6 @@ static int ibmvfc_register_scsi_channel(struct ibmvfc_host *vhost, · 69 unmodified lines
5757		5759
5758	ENTER;	5760	ENTER;
5759		5761
5760	if (ibmvfc_alloc_queue(vhost, scrq, IBMVFC_SUB_CRQ_FMT))
5761	return -ENOMEM;
5762
5763	rc = h_reg_sub_crq(vdev->unit_address, scrq->msg_token, PAGE_SIZE,	5762	rc = h_reg_sub_crq(vdev->unit_address, scrq->msg_token, PAGE_SIZE,
5764	&scrq->cookie, &scrq->hw_irq);	5763	&scrq->cookie, &scrq->hw_irq);
5765		5764
@@ -5790,7 +5789,6 @@ static int ibmvfc_register_scsi_channel(struct ibmvfc_host *vhost, · 24 unmodified lines
5790	}	5789	}
5791		5790
5792	scrq->hwq_id = index;	5791	scrq->hwq_id = index;
5793	scrq->vhost = vhost;
5794		5792
5795	LEAVE;	5793	LEAVE;
5796	return 0;	5794	return 0;
@@ -5800,7 +5798,6 @@ irq_failed: · 3 unmodified lines
5800	rc = plpar_hcall_norets(H_FREE_SUB_CRQ, vdev->unit_address, scrq->cookie);	5798	rc = plpar_hcall_norets(H_FREE_SUB_CRQ, vdev->unit_address, scrq->cookie);
5801	} while (rtas_busy_delay(rc));	5799	} while (rtas_busy_delay(rc));
5802	reg_failed:	5800	reg_failed:
5803	ibmvfc_free_queue(vhost, scrq);
5804	LEAVE;	5801	LEAVE;
5805	return rc;	5802	return rc;
5806	}	5803	}
@@ -5826,12 +5823,50 @@ static void ibmvfc_deregister_scsi_channel(struct ibmvfc_host *vhost, int index) · 19 unmodified lines
5826	if (rc)	5823	if (rc)
5827	dev_err(dev, "Failed to free sub-crq[%d]: rc=%ld\n", index, rc);	5824	dev_err(dev, "Failed to free sub-crq[%d]: rc=%ld\n", index, rc);
5828		5825
5829	ibmvfc_free_queue(vhost, scrq);	5826	/* Clean out the queue */
		5827	memset(scrq->msgs.crq, 0, PAGE_SIZE);
		5828	scrq->cur = 0;
		5829
		5830	LEAVE;
		5831	}
		5832
		5833	static void ibmvfc_reg_sub_crqs(struct ibmvfc_host *vhost)
		5834	{
		5835	int i, j;
		5836
		5837	ENTER;
		5838	if (!vhost->mq_enabled \|\| !vhost->scsi_scrqs.scrqs)
		5839	return;
		5840
		5841	for (i = 0; i < nr_scsi_hw_queues; i++) {
		5842	if (ibmvfc_register_scsi_channel(vhost, i)) {
		5843	for (j = i; j > 0; j--)
		5844	ibmvfc_deregister_scsi_channel(vhost, j - 1);
		5845	vhost->do_enquiry = 0;
		5846	return;
		5847	}
		5848	}
		5849
		5850	LEAVE;
		5851	}
		5852
		5853	static void ibmvfc_dereg_sub_crqs(struct ibmvfc_host *vhost)
		5854	{
		5855	int i;
		5856
		5857	ENTER;
		5858	if (!vhost->mq_enabled \|\| !vhost->scsi_scrqs.scrqs)
		5859	return;
		5860
		5861	for (i = 0; i < nr_scsi_hw_queues; i++)
		5862	ibmvfc_deregister_scsi_channel(vhost, i);
		5863
5830	LEAVE;	5864	LEAVE;
5831	}	5865	}
5832		5866
5833	static void ibmvfc_init_sub_crqs(struct ibmvfc_host *vhost)	5867	static void ibmvfc_init_sub_crqs(struct ibmvfc_host *vhost)
5834	{	5868	{
		5869	struct ibmvfc_queue *scrq;
5835	int i, j;	5870	int i, j;
5836		5871
5837	ENTER;	5872	ENTER;
@@ -5847,30 +5882,41 @@ static void ibmvfc_init_sub_crqs(struct ibmvfc_host *vhost) · 9 unmodified lines
5847	}	5882	}
5848		5883
5849	for (i = 0; i < nr_scsi_hw_queues; i++) {	5884	for (i = 0; i < nr_scsi_hw_queues; i++) {
5850	if (ibmvfc_register_scsi_channel(vhost, i)) {	5885	scrq = &vhost->scsi_scrqs.scrqs[i];
5851	for (j = i; j > 0; j--)	5886	if (ibmvfc_alloc_queue(vhost, scrq, IBMVFC_SUB_CRQ_FMT)) {
5852	ibmvfc_deregister_scsi_channel(vhost, j - 1);	5887	for (j = i; j > 0; j--) {
		5888	scrq = &vhost->scsi_scrqs.scrqs[j - 1];
		5889	ibmvfc_free_queue(vhost, scrq);
		5890	}
5853	kfree(vhost->scsi_scrqs.scrqs);	5891	kfree(vhost->scsi_scrqs.scrqs);
5854	vhost->scsi_scrqs.scrqs = NULL;	5892	vhost->scsi_scrqs.scrqs = NULL;
5855	vhost->scsi_scrqs.active_queues = 0;	5893	vhost->scsi_scrqs.active_queues = 0;
5856	vhost->do_enquiry = 0;	5894	vhost->do_enquiry = 0;
5857	break;	5895	vhost->mq_enabled = 0;
		5896	return;
5858	}	5897	}
5859	}	5898	}
5860		5899
		5900	ibmvfc_reg_sub_crqs(vhost);
		5901
5861	LEAVE;	5902	LEAVE;
5862	}	5903	}
5863		5904
5864	static void ibmvfc_release_sub_crqs(struct ibmvfc_host *vhost)	5905	static void ibmvfc_release_sub_crqs(struct ibmvfc_host *vhost)
5865	{	5906	{
		5907	struct ibmvfc_queue *scrq;
5866	int i;	5908	int i;
5867		5909
5868	ENTER;	5910	ENTER;
5869	if (!vhost->scsi_scrqs.scrqs)	5911	if (!vhost->scsi_scrqs.scrqs)
5870	return;	5912	return;
5871		5913
5872	for (i = 0; i < nr_scsi_hw_queues; i++)	5914	ibmvfc_dereg_sub_crqs(vhost);
5873	ibmvfc_deregister_scsi_channel(vhost, i);	5915
		5916	for (i = 0; i < nr_scsi_hw_queues; i++) {
		5917	scrq = &vhost->scsi_scrqs.scrqs[i];
		5918	ibmvfc_free_queue(vhost, scrq);
		5919	}
5874		5920
5875	kfree(vhost->scsi_scrqs.scrqs);	5921	kfree(vhost->scsi_scrqs.scrqs);
5876	vhost->scsi_scrqs.scrqs = NULL;	5922	vhost->scsi_scrqs.scrqs = NULL;

drivers/scsi/ibmvscsi/ibmvfc.h+1−1

 	spinlock_t _lock;
 	spinlock_t *q_lock;
+	struct ibmvfc_host *vhost;
 	struct ibmvfc_event_pool evt_pool;
 	struct list_head sent;
 	struct list_head free;
 	union ibmvfc_iu cancel_rsp;
 	/* Sub-CRQ fields */
-	struct ibmvfc_host *vhost;
 	unsigned long cookie;
 	unsigned long vios_cookie;
 	unsigned long hw_irq;

drivers/scsi/scsi_debug.c+20−2

 	}
 }
+static inline void zbc_set_zone_full(struct sdebug_dev_info *devip,
+				     struct sdeb_zone_state *zsp)
+{
+	switch (zsp->z_cond) {
+	case ZC2_IMPLICIT_OPEN:
+		devip->nr_imp_open--;
+		break;
+	case ZC3_EXPLICIT_OPEN:
+		devip->nr_exp_open--;
+		break;
+	default:
+		WARN_ONCE(true, "Invalid zone %llu condition %x\n",
+			  zsp->z_start, zsp->z_cond);
+		break;
+	}
+	zsp->z_cond = ZC5_FULL;
+}
 static void zbc_inc_wp(struct sdebug_dev_info *devip,
 		       unsigned long long lba, unsigned int num)
 {
 	if (zsp->z_type == ZBC_ZTYPE_SWR) {
 		zsp->z_wp += num;
 		if (zsp->z_wp >= zend)
-			zsp->z_cond = ZC5_FULL;
+			zbc_set_zone_full(devip, zsp);
 		return;
 	}
 			n = num;
 		}
 		if (zsp->z_wp >= zend)
-			zsp->z_cond = ZC5_FULL;
+			zbc_set_zone_full(devip, zsp);
 		num -= n;
 		lba += n;

drivers/scsi/scsi_transport_iscsi.c+6−1

@@ -212,7 +212,12 @@ iscsi_create_endpoint(int dd_size) · 211 unmodified lines
212	return NULL;	212	return NULL;
213		213
214	mutex_lock(&iscsi_ep_idr_mutex);	214	mutex_lock(&iscsi_ep_idr_mutex);
215	id = idr_alloc(&iscsi_ep_idr, ep, 0, -1, GFP_NOIO);	215
		216	/*
		217	* First endpoint id should be 1 to comply with user space
		218	* applications (iscsid).
		219	*/
		220	id = idr_alloc(&iscsi_ep_idr, ep, 1, -1, GFP_NOIO);
216	if (id < 0) {	221	if (id < 0) {
217	mutex_unlock(&iscsi_ep_idr_mutex);	222	mutex_unlock(&iscsi_ep_idr_mutex);
218	printk(KERN_ERR "Could not allocate endpoint ID. Error %d.\n",	223	printk(KERN_ERR "Could not allocate endpoint ID. Error %d.\n",

drivers/scsi/storvsc_drv.c+22−5

 	.cmd_per_lun =		2048,
 	.this_id =		-1,
 	/* Ensure there are no gaps in presented sgls */
-	.virt_boundary_mask =	PAGE_SIZE-1,
+	.virt_boundary_mask =	HV_HYP_PAGE_SIZE - 1,
 	.no_write_same =	1,
 	.track_queue_depth =	1,
 	.change_queue_depth =	storvsc_change_queue_depth,
 	int target = 0;
 	struct storvsc_device *stor_device;
 	int max_sub_channels = 0;
+	u32 max_xfer_bytes;
 	/*
 	 * We support sub-channels for storage on SCSI and FC controllers.
 	}
 	/* max cmd length */
 	host->max_cmd_len = STORVSC_MAX_CMD_LEN;
 	/*
-	 * set the table size based on the info we got
+	 * Any reasonable Hyper-V configuration should provide
-	 * from the host.
+	 * max_transfer_bytes value aligning to HV_HYP_PAGE_SIZE,
+	 * protecting it from any weird value.
+	 */
+	max_xfer_bytes = round_down(stor_device->max_transfer_bytes, HV_HYP_PAGE_SIZE);
+	/* max_hw_sectors_kb */
+	host->max_sectors = max_xfer_bytes >> 9;
+	/*
+	 * There are 2 requirements for Hyper-V storvsc sgl segments,
+	 * based on which the below calculation for max segments is
+	 * done:
+	 *
+	 * 1. Except for the first and last sgl segment, all sgl segments
+	 *    should be align to HV_HYP_PAGE_SIZE, that also means the
+	 *    maximum number of segments in a sgl can be calculated by
+	 *    dividing the total max transfer length by HV_HYP_PAGE_SIZE.
+	 *
+	 * 2. Except for the first and last, each entry in the SGL must
+	 *    have an offset that is a multiple of HV_HYP_PAGE_SIZE.
 	 */
-	host->sg_tablesize = (stor_device->max_transfer_bytes >> PAGE_SHIFT);
+	host->sg_tablesize = (max_xfer_bytes >> HV_HYP_PAGE_SHIFT) + 1;
 	/*
 	 * For non-IDE disks, the host supports multiple channels.
 	 * Set the number of HW queues we are supporting.

drivers/soc/bcm/brcmstb/pm/pm-arm.c+1−0

@@ -783,6 +783,7 @@ static int brcmstb_pm_probe(struct platform_device *pdev) · 782 unmodified lines
783	}	783	}
784		784
785	ret = brcmstb_init_sram(dn);	785	ret = brcmstb_init_sram(dn);
		786	of_node_put(dn);
786	if (ret) {	787	if (ret) {
787	pr_err("error setting up SRAM for PM\n");	788	pr_err("error setting up SRAM for PM\n");
788	return ret;	789	return ret;

drivers/soc/imx/imx8m-blk-ctrl.c+1−1

@@ -667,7 +667,7 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[ · 666 unmodified lines
667	},	667	},
668	[IMX8MP_MEDIABLK_PD_LCDIF_2] = {	668	[IMX8MP_MEDIABLK_PD_LCDIF_2] = {
669	.name = "mediablk-lcdif-2",	669	.name = "mediablk-lcdif-2",
670	.clk_names = (const char *[]){ "disp1", "apb", "axi", },	670	.clk_names = (const char *[]){ "disp2", "apb", "axi", },
671	.num_clks = 3,	671	.num_clks = 3,
672	.gpc_name = "lcdif2",	672	.gpc_name = "lcdif2",
673	.rst_mask = BIT(11) \| BIT(12) \| BIT(24),	673	.rst_mask = BIT(11) \| BIT(12) \| BIT(24),

drivers/spi/spi-cadence.c+31−6

 #define CDNS_SPI_BAUD_DIV_SHIFT		3 /* Baud rate divisor shift in CR */
 #define CDNS_SPI_SS_SHIFT		10 /* Slave Select field shift in CR */
 #define CDNS_SPI_SS0			0x1 /* Slave Select zero */
+#define CDNS_SPI_NOSS			0x3C /* No Slave select */
 /*
  * SPI Interrupt Registers bit Masks
 #define CDNS_SPI_ER_ENABLE	0x00000001 /* SPI Enable Bit Mask */
 #define CDNS_SPI_ER_DISABLE	0x0 /* SPI Disable Bit Mask */
-/* SPI FIFO depth in bytes */
-#define CDNS_SPI_FIFO_DEPTH	128
 /* Default number of chip select lines */
 #define CDNS_SPI_DEFAULT_NUM_CS		4
  * @rx_bytes:		Number of bytes requested
  * @dev_busy:		Device busy flag
  * @is_decoded_cs:	Flag for decoder property set or not
+ * @tx_fifo_depth:	Depth of the TX FIFO
  */
 struct cdns_spi {
 	void __iomem *regs;
 	int rx_bytes;
 	u8 dev_busy;
 	u32 is_decoded_cs;
+	unsigned int tx_fifo_depth;
 };
 /* Macros for the SPI controller read/write */
 {
 	unsigned long trans_cnt = 0;
-	while ((trans_cnt < CDNS_SPI_FIFO_DEPTH) &&
+	while ((trans_cnt < xspi->tx_fifo_depth) &&
 	       (xspi->tx_bytes > 0)) {
 		/* When xspi in busy condition, bytes may send failed,
  * @master:	Pointer to the spi_master structure which provides
  *		information about the controller.
  *
- * This function disables the SPI master controller.
+ * This function disables the SPI master controller when no slave selected.
  *
  * Return:	0 always
  */
 static int cdns_unprepare_transfer_hardware(struct spi_master *master)
 {
 	struct cdns_spi *xspi = spi_master_get_devdata(master);
+	u32 ctrl_reg;
-	cdns_spi_write(xspi, CDNS_SPI_ER, CDNS_SPI_ER_DISABLE);
+	/* Disable the SPI if slave is deselected */
+	ctrl_reg = cdns_spi_read(xspi, CDNS_SPI_CR);
+	ctrl_reg = (ctrl_reg & CDNS_SPI_CR_SSCTRL) >>  CDNS_SPI_SS_SHIFT;
+	if (ctrl_reg == CDNS_SPI_NOSS)
+		cdns_spi_write(xspi, CDNS_SPI_ER, CDNS_SPI_ER_DISABLE);
 	return 0;
 }
+/**
+ * cdns_spi_detect_fifo_depth - Detect the FIFO depth of the hardware
+ * @xspi:	Pointer to the cdns_spi structure
+ *
+ * The depth of the TX FIFO is a synthesis configuration parameter of the SPI
+ * IP. The FIFO threshold register is sized so that its maximum value can be the
+ * FIFO size - 1. This is used to detect the size of the FIFO.
+ */
+static void cdns_spi_detect_fifo_depth(struct cdns_spi *xspi)
+{
+	/* The MSBs will get truncated giving us the size of the FIFO */
+	cdns_spi_write(xspi, CDNS_SPI_THLD, 0xffff);
+	xspi->tx_fifo_depth = cdns_spi_read(xspi, CDNS_SPI_THLD) + 1;
+	/* Reset to default */
+	cdns_spi_write(xspi, CDNS_SPI_THLD, 0x1);
+}
 /**
  * cdns_spi_probe - Probe method for the SPI driver
  * @pdev:	Pointer to the platform_device structure
 	if (ret < 0)
 		xspi->is_decoded_cs = 0;
+	cdns_spi_detect_fifo_depth(xspi);
 	/* SPI controller initializations */
 	cdns_spi_init_hw(xspi);

drivers/spi/spi-mem.c+1−1

@@ -808,7 +808,7 @@ int spi_mem_poll_status(struct spi_mem *mem, · 807 unmodified lines
808	op->data.dir != SPI_MEM_DATA_IN)	808	op->data.dir != SPI_MEM_DATA_IN)
809	return -EINVAL;	809	return -EINVAL;
810		810
811	if (ctlr->mem_ops && ctlr->mem_ops->poll_status) {	811	if (ctlr->mem_ops && ctlr->mem_ops->poll_status && !mem->spi->cs_gpiod) {
812	ret = spi_mem_access_start(mem);	812	ret = spi_mem_access_start(mem);
813	if (ret)	813	if (ret)
814	return ret;	814	return ret;

drivers/spi/spi-rockchip.c+7−4

@@ -381,15 +381,18 @@ static int rockchip_spi_prepare_irq(struct rockchip_spi *rs, · 380 unmodified lines
381	rs->tx_left = rs->tx ? xfer->len / rs->n_bytes : 0;	381	rs->tx_left = rs->tx ? xfer->len / rs->n_bytes : 0;
382	rs->rx_left = xfer->len / rs->n_bytes;	382	rs->rx_left = xfer->len / rs->n_bytes;
383		383
384	if (rs->cs_inactive)	384	writel_relaxed(0xffffffff, rs->regs + ROCKCHIP_SPI_ICR);
385	writel_relaxed(INT_RF_FULL \| INT_CS_INACTIVE, rs->regs + ROCKCHIP_SPI_IMR);	385
386	else
387	writel_relaxed(INT_RF_FULL, rs->regs + ROCKCHIP_SPI_IMR);
388	spi_enable_chip(rs, true);	386	spi_enable_chip(rs, true);
389		387
390	if (rs->tx_left)	388	if (rs->tx_left)
391	rockchip_spi_pio_writer(rs);	389	rockchip_spi_pio_writer(rs);
392		390
		391	if (rs->cs_inactive)
		392	writel_relaxed(INT_RF_FULL \| INT_CS_INACTIVE, rs->regs + ROCKCHIP_SPI_IMR);
		393	else
		394	writel_relaxed(INT_RF_FULL, rs->regs + ROCKCHIP_SPI_IMR);
		395
393	/* 1 means the transfer is in progress */	396	/* 1 means the transfer is in progress */
394	return 1;	397	return 1;
395	}	398	}

drivers/staging/olpc_dcon/Kconfig+1−1

@@ -1,7 +1,7 @@
1	# SPDX-License-Identifier: GPL-2.0	1	# SPDX-License-Identifier: GPL-2.0
2	config FB_OLPC_DCON	2	config FB_OLPC_DCON
3	tristate "One Laptop Per Child Display CONtroller support"	3	tristate "One Laptop Per Child Display CONtroller support"
4	depends on OLPC && FB	4	depends on OLPC && FB && BROKEN
5	depends on I2C	5	depends on I2C
6	depends on GPIO_CS5535 && ACPI	6	depends on GPIO_CS5535 && ACPI
7	select BACKLIGHT_CLASS_DEVICE	7	select BACKLIGHT_CLASS_DEVICE

drivers/staging/r8188eu/core/rtw_xmit.c+5−15

 	pxmitpriv->free_xmit_extbuf_cnt = num_xmit_extbuf;
-	res = rtw_alloc_hwxmits(padapter);
+	if (rtw_alloc_hwxmits(padapter)) {
-	if (res) {
 		res = _FAIL;
 		goto exit;
 	}
 	hwxmits = pxmitpriv->hwxmits;
-	if (pxmitpriv->hwxmit_entry == 5) {
+	hwxmits[0].sta_queue = &pxmitpriv->vo_pending;
-		hwxmits[0] .sta_queue = &pxmitpriv->bm_pending;
+	hwxmits[1].sta_queue = &pxmitpriv->vi_pending;
-		hwxmits[1] .sta_queue = &pxmitpriv->vo_pending;
+	hwxmits[2].sta_queue = &pxmitpriv->be_pending;
-		hwxmits[2] .sta_queue = &pxmitpriv->vi_pending;
+	hwxmits[3].sta_queue = &pxmitpriv->bk_pending;
-		hwxmits[3] .sta_queue = &pxmitpriv->bk_pending;
-		hwxmits[4] .sta_queue = &pxmitpriv->be_pending;
-	} else if (pxmitpriv->hwxmit_entry == 4) {
-		hwxmits[0] .sta_queue = &pxmitpriv->vo_pending;
-		hwxmits[1] .sta_queue = &pxmitpriv->vi_pending;
-		hwxmits[2] .sta_queue = &pxmitpriv->be_pending;
-		hwxmits[3] .sta_queue = &pxmitpriv->bk_pending;
-	} else {
-	}
 	return 0;
 }

drivers/staging/r8188eu/os_dep/ioctl_linux.c+1−1

@@ -403,7 +403,7 @@ static int wpa_set_encryption(struct net_device dev, struct ieee_param param, · 402 unmodified lines
403		403
404	if (wep_key_len > 0) {	404	if (wep_key_len > 0) {
405	wep_key_len = wep_key_len <= 5 ? 5 : 13;	405	wep_key_len = wep_key_len <= 5 ? 5 : 13;
406	wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);	406	wep_total_len = wep_key_len + sizeof(*pwep);
407	pwep = kzalloc(wep_total_len, GFP_KERNEL);	407	pwep = kzalloc(wep_total_len, GFP_KERNEL);
408	if (!pwep)	408	if (!pwep)
409	goto exit;	409	goto exit;

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c+4−2

 		if (wep_key_len > 0) {
 			wep_key_len = wep_key_len <= 5 ? 5 : 13;
 			wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, key_material);
-			pwep = kzalloc(wep_total_len, GFP_KERNEL);
+			/* Allocate a full structure to avoid potentially running off the end. */
+			pwep = kzalloc(sizeof(*pwep), GFP_KERNEL);
 			if (!pwep) {
 				ret = -ENOMEM;
 				goto exit;
 		if (wep_key_len > 0) {
 			wep_key_len = wep_key_len <= 5 ? 5 : 13;
 			wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, key_material);
-			pwep = kzalloc(wep_total_len, GFP_KERNEL);
+			/* Allocate a full structure to avoid potentially running off the end. */
+			pwep = kzalloc(sizeof(*pwep), GFP_KERNEL);
 			if (!pwep)
 				goto exit;

drivers/tty/goldfish.c+1−1

@@ -426,7 +426,7 @@ static int goldfish_tty_remove(struct platform_device *pdev) · 425 unmodified lines
426	tty_unregister_device(goldfish_tty_driver, qtty->console.index);	426	tty_unregister_device(goldfish_tty_driver, qtty->console.index);
427	iounmap(qtty->base);	427	iounmap(qtty->base);
428	qtty->base = NULL;	428	qtty->base = NULL;
429	free_irq(qtty->irq, pdev);	429	free_irq(qtty->irq, qtty);
430	tty_port_destroy(&qtty->port);	430	tty_port_destroy(&qtty->port);
431	goldfish_tty_current_line_count--;	431	goldfish_tty_current_line_count--;
432	if (goldfish_tty_current_line_count == 0)	432	if (goldfish_tty_current_line_count == 0)

drivers/tty/n_gsm.c+1−1

@@ -455,7 +455,7 @@ static void gsm_hex_dump_bytes(const char fname, const u8 data, · 454 unmodified lines
455	return;	455	return;
456	}	456	}
457		457
458	prefix = kasprintf(GFP_KERNEL, "%s: ", fname);	458	prefix = kasprintf(GFP_ATOMIC, "%s: ", fname);
459	if (!prefix)	459	if (!prefix)
460	return;	460	return;
461	print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_OFFSET, 16, 1, data, len,	461	print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_OFFSET, 16, 1, data, len,

drivers/tty/serial/8250/8250_port.c+2−0

@@ -1517,6 +1517,8 @@ static inline void __stop_tx(struct uart_8250_port *p) · 1516 unmodified lines
1517	unsigned char lsr = serial_in(p, UART_LSR);	1517	unsigned char lsr = serial_in(p, UART_LSR);
1518	u64 stop_delay = 0;	1518	u64 stop_delay = 0;
1519		1519
		1520	p->lsr_saved_flags \|= lsr & LSR_SAVE_FLAGS;
		1521
1520	if (!(lsr & UART_LSR_THRE))	1522	if (!(lsr & UART_LSR_THRE))
1521	return;	1523	return;
1522	/*	1524	/*

drivers/tty/serial/qcom_geni_serial.c+1−0

@@ -1306,6 +1306,7 @@ static const struct uart_ops qcom_geni_console_pops = { · 1305 unmodified lines
1306	.stop_tx = qcom_geni_serial_stop_tx,	1306	.stop_tx = qcom_geni_serial_stop_tx,
1307	.start_tx = qcom_geni_serial_start_tx,	1307	.start_tx = qcom_geni_serial_start_tx,
1308	.stop_rx = qcom_geni_serial_stop_rx,	1308	.stop_rx = qcom_geni_serial_stop_rx,
		1309	.start_rx = qcom_geni_serial_start_rx,
1309	.set_termios = qcom_geni_serial_set_termios,	1310	.set_termios = qcom_geni_serial_set_termios,
1310	.startup = qcom_geni_serial_startup,	1311	.startup = qcom_geni_serial_startup,
1311	.request_port = qcom_geni_serial_request_port,	1312	.request_port = qcom_geni_serial_request_port,

drivers/tty/serial/serial_core.c+6−3

 	/*
 	 * Nothing to do if the console is not suspending
 	 * except stop_rx to prevent any asynchronous data
-	 * over RX line. Re-start_rx, when required, is
+	 * over RX line. However ensure that we will be
-	 * done by set_termios in resume sequence
+	 * able to Re-start_rx later.
 	 */
 	if (!console_suspend_enabled && uart_console(uport)) {
-		uport->ops->stop_rx(uport);
+		if (uport->ops->start_rx)
+			uport->ops->stop_rx(uport);
 		goto unlock;
 	}
 		if (console_suspend_enabled)
 			uart_change_pm(state, UART_PM_STATE_ON);
 		uport->ops->set_termios(uport, &termios, NULL);
+		if (!console_suspend_enabled && uport->ops->start_rx)
+			uport->ops->start_rx(uport);
 		if (console_suspend_enabled)
 			console_start(uport->cons);
 	}

drivers/tty/sysrq.c+0−2

 	rcu_sysrq_start();
 	rcu_read_lock();
-	printk_prefer_direct_enter();
 	/*
 	 * Raise the apparent loglevel to maximum so that the sysrq header
 	 * is shown to provide the user with positive feedback.  We do not
 		pr_cont("\n");
 		console_loglevel = orig_log_level;
 	}
-	printk_prefer_direct_exit();
 	rcu_read_unlock();
 	rcu_sysrq_end();

drivers/ufs/core/ufshcd.c+48−28

@@ -748,17 +748,28 @@ static enum utp_ocs ufshcd_get_tr_ocs(struct ufshcd_lrb *lrbp) · 747 unmodified lines
748	}	748	}
749		749
750	/**	750	/**
751	* ufshcd_utrl_clear - Clear a bit in UTRLCLR register	751	* ufshcd_utrl_clear() - Clear requests from the controller request list.
752	* @hba: per adapter instance	752	* @hba: per adapter instance
753	* @pos: position of the bit to be cleared	753	* @mask: mask with one bit set for each request to be cleared
754	*/	754	*/
755	static inline void ufshcd_utrl_clear(struct ufs_hba *hba, u32 pos)	755	static inline void ufshcd_utrl_clear(struct ufs_hba *hba, u32 mask)
756	{	756	{
757	if (hba->quirks & UFSHCI_QUIRK_BROKEN_REQ_LIST_CLR)	757	if (hba->quirks & UFSHCI_QUIRK_BROKEN_REQ_LIST_CLR)
758	ufshcd_writel(hba, (1 << pos), REG_UTP_TRANSFER_REQ_LIST_CLEAR);	758	mask = ~mask;
759	else	759	/*
760	ufshcd_writel(hba, ~(1 << pos),	760	* From the UFSHCI specification: "UTP Transfer Request List CLear
761	REG_UTP_TRANSFER_REQ_LIST_CLEAR);	761	* Register (UTRLCLR): This field is bit significant. Each bit
		762	* corresponds to a slot in the UTP Transfer Request List, where bit 0
		763	* corresponds to request slot 0. A bit in this field is set to ‘0’
		764	* by host software to indicate to the host controller that a transfer
		765	* request slot is cleared. The host controller
		766	* shall free up any resources associated to the request slot
		767	* immediately, and shall set the associated bit in UTRLDBR to ‘0’. The
		768	* host software indicates no change to request slots by setting the
		769	* associated bits in this field to ‘1’. Bits in this field shall only
		770	* be set ‘1’ or ‘0’ by host software when UTRLRSR is set to ‘1’."
		771	*/
		772	ufshcd_writel(hba, ~mask, REG_UTP_TRANSFER_REQ_LIST_CLEAR);
762	}	773	}
763		774
764	/**	775	/**
@@ -2863,27 +2874,26 @@ static int ufshcd_compose_dev_cmd(struct ufs_hba *hba, · 2098 unmodified lines
2863	return ufshcd_compose_devman_upiu(hba, lrbp);	2874	return ufshcd_compose_devman_upiu(hba, lrbp);
2864	}	2875	}
2865		2876
2866	static int	2877	/*
2867	ufshcd_clear_cmd(struct ufs_hba *hba, int tag)	2878	* Clear all the requests from the controller for which a bit has been set in
		2879	* @mask and wait until the controller confirms that these requests have been
		2880	* cleared.
		2881	*/
		2882	static int ufshcd_clear_cmds(struct ufs_hba *hba, u32 mask)
2868	{	2883	{
2869	int err = 0;
2870	unsigned long flags;	2884	unsigned long flags;
2871	u32 mask = 1 << tag;
2872		2885
2873	/* clear outstanding transaction before retry */	2886	/* clear outstanding transaction before retry */
2874	spin_lock_irqsave(hba->host->host_lock, flags);	2887	spin_lock_irqsave(hba->host->host_lock, flags);
2875	ufshcd_utrl_clear(hba, tag);	2888	ufshcd_utrl_clear(hba, mask);
2876	spin_unlock_irqrestore(hba->host->host_lock, flags);	2889	spin_unlock_irqrestore(hba->host->host_lock, flags);
2877		2890
2878	/*	2891	/*
2879	* wait for h/w to clear corresponding bit in door-bell.	2892	* wait for h/w to clear corresponding bit in door-bell.
2880	* max. wait is 1 sec.	2893	* max. wait is 1 sec.
2881	*/	2894	*/
2882	err = ufshcd_wait_for_register(hba,	2895	return ufshcd_wait_for_register(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL,
2883	REG_UTP_TRANSFER_REQ_DOOR_BELL,	2896	mask, ~mask, 1000, 1000);
2884	mask, ~mask, 1000, 1000);
2885
2886	return err;
2887	}	2897	}
2888		2898
2889	static int	2899	static int
@@ -2963,7 +2973,7 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba, · 73 unmodified lines
2963	err = -ETIMEDOUT;	2973	err = -ETIMEDOUT;
2964	dev_dbg(hba->dev, "%s: dev_cmd request timedout, tag %d\n",	2974	dev_dbg(hba->dev, "%s: dev_cmd request timedout, tag %d\n",
2965	__func__, lrbp->task_tag);	2975	__func__, lrbp->task_tag);
2966	if (!ufshcd_clear_cmd(hba, lrbp->task_tag))	2976	if (!ufshcd_clear_cmds(hba, 1U << lrbp->task_tag))
2967	/* successfully cleared the command, retry if needed */	2977	/* successfully cleared the command, retry if needed */
2968	err = -EAGAIN;	2978	err = -EAGAIN;
2969	/*	2979	/*
@@ -6958,14 +6968,14 @@ int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba, · 3988 unmodified lines
6958	}	6968	}
6959		6969
6960	/**	6970	/**
6961	* ufshcd_eh_device_reset_handler - device reset handler registered to	6971	* ufshcd_eh_device_reset_handler() - Reset a single logical unit.
6962	* scsi layer.
6963	* @cmd: SCSI command pointer	6972	* @cmd: SCSI command pointer
6964	*	6973	*
6965	* Returns SUCCESS/FAILED	6974	* Returns SUCCESS/FAILED
6966	*/	6975	*/
6967	static int ufshcd_eh_device_reset_handler(struct scsi_cmnd *cmd)	6976	static int ufshcd_eh_device_reset_handler(struct scsi_cmnd *cmd)
6968	{	6977	{
		6978	unsigned long flags, pending_reqs = 0, not_cleared = 0;
6969	struct Scsi_Host *host;	6979	struct Scsi_Host *host;
6970	struct ufs_hba *hba;	6980	struct ufs_hba *hba;
6971	u32 pos;	6981	u32 pos;
@@ -6984,14 +6994,24 @@ static int ufshcd_eh_device_reset_handler(struct scsi_cmnd *cmd) · 12 unmodified lines
6984	}	6994	}
6985		6995
6986	/* clear the commands that were pending for corresponding LUN */	6996	/* clear the commands that were pending for corresponding LUN */
6987	for_each_set_bit(pos, &hba->outstanding_reqs, hba->nutrs) {	6997	spin_lock_irqsave(&hba->outstanding_lock, flags);
6988	if (hba->lrb[pos].lun == lun) {	6998	for_each_set_bit(pos, &hba->outstanding_reqs, hba->nutrs)
6989	err = ufshcd_clear_cmd(hba, pos);	6999	if (hba->lrb[pos].lun == lun)
6990	if (err)	7000	__set_bit(pos, &pending_reqs);
6991	break;	7001	hba->outstanding_reqs &= ~pending_reqs;
6992	__ufshcd_transfer_req_compl(hba, 1U << pos);	7002	spin_unlock_irqrestore(&hba->outstanding_lock, flags);
6993	}	7003
		7004	if (ufshcd_clear_cmds(hba, pending_reqs) < 0) {
		7005	spin_lock_irqsave(&hba->outstanding_lock, flags);
		7006	not_cleared = pending_reqs &
		7007	ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
		7008	hba->outstanding_reqs \|= not_cleared;
		7009	spin_unlock_irqrestore(&hba->outstanding_lock, flags);
		7010
		7011	dev_err(hba->dev, "%s: failed to clear requests %#lx\n",
		7012	__func__, not_cleared);
6994	}	7013	}
		7014	__ufshcd_transfer_req_compl(hba, pending_reqs & ~not_cleared);
6995		7015
6996	out:	7016	out:
6997	hba->req_abort_count = 0;	7017	hba->req_abort_count = 0;
@@ -7088,7 +7108,7 @@ static int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag) · 90 unmodified lines
7088	goto out;	7108	goto out;
7089	}	7109	}
7090		7110
7091	err = ufshcd_clear_cmd(hba, tag);	7111	err = ufshcd_clear_cmds(hba, 1U << tag);
7092	if (err)	7112	if (err)
7093	dev_err(hba->dev, "%s: Failed clearing cmd at tag %d, err %d\n",	7113	dev_err(hba->dev, "%s: Failed clearing cmd at tag %d, err %d\n",
7094	__func__, tag, err);	7114	__func__, tag, err);

drivers/usb/cdns3/cdnsp-ring.c+11−8

@@ -1941,13 +1941,16 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device pdev, struct cdnsp_request preq) · 1940 unmodified lines
1941	}	1941	}
1942		1942
1943	if (enqd_len + trb_buff_len >= full_len) {	1943	if (enqd_len + trb_buff_len >= full_len) {
1944	if (need_zero_pkt)	1944	if (need_zero_pkt && !zero_len_trb) {
1945	zero_len_trb = !zero_len_trb;	1945	zero_len_trb = true;
1946		1946	} else {
1947	field &= ~TRB_CHAIN;	1947	zero_len_trb = false;
1948	field \|= TRB_IOC;	1948	field &= ~TRB_CHAIN;
1949	more_trbs_coming = false;	1949	field \|= TRB_IOC;
1950	preq->td.last_trb = ring->enqueue;	1950	more_trbs_coming = false;
		1951	need_zero_pkt = false;
		1952	preq->td.last_trb = ring->enqueue;
		1953	}
1951	}	1954	}
1952		1955
1953	/* Only set interrupt on short packet for OUT endpoints. */	1956	/* Only set interrupt on short packet for OUT endpoints. */
@@ -1962,7 +1965,7 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device pdev, struct cdnsp_request preq) · 8 unmodified lines
1962	length_field = TRB_LEN(trb_buff_len) \| TRB_TD_SIZE(remainder) \|	1965	length_field = TRB_LEN(trb_buff_len) \| TRB_TD_SIZE(remainder) \|
1963	TRB_INTR_TARGET(0);	1966	TRB_INTR_TARGET(0);
1964		1967
1965	cdnsp_queue_trb(pdev, ring, more_trbs_coming \| zero_len_trb,	1968	cdnsp_queue_trb(pdev, ring, more_trbs_coming,
1966	lower_32_bits(send_addr),	1969	lower_32_bits(send_addr),
1967	upper_32_bits(send_addr),	1970	upper_32_bits(send_addr),
1968	length_field,	1971	length_field,

drivers/usb/chipidea/udc.c+3−0

@@ -1048,6 +1048,9 @@ isr_setup_status_complete(struct usb_ep ep, struct usb_request req) · 1047 unmodified lines
1048	struct ci_hdrc *ci = req->context;	1048	struct ci_hdrc *ci = req->context;
1049	unsigned long flags;	1049	unsigned long flags;
1050		1050
		1051	if (req->status < 0)
		1052	return;
		1053
1051	if (ci->setaddr) {	1054	if (ci->setaddr) {
1052	hw_usb_set_address(ci, ci->address);	1055	hw_usb_set_address(ci, ci->address);
1053	ci->setaddr = false;	1056	ci->setaddr = false;

drivers/usb/dwc2/hcd.c+1−1

@@ -5190,7 +5190,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg) · 5189 unmodified lines
5190	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);	5190	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
5191	if (!res) {	5191	if (!res) {
5192	retval = -EINVAL;	5192	retval = -EINVAL;
5193	goto error1;	5193	goto error2;
5194	}	5194	}
5195	hcd->rsrc_start = res->start;	5195	hcd->rsrc_start = res->start;
5196	hcd->rsrc_len = resource_size(res);	5196	hcd->rsrc_len = resource_size(res);

drivers/usb/dwc3/core.c+2−7

 	 * This device property is for kernel internal use only and
 	 * is expected to be set by the glue code.
 	 */
-	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0) {
+	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0)
-		edev = extcon_get_extcon_dev(name);
+		return extcon_get_extcon_dev(name);
-		if (!edev)
-			return ERR_PTR(-EPROBE_DEFER);
-		return edev;
-	}
 	/*
 	 * Try to get an extcon device from the USB PHY controller's "port"

drivers/usb/dwc3/dwc3-pci.c+1−0

@@ -127,6 +127,7 @@ static const struct property_entry dwc3_pci_intel_phy_charger_detect_properties[ · 126 unmodified lines
127	PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),	127	PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),
128	PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),	128	PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),
129	PROPERTY_ENTRY_BOOL("linux,phy_charger_detect"),	129	PROPERTY_ENTRY_BOOL("linux,phy_charger_detect"),
		130	PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
130	{}	131	{}
131	};	132	};
132		133

drivers/usb/dwc3/gadget.c+15−11

 	struct dwc3 *dwc = dep->dwc;
 	u32 mdwidth;
 	int size;
+	int maxpacket;
 	mdwidth = dwc3_mdwidth(dwc);
 	else
 		size = DWC31_GTXFIFOSIZ_TXFDEP(size);
-	/* FIFO Depth is in MDWDITH bytes. Multiply */
-	size *= mdwidth;
 	/*
-	 * To meet performance requirement, a minimum TxFIFO size of 3x
+	 * maxpacket size is determined as part of the following, after assuming
-	 * MaxPacketSize is recommended for endpoints that support burst and a
+	 * a mult value of one maxpacket:
-	 * minimum TxFIFO size of 2x MaxPacketSize for endpoints that don't
+	 * DWC3 revision 280A and prior:
-	 * support burst. Use those numbers and we can calculate the max packet
+	 * fifo_size = mult * (max_packet / mdwidth) + 1;
-	 * limit as below.
+	 * maxpacket = mdwidth * (fifo_size - 1);
+	 *
+	 * DWC3 revision 290A and onwards:
+	 * fifo_size = mult * ((max_packet + mdwidth)/mdwidth + 1) + 1
+	 * maxpacket = mdwidth * ((fifo_size - 1) - 1) - mdwidth;
 	 */
-	if (dwc->maximum_speed >= USB_SPEED_SUPER)
+	if (DWC3_VER_IS_PRIOR(DWC3, 290A))
-		size /= 3;
+		maxpacket = mdwidth * (size - 1);
 	else
-		size /= 2;
+		maxpacket = mdwidth * ((size - 1) - 1) - mdwidth;
+	/* Functionally, space for one max packet is sufficient */
+	size = min_t(int, maxpacket, 1024);
 	usb_ep_set_maxpacket_limit(&dep->endpoint, size);
 	dep->endpoint.max_streams = 16;

drivers/usb/gadget/function/f_fs.c+25−15

@@ -122,8 +122,6 @@ struct ffs_ep { · 121 unmodified lines
122	struct usb_endpoint_descriptor *descs[3];	122	struct usb_endpoint_descriptor *descs[3];
123		123
124	u8 num;	124	u8 num;
125
126	int status; /* P: epfile->mutex */
127	};	125	};
128		126
129	struct ffs_epfile {	127	struct ffs_epfile {
@@ -227,6 +225,9 @@ struct ffs_io_data { · 97 unmodified lines
227	bool use_sg;	225	bool use_sg;
228		226
229	struct ffs_data *ffs;	227	struct ffs_data *ffs;
		228
		229	int status;
		230	struct completion done;
230	};	231	};
231		232
232	struct ffs_desc_helper {	233	struct ffs_desc_helper {
@@ -707,12 +708,15 @@ static const struct file_operations ffs_ep0_operations = { · 474 unmodified lines
707		708
708	static void ffs_epfile_io_complete(struct usb_ep _ep, struct usb_request req)	709	static void ffs_epfile_io_complete(struct usb_ep _ep, struct usb_request req)
709	{	710	{
		711	struct ffs_io_data *io_data = req->context;
		712
710	ENTER();	713	ENTER();
711	if (req->context) {	714	if (req->status)
712	struct ffs_ep *ep = _ep->driver_data;	715	io_data->status = req->status;
713	ep->status = req->status ? req->status : req->actual;	716	else
714	complete(req->context);	717	io_data->status = req->actual;
715	}	718
		719	complete(&io_data->done);
716	}	720	}
717		721
718	static ssize_t ffs_copy_to_iter(void data, int data_len, struct iov_iter iter)	722	static ssize_t ffs_copy_to_iter(void data, int data_len, struct iov_iter iter)
@@ -1050,7 +1054,6 @@ static ssize_t ffs_epfile_io(struct file file, struct ffs_io_data io_data) · 331 unmodified lines
1050	WARN(1, "%s: data_len == -EINVAL\n", __func__);	1054	WARN(1, "%s: data_len == -EINVAL\n", __func__);
1051	ret = -EINVAL;	1055	ret = -EINVAL;
1052	} else if (!io_data->aio) {	1056	} else if (!io_data->aio) {
1053	DECLARE_COMPLETION_ONSTACK(done);
1054	bool interrupted = false;	1057	bool interrupted = false;
1055		1058
1056	req = ep->req;	1059	req = ep->req;
@@ -1066,7 +1069,8 @@ static ssize_t ffs_epfile_io(struct file file, struct ffs_io_data io_data) · 9 unmodified lines
1066		1069
1067	io_data->buf = data;	1070	io_data->buf = data;
1068		1071
1069	req->context = &done;	1072	init_completion(&io_data->done);
		1073	req->context = io_data;
1070	req->complete = ffs_epfile_io_complete;	1074	req->complete = ffs_epfile_io_complete;
1071		1075
1072	ret = usb_ep_queue(ep->ep, req, GFP_ATOMIC);	1076	ret = usb_ep_queue(ep->ep, req, GFP_ATOMIC);
@@ -1075,7 +1079,12 @@ static ssize_t ffs_epfile_io(struct file file, struct ffs_io_data io_data) · 2 unmodified lines
1075		1079
1076	spin_unlock_irq(&epfile->ffs->eps_lock);	1080	spin_unlock_irq(&epfile->ffs->eps_lock);
1077		1081
1078	if (wait_for_completion_interruptible(&done)) {	1082	if (wait_for_completion_interruptible(&io_data->done)) {
		1083	spin_lock_irq(&epfile->ffs->eps_lock);
		1084	if (epfile->ep != ep) {
		1085	ret = -ESHUTDOWN;
		1086	goto error_lock;
		1087	}
1079	/*	1088	/*
1080	* To avoid race condition with ffs_epfile_io_complete,	1089	* To avoid race condition with ffs_epfile_io_complete,
1081	* dequeue the request first then check	1090	* dequeue the request first then check
@@ -1083,17 +1092,18 @@ static ssize_t ffs_epfile_io(struct file file, struct ffs_io_data io_data) · 1 unmodified line
1083	* condition with req->complete callback.	1092	* condition with req->complete callback.
1084	*/	1093	*/
1085	usb_ep_dequeue(ep->ep, req);	1094	usb_ep_dequeue(ep->ep, req);
1086	wait_for_completion(&done);	1095	spin_unlock_irq(&epfile->ffs->eps_lock);
1087	interrupted = ep->status < 0;	1096	wait_for_completion(&io_data->done);
		1097	interrupted = io_data->status < 0;
1088	}	1098	}
1089		1099
1090	if (interrupted)	1100	if (interrupted)
1091	ret = -EINTR;	1101	ret = -EINTR;
1092	else if (io_data->read && ep->status > 0)	1102	else if (io_data->read && io_data->status > 0)
1093	ret = __ffs_epfile_read_data(epfile, data, ep->status,	1103	ret = __ffs_epfile_read_data(epfile, data, io_data->status,
1094	&io_data->data);	1104	&io_data->data);
1095	else	1105	else
1096	ret = ep->status;	1106	ret = io_data->status;
1097	goto error_mutex;	1107	goto error_mutex;
1098	} else if (!(req = usb_ep_alloc_request(ep->ep, GFP_ATOMIC))) {	1108	} else if (!(req = usb_ep_alloc_request(ep->ep, GFP_ATOMIC))) {
1099	ret = -ENOMEM;	1109	ret = -ENOMEM;

drivers/usb/gadget/function/u_ether.c+10−2

 	dev->qmult = qmult;
 	snprintf(net->name, sizeof(net->name), "%s%%d", netname);
-	if (get_ether_addr(dev_addr, addr))
+	if (get_ether_addr(dev_addr, addr)) {
+		net->addr_assign_type = NET_ADDR_RANDOM;
 		dev_warn(&g->dev,
 			"using random %s ethernet address\n", "self");
+	} else {
+		net->addr_assign_type = NET_ADDR_SET;
+	}
 	eth_hw_addr_set(net, addr);
 	if (get_ether_addr(host_addr, dev->host_mac))
 		dev_warn(&g->dev,
 	eth_random_addr(dev->dev_mac);
 	pr_warn("using random %s ethernet address\n", "self");
+	/* by default we always have a random MAC address */
+	net->addr_assign_type = NET_ADDR_RANDOM;
 	eth_random_addr(dev->host_mac);
 	pr_warn("using random %s ethernet address\n", "host");
 	dev = netdev_priv(net);
 	g = dev->gadget;
-	net->addr_assign_type = NET_ADDR_RANDOM;
 	eth_hw_addr_set(net, dev->dev_mac);
 	status = register_netdev(net);
 	if (get_ether_addr(dev_addr, new_addr))
 		return -EINVAL;
 	memcpy(dev->dev_mac, new_addr, ETH_ALEN);
+	net->addr_assign_type = NET_ADDR_SET;
 	return 0;
 }
 EXPORT_SYMBOL_GPL(gether_set_dev_addr);

drivers/usb/gadget/function/uvc_video.c+3−0

@@ -424,6 +424,9 @@ static void uvcg_video_pump(struct work_struct *work) · 423 unmodified lines
424	uvcg_queue_cancel(queue, 0);	424	uvcg_queue_cancel(queue, 0);
425	break;	425	break;
426	}	426	}
		427
		428	/* Endpoint now owns the request */
		429	req = NULL;
427	video->req_int_count++;	430	video->req_int_count++;
428	}	431	}
429		432

drivers/usb/gadget/legacy/raw_gadget.c+47−16

 #include <linux/ctype.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
+#include <linux/idr.h>
 #include <linux/kref.h>
 #include <linux/miscdevice.h>
 #include <linux/module.h>
 /*----------------------------------------------------------------------*/
+static DEFINE_IDA(driver_id_numbers);
+#define DRIVER_DRIVER_NAME_LENGTH_MAX	32
 #define RAW_EVENT_QUEUE_SIZE	16
 struct raw_event_queue {
 	/* Reference to misc device: */
 	struct device			*dev;
+	/* Make driver names unique */
+	int				driver_id_number;
 	/* Protected by lock: */
 	enum dev_state			state;
 	bool				gadget_registered;
 	spin_lock_init(&dev->lock);
 	init_completion(&dev->ep0_done);
 	raw_event_queue_init(&dev->queue);
+	dev->driver_id_number = -1;
 	return dev;
 }
 	kfree(dev->udc_name);
 	kfree(dev->driver.udc_name);
+	kfree(dev->driver.driver.name);
+	if (dev->driver_id_number >= 0)
+		ida_free(&driver_id_numbers, dev->driver_id_number);
 	if (dev->req) {
 		if (dev->ep0_urb_queued)
 			usb_ep_dequeue(dev->gadget->ep0, dev->req);
 static int raw_ioctl_init(struct raw_dev *dev, unsigned long value)
 {
 	int ret = 0;
+	int driver_id_number;
 	struct usb_raw_init arg;
 	char *udc_driver_name;
 	char *udc_device_name;
+	char *driver_driver_name;
 	unsigned long flags;
 	if (copy_from_user(&arg, (void __user *)value, sizeof(arg)))
 		return -EINVAL;
 	}
+	driver_id_number = ida_alloc(&driver_id_numbers, GFP_KERNEL);
+	if (driver_id_number < 0)
+		return driver_id_number;
+	driver_driver_name = kmalloc(DRIVER_DRIVER_NAME_LENGTH_MAX, GFP_KERNEL);
+	if (!driver_driver_name) {
+		ret = -ENOMEM;
+		goto out_free_driver_id_number;
+	}
+	snprintf(driver_driver_name, DRIVER_DRIVER_NAME_LENGTH_MAX,
+				DRIVER_NAME ".%d", driver_id_number);
 	udc_driver_name = kmalloc(UDC_NAME_LENGTH_MAX, GFP_KERNEL);
-	if (!udc_driver_name)
+	if (!udc_driver_name) {
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto out_free_driver_driver_name;
+	}
 	ret = strscpy(udc_driver_name, &arg.driver_name[0],
 				UDC_NAME_LENGTH_MAX);
-	if (ret < 0) {
+	if (ret < 0)
-		kfree(udc_driver_name);
+		goto out_free_udc_driver_name;
-		return ret;
-	}
 	ret = 0;
 	udc_device_name = kmalloc(UDC_NAME_LENGTH_MAX, GFP_KERNEL);
 	if (!udc_device_name) {
-		kfree(udc_driver_name);
+		ret = -ENOMEM;
-		return -ENOMEM;
+		goto out_free_udc_driver_name;
 	}
 	ret = strscpy(udc_device_name, &arg.device_name[0],
 				UDC_NAME_LENGTH_MAX);
-	if (ret < 0) {
+	if (ret < 0)
-		kfree(udc_driver_name);
+		goto out_free_udc_device_name;
-		kfree(udc_device_name);
-		return ret;
-	}
 	ret = 0;
 	spin_lock_irqsave(&dev->lock, flags);
 	if (dev->state != STATE_DEV_OPENED) {
 		dev_dbg(dev->dev, "fail, device is not opened\n");
-		kfree(udc_driver_name);
-		kfree(udc_device_name);
 		ret = -EINVAL;
 		goto out_unlock;
 	}
 	dev->driver.suspend = gadget_suspend;
 	dev->driver.resume = gadget_resume;
 	dev->driver.reset = gadget_reset;
-	dev->driver.driver.name = DRIVER_NAME;
+	dev->driver.driver.name = driver_driver_name;
 	dev->driver.udc_name = udc_device_name;
 	dev->driver.match_existing_only = 1;
+	dev->driver_id_number = driver_id_number;
 	dev->state = STATE_DEV_INITIALIZED;
+	spin_unlock_irqrestore(&dev->lock, flags);
+	return ret;
 out_unlock:
 	spin_unlock_irqrestore(&dev->lock, flags);
+out_free_udc_device_name:
+	kfree(udc_device_name);
+out_free_udc_driver_name:
+	kfree(udc_driver_name);
+out_free_driver_driver_name:
+	kfree(driver_driver_name);
+out_free_driver_id_number:
+	ida_free(&driver_id_numbers, driver_id_number);
 	return ret;
 }

drivers/usb/gadget/udc/lpc32xx_udc.c+1−0

@@ -3016,6 +3016,7 @@ static int lpc32xx_udc_probe(struct platform_device *pdev) · 3015 unmodified lines
3016	}	3016	}
3017		3017
3018	udc->isp1301_i2c_client = isp1301_get_client(isp1301_node);	3018	udc->isp1301_i2c_client = isp1301_get_client(isp1301_node);
		3019	of_node_put(isp1301_node);
3019	if (!udc->isp1301_i2c_client) {	3020	if (!udc->isp1301_i2c_client) {
3020	return -EPROBE_DEFER;	3021	return -EPROBE_DEFER;
3021	}	3022	}

drivers/usb/host/xhci-hub.c+1−1

@@ -652,7 +652,7 @@ struct xhci_hub xhci_get_rhub(struct usb_hcd hcd) · 651 unmodified lines
652	* It will release and re-aquire the lock while calling ACPI	652	* It will release and re-aquire the lock while calling ACPI
653	* method.	653	* method.
654	*/	654	*/
655	static void xhci_set_port_power(struct xhci_hcd xhci, struct usb_hcd hcd,	655	void xhci_set_port_power(struct xhci_hcd xhci, struct usb_hcd hcd,
656	u16 index, bool on, unsigned long *flags)	656	u16 index, bool on, unsigned long *flags)
657	__must_hold(&xhci->lock)	657	__must_hold(&xhci->lock)
658	{	658	{

drivers/usb/host/xhci-pci.c+5−1

 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI		0x461e
 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI		0x464e
 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI	0x51ed
+#define PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI		0xa71e
+#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_XHCI		0x7ec0
 #define PCI_DEVICE_ID_AMD_RENOIR_XHCI			0x1639
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_4			0x43b9
 	     pdev->device == PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI ||
 	     pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI ||
 	     pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI ||
-	     pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI))
+	     pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI ||
+	     pdev->device == PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI ||
+	     pdev->device == PCI_DEVICE_ID_INTEL_METEOR_LAKE_XHCI))
 		xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
 	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&

drivers/usb/host/xhci.c+40−25

 static int xhci_run_finished(struct xhci_hcd *xhci)
 {
+	unsigned long	flags;
+	u32		temp;
+	/*
+	 * Enable interrupts before starting the host (xhci 4.2 and 5.5.2).
+	 * Protect the short window before host is running with a lock
+	 */
+	spin_lock_irqsave(&xhci->lock, flags);
+	xhci_dbg_trace(xhci, trace_xhci_dbg_init, "Enable interrupts");
+	temp = readl(&xhci->op_regs->command);
+	temp |= (CMD_EIE);
+	writel(temp, &xhci->op_regs->command);
+	xhci_dbg_trace(xhci, trace_xhci_dbg_init, "Enable primary interrupter");
+	temp = readl(&xhci->ir_set->irq_pending);
+	writel(ER_IRQ_ENABLE(temp), &xhci->ir_set->irq_pending);
 	if (xhci_start(xhci)) {
 		xhci_halt(xhci);
+		spin_unlock_irqrestore(&xhci->lock, flags);
 		return -ENODEV;
 	}
 	xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
 	if (xhci->quirks & XHCI_NEC_HOST)
 		xhci_ring_cmd_db(xhci);
+	spin_unlock_irqrestore(&xhci->lock, flags);
 	return 0;
 }
 	temp |= (xhci->imod_interval / 250) & ER_IRQ_INTERVAL_MASK;
 	writel(temp, &xhci->ir_set->irq_control);
-	/* Set the HCD state before we enable the irqs */
-	temp = readl(&xhci->op_regs->command);
-	temp |= (CMD_EIE);
-	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
-			"// Enable interrupts, cmd = 0x%x.", temp);
-	writel(temp, &xhci->op_regs->command);
-	temp = readl(&xhci->ir_set->irq_pending);
-	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
-			"// Enabling event ring interrupter %p by writing 0x%x to irq_pending",
-			xhci->ir_set, (unsigned int) ER_IRQ_ENABLE(temp));
-	writel(ER_IRQ_ENABLE(temp), &xhci->ir_set->irq_pending);
 	if (xhci->quirks & XHCI_NEC_HOST) {
 		struct xhci_command *command;
 void xhci_shutdown(struct usb_hcd *hcd)
 {
 	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+	unsigned long flags;
+	int i;
 	if (xhci->quirks & XHCI_SPURIOUS_REBOOT)
 		usb_disable_xhci_ports(to_pci_dev(hcd->self.sysdev));
 		del_timer_sync(&xhci->shared_hcd->rh_timer);
 	}
-	spin_lock_irq(&xhci->lock);
+	spin_lock_irqsave(&xhci->lock, flags);
 	xhci_halt(xhci);
+	/* Power off USB2 ports*/
+	for (i = 0; i < xhci->usb2_rhub.num_ports; i++)
+		xhci_set_port_power(xhci, xhci->main_hcd, i, false, &flags);
+	/* Power off USB3 ports*/
+	for (i = 0; i < xhci->usb3_rhub.num_ports; i++)
+		xhci_set_port_power(xhci, xhci->shared_hcd, i, false, &flags);
 	/* Workaround for spurious wakeups at shutdown with HSW */
 	if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
 		xhci_reset(xhci, XHCI_RESET_SHORT_USEC);
-	spin_unlock_irq(&xhci->lock);
+	spin_unlock_irqrestore(&xhci->lock, flags);
 	xhci_cleanup_msix(xhci);
 {
 	u32			command, temp = 0;
 	struct usb_hcd		*hcd = xhci_to_hcd(xhci);
-	struct usb_hcd		*secondary_hcd;
 	int			retval = 0;
 	bool			comp_timer_running = false;
 	bool			pending_portevent = false;
 		 * first with the primary HCD, and then with the secondary HCD.
 		 * If we don't do the same, the host will never be started.
 		 */
-		if (!usb_hcd_is_primary_hcd(hcd))
-			secondary_hcd = hcd;
-		else
-			secondary_hcd = xhci->shared_hcd;
 		xhci_dbg(xhci, "Initialize the xhci_hcd\n");
-		retval = xhci_init(hcd->primary_hcd);
+		retval = xhci_init(hcd);
 		if (retval)
 			return retval;
 		comp_timer_running = true;
 		xhci_dbg(xhci, "Start the primary HCD\n");
-		retval = xhci_run(hcd->primary_hcd);
+		retval = xhci_run(hcd);
-		if (!retval && secondary_hcd) {
+		if (!retval && xhci->shared_hcd) {
 			xhci_dbg(xhci, "Start the secondary HCD\n");
-			retval = xhci_run(secondary_hcd);
+			retval = xhci_run(xhci->shared_hcd);
 		}
 		hcd->state = HC_STATE_SUSPENDED;
 		if (xhci->shared_hcd)
 			xhci->shared_hcd->state = HC_STATE_SUSPENDED;

drivers/usb/host/xhci.h+2−0

@@ -2196,6 +2196,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex, · 2195 unmodified lines
2196	int xhci_hub_status_data(struct usb_hcd hcd, char buf);	2196	int xhci_hub_status_data(struct usb_hcd hcd, char buf);
2197	int xhci_find_raw_port_number(struct usb_hcd *hcd, int port1);	2197	int xhci_find_raw_port_number(struct usb_hcd *hcd, int port1);
2198	struct xhci_hub xhci_get_rhub(struct usb_hcd hcd);	2198	struct xhci_hub xhci_get_rhub(struct usb_hcd hcd);
		2199	void xhci_set_port_power(struct xhci_hcd xhci, struct usb_hcd hcd, u16 index,
		2200	bool on, unsigned long *flags);
2199		2201
2200	void xhci_hc_died(struct xhci_hcd *xhci);	2202	void xhci_hc_died(struct xhci_hcd *xhci);
2201		2203

drivers/usb/serial/io_ti.c+2−0

 	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_8S) },
 	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416) },
 	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416B) },
+	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_E5805A) },
 	{ }
 };
 	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_8S) },
 	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416) },
 	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416B) },
+	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_E5805A) },
 	{ }
 };

drivers/usb/serial/io_usbvend.h+1−0

@@ -212,6 +212,7 @@ · 211 unmodified lines
212	//	212	//
213	// Definitions for other product IDs	213	// Definitions for other product IDs
214	#define ION_DEVICE_ID_MT4X56USB 0x1403 // OEM device	214	#define ION_DEVICE_ID_MT4X56USB 0x1403 // OEM device
		215	#define ION_DEVICE_ID_E5805A 0x1A01 // OEM device (rebranded Edgeport/4)
215		216
216		217
217	#define GENERATION_ID_FROM_USB_PRODUCT_ID(ProductId) \	218	#define GENERATION_ID_FROM_USB_PRODUCT_ID(ProductId) \

drivers/usb/serial/option.c+12−0

 #define QUECTEL_PRODUCT_EG95			0x0195
 #define QUECTEL_PRODUCT_BG96			0x0296
 #define QUECTEL_PRODUCT_EP06			0x0306
+#define QUECTEL_PRODUCT_EM05G			0x030a
 #define QUECTEL_PRODUCT_EM12			0x0512
 #define QUECTEL_PRODUCT_RM500Q			0x0800
 #define QUECTEL_PRODUCT_EC200S_CN		0x6002
 #define QUECTEL_PRODUCT_EC200T			0x6026
+#define QUECTEL_PRODUCT_RM500K			0x7001
 #define CMOTECH_VENDOR_ID			0x16d8
 #define CMOTECH_PRODUCT_6001			0x6001
 #define CINTERION_PRODUCT_CLS8			0x00b0
 #define CINTERION_PRODUCT_MV31_MBIM		0x00b3
 #define CINTERION_PRODUCT_MV31_RMNET		0x00b7
+#define CINTERION_PRODUCT_MV31_2_MBIM		0x00b8
+#define CINTERION_PRODUCT_MV31_2_RMNET		0x00b9
 #define CINTERION_PRODUCT_MV32_WA		0x00f1
 #define CINTERION_PRODUCT_MV32_WB		0x00f2
 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),
 	  .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },
 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) },
+	{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G, 0xff),
+	  .driver_info = RSVD(6) | ZLP },
 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0xff, 0xff),
 	  .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },
 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0, 0) },
 	  .driver_info = ZLP },
 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },
 	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
 	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },
 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1231, 0xff),	/* Telit LE910Cx (RNDIS) */
 	  .driver_info = NCTRL(2) | RSVD(3) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x1250, 0xff, 0x00, 0x00) },	/* Telit LE910Cx (rmnet) */
 	{ USB_DEVICE(TELIT_VENDOR_ID, 0x1260),
 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
 	{ USB_DEVICE(TELIT_VENDOR_ID, 0x1261),
 	  .driver_info = RSVD(3)},
 	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_RMNET, 0xff),
 	  .driver_info = RSVD(0)},
+	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_2_MBIM, 0xff),
+	  .driver_info = RSVD(3)},
+	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_2_RMNET, 0xff),
+	  .driver_info = RSVD(0)},
 	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA, 0xff),
 	  .driver_info = RSVD(3)},
 	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB, 0xff),

drivers/usb/serial/pl2303.c+17−12

 		break;
 	case 0x200:
 		switch (bcdDevice) {
-		case 0x100:
+		case 0x100:	/* GC */
 		case 0x105:
+			return TYPE_HXN;
+		case 0x300:	/* GT / TA */
+			if (pl2303_supports_hx_status(serial))
+				return TYPE_TA;
+			fallthrough;
 		case 0x305:
+		case 0x400:	/* GL */
 		case 0x405:
+			return TYPE_HXN;
+		case 0x500:	/* GE / TB */
+			if (pl2303_supports_hx_status(serial))
+				return TYPE_TB;
+			fallthrough;
+		case 0x505:
+		case 0x600:	/* GS */
 		case 0x605:
-			/*
+		case 0x700:	/* GR */
-			 * Assume it's an HXN-type if the device doesn't
+		case 0x705:
-			 * support the old read request value.
+			return TYPE_HXN;
-			 */
-			if (!pl2303_supports_hx_status(serial))
-				return TYPE_HXN;
-			break;
-		case 0x300:
-			return TYPE_TA;
-		case 0x500:
-			return TYPE_TB;
 		}
 		break;
 	}

drivers/usb/typec/tcpm/Kconfig+0−1

@@ -56,7 +56,6 @@ config TYPEC_WCOVE · 55 unmodified lines
56	tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"	56	tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
57	depends on ACPI	57	depends on ACPI
58	depends on MFD_INTEL_PMC_BXT	58	depends on MFD_INTEL_PMC_BXT
59	depends on INTEL_SOC_PMIC
60	depends on BXT_WC_PMIC_OPREGION	59	depends on BXT_WC_PMIC_OPREGION
61	help	60	help
62	This driver adds support for USB Type-C on Intel Broxton platforms	61	This driver adds support for USB Type-C on Intel Broxton platforms

drivers/video/console/sticore.c+2−0

 	return ret;
 }
+#if defined(CONFIG_FB_STI)
 /* check if given fb_info is the primary device */
 int fb_is_primary_device(struct fb_info *info)
 {
 	return (sti->info == info);
 }
 EXPORT_SYMBOL(fb_is_primary_device);
+#endif
 MODULE_AUTHOR("Philipp Rumpf, Helge Deller, Thomas Bogendoerfer");
 MODULE_DESCRIPTION("Core STI driver for HP's NGLE series graphics cards in HP PARISC machines");

drivers/video/fbdev/au1100fb.c+2−4

 	/* Blank the LCD */
 	au1100fb_fb_blank(VESA_POWERDOWN, &fbdev->info);
-	if (fbdev->lcdclk)
+	clk_disable(fbdev->lcdclk);
-		clk_disable(fbdev->lcdclk);
 	memcpy(&fbregs, fbdev->regs, sizeof(struct au1100fb_regs));
 	memcpy(fbdev->regs, &fbregs, sizeof(struct au1100fb_regs));
-	if (fbdev->lcdclk)
+	clk_enable(fbdev->lcdclk);
-		clk_enable(fbdev->lcdclk);
 	/* Unblank the LCD */
 	au1100fb_fb_blank(VESA_NO_BLANKING, &fbdev->info);

drivers/video/fbdev/cirrusfb.c+0−6

 	.id_table	= cirrusfb_pci_table,
 	.probe		= cirrusfb_pci_register,
 	.remove		= cirrusfb_pci_unregister,
-#ifdef CONFIG_PM
-#if 0
-	.suspend	= cirrusfb_pci_suspend,
-	.resume		= cirrusfb_pci_resume,
-#endif
-#endif
 };
 #endif /* CONFIG_PCI */

drivers/video/fbdev/intelfb/intelfbdrv.c+2−2

@@ -472,7 +472,7 @@ static int intelfb_pci_register(struct pci_dev *pdev, · 471 unmodified lines
472	struct fb_info *info;	472	struct fb_info *info;
473	struct intelfb_info *dinfo;	473	struct intelfb_info *dinfo;
474	int i, err, dvo;	474	int i, err, dvo;
475	int aperture_size, stolen_size;	475	int aperture_size, stolen_size = 0;
476	struct agp_kern_info gtt_info;	476	struct agp_kern_info gtt_info;
477	int agp_memtype;	477	int agp_memtype;
478	const char *s;	478	const char *s;
@@ -571,7 +571,7 @@ static int intelfb_pci_register(struct pci_dev *pdev, · 92 unmodified lines
571	return -ENODEV;	571	return -ENODEV;
572	}	572	}
573		573
574	if (intelfbhw_get_memory(pdev, &aperture_size,&stolen_size)) {	574	if (intelfbhw_get_memory(pdev, &aperture_size, &stolen_size)) {
575	cleanup(dinfo);	575	cleanup(dinfo);
576	return -ENODEV;	576	return -ENODEV;
577	}	577	}

drivers/video/fbdev/intelfb/intelfbhw.c+5−7

 	case PCI_DEVICE_ID_INTEL_945GME:
 	case PCI_DEVICE_ID_INTEL_965G:
 	case PCI_DEVICE_ID_INTEL_965GM:
-		/* 915, 945 and 965 chipsets support a 256MB aperture.
+		/*
-		   Aperture size is determined by inspected the
+		 * 915, 945 and 965 chipsets support 64MB, 128MB or 256MB
-		   base address of the aperture. */
+		 * aperture. Determine size from PCI resource length.
-		if (pci_resource_start(pdev, 2) & 0x08000000)
+		 */
-			*aperture_size = MB(128);
+		*aperture_size = pci_resource_len(pdev, 2);
-		else
-			*aperture_size = MB(256);
 		break;
 	default:
 		if ((tmp & INTEL_GMCH_MEM_MASK) == INTEL_GMCH_MEM_64M)

drivers/video/fbdev/omap/sossi.c+1−1

@@ -359,7 +359,7 @@ static void sossi_set_bits_per_cycle(int bpc) · 358 unmodified lines
359	int bus_pick_count, bus_pick_width;	359	int bus_pick_count, bus_pick_width;
360		360
361	/*	361	/*
362	* We set explicitly the the bus_pick_count as well, although	362	* We set explicitly the bus_pick_count as well, although
363	* with remapping/reordering disabled it will be calculated by HW	363	* with remapping/reordering disabled it will be calculated by HW
364	* as (32 / bus_pick_width).	364	* as (32 / bus_pick_width).
365	*/	365	*/

drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c+1−1

@@ -143,7 +143,7 @@ int hdmi_phy_configure(struct hdmi_phy_data *phy, unsigned long hfbitclk, · 142 unmodified lines
143	/*	143	/*
144	* In OMAP5+, the HFBITCLK must be divided by 2 before issuing the	144	* In OMAP5+, the HFBITCLK must be divided by 2 before issuing the
145	* HDMI_PHYPWRCMD_LDOON command.	145	* HDMI_PHYPWRCMD_LDOON command.
146	*/	146	*/
147	if (phy_feat->bist_ctrl)	147	if (phy_feat->bist_ctrl)
148	REG_FLD_MOD(phy->base, HDMI_TXPHY_BIST_CONTROL, 1, 11, 11);	148	REG_FLD_MOD(phy->base, HDMI_TXPHY_BIST_CONTROL, 1, 11, 11);
149		149

drivers/video/fbdev/pxa3xx-gcu.c+1−1

@@ -381,7 +381,7 @@ pxa3xx_gcu_write(struct file file, const char buff, · 380 unmodified lines
381	struct pxa3xx_gcu_batch *buffer;	381	struct pxa3xx_gcu_batch *buffer;
382	struct pxa3xx_gcu_priv *priv = to_pxa3xx_gcu_priv(file);	382	struct pxa3xx_gcu_priv *priv = to_pxa3xx_gcu_priv(file);
383		383
384	int words = count / 4;	384	size_t words = count / 4;
385		385
386	/* Does not need to be atomic. There's a lock in user space,	386	/* Does not need to be atomic. There's a lock in user space,
387	* but anyhow, this is just for statistics. */	387	* but anyhow, this is just for statistics. */

drivers/video/fbdev/simplefb.c+1−2

 		if (IS_ERR(clock)) {
 			if (PTR_ERR(clock) == -EPROBE_DEFER) {
 				while (--i >= 0) {
-					if (par->clks[i])
+					clk_put(par->clks[i]);
-						clk_put(par->clks[i]);
 				}
 				kfree(par->clks);
 				return -EPROBE_DEFER;

drivers/video/fbdev/skeletonfb.c+8−7

     /*
      * 	Modern graphical hardware not only supports pipelines but some
-     *  also support multiple monitors where each display can have its
+     *  also support multiple monitors where each display can have
      *  its own unique data. In this case each display could be
      *  represented by a separate framebuffer device thus a separate
      *  struct fb_info. Now the struct xxx_par represents the graphics
  *
  *      See Documentation/driver-api/pm/devices.rst for more information
  */
-static int xxxfb_suspend(struct pci_dev *dev, pm_message_t msg)
+static int xxxfb_suspend(struct device *dev)
 {
-	struct fb_info *info = pci_get_drvdata(dev);
+	struct fb_info *info = dev_get_drvdata(dev);
 	struct xxxfb_par *par = info->par;
 	/* suspend here */
  *
  *      See Documentation/driver-api/pm/devices.rst for more information
  */
-static int xxxfb_resume(struct pci_dev *dev)
+static int xxxfb_resume(struct device *dev)
 {
-	struct fb_info *info = pci_get_drvdata(dev);
+	struct fb_info *info = dev_get_drvdata(dev);
 	struct xxxfb_par *par = info->par;
 	/* resume here */
 	{ 0, }
 };
+static SIMPLE_DEV_PM_OPS(xxxfb_pm_ops, xxxfb_suspend, xxxfb_resume);
 /* For PCI drivers */
 static struct pci_driver xxxfb_driver = {
 	.name =		"xxxfb",
 	.id_table =	xxxfb_id_table,
 	.probe =	xxxfb_probe,
 	.remove =	xxxfb_remove,
-	.suspend =      xxxfb_suspend, /* optional but recommended */
+	.driver.pm =	xxxfb_pm_ops, /* optional but recommended */
-	.resume =       xxxfb_resume,  /* optional but recommended */
 };
 MODULE_DEVICE_TABLE(pci, xxxfb_id_table);

drivers/watchdog/gxp-wdt.c+1−0

@@ -172,3 +172,4 @@ module_platform_driver(gxp_wdt_driver); · 171 unmodified lines
172	MODULE_AUTHOR("Nick Hawkins <nick.hawkins@hpe.com>");	172	MODULE_AUTHOR("Nick Hawkins <nick.hawkins@hpe.com>");
173	MODULE_AUTHOR("Jean-Marie Verdun <verdun@hpe.com>");	173	MODULE_AUTHOR("Jean-Marie Verdun <verdun@hpe.com>");
174	MODULE_DESCRIPTION("Driver for GXP watchdog timer");	174	MODULE_DESCRIPTION("Driver for GXP watchdog timer");
		175	MODULE_LICENSE("GPL");

drivers/xen/features.c+1−1

@@ -42,7 +42,7 @@ void xen_setup_features(void) · 41 unmodified lines
42	if (HYPERVISOR_xen_version(XENVER_get_features, &fi) < 0)	42	if (HYPERVISOR_xen_version(XENVER_get_features, &fi) < 0)
43	break;	43	break;
44	for (j = 0; j < 32; j++)	44	for (j = 0; j < 32; j++)
45	xen_features[i * 32 + j] = !!(fi.submap & 1<<j);	45	xen_features[i * 32 + j] = !!(fi.submap & 1U << j);
46	}	46	}
47		47
48	if (xen_pv_domain()) {	48	if (xen_pv_domain()) {

drivers/xen/gntdev-common.h+7−0

 #include <linux/mmu_notifier.h>
 #include <linux/types.h>
 #include <xen/interface/event_channel.h>
+#include <xen/grant_table.h>
 struct gntdev_dmabuf_priv;
 	struct gnttab_unmap_grant_ref *unmap_ops;
 	struct gnttab_map_grant_ref   *kmap_ops;
 	struct gnttab_unmap_grant_ref *kunmap_ops;
+	bool *being_removed;
 	struct page **pages;
 	unsigned long pages_vm_start;
 	/* Needed to avoid allocation in gnttab_dma_free_pages(). */
 	xen_pfn_t *frames;
 #endif
+	/* Number of live grants */
+	atomic_t live_grants;
+	/* Needed to avoid allocation in __unmap_grant_pages */
+	struct gntab_unmap_queue_data unmap_data;
 };
 struct gntdev_grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count,

drivers/xen/gntdev.c+106−51

@@ -35,6 +35,7 @@ · 34 unmodified lines
35	#include <linux/slab.h>	35	#include <linux/slab.h>
36	#include <linux/highmem.h>	36	#include <linux/highmem.h>
37	#include <linux/refcount.h>	37	#include <linux/refcount.h>
		38	#include <linux/workqueue.h>
38		39
39	#include <xen/xen.h>	40	#include <xen/xen.h>
40	#include <xen/grant_table.h>	41	#include <xen/grant_table.h>
@@ -60,10 +61,11 @@ module_param(limit, uint, 0644); · 19 unmodified lines
60	MODULE_PARM_DESC(limit,	61	MODULE_PARM_DESC(limit,
61	"Maximum number of grants that may be mapped by one mapping request");	62	"Maximum number of grants that may be mapped by one mapping request");
62		63
		64	/* True in PV mode, false otherwise */
63	static int use_ptemod;	65	static int use_ptemod;
64		66
65	static int unmap_grant_pages(struct gntdev_grant_map *map,	67	static void unmap_grant_pages(struct gntdev_grant_map *map,
66	int offset, int pages);	68	int offset, int pages);
67		69
68	static struct miscdevice gntdev_miscdev;	70	static struct miscdevice gntdev_miscdev;
69		71
@@ -120,6 +122,7 @@ static void gntdev_free_map(struct gntdev_grant_map *map) · 50 unmodified lines
120	kvfree(map->unmap_ops);	122	kvfree(map->unmap_ops);
121	kvfree(map->kmap_ops);	123	kvfree(map->kmap_ops);
122	kvfree(map->kunmap_ops);	124	kvfree(map->kunmap_ops);
		125	kvfree(map->being_removed);
123	kfree(map);	126	kfree(map);
124	}	127	}
125		128
@@ -140,10 +143,13 @@ struct gntdev_grant_map gntdev_alloc_map(struct gntdev_priv priv, int count, · 14 unmodified lines
140	add->unmap_ops = kvmalloc_array(count, sizeof(add->unmap_ops[0]),	143	add->unmap_ops = kvmalloc_array(count, sizeof(add->unmap_ops[0]),
141	GFP_KERNEL);	144	GFP_KERNEL);
142	add->pages = kvcalloc(count, sizeof(add->pages[0]), GFP_KERNEL);	145	add->pages = kvcalloc(count, sizeof(add->pages[0]), GFP_KERNEL);
		146	add->being_removed =
		147	kvcalloc(count, sizeof(add->being_removed[0]), GFP_KERNEL);
143	if (NULL == add->grants \|\|	148	if (NULL == add->grants \|\|
144	NULL == add->map_ops \|\|	149	NULL == add->map_ops \|\|
145	NULL == add->unmap_ops \|\|	150	NULL == add->unmap_ops \|\|
146	NULL == add->pages)	151	NULL == add->pages \|\|
		152	NULL == add->being_removed)
147	goto err;	153	goto err;
148	if (use_ptemod) {	154	if (use_ptemod) {
149	add->kmap_ops = kvmalloc_array(count, sizeof(add->kmap_ops[0]),	155	add->kmap_ops = kvmalloc_array(count, sizeof(add->kmap_ops[0]),
@@ -250,9 +256,36 @@ void gntdev_put_map(struct gntdev_priv priv, struct gntdev_grant_map map) · 100 unmodified lines
250	if (!refcount_dec_and_test(&map->users))	256	if (!refcount_dec_and_test(&map->users))
251	return;	257	return;
252		258
253	if (map->pages && !use_ptemod)	259	if (map->pages && !use_ptemod) {
		260	/*
		261	* Increment the reference count. This ensures that the
		262	* subsequent call to unmap_grant_pages() will not wind up
		263	* re-entering itself. It can wind up calling
		264	* gntdev_put_map() recursively, but such calls will be with a
		265	* reference count greater than 1, so they will return before
		266	* this code is reached. The recursion depth is thus limited to
		267	* 1. Do NOT use refcount_inc() here, as it will detect that
		268	* the reference count is zero and WARN().
		269	*/
		270	refcount_set(&map->users, 1);
		271
		272	/*
		273	* Unmap the grants. This may or may not be asynchronous, so it
		274	* is possible that the reference count is 1 on return, but it
		275	* could also be greater than 1.
		276	*/
254	unmap_grant_pages(map, 0, map->count);	277	unmap_grant_pages(map, 0, map->count);
255		278
		279	/* Check if the memory now needs to be freed */
		280	if (!refcount_dec_and_test(&map->users))
		281	return;
		282
		283	/*
		284	* All pages have been returned to the hypervisor, so free the
		285	* map.
		286	*/
		287	}
		288
256	if (map->notify.flags & UNMAP_NOTIFY_SEND_EVENT) {	289	if (map->notify.flags & UNMAP_NOTIFY_SEND_EVENT) {
257	notify_remote_via_evtchn(map->notify.event);	290	notify_remote_via_evtchn(map->notify.event);
258	evtchn_put(map->notify.event);	291	evtchn_put(map->notify.event);
@@ -283,6 +316,7 @@ static int find_grant_ptes(pte_t pte, unsigned long addr, void data) · 24 unmodified lines
283		316
284	int gntdev_map_grant_pages(struct gntdev_grant_map *map)	317	int gntdev_map_grant_pages(struct gntdev_grant_map *map)
285	{	318	{
		319	size_t alloced = 0;
286	int i, err = 0;	320	int i, err = 0;
287		321
288	if (!use_ptemod) {	322	if (!use_ptemod) {
@@ -331,97 +365,116 @@ int gntdev_map_grant_pages(struct gntdev_grant_map *map) · 42 unmodified lines
331	map->count);	365	map->count);
332		366
333	for (i = 0; i < map->count; i++) {	367	for (i = 0; i < map->count; i++) {
334	if (map->map_ops[i].status == GNTST_okay)	368	if (map->map_ops[i].status == GNTST_okay) {
335	map->unmap_ops[i].handle = map->map_ops[i].handle;	369	map->unmap_ops[i].handle = map->map_ops[i].handle;
336	else if (!err)	370	if (!use_ptemod)
		371	alloced++;
		372	} else if (!err)
337	err = -EINVAL;	373	err = -EINVAL;
338		374
339	if (map->flags & GNTMAP_device_map)	375	if (map->flags & GNTMAP_device_map)
340	map->unmap_ops[i].dev_bus_addr = map->map_ops[i].dev_bus_addr;	376	map->unmap_ops[i].dev_bus_addr = map->map_ops[i].dev_bus_addr;
341		377
342	if (use_ptemod) {	378	if (use_ptemod) {
343	if (map->kmap_ops[i].status == GNTST_okay)	379	if (map->kmap_ops[i].status == GNTST_okay) {
		380	if (map->map_ops[i].status == GNTST_okay)
		381	alloced++;
344	map->kunmap_ops[i].handle = map->kmap_ops[i].handle;	382	map->kunmap_ops[i].handle = map->kmap_ops[i].handle;
345	else if (!err)	383	} else if (!err)
346	err = -EINVAL;	384	err = -EINVAL;
347	}	385	}
348	}	386	}
		387	atomic_add(alloced, &map->live_grants);
349	return err;	388	return err;
350	}	389	}
351		390
352	static int __unmap_grant_pages(struct gntdev_grant_map *map, int offset,	391	static void __unmap_grant_pages_done(int result,
353	int pages)	392	struct gntab_unmap_queue_data *data)
354	{	393	{
355	int i, err = 0;	394	unsigned int i;
356	struct gntab_unmap_queue_data unmap_data;	395	struct gntdev_grant_map *map = data->data;
357		396	unsigned int offset = data->unmap_ops - map->unmap_ops;
358	if (map->notify.flags & UNMAP_NOTIFY_CLEAR_BYTE) {
359	int pgno = (map->notify.addr >> PAGE_SHIFT);
360	if (pgno >= offset && pgno < offset + pages) {
361	/* No need for kmap, pages are in lowmem */
362	uint8_t *tmp = pfn_to_kaddr(page_to_pfn(map->pages[pgno]));
363	tmp[map->notify.addr & (PAGE_SIZE-1)] = 0;
364	map->notify.flags &= ~UNMAP_NOTIFY_CLEAR_BYTE;
365	}
366	}
367
368	unmap_data.unmap_ops = map->unmap_ops + offset;
369	unmap_data.kunmap_ops = use_ptemod ? map->kunmap_ops + offset : NULL;
370	unmap_data.pages = map->pages + offset;
371	unmap_data.count = pages;
372
373	err = gnttab_unmap_refs_sync(&unmap_data);
374	if (err)
375	return err;
376		397
377	for (i = 0; i < pages; i++) {	398	for (i = 0; i < data->count; i++) {
378	if (map->unmap_ops[offset+i].status)	399	WARN_ON(map->unmap_ops[offset+i].status);
379	err = -EINVAL;
380	pr_debug("unmap handle=%d st=%d\n",	400	pr_debug("unmap handle=%d st=%d\n",
381	map->unmap_ops[offset+i].handle,	401	map->unmap_ops[offset+i].handle,
382	map->unmap_ops[offset+i].status);	402	map->unmap_ops[offset+i].status);
383	map->unmap_ops[offset+i].handle = INVALID_GRANT_HANDLE;	403	map->unmap_ops[offset+i].handle = INVALID_GRANT_HANDLE;
384	if (use_ptemod) {	404	if (use_ptemod) {
385	if (map->kunmap_ops[offset+i].status)	405	WARN_ON(map->kunmap_ops[offset+i].status);
386	err = -EINVAL;
387	pr_debug("kunmap handle=%u st=%d\n",	406	pr_debug("kunmap handle=%u st=%d\n",
388	map->kunmap_ops[offset+i].handle,	407	map->kunmap_ops[offset+i].handle,
389	map->kunmap_ops[offset+i].status);	408	map->kunmap_ops[offset+i].status);
390	map->kunmap_ops[offset+i].handle = INVALID_GRANT_HANDLE;	409	map->kunmap_ops[offset+i].handle = INVALID_GRANT_HANDLE;
391	}	410	}
392	}	411	}
393	return err;	412	/*
		413	* Decrease the live-grant counter. This must happen after the loop to
		414	* prevent premature reuse of the grants by gnttab_mmap().
		415	*/
		416	atomic_sub(data->count, &map->live_grants);
		417
		418	/* Release reference taken by __unmap_grant_pages */
		419	gntdev_put_map(NULL, map);
		420	}
		421
		422	static void __unmap_grant_pages(struct gntdev_grant_map *map, int offset,
		423	int pages)
		424	{
		425	if (map->notify.flags & UNMAP_NOTIFY_CLEAR_BYTE) {
		426	int pgno = (map->notify.addr >> PAGE_SHIFT);
		427
		428	if (pgno >= offset && pgno < offset + pages) {
		429	/* No need for kmap, pages are in lowmem */
		430	uint8_t *tmp = pfn_to_kaddr(page_to_pfn(map->pages[pgno]));
		431
		432	tmp[map->notify.addr & (PAGE_SIZE-1)] = 0;
		433	map->notify.flags &= ~UNMAP_NOTIFY_CLEAR_BYTE;
		434	}
		435	}
		436
		437	map->unmap_data.unmap_ops = map->unmap_ops + offset;
		438	map->unmap_data.kunmap_ops = use_ptemod ? map->kunmap_ops + offset : NULL;
		439	map->unmap_data.pages = map->pages + offset;
		440	map->unmap_data.count = pages;
		441	map->unmap_data.done = __unmap_grant_pages_done;
		442	map->unmap_data.data = map;
		443	refcount_inc(&map->users); /* to keep map alive during async call below */
		444
		445	gnttab_unmap_refs_async(&map->unmap_data);
394	}	446	}
395		447
396	static int unmap_grant_pages(struct gntdev_grant_map *map, int offset,	448	static void unmap_grant_pages(struct gntdev_grant_map *map, int offset,
397	int pages)	449	int pages)
398	{	450	{
399	int range, err = 0;	451	int range;
		452
		453	if (atomic_read(&map->live_grants) == 0)
		454	return; /* Nothing to do */
400		455
401	pr_debug("unmap %d+%d [%d+%d]\n", map->index, map->count, offset, pages);	456	pr_debug("unmap %d+%d [%d+%d]\n", map->index, map->count, offset, pages);
402		457
403	/* It is possible the requested range will have a "hole" where we	458	/* It is possible the requested range will have a "hole" where we
404	* already unmapped some of the grants. Only unmap valid ranges.	459	* already unmapped some of the grants. Only unmap valid ranges.
405	*/	460	*/
406	while (pages && !err) {	461	while (pages) {
407	while (pages &&	462	while (pages && map->being_removed[offset]) {
408	map->unmap_ops[offset].handle == INVALID_GRANT_HANDLE) {
409	offset++;	463	offset++;
410	pages--;	464	pages--;
411	}	465	}
412	range = 0;	466	range = 0;
413	while (range < pages) {	467	while (range < pages) {
414	if (map->unmap_ops[offset + range].handle ==	468	if (map->being_removed[offset + range])
415	INVALID_GRANT_HANDLE)
416	break;	469	break;
		470	map->being_removed[offset + range] = true;
417	range++;	471	range++;
418	}	472	}
419	err = __unmap_grant_pages(map, offset, range);	473	if (range)
		474	__unmap_grant_pages(map, offset, range);
420	offset += range;	475	offset += range;
421	pages -= range;	476	pages -= range;
422	}	477	}
423
424	return err;
425	}	478	}
426		479
427	/* ------------------------------------------------------------------ */	480	/* ------------------------------------------------------------------ */
@@ -473,7 +526,6 @@ static bool gntdev_invalidate(struct mmu_interval_notifier *mn, · 45 unmodified lines
473	struct gntdev_grant_map *map =	526	struct gntdev_grant_map *map =
474	container_of(mn, struct gntdev_grant_map, notifier);	527	container_of(mn, struct gntdev_grant_map, notifier);
475	unsigned long mstart, mend;	528	unsigned long mstart, mend;
476	int err;
477		529
478	if (!mmu_notifier_range_blockable(range))	530	if (!mmu_notifier_range_blockable(range))
479	return false;	531	return false;
@@ -494,10 +546,9 @@ static bool gntdev_invalidate(struct mmu_interval_notifier *mn, · 14 unmodified lines
494	map->index, map->count,	546	map->index, map->count,
495	map->vma->vm_start, map->vma->vm_end,	547	map->vma->vm_start, map->vma->vm_end,
496	range->start, range->end, mstart, mend);	548	range->start, range->end, mstart, mend);
497	err = unmap_grant_pages(map,	549	unmap_grant_pages(map,
498	(mstart - map->vma->vm_start) >> PAGE_SHIFT,	550	(mstart - map->vma->vm_start) >> PAGE_SHIFT,
499	(mend - mstart) >> PAGE_SHIFT);	551	(mend - mstart) >> PAGE_SHIFT);
500	WARN_ON(err);
501		552
502	return true;	553	return true;
503	}	554	}
@@ -985,6 +1036,10 @@ static int gntdev_mmap(struct file flip, struct vm_area_struct vma) · 481 unmodified lines
985	goto unlock_out;	1036	goto unlock_out;
986	if (use_ptemod && map->vma)	1037	if (use_ptemod && map->vma)
987	goto unlock_out;	1038	goto unlock_out;
		1039	if (atomic_read(&map->live_grants)) {
		1040	err = -EAGAIN;
		1041	goto unlock_out;
		1042	}
988	refcount_inc(&map->users);	1043	refcount_inc(&map->users);
989		1044
990	vma->vm_ops = &gntdev_vmops;	1045	vma->vm_ops = &gntdev_vmops;

fs/9p/fid.c+9−13

 	const unsigned char **wnames, *uname;
 	int i, n, l, clone, access;
 	struct v9fs_session_info *v9ses;
-	struct p9_fid *fid, *old_fid = NULL;
+	struct p9_fid *fid, *old_fid;
 	v9ses = v9fs_dentry2v9ses(dentry);
 	access = v9ses->flags & V9FS_ACCESS_MASK;
 		if (IS_ERR(fid))
 			return fid;
+		refcount_inc(&fid->count);
 		v9fs_fid_add(dentry->d_sb->s_root, fid);
 	}
 	/* If we are root ourself just return that */
-	if (dentry->d_sb->s_root == dentry) {
+	if (dentry->d_sb->s_root == dentry)
-		refcount_inc(&fid->count);
 		return fid;
-	}
 	/*
 	 * Do a multipath walk with attached root.
 	 * When walking parent we need to make sure we
 		fid = ERR_PTR(n);
 		goto err_out;
 	}
+	old_fid = fid;
 	clone = 1;
 	i = 0;
 	while (i < n) {
 		 * walk to ensure none of the patch component change
 		 */
 		fid = p9_client_walk(fid, l, &wnames[i], clone);
+		/* non-cloning walk will return the same fid */
+		if (fid != old_fid) {
+			p9_client_clunk(old_fid);
+			old_fid = fid;
+		}
 		if (IS_ERR(fid)) {
-			if (old_fid) {
-				/*
-				 * If we fail, clunk fid which are mapping
-				 * to path component and not the last component
-				 * of the path.
-				 */
-				p9_client_clunk(old_fid);
-			}
 			kfree(wnames);
 			goto err_out;
 		}
-		old_fid = fid;
 		i += l;
 		clone = 0;
 	}

fs/9p/vfs_addr.c+13−0

@@ -58,8 +58,21 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq) · 57 unmodified lines
58	*/	58	*/
59	static int v9fs_init_request(struct netfs_io_request rreq, struct file file)	59	static int v9fs_init_request(struct netfs_io_request rreq, struct file file)
60	{	60	{
		61	struct inode *inode = file_inode(file);
		62	struct v9fs_inode *v9inode = V9FS_I(inode);
61	struct p9_fid *fid = file->private_data;	63	struct p9_fid *fid = file->private_data;
62		64
		65	BUG_ON(!fid);
		66
		67	/* we might need to read from a fid that was opened write-only
		68	* for read-modify-write of page cache, use the writeback fid
		69	* for that */
		70	if (rreq->origin == NETFS_READ_FOR_WRITE &&
		71	(fid->mode & O_ACCMODE) == O_WRONLY) {
		72	fid = v9inode->writeback_fid;
		73	BUG_ON(!fid);
		74	}
		75
63	refcount_inc(&fid->count);	76	refcount_inc(&fid->count);
64	rreq->netfs_priv = fid;	77	rreq->netfs_priv = fid;
65	return 0;	78	return 0;

fs/9p/vfs_inode.c+4−4

 		return ERR_PTR(-ECHILD);
 	v9ses = v9fs_dentry2v9ses(dentry);
-	fid = v9fs_fid_lookup(dentry);
+	if (!v9fs_proto_dotu(v9ses))
+		return ERR_PTR(-EBADF);
 	p9_debug(P9_DEBUG_VFS, "%pd\n", dentry);
+	fid = v9fs_fid_lookup(dentry);
 	if (IS_ERR(fid))
 		return ERR_CAST(fid);
-	if (!v9fs_proto_dotu(v9ses))
-		return ERR_PTR(-EBADF);
 	st = p9_client_stat(fid);
 	p9_client_clunk(fid);
 	if (IS_ERR(st))

fs/9p/vfs_inode_dotl.c+3−0

 	if (IS_ERR(ofid)) {
 		err = PTR_ERR(ofid);
 		p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n", err);
+		p9_client_clunk(dfid);
 		goto out;
 	}
 	if (err) {
 		p9_debug(P9_DEBUG_VFS, "Failed to get acl values in creat %d\n",
 			 err);
+		p9_client_clunk(dfid);
 		goto error;
 	}
 	err = p9_client_create_dotl(ofid, name, v9fs_open_to_dotl_flags(flags),
 	if (err < 0) {
 		p9_debug(P9_DEBUG_VFS, "p9_client_open_dotl failed in creat %d\n",
 			 err);
+		p9_client_clunk(dfid);
 		goto error;
 	}
 	v9fs_invalidate_inode_attr(dir);

fs/afs/inode.c+2−1

@@ -745,7 +745,8 @@ int afs_getattr(struct user_namespace mnt_userns, const struct path path, · 744 unmodified lines
745		745
746	_enter("{ ino=%lu v=%u }", inode->i_ino, inode->i_generation);	746	_enter("{ ino=%lu v=%u }", inode->i_ino, inode->i_generation);
747		747
748	if (!(query_flags & AT_STATX_DONT_SYNC) &&	748	if (vnode->volume &&
		749	!(query_flags & AT_STATX_DONT_SYNC) &&
749	!test_bit(AFS_VNODE_CB_PROMISED, &vnode->flags)) {	750	!test_bit(AFS_VNODE_CB_PROMISED, &vnode->flags)) {
750	key = afs_request_key(vnode->volume->cell);	751	key = afs_request_key(vnode->volume->cell);
751	if (IS_ERR(key))	752	if (IS_ERR(key))

fs/attr.c+20−6

@@ -61,9 +61,15 @@ static bool chgrp_ok(struct user_namespace *mnt_userns, · 60 unmodified lines
61	const struct inode *inode, kgid_t gid)	61	const struct inode *inode, kgid_t gid)
62	{	62	{
63	kgid_t kgid = i_gid_into_mnt(mnt_userns, inode);	63	kgid_t kgid = i_gid_into_mnt(mnt_userns, inode);
64	if (uid_eq(current_fsuid(), i_uid_into_mnt(mnt_userns, inode)) &&	64	if (uid_eq(current_fsuid(), i_uid_into_mnt(mnt_userns, inode))) {
65	(in_group_p(gid) \|\| gid_eq(gid, inode->i_gid)))	65	kgid_t mapped_gid;
66	return true;	66
		67	if (gid_eq(gid, inode->i_gid))
		68	return true;
		69	mapped_gid = mapped_kgid_fs(mnt_userns, i_user_ns(inode), gid);
		70	if (in_group_p(mapped_gid))
		71	return true;
		72	}
67	if (capable_wrt_inode_uidgid(mnt_userns, inode, CAP_CHOWN))	73	if (capable_wrt_inode_uidgid(mnt_userns, inode, CAP_CHOWN))
68	return true;	74	return true;
69	if (gid_eq(kgid, INVALID_GID) &&	75	if (gid_eq(kgid, INVALID_GID) &&
@@ -123,12 +129,20 @@ int setattr_prepare(struct user_namespace mnt_userns, struct dentry dentry, · 53 unmodified lines
123		129
124	/* Make sure a caller can chmod. */	130	/* Make sure a caller can chmod. */
125	if (ia_valid & ATTR_MODE) {	131	if (ia_valid & ATTR_MODE) {
		132	kgid_t mapped_gid;
		133
126	if (!inode_owner_or_capable(mnt_userns, inode))	134	if (!inode_owner_or_capable(mnt_userns, inode))
127	return -EPERM;	135	return -EPERM;
		136
		137	if (ia_valid & ATTR_GID)
		138	mapped_gid = mapped_kgid_fs(mnt_userns,
		139	i_user_ns(inode), attr->ia_gid);
		140	else
		141	mapped_gid = i_gid_into_mnt(mnt_userns, inode);
		142
128	/* Also check the setgid bit! */	143	/* Also check the setgid bit! */
129	if (!in_group_p((ia_valid & ATTR_GID) ? attr->ia_gid :	144	if (!in_group_p(mapped_gid) &&
130	i_gid_into_mnt(mnt_userns, inode)) &&	145	!capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID))
131	!capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID))
132	attr->ia_mode &= ~S_ISGID;	146	attr->ia_mode &= ~S_ISGID;
133	}	147	}
134		148

fs/btrfs/block-group.h+1−0

@@ -104,6 +104,7 @@ struct btrfs_block_group { · 103 unmodified lines
104	unsigned int relocating_repair:1;	104	unsigned int relocating_repair:1;
105	unsigned int chunk_item_inserted:1;	105	unsigned int chunk_item_inserted:1;
106	unsigned int zone_is_active:1;	106	unsigned int zone_is_active:1;
		107	unsigned int zoned_data_reloc_ongoing:1;
107		108
108	int disk_cache_state;	109	int disk_cache_state;
109		110

fs/btrfs/ctree.h+2−0

 	 * existing extent into a file range.
 	 */
 	bool is_new_extent;
+	/* Indicate if we should update the inode's mtime and ctime. */
+	bool update_times;
 	/* Meaningful only if is_new_extent is true. */
 	int qgroup_reserved;
 	/*

fs/btrfs/disk-io.c+11−2

 	int ret;
 	set_bit(BTRFS_FS_CLOSING_START, &fs_info->flags);
+	/*
+	 * We may have the reclaim task running and relocating a data block group,
+	 * in which case it may create delayed iputs. So stop it before we park
+	 * the cleaner kthread otherwise we can get new delayed iputs after
+	 * parking the cleaner, and that can make the async reclaim task to hang
+	 * if it's waiting for delayed iputs to complete, since the cleaner is
+	 * parked and can not run delayed iputs - this will make us hang when
+	 * trying to stop the async reclaim task.
+	 */
+	cancel_work_sync(&fs_info->reclaim_bgs_work);
 	/*
 	 * We don't want the cleaner to start new transactions, add more delayed
 	 * iputs, etc. while we're closing. We can't use kthread_stop() yet
 	cancel_work_sync(&fs_info->async_data_reclaim_work);
 	cancel_work_sync(&fs_info->preempt_reclaim_work);
-	cancel_work_sync(&fs_info->reclaim_bgs_work);
 	/* Cancel or finish ongoing discard work */
 	btrfs_discard_cleanup(fs_info);

fs/btrfs/extent-tree.c+18−2

@@ -3832,7 +3832,7 @@ static int do_allocation_zoned(struct btrfs_block_group *block_group, · 3831 unmodified lines
3832	block_group->start == fs_info->data_reloc_bg \|\|	3832	block_group->start == fs_info->data_reloc_bg \|\|
3833	fs_info->data_reloc_bg == 0);	3833	fs_info->data_reloc_bg == 0);
3834		3834
3835	if (block_group->ro) {	3835	if (block_group->ro \|\| block_group->zoned_data_reloc_ongoing) {
3836	ret = 1;	3836	ret = 1;
3837	goto out;	3837	goto out;
3838	}	3838	}
@@ -3894,8 +3894,24 @@ static int do_allocation_zoned(struct btrfs_block_group *block_group, · 55 unmodified lines
3894	out:	3894	out:
3895	if (ret && ffe_ctl->for_treelog)	3895	if (ret && ffe_ctl->for_treelog)
3896	fs_info->treelog_bg = 0;	3896	fs_info->treelog_bg = 0;
3897	if (ret && ffe_ctl->for_data_reloc)	3897	if (ret && ffe_ctl->for_data_reloc &&
		3898	fs_info->data_reloc_bg == block_group->start) {
		3899	/*
		3900	* Do not allow further allocations from this block group.
		3901	* Compared to increasing the ->ro, setting the
		3902	* ->zoned_data_reloc_ongoing flag still allows nocow
		3903	* writers to come in. See btrfs_inc_nocow_writers().
		3904	*
		3905	* We need to disable an allocation to avoid an allocation of
		3906	* regular (non-relocation data) extent. With mix of relocation
		3907	* extents and regular extents, we can dispatch WRITE commands
		3908	* (for relocation extents) and ZONE APPEND commands (for
		3909	* regular extents) at the same time to the same zone, which
		3910	* easily break the write pointer.
		3911	*/
		3912	block_group->zoned_data_reloc_ongoing = 1;
3898	fs_info->data_reloc_bg = 0;	3913	fs_info->data_reloc_bg = 0;
		3914	}
3899	spin_unlock(&fs_info->relocation_bg_lock);	3915	spin_unlock(&fs_info->relocation_bg_lock);
3900	spin_unlock(&fs_info->treelog_bg_lock);	3916	spin_unlock(&fs_info->treelog_bg_lock);
3901	spin_unlock(&block_group->lock);	3917	spin_unlock(&block_group->lock);

fs/btrfs/extent_io.c+2−1

 	 */
 	btrfs_zoned_data_reloc_lock(BTRFS_I(inode));
 	ret = extent_write_cache_pages(mapping, wbc, &epd);
-	btrfs_zoned_data_reloc_unlock(BTRFS_I(inode));
 	ASSERT(ret <= 0);
 	if (ret < 0) {
+		btrfs_zoned_data_reloc_unlock(BTRFS_I(inode));
 		end_write_bio(&epd, ret);
 		return ret;
 	}
 	flush_write_bio(&epd);
+	btrfs_zoned_data_reloc_unlock(BTRFS_I(inode));
 	return ret;
 }

fs/btrfs/file.c+75−17

@@ -2323,25 +2323,62 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) · 2322 unmodified lines
2323	*/	2323	*/
2324	btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);	2324	btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);
2325		2325
2326	if (ret != BTRFS_NO_LOG_SYNC) {	2326	if (ret == BTRFS_NO_LOG_SYNC) {
		2327	ret = btrfs_end_transaction(trans);
		2328	goto out;
		2329	}
		2330
		2331	/* We successfully logged the inode, attempt to sync the log. */
		2332	if (!ret) {
		2333	ret = btrfs_sync_log(trans, root, &ctx);
2327	if (!ret) {	2334	if (!ret) {
2328	ret = btrfs_sync_log(trans, root, &ctx);	2335	ret = btrfs_end_transaction(trans);
2329	if (!ret) {	2336	goto out;
2330	ret = btrfs_end_transaction(trans);
2331	goto out;
2332	}
2333	}
2334	if (!full_sync) {
2335	ret = btrfs_wait_ordered_range(inode, start, len);
2336	if (ret) {
2337	btrfs_end_transaction(trans);
2338	goto out;
2339	}
2340	}	2337	}
2341	ret = btrfs_commit_transaction(trans);	2338	}
2342	} else {	2339
		2340	/*
		2341	* At this point we need to commit the transaction because we had
		2342	* btrfs_need_log_full_commit() or some other error.
		2343	*
		2344	* If we didn't do a full sync we have to stop the trans handle, wait on
		2345	* the ordered extents, start it again and commit the transaction. If
		2346	* we attempt to wait on the ordered extents here we could deadlock with
		2347	* something like fallocate() that is holding the extent lock trying to
		2348	* start a transaction while some other thread is trying to commit the
		2349	* transaction while we (fsync) are currently holding the transaction
		2350	* open.
		2351	*/
		2352	if (!full_sync) {
2343	ret = btrfs_end_transaction(trans);	2353	ret = btrfs_end_transaction(trans);
		2354	if (ret)
		2355	goto out;
		2356	ret = btrfs_wait_ordered_range(inode, start, len);
		2357	if (ret)
		2358	goto out;
		2359
		2360	/*
		2361	* This is safe to use here because we're only interested in
		2362	* making sure the transaction that had the ordered extents is
		2363	* committed. We aren't waiting on anything past this point,
		2364	* we're purely getting the transaction and committing it.
		2365	*/
		2366	trans = btrfs_attach_transaction_barrier(root);
		2367	if (IS_ERR(trans)) {
		2368	ret = PTR_ERR(trans);
		2369
		2370	/*
		2371	* We committed the transaction and there's no currently
		2372	* running transaction, this means everything we care
		2373	* about made it to disk and we are done.
		2374	*/
		2375	if (ret == -ENOENT)
		2376	ret = 0;
		2377	goto out;
		2378	}
2344	}	2379	}
		2380
		2381	ret = btrfs_commit_transaction(trans);
2345	out:	2382	out:
2346	ASSERT(list_empty(&ctx.list));	2383	ASSERT(list_empty(&ctx.list));
2347	err = file_check_and_advance_wb_err(file);	2384	err = file_check_and_advance_wb_err(file);
@@ -2719,7 +2756,8 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode, · 371 unmodified lines
2719		2756
2720	ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, rsv,	2757	ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, rsv,
2721	min_size, false);	2758	min_size, false);
2722	BUG_ON(ret);	2759	if (WARN_ON(ret))
		2760	goto out_trans;
2723	trans->block_rsv = rsv;	2761	trans->block_rsv = rsv;
2724		2762
2725	cur_offset = start;	2763	cur_offset = start;
@@ -2803,6 +2841,25 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode, · 77 unmodified lines
2803	extent_info->file_offset += replace_len;	2841	extent_info->file_offset += replace_len;
2804	}	2842	}
2805		2843
		2844	/*
		2845	* We are releasing our handle on the transaction, balance the
		2846	* dirty pages of the btree inode and flush delayed items, and
		2847	* then get a new transaction handle, which may now point to a
		2848	* new transaction in case someone else may have committed the
		2849	* transaction we used to replace/drop file extent items. So
		2850	* bump the inode's iversion and update mtime and ctime except
		2851	* if we are called from a dedupe context. This is because a
		2852	* power failure/crash may happen after the transaction is
		2853	* committed and before we finish replacing/dropping all the
		2854	* file extent items we need.
		2855	*/
		2856	inode_inc_iversion(&inode->vfs_inode);
		2857
		2858	if (!extent_info \|\| extent_info->update_times) {
		2859	inode->vfs_inode.i_mtime = current_time(&inode->vfs_inode);
		2860	inode->vfs_inode.i_ctime = inode->vfs_inode.i_mtime;
		2861	}
		2862
2806	ret = btrfs_update_inode(trans, root, inode);	2863	ret = btrfs_update_inode(trans, root, inode);
2807	if (ret)	2864	if (ret)
2808	break;	2865	break;
@@ -2819,7 +2876,8 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode, · 10 unmodified lines
2819		2876
2820	ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv,	2877	ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv,
2821	rsv, min_size, false);	2878	rsv, min_size, false);
2822	BUG_ON(ret); /* shouldn't happen */	2879	if (WARN_ON(ret))
		2880	break;
2823	trans->block_rsv = rsv;	2881	trans->block_rsv = rsv;
2824		2882
2825	cur_offset = drop_args.drop_end;	2883	cur_offset = drop_args.drop_end;

fs/btrfs/inode.c+3−0

 						ordered_extent->file_offset,
 						ordered_extent->file_offset +
 						logical_len);
+		btrfs_zoned_release_data_reloc_bg(fs_info, ordered_extent->disk_bytenr,
+						  ordered_extent->disk_num_bytes);
 	} else {
 		BUG_ON(root == fs_info->tree_root);
 		ret = insert_ordered_extent_file_extent(trans, ordered_extent);
 	extent_info.file_offset = file_offset;
 	extent_info.extent_buf = (char *)&stack_fi;
 	extent_info.is_new_extent = true;
+	extent_info.update_times = true;
 	extent_info.qgroup_reserved = qgroup_released;
 	extent_info.insertions = 0;

fs/btrfs/locking.c+0−3

 		start_ns = ktime_get_ns();
 	down_read_nested(&eb->lock, nest);
-	eb->lock_owner = current->pid;
 	trace_btrfs_tree_read_lock(eb, start_ns);
 }
 int btrfs_try_tree_read_lock(struct extent_buffer *eb)
 {
 	if (down_read_trylock(&eb->lock)) {
-		eb->lock_owner = current->pid;
 		trace_btrfs_try_tree_read_lock(eb);
 		return 1;
 	}
 void btrfs_tree_read_unlock(struct extent_buffer *eb)
 {
 	trace_btrfs_tree_read_unlock(eb);
-	eb->lock_owner = 0;
 	up_read(&eb->lock);
 }

fs/btrfs/reflink.c+12−4

@@ -344,6 +344,7 @@ static int btrfs_clone(struct inode src, struct inode inode, · 343 unmodified lines
344	int ret;	344	int ret;
345	const u64 len = olen_aligned;	345	const u64 len = olen_aligned;
346	u64 last_dest_end = destoff;	346	u64 last_dest_end = destoff;
		347	u64 prev_extent_end = off;
347		348
348	ret = -ENOMEM;	349	ret = -ENOMEM;
349	buf = kvmalloc(fs_info->nodesize, GFP_KERNEL);	350	buf = kvmalloc(fs_info->nodesize, GFP_KERNEL);
@@ -363,7 +364,6 @@ static int btrfs_clone(struct inode src, struct inode inode, · 13 unmodified lines
363	key.offset = off;	364	key.offset = off;
364		365
365	while (1) {	366	while (1) {
366	u64 next_key_min_offset = key.offset + 1;
367	struct btrfs_file_extent_item *extent;	367	struct btrfs_file_extent_item *extent;
368	u64 extent_gen;	368	u64 extent_gen;
369	int type;	369	int type;
@@ -431,14 +431,21 @@ process_slot: · 61 unmodified lines
431	* The first search might have left us at an extent item that	431	* The first search might have left us at an extent item that
432	* ends before our target range's start, can happen if we have	432	* ends before our target range's start, can happen if we have
433	* holes and NO_HOLES feature enabled.	433	* holes and NO_HOLES feature enabled.
		434	*
		435	* Subsequent searches may leave us on a file range we have
		436	* processed before - this happens due to a race with ordered
		437	* extent completion for a file range that is outside our source
		438	* range, but that range was part of a file extent item that
		439	* also covered a leading part of our source range.
434	*/	440	*/
435	if (key.offset + datal <= off) {	441	if (key.offset + datal <= prev_extent_end) {
436	path->slots[0]++;	442	path->slots[0]++;
437	goto process_slot;	443	goto process_slot;
438	} else if (key.offset >= off + len) {	444	} else if (key.offset >= off + len) {
439	break;	445	break;
440	}	446	}
441	next_key_min_offset = key.offset + datal;	447
		448	prev_extent_end = key.offset + datal;
442	size = btrfs_item_size(leaf, slot);	449	size = btrfs_item_size(leaf, slot);
443	read_extent_buffer(leaf, buf, btrfs_item_ptr_offset(leaf, slot),	450	read_extent_buffer(leaf, buf, btrfs_item_ptr_offset(leaf, slot),
444	size);	451	size);
@@ -489,6 +496,7 @@ process_slot: · 44 unmodified lines
489	clone_info.file_offset = new_key.offset;	496	clone_info.file_offset = new_key.offset;
490	clone_info.extent_buf = buf;	497	clone_info.extent_buf = buf;
491	clone_info.is_new_extent = false;	498	clone_info.is_new_extent = false;
		499	clone_info.update_times = !no_time_update;
492	ret = btrfs_replace_file_extents(BTRFS_I(inode), path,	500	ret = btrfs_replace_file_extents(BTRFS_I(inode), path,
493	drop_start, new_key.offset + datal - 1,	501	drop_start, new_key.offset + datal - 1,
494	&clone_info, &trans);	502	&clone_info, &trans);
@@ -550,7 +558,7 @@ process_slot: · 55 unmodified lines
550	break;	558	break;
551		559
552	btrfs_release_path(path);	560	btrfs_release_path(path);
553	key.offset = next_key_min_offset;	561	key.offset = prev_extent_end;
554		562
555	if (fatal_signal_pending(current)) {	563	if (fatal_signal_pending(current)) {
556	ret = -EINTR;	564	ret = -EINTR;

fs/btrfs/super.c+40−7

 				compress_force = false;
 				no_compress++;
 			} else {
+				btrfs_err(info, "unrecognized compression value %s",
+					  args[0].from);
 				ret = -EINVAL;
 				goto out;
 			}
 		case Opt_thread_pool:
 			ret = match_int(&args[0], &intarg);
 			if (ret) {
+				btrfs_err(info, "unrecognized thread_pool value %s",
+					  args[0].from);
 				goto out;
 			} else if (intarg == 0) {
+				btrfs_err(info, "invalid value 0 for thread_pool");
 				ret = -EINVAL;
 				goto out;
 			}
 			break;
 		case Opt_ratio:
 			ret = match_int(&args[0], &intarg);
-			if (ret)
+			if (ret) {
+				btrfs_err(info, "unrecognized metadata_ratio value %s",
+					  args[0].from);
 				goto out;
+			}
 			info->metadata_ratio = intarg;
 			btrfs_info(info, "metadata ratio %u",
 				   info->metadata_ratio);
 				btrfs_set_and_info(info, DISCARD_ASYNC,
 						   "turning on async discard");
 			} else {
+				btrfs_err(info, "unrecognized discard mode value %s",
+					  args[0].from);
 				ret = -EINVAL;
 				goto out;
 			}
 				btrfs_set_and_info(info, FREE_SPACE_TREE,
 						   "enabling free space tree");
 			} else {
+				btrfs_err(info, "unrecognized space_cache value %s",
+					  args[0].from);
 				ret = -EINVAL;
 				goto out;
 			}
 			break;
 		case Opt_check_integrity_print_mask:
 			ret = match_int(&args[0], &intarg);
-			if (ret)
+			if (ret) {
+				btrfs_err(info,
+				"unrecognized check_integrity_print_mask value %s",
+					args[0].from);
 				goto out;
+			}
 			info->check_integrity_print_mask = intarg;
 			btrfs_info(info, "check_integrity_print_mask 0x%x",
 				   info->check_integrity_print_mask);
 			goto out;
 #endif
 		case Opt_fatal_errors:
-			if (strcmp(args[0].from, "panic") == 0)
+			if (strcmp(args[0].from, "panic") == 0) {
 				btrfs_set_opt(info->mount_opt,
 					      PANIC_ON_FATAL_ERROR);
-			else if (strcmp(args[0].from, "bug") == 0)
+			} else if (strcmp(args[0].from, "bug") == 0) {
 				btrfs_clear_opt(info->mount_opt,
 					      PANIC_ON_FATAL_ERROR);
-			else {
+			} else {
+				btrfs_err(info, "unrecognized fatal_errors value %s",
+					  args[0].from);
 				ret = -EINVAL;
 				goto out;
 			}
 		case Opt_commit_interval:
 			intarg = 0;
 			ret = match_int(&args[0], &intarg);
-			if (ret)
+			if (ret) {
+				btrfs_err(info, "unrecognized commit_interval value %s",
+					  args[0].from);
+				ret = -EINVAL;
 				goto out;
+			}
 			if (intarg == 0) {
 				btrfs_info(info,
 					   "using default commit interval %us",
 			break;
 		case Opt_rescue:
 			ret = parse_rescue_options(info, args[0].from);
-			if (ret < 0)
+			if (ret < 0) {
+				btrfs_err(info, "unrecognized rescue value %s",
+					  args[0].from);
 				goto out;
+			}
 			break;
 #ifdef CONFIG_BTRFS_DEBUG
 		case Opt_fragment_all:
 	if (ret)
 		goto restore;
+	/* V1 cache is not supported for subpage mount. */
+	if (fs_info->sectorsize < PAGE_SIZE && btrfs_test_opt(fs_info, SPACE_CACHE)) {
+		btrfs_warn(fs_info,
+	"v1 space cache is not supported for page size %lu with sectorsize %u",
+			   PAGE_SIZE, fs_info->sectorsize);
+		ret = -EINVAL;
+		goto restore;
+	}
 	btrfs_remount_begin(fs_info, old_opts, *flags);
 	btrfs_resize_thread_pool(fs_info,
 		fs_info->thread_pool_size, old_thread_pool_size);

fs/btrfs/zoned.c+27−0

@@ -2139,3 +2139,30 @@ bool btrfs_zoned_should_reclaim(struct btrfs_fs_info *fs_info) · 2138 unmodified lines
2139	factor = div64_u64(used * 100, total);	2139	factor = div64_u64(used * 100, total);
2140	return factor >= fs_info->bg_reclaim_threshold;	2140	return factor >= fs_info->bg_reclaim_threshold;
2141	}	2141	}
		2142
		2143	void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info, u64 logical,
		2144	u64 length)
		2145	{
		2146	struct btrfs_block_group *block_group;
		2147
		2148	if (!btrfs_is_zoned(fs_info))
		2149	return;
		2150
		2151	block_group = btrfs_lookup_block_group(fs_info, logical);
		2152	/* It should be called on a previous data relocation block group. */
		2153	ASSERT(block_group && (block_group->flags & BTRFS_BLOCK_GROUP_DATA));
		2154
		2155	spin_lock(&block_group->lock);
		2156	if (!block_group->zoned_data_reloc_ongoing)
		2157	goto out;
		2158
		2159	/* All relocation extents are written. */
		2160	if (block_group->start + block_group->alloc_offset == logical + length) {
		2161	/* Now, release this block group for further allocations. */
		2162	block_group->zoned_data_reloc_ongoing = 0;
		2163	}
		2164
		2165	out:
		2166	spin_unlock(&block_group->lock);
		2167	btrfs_put_block_group(block_group);
		2168	}

fs/btrfs/zoned.h+5−0

 void btrfs_clear_data_reloc_bg(struct btrfs_block_group *bg);
 void btrfs_free_zone_cache(struct btrfs_fs_info *fs_info);
 bool btrfs_zoned_should_reclaim(struct btrfs_fs_info *fs_info);
+void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info, u64 logical,
+				       u64 length);
 #else /* CONFIG_BLK_DEV_ZONED */
 static inline int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos,
 				     struct blk_zone *zone)
 {
 	return false;
 }
+static inline void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info,
+						     u64 logical, u64 length) { }
 #endif
 static inline bool btrfs_dev_is_sequential(struct btrfs_device *device, u64 pos)

fs/cifs/cifs_debug.c+7−5

@@ -162,6 +162,8 @@ cifs_dump_iface(struct seq_file m, struct cifs_server_iface iface) · 161 unmodified lines
162	seq_printf(m, "\t\tIPv4: %pI4\n", &ipv4->sin_addr);	162	seq_printf(m, "\t\tIPv4: %pI4\n", &ipv4->sin_addr);
163	else if (iface->sockaddr.ss_family == AF_INET6)	163	else if (iface->sockaddr.ss_family == AF_INET6)
164	seq_printf(m, "\t\tIPv6: %pI6\n", &ipv6->sin6_addr);	164	seq_printf(m, "\t\tIPv6: %pI6\n", &ipv6->sin6_addr);
		165	if (!iface->is_active)
		166	seq_puts(m, "\t\t[for-cleanup]\n");
165	}	167	}
166		168
167	static int cifs_debug_files_proc_show(struct seq_file m, void v)	169	static int cifs_debug_files_proc_show(struct seq_file m, void v)
@@ -221,6 +223,7 @@ static int cifs_debug_data_proc_show(struct seq_file m, void v) · 53 unmodified lines
221	struct TCP_Server_Info *server;	223	struct TCP_Server_Info *server;
222	struct cifs_ses *ses;	224	struct cifs_ses *ses;
223	struct cifs_tcon *tcon;	225	struct cifs_tcon *tcon;
		226	struct cifs_server_iface *iface;
224	int c, i, j;	227	int c, i, j;
225		228
226	seq_puts(m,	229	seq_puts(m,
@@ -456,11 +459,10 @@ skip_rdma: · 229 unmodified lines
456	if (ses->iface_count)	459	if (ses->iface_count)
457	seq_printf(m, "\n\n\tServer interfaces: %zu",	460	seq_printf(m, "\n\n\tServer interfaces: %zu",
458	ses->iface_count);	461	ses->iface_count);
459	for (j = 0; j < ses->iface_count; j++) {	462	j = 0;
460	struct cifs_server_iface *iface;	463	list_for_each_entry(iface, &ses->iface_list,
461		464	iface_head) {
462	iface = &ses->iface_list[j];	465	seq_printf(m, "\n\t%d)", ++j);
463	seq_printf(m, "\n\t%d)", j+1);
464	cifs_dump_iface(m, iface);	466	cifs_dump_iface(m, iface);
465	if (is_ses_using_iface(ses, iface))	467	if (is_ses_using_iface(ses, iface))
466	seq_puts(m, "\t\t[CONNECTED]\n");	468	seq_puts(m, "\t\t[CONNECTED]\n");

fs/cifs/cifsglob.h+57−1

@@ -80,6 +80,9 @@ · 79 unmodified lines
80	#define SMB_DNS_RESOLVE_INTERVAL_MIN 120	80	#define SMB_DNS_RESOLVE_INTERVAL_MIN 120
81	#define SMB_DNS_RESOLVE_INTERVAL_DEFAULT 600	81	#define SMB_DNS_RESOLVE_INTERVAL_DEFAULT 600
82		82
		83	/* smb multichannel query server interfaces interval in seconds */
		84	#define SMB_INTERFACE_POLL_INTERVAL 600
		85
83	/* maximum number of PDUs in one compound */	86	/* maximum number of PDUs in one compound */
84	#define MAX_COMPOUND 5	87	#define MAX_COMPOUND 5
85		88
@@ -933,15 +936,67 @@ static inline void cifs_set_net_ns(struct TCP_Server_Info srv, struct net net) · 847 unmodified lines
933	#endif	936	#endif
934		937
935	struct cifs_server_iface {	938	struct cifs_server_iface {
		939	struct list_head iface_head;
		940	struct kref refcount;
936	size_t speed;	941	size_t speed;
937	unsigned int rdma_capable : 1;	942	unsigned int rdma_capable : 1;
938	unsigned int rss_capable : 1;	943	unsigned int rss_capable : 1;
		944	unsigned int is_active : 1; /* unset if non existent */
939	struct sockaddr_storage sockaddr;	945	struct sockaddr_storage sockaddr;
940	};	946	};
941		947
		948	/* release iface when last ref is dropped */
		949	static inline void
		950	release_iface(struct kref *ref)
		951	{
		952	struct cifs_server_iface *iface = container_of(ref,
		953	struct cifs_server_iface,
		954	refcount);
		955	list_del_init(&iface->iface_head);
		956	kfree(iface);
		957	}
		958
		959	/*
		960	* compare two interfaces a and b
		961	* return 0 if everything matches.
		962	* return 1 if a has higher link speed, or rdma capable, or rss capable
		963	* return -1 otherwise.
		964	*/
		965	static inline int
		966	iface_cmp(struct cifs_server_iface a, struct cifs_server_iface b)
		967	{
		968	int cmp_ret = 0;
		969
		970	WARN_ON(!a \|\| !b);
		971	if (a->speed == b->speed) {
		972	if (a->rdma_capable == b->rdma_capable) {
		973	if (a->rss_capable == b->rss_capable) {
		974	cmp_ret = memcmp(&a->sockaddr, &b->sockaddr,
		975	sizeof(a->sockaddr));
		976	if (!cmp_ret)
		977	return 0;
		978	else if (cmp_ret > 0)
		979	return 1;
		980	else
		981	return -1;
		982	} else if (a->rss_capable > b->rss_capable)
		983	return 1;
		984	else
		985	return -1;
		986	} else if (a->rdma_capable > b->rdma_capable)
		987	return 1;
		988	else
		989	return -1;
		990	} else if (a->speed > b->speed)
		991	return 1;
		992	else
		993	return -1;
		994	}
		995
942	struct cifs_chan {	996	struct cifs_chan {
943	unsigned int in_reconnect : 1; /* if session setup in progress for this channel */	997	unsigned int in_reconnect : 1; /* if session setup in progress for this channel */
944	struct TCP_Server_Info *server;	998	struct TCP_Server_Info *server;
		999	struct cifs_server_iface iface; / interface in use */
945	__u8 signkey[SMB3_SIGN_KEY_SIZE];	1000	__u8 signkey[SMB3_SIGN_KEY_SIZE];
946	};	1001	};
947		1002
@@ -993,7 +1048,7 @@ struct cifs_ses { · 45 unmodified lines
993	*/	1048	*/
994	spinlock_t iface_lock;	1049	spinlock_t iface_lock;
995	/* ========= begin: protected by iface_lock ======== */	1050	/* ========= begin: protected by iface_lock ======== */
996	struct cifs_server_iface *iface_list;	1051	struct list_head iface_list;
997	size_t iface_count;	1052	size_t iface_count;
998	unsigned long iface_last_update; /* jiffies */	1053	unsigned long iface_last_update; /* jiffies */
999	/* ========= end: protected by iface_lock ======== */	1054	/* ========= end: protected by iface_lock ======== */
@@ -1203,6 +1258,7 @@ struct cifs_tcon { · 203 unmodified lines
1203	#ifdef CONFIG_CIFS_DFS_UPCALL	1258	#ifdef CONFIG_CIFS_DFS_UPCALL
1204	struct list_head ulist; /* cache update list */	1259	struct list_head ulist; /* cache update list */
1205	#endif	1260	#endif
		1261	struct delayed_work query_interfaces; /* query interfaces workqueue job */
1206	};	1262	};
1207		1263
1208	/*	1264	/*

fs/cifs/cifsproto.h+7−0

@@ -636,6 +636,13 @@ cifs_chan_clear_need_reconnect(struct cifs_ses *ses, · 635 unmodified lines
636	bool	636	bool
637	cifs_chan_needs_reconnect(struct cifs_ses *ses,	637	cifs_chan_needs_reconnect(struct cifs_ses *ses,
638	struct TCP_Server_Info *server);	638	struct TCP_Server_Info *server);
		639	bool
		640	cifs_chan_is_iface_active(struct cifs_ses *ses,
		641	struct TCP_Server_Info *server);
		642	int
		643	cifs_chan_update_iface(struct cifs_ses ses, struct TCP_Server_Info server);
		644	int
		645	SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon);
639		646
640	void extract_unc_hostname(const char unc, const char h, size_t len);	647	void extract_unc_hostname(const char unc, const char h, size_t len);
641	int copy_path_name(char dst, const char src);	648	int copy_path_name(char dst, const char src);

fs/cifs/connect.c+54−5

 	return rc;
 }
+static void smb2_query_server_interfaces(struct work_struct *work)
+{
+	int rc;
+	struct cifs_tcon *tcon = container_of(work,
+					struct cifs_tcon,
+					query_interfaces.work);
+	/*
+	 * query server network interfaces, in case they change
+	 */
+	rc = SMB3_request_interfaces(0, tcon);
+	if (rc) {
+		cifs_dbg(FYI, "%s: failed to query server interfaces: %d\n",
+				__func__, rc);
+	}
+	queue_delayed_work(cifsiod_wq, &tcon->query_interfaces,
+			   (SMB_INTERFACE_POLL_INTERVAL * HZ));
+}
 static void cifs_resolve_server(struct work_struct *work)
 {
 				      bool mark_smb_session)
 {
 	struct TCP_Server_Info *pserver;
-	struct cifs_ses *ses;
+	struct cifs_ses *ses, *nses;
 	struct cifs_tcon *tcon;
 	/*
 	spin_lock(&cifs_tcp_ses_lock);
-	list_for_each_entry(ses, &pserver->smb_ses_list, smb_ses_list) {
+	list_for_each_entry_safe(ses, nses, &pserver->smb_ses_list, smb_ses_list) {
+		/* check if iface is still active */
+		if (!cifs_chan_is_iface_active(ses, server)) {
+			/*
+			 * HACK: drop the lock before calling
+			 * cifs_chan_update_iface to avoid deadlock
+			 */
+			ses->ses_count++;
+			spin_unlock(&cifs_tcp_ses_lock);
+			cifs_chan_update_iface(ses, server);
+			spin_lock(&cifs_tcp_ses_lock);
+			ses->ses_count--;
+		}
 		spin_lock(&ses->chan_lock);
 		if (!mark_smb_session && cifs_chan_needs_reconnect(ses, server))
 			goto next_session;
 		int i;
 		for (i = 1; i < chan_count; i++) {
-			spin_unlock(&ses->chan_lock);
+			if (ses->chans[i].iface) {
+				kref_put(&ses->chans[i].iface->refcount, release_iface);
+				ses->chans[i].iface = NULL;
+			}
 			cifs_put_tcp_session(ses->chans[i].server, 0);
-			spin_lock(&ses->chan_lock);
 			ses->chans[i].server = NULL;
 		}
 	}
 	list_del_init(&tcon->tcon_list);
 	spin_unlock(&cifs_tcp_ses_lock);
+	/* cancel polling of interfaces */
+	cancel_delayed_work_sync(&tcon->query_interfaces);
 	if (tcon->use_witness) {
 		int rc;
 	tcon->local_lease = ctx->local_lease;
 	INIT_LIST_HEAD(&tcon->pending_opens);
+	/* schedule query interfaces poll */
+	INIT_DELAYED_WORK(&tcon->query_interfaces,
+			  smb2_query_server_interfaces);
+	queue_delayed_work(cifsiod_wq, &tcon->query_interfaces,
+			   (SMB_INTERFACE_POLL_INTERVAL * HZ));
 	spin_lock(&cifs_tcp_ses_lock);
 	list_add(&tcon->tcon_list, &ses->tcon_list);
 	spin_unlock(&cifs_tcp_ses_lock);
 		   struct nls_table *nls_info)
 {
 	int rc = -ENOSYS;
+	struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&server->dstaddr;
+	struct sockaddr_in *addr = (struct sockaddr_in *)&server->dstaddr;
 	bool is_binding = false;
 	spin_lock(&cifs_tcp_ses_lock);
+	if (server->dstaddr.ss_family == AF_INET6)
+		scnprintf(ses->ip_addr, sizeof(ses->ip_addr), "%pI6", &addr6->sin6_addr);
+	else
+		scnprintf(ses->ip_addr, sizeof(ses->ip_addr), "%pI4", &addr->sin_addr);
 	if (ses->ses_status != SES_GOOD &&
 	    ses->ses_status != SES_NEW &&
 	    ses->ses_status != SES_NEED_RECON) {

fs/cifs/misc.c+8−1

 		INIT_LIST_HEAD(&ret_buf->tcon_list);
 		mutex_init(&ret_buf->session_mutex);
 		spin_lock_init(&ret_buf->iface_lock);
+		INIT_LIST_HEAD(&ret_buf->iface_list);
 		spin_lock_init(&ret_buf->chan_lock);
 	}
 	return ret_buf;
 void
 sesInfoFree(struct cifs_ses *buf_to_free)
 {
+	struct cifs_server_iface *iface = NULL, *niface = NULL;
 	if (buf_to_free == NULL) {
 		cifs_dbg(FYI, "Null buffer passed to sesInfoFree\n");
 		return;
 	kfree(buf_to_free->user_name);
 	kfree(buf_to_free->domainName);
 	kfree_sensitive(buf_to_free->auth_key.response);
-	kfree(buf_to_free->iface_list);
+	spin_lock(&buf_to_free->iface_lock);
+	list_for_each_entry_safe(iface, niface, &buf_to_free->iface_list,
+				 iface_head)
+		kref_put(&iface->refcount, release_iface);
+	spin_unlock(&buf_to_free->iface_lock);
 	kfree_sensitive(buf_to_free);
 }

fs/cifs/sess.c+131−38

@@ -58,7 +58,7 @@ bool is_ses_using_iface(struct cifs_ses ses, struct cifs_server_iface iface) · 57 unmodified lines
58		58
59	spin_lock(&ses->chan_lock);	59	spin_lock(&ses->chan_lock);
60	for (i = 0; i < ses->chan_count; i++) {	60	for (i = 0; i < ses->chan_count; i++) {
61	if (is_server_using_iface(ses->chans[i].server, iface)) {	61	if (ses->chans[i].iface == iface) {
62	spin_unlock(&ses->chan_lock);	62	spin_unlock(&ses->chan_lock);
63	return true;	63	return true;
64	}	64	}
@@ -81,6 +81,9 @@ cifs_ses_get_chan_index(struct cifs_ses *ses, · 16 unmodified lines
81	}	81	}
82		82
83	/* If we didn't find the channel, it is likely a bug */	83	/* If we didn't find the channel, it is likely a bug */
		84	if (server)
		85	cifs_dbg(VFS, "unable to get chan index for server: 0x%llx",
		86	server->conn_id);
84	WARN_ON(1);	87	WARN_ON(1);
85	return 0;	88	return 0;
86	}	89	}
@@ -143,16 +146,24 @@ cifs_chan_needs_reconnect(struct cifs_ses *ses, · 56 unmodified lines
143	return CIFS_CHAN_NEEDS_RECONNECT(ses, chan_index);	146	return CIFS_CHAN_NEEDS_RECONNECT(ses, chan_index);
144	}	147	}
145		148
		149	bool
		150	cifs_chan_is_iface_active(struct cifs_ses *ses,
		151	struct TCP_Server_Info *server)
		152	{
		153	unsigned int chan_index = cifs_ses_get_chan_index(ses, server);
		154
		155	return ses->chans[chan_index].iface &&
		156	ses->chans[chan_index].iface->is_active;
		157	}
		158
146	/* returns number of channels added */	159	/* returns number of channels added */
147	int cifs_try_adding_channels(struct cifs_sb_info cifs_sb, struct cifs_ses ses)	160	int cifs_try_adding_channels(struct cifs_sb_info cifs_sb, struct cifs_ses ses)
148	{	161	{
149	int old_chan_count, new_chan_count;	162	int old_chan_count, new_chan_count;
150	int left;	163	int left;
151	int i = 0;
152	int rc = 0;	164	int rc = 0;
153	int tries = 0;	165	int tries = 0;
154	struct cifs_server_iface *ifaces = NULL;	166	struct cifs_server_iface iface = NULL, niface = NULL;
155	size_t iface_count;
156		167
157	spin_lock(&ses->chan_lock);	168	spin_lock(&ses->chan_lock);
158		169
@@ -181,33 +192,17 @@ int cifs_try_adding_channels(struct cifs_sb_info cifs_sb, struct cifs_ses ses) · 22 unmodified lines
181	}	192	}
182	spin_unlock(&ses->chan_lock);	193	spin_unlock(&ses->chan_lock);
183		194
184	/*
185	* Make a copy of the iface list at the time and use that
186	* instead so as to not hold the iface spinlock for opening
187	* channels
188	*/
189	spin_lock(&ses->iface_lock);
190	iface_count = ses->iface_count;
191	if (iface_count <= 0) {
192	spin_unlock(&ses->iface_lock);
193	cifs_dbg(VFS, "no iface list available to open channels\n");
194	return 0;
195	}
196	ifaces = kmemdup(ses->iface_list, iface_countsizeof(ifaces),
197	GFP_ATOMIC);
198	if (!ifaces) {
199	spin_unlock(&ses->iface_lock);
200	return 0;
201	}
202	spin_unlock(&ses->iface_lock);
203
204	/*	195	/*
205	* Keep connecting to same, fastest, iface for all channels as	196	* Keep connecting to same, fastest, iface for all channels as
206	* long as its RSS. Try next fastest one if not RSS or channel	197	* long as its RSS. Try next fastest one if not RSS or channel
207	* creation fails.	198	* creation fails.
208	*/	199	*/
		200	spin_lock(&ses->iface_lock);
		201	iface = list_first_entry(&ses->iface_list, struct cifs_server_iface,
		202	iface_head);
		203	spin_unlock(&ses->iface_lock);
		204
209	while (left > 0) {	205	while (left > 0) {
210	struct cifs_server_iface *iface;
211		206
212	tries++;	207	tries++;
213	if (tries > 3*ses->chan_max) {	208	if (tries > 3*ses->chan_max) {
@@ -216,30 +211,127 @@ int cifs_try_adding_channels(struct cifs_sb_info cifs_sb, struct cifs_ses ses) · 2 unmodified lines
216	break;	211	break;
217	}	212	}
218		213
219	iface = &ifaces[i];	214	spin_lock(&ses->iface_lock);
220	if (is_ses_using_iface(ses, iface) && !iface->rss_capable) {	215	if (!ses->iface_count) {
221	i = (i+1) % iface_count;	216	spin_unlock(&ses->iface_lock);
222	continue;	217	break;
223	}	218	}
224		219
225	rc = cifs_ses_add_channel(cifs_sb, ses, iface);	220	list_for_each_entry_safe_from(iface, niface, &ses->iface_list,
226	if (rc) {	221	iface_head) {
227	cifs_dbg(FYI, "failed to open extra channel on iface#%d rc=%d\n",	222	/* skip ifaces that are unusable */
228	i, rc);	223	if (!iface->is_active \|\|
229	i = (i+1) % iface_count;	224	(is_ses_using_iface(ses, iface) &&
230	continue;	225	!iface->rss_capable)) {
		226	continue;
		227	}
		228
		229	/* take ref before unlock */
		230	kref_get(&iface->refcount);
		231
		232	spin_unlock(&ses->iface_lock);
		233	rc = cifs_ses_add_channel(cifs_sb, ses, iface);
		234	spin_lock(&ses->iface_lock);
		235
		236	if (rc) {
		237	cifs_dbg(VFS, "failed to open extra channel on iface:%pIS rc=%d\n",
		238	&iface->sockaddr,
		239	rc);
		240	kref_put(&iface->refcount, release_iface);
		241	continue;
		242	}
		243
		244	cifs_dbg(FYI, "successfully opened new channel on iface:%pIS\n",
		245	&iface->sockaddr);
		246	break;
231	}	247	}
		248	spin_unlock(&ses->iface_lock);
232		249
233	cifs_dbg(FYI, "successfully opened new channel on iface#%d\n",
234	i);
235	left--;	250	left--;
236	new_chan_count++;	251	new_chan_count++;
237	}	252	}
238		253
239	kfree(ifaces);
240	return new_chan_count - old_chan_count;	254	return new_chan_count - old_chan_count;
241	}	255	}
242		256
		257	/*
		258	* update the iface for the channel if necessary.
		259	* will return 0 when iface is updated, 1 if removed, 2 otherwise
		260	* Must be called with chan_lock held.
		261	*/
		262	int
		263	cifs_chan_update_iface(struct cifs_ses ses, struct TCP_Server_Info server)
		264	{
		265	unsigned int chan_index;
		266	struct cifs_server_iface *iface = NULL;
		267	struct cifs_server_iface *old_iface = NULL;
		268	int rc = 0;
		269
		270	spin_lock(&ses->chan_lock);
		271	chan_index = cifs_ses_get_chan_index(ses, server);
		272	if (!chan_index) {
		273	spin_unlock(&ses->chan_lock);
		274	return 0;
		275	}
		276
		277	if (ses->chans[chan_index].iface) {
		278	old_iface = ses->chans[chan_index].iface;
		279	if (old_iface->is_active) {
		280	spin_unlock(&ses->chan_lock);
		281	return 1;
		282	}
		283	}
		284	spin_unlock(&ses->chan_lock);
		285
		286	spin_lock(&ses->iface_lock);
		287	/* then look for a new one */
		288	list_for_each_entry(iface, &ses->iface_list, iface_head) {
		289	if (!iface->is_active \|\|
		290	(is_ses_using_iface(ses, iface) &&
		291	!iface->rss_capable)) {
		292	continue;
		293	}
		294	kref_get(&iface->refcount);
		295	}
		296
		297	if (!list_entry_is_head(iface, &ses->iface_list, iface_head)) {
		298	rc = 1;
		299	iface = NULL;
		300	cifs_dbg(FYI, "unable to find a suitable iface\n");
		301	}
		302
		303	/* now drop the ref to the current iface */
		304	if (old_iface && iface) {
		305	kref_put(&old_iface->refcount, release_iface);
		306	cifs_dbg(FYI, "replacing iface: %pIS with %pIS\n",
		307	&old_iface->sockaddr,
		308	&iface->sockaddr);
		309	} else if (old_iface) {
		310	kref_put(&old_iface->refcount, release_iface);
		311	cifs_dbg(FYI, "releasing ref to iface: %pIS\n",
		312	&old_iface->sockaddr);
		313	} else {
		314	WARN_ON(!iface);
		315	cifs_dbg(FYI, "adding new iface: %pIS\n", &iface->sockaddr);
		316	}
		317	spin_unlock(&ses->iface_lock);
		318
		319	spin_lock(&ses->chan_lock);
		320	chan_index = cifs_ses_get_chan_index(ses, server);
		321	ses->chans[chan_index].iface = iface;
		322
		323	/* No iface is found. if secondary chan, drop connection */
		324	if (!iface && CIFS_SERVER_IS_CHAN(server))
		325	ses->chans[chan_index].server = NULL;
		326
		327	spin_unlock(&ses->chan_lock);
		328
		329	if (!iface && CIFS_SERVER_IS_CHAN(server))
		330	cifs_put_tcp_session(server, false);
		331
		332	return rc;
		333	}
		334
243	/*	335	/*
244	* If server is a channel of ses, return the corresponding enclosing	336	* If server is a channel of ses, return the corresponding enclosing
245	* cifs_chan otherwise return NULL.	337	* cifs_chan otherwise return NULL.
@@ -352,6 +444,7 @@ cifs_ses_add_channel(struct cifs_sb_info cifs_sb, struct cifs_ses ses, · 106 unmodified lines
352	spin_unlock(&ses->chan_lock);	444	spin_unlock(&ses->chan_lock);
353	goto out;	445	goto out;
354	}	446	}
		447	chan->iface = iface;
355	ses->chan_count++;	448	ses->chan_count++;
356	atomic_set(&ses->chan_seq, 0);	449	atomic_set(&ses->chan_seq, 0);
357		450

fs/cifs/smb2ops.c+90−83

@@ -512,73 +512,41 @@ smb3_negotiate_rsize(struct cifs_tcon tcon, struct smb3_fs_context ctx) · 511 unmodified lines
512	static int	512	static int
513	parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,	513	parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,
514	size_t buf_len,	514	size_t buf_len,
515	struct cifs_server_iface **iface_list,	515	struct cifs_ses *ses)
516	size_t *iface_count)
517	{	516	{
518	struct network_interface_info_ioctl_rsp *p;	517	struct network_interface_info_ioctl_rsp *p;
519	struct sockaddr_in *addr4;	518	struct sockaddr_in *addr4;
520	struct sockaddr_in6 *addr6;	519	struct sockaddr_in6 *addr6;
521	struct iface_info_ipv4 *p4;	520	struct iface_info_ipv4 *p4;
522	struct iface_info_ipv6 *p6;	521	struct iface_info_ipv6 *p6;
523	struct cifs_server_iface *info;	522	struct cifs_server_iface info = NULL, iface = NULL, *niface = NULL;
		523	struct cifs_server_iface tmp_iface;
524	ssize_t bytes_left;	524	ssize_t bytes_left;
525	size_t next = 0;	525	size_t next = 0;
526	int nb_iface = 0;	526	int nb_iface = 0;
527	int rc = 0;	527	int rc = 0, ret = 0;
528
529	*iface_list = NULL;
530	*iface_count = 0;
531
532	/*
533	* Fist pass: count and sanity check
534	*/
535		528
536	bytes_left = buf_len;	529	bytes_left = buf_len;
537	p = buf;	530	p = buf;
538	while (bytes_left >= sizeof(*p)) {
539	nb_iface++;
540	next = le32_to_cpu(p->Next);
541	if (!next) {
542	bytes_left -= sizeof(*p);
543	break;
544	}
545	p = (struct network_interface_info_ioctl_rsp )((u8 )p+next);
546	bytes_left -= next;
547	}
548
549	if (!nb_iface) {
550	cifs_dbg(VFS, "%s: malformed interface info\n", __func__);
551	rc = -EINVAL;
552	goto out;
553	}
554
555	/* Azure rounds the buffer size up 8, to a 16 byte boundary */
556	if ((bytes_left > 8) \|\| p->Next)
557	cifs_dbg(VFS, "%s: incomplete interface info\n", __func__);
558
559		531
		532	spin_lock(&ses->iface_lock);
560	/*	533	/*
561	* Second pass: extract info to internal structure	534	* Go through iface_list and do kref_put to remove
		535	* any unused ifaces. ifaces in use will be removed
		536	* when the last user calls a kref_put on it
562	*/	537	*/
563		538	list_for_each_entry_safe(iface, niface, &ses->iface_list,
564	iface_list = kcalloc(nb_iface, sizeof(*iface_list), GFP_KERNEL);	539	iface_head) {
565	if (!*iface_list) {	540	iface->is_active = 0;
566	rc = -ENOMEM;	541	kref_put(&iface->refcount, release_iface);
567	goto out;
568	}	542	}
		543	spin_unlock(&ses->iface_lock);
569		544
570	info = *iface_list;
571	bytes_left = buf_len;
572	p = buf;
573	while (bytes_left >= sizeof(*p)) {	545	while (bytes_left >= sizeof(*p)) {
574	info->speed = le64_to_cpu(p->LinkSpeed);	546	memset(&tmp_iface, 0, sizeof(tmp_iface));
575	info->rdma_capable = le32_to_cpu(p->Capability & RDMA_CAPABLE) ? 1 : 0;	547	tmp_iface.speed = le64_to_cpu(p->LinkSpeed);
576	info->rss_capable = le32_to_cpu(p->Capability & RSS_CAPABLE) ? 1 : 0;	548	tmp_iface.rdma_capable = le32_to_cpu(p->Capability & RDMA_CAPABLE) ? 1 : 0;
577		549	tmp_iface.rss_capable = le32_to_cpu(p->Capability & RSS_CAPABLE) ? 1 : 0;
578	cifs_dbg(FYI, "%s: adding iface %zu\n", __func__, *iface_count);
579	cifs_dbg(FYI, "%s: speed %zu bps\n", __func__, info->speed);
580	cifs_dbg(FYI, "%s: capabilities 0x%08x\n", __func__,
581	le32_to_cpu(p->Capability));
582		550
583	switch (p->Family) {	551	switch (p->Family) {
584	/*	552	/*
@@ -587,7 +555,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, · 2 unmodified lines
587	* conversion explicit in case either one changes.	555	* conversion explicit in case either one changes.
588	*/	556	*/
589	case INTERNETWORK:	557	case INTERNETWORK:
590	addr4 = (struct sockaddr_in *)&info->sockaddr;	558	addr4 = (struct sockaddr_in *)&tmp_iface.sockaddr;
591	p4 = (struct iface_info_ipv4 *)p->Buffer;	559	p4 = (struct iface_info_ipv4 *)p->Buffer;
592	addr4->sin_family = AF_INET;	560	addr4->sin_family = AF_INET;
593	memcpy(&addr4->sin_addr, &p4->IPv4Address, 4);	561	memcpy(&addr4->sin_addr, &p4->IPv4Address, 4);
@@ -599,7 +567,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, · 5 unmodified lines
599	&addr4->sin_addr);	567	&addr4->sin_addr);
600	break;	568	break;
601	case INTERNETWORKV6:	569	case INTERNETWORKV6:
602	addr6 = (struct sockaddr_in6 *)&info->sockaddr;	570	addr6 = (struct sockaddr_in6 *)&tmp_iface.sockaddr;
603	p6 = (struct iface_info_ipv6 *)p->Buffer;	571	p6 = (struct iface_info_ipv6 *)p->Buffer;
604	addr6->sin6_family = AF_INET6;	572	addr6->sin6_family = AF_INET6;
605	memcpy(&addr6->sin6_addr, &p6->IPv6Address, 16);	573	memcpy(&addr6->sin6_addr, &p6->IPv6Address, 16);
@@ -619,46 +587,96 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, · 13 unmodified lines
619	goto next_iface;	587	goto next_iface;
620	}	588	}
621		589
622	(*iface_count)++;	590	/*
623	info++;	591	* The iface_list is assumed to be sorted by speed.
		592	* Check if the new interface exists in that list.
		593	* NEVER change iface. it could be in use.
		594	* Add a new one instead
		595	*/
		596	spin_lock(&ses->iface_lock);
		597	iface = niface = NULL;
		598	list_for_each_entry_safe(iface, niface, &ses->iface_list,
		599	iface_head) {
		600	ret = iface_cmp(iface, &tmp_iface);
		601	if (!ret) {
		602	/* just get a ref so that it doesn't get picked/freed */
		603	iface->is_active = 1;
		604	kref_get(&iface->refcount);
		605	spin_unlock(&ses->iface_lock);
		606	goto next_iface;
		607	} else if (ret < 0) {
		608	/* all remaining ifaces are slower */
		609	kref_get(&iface->refcount);
		610	break;
		611	}
		612	}
		613	spin_unlock(&ses->iface_lock);
		614
		615	/* no match. insert the entry in the list */
		616	info = kmalloc(sizeof(struct cifs_server_iface),
		617	GFP_KERNEL);
		618	if (!info) {
		619	rc = -ENOMEM;
		620	goto out;
		621	}
		622	memcpy(info, &tmp_iface, sizeof(tmp_iface));
		623
		624	/* add this new entry to the list */
		625	kref_init(&info->refcount);
		626	info->is_active = 1;
		627
		628	cifs_dbg(FYI, "%s: adding iface %zu\n", __func__, ses->iface_count);
		629	cifs_dbg(FYI, "%s: speed %zu bps\n", __func__, info->speed);
		630	cifs_dbg(FYI, "%s: capabilities 0x%08x\n", __func__,
		631	le32_to_cpu(p->Capability));
		632
		633	spin_lock(&ses->iface_lock);
		634	if (!list_entry_is_head(iface, &ses->iface_list, iface_head)) {
		635	list_add_tail(&info->iface_head, &iface->iface_head);
		636	kref_put(&iface->refcount, release_iface);
		637	} else
		638	list_add_tail(&info->iface_head, &ses->iface_list);
		639	spin_unlock(&ses->iface_lock);
		640
		641	ses->iface_count++;
		642	ses->iface_last_update = jiffies;
624	next_iface:	643	next_iface:
		644	nb_iface++;
625	next = le32_to_cpu(p->Next);	645	next = le32_to_cpu(p->Next);
626	if (!next)	646	if (!next) {
		647	bytes_left -= sizeof(*p);
627	break;	648	break;
		649	}
628	p = (struct network_interface_info_ioctl_rsp )((u8 )p+next);	650	p = (struct network_interface_info_ioctl_rsp )((u8 )p+next);
629	bytes_left -= next;	651	bytes_left -= next;
630	}	652	}
631		653
632	if (!*iface_count) {	654	if (!nb_iface) {
		655	cifs_dbg(VFS, "%s: malformed interface info\n", __func__);
633	rc = -EINVAL;	656	rc = -EINVAL;
634	goto out;	657	goto out;
635	}	658	}
636		659
637	out:	660	/* Azure rounds the buffer size up 8, to a 16 byte boundary */
638	if (rc) {	661	if ((bytes_left > 8) \|\| p->Next)
639	kfree(*iface_list);	662	cifs_dbg(VFS, "%s: incomplete interface info\n", __func__);
640	*iface_count = 0;
641	*iface_list = NULL;
642	}
643	return rc;
644	}
645		663
646	static int compare_iface(const void ia, const void ib)
647	{
648	const struct cifs_server_iface a = (struct cifs_server_iface )ia;
649	const struct cifs_server_iface b = (struct cifs_server_iface )ib;
650		664
651	return a->speed == b->speed ? 0 : (a->speed > b->speed ? -1 : 1);	665	if (!ses->iface_count) {
		666	rc = -EINVAL;
		667	goto out;
		668	}
		669
		670	out:
		671	return rc;
652	}	672	}
653		673
654	static int	674	int
655	SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon)	675	SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon)
656	{	676	{
657	int rc;	677	int rc;
658	unsigned int ret_data_len = 0;	678	unsigned int ret_data_len = 0;
659	struct network_interface_info_ioctl_rsp *out_buf = NULL;	679	struct network_interface_info_ioctl_rsp *out_buf = NULL;
660	struct cifs_server_iface *iface_list;
661	size_t iface_count;
662	struct cifs_ses *ses = tcon->ses;	680	struct cifs_ses *ses = tcon->ses;
663		681
664	rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID,	682	rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID,
@@ -674,21 +692,10 @@ SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon) · 9 unmodified lines
674	goto out;	692	goto out;
675	}	693	}
676		694
677	rc = parse_server_interfaces(out_buf, ret_data_len,	695	rc = parse_server_interfaces(out_buf, ret_data_len, ses);
678	&iface_list, &iface_count);
679	if (rc)	696	if (rc)
680	goto out;	697	goto out;
681		698
682	/* sort interfaces from fastest to slowest */
683	sort(iface_list, iface_count, sizeof(*iface_list), compare_iface, NULL);
684
685	spin_lock(&ses->iface_lock);
686	kfree(ses->iface_list);
687	ses->iface_list = iface_list;
688	ses->iface_count = iface_count;
689	ses->iface_last_update = jiffies;
690	spin_unlock(&ses->iface_lock);
691
692	out:	699	out:
693	kfree(out_buf);	700	kfree(out_buf);
694	return rc;	701	return rc;

fs/cifs/smb2pdu.c+17−6

 		      struct TCP_Server_Info *server, unsigned int *total_len)
 {
 	char *pneg_ctxt;
+	char *hostname = NULL;
 	unsigned int ctxt_len, neg_context_count;
 	if (*total_len > 200) {
 	*total_len += ctxt_len;
 	pneg_ctxt += ctxt_len;
-	ctxt_len = build_netname_ctxt((struct smb2_netname_neg_context *)pneg_ctxt,
-					server->hostname);
-	*total_len += ctxt_len;
-	pneg_ctxt += ctxt_len;
 	build_posix_ctxt((struct smb2_posix_neg_context *)pneg_ctxt);
 	*total_len += sizeof(struct smb2_posix_neg_context);
 	pneg_ctxt += sizeof(struct smb2_posix_neg_context);
-	neg_context_count = 4;
+	/*
+	 * secondary channels don't have the hostname field populated
+	 * use the hostname field in the primary channel instead
+	 */
+	hostname = CIFS_SERVER_IS_CHAN(server) ?
+		server->primary_server->hostname : server->hostname;
+	if (hostname && (hostname[0] != 0)) {
+		ctxt_len = build_netname_ctxt((struct smb2_netname_neg_context *)pneg_ctxt,
+					      hostname);
+		*total_len += ctxt_len;
+		pneg_ctxt += ctxt_len;
+		neg_context_count = 4;
+	} else /* second channels do not have a hostname */
+		neg_context_count = 3;
 	if (server->compress_algorithm) {
 		build_compression_ctxt((struct smb2_compression_capabilities_context *)
 	data = &info;
 	size = sizeof(struct smb2_file_eof_info);
+	trace_smb3_set_eof(xid, persistent_fid, tcon->tid, tcon->ses->Suid, le64_to_cpu(*eof));
 	return send_set_info(xid, tcon, persistent_fid, volatile_fid,
 			pid, FILE_END_OF_FILE_INFORMATION, SMB2_O_INFO_FILE,
 			0, 1, &data, &size);

fs/cifs/trace.h+38−0

@@ -121,6 +121,44 @@ DEFINE_SMB3_RW_DONE_EVENT(query_dir_done); · 120 unmodified lines
121	DEFINE_SMB3_RW_DONE_EVENT(zero_done);	121	DEFINE_SMB3_RW_DONE_EVENT(zero_done);
122	DEFINE_SMB3_RW_DONE_EVENT(falloc_done);	122	DEFINE_SMB3_RW_DONE_EVENT(falloc_done);
123		123
		124	/* For logging successful set EOF (truncate) */
		125	DECLARE_EVENT_CLASS(smb3_eof_class,
		126	TP_PROTO(unsigned int xid,
		127	__u64 fid,
		128	__u32 tid,
		129	__u64 sesid,
		130	__u64 offset),
		131	TP_ARGS(xid, fid, tid, sesid, offset),
		132	TP_STRUCT__entry(
		133	__field(unsigned int, xid)
		134	__field(__u64, fid)
		135	__field(__u32, tid)
		136	__field(__u64, sesid)
		137	__field(__u64, offset)
		138	),
		139	TP_fast_assign(
		140	__entry->xid = xid;
		141	__entry->fid = fid;
		142	__entry->tid = tid;
		143	__entry->sesid = sesid;
		144	__entry->offset = offset;
		145	),
		146	TP_printk("xid=%u sid=0x%llx tid=0x%x fid=0x%llx offset=0x%llx",
		147	__entry->xid, __entry->sesid, __entry->tid, __entry->fid,
		148	__entry->offset)
		149	)
		150
		151	#define DEFINE_SMB3_EOF_EVENT(name) \
		152	DEFINE_EVENT(smb3_eof_class, smb3_##name, \
		153	TP_PROTO(unsigned int xid, \
		154	__u64 fid, \
		155	__u32 tid, \
		156	__u64 sesid, \
		157	__u64 offset), \
		158	TP_ARGS(xid, fid, tid, sesid, offset))
		159
		160	DEFINE_SMB3_EOF_EVENT(set_eof);
		161
124	/*	162	/*
125	* For handle based calls other than read and write, and get/set info	163	* For handle based calls other than read and write, and get/set info
126	*/	164	*/

fs/exfat/namei.c+3−1

@@ -1198,7 +1198,9 @@ static int __exfat_rename(struct inode *old_parent_inode, · 1197 unmodified lines
1198	return -ENOENT;	1198	return -ENOENT;
1199	}	1199	}
1200		1200
1201	exfat_chain_dup(&olddir, &ei->dir);	1201	exfat_chain_set(&olddir, EXFAT_I(old_parent_inode)->start_clu,
		1202	EXFAT_B_TO_CLU_ROUND_UP(i_size_read(old_parent_inode), sbi),
		1203	EXFAT_I(old_parent_inode)->flags);
1202	dentry = ei->entry;	1204	dentry = ei->entry;
1203		1205
1204	ep = exfat_get_dentry(sb, &olddir, dentry, &old_bh);	1206	ep = exfat_get_dentry(sb, &olddir, dentry, &old_bh);

fs/ext2/dir.c+3−6

 	void *page_addr = NULL;
 	struct page *page = NULL;
 	unsigned long i, npages = dir_pages(inode);
-	int dir_has_error = 0;
 	for (i = 0; i < npages; i++) {
 		char *kaddr;
 		ext2_dirent * de;
-		page = ext2_get_page(inode, i, dir_has_error, &page_addr);
+		page = ext2_get_page(inode, i, 0, &page_addr);
-		if (IS_ERR(page)) {
+		if (IS_ERR(page))
-			dir_has_error = 1;
+			goto not_empty;
-			continue;
-		}
 		kaddr = page_addr;
 		de = (ext2_dirent *)kaddr;

fs/ext4/inode.c+1−1

@@ -829,7 +829,7 @@ int ext4_get_block_unwritten(struct inode *inode, sector_t iblock, · 828 unmodified lines
829	ext4_debug("ext4_get_block_unwritten: inode %lu, create flag %d\n",	829	ext4_debug("ext4_get_block_unwritten: inode %lu, create flag %d\n",
830	inode->i_ino, create);	830	inode->i_ino, create);
831	return _ext4_get_block(inode, iblock, bh_result,	831	return _ext4_get_block(inode, iblock, bh_result,
832	EXT4_GET_BLOCKS_IO_CREATE_EXT);	832	EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT);
833	}	833	}
834		834
835	/* Maximum number of blocks we map for direct IO at once. */	835	/* Maximum number of blocks we map for direct IO at once. */

fs/ext4/mballoc.c+25−1

@@ -4104,6 +4104,15 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, · 4103 unmodified lines
4104	size = size >> bsbits;	4104	size = size >> bsbits;
4105	start = start_off >> bsbits;	4105	start = start_off >> bsbits;
4106		4106
		4107	/*
		4108	* For tiny groups (smaller than 8MB) the chosen allocation
		4109	* alignment may be larger than group size. Make sure the
		4110	* alignment does not move allocation to a different group which
		4111	* makes mballoc fail assertions later.
		4112	*/
		4113	start = max(start, rounddown(ac->ac_o_ex.fe_logical,
		4114	(ext4_lblk_t)EXT4_BLOCKS_PER_GROUP(ac->ac_sb)));
		4115
4107	/* don't cover already allocated blocks in selected range */	4116	/* don't cover already allocated blocks in selected range */
4108	if (ar->pleft && start <= ar->lleft) {	4117	if (ar->pleft && start <= ar->lleft) {
4109	size -= ar->lleft + 1 - start;	4118	size -= ar->lleft + 1 - start;
@@ -4176,7 +4185,22 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, · 66 unmodified lines
4176	}	4185	}
4177	rcu_read_unlock();	4186	rcu_read_unlock();
4178		4187
4179	if (start + size <= ac->ac_o_ex.fe_logical &&	4188	/*
		4189	* In this function "start" and "size" are normalized for better
		4190	* alignment and length such that we could preallocate more blocks.
		4191	* This normalization is done such that original request of
		4192	* ac->ac_o_ex.fe_logical & fe_len should always lie within "start" and
		4193	* "size" boundaries.
		4194	* (Note fe_len can be relaxed since FS block allocation API does not
		4195	* provide gurantee on number of contiguous blocks allocation since that
		4196	* depends upon free space left, etc).
		4197	* In case of inode pa, later we use the allocated blocks
		4198	* [pa_start + fe_logical - pa_lstart, fe_len/size] from the preallocated
		4199	* range of goal/best blocks [start, size] to put it at the
		4200	* ac_o_ex.fe_logical extent of this inode.
		4201	* (See ext4_mb_use_inode_pa() for more details)
		4202	*/
		4203	if (start + size <= ac->ac_o_ex.fe_logical \|\|
4180	start > ac->ac_o_ex.fe_logical) {	4204	start > ac->ac_o_ex.fe_logical) {
4181	ext4_msg(ac->ac_sb, KERN_ERR,	4205	ext4_msg(ac->ac_sb, KERN_ERR,
4182	"start %lu, size %lu, fe_logical %lu",	4206	"start %lu, size %lu, fe_logical %lu",

fs/ext4/migrate.c+1−1

@@ -438,7 +438,7 @@ int ext4_ext_migrate(struct inode *inode) · 437 unmodified lines
438		438
439	/*	439	/*
440	* Worst case we can touch the allocation bitmaps and a block	440	* Worst case we can touch the allocation bitmaps and a block
441	* group descriptor block. We do need need to worry about	441	* group descriptor block. We do need to worry about
442	* credits for modifying the quota inode.	442	* credits for modifying the quota inode.
443	*/	443	*/
444	handle = ext4_journal_start(inode, EXT4_HT_MIGRATE,	444	handle = ext4_journal_start(inode, EXT4_HT_MIGRATE,

fs/ext4/namei.c+2−1

 			struct dx_hash_info *hinfo)
 {
 	unsigned blocksize = dir->i_sb->s_blocksize;
-	unsigned count, continued;
+	unsigned continued;
+	int count;
 	struct buffer_head *bh2;
 	ext4_lblk_t newblock;
 	u32 hash2;

fs/ext4/page-io.c+1−1

@@ -465,7 +465,7 @@ int ext4_bio_write_page(struct ext4_io_submit *io, · 464 unmodified lines
465	/*	465	/*
466	* In the first loop we prepare and mark buffers to submit. We have to	466	* In the first loop we prepare and mark buffers to submit. We have to
467	* mark all buffers in the page before submitting so that	467	* mark all buffers in the page before submitting so that
468	* end_page_writeback() cannot be called from ext4_bio_end_io() when IO	468	* end_page_writeback() cannot be called from ext4_end_bio() when IO
469	* on the first buffer finishes and we are still working on submitting	469	* on the first buffer finishes and we are still working on submitting
470	* the second buffer.	470	* the second buffer.
471	*/	471	*/

fs/ext4/resize.c+10−0

@@ -53,6 +53,16 @@ int ext4_resize_begin(struct super_block *sb) · 52 unmodified lines
53	if (!capable(CAP_SYS_RESOURCE))	53	if (!capable(CAP_SYS_RESOURCE))
54	return -EPERM;	54	return -EPERM;
55		55
		56	/*
		57	* If the reserved GDT blocks is non-zero, the resize_inode feature
		58	* should always be set.
		59	*/
		60	if (EXT4_SB(sb)->s_es->s_reserved_gdt_blocks &&
		61	!ext4_has_feature_resize_inode(sb)) {
		62	ext4_error(sb, "resize_inode disabled but reserved GDT blocks non-zero");
		63	return -EFSCORRUPTED;
		64	}
		65
56	/*	66	/*
57	* If we are not using the primary superblock/GDT copy don't resize,	67	* If we are not using the primary superblock/GDT copy don't resize,
58	* because the user tools have no way of handling this. Probably a	68	* because the user tools have no way of handling this. Probably a

fs/ext4/super.c+95−77

@@ -87,7 +87,7 @@ static struct inode ext4_get_journal_inode(struct super_block sb, · 86 unmodified lines
87	static int ext4_validate_options(struct fs_context *fc);	87	static int ext4_validate_options(struct fs_context *fc);
88	static int ext4_check_opt_consistency(struct fs_context *fc,	88	static int ext4_check_opt_consistency(struct fs_context *fc,
89	struct super_block *sb);	89	struct super_block *sb);
90	static int ext4_apply_options(struct fs_context fc, struct super_block sb);	90	static void ext4_apply_options(struct fs_context fc, struct super_block sb);
91	static int ext4_parse_param(struct fs_context fc, struct fs_parameter param);	91	static int ext4_parse_param(struct fs_context fc, struct fs_parameter param);
92	static int ext4_get_tree(struct fs_context *fc);	92	static int ext4_get_tree(struct fs_context *fc);
93	static int ext4_reconfigure(struct fs_context *fc);	93	static int ext4_reconfigure(struct fs_context *fc);
@@ -1870,31 +1870,12 @@ ext4_sb_read_encoding(const struct ext4_super_block *es) · 1776 unmodified lines
1870	}	1870	}
1871	#endif	1871	#endif
1872		1872
1873	static int ext4_set_test_dummy_encryption(struct super_block sb, char arg)
1874	{
1875	#ifdef CONFIG_FS_ENCRYPTION
1876	struct ext4_sb_info *sbi = EXT4_SB(sb);
1877	int err;
1878
1879	err = fscrypt_set_test_dummy_encryption(sb, arg,
1880	&sbi->s_dummy_enc_policy);
1881	if (err) {
1882	ext4_msg(sb, KERN_WARNING,
1883	"Error while setting test dummy encryption [%d]", err);
1884	return err;
1885	}
1886	ext4_msg(sb, KERN_WARNING, "Test dummy encryption mode enabled");
1887	#endif
1888	return 0;
1889	}
1890
1891	#define EXT4_SPEC_JQUOTA (1 << 0)	1873	#define EXT4_SPEC_JQUOTA (1 << 0)
1892	#define EXT4_SPEC_JQFMT (1 << 1)	1874	#define EXT4_SPEC_JQFMT (1 << 1)
1893	#define EXT4_SPEC_DATAJ (1 << 2)	1875	#define EXT4_SPEC_DATAJ (1 << 2)
1894	#define EXT4_SPEC_SB_BLOCK (1 << 3)	1876	#define EXT4_SPEC_SB_BLOCK (1 << 3)
1895	#define EXT4_SPEC_JOURNAL_DEV (1 << 4)	1877	#define EXT4_SPEC_JOURNAL_DEV (1 << 4)
1896	#define EXT4_SPEC_JOURNAL_IOPRIO (1 << 5)	1878	#define EXT4_SPEC_JOURNAL_IOPRIO (1 << 5)
1897	#define EXT4_SPEC_DUMMY_ENCRYPTION (1 << 6)
1898	#define EXT4_SPEC_s_want_extra_isize (1 << 7)	1879	#define EXT4_SPEC_s_want_extra_isize (1 << 7)
1899	#define EXT4_SPEC_s_max_batch_time (1 << 8)	1880	#define EXT4_SPEC_s_max_batch_time (1 << 8)
1900	#define EXT4_SPEC_s_min_batch_time (1 << 9)	1881	#define EXT4_SPEC_s_min_batch_time (1 << 9)
@@ -1911,7 +1892,7 @@ static int ext4_set_test_dummy_encryption(struct super_block sb, char arg) · 10 unmodified lines
1911		1892
1912	struct ext4_fs_context {	1893	struct ext4_fs_context {
1913	char *s_qf_names[EXT4_MAXQUOTAS];	1894	char *s_qf_names[EXT4_MAXQUOTAS];
1914	char *test_dummy_enc_arg;	1895	struct fscrypt_dummy_policy dummy_enc_policy;
1915	int s_jquota_fmt; /* Format of quota to use */	1896	int s_jquota_fmt; /* Format of quota to use */
1916	#ifdef CONFIG_EXT4_DEBUG	1897	#ifdef CONFIG_EXT4_DEBUG
1917	int s_fc_debug_max_replay;	1898	int s_fc_debug_max_replay;
@@ -1953,7 +1934,7 @@ static void ext4_fc_free(struct fs_context *fc) · 35 unmodified lines
1953	for (i = 0; i < EXT4_MAXQUOTAS; i++)	1934	for (i = 0; i < EXT4_MAXQUOTAS; i++)
1954	kfree(ctx->s_qf_names[i]);	1935	kfree(ctx->s_qf_names[i]);
1955		1936
1956	kfree(ctx->test_dummy_enc_arg);	1937	fscrypt_free_dummy_policy(&ctx->dummy_enc_policy);
1957	kfree(ctx);	1938	kfree(ctx);
1958	}	1939	}
1959		1940
@@ -2029,6 +2010,29 @@ static int unnote_qf_name(struct fs_context *fc, int qtype) · 69 unmodified lines
2029	}	2010	}
2030	#endif	2011	#endif
2031		2012
		2013	static int ext4_parse_test_dummy_encryption(const struct fs_parameter *param,
		2014	struct ext4_fs_context *ctx)
		2015	{
		2016	int err;
		2017
		2018	if (!IS_ENABLED(CONFIG_FS_ENCRYPTION)) {
		2019	ext4_msg(NULL, KERN_WARNING,
		2020	"test_dummy_encryption option not supported");
		2021	return -EINVAL;
		2022	}
		2023	err = fscrypt_parse_test_dummy_encryption(param,
		2024	&ctx->dummy_enc_policy);
		2025	if (err == -EINVAL) {
		2026	ext4_msg(NULL, KERN_WARNING,
		2027	"Value of option \"%s\" is unrecognized", param->key);
		2028	} else if (err == -EEXIST) {
		2029	ext4_msg(NULL, KERN_WARNING,
		2030	"Conflicting test_dummy_encryption options");
		2031	return -EINVAL;
		2032	}
		2033	return err;
		2034	}
		2035
2032	#define EXT4_SET_CTX(name) \	2036	#define EXT4_SET_CTX(name) \
2033	static inline void ctx_set_##name(struct ext4_fs_context *ctx, \	2037	static inline void ctx_set_##name(struct ext4_fs_context *ctx, \
2034	unsigned long flag) \	2038	unsigned long flag) \
@@ -2291,29 +2295,7 @@ static int ext4_parse_param(struct fs_context fc, struct fs_parameter param) · 256 unmodified lines
2291	ctx->spec \|= EXT4_SPEC_JOURNAL_IOPRIO;	2295	ctx->spec \|= EXT4_SPEC_JOURNAL_IOPRIO;
2292	return 0;	2296	return 0;
2293	case Opt_test_dummy_encryption:	2297	case Opt_test_dummy_encryption:
2294	#ifdef CONFIG_FS_ENCRYPTION	2298	return ext4_parse_test_dummy_encryption(param, ctx);
2295	if (param->type == fs_value_is_flag) {
2296	ctx->spec \|= EXT4_SPEC_DUMMY_ENCRYPTION;
2297	ctx->test_dummy_enc_arg = NULL;
2298	return 0;
2299	}
2300	if (*param->string &&
2301	!(!strcmp(param->string, "v1") \|\|
2302	!strcmp(param->string, "v2"))) {
2303	ext4_msg(NULL, KERN_WARNING,
2304	"Value of option \"%s\" is unrecognized",
2305	param->key);
2306	return -EINVAL;
2307	}
2308	ctx->spec \|= EXT4_SPEC_DUMMY_ENCRYPTION;
2309	ctx->test_dummy_enc_arg = kmemdup_nul(param->string, param->size,
2310	GFP_KERNEL);
2311	return 0;
2312	#else
2313	ext4_msg(NULL, KERN_WARNING,
2314	"test_dummy_encryption option not supported");
2315	return -EINVAL;
2316	#endif
2317	case Opt_dax:	2299	case Opt_dax:
2318	case Opt_dax_type:	2300	case Opt_dax_type:
2319	#ifdef CONFIG_FS_DAX	2301	#ifdef CONFIG_FS_DAX
@@ -2504,7 +2486,8 @@ parse_failed: · 184 unmodified lines
2504	if (s_ctx->spec & EXT4_SPEC_JOURNAL_IOPRIO)	2486	if (s_ctx->spec & EXT4_SPEC_JOURNAL_IOPRIO)
2505	m_ctx->journal_ioprio = s_ctx->journal_ioprio;	2487	m_ctx->journal_ioprio = s_ctx->journal_ioprio;
2506		2488
2507	ret = ext4_apply_options(fc, sb);	2489	ext4_apply_options(fc, sb);
		2490	ret = 0;
2508		2491
2509	out_free:	2492	out_free:
2510	if (fc) {	2493	if (fc) {
@@ -2673,11 +2656,11 @@ err_jquota_specified: · 162 unmodified lines
2673	static int ext4_check_test_dummy_encryption(const struct fs_context *fc,	2656	static int ext4_check_test_dummy_encryption(const struct fs_context *fc,
2674	struct super_block *sb)	2657	struct super_block *sb)
2675	{	2658	{
2676	#ifdef CONFIG_FS_ENCRYPTION
2677	const struct ext4_fs_context *ctx = fc->fs_private;	2659	const struct ext4_fs_context *ctx = fc->fs_private;
2678	const struct ext4_sb_info *sbi = EXT4_SB(sb);	2660	const struct ext4_sb_info *sbi = EXT4_SB(sb);
		2661	int err;
2679		2662
2680	if (!(ctx->spec & EXT4_SPEC_DUMMY_ENCRYPTION))	2663	if (!fscrypt_is_dummy_policy_set(&ctx->dummy_enc_policy))
2681	return 0;	2664	return 0;
2682		2665
2683	if (!ext4_has_feature_encrypt(sb)) {	2666	if (!ext4_has_feature_encrypt(sb)) {
@@ -2691,14 +2674,46 @@ static int ext4_check_test_dummy_encryption(const struct fs_context *fc, · 7 unmodified lines
2691	* needed to allow it to be set or changed during remount. We do allow	2674	* needed to allow it to be set or changed during remount. We do allow
2692	* it to be specified during remount, but only if there is no change.	2675	* it to be specified during remount, but only if there is no change.
2693	*/	2676	*/
2694	if (fc->purpose == FS_CONTEXT_FOR_RECONFIGURE &&	2677	if (fc->purpose == FS_CONTEXT_FOR_RECONFIGURE) {
2695	!sbi->s_dummy_enc_policy.policy) {	2678	if (fscrypt_dummy_policies_equal(&sbi->s_dummy_enc_policy,
		2679	&ctx->dummy_enc_policy))
		2680	return 0;
2696	ext4_msg(NULL, KERN_WARNING,	2681	ext4_msg(NULL, KERN_WARNING,
2697	"Can't set test_dummy_encryption on remount");	2682	"Can't set or change test_dummy_encryption on remount");
2698	return -EINVAL;	2683	return -EINVAL;
2699	}	2684	}
2700	#endif /* CONFIG_FS_ENCRYPTION */	2685	/* Also make sure s_mount_opts didn't contain a conflicting value. */
2701	return 0;	2686	if (fscrypt_is_dummy_policy_set(&sbi->s_dummy_enc_policy)) {
		2687	if (fscrypt_dummy_policies_equal(&sbi->s_dummy_enc_policy,
		2688	&ctx->dummy_enc_policy))
		2689	return 0;
		2690	ext4_msg(NULL, KERN_WARNING,
		2691	"Conflicting test_dummy_encryption options");
		2692	return -EINVAL;
		2693	}
		2694	/*
		2695	* fscrypt_add_test_dummy_key() technically changes the super_block, so
		2696	* technically it should be delayed until ext4_apply_options() like the
		2697	* other changes. But since we never get here for remounts (see above),
		2698	* and this is the last chance to report errors, we do it here.
		2699	*/
		2700	err = fscrypt_add_test_dummy_key(sb, &ctx->dummy_enc_policy);
		2701	if (err)
		2702	ext4_msg(NULL, KERN_WARNING,
		2703	"Error adding test dummy encryption key [%d]", err);
		2704	return err;
		2705	}
		2706
		2707	static void ext4_apply_test_dummy_encryption(struct ext4_fs_context *ctx,
		2708	struct super_block *sb)
		2709	{
		2710	if (!fscrypt_is_dummy_policy_set(&ctx->dummy_enc_policy) \|\|
		2711	/* if already set, it was already verified to be the same */
		2712	fscrypt_is_dummy_policy_set(&EXT4_SB(sb)->s_dummy_enc_policy))
		2713	return;
		2714	EXT4_SB(sb)->s_dummy_enc_policy = ctx->dummy_enc_policy;
		2715	memset(&ctx->dummy_enc_policy, 0, sizeof(ctx->dummy_enc_policy));
		2716	ext4_msg(sb, KERN_WARNING, "Test dummy encryption mode enabled");
2702	}	2717	}
2703		2718
2704	static int ext4_check_opt_consistency(struct fs_context *fc,	2719	static int ext4_check_opt_consistency(struct fs_context *fc,
@@ -2785,11 +2800,10 @@ fail_dax_change_remount: · 80 unmodified lines
2785	return ext4_check_quota_consistency(fc, sb);	2800	return ext4_check_quota_consistency(fc, sb);
2786	}	2801	}
2787		2802
2788	static int ext4_apply_options(struct fs_context fc, struct super_block sb)	2803	static void ext4_apply_options(struct fs_context fc, struct super_block sb)
2789	{	2804	{
2790	struct ext4_fs_context *ctx = fc->fs_private;	2805	struct ext4_fs_context *ctx = fc->fs_private;
2791	struct ext4_sb_info *sbi = fc->s_fs_info;	2806	struct ext4_sb_info *sbi = fc->s_fs_info;
2792	int ret = 0;
2793		2807
2794	sbi->s_mount_opt &= ~ctx->mask_s_mount_opt;	2808	sbi->s_mount_opt &= ~ctx->mask_s_mount_opt;
2795	sbi->s_mount_opt \|= ctx->vals_s_mount_opt;	2809	sbi->s_mount_opt \|= ctx->vals_s_mount_opt;
@@ -2825,11 +2839,7 @@ static int ext4_apply_options(struct fs_context fc, struct super_block sb) · 29 unmodified lines
2825	#endif	2839	#endif
2826		2840
2827	ext4_apply_quota_options(fc, sb);	2841	ext4_apply_quota_options(fc, sb);
2828		2842	ext4_apply_test_dummy_encryption(ctx, sb);
2829	if (ctx->spec & EXT4_SPEC_DUMMY_ENCRYPTION)
2830	ret = ext4_set_test_dummy_encryption(sb, ctx->test_dummy_enc_arg);
2831
2832	return ret;
2833	}	2843	}
2834		2844
2835		2845
@@ -4552,9 +4562,7 @@ static int __ext4_fill_super(struct fs_context fc, struct super_block sb) · 1716 unmodified lines
4552	if (err < 0)	4562	if (err < 0)
4553	goto failed_mount;	4563	goto failed_mount;
4554		4564
4555	err = ext4_apply_options(fc, sb);	4565	ext4_apply_options(fc, sb);
4556	if (err < 0)
4557	goto failed_mount;
4558		4566
4559	#if IS_ENABLED(CONFIG_UNICODE)	4567	#if IS_ENABLED(CONFIG_UNICODE)
4560	if (ext4_has_feature_casefold(sb) && !sb->s_encoding) {	4568	if (ext4_has_feature_casefold(sb) && !sb->s_encoding) {
@@ -5302,14 +5310,6 @@ no_journal: · 741 unmodified lines
5302	err = percpu_counter_init(&sbi->s_freeinodes_counter, freei,	5310	err = percpu_counter_init(&sbi->s_freeinodes_counter, freei,
5303	GFP_KERNEL);	5311	GFP_KERNEL);
5304	}	5312	}
5305	/*
5306	* Update the checksum after updating free space/inode
5307	* counters. Otherwise the superblock can have an incorrect
5308	* checksum in the buffer cache until it is written out and
5309	* e2fsprogs programs trying to open a file system immediately
5310	* after it is mounted can fail.
5311	*/
5312	ext4_superblock_csum_set(sb);
5313	if (!err)	5313	if (!err)
5314	err = percpu_counter_init(&sbi->s_dirs_counter,	5314	err = percpu_counter_init(&sbi->s_dirs_counter,
5315	ext4_count_dirs(sb), GFP_KERNEL);	5315	ext4_count_dirs(sb), GFP_KERNEL);
@@ -5367,6 +5367,14 @@ no_journal: · 51 unmodified lines
5367	EXT4_SB(sb)->s_mount_state \|= EXT4_ORPHAN_FS;	5367	EXT4_SB(sb)->s_mount_state \|= EXT4_ORPHAN_FS;
5368	ext4_orphan_cleanup(sb, es);	5368	ext4_orphan_cleanup(sb, es);
5369	EXT4_SB(sb)->s_mount_state &= ~EXT4_ORPHAN_FS;	5369	EXT4_SB(sb)->s_mount_state &= ~EXT4_ORPHAN_FS;
		5370	/*
		5371	* Update the checksum after updating free space/inode counters and
		5372	* ext4_orphan_cleanup. Otherwise the superblock can have an incorrect
		5373	* checksum in the buffer cache until it is written out and
		5374	* e2fsprogs programs trying to open a file system immediately
		5375	* after it is mounted can fail.
		5376	*/
		5377	ext4_superblock_csum_set(sb);
5370	if (needs_recovery) {	5378	if (needs_recovery) {
5371	ext4_msg(sb, KERN_INFO, "recovery complete");	5379	ext4_msg(sb, KERN_INFO, "recovery complete");
5372	err = ext4_mark_recovery_complete(sb, es);	5380	err = ext4_mark_recovery_complete(sb, es);
@@ -5898,7 +5906,6 @@ static void ext4_update_super(struct super_block *sb) · 525 unmodified lines
5898	static int ext4_commit_super(struct super_block *sb)	5906	static int ext4_commit_super(struct super_block *sb)
5899	{	5907	{
5900	struct buffer_head *sbh = EXT4_SB(sb)->s_sbh;	5908	struct buffer_head *sbh = EXT4_SB(sb)->s_sbh;
5901	int error = 0;
5902		5909
5903	if (!sbh)	5910	if (!sbh)
5904	return -EINVAL;	5911	return -EINVAL;
@@ -5907,6 +5914,13 @@ static int ext4_commit_super(struct super_block *sb) · 2 unmodified lines
5907		5914
5908	ext4_update_super(sb);	5915	ext4_update_super(sb);
5909		5916
		5917	lock_buffer(sbh);
		5918	/* Buffer got discarded which means block device got invalidated */
		5919	if (!buffer_mapped(sbh)) {
		5920	unlock_buffer(sbh);
		5921	return -EIO;
		5922	}
		5923
5910	if (buffer_write_io_error(sbh) \|\| !buffer_uptodate(sbh)) {	5924	if (buffer_write_io_error(sbh) \|\| !buffer_uptodate(sbh)) {
5911	/*	5925	/*
5912	* Oh, dear. A previous attempt to write the	5926	* Oh, dear. A previous attempt to write the
@@ -5921,17 +5935,21 @@ static int ext4_commit_super(struct super_block *sb) · 8 unmodified lines
5921	clear_buffer_write_io_error(sbh);	5935	clear_buffer_write_io_error(sbh);
5922	set_buffer_uptodate(sbh);	5936	set_buffer_uptodate(sbh);
5923	}	5937	}
5924	BUFFER_TRACE(sbh, "marking dirty");	5938	get_bh(sbh);
5925	mark_buffer_dirty(sbh);	5939	/* Clear potential dirty bit if it was journalled update */
5926	error = __sync_dirty_buffer(sbh,	5940	clear_buffer_dirty(sbh);
5927	REQ_SYNC \| (test_opt(sb, BARRIER) ? REQ_FUA : 0));	5941	sbh->b_end_io = end_buffer_write_sync;
		5942	submit_bh(REQ_OP_WRITE,
		5943	REQ_SYNC \| (test_opt(sb, BARRIER) ? REQ_FUA : 0), sbh);
		5944	wait_on_buffer(sbh);
5928	if (buffer_write_io_error(sbh)) {	5945	if (buffer_write_io_error(sbh)) {
5929	ext4_msg(sb, KERN_ERR, "I/O error while writing "	5946	ext4_msg(sb, KERN_ERR, "I/O error while writing "
5930	"superblock");	5947	"superblock");
5931	clear_buffer_write_io_error(sbh);	5948	clear_buffer_write_io_error(sbh);
5932	set_buffer_uptodate(sbh);	5949	set_buffer_uptodate(sbh);
		5950	return -EIO;
5933	}	5951	}
5934	return error;	5952	return 0;
5935	}	5953	}
5936		5954
5937	/*	5955	/*

fs/ext4/xattr.c+1−2

 			unlock_buffer(bs->bh);
 			ea_bdebug(bs->bh, "cloning");
-			s->base = kmalloc(bs->bh->b_size, GFP_NOFS);
+			s->base = kmemdup(BHDR(bs->bh), bs->bh->b_size, GFP_NOFS);
 			error = -ENOMEM;
 			if (s->base == NULL)
 				goto cleanup;
-			memcpy(s->base, BHDR(bs->bh), bs->bh->b_size);
 			s->first = ENTRY(header(s->base)+1);
 			header(s->base)->h_refcount = cpu_to_le32(1);
 			s->here = ENTRY(s->base + offset);

fs/f2fs/iostat.c+18−13

 	unsigned int cnt;
 	struct f2fs_iostat_latency iostat_lat[MAX_IO_TYPE][NR_PAGE_TYPE];
 	struct iostat_lat_info *io_lat = sbi->iostat_io_lat;
+	unsigned long flags;
-	spin_lock_bh(&sbi->iostat_lat_lock);
+	spin_lock_irqsave(&sbi->iostat_lat_lock, flags);
 	for (idx = 0; idx < MAX_IO_TYPE; idx++) {
 		for (io = 0; io < NR_PAGE_TYPE; io++) {
 			cnt = io_lat->bio_cnt[idx][io];
 			io_lat->bio_cnt[idx][io] = 0;
 		}
 	}
-	spin_unlock_bh(&sbi->iostat_lat_lock);
+	spin_unlock_irqrestore(&sbi->iostat_lat_lock, flags);
 	trace_f2fs_iostat_latency(sbi, iostat_lat);
 }
 {
 	unsigned long long iostat_diff[NR_IO_TYPE];
 	int i;
+	unsigned long flags;
 	if (time_is_after_jiffies(sbi->iostat_next_period))
 		return;
 	/* Need double check under the lock */
-	spin_lock_bh(&sbi->iostat_lock);
+	spin_lock_irqsave(&sbi->iostat_lock, flags);
 	if (time_is_after_jiffies(sbi->iostat_next_period)) {
-		spin_unlock_bh(&sbi->iostat_lock);
+		spin_unlock_irqrestore(&sbi->iostat_lock, flags);
 		return;
 	}
 	sbi->iostat_next_period = jiffies +
 				sbi->prev_rw_iostat[i];
 		sbi->prev_rw_iostat[i] = sbi->rw_iostat[i];
 	}
-	spin_unlock_bh(&sbi->iostat_lock);
+	spin_unlock_irqrestore(&sbi->iostat_lock, flags);
 	trace_f2fs_iostat(sbi, iostat_diff);
 	struct iostat_lat_info *io_lat = sbi->iostat_io_lat;
 	int i;
-	spin_lock_bh(&sbi->iostat_lock);
+	spin_lock_irq(&sbi->iostat_lock);
 	for (i = 0; i < NR_IO_TYPE; i++) {
 		sbi->rw_iostat[i] = 0;
 		sbi->prev_rw_iostat[i] = 0;
 	}
-	spin_unlock_bh(&sbi->iostat_lock);
+	spin_unlock_irq(&sbi->iostat_lock);
-	spin_lock_bh(&sbi->iostat_lat_lock);
+	spin_lock_irq(&sbi->iostat_lat_lock);
 	memset(io_lat, 0, sizeof(struct iostat_lat_info));
-	spin_unlock_bh(&sbi->iostat_lat_lock);
+	spin_unlock_irq(&sbi->iostat_lat_lock);
 }
 void f2fs_update_iostat(struct f2fs_sb_info *sbi,
 			enum iostat_type type, unsigned long long io_bytes)
 {
+	unsigned long flags;
 	if (!sbi->iostat_enable)
 		return;
-	spin_lock_bh(&sbi->iostat_lock);
+	spin_lock_irqsave(&sbi->iostat_lock, flags);
 	sbi->rw_iostat[type] += io_bytes;
 	if (type == APP_BUFFERED_IO || type == APP_DIRECT_IO)
 	if (type == APP_BUFFERED_READ_IO || type == APP_DIRECT_READ_IO)
 		sbi->rw_iostat[APP_READ_IO] += io_bytes;
-	spin_unlock_bh(&sbi->iostat_lock);
+	spin_unlock_irqrestore(&sbi->iostat_lock, flags);
 	f2fs_record_iostat(sbi);
 }
 	struct f2fs_sb_info *sbi = iostat_ctx->sbi;
 	struct iostat_lat_info *io_lat = sbi->iostat_io_lat;
 	int idx;
+	unsigned long flags;
 	if (!sbi->iostat_enable)
 		return;
 			idx = WRITE_ASYNC_IO;
 	}
-	spin_lock_bh(&sbi->iostat_lat_lock);
+	spin_lock_irqsave(&sbi->iostat_lat_lock, flags);
 	io_lat->sum_lat[idx][iotype] += ts_diff;
 	io_lat->bio_cnt[idx][iotype]++;
 	if (ts_diff > io_lat->peak_lat[idx][iotype])
 		io_lat->peak_lat[idx][iotype] = ts_diff;
-	spin_unlock_bh(&sbi->iostat_lat_lock);
+	spin_unlock_irqrestore(&sbi->iostat_lat_lock, flags);
 }
 void iostat_update_and_unbind_ctx(struct bio *bio, int rw)

fs/f2fs/namei.c+11−6

 	if (test_opt(sbi, INLINE_XATTR))
 		set_inode_flag(inode, FI_INLINE_XATTR);
-	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
-		set_inode_flag(inode, FI_INLINE_DATA);
 	if (f2fs_may_inline_dentry(inode))
 		set_inode_flag(inode, FI_INLINE_DENTRY);
 	f2fs_init_extent_tree(inode, NULL);
-	stat_inc_inline_xattr(inode);
-	stat_inc_inline_inode(inode);
-	stat_inc_inline_dir(inode);
 	F2FS_I(inode)->i_flags =
 		f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED);
 			set_compress_context(inode);
 	}
+	/* Should enable inline_data after compression set */
+	if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode))
+		set_inode_flag(inode, FI_INLINE_DATA);
+	stat_inc_inline_xattr(inode);
+	stat_inc_inline_inode(inode);
+	stat_inc_inline_dir(inode);
 	f2fs_set_inode_flags(inode);
 	trace_f2fs_new_inode(inode, 0);
 		if (!is_extension_exist(name, ext[i], false))
 			continue;
+		/* Do not use inline_data with compression */
+		stat_dec_inline_inode(inode);
+		clear_inode_flag(inode, FI_INLINE_DATA);
 		set_compress_context(inode);
 		return;
 	}

fs/f2fs/node.c+3−1

 out_err:
 	ClearPageUptodate(page);
 out_put_err:
-	f2fs_handle_page_eio(sbi, page->index, NODE);
+	/* ENOENT comes from read_node_page which is not an error. */
+	if (err != -ENOENT)
+		f2fs_handle_page_eio(sbi, page->index, NODE);
 	f2fs_put_page(page, 1);
 	return ERR_PTR(err);
 }

fs/hugetlbfs/inode.c+53−15

@@ -600,41 +600,79 @@ static void hugetlb_vmtruncate(struct inode *inode, loff_t offset) · 599 unmodified lines
600	remove_inode_hugepages(inode, offset, LLONG_MAX);	600	remove_inode_hugepages(inode, offset, LLONG_MAX);
601	}	601	}
602		602
		603	static void hugetlbfs_zero_partial_page(struct hstate *h,
		604	struct address_space *mapping,
		605	loff_t start,
		606	loff_t end)
		607	{
		608	pgoff_t idx = start >> huge_page_shift(h);
		609	struct folio *folio;
		610
		611	folio = filemap_lock_folio(mapping, idx);
		612	if (!folio)
		613	return;
		614
		615	start = start & ~huge_page_mask(h);
		616	end = end & ~huge_page_mask(h);
		617	if (!end)
		618	end = huge_page_size(h);
		619
		620	folio_zero_segment(folio, (size_t)start, (size_t)end);
		621
		622	folio_unlock(folio);
		623	folio_put(folio);
		624	}
		625
603	static long hugetlbfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)	626	static long hugetlbfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
604	{	627	{
		628	struct hugetlbfs_inode_info *info = HUGETLBFS_I(inode);
		629	struct address_space *mapping = inode->i_mapping;
605	struct hstate *h = hstate_inode(inode);	630	struct hstate *h = hstate_inode(inode);
606	loff_t hpage_size = huge_page_size(h);	631	loff_t hpage_size = huge_page_size(h);
607	loff_t hole_start, hole_end;	632	loff_t hole_start, hole_end;
608		633
609	/*	634	/*
610	* For hole punch round up the beginning offset of the hole and	635	* hole_start and hole_end indicate the full pages within the hole.
611	* round down the end.
612	*/	636	*/
613	hole_start = round_up(offset, hpage_size);	637	hole_start = round_up(offset, hpage_size);
614	hole_end = round_down(offset + len, hpage_size);	638	hole_end = round_down(offset + len, hpage_size);
615		639
616	if (hole_end > hole_start) {	640	inode_lock(inode);
617	struct address_space *mapping = inode->i_mapping;
618	struct hugetlbfs_inode_info *info = HUGETLBFS_I(inode);
619		641
620	inode_lock(inode);	642	/* protected by i_rwsem */
		643	if (info->seals & (F_SEAL_WRITE \| F_SEAL_FUTURE_WRITE)) {
		644	inode_unlock(inode);
		645	return -EPERM;

42 more lines aren’t shown here.

fs/io_uring.c+157−216

This diff is large: its 734 lines aren’t shown here.

fs/jbd2/transaction.c+1−1

This diff is large: its 9 lines aren’t shown here.

fs/nfs/callback_proc.c+1−0

This diff is large: its 8 lines aren’t shown here.

fs/nfs/dir.c+1−0

This diff is large: its 8 lines aren’t shown here.

fs/nfs/nfs4file.c+1−0

This diff is large: its 8 lines aren’t shown here.

fs/nfs/pnfs.c+15−6

This diff is large: its 58 lines aren’t shown here.

fs/nfs/pnfs.h+1−0

This diff is large: its 8 lines aren’t shown here.

fs/tracefs/inode.c+1−1

This diff is large: its 9 lines aren’t shown here.

fs/xfs/libxfs/xfs_attr.c+5−4

This diff is large: its 28 lines aren’t shown here.

fs/xfs/libxfs/xfs_attr.h+1−11

This diff is large: its 26 lines aren’t shown here.

fs/xfs/libxfs/xfs_attr_leaf.c+1−1

This diff is large: its 9 lines aren’t shown here.

fs/xfs/libxfs/xfs_da_btree.h+3−1

This diff is large: its 18 lines aren’t shown here.

fs/xfs/xfs_attr_item.c+9−6

This diff is large: its 45 lines aren’t shown here.

fs/xfs/xfs_ioctl.c+2−1

This diff is large: its 10 lines aren’t shown here.

fs/xfs/xfs_xattr.c+16−1

This diff is large: its 35 lines aren’t shown here.

include/drm/drm_atomic.h+1−0

This diff is large: its 8 lines aren’t shown here.

include/drm/ttm/ttm_resource.h+4−4

This diff is large: its 17 lines aren’t shown here.

include/keys/asymmetric-type.h+3−0

This diff is large: its 10 lines aren’t shown here.

include/linux/backing-dev.h+2−0

This diff is large: its 9 lines aren’t shown here.

include/linux/blkdev.h+6−7

This diff is large: its 57 lines aren’t shown here.

include/linux/console.h+0−17

This diff is large: its 31 lines aren’t shown here.

include/linux/cpu.h+3−0

This diff is large: its 10 lines aren’t shown here.

include/linux/gpio/driver.h+16−13

This diff is large: its 38 lines aren’t shown here.

include/linux/mm.h+2−1

This diff is large: its 17 lines aren’t shown here.

include/linux/netfs.h+1−1

This diff is large: its 9 lines aren’t shown here.

include/linux/nvme.h+2−2

This diff is large: its 11 lines aren’t shown here.

include/linux/objtool.h+6−0

This diff is large: its 13 lines aren’t shown here.

include/linux/printk.h+0−11

This diff is large: its 25 lines aren’t shown here.

include/linux/ratelimit_types.h+8−4

This diff is large: its 21 lines aren’t shown here.

include/linux/scmi_protocol.h+5−4

This diff is large: its 23 lines aren’t shown here.

include/linux/serial_core.h+1−0

This diff is large: its 8 lines aren’t shown here.

include/linux/visorbus.h+0−344

This diff is large: its 345 lines aren’t shown here.

include/linux/vmalloc.h+1−0

This diff is large: its 8 lines aren’t shown here.

include/net/inet_connection_sock.h+0−3

This diff is large: its 24 lines aren’t shown here.

include/net/inet_hashtables.h+1−67

This diff is large: its 108 lines aren’t shown here.

include/net/inet_sock.h+5−0

This diff is large: its 12 lines aren’t shown here.

include/net/sock.h+0−14

This diff is large: its 42 lines aren’t shown here.

include/trace/events/io_uring.h+35−7

This diff is large: its 171 lines aren’t shown here.

include/trace/events/libata.h+1−0

This diff is large: its 8 lines aren’t shown here.

include/uapi/linux/io_uring.h+0−6

This diff is large: its 20 lines aren’t shown here.

kernel/auditsc.c+1−1

This diff is large: its 12 lines aren’t shown here.

kernel/bpf/btf.c+5−0

This diff is large: its 19 lines aren’t shown here.

kernel/cfi.c+16−6

This diff is large: its 37 lines aren’t shown here.

kernel/dma/direct.c+2−3

This diff is large: its 26 lines aren’t shown here.

kernel/hung_task.c+1−10

This diff is large: its 37 lines aren’t shown here.

kernel/irq/chip.c+4−1

This diff is large: its 20 lines aren’t shown here.

kernel/kthread.c+7−7

This diff is large: its 49 lines aren’t shown here.

kernel/locking/lockdep.c+1−1

This diff is large: its 9 lines aren’t shown here.

kernel/panic.c+0−4

This diff is large: its 18 lines aren’t shown here.

kernel/power/hibernate.c+1−1

This diff is large: its 9 lines aren’t shown here.

kernel/printk/printk.c+63−524

This diff is large: its 830 lines aren’t shown here.

kernel/rcu/tree_stall.h+0−2

This diff is large: its 16 lines aren’t shown here.

kernel/reboot.c+1−13

This diff is large: its 70 lines aren’t shown here.

kernel/sched/core.c+33−3

This diff is large: its 59 lines aren’t shown here.

kernel/sched/sched.h+5−0

This diff is large: its 12 lines aren’t shown here.

kernel/trace/blktrace.c+0−3

This diff is large: its 15 lines aren’t shown here.

kernel/trace/bpf_trace.c+45−15

This diff is large: its 99 lines aren’t shown here.

kernel/trace/ftrace.c+11−2

This diff is large: its 34 lines aren’t shown here.

kernel/trace/rethook.c+9−0

This diff is large: its 16 lines aren’t shown here.

kernel/trace/trace.c+0−2

This diff is large: its 10 lines aren’t shown here.

kernel/trace/trace_kprobe.c+10−1

This diff is large: its 19 lines aren’t shown here.

kernel/trace/trace_uprobe.c+0−1

This diff is large: its 8 lines aren’t shown here.

kernel/watchdog.c+0−4

This diff is large: its 18 lines aren’t shown here.

kernel/watchdog_hld.c+0−4

This diff is large: its 18 lines aren’t shown here.

lib/Kconfig+3−0

This diff is large: its 10 lines aren’t shown here.

lib/Kconfig.ubsan+1−1

This diff is large: its 9 lines aren’t shown here.

lib/Makefile+1−0

This diff is large: its 8 lines aren’t shown here.

lib/crypto/Kconfig+1−0

This diff is large: its 8 lines aren’t shown here.

lib/memneq.crenamed from crypto/memneq.c+0−0

File renamed without changes.

mm/backing-dev.c+2−9

This diff is large: its 31 lines aren’t shown here.

mm/damon/reclaim.c+8−0

This diff is large: its 29 lines aren’t shown here.

mm/filemap.c+12−3

This diff is large: its 38 lines aren’t shown here.

mm/huge_memory.c+1−0

This diff is large: its 8 lines aren’t shown here.

mm/hwpoison-inject.c+1−1

This diff is large: its 9 lines aren’t shown here.

mm/kfence/core.c+5−2

This diff is large: its 28 lines aren’t shown here.

mm/madvise.c+1−1

This diff is large: its 9 lines aren’t shown here.

mm/memcontrol.c+1−1

This diff is large: its 9 lines aren’t shown here.

mm/memory-failure.c+12−0

This diff is large: its 33 lines aren’t shown here.

mm/migrate.c+1−0

This diff is large: its 8 lines aren’t shown here.

mm/page_isolation.c+2−0

This diff is large: its 9 lines aren’t shown here.

mm/readahead.c+2−0

This diff is large: its 16 lines aren’t shown here.

mm/slub.c+36−7

This diff is large: its 91 lines aren’t shown here.

mm/swap.c+1−1

This diff is large: its 9 lines aren’t shown here.

mm/usercopy.c+12−14

This diff is large: its 51 lines aren’t shown here.

mm/vmalloc.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/ax25/af_ax25.c+28−5

This diff is large: its 56 lines aren’t shown here.

net/core/dev.c+15−10

This diff is large: its 70 lines aren’t shown here.

net/core/filter.c+28−6

This diff is large: its 50 lines aren’t shown here.

net/core/net-sysfs.c+1−0

This diff is large: its 8 lines aren’t shown here.

net/core/skmsg.c+5−0

This diff is large: its 12 lines aren’t shown here.

net/dccp/proto.c+5−28

This diff is large: its 89 lines aren’t shown here.

net/ethtool/eeprom.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/ipv4/inet_connection_sock.c+64−183

This diff is large: its 345 lines aren’t shown here.

net/ipv4/inet_hashtables.c+11−182

This diff is large: its 313 lines aren’t shown here.

net/ipv4/ip_gre.c+10−5

This diff is large: its 29 lines aren’t shown here.

net/ipv4/ping.c+7−3

This diff is large: its 20 lines aren’t shown here.

net/ipv4/tcp.c+2−12

This diff is large: its 38 lines aren’t shown here.

net/ipv4/tcp_bpf.c+0−3

This diff is large: its 10 lines aren’t shown here.

net/ipv6/ip6_gre.c+10−5

This diff is large: its 29 lines aren’t shown here.

net/netfilter/nf_dup_netdev.c+21−4

This diff is large: its 52 lines aren’t shown here.

net/netfilter/nfnetlink_cttimeout.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/netfilter/nft_meta.c+2−11

This diff is large: its 48 lines aren’t shown here.

net/netfilter/nft_numgen.c+3−9

This diff is large: its 38 lines aren’t shown here.

net/openvswitch/flow.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/sched/sch_netem.c+2−2

This diff is large: its 12 lines aren’t shown here.

net/sunrpc/clnt.c+1−0

This diff is large: its 8 lines aren’t shown here.

net/tipc/core.c+1−2

This diff is large: its 12 lines aren’t shown here.

net/tls/tls_main.c+2−0

This diff is large: its 9 lines aren’t shown here.

net/xdp/xsk.c+9−7

This diff is large: its 34 lines aren’t shown here.

samples/fprobe/fprobe_example.c+25−4

This diff is large: its 64 lines aren’t shown here.

scripts/faddr2line+34−11

This diff is large: its 102 lines aren’t shown here.

scripts/gen_autoksyms.sh+3−0

This diff is large: its 8 lines aren’t shown here.

scripts/mod/modpost.c+1−1

This diff is large: its 9 lines aren’t shown here.

security/selinux/hooks.c+4−7

This diff is large: its 31 lines aren’t shown here.

sound/core/memalloc.c+1−22

This diff is large: its 54 lines aren’t shown here.

sound/hda/hdac_i915.c+6−9

This diff is large: its 28 lines aren’t shown here.

sound/hda/intel-dsp-config.c+12−0

This diff is large: its 26 lines aren’t shown here.

sound/hda/intel-nhlt.c+8−9

This diff is large: its 45 lines aren’t shown here.

sound/pci/hda/hda_auto_parser.c+4−3

This diff is large: its 35 lines aren’t shown here.

sound/pci/hda/hda_local.h+1−0

This diff is large: its 8 lines aren’t shown here.

sound/pci/hda/patch_conexant.c+2−2

This diff is large: its 14 lines aren’t shown here.

sound/pci/hda/patch_realtek.c+35−1

This diff is large: its 106 lines aren’t shown here.

sound/pci/hda/patch_via.c+2−2

This diff is large: its 14 lines aren’t shown here.

sound/usb/mixer_us16x08.c+3−3

This diff is large: its 14 lines aren’t shown here.

sound/x86/intel_hdmi_audio.c+13−2

This diff is large: its 46 lines aren’t shown here.

tools/arch/arm64/include/asm/cputype.h+10−2

This diff is large: its 40 lines aren’t shown here.

tools/arch/x86/include/asm/cpufeatures.h+6−2

This diff is large: its 49 lines aren’t shown here.

tools/arch/x86/include/asm/disabled-features.h+7−1

This diff is large: its 22 lines aren’t shown here.

tools/arch/x86/include/asm/msr-index.h+25−0

This diff is large: its 39 lines aren’t shown here.

tools/arch/x86/include/uapi/asm/kvm.h+6−5

This diff is large: its 18 lines aren’t shown here.

tools/arch/x86/include/uapi/asm/svm.h+13−0

This diff is large: its 27 lines aren’t shown here.

tools/include/linux/objtool.h+6−0

This diff is large: its 13 lines aren’t shown here.

tools/include/uapi/drm/i915_drm.h+272−81

This diff is large: its 489 lines aren’t shown here.

tools/include/uapi/linux/prctl.h+9−0

This diff is large: its 16 lines aren’t shown here.

tools/include/uapi/linux/vhost.h+20−6

This diff is large: its 44 lines aren’t shown here.

tools/kvm/kvm_stat/kvm_stat+2−1

This diff is large: its 10 lines aren’t shown here.

tools/lib/perf/evsel.c+12−5

This diff is large: its 36 lines aren’t shown here.

tools/perf/builtin-inject.c+4−2

This diff is large: its 20 lines aren’t shown here.

tools/perf/builtin-stat.c+2−0

This diff is large: its 9 lines aren’t shown here.

tools/perf/tests/bp_account.c+14−2

This diff is large: its 36 lines aren’t shown here.

tools/perf/tests/expr.c+2−0

This diff is large: its 9 lines aren’t shown here.

tools/perf/tests/shell/lib/perf_csv_output_lint.py+0−48

This diff is large: its 49 lines aren’t shown here.

tools/perf/tests/shell/stat+csv_output.sh+45−24

This diff is large: its 145 lines aren’t shown here.

tools/perf/tests/shell/test_arm_callgraph_fp.sh+1−1

This diff is large: its 9 lines aren’t shown here.

tools/perf/tests/topology.c+1−1

This diff is large: its 9 lines aren’t shown here.

tools/perf/trace/beauty/arch_errno_names.sh+2−12

This diff is large: its 26 lines aren’t shown here.

tools/perf/trace/beauty/include/linux/socket.h+6−1

This diff is large: its 29 lines aren’t shown here.

tools/perf/util/arm-spe.c+8−14

This diff is large: its 43 lines aren’t shown here.

tools/perf/util/build-id.c+28−0

This diff is large: its 42 lines aren’t shown here.

tools/perf/util/expr.l+1−1

This diff is large: its 9 lines aren’t shown here.

tools/perf/util/header.c+14−0

This diff is large: its 21 lines aren’t shown here.

tools/perf/util/header.h+2−0

This diff is large: its 9 lines aren’t shown here.

tools/perf/util/metricgroup.c+9−0

This diff is large: its 25 lines aren’t shown here.

tools/perf/util/unwind-libunwind-local.c+1−1

This diff is large: its 9 lines aren’t shown here.

tools/testing/selftests/bpf/prog_tests/bpf_cookie.c+39−39

This diff is large: its 122 lines aren’t shown here.

tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c+3−0

This diff is large: its 10 lines aren’t shown here.

tools/testing/selftests/bpf/prog_tests/tailcalls.c+55−0

This diff is large: its 67 lines aren’t shown here.

tools/testing/selftests/bpf/progs/kprobe_multi.c+12−12

This diff is large: its 34 lines aren’t shown here.

tools/testing/selftests/bpf/progs/tailcall_bpf2bpf6.c+42−0

This diff is large: its 43 lines aren’t shown here.

tools/testing/selftests/dma/Makefile+1−0

This diff is large: its 7 lines aren’t shown here.

tools/testing/selftests/dma/dma_map_benchmark.c+1−1

This diff is large: its 10 lines aren’t shown here.

tools/testing/selftests/kvm/Makefile+36−13

This diff is large: its 75 lines aren’t shown here.

tools/testing/selftests/kvm/dirty_log_perf_test.c+7−3

This diff is large: its 38 lines aren’t shown here.

tools/testing/selftests/kvm/include/perf_test_util.h+9−0

This diff is large: its 26 lines aren’t shown here.

tools/testing/selftests/kvm/include/x86_64/processor.h+16−9

This diff is large: its 40 lines aren’t shown here.

tools/testing/selftests/kvm/include/x86_64/vmx.h+6−0

This diff is large: its 27 lines aren’t shown here.

tools/testing/selftests/kvm/lib/aarch64/ucall.c+4−5

This diff is large: its 25 lines aren’t shown here.

tools/testing/selftests/kvm/lib/perf_test_util.c+45−8

This diff is large: its 111 lines aren’t shown here.

tools/testing/selftests/kvm/lib/x86_64/perf_test_util.c+112−0

This diff is large: its 113 lines aren’t shown here.

tools/testing/selftests/kvm/lib/x86_64/processor.c+15−16

This diff is large: its 88 lines aren’t shown here.

tools/testing/selftests/kvm/lib/x86_64/vmx.c+93−56

This diff is large: its 227 lines aren’t shown here.

tools/testing/selftests/kvm/max_guest_memory_test.c+1−1

This diff is large: its 9 lines aren’t shown here.

tools/testing/selftests/kvm/x86_64/mmu_role_test.c+1−1

This diff is large: its 9 lines aren’t shown here.

tools/testing/selftests/lib.mk+23−2

This diff is large: its 34 lines aren’t shown here.

tools/testing/selftests/net/.gitignore+0−1

This diff is large: its 5 lines aren’t shown here.

tools/testing/selftests/net/Makefile+0−2

This diff is large: its 14 lines aren’t shown here.

tools/testing/selftests/net/bind_bhash_test.c+0−119

This diff is large: its 120 lines aren’t shown here.

tools/testing/selftests/net/fcnal-test.sh+56−5

This diff is large: its 108 lines aren’t shown here.

tools/testing/selftests/netfilter/nft_concat_range.sh+1−1

This diff is large: its 9 lines aren’t shown here.

tools/testing/selftests/vm/gup_test.c+2−2

This diff is large: its 18 lines aren’t shown here.

tools/testing/selftests/vm/ksm_tests.c+2−0

This diff is large: its 16 lines aren’t shown here.

virt/kvm/kvm_main.c+6−2

This diff is large: its 26 lines aren’t shown here.

Merge branch 'master' into mm-nonmm-stable

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -4,7 +4,7 @@ GPIO Descriptor Consumer Interface · 3 unmodified lines
4		4
5	This document describes the consumer interface of the GPIO framework. Note that	5	This document describes the consumer interface of the GPIO framework. Note that
6	it describes the new descriptor-based interface. For a description of the	6	it describes the new descriptor-based interface. For a description of the
7	deprecated integer-based GPIO interface please refer to gpio-legacy.txt.	7	deprecated integer-based GPIO interface please refer to legacy.rst.
8		8
9		9
10	Guidelines for GPIOs consumers	10	Guidelines for GPIOs consumers
@@ -78,7 +78,7 @@ whether the line is configured active high or active low (see · 67 unmodified lines
78		78
79	The two last flags are used for use cases where open drain is mandatory, such	79	The two last flags are used for use cases where open drain is mandatory, such
80	as I2C: if the line is not already configured as open drain in the mappings	80	as I2C: if the line is not already configured as open drain in the mappings
81	(see board.txt), then open drain will be enforced anyway and a warning will be	81	(see board.rst), then open drain will be enforced anyway and a warning will be
82	printed that the board configuration needs to be updated to match the use case.	82	printed that the board configuration needs to be updated to match the use case.
83		83
84	Both functions return either a valid GPIO descriptor, or an error code checkable	84	Both functions return either a valid GPIO descriptor, or an error code checkable
@@ -270,7 +270,7 @@ driven. · 185 unmodified lines
270	The same is applicable for open drain or open source output lines: those do not	270	The same is applicable for open drain or open source output lines: those do not
271	actively drive their output high (open drain) or low (open source), they just	271	actively drive their output high (open drain) or low (open source), they just
272	switch their output to a high impedance value. The consumer should not need to	272	switch their output to a high impedance value. The consumer should not need to
273	care. (For details read about open drain in driver.txt.)	273	care. (For details read about open drain in driver.rst.)
274		274
275	With this, all the gpiod_set_(array)_value_xxx() functions interpret the	275	With this, all the gpiod_set_(array)_value_xxx() functions interpret the
276	parameter "value" as "asserted" ("1") or "de-asserted" ("0"). The physical line	276	parameter "value" as "asserted" ("1") or "de-asserted" ("0"). The physical line

@@ -56,39 +56,39 @@ established that the super block and the group descriptor table, if · 55 unmodified lines
56	present, will be at the beginning of the block group. The bitmaps and	56	present, will be at the beginning of the block group. The bitmaps and
57	the inode table can be anywhere, and it is quite possible for the	57	the inode table can be anywhere, and it is quite possible for the
58	bitmaps to come after the inode table, or for both to be in different	58	bitmaps to come after the inode table, or for both to be in different
59	groups (flex\_bg). Leftover space is used for file data blocks, indirect	59	groups (flex_bg). Leftover space is used for file data blocks, indirect
60	block maps, extent tree blocks, and extended attributes.	60	block maps, extent tree blocks, and extended attributes.
61		61
62	Flexible Block Groups	62	Flexible Block Groups
63	---------------------	63	---------------------
64		64
65	Starting in ext4, there is a new feature called flexible block groups	65	Starting in ext4, there is a new feature called flexible block groups
66	(flex\_bg). In a flex\_bg, several block groups are tied together as one	66	(flex_bg). In a flex_bg, several block groups are tied together as one
67	logical block group; the bitmap spaces and the inode table space in the	67	logical block group; the bitmap spaces and the inode table space in the
68	first block group of the flex\_bg are expanded to include the bitmaps	68	first block group of the flex_bg are expanded to include the bitmaps
69	and inode tables of all other block groups in the flex\_bg. For example,	69	and inode tables of all other block groups in the flex_bg. For example,
70	if the flex\_bg size is 4, then group 0 will contain (in order) the	70	if the flex_bg size is 4, then group 0 will contain (in order) the
71	superblock, group descriptors, data block bitmaps for groups 0-3, inode	71	superblock, group descriptors, data block bitmaps for groups 0-3, inode
72	bitmaps for groups 0-3, inode tables for groups 0-3, and the remaining	72	bitmaps for groups 0-3, inode tables for groups 0-3, and the remaining
73	space in group 0 is for file data. The effect of this is to group the	73	space in group 0 is for file data. The effect of this is to group the
74	block group metadata close together for faster loading, and to enable	74	block group metadata close together for faster loading, and to enable
75	large files to be continuous on disk. Backup copies of the superblock	75	large files to be continuous on disk. Backup copies of the superblock
76	and group descriptors are always at the beginning of block groups, even	76	and group descriptors are always at the beginning of block groups, even
77	if flex\_bg is enabled. The number of block groups that make up a	77	if flex_bg is enabled. The number of block groups that make up a
78	flex\_bg is given by 2 ^ ``sb.s_log_groups_per_flex``.	78	flex_bg is given by 2 ^ ``sb.s_log_groups_per_flex``.
79		79
80	Meta Block Groups	80	Meta Block Groups
81	-----------------	81	-----------------
82		82
83	Without the option META\_BG, for safety concerns, all block group	83	Without the option META_BG, for safety concerns, all block group
84	descriptors copies are kept in the first block group. Given the default	84	descriptors copies are kept in the first block group. Given the default
85	128MiB(2^27 bytes) block group size and 64-byte group descriptors, ext4	85	128MiB(2^27 bytes) block group size and 64-byte group descriptors, ext4
86	can have at most 2^27/64 = 2^21 block groups. This limits the entire	86	can have at most 2^27/64 = 2^21 block groups. This limits the entire
87	filesystem size to 2^21 * 2^27 = 2^48bytes or 256TiB.	87	filesystem size to 2^21 * 2^27 = 2^48bytes or 256TiB.
88		88
89	The solution to this problem is to use the metablock group feature	89	The solution to this problem is to use the metablock group feature
90	(META\_BG), which is already in ext3 for all 2.6 releases. With the	90	(META_BG), which is already in ext3 for all 2.6 releases. With the
91	META\_BG feature, ext4 filesystems are partitioned into many metablock	91	META_BG feature, ext4 filesystems are partitioned into many metablock
92	groups. Each metablock group is a cluster of block groups whose group	92	groups. Each metablock group is a cluster of block groups whose group
93	descriptor structures can be stored in a single disk block. For ext4	93	descriptor structures can be stored in a single disk block. For ext4
94	filesystems with 4 KB block size, a single metablock group partition	94	filesystems with 4 KB block size, a single metablock group partition
@@ -110,7 +110,7 @@ bytes, a meta-block group contains 32 block groups for filesystems with · 15 unmodified lines
110	a 1KB block size, and 128 block groups for filesystems with a 4KB	110	a 1KB block size, and 128 block groups for filesystems with a 4KB
111	blocksize. Filesystems can either be created using this new block group	111	blocksize. Filesystems can either be created using this new block group
112	descriptor layout, or existing filesystems can be resized on-line, and	112	descriptor layout, or existing filesystems can be resized on-line, and
113	the field s\_first\_meta\_bg in the superblock will indicate the first	113	the field s_first_meta_bg in the superblock will indicate the first
114	block group using this new layout.	114	block group using this new layout.
115		115
116	Please see an important note about ``BLOCK_UNINIT`` in the section about	116	Please see an important note about ``BLOCK_UNINIT`` in the section about
@@ -121,15 +121,15 @@ Lazy Block Group Initialization · 4 unmodified lines
121		121
122	A new feature for ext4 are three block group descriptor flags that	122	A new feature for ext4 are three block group descriptor flags that
123	enable mkfs to skip initializing other parts of the block group	123	enable mkfs to skip initializing other parts of the block group
124	metadata. Specifically, the INODE\_UNINIT and BLOCK\_UNINIT flags mean	124	metadata. Specifically, the INODE_UNINIT and BLOCK_UNINIT flags mean
125	that the inode and block bitmaps for that group can be calculated and	125	that the inode and block bitmaps for that group can be calculated and
126	therefore the on-disk bitmap blocks are not initialized. This is	126	therefore the on-disk bitmap blocks are not initialized. This is
127	generally the case for an empty block group or a block group containing	127	generally the case for an empty block group or a block group containing
128	only fixed-location block group metadata. The INODE\_ZEROED flag means	128	only fixed-location block group metadata. The INODE_ZEROED flag means
129	that the inode table has been initialized; mkfs will unset this flag and	129	that the inode table has been initialized; mkfs will unset this flag and
130	rely on the kernel to initialize the inode tables in the background.	130	rely on the kernel to initialize the inode tables in the background.
131		131
132	By not writing zeroes to the bitmaps and inode table, mkfs time is	132	By not writing zeroes to the bitmaps and inode table, mkfs time is
133	reduced considerably. Note the feature flag is RO\_COMPAT\_GDT\_CSUM,	133	reduced considerably. Note the feature flag is RO_COMPAT_GDT_CSUM,
134	but the dumpe2fs output prints this as “uninit\_bg”. They are the same	134	but the dumpe2fs output prints this as “uninit_bg”. They are the same
135	thing.	135	thing.

@@ -11,12 +11,12 @@ file is smaller than 60 bytes, then the data are stored inline in · 10 unmodified lines
11	attribute space, then it might be found as an extended attribute	11	attribute space, then it might be found as an extended attribute
12	“system.data” within the inode body (“ibody EA”). This of course	12	“system.data” within the inode body (“ibody EA”). This of course
13	constrains the amount of extended attributes one can attach to an inode.	13	constrains the amount of extended attributes one can attach to an inode.
14	If the data size increases beyond i\_block + ibody EA, a regular block	14	If the data size increases beyond i_block + ibody EA, a regular block
15	is allocated and the contents moved to that block.	15	is allocated and the contents moved to that block.
16		16
17	Pending a change to compact the extended attribute key used to store	17	Pending a change to compact the extended attribute key used to store
18	inline data, one ought to be able to store 160 bytes of data in a	18	inline data, one ought to be able to store 160 bytes of data in a
19	256-byte inode (as of June 2015, when i\_extra\_isize is 28). Prior to	19	256-byte inode (as of June 2015, when i_extra_isize is 28). Prior to
20	that, the limit was 156 bytes due to inefficient use of inode space.	20	that, the limit was 156 bytes due to inefficient use of inode space.
21		21
22	The inline data feature requires the presence of an extended attribute	22	The inline data feature requires the presence of an extended attribute
@@ -25,12 +25,12 @@ for “system.data”, even if the attribute value is zero length. · 2 unmodified lines
25	Inline Directories	25	Inline Directories
26	~~~~~~~~~~~~~~~~~~	26	~~~~~~~~~~~~~~~~~~
27		27
28	The first four bytes of i\_block are the inode number of the parent	28	The first four bytes of i_block are the inode number of the parent
29	directory. Following that is a 56-byte space for an array of directory	29	directory. Following that is a 56-byte space for an array of directory
30	entries; see ``struct ext4_dir_entry``. If there is a “system.data”	30	entries; see ``struct ext4_dir_entry``. If there is a “system.data”
31	attribute in the inode body, the EA value is an array of	31	attribute in the inode body, the EA value is an array of
32	``struct ext4_dir_entry`` as well. Note that for inline directories, the	32	``struct ext4_dir_entry`` as well. Note that for inline directories, the
33	i\_block and EA space are treated as separate dirent blocks; directory	33	i_block and EA space are treated as separate dirent blocks; directory
34	entries cannot span the two.	34	entries cannot span the two.
35		35
36	Inline directory entries are not checksummed, as the inode checksum	36	Inline directory entries are not checksummed, as the inode checksum

@@ -87,7 +87,7 @@ static struct fasync_struct *fasync; · 86 unmodified lines
87		87
88	/* Control how we warn userspace. */	88	/* Control how we warn userspace. */
89	static struct ratelimit_state urandom_warning =	89	static struct ratelimit_state urandom_warning =
90	RATELIMIT_STATE_INIT("warn_urandom_randomness", HZ, 3);	90	RATELIMIT_STATE_INIT_FLAGS("urandom_warning", HZ, 3, RATELIMIT_MSG_ON_RELEASE);
91	static int ratelimit_disable __read_mostly =	91	static int ratelimit_disable __read_mostly =
92	IS_ENABLED(CONFIG_WARN_ALL_UNSEEDED_RANDOM);	92	IS_ENABLED(CONFIG_WARN_ALL_UNSEEDED_RANDOM);
93	module_param_named(ratelimit_disable, ratelimit_disable, int, 0644);	93	module_param_named(ratelimit_disable, ratelimit_disable, int, 0644);
@@ -408,7 +408,7 @@ static ssize_t get_random_bytes_user(struct iov_iter *iter) · 314 unmodified lines
408		408
409	/*	409	/*
410	* Immediately overwrite the ChaCha key at index 4 with random	410	* Immediately overwrite the ChaCha key at index 4 with random
411	* bytes, in case userspace causes copy_to_user() below to sleep	411	* bytes, in case userspace causes copy_to_iter() below to sleep
412	* forever, so that we still retain forward secrecy in that case.	412	* forever, so that we still retain forward secrecy in that case.
413	*/	413	*/
414	crng_make_state(chacha_state, (u8 *)&chacha_state[4], CHACHA_KEY_SIZE);	414	crng_make_state(chacha_state, (u8 *)&chacha_state[4], CHACHA_KEY_SIZE);
@@ -1009,7 +1009,7 @@ void add_interrupt_randomness(int irq) · 594 unmodified lines
1009	if (new_count & MIX_INFLIGHT)	1009	if (new_count & MIX_INFLIGHT)
1010	return;	1010	return;
1011		1011
1012	if (new_count < 64 && !time_is_before_jiffies(fast_pool->last + HZ))	1012	if (new_count < 1024 && !time_is_before_jiffies(fast_pool->last + HZ))
1013	return;	1013	return;
1014		1014
1015	if (unlikely(!fast_pool->mix.func))	1015	if (unlikely(!fast_pool->mix.func))

@@ -2812,7 +2812,7 @@ static struct drm_mode_config_helper_funcs amdgpu_dm_mode_config_helperfuncs = { · 2811 unmodified lines
2812		2812
2813	static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector)	2813	static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector)
2814	{	2814	{
2815	u32 max_cll, min_cll, max, min, q, r;	2815	u32 max_avg, min_cll, max, min, q, r;
2816	struct amdgpu_dm_backlight_caps *caps;	2816	struct amdgpu_dm_backlight_caps *caps;
2817	struct amdgpu_display_manager *dm;	2817	struct amdgpu_display_manager *dm;
2818	struct drm_connector *conn_base;	2818	struct drm_connector *conn_base;
@@ -2842,7 +2842,7 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector) · 23 unmodified lines
2842	caps = &dm->backlight_caps[i];	2842	caps = &dm->backlight_caps[i];
2843	caps->ext_caps = &aconnector->dc_link->dpcd_sink_ext_caps;	2843	caps->ext_caps = &aconnector->dc_link->dpcd_sink_ext_caps;
2844	caps->aux_support = false;	2844	caps->aux_support = false;
2845	max_cll = conn_base->hdr_sink_metadata.hdmi_type1.max_cll;	2845	max_avg = conn_base->hdr_sink_metadata.hdmi_type1.max_fall;
2846	min_cll = conn_base->hdr_sink_metadata.hdmi_type1.min_cll;	2846	min_cll = conn_base->hdr_sink_metadata.hdmi_type1.min_cll;
2847		2847
2848	if (caps->ext_caps->bits.oled == 1 /*\|\|	2848	if (caps->ext_caps->bits.oled == 1 /*\|\|
@@ -2870,8 +2870,8 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector) · 21 unmodified lines
2870	* The results of the above expressions can be verified at	2870	* The results of the above expressions can be verified at
2871	* pre_computed_values.	2871	* pre_computed_values.
2872	*/	2872	*/
2873	q = max_cll >> 5;	2873	q = max_avg >> 5;
2874	r = max_cll % 32;	2874	r = max_avg % 32;
2875	max = (1 << q) * pre_computed_values[r];	2875	max = (1 << q) * pre_computed_values[r];
2876		2876
2877	// min luminance: maxLum * (CV/255)^2 / 100	2877	// min luminance: maxLum * (CV/255)^2 / 100