lael-labs/linux

.mailmap+2−0

 Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
 Takashi YOSHII <takashi.yoshii.zj@renesas.com>
 Will Deacon <will@kernel.org> <will.deacon@arm.com>
+Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
+Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
 Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
 Yusuke Goda <goda.yusuke@renesas.com>
 Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/core-api/printk-formats.rst+14−0

@@ -112,6 +112,20 @@ used when printing stack backtraces. The specifier takes into · 111 unmodified lines
112	consideration the effect of compiler optimisations which may occur	112	consideration the effect of compiler optimisations which may occur
113	when tail-calls are used and marked with the noreturn GCC attribute.	113	when tail-calls are used and marked with the noreturn GCC attribute.
114		114
		115	Probed Pointers from BPF / tracing
		116	----------------------------------
		117
		118	::
		119
		120	%pks kernel string
		121	%pus user string
		122
		123	The ``k`` and ``u`` specifiers are used for printing prior probed memory from
		124	either kernel memory (k) or user memory (u). The subsequent ``s`` specifier
		125	results in printing a string. For direct use in regular vsnprintf() the (k)
		126	and (u) annotation is ignored, however, when used out of BPF's bpf_trace_printk(),
		127	for example, it reads the memory it is pointing to without faulting.
		128
115	Kernel Pointers	129	Kernel Pointers
116	---------------	130	---------------
117		131

Documentation/devicetree/bindings/dma/fsl-edma.txt+2−1

 - compatible :
 	- "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC
 	- "fsl,imx7ulp-edma" for eDMA2 used similar to that on i.mx7ulp
-	- "fsl,fsl,ls1028a-edma" for eDMA used similar to that on Vybrid vf610 SoC
+	- "fsl,ls1028a-edma" followed by "fsl,vf610-edma" for eDMA used on the
+	  LS1028A SoC.
 - reg : Specifies base physical address(s) and size of the eDMA registers.
 	The 1st region is eDMA control register's address and size.
 	The 2nd and the 3rd regions are programmable channel multiplexing

Documentation/devicetree/bindings/net/dsa/b53.txt+3−0

@@ -110,6 +110,9 @@ Ethernet switch connected via MDIO to the host, CPU port wired to eth0: · 109 unmodified lines
110	#size-cells = <0>;	110	#size-cells = <0>;
111		111
112	ports {	112	ports {
		113	#address-cells = <1>;
		114	#size-cells = <0>;
		115
113	port0@0 {	116	port0@0 {
114	reg = <0>;	117	reg = <0>;
115	label = "lan1";	118	label = "lan1";

Documentation/usb/raw-gadget.rst+30−7

@@ -27,9 +27,8 @@ differences are: · 26 unmodified lines
27	3. Raw Gadget provides a way to select a UDC device/driver to bind to,	27	3. Raw Gadget provides a way to select a UDC device/driver to bind to,
28	while GadgetFS currently binds to the first available UDC.	28	while GadgetFS currently binds to the first available UDC.
29		29
30	4. Raw Gadget uses predictable endpoint names (handles) across different	30	4. Raw Gadget explicitly exposes information about endpoints addresses and
31	UDCs (as long as UDCs have enough endpoints of each required transfer	31	capabilities allowing a user to write UDC-agnostic gadgets.
32	type).
33		32
34	5. Raw Gadget has ioctl-based interface instead of a filesystem-based one.	33	5. Raw Gadget has ioctl-based interface instead of a filesystem-based one.
35		34
@@ -50,12 +49,36 @@ The typical usage of Raw Gadget looks like: · 14 unmodified lines
50	Raw Gadget and react to those depending on what kind of USB device	49	Raw Gadget and react to those depending on what kind of USB device
51	needs to be emulated.	50	needs to be emulated.
52		51
		52	Note, that some UDC drivers have fixed addresses assigned to endpoints, and
		53	therefore arbitrary endpoint addresses can't be used in the descriptors.
		54	Nevertheles, Raw Gadget provides a UDC-agnostic way to write USB gadgets.
		55	Once a USB_RAW_EVENT_CONNECT event is received via USB_RAW_IOCTL_EVENT_FETCH,
		56	the USB_RAW_IOCTL_EPS_INFO ioctl can be used to find out information about
		57	endpoints that the UDC driver has. Based on that information, the user must
		58	chose UDC endpoints that will be used for the gadget being emulated, and
		59	properly assign addresses in endpoint descriptors.
		60
		61	You can find usage examples (along with a test suite) here:
		62
		63	https://github.com/xairy/raw-gadget
		64
		65	Internal details
		66	~~~~~~~~~~~~~~~~
		67
		68	Currently every endpoint read/write ioctl submits a USB request and waits until
		69	its completion. This is the desired mode for coverage-guided fuzzing (as we'd
		70	like all USB request processing happen during the lifetime of a syscall),
		71	and must be kept in the implementation. (This might be slow for real world
		72	applications, thus the O_NONBLOCK improvement suggestion below.)
		73
53	Potential future improvements	74	Potential future improvements
54	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	75	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
55		76
56	- Implement ioctl's for setting/clearing halt status on endpoints.	77	- Report more events (suspend, resume, etc.) through USB_RAW_IOCTL_EVENT_FETCH.
57
58	- Reporting more events (suspend, resume, etc.) through
59	USB_RAW_IOCTL_EVENT_FETCH.
60		78
61	- Support O_NONBLOCK I/O.	79	- Support O_NONBLOCK I/O.
		80
		81	- Support USB 3 features (accept SS endpoint companion descriptor when
		82	enabling endpoints; allow providing stream_id for bulk transfers).
		83
		84	- Support ISO transfer features (expose frame_number for completed requests).

MAINTAINERS+20−5

 DRM DRIVER FOR VMWARE VIRTUAL GPU
 M:	"VMware Graphics" <linux-graphics-maintainer@vmware.com>
-M:	Thomas Hellstrom <thellstrom@vmware.com>
+M:	Roland Scheidegger <sroland@vmware.com>
 L:	dri-devel@lists.freedesktop.org
 S:	Supported
-T:	git git://people.freedesktop.org/~thomash/linux
+T:	git git://people.freedesktop.org/~sroland/linux
 F:	drivers/gpu/drm/vmwgfx/
 F:	include/uapi/drm/vmwgfx_drm.h
 F:	drivers/media/platform/sti/hva
 HWPOISON MEMORY FAILURE HANDLING
-M:	Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
+M:	Naoya Horiguchi <naoya.horiguchi@nec.com>
 L:	linux-mm@kvack.org
 S:	Maintained
 F:	mm/hwpoison-inject.c
 F:	drivers/i2c/busses/i2c-parport.c
 I2C SUBSYSTEM
-M:	Wolfram Sang <wsa@the-dreams.de>
+M:	Wolfram Sang <wsa@kernel.org>
 L:	linux-i2c@vger.kernel.org
 S:	Maintained
 W:	https://i2c.wiki.kernel.org/
 S:	Maintained
 W:	http://lse.sourceforge.net/kdump/
 F:	Documentation/admin-guide/kdump/
+F:	fs/proc/vmcore.c
+F:	include/linux/crash_core.h
+F:	include/linux/crash_dump.h
+F:	include/uapi/linux/vmcore.h
+F:	kernel/crash_*.c
 KEENE FM RADIO TRANSMITTER DRIVER
 M:	Hans Verkuil <hverkuil@xs4all.nl>
 S:	Maintained
 F:	drivers/net/ethernet/mediatek/
+MEDIATEK I2C CONTROLLER DRIVER
+M:	Qii Wang <qii.wang@mediatek.com>
+L:	linux-i2c@vger.kernel.org
+S:	Maintained
+F:	Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt
+F:	drivers/i2c/busses/i2c-mt65xx.c
 MEDIATEK JPEG DRIVER
 M:	Rick Chang <rick.chang@mediatek.com>
 M:	Bin Liu <bin.liu@mediatek.com>
 NETWORKING DRIVERS
 M:	"David S. Miller" <davem@davemloft.net>
+M:	Jakub Kicinski <kuba@kernel.org>
 L:	netdev@vger.kernel.org
-S:	Odd Fixes
+S:	Maintained
 W:	http://www.linuxfoundation.org/en/Net
 Q:	http://patchwork.ozlabs.org/project/netdev/list/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
 S390 IUCV NETWORK LAYER
 M:	Julian Wiedmann <jwi@linux.ibm.com>
+M:	Karsten Graul <kgraul@linux.ibm.com>
 M:	Ursula Braun <ubraun@linux.ibm.com>
 L:	linux-s390@vger.kernel.org
 S:	Supported
 S390 NETWORK DRIVERS
 M:	Julian Wiedmann <jwi@linux.ibm.com>
+M:	Karsten Graul <kgraul@linux.ibm.com>
 M:	Ursula Braun <ubraun@linux.ibm.com>
 L:	linux-s390@vger.kernel.org
 S:	Supported

Makefile+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	VERSION = 5	2	VERSION = 5
3	PATCHLEVEL = 7	3	PATCHLEVEL = 7
4	SUBLEVEL = 0	4	SUBLEVEL = 0
5	EXTRAVERSION = -rc5	5	EXTRAVERSION = -rc7
6	NAME = Kleptomaniac Octopus	6	NAME = Kleptomaniac Octopus
7		7
8	# DOCUMENTATION	8	# DOCUMENTATION

arch/arc/configs/hsdk_defconfig+1−0

@@ -65,6 +65,7 @@ CONFIG_DRM_UDL=y · 64 unmodified lines
65	CONFIG_DRM_ETNAVIV=y	65	CONFIG_DRM_ETNAVIV=y
66	CONFIG_FB=y	66	CONFIG_FB=y
67	CONFIG_FRAMEBUFFER_CONSOLE=y	67	CONFIG_FRAMEBUFFER_CONSOLE=y
		68	CONFIG_USB=y
68	CONFIG_USB_EHCI_HCD=y	69	CONFIG_USB_EHCI_HCD=y
69	CONFIG_USB_EHCI_HCD_PLATFORM=y	70	CONFIG_USB_EHCI_HCD_PLATFORM=y
70	CONFIG_USB_OHCI_HCD=y	71	CONFIG_USB_OHCI_HCD=y

arch/arc/include/asm/dsp-impl.h+2−0

 /* clobbers r5 register */
 .macro DSP_EARLY_INIT
+#ifdef CONFIG_ISA_ARCV2
 	lr	r5, [ARC_AUX_DSP_BUILD]
 	bmsk	r5, r5, 7
 	breq    r5, 0, 1f
 	mov	r5, DSP_CTRL_DISABLED_ALL
 	sr	r5, [ARC_AUX_DSP_CTRL]
 1:
+#endif
 .endm
 /* clobbers r10, r11 registers pair */

arch/arc/include/asm/entry-arcv2.h+2−0

@@ -233,6 +233,8 @@ · 232 unmodified lines
233		233
234	#ifdef CONFIG_ARC_IRQ_NO_AUTOSAVE	234	#ifdef CONFIG_ARC_IRQ_NO_AUTOSAVE
235	__RESTORE_REGFILE_HARD	235	__RESTORE_REGFILE_HARD
		236
		237	; SP points to PC/STAT32: hw restores them despite NO_AUTOSAVE
236	add sp, sp, SZ_PT_REGS - 8	238	add sp, sp, SZ_PT_REGS - 8
237	#else	239	#else
238	add sp, sp, PT_r0	240	add sp, sp, PT_r0

arch/arc/kernel/Makefile+0−3

@@ -3,9 +3,6 @@ · 2 unmodified lines
3	# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)	3	# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
4	#	4	#
5		5
6	# Pass UTS_MACHINE for user_regset definition
7	CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"'
8
9	obj-y := arcksyms.o setup.o irq.o reset.o ptrace.o process.o devtree.o	6	obj-y := arcksyms.o setup.o irq.o reset.o ptrace.o process.o devtree.o
10	obj-y += signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o	7	obj-y += signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o
11	obj-$(CONFIG_ISA_ARCOMPACT) += entry-compact.o intc-compact.o	8	obj-$(CONFIG_ISA_ARCOMPACT) += entry-compact.o intc-compact.o

arch/arc/kernel/ptrace.c+1−1

@@ -253,7 +253,7 @@ static const struct user_regset arc_regsets[] = { · 252 unmodified lines
253	};	253	};
254		254
255	static const struct user_regset_view user_arc_view = {	255	static const struct user_regset_view user_arc_view = {
256	.name = UTS_MACHINE,	256	.name = "arc",
257	.e_machine = EM_ARC_INUSE,	257	.e_machine = EM_ARC_INUSE,
258	.regsets = arc_regsets,	258	.regsets = arc_regsets,
259	.n = ARRAY_SIZE(arc_regsets)	259	.n = ARRAY_SIZE(arc_regsets)

arch/arc/kernel/setup.c+3−2

 #include <linux/clocksource.h>
 #include <linux/console.h>
 #include <linux/module.h>
+#include <linux/sizes.h>
 #include <linux/cpu.h>
 #include <linux/of_clk.h>
 #include <linux/of_fdt.h>
 	if ((unsigned int)__arc_dccm_base != cpu->dccm.base_addr)
 		panic("Linux built with incorrect DCCM Base address\n");
-	if (CONFIG_ARC_DCCM_SZ != cpu->dccm.sz)
+	if (CONFIG_ARC_DCCM_SZ * SZ_1K != cpu->dccm.sz)
 		panic("Linux built with incorrect DCCM Size\n");
 #endif
 #ifdef CONFIG_ARC_HAS_ICCM
-	if (CONFIG_ARC_ICCM_SZ != cpu->iccm.sz)
+	if (CONFIG_ARC_ICCM_SZ * SZ_1K != cpu->iccm.sz)
 		panic("Linux built with incorrect ICCM Size\n");
 #endif

arch/arc/kernel/troubleshoot.c+6−8

@@ -191,10 +191,9 @@ void show_regs(struct pt_regs *regs) · 190 unmodified lines
191	if (user_mode(regs))	191	if (user_mode(regs))
192	show_faulting_vma(regs->ret); /* faulting code, not data */	192	show_faulting_vma(regs->ret); /* faulting code, not data */
193		193
194	pr_info("ECR: 0x%08lx EFA: 0x%08lx ERET: 0x%08lx\n",	194	pr_info("ECR: 0x%08lx EFA: 0x%08lx ERET: 0x%08lx\nSTAT: 0x%08lx",
195	regs->event, current->thread.fault_address, regs->ret);	195	regs->event, current->thread.fault_address, regs->ret,
196		196	regs->status32);
197	pr_info("STAT32: 0x%08lx", regs->status32);
198		197
199	#define STS_BIT(r, bit) r->status32 & STATUS_##bit##_MASK ? #bit" " : ""	198	#define STS_BIT(r, bit) r->status32 & STATUS_##bit##_MASK ? #bit" " : ""
200		199
@@ -210,11 +209,10 @@ void show_regs(struct pt_regs *regs) · 9 unmodified lines
210	(regs->status32 & STATUS_U_MASK) ? "U " : "K ",	209	(regs->status32 & STATUS_U_MASK) ? "U " : "K ",
211	STS_BIT(regs, DE), STS_BIT(regs, AE));	210	STS_BIT(regs, DE), STS_BIT(regs, AE));
212	#endif	211	#endif
213	pr_cont(" BTA: 0x%08lx\n", regs->bta);	212	pr_cont(" BTA: 0x%08lx\n SP: 0x%08lx FP: 0x%08lx BLK: %pS\n",
214	pr_info("BLK: %pS\n SP: 0x%08lx FP: 0x%08lx\n",	213	regs->bta, regs->sp, regs->fp, (void *)regs->blink);
215	(void *)regs->blink, regs->sp, regs->fp);
216	pr_info("LPS: 0x%08lx\tLPE: 0x%08lx\tLPC: 0x%08lx\n",	214	pr_info("LPS: 0x%08lx\tLPE: 0x%08lx\tLPC: 0x%08lx\n",
217	regs->lp_start, regs->lp_end, regs->lp_count);	215	regs->lp_start, regs->lp_end, regs->lp_count);
218		216
219	/* print regs->r0 thru regs->r12	217	/* print regs->r0 thru regs->r12
220	* Sequential printing was generating horrible code	218	* Sequential printing was generating horrible code

arch/arc/kernel/unwind.c+0−2

 #endif
 	/* update frame */
-#ifndef CONFIG_AS_CFI_SIGNAL_FRAME
 	if (frame->call_frame
 	    && !UNW_DEFAULT_RA(state.regs[retAddrReg], state.dataAlign))
 		frame->call_frame = 0;
-#endif
 	cfa = FRAME_REG(state.cfa.reg, unsigned long) + state.cfa.offs;
 	startLoc = min_t(unsigned long, UNW_SP(frame), cfa);
 	endLoc = max_t(unsigned long, UNW_SP(frame), cfa);

arch/arc/plat-eznps/Kconfig+1−0

@@ -6,6 +6,7 @@ · 5 unmodified lines
6		6
7	menuconfig ARC_PLAT_EZNPS	7	menuconfig ARC_PLAT_EZNPS
8	bool "\"EZchip\" ARC dev platform"	8	bool "\"EZchip\" ARC dev platform"
		9	depends on ISA_ARCOMPACT
9	select CPU_BIG_ENDIAN	10	select CPU_BIG_ENDIAN
10	select CLKSRC_NPS if !PHYS_ADDR_T_64BIT	11	select CLKSRC_NPS if !PHYS_ADDR_T_64BIT
11	select EZNPS_GIC	12	select EZNPS_GIC

arch/arm/Kconfig+1−0

@@ -12,6 +12,7 @@ config ARM · 11 unmodified lines
12	select ARCH_HAS_KEEPINITRD	12	select ARCH_HAS_KEEPINITRD
13	select ARCH_HAS_KCOV	13	select ARCH_HAS_KCOV
14	select ARCH_HAS_MEMBARRIER_SYNC_CORE	14	select ARCH_HAS_MEMBARRIER_SYNC_CORE
		15	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
15	select ARCH_HAS_PTE_SPECIAL if ARM_LPAE	16	select ARCH_HAS_PTE_SPECIAL if ARM_LPAE
16	select ARCH_HAS_PHYS_TO_DMA	17	select ARCH_HAS_PHYS_TO_DMA
17	select ARCH_HAS_SETUP_DMA_OPS	18	select ARCH_HAS_SETUP_DMA_OPS

arch/arm/boot/dts/am574x-idk.dts+4−0

@@ -40,3 +40,7 @@ · 39 unmodified lines
40	status = "okay";	40	status = "okay";
41	dual_emac;	41	dual_emac;
42	};	42	};
		43
		44	&m_can0 {
		45	status = "disabled";
		46	};

arch/arm/boot/dts/dra7.dtsi+2−2

 			#address-cells = <1>;
 			ranges = <0x51000000 0x51000000 0x3000
 				  0x0	     0x20000000 0x10000000>;
+			dma-ranges;
 			/**
 			 * To enable PCI endpoint mode, disable the pcie1_rc
 			 * node and enable pcie1_ep mode.
 				device_type = "pci";
 				ranges = <0x81000000 0 0          0x03000 0 0x00010000
 					  0x82000000 0 0x20013000 0x13000 0 0xffed000>;
-				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
 				bus-range = <0x00 0xff>;
 				#interrupt-cells = <1>;
 				num-lanes = <1>;
 			#address-cells = <1>;
 			ranges = <0x51800000 0x51800000 0x3000
 				  0x0	     0x30000000 0x10000000>;
+			dma-ranges;
 			status = "disabled";
 			pcie2_rc: pcie@51800000 {
 				reg = <0x51800000 0x2000>, <0x51802000 0x14c>, <0x1000 0x2000>;
 				device_type = "pci";
 				ranges = <0x81000000 0 0          0x03000 0 0x00010000
 					  0x82000000 0 0x30013000 0x13000 0 0xffed000>;
-				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;
 				bus-range = <0x00 0xff>;
 				#interrupt-cells = <1>;
 				num-lanes = <1>;

arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts+2−2

@@ -75,8 +75,8 @@ · 74 unmodified lines
75	imx27-phycard-s-rdk {	75	imx27-phycard-s-rdk {
76	pinctrl_i2c1: i2c1grp {	76	pinctrl_i2c1: i2c1grp {
77	fsl,pins = <	77	fsl,pins = <
78	MX27_PAD_I2C2_SDA__I2C2_SDA 0x0	78	MX27_PAD_I2C_DATA__I2C_DATA 0x0
79	MX27_PAD_I2C2_SCL__I2C2_SCL 0x0	79	MX27_PAD_I2C_CLK__I2C_CLK 0x0
80	>;	80	>;
81	};	81	};
82		82

arch/arm/boot/dts/imx6dl-yapp4-ursa.dts+1−1

@@ -38,7 +38,7 @@ · 37 unmodified lines
38	};	38	};
39		39
40	&switch_ports {	40	&switch_ports {
41	/delete-node/ port@2;	41	/delete-node/ port@3;
42	};	42	};
43		43
44	&touchscreen {	44	&touchscreen {

arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi+0−2

@@ -72,8 +72,6 @@ · 71 unmodified lines
72	adi,input-depth = <8>;	72	adi,input-depth = <8>;
73	adi,input-colorspace = "rgb";	73	adi,input-colorspace = "rgb";
74	adi,input-clock = "1x";	74	adi,input-clock = "1x";
75	adi,input-style = <1>;
76	adi,input-justification = "evenly";
77		75
78	ports {	76	ports {
79	#address-cells = <1>;	77	#address-cells = <1>;

arch/arm/boot/dts/motorola-mapphone-common.dtsi+40−3

@@ -367,6 +367,8 @@ · 366 unmodified lines
367	};	367	};
368		368
369	&mmc3 {	369	&mmc3 {
		370	pinctrl-names = "default";
		371	pinctrl-0 = <&mmc3_pins>;
370	vmmc-supply = <&wl12xx_vmmc>;	372	vmmc-supply = <&wl12xx_vmmc>;
371	/* uart2_tx.sdmmc3_dat1 pad as wakeirq */	373	/* uart2_tx.sdmmc3_dat1 pad as wakeirq */
372	interrupts-extended = <&wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH	374	interrupts-extended = <&wakeupgen GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH
@@ -472,6 +474,37 @@ · 99 unmodified lines
472	>;	474	>;
473	};	475	};
474		476
		477	/*
		478	* Android uses PIN_OFF_INPUT_PULLDOWN \| PIN_INPUT_PULLUP \| MUX_MODE3
		479	* for gpio_100, but the internal pull makes wlan flakey on some
		480	* devices. Off mode value should be tested if we have off mode working
		481	* later on.
		482	*/
		483	mmc3_pins: pinmux_mmc3_pins {
		484	pinctrl-single,pins = <
		485	/* 0x4a10008e gpmc_wait2.gpio_100 d23 */
		486	OMAP4_IOPAD(0x08e, PIN_INPUT \| MUX_MODE3)
		487
		488	/* 0x4a100102 abe_mcbsp1_dx.sdmmc3_dat2 ab25 */
		489	OMAP4_IOPAD(0x102, PIN_INPUT_PULLUP \| MUX_MODE1)
		490
		491	/* 0x4a100104 abe_mcbsp1_fsx.sdmmc3_dat3 ac27 */
		492	OMAP4_IOPAD(0x104, PIN_INPUT_PULLUP \| MUX_MODE1)
		493
		494	/* 0x4a100118 uart2_cts.sdmmc3_clk ab26 */
		495	OMAP4_IOPAD(0x118, PIN_INPUT \| MUX_MODE1)
		496
		497	/* 0x4a10011a uart2_rts.sdmmc3_cmd ab27 */
		498	OMAP4_IOPAD(0x11a, PIN_INPUT_PULLUP \| MUX_MODE1)
		499
		500	/* 0x4a10011c uart2_rx.sdmmc3_dat0 aa25 */
		501	OMAP4_IOPAD(0x11c, PIN_INPUT_PULLUP \| MUX_MODE1)
		502
		503	/* 0x4a10011e uart2_tx.sdmmc3_dat1 aa26 */
		504	OMAP4_IOPAD(0x11e, PIN_INPUT_PULLUP \| MUX_MODE1)
		505	>;
		506	};
		507
475	/* gpmc_ncs0.gpio_50 */	508	/* gpmc_ncs0.gpio_50 */
476	poweroff_gpio: pinmux_poweroff_pins {	509	poweroff_gpio: pinmux_poweroff_pins {
477	pinctrl-single,pins = <	510	pinctrl-single,pins = <
@@ -690,14 +723,18 @@ · 212 unmodified lines
690	};	723	};
691		724
692	/*	725	/*
693	* As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for	726	* The uart1 port is wired to mdm6600 with rts and cts. The modem uses gpio_149
694	* uart1 wakeirq.	727	* for wake-up events for both the USB PHY and the UART. We can use gpio_149
		728	* pad as the shared wakeirq for the UART rather than the RX or CTS pad as we
		729	* have gpio_149 trigger before the UART transfer starts.
695	*/	730	*/
696	&uart1 {	731	&uart1 {
697	pinctrl-names = "default";	732	pinctrl-names = "default";
698	pinctrl-0 = <&uart1_pins>;	733	pinctrl-0 = <&uart1_pins>;
699	interrupts-extended = <&wakeupgen GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH	734	interrupts-extended = <&wakeupgen GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH
700	&omap4_pmx_core 0xfc>;	735	&omap4_pmx_core 0x110>;
		736	uart-has-rtscts;
		737	current-speed = <115200>;
701	};	738	};
702		739
703	&uart3 {	740	&uart3 {

arch/arm/boot/dts/r7s9210.dtsi+0−3

 			reg = <0xe803b000 0x30>;
 			interrupts = <GIC_SPI 56 IRQ_TYPE_EDGE_RISING>;
 			clocks = <&cpg CPG_MOD 36>;
-			clock-names = "ostm0";
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
 			reg = <0xe803c000 0x30>;
 			interrupts = <GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;
 			clocks = <&cpg CPG_MOD 35>;
-			clock-names = "ostm1";
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
 			reg = <0xe803d000 0x30>;
 			interrupts = <GIC_SPI 58 IRQ_TYPE_EDGE_RISING>;
 			clocks = <&cpg CPG_MOD 34>;
-			clock-names = "ostm2";
 			power-domains = <&cpg>;
 			status = "disabled";
 		};

arch/arm/boot/dts/r8a73a4.dtsi+8−1

 	cmt1: timer@e6130000 {
 		compatible = "renesas,r8a73a4-cmt1", "renesas,rcar-gen2-cmt1";
 		reg = <0 0xe6130000 0 0x1004>;
-		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp3_clks R8A73A4_CLK_CMT1>;
 		clock-names = "fck";
 		power-domains = <&pd_c5>;

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

@@ -479,7 +479,7 @@ · 478 unmodified lines
479	cpg_clocks: cpg_clocks@e6150000 {	479	cpg_clocks: cpg_clocks@e6150000 {
480	compatible = "renesas,r8a7740-cpg-clocks";	480	compatible = "renesas,r8a7740-cpg-clocks";
481	reg = <0xe6150000 0x10000>;	481	reg = <0xe6150000 0x10000>;
482	clocks = <&extal1_clk>, <&extalr_clk>;	482	clocks = <&extal1_clk>, <&extal2_clk>, <&extalr_clk>;
483	#clock-cells = <1>;	483	#clock-cells = <1>;
484	clock-output-names = "system", "pllc0", "pllc1",	484	clock-output-names = "system", "pllc0", "pllc1",
485	"pllc2", "r",	485	"pllc2", "r",

arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts+0−2

@@ -84,8 +84,6 @@ · 83 unmodified lines
84	adi,input-depth = <8>;	84	adi,input-depth = <8>;
85	adi,input-colorspace = "rgb";	85	adi,input-colorspace = "rgb";
86	adi,input-clock = "1x";	86	adi,input-clock = "1x";
87	adi,input-style = <1>;
88	adi,input-justification = "evenly";
89		87
90	ports {	88	ports {
91	#address-cells = <1>;	89	#address-cells = <1>;

arch/arm/boot/dts/r8a7790-lager.dts+0−2

@@ -364,8 +364,6 @@ · 363 unmodified lines
364	adi,input-depth = <8>;	364	adi,input-depth = <8>;
365	adi,input-colorspace = "rgb";	365	adi,input-colorspace = "rgb";
366	adi,input-clock = "1x";	366	adi,input-clock = "1x";
367	adi,input-style = <1>;
368	adi,input-justification = "evenly";
369		367
370	ports {	368	ports {
371	#address-cells = <1>;	369	#address-cells = <1>;

arch/arm/boot/dts/r8a7790-stout.dts+0−2

@@ -297,8 +297,6 @@ · 296 unmodified lines
297	adi,input-depth = <8>;	297	adi,input-depth = <8>;
298	adi,input-colorspace = "rgb";	298	adi,input-colorspace = "rgb";
299	adi,input-clock = "1x";	299	adi,input-clock = "1x";
300	adi,input-style = <1>;
301	adi,input-justification = "evenly";
302		300
303	ports {	301	ports {
304	#address-cells = <1>;	302	#address-cells = <1>;

arch/arm/boot/dts/r8a7791-koelsch.dts+0−2

@@ -387,8 +387,6 @@ · 386 unmodified lines
387	adi,input-depth = <8>;	387	adi,input-depth = <8>;
388	adi,input-colorspace = "rgb";	388	adi,input-colorspace = "rgb";
389	adi,input-clock = "1x";	389	adi,input-clock = "1x";
390	adi,input-style = <1>;
391	adi,input-justification = "evenly";
392		390
393	ports {	391	ports {
394	#address-cells = <1>;	392	#address-cells = <1>;

arch/arm/boot/dts/r8a7791-porter.dts+0−2

@@ -181,8 +181,6 @@ · 180 unmodified lines
181	adi,input-depth = <8>;	181	adi,input-depth = <8>;
182	adi,input-colorspace = "rgb";	182	adi,input-colorspace = "rgb";
183	adi,input-clock = "1x";	183	adi,input-clock = "1x";
184	adi,input-style = <1>;
185	adi,input-justification = "evenly";
186		184
187	ports {	185	ports {
188	#address-cells = <1>;	186	#address-cells = <1>;

arch/arm/boot/dts/r8a7792-blanche.dts+0−2

@@ -289,8 +289,6 @@ · 288 unmodified lines
289	adi,input-depth = <8>;	289	adi,input-depth = <8>;
290	adi,input-colorspace = "rgb";	290	adi,input-colorspace = "rgb";
291	adi,input-clock = "1x";	291	adi,input-clock = "1x";
292	adi,input-style = <1>;
293	adi,input-justification = "evenly";
294		292
295	ports {	293	ports {
296	#address-cells = <1>;	294	#address-cells = <1>;

arch/arm/boot/dts/r8a7792-wheat.dts+4−8

 	 */
 	hdmi@3d {
 		compatible = "adi,adv7513";
-		reg = <0x3d>, <0x2d>, <0x4d>, <0x5d>;
+		reg = <0x3d>, <0x4d>, <0x2d>, <0x5d>;
-		reg-names = "main", "cec", "edid", "packet";
+		reg-names = "main", "edid", "cec", "packet";
 		adi,input-depth = <8>;
 		adi,input-colorspace = "rgb";
 		adi,input-clock = "1x";
-		adi,input-style = <1>;
-		adi,input-justification = "evenly";
 		ports {
 			#address-cells = <1>;
 	hdmi@39 {
 		compatible = "adi,adv7513";
-		reg = <0x39>, <0x29>, <0x49>, <0x59>;
+		reg = <0x39>, <0x49>, <0x29>, <0x59>;
-		reg-names = "main", "cec", "edid", "packet";
+		reg-names = "main", "edid", "cec", "packet";
 		adi,input-depth = <8>;
 		adi,input-colorspace = "rgb";
 		adi,input-clock = "1x";
-		adi,input-style = <1>;
-		adi,input-justification = "evenly";
 		ports {
 			#address-cells = <1>;

arch/arm/boot/dts/r8a7793-gose.dts+0−2

@@ -366,8 +366,6 @@ · 365 unmodified lines
366	adi,input-depth = <8>;	366	adi,input-depth = <8>;
367	adi,input-colorspace = "rgb";	367	adi,input-colorspace = "rgb";
368	adi,input-clock = "1x";	368	adi,input-clock = "1x";
369	adi,input-style = <1>;
370	adi,input-justification = "evenly";
371		369
372	ports {	370	ports {
373	#address-cells = <1>;	371	#address-cells = <1>;

arch/arm/boot/dts/r8a7794-silk.dts+0−2

@@ -255,8 +255,6 @@ · 254 unmodified lines
255	adi,input-depth = <8>;	255	adi,input-depth = <8>;
256	adi,input-colorspace = "rgb";	256	adi,input-colorspace = "rgb";
257	adi,input-clock = "1x";	257	adi,input-clock = "1x";
258	adi,input-style = <1>;
259	adi,input-justification = "evenly";
260		258
261	ports {	259	ports {
262	#address-cells = <1>;	260	#address-cells = <1>;

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

@@ -128,7 +128,7 @@ · 127 unmodified lines
128	assigned-clocks = <&cru SCLK_GPU>;	128	assigned-clocks = <&cru SCLK_GPU>;
129	assigned-clock-rates = <100000000>;	129	assigned-clock-rates = <100000000>;
130	clocks = <&cru SCLK_GPU>, <&cru SCLK_GPU>;	130	clocks = <&cru SCLK_GPU>, <&cru SCLK_GPU>;
131	clock-names = "core", "bus";	131	clock-names = "bus", "core";
132	resets = <&cru SRST_GPU>;	132	resets = <&cru SRST_GPU>;
133	status = "disabled";	133	status = "disabled";
134	};	134	};

arch/arm/boot/dts/rk3228-evb.dts+1−1

@@ -46,7 +46,7 @@ · 45 unmodified lines
46	#address-cells = <1>;	46	#address-cells = <1>;
47	#size-cells = <0>;	47	#size-cells = <0>;
48		48
49	phy: phy@0 {	49	phy: ethernet-phy@0 {
50	compatible = "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22";	50	compatible = "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22";
51	reg = <0>;	51	reg = <0>;
52	clocks = <&cru SCLK_MAC_PHY>;	52	clocks = <&cru SCLK_MAC_PHY>;

arch/arm/boot/dts/rk3229-xms6.dts+1−1

@@ -150,7 +150,7 @@ · 149 unmodified lines
150	#address-cells = <1>;	150	#address-cells = <1>;
151	#size-cells = <0>;	151	#size-cells = <0>;
152		152
153	phy: phy@0 {	153	phy: ethernet-phy@0 {
154	compatible = "ethernet-phy-id1234.d400",	154	compatible = "ethernet-phy-id1234.d400",
155	"ethernet-phy-ieee802.3-c22";	155	"ethernet-phy-ieee802.3-c22";
156	reg = <0>;	156	reg = <0>;

arch/arm/boot/dts/rk322x.dtsi+3−3

@@ -555,7 +555,7 @@ · 554 unmodified lines
555	"pp1",	555	"pp1",
556	"ppmmu1";	556	"ppmmu1";
557	clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;	557	clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
558	clock-names = "core", "bus";	558	clock-names = "bus", "core";
559	resets = <&cru SRST_GPU_A>;	559	resets = <&cru SRST_GPU_A>;
560	status = "disabled";	560	status = "disabled";
561	};	561	};
@@ -1020,7 +1020,7 @@ · 458 unmodified lines
1020	};	1020	};
1021	};	1021	};
1022		1022
1023	spi-0 {	1023	spi0 {
1024	spi0_clk: spi0-clk {	1024	spi0_clk: spi0-clk {
1025	rockchip,pins = <0 RK_PB1 2 &pcfg_pull_up>;	1025	rockchip,pins = <0 RK_PB1 2 &pcfg_pull_up>;
1026	};	1026	};
@@ -1038,7 +1038,7 @@ · 11 unmodified lines
1038	};	1038	};
1039	};	1039	};
1040		1040
1041	spi-1 {	1041	spi1 {
1042	spi1_clk: spi1-clk {	1042	spi1_clk: spi1-clk {
1043	rockchip,pins = <0 RK_PC7 2 &pcfg_pull_up>;	1043	rockchip,pins = <0 RK_PC7 2 &pcfg_pull_up>;
1044	};	1044	};

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

@@ -84,7 +84,7 @@ · 83 unmodified lines
84	compatible = "arm,mali-400";	84	compatible = "arm,mali-400";
85	reg = <0x10090000 0x10000>;	85	reg = <0x10090000 0x10000>;
86	clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;	86	clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
87	clock-names = "core", "bus";	87	clock-names = "bus", "core";
88	assigned-clocks = <&cru ACLK_GPU>;	88	assigned-clocks = <&cru ACLK_GPU>;
89	assigned-clock-rates = <100000000>;	89	assigned-clock-rates = <100000000>;
90	resets = <&cru SRST_GPU>;	90	resets = <&cru SRST_GPU>;

arch/arm/configs/keystone_defconfig+1−0

@@ -147,6 +147,7 @@ CONFIG_I2C_DAVINCI=y · 146 unmodified lines
147	CONFIG_SPI=y	147	CONFIG_SPI=y
148	CONFIG_SPI_DAVINCI=y	148	CONFIG_SPI_DAVINCI=y
149	CONFIG_SPI_SPIDEV=y	149	CONFIG_SPI_SPIDEV=y
		150	CONFIG_PTP_1588_CLOCK=y
150	CONFIG_PINCTRL_SINGLE=y	151	CONFIG_PINCTRL_SINGLE=y
151	CONFIG_GPIOLIB=y	152	CONFIG_GPIOLIB=y
152	CONFIG_GPIO_SYSFS=y	153	CONFIG_GPIO_SYSFS=y

arch/arm/configs/omap2plus_defconfig+1−0

@@ -274,6 +274,7 @@ CONFIG_SPI_TI_QSPI=m · 273 unmodified lines
274	CONFIG_HSI=m	274	CONFIG_HSI=m
275	CONFIG_OMAP_SSI=m	275	CONFIG_OMAP_SSI=m
276	CONFIG_SSI_PROTOCOL=m	276	CONFIG_SSI_PROTOCOL=m
		277	CONFIG_PTP_1588_CLOCK=y
277	CONFIG_PINCTRL_SINGLE=y	278	CONFIG_PINCTRL_SINGLE=y
278	CONFIG_DEBUG_GPIO=y	279	CONFIG_DEBUG_GPIO=y
279	CONFIG_GPIO_SYSFS=y	280	CONFIG_GPIO_SYSFS=y

arch/arm/mach-oxnas/platsmp.c+2−1

@@ -27,7 +27,8 @@ static void __iomem *gic_cpu_ctrl; · 26 unmodified lines
27	#define GIC_CPU_CTRL 0x00	27	#define GIC_CPU_CTRL 0x00
28	#define GIC_CPU_CTRL_ENABLE 1	28	#define GIC_CPU_CTRL_ENABLE 1
29		29
30	int __init ox820_boot_secondary(unsigned int cpu, struct task_struct *idle)	30	static int __init ox820_boot_secondary(unsigned int cpu,
		31	struct task_struct *idle)
31	{	32	{
32	/*	33	/*
33	* Write the address of secondary startup into the	34	* Write the address of secondary startup into the

arch/arm64/Kconfig+1−0

@@ -20,6 +20,7 @@ config ARM64 · 19 unmodified lines
20	select ARCH_HAS_KCOV	20	select ARCH_HAS_KCOV
21	select ARCH_HAS_KEEPINITRD	21	select ARCH_HAS_KEEPINITRD
22	select ARCH_HAS_MEMBARRIER_SYNC_CORE	22	select ARCH_HAS_MEMBARRIER_SYNC_CORE
		23	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
23	select ARCH_HAS_PTE_DEVMAP	24	select ARCH_HAS_PTE_DEVMAP
24	select ARCH_HAS_PTE_SPECIAL	25	select ARCH_HAS_PTE_SPECIAL
25	select ARCH_HAS_SETUP_DMA_OPS	26	select ARCH_HAS_SETUP_DMA_OPS

arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts+1−1

@@ -98,7 +98,7 @@ · 97 unmodified lines
98	};	98	};
99		99
100	&codec_analog {	100	&codec_analog {
101	hpvcc-supply = <&reg_eldo1>;	101	cpvdd-supply = <&reg_eldo1>;
102	status = "okay";	102	status = "okay";
103	};	103	};
104		104

arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi+0−18

@@ -154,24 +154,6 @@ · 153 unmodified lines
154	};	154	};
155	};	155	};
156		156
157	sound_spdif {
158	compatible = "simple-audio-card";
159	simple-audio-card,name = "On-board SPDIF";
160
161	simple-audio-card,cpu {
162	sound-dai = <&spdif>;
163	};
164
165	simple-audio-card,codec {
166	sound-dai = <&spdif_out>;
167	};
168	};
169
170	spdif_out: spdif-out {
171	#sound-dai-cells = <0>;
172	compatible = "linux,spdif-dit";
173	};
174
175	timer {	157	timer {
176	compatible = "arm,armv8-timer";	158	compatible = "arm,armv8-timer";
177	allwinner,erratum-unknown1;	159	allwinner,erratum-unknown1;

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi+1−1

@@ -2319,7 +2319,7 @@ · 2318 unmodified lines
2319	reg = <0x0 0xff400000 0x0 0x40000>;	2319	reg = <0x0 0xff400000 0x0 0x40000>;
2320	interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;	2320	interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
2321	clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;	2321	clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;
2322	clock-names = "ddr";	2322	clock-names = "otg";
2323	phys = <&usb2_phy1>;	2323	phys = <&usb2_phy1>;
2324	phy-names = "usb2-phy";	2324	phy-names = "usb2-phy";
2325	dr_mode = "peripheral";	2325	dr_mode = "peripheral";

arch/arm64/boot/dts/amlogic/meson-g12.dtsi+0−1

@@ -1,4 +1,3 @@
1
2	// SPDX-License-Identifier: (GPL-2.0+ OR MIT)	1	// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
3	/*	2	/*
4	* Copyright (c) 2019 BayLibre, SAS	3	* Copyright (c) 2019 BayLibre, SAS

arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi+4−0

 	clock-latency = <50000>;
 };
+&frddr_a {
+	status = "okay";
+};
 &frddr_b {
 	status = "okay";
 };

arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts+1−1

@@ -545,7 +545,7 @@ · 544 unmodified lines
545	&usb {	545	&usb {
546	status = "okay";	546	status = "okay";
547	dr_mode = "host";	547	dr_mode = "host";
548	vbus-regulator = <&usb_pwr_en>;	548	vbus-supply = <&usb_pwr_en>;
549	};	549	};
550		550
551	&usb2_phy0 {	551	&usb2_phy0 {

arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi+1−1

@@ -447,7 +447,7 @@ · 446 unmodified lines
447		447
448	edma0: dma-controller@22c0000 {	448	edma0: dma-controller@22c0000 {
449	#dma-cells = <2>;	449	#dma-cells = <2>;
450	compatible = "fsl,ls1028a-edma";	450	compatible = "fsl,ls1028a-edma", "fsl,vf610-edma";
451	reg = <0x0 0x22c0000 0x0 0x10000>,	451	reg = <0x0 0x22c0000 0x0 0x10000>,
452	<0x0 0x22d0000 0x0 0x10000>,	452	<0x0 0x22d0000 0x0 0x10000>,
453	<0x0 0x22e0000 0x0 0x10000>;	453	<0x0 0x22e0000 0x0 0x10000>;

arch/arm64/boot/dts/freescale/imx8mm.dtsi+4−4

@@ -264,7 +264,7 @@ · 263 unmodified lines
264		264
265	aips1: bus@30000000 {	265	aips1: bus@30000000 {
266	compatible = "fsl,aips-bus", "simple-bus";	266	compatible = "fsl,aips-bus", "simple-bus";
267	reg = <0x301f0000 0x10000>;	267	reg = <0x30000000 0x400000>;
268	#address-cells = <1>;	268	#address-cells = <1>;
269	#size-cells = <1>;	269	#size-cells = <1>;
270	ranges = <0x30000000 0x30000000 0x400000>;	270	ranges = <0x30000000 0x30000000 0x400000>;
@@ -543,7 +543,7 @@ · 272 unmodified lines
543		543
544	aips2: bus@30400000 {	544	aips2: bus@30400000 {
545	compatible = "fsl,aips-bus", "simple-bus";	545	compatible = "fsl,aips-bus", "simple-bus";
546	reg = <0x305f0000 0x10000>;	546	reg = <0x30400000 0x400000>;
547	#address-cells = <1>;	547	#address-cells = <1>;
548	#size-cells = <1>;	548	#size-cells = <1>;
549	ranges = <0x30400000 0x30400000 0x400000>;	549	ranges = <0x30400000 0x30400000 0x400000>;
@@ -603,7 +603,7 @@ · 53 unmodified lines
603		603
604	aips3: bus@30800000 {	604	aips3: bus@30800000 {
605	compatible = "fsl,aips-bus", "simple-bus";	605	compatible = "fsl,aips-bus", "simple-bus";
606	reg = <0x309f0000 0x10000>;	606	reg = <0x30800000 0x400000>;
607	#address-cells = <1>;	607	#address-cells = <1>;
608	#size-cells = <1>;	608	#size-cells = <1>;
609	ranges = <0x30800000 0x30800000 0x400000>,	609	ranges = <0x30800000 0x30800000 0x400000>,
@@ -863,7 +863,7 @@ · 253 unmodified lines
863		863
864	aips4: bus@32c00000 {	864	aips4: bus@32c00000 {
865	compatible = "fsl,aips-bus", "simple-bus";	865	compatible = "fsl,aips-bus", "simple-bus";
866	reg = <0x32df0000 0x10000>;	866	reg = <0x32c00000 0x400000>;
867	#address-cells = <1>;	867	#address-cells = <1>;
868	#size-cells = <1>;	868	#size-cells = <1>;
869	ranges = <0x32c00000 0x32c00000 0x400000>;	869	ranges = <0x32c00000 0x32c00000 0x400000>;

arch/arm64/boot/dts/freescale/imx8mn.dtsi+5−5

@@ -241,7 +241,7 @@ · 240 unmodified lines
241		241
242	aips1: bus@30000000 {	242	aips1: bus@30000000 {
243	compatible = "fsl,aips-bus", "simple-bus";	243	compatible = "fsl,aips-bus", "simple-bus";
244	reg = <0x301f0000 0x10000>;	244	reg = <0x30000000 0x400000>;
245	#address-cells = <1>;	245	#address-cells = <1>;
246	#size-cells = <1>;	246	#size-cells = <1>;
247	ranges;	247	ranges;
@@ -448,7 +448,7 @@ · 200 unmodified lines
448		448
449	aips2: bus@30400000 {	449	aips2: bus@30400000 {
450	compatible = "fsl,aips-bus", "simple-bus";	450	compatible = "fsl,aips-bus", "simple-bus";
451	reg = <0x305f0000 0x10000>;	451	reg = <0x30400000 0x400000>;
452	#address-cells = <1>;	452	#address-cells = <1>;
453	#size-cells = <1>;	453	#size-cells = <1>;
454	ranges;	454	ranges;
@@ -508,7 +508,7 @@ · 53 unmodified lines
508		508
509	aips3: bus@30800000 {	509	aips3: bus@30800000 {
510	compatible = "fsl,aips-bus", "simple-bus";	510	compatible = "fsl,aips-bus", "simple-bus";
511	reg = <0x309f0000 0x10000>;	511	reg = <0x30800000 0x400000>;
512	#address-cells = <1>;	512	#address-cells = <1>;
513	#size-cells = <1>;	513	#size-cells = <1>;
514	ranges;	514	ranges;
@@ -718,7 +718,7 @@ · 203 unmodified lines
718	reg = <0x30bd0000 0x10000>;	718	reg = <0x30bd0000 0x10000>;
719	interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;	719	interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
720	clocks = <&clk IMX8MN_CLK_SDMA1_ROOT>,	720	clocks = <&clk IMX8MN_CLK_SDMA1_ROOT>,
721	<&clk IMX8MN_CLK_SDMA1_ROOT>;	721	<&clk IMX8MN_CLK_AHB>;
722	clock-names = "ipg", "ahb";	722	clock-names = "ipg", "ahb";
723	#dma-cells = <3>;	723	#dma-cells = <3>;
724	fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";	724	fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
@@ -754,7 +754,7 @@ · 29 unmodified lines
754		754
755	aips4: bus@32c00000 {	755	aips4: bus@32c00000 {
756	compatible = "fsl,aips-bus", "simple-bus";	756	compatible = "fsl,aips-bus", "simple-bus";
757	reg = <0x32df0000 0x10000>;	757	reg = <0x32c00000 0x400000>;
758	#address-cells = <1>;	758	#address-cells = <1>;
759	#size-cells = <1>;	759	#size-cells = <1>;
760	ranges;	760	ranges;

arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h+23−23

arch/arm64/boot/dts/freescale/imx8mp.dtsi+3−3

@@ -145,7 +145,7 @@ · 144 unmodified lines
145		145
146	aips1: bus@30000000 {	146	aips1: bus@30000000 {
147	compatible = "fsl,aips-bus", "simple-bus";	147	compatible = "fsl,aips-bus", "simple-bus";
148	reg = <0x301f0000 0x10000>;	148	reg = <0x30000000 0x400000>;
149	#address-cells = <1>;	149	#address-cells = <1>;
150	#size-cells = <1>;	150	#size-cells = <1>;
151	ranges;	151	ranges;
@@ -318,7 +318,7 @@ · 166 unmodified lines
318		318
319	aips2: bus@30400000 {	319	aips2: bus@30400000 {
320	compatible = "fsl,aips-bus", "simple-bus";	320	compatible = "fsl,aips-bus", "simple-bus";
321	reg = <0x305f0000 0x400000>;	321	reg = <0x30400000 0x400000>;
322	#address-cells = <1>;	322	#address-cells = <1>;
323	#size-cells = <1>;	323	#size-cells = <1>;
324	ranges;	324	ranges;
@@ -378,7 +378,7 @@ · 53 unmodified lines
378		378
379	aips3: bus@30800000 {	379	aips3: bus@30800000 {
380	compatible = "fsl,aips-bus", "simple-bus";	380	compatible = "fsl,aips-bus", "simple-bus";
381	reg = <0x309f0000 0x400000>;	381	reg = <0x30800000 0x400000>;
382	#address-cells = <1>;	382	#address-cells = <1>;
383	#size-cells = <1>;	383	#size-cells = <1>;
384	ranges;	384	ranges;

arch/arm64/boot/dts/freescale/imx8mq.dtsi+4−4

@@ -291,7 +291,7 @@ · 290 unmodified lines
291		291
292	bus@30000000 { /* AIPS1 */	292	bus@30000000 { /* AIPS1 */
293	compatible = "fsl,aips-bus", "simple-bus";	293	compatible = "fsl,aips-bus", "simple-bus";
294	reg = <0x301f0000 0x10000>;	294	reg = <0x30000000 0x400000>;
295	#address-cells = <1>;	295	#address-cells = <1>;
296	#size-cells = <1>;	296	#size-cells = <1>;
297	ranges = <0x30000000 0x30000000 0x400000>;	297	ranges = <0x30000000 0x30000000 0x400000>;
@@ -696,7 +696,7 @@ · 398 unmodified lines
696		696
697	bus@30400000 { /* AIPS2 */	697	bus@30400000 { /* AIPS2 */
698	compatible = "fsl,aips-bus", "simple-bus";	698	compatible = "fsl,aips-bus", "simple-bus";
699	reg = <0x305f0000 0x10000>;	699	reg = <0x30400000 0x400000>;
700	#address-cells = <1>;	700	#address-cells = <1>;
701	#size-cells = <1>;	701	#size-cells = <1>;
702	ranges = <0x30400000 0x30400000 0x400000>;	702	ranges = <0x30400000 0x30400000 0x400000>;
@@ -756,7 +756,7 @@ · 53 unmodified lines
756		756
757	bus@30800000 { /* AIPS3 */	757	bus@30800000 { /* AIPS3 */
758	compatible = "fsl,aips-bus", "simple-bus";	758	compatible = "fsl,aips-bus", "simple-bus";
759	reg = <0x309f0000 0x10000>;	759	reg = <0x30800000 0x400000>;
760	#address-cells = <1>;	760	#address-cells = <1>;
761	#size-cells = <1>;	761	#size-cells = <1>;
762	ranges = <0x30800000 0x30800000 0x400000>,	762	ranges = <0x30800000 0x30800000 0x400000>,
@@ -1029,7 +1029,7 @@ · 266 unmodified lines
1029		1029
1030	bus@32c00000 { /* AIPS4 */	1030	bus@32c00000 { /* AIPS4 */
1031	compatible = "fsl,aips-bus", "simple-bus";	1031	compatible = "fsl,aips-bus", "simple-bus";
1032	reg = <0x32df0000 0x10000>;	1032	reg = <0x32c00000 0x400000>;
1033	#address-cells = <1>;	1033	#address-cells = <1>;
1034	#size-cells = <1>;	1034	#size-cells = <1>;
1035	ranges = <0x32c00000 0x32c00000 0x400000>;	1035	ranges = <0x32c00000 0x32c00000 0x400000>;

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi+20−3

 	s11 {
 		qcom,saw-leader;
 		regulator-always-on;
-		regulator-min-microvolt = <1230000>;
+		regulator-min-microvolt = <980000>;
-		regulator-max-microvolt = <1230000>;
+		regulator-max-microvolt = <980000>;
 	};
 };
 	status = "okay";
 };
+&q6asmdai {
+	dai@0 {
+		reg = <0>;
+	};
+	dai@1 {
+		reg = <1>;
+	};
+	dai@2 {
+		reg = <2>;
+	};
+};
 &sound {
 	compatible = "qcom,apq8096-sndcard";
 	model = "DB820c";
-	audio-routing =	"RX_BIAS", "MCLK";
+	audio-routing =	"RX_BIAS", "MCLK",
+		"MM_DL1",  "MultiMedia1 Playback",
+		"MM_DL2",  "MultiMedia2 Playback",
+		"MultiMedia3 Capture", "MM_UL3";
 	mm1-dai-link {
 		link-name = "MultiMedia1";

arch/arm64/boot/dts/qcom/msm8996.dtsi+2−0

 						reg = <APR_SVC_ASM>;
 						q6asmdai: dais {
 							compatible = "qcom,q6asm-dais";
+							#address-cells = <1>;
+							#size-cells = <0>;
 							#sound-dai-cells = <1>;
 							iommus = <&lpass_q6_smmu 1>;
 						};

arch/arm64/boot/dts/qcom/sdm845-db845c.dts+0−3

 &q6asmdai {
 	dai@0 {
 		reg = <0>;
-		direction = <2>;
 	};
 	dai@1 {
 		reg = <1>;
-		direction = <2>;
 	};
 	dai@2 {
 		reg = <2>;
-		direction = <1>;
 	};
 	dai@3 {

arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts+0−2

 &q6asmdai {
 	dai@0 {
 		reg = <0>;
-		direction = <2>;
 	};
 	dai@1 {
 		reg = <1>;
-		direction = <1>;
 	};
 };

arch/arm64/boot/dts/renesas/r8a77970-eagle.dts+0−2

@@ -137,8 +137,6 @@ · 136 unmodified lines
137	adi,input-depth = <8>;	137	adi,input-depth = <8>;
138	adi,input-colorspace = "rgb";	138	adi,input-colorspace = "rgb";
139	adi,input-clock = "1x";	139	adi,input-clock = "1x";
140	adi,input-style = <1>;
141	adi,input-justification = "evenly";
142		140
143	ports {	141	ports {
144	#address-cells = <1>;	142	#address-cells = <1>;

arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts+0−2

@@ -150,8 +150,6 @@ · 149 unmodified lines
150	adi,input-depth = <8>;	150	adi,input-depth = <8>;
151	adi,input-colorspace = "rgb";	151	adi,input-colorspace = "rgb";
152	adi,input-clock = "1x";	152	adi,input-clock = "1x";
153	adi,input-style = <1>;
154	adi,input-justification = "evenly";
155		153
156	ports {	154	ports {
157	#address-cells = <1>;	155	#address-cells = <1>;

arch/arm64/boot/dts/renesas/r8a77980-condor.dts+0−2

@@ -174,8 +174,6 @@ · 173 unmodified lines
174	adi,input-depth = <8>;	174	adi,input-depth = <8>;
175	adi,input-colorspace = "rgb";	175	adi,input-colorspace = "rgb";
176	adi,input-clock = "1x";	176	adi,input-clock = "1x";
177	adi,input-style = <1>;
178	adi,input-justification = "evenly";
179		177
180	ports {	178	ports {
181	#address-cells = <1>;	179	#address-cells = <1>;

arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts+0−2

@@ -141,8 +141,6 @@ · 140 unmodified lines
141	adi,input-depth = <8>;	141	adi,input-depth = <8>;
142	adi,input-colorspace = "rgb";	142	adi,input-colorspace = "rgb";
143	adi,input-clock = "1x";	143	adi,input-clock = "1x";
144	adi,input-style = <1>;
145	adi,input-justification = "evenly";
146		144
147	ports {	145	ports {
148	#address-cells = <1>;	146	#address-cells = <1>;

arch/arm64/boot/dts/renesas/r8a77980.dtsi+2−0

 		ipmmu_vip0: mmu@e7b00000 {
 			compatible = "renesas,ipmmu-r8a77980";
 			reg = <0 0xe7b00000 0 0x1000>;
+			renesas,ipmmu-main = <&ipmmu_mm 4>;
 			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
 			#iommu-cells = <1>;
 		};
 		ipmmu_vip1: mmu@e7960000 {
 			compatible = "renesas,ipmmu-r8a77980";
 			reg = <0 0xe7960000 0 0x1000>;
+			renesas,ipmmu-main = <&ipmmu_mm 11>;
 			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
 			#iommu-cells = <1>;
 		};

arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts+0−2

@@ -360,8 +360,6 @@ · 359 unmodified lines
360	adi,input-depth = <8>;	360	adi,input-depth = <8>;
361	adi,input-colorspace = "rgb";	361	adi,input-colorspace = "rgb";
362	adi,input-clock = "1x";	362	adi,input-clock = "1x";
363	adi,input-style = <1>;
364	adi,input-justification = "evenly";
365		363
366	ports {	364	ports {
367	#address-cells = <1>;	365	#address-cells = <1>;

arch/arm64/boot/dts/renesas/r8a77995-draak.dts+2−4

 	hdmi-encoder@39 {
 		compatible = "adi,adv7511w";
-		reg = <0x39>, <0x3f>, <0x38>, <0x3c>;
+		reg = <0x39>, <0x3f>, <0x3c>, <0x38>;
-		reg-names = "main", "edid", "packet", "cec";
+		reg-names = "main", "edid", "cec", "packet";
 		interrupt-parent = <&gpio1>;
 		interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
 		adi,input-depth = <8>;
 		adi,input-colorspace = "rgb";
 		adi,input-clock = "1x";
-		adi,input-style = <1>;
-		adi,input-justification = "evenly";
 		ports {
 			#address-cells = <1>;

arch/arm64/boot/dts/rockchip/px30.dtsi+1−1

@@ -143,7 +143,7 @@ · 142 unmodified lines
143	};	143	};
144		144
145	arm-pmu {	145	arm-pmu {
146	compatible = "arm,cortex-a53-pmu";	146	compatible = "arm,cortex-a35-pmu";
147	interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,	147	interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
148	<GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,	148	<GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
149	<GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,	149	<GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/rockchip/rk3308.dtsi+1−1

@@ -127,7 +127,7 @@ · 126 unmodified lines
127	};	127	};
128		128
129	arm-pmu {	129	arm-pmu {
130	compatible = "arm,cortex-a53-pmu";	130	compatible = "arm,cortex-a35-pmu";
131	interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>,	131	interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>,
132	<GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,	132	<GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
133	<GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,	133	<GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/rockchip/rk3328-evb.dts+2−3

@@ -82,17 +82,16 @@ · 81 unmodified lines
82	&gmac2phy {	82	&gmac2phy {
83	phy-supply = <&vcc_phy>;	83	phy-supply = <&vcc_phy>;
84	clock_in_out = "output";	84	clock_in_out = "output";
85	assigned-clocks = <&cru SCLK_MAC2PHY_SRC>;
86	assigned-clock-rate = <50000000>;	85	assigned-clock-rate = <50000000>;
87	assigned-clocks = <&cru SCLK_MAC2PHY>;	86	assigned-clocks = <&cru SCLK_MAC2PHY>;
88	assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>;	87	assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>;
89		88	status = "okay";
90	};	89	};
91		90
92	&i2c1 {	91	&i2c1 {
93	status = "okay";	92	status = "okay";
94		93
95	rk805: rk805@18 {	94	rk805: pmic@18 {
96	compatible = "rockchip,rk805";	95	compatible = "rockchip,rk805";
97	reg = <0x18>;	96	reg = <0x18>;
98	interrupt-parent = <&gpio2>;	97	interrupt-parent = <&gpio2>;

arch/arm64/boot/dts/rockchip/rk3328-rock64.dts+1−1

@@ -170,7 +170,7 @@ · 169 unmodified lines
170	&i2c1 {	170	&i2c1 {
171	status = "okay";	171	status = "okay";
172		172
173	rk805: rk805@18 {	173	rk805: pmic@18 {
174	compatible = "rockchip,rk805";	174	compatible = "rockchip,rk805";
175	reg = <0x18>;	175	reg = <0x18>;
176	interrupt-parent = <&gpio2>;	176	interrupt-parent = <&gpio2>;

arch/arm64/boot/dts/rockchip/rk3328.dtsi+0−18

 	grf: syscon@ff100000 {
 		compatible = "rockchip,rk3328-grf", "syscon", "simple-mfd";
 		reg = <0x0 0xff100000 0x0 0x1000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 		io_domains: io-domains {
 			compatible = "rockchip,rk3328-io-voltage-domain";
 		};
 		gmac2phy {
-			fephyled_speed100: fephyled-speed100 {
-				rockchip,pins = <0 RK_PD7 1 &pcfg_pull_none>;
-			};
 			fephyled_speed10: fephyled-speed10 {
 				rockchip,pins = <0 RK_PD6 1 &pcfg_pull_none>;
 			};
 				rockchip,pins = <0 RK_PD6 2 &pcfg_pull_none>;
 			};
-			fephyled_rxm0: fephyled-rxm0 {
-				rockchip,pins = <0 RK_PD5 1 &pcfg_pull_none>;
-			};
-			fephyled_txm0: fephyled-txm0 {
-				rockchip,pins = <0 RK_PD5 2 &pcfg_pull_none>;
-			};
-			fephyled_linkm0: fephyled-linkm0 {
-				rockchip,pins = <0 RK_PD4 1 &pcfg_pull_none>;
-			};
 			fephyled_rxm1: fephyled-rxm1 {
 				rockchip,pins = <2 RK_PD1 2 &pcfg_pull_none>;
 			};

arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts+5−4

 			"Speaker", "Speaker Amplifier OUTL",
 			"Speaker", "Speaker Amplifier OUTR";
-		simple-audio-card,hp-det-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_LOW>;
+		simple-audio-card,hp-det-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
 		simple-audio-card,aux-devs = <&speaker_amp>;
 		simple-audio-card,pin-switches = "Speaker";
 	fusb0: fusb30x@22 {
 		compatible = "fcs,fusb302";
 		reg = <0x22>;
-		fcs,int_n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
+		interrupt-parent = <&gpio1>;
+		interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&fusb0_int_gpio>;
 		vbus-supply = <&vbus_typec>;
 	dc-charger {
 		dc_det_gpio: dc-det-gpio {
-			rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
+			rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 	es8316 {
 		hp_det_gpio: hp-det-gpio {
-			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};

arch/arm64/boot/dts/rockchip/rk3399.dtsi+6−8

 		reset-names = "usb3-otg";
 		status = "disabled";
-		usbdrd_dwc3_0: dwc3 {
+		usbdrd_dwc3_0: usb@fe800000 {
 			compatible = "snps,dwc3";
 			reg = <0x0 0xfe800000 0x0 0x100000>;
 			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH 0>;
 		reset-names = "usb3-otg";
 		status = "disabled";
-		usbdrd_dwc3_1: dwc3 {
+		usbdrd_dwc3_1: usb@fe900000 {
 			compatible = "snps,dwc3";
 			reg = <0x0 0xfe900000 0x0 0x100000>;
 			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH 0>;
 	pmugrf: syscon@ff320000 {
 		compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd";
 		reg = <0x0 0xff320000 0x0 0x1000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 		pmu_io_domains: io-domains {
 			compatible = "rockchip,rk3399-pmu-io-voltage-domain";
 	gpu: gpu@ff9a0000 {
 		compatible = "rockchip,rk3399-mali", "arm,mali-t860";
 		reg = <0x0 0xff9a0000 0x0 0x10000>;
-		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH 0>,
+		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH 0>,
-			     <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH 0>,
+			     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH 0>,
-			     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH 0>;
+			     <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH 0>;
-		interrupt-names = "gpu", "job", "mmu";
+		interrupt-names = "job", "mmu", "gpu";
 		clocks = <&cru ACLK_GPU>;
 		#cooling-cells = <2>;
 		power-domains = <&power RK3399_PD_GPU>;

arch/arm64/configs/defconfig+6−3

 CONFIG_PCIE_ARMADA_8K=y
 CONFIG_PCIE_KIRIN=y
 CONFIG_PCIE_HISI_STB=y
-CONFIG_PCIE_TEGRA194=m
+CONFIG_PCIE_TEGRA194_HOST=m
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_FW_LOADER_USER_HELPER=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
 # CONFIG_DVB_NET is not set
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_DUMB_VGA_DAC=m
+CONFIG_DRM_SIMPLE_BRIDGE=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_SII902X=m
 CONFIG_DRM_THINE_THC63LVD1024=m
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_ARCH_R8A774A1=y
 CONFIG_ARCH_R8A774B1=y
 CONFIG_ARCH_R8A774C0=y
-CONFIG_ARCH_R8A7795=y
+CONFIG_ARCH_R8A77950=y
+CONFIG_ARCH_R8A77951=y
 CONFIG_ARCH_R8A77960=y
 CONFIG_ARCH_R8A77961=y
 CONFIG_ARCH_R8A77965=y

arch/arm64/include/asm/uaccess.h+1−1

@@ -304,7 +304,7 @@ do { \ · 303 unmodified lines
304	__p = uaccess_mask_ptr(__p); \	304	__p = uaccess_mask_ptr(__p); \
305	__raw_get_user((x), __p, (err)); \	305	__raw_get_user((x), __p, (err)); \
306	} else { \	306	} else { \
307	(x) = 0; (err) = -EFAULT; \	307	(x) = (__force __typeof__(x))0; (err) = -EFAULT; \
308	} \	308	} \
309	} while (0)	309	} while (0)
310		310

arch/arm64/kernel/machine_kexec.c+1−0

@@ -177,6 +177,7 @@ void machine_kexec(struct kimage *kimage) · 176 unmodified lines
177	* the offline CPUs. Therefore, we must use the __* variant here.	177	* the offline CPUs. Therefore, we must use the __* variant here.
178	*/	178	*/
179	__flush_icache_range((uintptr_t)reboot_code_buffer,	179	__flush_icache_range((uintptr_t)reboot_code_buffer,
		180	(uintptr_t)reboot_code_buffer +
180	arm64_relocate_new_kernel_size);	181	arm64_relocate_new_kernel_size);
181		182
182	/* Flush the kimage list and its buffers. */	183	/* Flush the kimage list and its buffers. */

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

@@ -1829,10 +1829,11 @@ static void tracehook_report_syscall(struct pt_regs *regs, · 1828 unmodified lines
1829		1829
1830	int syscall_trace_enter(struct pt_regs *regs)	1830	int syscall_trace_enter(struct pt_regs *regs)
1831	{	1831	{
1832	if (test_thread_flag(TIF_SYSCALL_TRACE) \|\|	1832	unsigned long flags = READ_ONCE(current_thread_info()->flags);
1833	test_thread_flag(TIF_SYSCALL_EMU)) {	1833
		1834	if (flags & (_TIF_SYSCALL_EMU \| _TIF_SYSCALL_TRACE)) {
1834	tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);	1835	tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);
1835	if (!in_syscall(regs) \|\| test_thread_flag(TIF_SYSCALL_EMU))	1836	if (!in_syscall(regs) \|\| (flags & _TIF_SYSCALL_EMU))
1836	return -1;	1837	return -1;
1837	}	1838	}
1838		1839

arch/csky/Kconfig+2−0

 	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
 	select ARCH_USE_BUILTIN_BSWAP
 	select ARCH_USE_QUEUED_RWLOCKS if NR_CPUS>2
+	select ARCH_WANT_FRAME_POINTERS if !CPU_CK610
 	select COMMON_CLK
 	select CLKSRC_MMIO
 	select CSKY_MPINTC if CPU_CK860
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_ARCH_AUDITSYSCALL
 	select HAVE_COPY_THREAD_TLS
+	select HAVE_DEBUG_BUGVERBOSE
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_DYNAMIC_FTRACE_WITH_REGS
 	select HAVE_FUNCTION_TRACER

arch/csky/Makefile+1−1

@@ -47,7 +47,7 @@ ifeq ($(CSKYABI),abiv2) · 46 unmodified lines
47	KBUILD_CFLAGS += -mno-stack-size	47	KBUILD_CFLAGS += -mno-stack-size
48	endif	48	endif
49		49
50	ifdef CONFIG_STACKTRACE	50	ifdef CONFIG_FRAME_POINTER
51	KBUILD_CFLAGS += -mbacktrace	51	KBUILD_CFLAGS += -mbacktrace
52	endif	52	endif
53		53

arch/csky/abiv1/inc/abi/entry.h+2−2

@@ -167,8 +167,8 @@ · 166 unmodified lines
167	* BA Reserved C D V	167	* BA Reserved C D V
168	*/	168	*/
169	cprcr r6, cpcr30	169	cprcr r6, cpcr30
170	lsri r6, 28	170	lsri r6, 29
171	lsli r6, 28	171	lsli r6, 29
172	addi r6, 0xe	172	addi r6, 0xe
173	cpwcr r6, cpcr30	173	cpwcr r6, cpcr30
174		174

arch/csky/abiv2/inc/abi/entry.h+2−2

@@ -285,8 +285,8 @@ · 284 unmodified lines
285	*/	285	*/
286	mfcr r6, cr<30, 15> /* Get MSA0 */	286	mfcr r6, cr<30, 15> /* Get MSA0 */
287	2:	287	2:
288	lsri r6, 28	288	lsri r6, 29
289	lsli r6, 28	289	lsli r6, 29
290	addi r6, 0x1ce	290	addi r6, 0x1ce
291	mtcr r6, cr<30, 15> /* Set MSA0 */	291	mtcr r6, cr<30, 15> /* Set MSA0 */
292		292

arch/csky/abiv2/mcount.S+2−0

@@ -103,6 +103,8 @@ ENTRY(_mcount) · 102 unmodified lines
103	mov a0, lr	103	mov a0, lr
104	subi a0, 4	104	subi a0, 4
105	ldw a1, (sp, 24)	105	ldw a1, (sp, 24)
		106	lrw a2, function_trace_op
		107	ldw a2, (a2, 0)
106		108
107	jsr r26	109	jsr r26
108		110

arch/csky/include/asm/processor.h+2−4

 #define TASK_UNMAPPED_BASE      (TASK_SIZE / 3)
 struct thread_struct {
-	unsigned long  ksp;       /* kernel stack pointer */
+	unsigned long  sp;        /* kernel stack pointer */
-	unsigned long  sr;        /* saved status register */
 	unsigned long  trap_no;   /* saved status register */
 	/* FPU regs */
 };
 #define INIT_THREAD  { \
-	.ksp = sizeof(init_stack) + (unsigned long) &init_stack, \
+	.sp = sizeof(init_stack) + (unsigned long) &init_stack, \
-	.sr = DEFAULT_PSR_VALUE, \
 }
 /*

arch/csky/include/asm/ptrace.h+10−0

@@ -58,6 +58,16 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs) · 57 unmodified lines
58	return regs->usp;	58	return regs->usp;
59	}	59	}
60		60
		61	static inline unsigned long frame_pointer(struct pt_regs *regs)
		62	{
		63	return regs->regs[4];
		64	}
		65	static inline void frame_pointer_set(struct pt_regs *regs,
		66	unsigned long val)
		67	{
		68	regs->regs[4] = val;
		69	}
		70
61	extern int regs_query_register_offset(const char *name);	71	extern int regs_query_register_offset(const char *name);
62	extern unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs,	72	extern unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs,
63	unsigned int n);	73	unsigned int n);

arch/csky/include/asm/thread_info.h+11−5

 #define THREAD_SIZE_ORDER (THREAD_SHIFT - PAGE_SHIFT)
 #define thread_saved_fp(tsk) \
-	((unsigned long)(((struct switch_stack *)(tsk->thread.ksp))->r8))
+	((unsigned long)(((struct switch_stack *)(tsk->thread.sp))->r8))
+#define thread_saved_sp(tsk) \
+	((unsigned long)(tsk->thread.sp))
+#define thread_saved_lr(tsk) \
+	((unsigned long)(((struct switch_stack *)(tsk->thread.sp))->r15))
 static inline struct thread_info *current_thread_info(void)
 {
 #define TIF_SIGPENDING		0	/* signal pending */
 #define TIF_NOTIFY_RESUME	1       /* callback before returning to user */
 #define TIF_NEED_RESCHED	2	/* rescheduling necessary */
-#define TIF_SYSCALL_TRACE	3	/* syscall trace active */
+#define TIF_UPROBE		3	/* uprobe breakpoint or singlestep */
-#define TIF_SYSCALL_TRACEPOINT	4       /* syscall tracepoint instrumentation */
+#define TIF_SYSCALL_TRACE	4	/* syscall trace active */
-#define TIF_SYSCALL_AUDIT	5	/* syscall auditing */
+#define TIF_SYSCALL_TRACEPOINT	5       /* syscall tracepoint instrumentation */
-#define TIF_UPROBE		6	/* uprobe breakpoint or singlestep */
+#define TIF_SYSCALL_AUDIT	6	/* syscall auditing */
 #define TIF_POLLING_NRFLAG	16	/* poll_idle() is TIF_NEED_RESCHED */
 #define TIF_MEMDIE		18      /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK	20	/* restore signal mask in do_signal() */

arch/csky/include/asm/uaccess.h+26−23

 extern int __get_user_bad(void);
-#define __copy_user(to, from, n)			\
+#define ___copy_to_user(to, from, n)			\
 do {							\
 	int w0, w1, w2, w3;				\
 	asm volatile(					\
 	"       subi    %0, 4           \n"		\
 	"       br      3b              \n"		\
 	"5:     cmpnei  %0, 0           \n"  /* 1B */   \
-	"       bf      8f              \n"		\
+	"       bf      13f             \n"		\
 	"       ldb     %3, (%2, 0)     \n"		\
 	"6:     stb     %3, (%1, 0)     \n"		\
 	"       addi    %2,  1          \n"		\
 	"       addi    %1,  1          \n"		\
 	"       subi    %0,  1          \n"		\
 	"       br      5b              \n"		\
-	"7:     br      8f              \n"		\
+	"7:     subi	%0,  4          \n"		\
+	"8:     subi	%0,  4          \n"		\
+	"12:    subi	%0,  4          \n"		\
+	"       br      13f             \n"		\
 	".section __ex_table, \"a\"     \n"		\
 	".align   2                     \n"		\
-	".long    2b, 7b                \n"		\
+	".long    2b, 13f               \n"		\
-	".long    9b, 7b                \n"		\
+	".long    4b, 13f               \n"		\
-	".long   10b, 7b                \n"		\
+	".long    6b, 13f               \n"		\
+	".long    9b, 12b               \n"		\
+	".long   10b, 8b                \n"		\
 	".long   11b, 7b                \n"		\
-	".long    4b, 7b                \n"		\
-	".long    6b, 7b                \n"		\
 	".previous                      \n"		\
-	"8:                             \n"		\
+	"13:                            \n"		\
 	: "=r"(n), "=r"(to), "=r"(from), "=r"(w0),	\
 	  "=r"(w1), "=r"(w2), "=r"(w3)			\
 	: "0"(n), "1"(to), "2"(from)			\
 	: "memory");					\
 } while (0)
-#define __copy_user_zeroing(to, from, n)		\
+#define ___copy_from_user(to, from, n)			\
 do {							\
 	int tmp;					\
 	int nsave;					\
 	"       addi    %1,  1          \n"		\
 	"       subi    %0,  1          \n"		\
 	"       br      5b              \n"		\
-	"8:     mov     %3, %0          \n"		\
+	"8:     stw     %3, (%1, 0)     \n"		\
-	"       movi    %4, 0           \n"		\
+	"       subi    %0, 4           \n"		\
-	"9:     stb     %4, (%1, 0)     \n"		\
+	"       bf      7f              \n"		\
-	"       addi    %1, 1           \n"		\
+	"9:     subi    %0, 8           \n"		\
-	"       subi    %3, 1           \n"		\
+	"       bf      7f              \n"		\
-	"       cmpnei  %3, 0           \n"		\
+	"13:    stw     %3, (%1, 8)     \n"		\
-	"       bt      9b              \n"		\
+	"       subi    %0, 12          \n"		\
-	"       br      7f              \n"		\
+	"       bf      7f              \n"		\
 	".section __ex_table, \"a\"     \n"		\
 	".align   2                     \n"		\
-	".long    2b, 8b                \n"		\
+	".long    2b, 7f                \n"		\
+	".long    4b, 7f                \n"		\
+	".long    6b, 7f                \n"		\
 	".long   10b, 8b                \n"		\
-	".long   11b, 8b                \n"		\
+	".long   11b, 9b                \n"		\
-	".long   12b, 8b                \n"		\
+	".long   12b,13b                \n"		\
-	".long    4b, 8b                \n"		\
-	".long    6b, 8b                \n"		\
 	".previous                      \n"		\
 	"7:                             \n"		\
 	: "=r"(n), "=r"(to), "=r"(from), "=r"(nsave),	\

arch/csky/kernel/Makefile+1−1

@@ -3,7 +3,7 @@ extra-y := head.o vmlinux.lds · 2 unmodified lines
3		3
4	obj-y += entry.o atomic.o signal.o traps.o irq.o time.o vdso.o	4	obj-y += entry.o atomic.o signal.o traps.o irq.o time.o vdso.o
5	obj-y += power.o syscall.o syscall_table.o setup.o	5	obj-y += power.o syscall.o syscall_table.o setup.o
6	obj-y += process.o cpu-probe.o ptrace.o dumpstack.o	6	obj-y += process.o cpu-probe.o ptrace.o stacktrace.o
7	obj-y += probes/	7	obj-y += probes/
8		8
9	obj-$(CONFIG_MODULES) += module.o	9	obj-$(CONFIG_MODULES) += module.o

arch/csky/kernel/asm-offsets.c+1−2

@@ -18,8 +18,7 @@ int main(void) · 17 unmodified lines
18	DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));	18	DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));
19		19
20	/* offsets into the thread struct */	20	/* offsets into the thread struct */
21	DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp));	21	DEFINE(THREAD_KSP, offsetof(struct thread_struct, sp));
22	DEFINE(THREAD_SR, offsetof(struct thread_struct, sr));
23	DEFINE(THREAD_FESR, offsetof(struct thread_struct, user_fp.fesr));	22	DEFINE(THREAD_FESR, offsetof(struct thread_struct, user_fp.fesr));
24	DEFINE(THREAD_FCR, offsetof(struct thread_struct, user_fp.fcr));	23	DEFINE(THREAD_FCR, offsetof(struct thread_struct, user_fp.fcr));
25	DEFINE(THREAD_FPREG, offsetof(struct thread_struct, user_fp.vr));	24	DEFINE(THREAD_FPREG, offsetof(struct thread_struct, user_fp.vr));

arch/csky/kernel/dumpstack.c+0−49

@@ -1,49 +0,0 @@
1	// SPDX-License-Identifier: GPL-2.0
2	// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.
3
4	#include <linux/ptrace.h>
5
6	int kstack_depth_to_print = 48;
7
8	void show_trace(unsigned long *stack)
9	{
10	unsigned long *stack_end;
11	unsigned long *stack_start;
12	unsigned long *fp;
13	unsigned long addr;
14
15	addr = (unsigned long) stack & THREAD_MASK;
16	stack_start = (unsigned long *) addr;
17	stack_end = (unsigned long *) (addr + THREAD_SIZE);
18
19	fp = stack;
20	pr_info("\nCall Trace:");
21
22	while (fp > stack_start && fp < stack_end) {
23	#ifdef CONFIG_STACKTRACE
24	addr = fp[1];
25	fp = (unsigned long *) fp[0];
26	#else
27	addr = *fp++;
28	#endif
29	if (__kernel_text_address(addr))
30	pr_cont("\n[<%08lx>] %pS", addr, (void *)addr);
31	}
32	pr_cont("\n");
33	}
34
35	void show_stack(struct task_struct task, unsigned long stack)
36	{
37	if (!stack) {
38	if (task)
39	stack = (unsigned long *)thread_saved_fp(task);
40	else
41	#ifdef CONFIG_STACKTRACE
42	asm volatile("mov %0, r8\n":"=r"(stack)::"memory");
43	#else
44	stack = (unsigned long *)&stack;
45	#endif
46	}
47
48	show_trace(stack);
49	}

arch/csky/kernel/entry.S+2−10

 	lrw	a3, TASK_THREAD
 	addu	a3, a0
-	mfcr	a2, psr			/* Save PSR value */
-	stw	a2, (a3, THREAD_SR)	/* Save PSR in task struct */
-	bclri	a2, 6			/* Disable interrupts */
-	mtcr	a2, psr
 	SAVE_SWITCH_STACK
 	stw	sp, (a3, THREAD_KSP)
 	ldw	sp, (a3, THREAD_KSP)	/* Set next kernel sp */
-	ldw	a2, (a3, THREAD_SR)	/* Set next PSR */
-	mtcr	a2, psr
 #if  defined(__CSKYABIV2__)
-	addi	r7, a1, TASK_THREAD_INFO
+	addi	a3, a1, TASK_THREAD_INFO
-	ldw	tls, (r7, TINFO_TP_VALUE)
+	ldw	tls, (a3, TINFO_TP_VALUE)
 #endif
 	RESTORE_SWITCH_STACK

arch/csky/kernel/ftrace.c+2−0

 #endif /* CONFIG_DYNAMIC_FTRACE */
 #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
+#ifdef CONFIG_DYNAMIC_FTRACE
 #ifndef CONFIG_CPU_HAS_ICACHE_INS
 struct ftrace_modify_param {
 	int command;
 	stop_machine(__ftrace_modify_code, &param, cpu_online_mask);
 }
 #endif
+#endif /* CONFIG_DYNAMIC_FTRACE */
 /* _mcount is defined in abi's mcount.S */
 EXPORT_SYMBOL(_mcount);

arch/csky/kernel/perf_callchain.c+7−2

@@ -12,12 +12,17 @@ struct stackframe { · 11 unmodified lines
12		12
13	static int unwind_frame_kernel(struct stackframe *frame)	13	static int unwind_frame_kernel(struct stackframe *frame)
14	{	14	{
15	if (kstack_end((void *)frame->fp))	15	unsigned long low = (unsigned long)task_stack_page(current);
		16	unsigned long high = low + THREAD_SIZE;
		17
		18	if (unlikely(frame->fp < low \|\| frame->fp > high))
16	return -EPERM;	19	return -EPERM;
17	if (frame->fp & 0x3 \|\| frame->fp < TASK_SIZE)	20
		21	if (kstack_end((void *)frame->fp) \|\| frame->fp & 0x3)
18	return -EPERM;	22	return -EPERM;
19		23
20	frame = (struct stackframe *)frame->fp;	24	frame = (struct stackframe *)frame->fp;
		25
21	if (__kernel_text_address(frame->lr)) {	26	if (__kernel_text_address(frame->lr)) {
22	int graph = 0;	27	int graph = 0;
23		28

arch/csky/kernel/probes/uprobes.c+5−0

 #define UPROBE_TRAP_NR	UINT_MAX
+bool is_swbp_insn(uprobe_opcode_t *insn)
+{
+	return (*insn & 0xffff) == UPROBE_SWBP_INSN;
+}
 unsigned long uprobe_get_swbp_addr(struct pt_regs *regs)
 {
 	return instruction_pointer(regs);

arch/csky/kernel/process.c+3−34

@@ -35,7 +35,7 @@ void flush_thread(void){} · 34 unmodified lines
35	*/	35	*/
36	unsigned long thread_saved_pc(struct task_struct *tsk)	36	unsigned long thread_saved_pc(struct task_struct *tsk)
37	{	37	{
38	struct switch_stack sw = (struct switch_stack )tsk->thread.ksp;	38	struct switch_stack sw = (struct switch_stack )tsk->thread.sp;
39		39
40	return sw->r15;	40	return sw->r15;
41	}	41	}
@@ -56,8 +56,8 @@ int copy_thread_tls(unsigned long clone_flags, · 14 unmodified lines
56	childstack = ((struct switch_stack *) childregs) - 1;	56	childstack = ((struct switch_stack *) childregs) - 1;
57	memset(childstack, 0, sizeof(struct switch_stack));	57	memset(childstack, 0, sizeof(struct switch_stack));
58		58
59	/* setup ksp for switch_to !!! */	59	/* setup thread.sp for switch_to !!! */
60	p->thread.ksp = (unsigned long)childstack;	60	p->thread.sp = (unsigned long)childstack;
61		61
62	if (unlikely(p->flags & PF_KTHREAD)) {	62	if (unlikely(p->flags & PF_KTHREAD)) {
63	memset(childregs, 0, sizeof(struct pt_regs));	63	memset(childregs, 0, sizeof(struct pt_regs));
@@ -98,37 +98,6 @@ int dump_task_regs(struct task_struct tsk, elf_gregset_t pr_regs) · 34 unmodified lines
98	return 1;	98	return 1;
99	}	99	}
100		100
101	unsigned long get_wchan(struct task_struct *p)
102	{
103	unsigned long lr;
104	unsigned long fp, stack_start, *stack_end;
105	int count = 0;
106
107	if (!p \|\| p == current \|\| p->state == TASK_RUNNING)
108	return 0;
109
110	stack_start = (unsigned long *)end_of_stack(p);
111	stack_end = (unsigned long *)(task_stack_page(p) + THREAD_SIZE);
112
113	fp = (unsigned long *) thread_saved_fp(p);
114	do {
115	if (fp < stack_start \|\| fp > stack_end)
116	return 0;
117	#ifdef CONFIG_STACKTRACE
118	lr = fp[1];
119	fp = (unsigned long *)fp[0];
120	#else
121	lr = *fp++;
122	#endif
123	if (!in_sched_functions(lr) &&
124	__kernel_text_address(lr))
125	return lr;
126	} while (count++ < 16);
127
128	return 0;
129	}
130	EXPORT_SYMBOL(get_wchan);
131
132	#ifndef CONFIG_CPU_PM_NONE	101	#ifndef CONFIG_CPU_PM_NONE
133	void arch_cpu_idle(void)	102	void arch_cpu_idle(void)
134	{	103	{

arch/csky/kernel/ptrace.c+6−0

 	regs = task_pt_regs(tsk);
 	regs->sr = (regs->sr & TRACE_MODE_MASK) | TRACE_MODE_RUN;
+	/* Enable irq */
+	regs->sr |= BIT(6);
 }
 static void singlestep_enable(struct task_struct *tsk)
 	regs = task_pt_regs(tsk);
 	regs->sr = (regs->sr & TRACE_MODE_MASK) | TRACE_MODE_SI;
+	/* Disable irq */
+	regs->sr &= ~BIT(6);
 }
 /*

arch/csky/kernel/stacktrace.c+139−37

@@ -1,57 +1,159 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/* Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. */
3		2
4	#include <linux/sched/debug.h>	3	#include <linux/sched/debug.h>
5	#include <linux/sched/task_stack.h>	4	#include <linux/sched/task_stack.h>
6	#include <linux/stacktrace.h>	5	#include <linux/stacktrace.h>
7	#include <linux/ftrace.h>	6	#include <linux/ftrace.h>
		7	#include <linux/ptrace.h>
8		8
9	void save_stack_trace(struct stack_trace *trace)	9	#ifdef CONFIG_FRAME_POINTER
		10
		11	struct stackframe {
		12	unsigned long fp;
		13	unsigned long ra;
		14	};
		15
		16	void notrace walk_stackframe(struct task_struct task, struct pt_regs regs,
		17	bool (fn)(unsigned long, void ), void *arg)
10	{	18	{
11	save_stack_trace_tsk(current, trace);	19	unsigned long fp, sp, pc;
		20
		21	if (regs) {
		22	fp = frame_pointer(regs);
		23	sp = user_stack_pointer(regs);
		24	pc = instruction_pointer(regs);
		25	} else if (task == NULL \|\| task == current) {
		26	const register unsigned long current_sp __asm__ ("sp");
		27	const register unsigned long current_fp __asm__ ("r8");
		28	fp = current_fp;
		29	sp = current_sp;
		30	pc = (unsigned long)walk_stackframe;
		31	} else {
		32	/* task blocked in __switch_to */
		33	fp = thread_saved_fp(task);
		34	sp = thread_saved_sp(task);
		35	pc = thread_saved_lr(task);
		36	}
		37
		38	for (;;) {
		39	unsigned long low, high;
		40	struct stackframe *frame;
		41
		42	if (unlikely(!__kernel_text_address(pc) \|\| fn(pc, arg)))
		43	break;
		44
		45	/* Validate frame pointer */
		46	low = sp;
		47	high = ALIGN(sp, THREAD_SIZE);
		48	if (unlikely(fp < low \|\| fp > high \|\| fp & 0x3))
		49	break;
		50	/* Unwind stack frame */
		51	frame = (struct stackframe *)fp;
		52	sp = fp;
		53	fp = frame->fp;
		54	pc = ftrace_graph_ret_addr(current, NULL, frame->ra,
		55	(unsigned long *)(fp - 8));
		56	}
12	}	57	}
13	EXPORT_SYMBOL_GPL(save_stack_trace);
14		58
15	void save_stack_trace_tsk(struct task_struct tsk, struct stack_trace trace)	59	#else /* !CONFIG_FRAME_POINTER */
		60
		61	static void notrace walk_stackframe(struct task_struct *task,
		62	struct pt_regs regs, bool (fn)(unsigned long, void ), void arg)
16	{	63	{
17	unsigned long fp, stack_start, *stack_end;	64	unsigned long sp, pc;
18	unsigned long addr;	65	unsigned long *ksp;
19	int skip = trace->skip;
20	int savesched;
21	int graph_idx = 0;
22		66
23	if (tsk == current) {	67	if (regs) {
24	asm volatile("mov %0, r8\n":"=r"(fp));	68	sp = user_stack_pointer(regs);
25	savesched = 1;	69	pc = instruction_pointer(regs);
		70	} else if (task == NULL \|\| task == current) {
		71	const register unsigned long current_sp __asm__ ("sp");
		72	sp = current_sp;
		73	pc = (unsigned long)walk_stackframe;
26	} else {	74	} else {
27	fp = (unsigned long *)thread_saved_fp(tsk);	75	/* task blocked in __switch_to */
28	savesched = 0;	76	sp = thread_saved_sp(task);
		77	pc = thread_saved_lr(task);
29	}	78	}
30		79
31	addr = (unsigned long) fp & THREAD_MASK;	80	if (unlikely(sp & 0x3))
32	stack_start = (unsigned long *) addr;	81	return;
33	stack_end = (unsigned long *) (addr + THREAD_SIZE);
34
35	while (fp > stack_start && fp < stack_end) {
36	unsigned long lpp, fpp;
37		82
38	fpp = fp[0];	83	ksp = (unsigned long *)sp;
39	lpp = fp[1];	84	while (!kstack_end(ksp)) {
40	if (!__kernel_text_address(lpp))	85	if (__kernel_text_address(pc) && unlikely(fn(pc, arg)))
41	break;	86	break;
42	else	87	pc = (*ksp++) - 0x4;
43	lpp = ftrace_graph_ret_addr(tsk, &graph_idx, lpp, NULL);
44
45	if (savesched \|\| !in_sched_functions(lpp)) {
46	if (skip) {
47	skip--;
48	} else {
49	trace->entries[trace->nr_entries++] = lpp;
50	if (trace->nr_entries >= trace->max_entries)
51	break;
52	}
53	}
54	fp = (unsigned long *)fpp;
55	}	88	}
56	}	89	}
		90	#endif /* CONFIG_FRAME_POINTER */
		91
		92	static bool print_trace_address(unsigned long pc, void *arg)
		93	{
		94	print_ip_sym(pc);
		95	return false;
		96	}
		97
		98	void show_stack(struct task_struct task, unsigned long sp)
		99	{
		100	pr_cont("Call Trace:\n");
		101	walk_stackframe(task, NULL, print_trace_address, NULL);
		102	}
		103
		104	static bool save_wchan(unsigned long pc, void *arg)
		105	{
		106	if (!in_sched_functions(pc)) {
		107	unsigned long *p = arg;
		108	*p = pc;
		109	return true;
		110	}
		111	return false;
		112	}
		113
		114	unsigned long get_wchan(struct task_struct *task)
		115	{
		116	unsigned long pc = 0;
		117
		118	if (likely(task && task != current && task->state != TASK_RUNNING))
		119	walk_stackframe(task, NULL, save_wchan, &pc);
		120	return pc;
		121	}
		122
		123	#ifdef CONFIG_STACKTRACE
		124	static bool __save_trace(unsigned long pc, void *arg, bool nosched)
		125	{
		126	struct stack_trace *trace = arg;
		127
		128	if (unlikely(nosched && in_sched_functions(pc)))
		129	return false;
		130	if (unlikely(trace->skip > 0)) {
		131	trace->skip--;
		132	return false;
		133	}
		134
		135	trace->entries[trace->nr_entries++] = pc;
		136	return (trace->nr_entries >= trace->max_entries);
		137	}
		138
		139	static bool save_trace(unsigned long pc, void *arg)
		140	{
		141	return __save_trace(pc, arg, false);
		142	}
		143
		144	/*
		145	* Save stack-backtrace addresses into a stack_trace buffer.
		146	*/
		147	void save_stack_trace_tsk(struct task_struct tsk, struct stack_trace trace)
		148	{
		149	walk_stackframe(tsk, NULL, save_trace, trace);
		150	}
57	EXPORT_SYMBOL_GPL(save_stack_trace_tsk);	151	EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
		152
		153	void save_stack_trace(struct stack_trace *trace)
		154	{
		155	save_stack_trace_tsk(NULL, trace);
		156	}
		157	EXPORT_SYMBOL_GPL(save_stack_trace);
		158
		159	#endif /* CONFIG_STACKTRACE */

arch/csky/lib/usercopy.c+2−6

 unsigned long raw_copy_from_user(void *to, const void *from,
 			unsigned long n)
 {
-	if (access_ok(from, n))
+	___copy_from_user(to, from, n);
-		__copy_user_zeroing(to, from, n);
-	else
-		memset(to, 0, n);
 	return n;
 }
 EXPORT_SYMBOL(raw_copy_from_user);
 unsigned long raw_copy_to_user(void *to, const void *from,
 			unsigned long n)
 {
-	if (access_ok(to, n))
+	___copy_to_user(to, from, n);
-		__copy_user(to, from, n);
 	return n;
 }
 EXPORT_SYMBOL(raw_copy_to_user);

arch/powerpc/Kconfig+1−1

@@ -130,7 +130,7 @@ config PPC · 129 unmodified lines
130	select ARCH_HAS_PTE_SPECIAL	130	select ARCH_HAS_PTE_SPECIAL
131	select ARCH_HAS_MEMBARRIER_CALLBACKS	131	select ARCH_HAS_MEMBARRIER_CALLBACKS
132	select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64	132	select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64
133	select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 \|\| PPC32) && !HIBERNATION)	133	select ARCH_HAS_STRICT_KERNEL_RWX if (PPC32 && !HIBERNATION)
134	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST	134	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
135	select ARCH_HAS_UACCESS_FLUSHCACHE	135	select ARCH_HAS_UACCESS_FLUSHCACHE
136	select ARCH_HAS_UACCESS_MCSAFE if PPC64	136	select ARCH_HAS_UACCESS_MCSAFE if PPC64

arch/powerpc/include/asm/book3s/32/hash.h+4−4

@@ -17,9 +17,9 @@ · 16 unmodified lines
17	* updating the accessed and modified bits in the page table tree.	17	* updating the accessed and modified bits in the page table tree.
18	*/	18	*/
19		19
20	#define _PAGE_USER 0x001 /* usermode access allowed */	20	#define _PAGE_PRESENT 0x001 /* software: pte contains a translation */
21	#define _PAGE_RW 0x002 /* software: user write access allowed */	21	#define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
22	#define _PAGE_PRESENT 0x004 /* software: pte contains a translation */	22	#define _PAGE_USER 0x004 /* usermode access allowed */
23	#define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */	23	#define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
24	#define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */	24	#define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
25	#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */	25	#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
@@ -27,7 +27,7 @@ · 1 unmodified line
27	#define _PAGE_DIRTY 0x080 /* C: page changed */	27	#define _PAGE_DIRTY 0x080 /* C: page changed */
28	#define _PAGE_ACCESSED 0x100 /* R: page referenced */	28	#define _PAGE_ACCESSED 0x100 /* R: page referenced */
29	#define _PAGE_EXEC 0x200 /* software: exec allowed */	29	#define _PAGE_EXEC 0x200 /* software: exec allowed */
30	#define _PAGE_HASHPTE 0x400 /* hash_page has made an HPTE for this pte */	30	#define _PAGE_RW 0x400 /* software: user write access allowed */
31	#define _PAGE_SPECIAL 0x800 /* software: Special page */	31	#define _PAGE_SPECIAL 0x800 /* software: Special page */
32		32
33	#ifdef CONFIG_PTE_64BIT	33	#ifdef CONFIG_PTE_64BIT

arch/powerpc/include/asm/book3s/32/kup.h+1−1

@@ -75,7 +75,7 @@ · 74 unmodified lines
75		75
76	.macro kuap_check current, gpr	76	.macro kuap_check current, gpr
77	#ifdef CONFIG_PPC_KUAP_DEBUG	77	#ifdef CONFIG_PPC_KUAP_DEBUG
78	lwz \gpr2, KUAP(thread)	78	lwz \gpr, KUAP(thread)
79	999: twnei \gpr, 0	79	999: twnei \gpr, 0
80	EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING \| BUGFLAG_ONCE)	80	EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING \| BUGFLAG_ONCE)
81	#endif	81	#endif

arch/powerpc/include/asm/hw_irq.h+19−1

@@ -250,9 +250,27 @@ static inline bool arch_irqs_disabled(void) · 249 unmodified lines
250	} \	250	} \
251	} while(0)	251	} while(0)
252		252
		253	static inline bool __lazy_irq_pending(u8 irq_happened)
		254	{
		255	return !!(irq_happened & ~PACA_IRQ_HARD_DIS);
		256	}
		257
		258	/*
		259	* Check if a lazy IRQ is pending. Should be called with IRQs hard disabled.
		260	*/
253	static inline bool lazy_irq_pending(void)	261	static inline bool lazy_irq_pending(void)
254	{	262	{
255	return !!(get_paca()->irq_happened & ~PACA_IRQ_HARD_DIS);	263	return __lazy_irq_pending(get_paca()->irq_happened);
		264	}
		265
		266	/*
		267	* Check if a lazy IRQ is pending, with no debugging checks.
		268	* Should be called with IRQs hard disabled.
		269	* For use in RI disabled code or other constrained situations.
		270	*/
		271	static inline bool lazy_irq_pending_nocheck(void)
		272	{
		273	return __lazy_irq_pending(local_paca->irq_happened);
256	}	274	}
257		275
258	/*	276	/*

arch/powerpc/include/asm/uaccess.h+35−14

 ({								\
 	long __pu_err;						\
 	__typeof__(*(ptr)) __user *__pu_addr = (ptr);		\
+	__typeof__(*(ptr)) __pu_val = (x);			\
+	__typeof__(size) __pu_size = (size);			\
+								\
 	if (!is_kernel_addr((unsigned long)__pu_addr))		\
 		might_fault();					\
-	__chk_user_ptr(ptr);					\
+	__chk_user_ptr(__pu_addr);				\
 	if (do_allow)								\
-		__put_user_size((x), __pu_addr, (size), __pu_err);		\
+		__put_user_size(__pu_val, __pu_addr, __pu_size, __pu_err);	\
 	else									\
-		__put_user_size_allowed((x), __pu_addr, (size), __pu_err);	\
+		__put_user_size_allowed(__pu_val, __pu_addr, __pu_size, __pu_err); \
+								\
 	__pu_err;						\
 })
 ({									\
 	long __pu_err = -EFAULT;					\
 	__typeof__(*(ptr)) __user *__pu_addr = (ptr);			\
+	__typeof__(*(ptr)) __pu_val = (x);				\
+	__typeof__(size) __pu_size = (size);				\
+									\
 	might_fault();							\
-	if (access_ok(__pu_addr, size))			\
+	if (access_ok(__pu_addr, __pu_size))				\
-		__put_user_size((x), __pu_addr, (size), __pu_err);	\
+		__put_user_size(__pu_val, __pu_addr, __pu_size, __pu_err); \
+									\
 	__pu_err;							\
 })
 ({								\
 	long __pu_err;						\
 	__typeof__(*(ptr)) __user *__pu_addr = (ptr);		\
-	__chk_user_ptr(ptr);					\
+	__typeof__(*(ptr)) __pu_val = (x);			\
-	__put_user_size((x), __pu_addr, (size), __pu_err);	\
+	__typeof__(size) __pu_size = (size);			\
+								\
+	__chk_user_ptr(__pu_addr);				\
+	__put_user_size(__pu_val, __pu_addr, __pu_size, __pu_err); \
+								\
 	__pu_err;						\
 })
 	long __gu_err;						\
 	__long_type(*(ptr)) __gu_val;				\
 	__typeof__(*(ptr)) __user *__gu_addr = (ptr);	\
-	__chk_user_ptr(ptr);					\
+	__typeof__(size) __gu_size = (size);			\
+								\
+	__chk_user_ptr(__gu_addr);				\
 	if (!is_kernel_addr((unsigned long)__gu_addr))		\
 		might_fault();					\
 	barrier_nospec();					\
 	if (do_allow)								\
-		__get_user_size(__gu_val, __gu_addr, (size), __gu_err);		\
+		__get_user_size(__gu_val, __gu_addr, __gu_size, __gu_err);	\
 	else									\
-		__get_user_size_allowed(__gu_val, __gu_addr, (size), __gu_err);	\
+		__get_user_size_allowed(__gu_val, __gu_addr, __gu_size, __gu_err); \
 	(x) = (__typeof__(*(ptr)))__gu_val;			\
+								\
 	__gu_err;						\
 })
 	long __gu_err = -EFAULT;					\
 	__long_type(*(ptr)) __gu_val = 0;				\
 	__typeof__(*(ptr)) __user *__gu_addr = (ptr);		\
+	__typeof__(size) __gu_size = (size);				\
+									\
 	might_fault();							\
-	if (access_ok(__gu_addr, (size))) {		\
+	if (access_ok(__gu_addr, __gu_size)) {				\
 		barrier_nospec();					\
-		__get_user_size(__gu_val, __gu_addr, (size), __gu_err);	\
+		__get_user_size(__gu_val, __gu_addr, __gu_size, __gu_err); \
 	}								\
 	(x) = (__force __typeof__(*(ptr)))__gu_val;				\
+									\
 	__gu_err;							\
 })
 	long __gu_err;						\
 	__long_type(*(ptr)) __gu_val;				\
 	__typeof__(*(ptr)) __user *__gu_addr = (ptr);	\
-	__chk_user_ptr(ptr);					\
+	__typeof__(size) __gu_size = (size);			\
+								\
+	__chk_user_ptr(__gu_addr);				\
 	barrier_nospec();					\
-	__get_user_size(__gu_val, __gu_addr, (size), __gu_err);	\
+	__get_user_size(__gu_val, __gu_addr, __gu_size, __gu_err); \
 	(x) = (__force __typeof__(*(ptr)))__gu_val;			\
+								\
 	__gu_err;						\
 })

arch/powerpc/kernel/entry_64.S+3−1

 #ifdef CONFIG_PPC_BOOK3S
 	/*
 	 * If MSR EE/RI was never enabled, IRQs not reconciled, NVGPRs not
-	 * touched, AMR not set, no exit work created, then this can be used.
+	 * touched, no exit work created, then this can be used.
 	 */
 	.balign IFETCH_ALIGN_BYTES
 	.globl fast_interrupt_return
 fast_interrupt_return:
 _ASM_NOKPROBE_SYMBOL(fast_interrupt_return)
+	kuap_check_amr r3, r4
 	ld	r4,_MSR(r1)
 	andi.	r0,r4,MSR_PR
 	bne	.Lfast_user_interrupt_return
+	kuap_restore_amr r3
 	andi.	r0,r4,MSR_RI
 	li	r3,0 /* 0 return value, no EMULATE_STACK_STORE */
 	bne+	.Lfast_kernel_interrupt_return

arch/powerpc/kernel/exceptions-64s.S+1−0

@@ -971,6 +971,7 @@ EXC_COMMON_BEGIN(system_reset_common) · 970 unmodified lines
971	ld r10,SOFTE(r1)	971	ld r10,SOFTE(r1)
972	stb r10,PACAIRQSOFTMASK(r13)	972	stb r10,PACAIRQSOFTMASK(r13)
973		973
		974	kuap_restore_amr r10
974	EXCEPTION_RESTORE_REGS	975	EXCEPTION_RESTORE_REGS
975	RFI_TO_USER_OR_KERNEL	976	RFI_TO_USER_OR_KERNEL
976		977

arch/powerpc/kernel/head_32.S+6−3

 	andis.	r0, r5, (DSISR_BAD_FAULT_32S | DSISR_DABRMATCH)@h
 #endif
 	bne	handle_page_fault_tramp_2	/* if not, try to put a PTE */
-	rlwinm	r3, r5, 32 - 24, 30, 30		/* DSISR_STORE -> _PAGE_RW */
+	rlwinm	r3, r5, 32 - 15, 21, 21		/* DSISR_STORE -> _PAGE_RW */
 	bl	hash_page
 	b	handle_page_fault_tramp_1
 FTR_SECTION_ELSE
 	andc.	r1,r1,r0		/* check access & ~permission */
 	bne-	InstructionAddressInvalid /* return if access not permitted */
 	/* Convert linux-style PTE to low word of PPC-style PTE */
+	rlwimi	r0,r0,32-2,31,31	/* _PAGE_USER -> PP lsb */
 	ori	r1, r1, 0xe06		/* clear out reserved bits */
 	andc	r1, r0, r1		/* PP = user? 1 : 0 */
 BEGIN_FTR_SECTION
 	 * we would need to update the pte atomically with lwarx/stwcx.
 	 */
 	/* Convert linux-style PTE to low word of PPC-style PTE */
-	rlwinm	r1,r0,0,30,30		/* _PAGE_RW -> PP msb */
+	rlwinm	r1,r0,32-9,30,30	/* _PAGE_RW -> PP msb */
-	rlwimi	r0,r0,1,30,30		/* _PAGE_USER -> PP msb */
+	rlwimi	r0,r0,32-1,30,30	/* _PAGE_USER -> PP msb */
+	rlwimi	r0,r0,32-1,31,31	/* _PAGE_USER -> PP lsb */
 	ori	r1,r1,0xe04		/* clear out reserved bits */
 	andc	r1,r0,r1		/* PP = user? rw? 1: 3: 0 */
 BEGIN_FTR_SECTION
 	 * we would need to update the pte atomically with lwarx/stwcx.
 	 */
 	/* Convert linux-style PTE to low word of PPC-style PTE */
+	rlwimi	r0,r0,32-2,31,31	/* _PAGE_USER -> PP lsb */
 	li	r1,0xe06		/* clear out reserved bits & PP msb */
 	andc	r1,r0,r1		/* PP = user? 1: 0 */
 BEGIN_FTR_SECTION

arch/powerpc/kernel/head_40x.S+2−1

@@ -344,8 +344,9 @@ _ENTRY(saved_ksp_limit) · 343 unmodified lines
344	/* 0x0C00 - System Call Exception */	344	/* 0x0C00 - System Call Exception */
345	START_EXCEPTION(0x0C00, SystemCall)	345	START_EXCEPTION(0x0C00, SystemCall)
346	SYSCALL_ENTRY 0xc00	346	SYSCALL_ENTRY 0xc00
		347	/* Trap_0D is commented out to get more space for system call exception */
347		348
348	EXCEPTION(0x0D00, Trap_0D, unknown_exception, EXC_XFER_STD)	349	/* EXCEPTION(0x0D00, Trap_0D, unknown_exception, EXC_XFER_STD) */
349	EXCEPTION(0x0E00, Trap_0E, unknown_exception, EXC_XFER_STD)	350	EXCEPTION(0x0E00, Trap_0E, unknown_exception, EXC_XFER_STD)
350	EXCEPTION(0x0F00, Trap_0F, unknown_exception, EXC_XFER_STD)	351	EXCEPTION(0x0F00, Trap_0F, unknown_exception, EXC_XFER_STD)
351		352

arch/powerpc/kernel/ima_arch.c+3−3

@@ -19,12 +19,12 @@ bool arch_ima_get_secureboot(void) · 18 unmodified lines
19	* to be stored as an xattr or as an appended signature.	19	* to be stored as an xattr or as an appended signature.
20	*	20	*
21	* To avoid duplicate signature verification as much as possible, the IMA	21	* To avoid duplicate signature verification as much as possible, the IMA
22	* policy rule for module appraisal is added only if CONFIG_MODULE_SIG_FORCE	22	* policy rule for module appraisal is added only if CONFIG_MODULE_SIG
23	* is not enabled.	23	* is not enabled.
24	*/	24	*/
25	static const char *const secure_rules[] = {	25	static const char *const secure_rules[] = {
26	"appraise func=KEXEC_KERNEL_CHECK appraise_flag=check_blacklist appraise_type=imasig\|modsig",	26	"appraise func=KEXEC_KERNEL_CHECK appraise_flag=check_blacklist appraise_type=imasig\|modsig",
27	#ifndef CONFIG_MODULE_SIG_FORCE	27	#ifndef CONFIG_MODULE_SIG
28	"appraise func=MODULE_CHECK appraise_flag=check_blacklist appraise_type=imasig\|modsig",	28	"appraise func=MODULE_CHECK appraise_flag=check_blacklist appraise_type=imasig\|modsig",
29	#endif	29	#endif
30	NULL	30	NULL
@@ -50,7 +50,7 @@ static const char *const secure_and_trusted_rules[] = { · 19 unmodified lines
50	"measure func=KEXEC_KERNEL_CHECK template=ima-modsig",	50	"measure func=KEXEC_KERNEL_CHECK template=ima-modsig",
51	"measure func=MODULE_CHECK template=ima-modsig",	51	"measure func=MODULE_CHECK template=ima-modsig",
52	"appraise func=KEXEC_KERNEL_CHECK appraise_flag=check_blacklist appraise_type=imasig\|modsig",	52	"appraise func=KEXEC_KERNEL_CHECK appraise_flag=check_blacklist appraise_type=imasig\|modsig",
53	#ifndef CONFIG_MODULE_SIG_FORCE	53	#ifndef CONFIG_MODULE_SIG
54	"appraise func=MODULE_CHECK appraise_flag=check_blacklist appraise_type=imasig\|modsig",	54	"appraise func=MODULE_CHECK appraise_flag=check_blacklist appraise_type=imasig\|modsig",
55	#endif	55	#endif
56	NULL	56	NULL

arch/powerpc/kernel/syscall_64.c+11−9

 	BUG_ON(!FULL_REGS(regs));
 	BUG_ON(regs->softe != IRQS_ENABLED);
+	kuap_check_amr();
 	account_cpu_user_entry();
 #ifdef CONFIG_PPC_SPLPAR
 	}
 #endif
-	kuap_check_amr();
 	/*
 	 * This is not required for the syscall exit path, but makes the
 	 * stack frame look nicer. If this was initialised in the first stack
 	unsigned long ti_flags;
 	unsigned long ret = 0;
+	kuap_check_amr();
 	regs->result = r3;
 	/* Check whether the syscall is issued inside a restartable sequence */
 	/* This pattern matches prep_irq_for_idle */
 	__hard_EE_RI_disable();
-	if (unlikely(lazy_irq_pending())) {
+	if (unlikely(lazy_irq_pending_nocheck())) {
 		__hard_RI_enable();
 		trace_hardirqs_off();
 		local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
 	local_paca->tm_scratch = regs->msr;
 #endif
-	kuap_check_amr();
 	account_cpu_user_exit();
 	return ret;
 	BUG_ON(!FULL_REGS(regs));
 	BUG_ON(regs->softe != IRQS_ENABLED);
+	kuap_check_amr();
 	local_irq_save(flags);
 again:
 	trace_hardirqs_on();
 	__hard_EE_RI_disable();
-	if (unlikely(lazy_irq_pending())) {
+	if (unlikely(lazy_irq_pending_nocheck())) {
 		__hard_RI_enable();
 		trace_hardirqs_off();
 		local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
 	local_paca->tm_scratch = regs->msr;
 #endif
-	kuap_check_amr();
 	account_cpu_user_exit();
 	return ret;
 	BUG_ON(regs->msr & MSR_PR);
 	BUG_ON(!FULL_REGS(regs));
+	kuap_check_amr();
 	if (unlikely(*ti_flagsp & _TIF_EMULATE_STACK_STORE)) {
 		clear_bits(_TIF_EMULATE_STACK_STORE, ti_flagsp);
 		ret = 1;
 		trace_hardirqs_on();
 		__hard_EE_RI_disable();
-		if (unlikely(lazy_irq_pending())) {
+		if (unlikely(lazy_irq_pending_nocheck())) {
 			__hard_RI_enable();
 			irq_soft_mask_set(IRQS_ALL_DISABLED);
 			trace_hardirqs_off();

arch/powerpc/kernel/vdso32/gettimeofday.S+3−3

@@ -218,11 +218,11 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) · 217 unmodified lines
218	blr	218	blr
219		219
220	/*	220	/*
221	* invalid clock	221	* syscall fallback
222	*/	222	*/
223	99:	223	99:
224	li r3, EINVAL	224	li r0,__NR_clock_getres
225	crset so	225	sc
226	blr	226	blr
227	.cfi_endproc	227	.cfi_endproc
228	V_FUNCTION_END(__kernel_clock_getres)	228	V_FUNCTION_END(__kernel_clock_getres)

arch/powerpc/mm/book3s32/hash_low.S+8−6

 /*
  * Load a PTE into the hash table, if possible.
  * The address is in r4, and r3 contains an access flag:
- * _PAGE_RW (0x002) if a write.
+ * _PAGE_RW (0x400) if a write.
  * r9 contains the SRR1 value, from which we use the MSR_PR bit.
  * SPRG_THREAD contains the physical address of the current task's thread.
  *
 	blt+	112f			/* assume user more likely */
 	lis	r5, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */
 	addi	r5 ,r5 ,(swapper_pg_dir - PAGE_OFFSET)@l	/* kernel page table */
-	rlwimi	r3,r9,32-14,31,31	/* MSR_PR -> _PAGE_USER */
+	rlwimi	r3,r9,32-12,29,29	/* MSR_PR -> _PAGE_USER */
 112:
 #ifndef CONFIG_PTE_64BIT
 	rlwimi	r5,r4,12,20,29		/* insert top 10 bits of address */
 #else
 	rlwimi	r8,r4,23,20,28		/* compute pte address */
 #endif
-	rlwinm	r0,r3,6,24,24		/* _PAGE_RW access -> _PAGE_DIRTY */
+	rlwinm	r0,r3,32-3,24,24	/* _PAGE_RW access -> _PAGE_DIRTY */
 	ori	r0,r0,_PAGE_ACCESSED|_PAGE_HASHPTE
 	/*
 _GLOBAL(create_hpte)
 	/* Convert linux-style PTE (r5) to low word of PPC-style PTE (r8) */
+	rlwinm	r8,r5,32-9,30,30	/* _PAGE_RW -> PP msb */
 	rlwinm	r0,r5,32-6,30,30	/* _PAGE_DIRTY -> PP msb */
-	and	r8,r5,r0		/* writable if _RW & _DIRTY */
+	and	r8,r8,r0		/* writable if _RW & _DIRTY */
-	rlwimi	r5,r5,1,30,30		/* _PAGE_USER -> PP msb */
+	rlwimi	r5,r5,32-1,30,30	/* _PAGE_USER -> PP msb */
+	rlwimi	r5,r5,32-2,31,31	/* _PAGE_USER -> PP lsb */
 	ori	r8,r8,0xe04		/* clear out reserved bits */
 	andc	r8,r5,r8		/* PP = user? (rw&dirty? 1: 3): 0 */
 BEGIN_FTR_SECTION
 33:	lwarx	r8,0,r5			/* fetch the pte flags word */
 	andi.	r0,r8,_PAGE_HASHPTE
 	beq	8f			/* done if HASHPTE is already clear */
-	rlwinm	r8,r8,0,~_PAGE_HASHPTE	/* clear HASHPTE bit */
+	rlwinm	r8,r8,0,31,29		/* clear HASHPTE bit */
 	stwcx.	r8,0,r5			/* update the pte */
 	bne-	33b

arch/riscv/Kconfig+2−1

 	select GENERIC_ARCH_TOPOLOGY if SMP
 	select ARCH_HAS_PTE_SPECIAL
 	select ARCH_HAS_MMIOWB
-	select ARCH_HAS_DEBUG_VIRTUAL
+	select ARCH_HAS_DEBUG_VIRTUAL if MMU
 	select HAVE_EBPF_JIT if MMU
 	select EDAC_SUPPORT
 	select ARCH_HAS_GIGANTIC_PAGE
 	def_bool y
 config SYS_SUPPORTS_HUGETLBFS
+	depends on MMU
 	def_bool y
 config STACKTRACE_SUPPORT

arch/riscv/Kconfig.socs+9−8

@@ -11,14 +11,15 @@ config SOC_SIFIVE · 10 unmodified lines
11	This enables support for SiFive SoC platform hardware.	11	This enables support for SiFive SoC platform hardware.
12		12
13	config SOC_VIRT	13	config SOC_VIRT
14	bool "QEMU Virt Machine"	14	bool "QEMU Virt Machine"
15	select POWER_RESET_SYSCON	15	select POWER_RESET
16	select POWER_RESET_SYSCON_POWEROFF	16	select POWER_RESET_SYSCON
17	select GOLDFISH	17	select POWER_RESET_SYSCON_POWEROFF
18	select RTC_DRV_GOLDFISH	18	select GOLDFISH
19	select SIFIVE_PLIC	19	select RTC_DRV_GOLDFISH if RTC_CLASS
20	help	20	select SIFIVE_PLIC
21	This enables support for QEMU Virt Machine.	21	help
		22	This enables support for QEMU Virt Machine.
22		23
23	config SOC_KENDRYTE	24	config SOC_KENDRYTE
24	bool "Kendryte K210 SoC"	25	bool "Kendryte K210 SoC"

arch/riscv/include/asm/mmio.h+2−0

@@ -16,6 +16,8 @@ · 15 unmodified lines
16		16
17	#ifndef CONFIG_MMU	17	#ifndef CONFIG_MMU
18	#define pgprot_noncached(x) (x)	18	#define pgprot_noncached(x) (x)
		19	#define pgprot_writecombine(x) (x)
		20	#define pgprot_device(x) (x)
19	#endif /* CONFIG_MMU */	21	#endif /* CONFIG_MMU */
20		22
21	/* Generic IO read/write. These perform native-endian accesses. */	23	/* Generic IO read/write. These perform native-endian accesses. */

arch/riscv/include/asm/mmiowb.h+1−0

@@ -9,6 +9,7 @@ · 8 unmodified lines
9	*/	9	*/
10	#define mmiowb() __asm__ __volatile__ ("fence o,w" : : : "memory");	10	#define mmiowb() __asm__ __volatile__ ("fence o,w" : : : "memory");
11		11
		12	#include <linux/smp.h>
12	#include <asm-generic/mmiowb.h>	13	#include <asm-generic/mmiowb.h>
13		14
14	#endif /* _ASM_RISCV_MMIOWB_H */	15	#endif /* _ASM_RISCV_MMIOWB_H */

arch/riscv/include/asm/perf_event.h+2−6

 #include <linux/ptrace.h>
 #include <linux/interrupt.h>
+#ifdef CONFIG_RISCV_BASE_PMU
 #define RISCV_BASE_COUNTERS	2
 /*
  * The RISCV_MAX_COUNTERS parameter should be specified.
  */
-#ifdef CONFIG_RISCV_BASE_PMU
 #define RISCV_MAX_COUNTERS	2
-#endif
-#ifndef RISCV_MAX_COUNTERS
-#error "Please provide a valid RISCV_MAX_COUNTERS for the PMU."
-#endif
 /*
  * These are the indexes of bits in counteren register *minus* 1,
 	int		irq;
 };
+#endif
 #ifdef CONFIG_PERF_EVENTS
 #define perf_arch_bpf_user_pt_regs(regs) (struct user_regs_struct *)regs
 #endif

arch/riscv/include/asm/pgtable.h+3−0

 #else /* CONFIG_MMU */
+#define PAGE_SHARED		__pgprot(0)
 #define PAGE_KERNEL		__pgprot(0)
 #define swapper_pg_dir		NULL
 #define VMALLOC_START		0
 #define TASK_SIZE 0xffffffffUL
+static inline void __kernel_map_pages(struct page *page, int numpages, int enable) {}
 #endif /* !CONFIG_MMU */
 #define kern_addr_valid(addr)   (1) /* FIXME */

arch/riscv/kernel/Makefile+1−1

@@ -43,7 +43,7 @@ obj-$(CONFIG_MODULE_SECTIONS) += module-sections.o · 42 unmodified lines
43	obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o	43	obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o
44	obj-$(CONFIG_DYNAMIC_FTRACE) += mcount-dyn.o	44	obj-$(CONFIG_DYNAMIC_FTRACE) += mcount-dyn.o
45		45
46	obj-$(CONFIG_PERF_EVENTS) += perf_event.o	46	obj-$(CONFIG_RISCV_BASE_PMU) += perf_event.o
47	obj-$(CONFIG_PERF_EVENTS) += perf_callchain.o	47	obj-$(CONFIG_PERF_EVENTS) += perf_callchain.o
48	obj-$(CONFIG_HAVE_PERF_REGS) += perf_regs.o	48	obj-$(CONFIG_HAVE_PERF_REGS) += perf_regs.o
49	obj-$(CONFIG_RISCV_SBI) += sbi.o	49	obj-$(CONFIG_RISCV_SBI) += sbi.o

arch/riscv/kernel/perf_event.c+4−4

@@ -147,7 +147,7 @@ static int riscv_map_hw_event(u64 config) · 146 unmodified lines
147	return riscv_pmu->hw_events[config];	147	return riscv_pmu->hw_events[config];
148	}	148	}
149		149
150	int riscv_map_cache_decode(u64 config, unsigned int *type,	150	static int riscv_map_cache_decode(u64 config, unsigned int *type,
151	unsigned int op, unsigned int result)	151	unsigned int op, unsigned int result)
152	{	152	{
153	return -ENOENT;	153	return -ENOENT;
@@ -342,7 +342,7 @@ static void riscv_pmu_del(struct perf_event *event, int flags) · 188 unmodified lines
342		342
343	static DEFINE_MUTEX(pmc_reserve_mutex);	343	static DEFINE_MUTEX(pmc_reserve_mutex);
344		344
345	irqreturn_t riscv_base_pmu_handle_irq(int irq_num, void *dev)	345	static irqreturn_t riscv_base_pmu_handle_irq(int irq_num, void *dev)
346	{	346	{
347	return IRQ_NONE;	347	return IRQ_NONE;
348	}	348	}
@@ -361,7 +361,7 @@ static int reserve_pmc_hardware(void) · 12 unmodified lines
361	return err;	361	return err;
362	}	362	}
363		363
364	void release_pmc_hardware(void)	364	static void release_pmc_hardware(void)
365	{	365	{
366	mutex_lock(&pmc_reserve_mutex);	366	mutex_lock(&pmc_reserve_mutex);
367	if (riscv_pmu->irq >= 0)	367	if (riscv_pmu->irq >= 0)
@@ -464,7 +464,7 @@ static const struct of_device_id riscv_pmu_of_ids[] = { · 96 unmodified lines
464	{ /* sentinel value */ }	464	{ /* sentinel value */ }
465	};	465	};
466		466
467	int __init init_hw_perf_events(void)	467	static int __init init_hw_perf_events(void)
468	{	468	{
469	struct device_node *node = of_find_node_by_type(NULL, "pmu");	469	struct device_node *node = of_find_node_by_type(NULL, "pmu");
470	const struct of_device_id *of_id;	470	const struct of_device_id *of_id;

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

@@ -22,7 +22,7 @@ · 21 unmodified lines
22	#include <asm/switch_to.h>	22	#include <asm/switch_to.h>
23	#include <asm/thread_info.h>	23	#include <asm/thread_info.h>
24		24
25	unsigned long gp_in_global __asm__("gp");	25	register unsigned long gp_in_global __asm__("gp");
26		26
27	extern asmlinkage void ret_from_fork(void);	27	extern asmlinkage void ret_from_fork(void);
28	extern asmlinkage void ret_from_kernel_thread(void);	28	extern asmlinkage void ret_from_kernel_thread(void);

arch/riscv/kernel/stacktrace.c+1−1

@@ -65,7 +65,7 @@ void notrace walk_stackframe(struct task_struct task, struct pt_regs regs, · 64 unmodified lines
65		65
66	#else /* !CONFIG_FRAME_POINTER */	66	#else /* !CONFIG_FRAME_POINTER */
67		67
68	static void notrace walk_stackframe(struct task_struct *task,	68	void notrace walk_stackframe(struct task_struct *task,
69	struct pt_regs regs, bool (fn)(unsigned long, void ), void arg)	69	struct pt_regs regs, bool (fn)(unsigned long, void ), void arg)
70	{	70	{
71	unsigned long sp, pc;	71	unsigned long sp, pc;

arch/riscv/mm/init.c+1−1

@@ -47,7 +47,7 @@ static void setup_zero_page(void) · 46 unmodified lines
47	memset((void *)empty_zero_page, 0, PAGE_SIZE);	47	memset((void *)empty_zero_page, 0, PAGE_SIZE);
48	}	48	}
49		49
50	#ifdef CONFIG_DEBUG_VM	50	#if defined(CONFIG_MMU) && defined(CONFIG_DEBUG_VM)
51	static inline void print_mlk(char *name, unsigned long b, unsigned long t)	51	static inline void print_mlk(char *name, unsigned long b, unsigned long t)
52	{	52	{
53	pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t,	53	pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t,

arch/s390/include/asm/pci_io.h+8−2

 #include <linux/slab.h>
 #include <asm/pci_insn.h>
+/* I/O size constraints */
+#define ZPCI_MAX_READ_SIZE	8
+#define ZPCI_MAX_WRITE_SIZE	128
 /* I/O Map */
 #define ZPCI_IOMAP_SHIFT		48
 #define ZPCI_IOMAP_ADDR_BASE		0x8000000000000000UL
 	while (n > 0) {
 		size = zpci_get_max_write_size((u64 __force) src,
-					       (u64) dst, n, 8);
+					       (u64) dst, n,
+					       ZPCI_MAX_READ_SIZE);
 		rc = zpci_read_single(dst, src, size);
 		if (rc)
 			break;
 	while (n > 0) {
 		size = zpci_get_max_write_size((u64 __force) dst,
-					       (u64) src, n, 128);
+					       (u64) src, n,
+					       ZPCI_MAX_WRITE_SIZE);
 		if (size > 8) /* main path */
 			rc = zpci_write_block(dst, src, size);
 		else

arch/s390/kernel/machine_kexec_file.c+1−1

@@ -151,7 +151,7 @@ static int kexec_file_add_initrd(struct kimage *image, · 150 unmodified lines
151	buf.mem += crashk_res.start;	151	buf.mem += crashk_res.start;
152	buf.memsz = buf.bufsz;	152	buf.memsz = buf.bufsz;
153		153
154	data->parm->initrd_start = buf.mem;	154	data->parm->initrd_start = data->memsz;
155	data->parm->initrd_size = buf.memsz;	155	data->parm->initrd_size = buf.memsz;
156	data->memsz += buf.memsz;	156	data->memsz += buf.memsz;
157		157

arch/s390/kernel/machine_kexec_reloc.c+1−0

@@ -28,6 +28,7 @@ int arch_kexec_do_relocs(int r_type, void *loc, unsigned long val, · 27 unmodified lines
28	break;	28	break;
29	case R_390_64: /* Direct 64 bit. */	29	case R_390_64: /* Direct 64 bit. */
30	case R_390_GLOB_DAT:	30	case R_390_GLOB_DAT:
		31	case R_390_JMP_SLOT:
31	(u64 )loc = val;	32	(u64 )loc = val;
32	break;	33	break;
33	case R_390_PC16: /* PC relative 16 bit. */	34	case R_390_PC16: /* PC relative 16 bit. */

arch/s390/mm/hugetlbpage.c+6−3

 		rste &= ~_SEGMENT_ENTRY_NOEXEC;
 	/* Set correct table type for 2G hugepages */
-	if ((pte_val(*ptep) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3)
+	if ((pte_val(*ptep) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3) {
-		rste |= _REGION_ENTRY_TYPE_R3 | _REGION3_ENTRY_LARGE;
+		if (likely(pte_present(pte)))
-	else
+			rste |= _REGION3_ENTRY_LARGE;
+		rste |= _REGION_ENTRY_TYPE_R3;
+	} else if (likely(pte_present(pte)))
 		rste |= _SEGMENT_ENTRY_LARGE;
 	clear_huge_pte_skeys(mm, rste);
 	pte_val(*ptep) = rste;
 }

arch/s390/pci/pci_mmio.c+211−2

@@ -11,6 +11,113 @@ · 10 unmodified lines
11	#include <linux/mm.h>	11	#include <linux/mm.h>
12	#include <linux/errno.h>	12	#include <linux/errno.h>
13	#include <linux/pci.h>	13	#include <linux/pci.h>
		14	#include <asm/pci_io.h>
		15	#include <asm/pci_debug.h>
		16
		17	static inline void zpci_err_mmio(u8 cc, u8 status, u64 offset)
		18	{
		19	struct {
		20	u64 offset;
		21	u8 cc;
		22	u8 status;
		23	} data = {offset, cc, status};
		24
		25	zpci_err_hex(&data, sizeof(data));
		26	}
		27
		28	static inline int __pcistb_mio_inuser(
		29	void __iomem ioaddr, const void __user src,
		30	u64 len, u8 *status)
		31	{
		32	int cc = -ENXIO;
		33
		34	asm volatile (
		35	" sacf 256\n"
		36	"0: .insn rsy,0xeb00000000d4,%[len],%[ioaddr],%[src]\n"
		37	"1: ipm %[cc]\n"
		38	" srl %[cc],28\n"
		39	"2: sacf 768\n"
		40	EX_TABLE(0b, 2b) EX_TABLE(1b, 2b)
		41	: [cc] "+d" (cc), [len] "+d" (len)
		42	: [ioaddr] "a" (ioaddr), [src] "Q" (((u8 __force )src))
		43	: "cc", "memory");
		44	*status = len >> 24 & 0xff;
		45	return cc;
		46	}
		47
		48	static inline int __pcistg_mio_inuser(
		49	void __iomem ioaddr, const void __user src,
		50	u64 ulen, u8 *status)
		51	{
		52	register u64 addr asm("2") = (u64 __force) ioaddr;
		53	register u64 len asm("3") = ulen;
		54	int cc = -ENXIO;
		55	u64 val = 0;
		56	u64 cnt = ulen;
		57	u8 tmp;
		58
		59	/*
		60	* copy 0 < @len <= 8 bytes from @src into the right most bytes of
		61	* a register, then store it to PCI at @ioaddr while in secondary
		62	* address space. pcistg then uses the user mappings.
		63	*/
		64	asm volatile (
		65	" sacf 256\n"
		66	"0: llgc %[tmp],0(%[src])\n"
		67	" sllg %[val],%[val],8\n"
		68	" aghi %[src],1\n"
		69	" ogr %[val],%[tmp]\n"
		70	" brctg %[cnt],0b\n"
		71	"1: .insn rre,0xb9d40000,%[val],%[ioaddr]\n"
		72	"2: ipm %[cc]\n"
		73	" srl %[cc],28\n"
		74	"3: sacf 768\n"
		75	EX_TABLE(0b, 3b) EX_TABLE(1b, 3b) EX_TABLE(2b, 3b)
		76	:
		77	[src] "+a" (src), [cnt] "+d" (cnt),
		78	[val] "+d" (val), [tmp] "=d" (tmp),
		79	[len] "+d" (len), [cc] "+d" (cc),
		80	[ioaddr] "+a" (addr)
		81	:: "cc", "memory");
		82	*status = len >> 24 & 0xff;
		83
		84	/* did we read everything from user memory? */
		85	if (!cc && cnt != 0)
		86	cc = -EFAULT;
		87
		88	return cc;
		89	}
		90
		91	static inline int __memcpy_toio_inuser(void __iomem *dst,
		92	const void __user *src, size_t n)
		93	{
		94	int size, rc = 0;
		95	u8 status = 0;
		96	mm_segment_t old_fs;
		97
		98	if (!src)
		99	return -EINVAL;
		100
		101	old_fs = enable_sacf_uaccess();
		102	while (n > 0) {
		103	size = zpci_get_max_write_size((u64 __force) dst,
		104	(u64 __force) src, n,
		105	ZPCI_MAX_WRITE_SIZE);
		106	if (size > 8) /* main path */
		107	rc = __pcistb_mio_inuser(dst, src, size, &status);
		108	else
		109	rc = __pcistg_mio_inuser(dst, src, size, &status);
		110	if (rc)
		111	break;
		112	src += size;
		113	dst += size;
		114	n -= size;
		115	}
		116	disable_sacf_uaccess(old_fs);
		117	if (rc)
		118	zpci_err_mmio(rc, status, (__force u64) dst);
		119	return rc;
		120	}
14		121
15	static long get_pfn(unsigned long user_addr, unsigned long access,	122	static long get_pfn(unsigned long user_addr, unsigned long access,
16	unsigned long *pfn)	123	unsigned long *pfn)
@@ -46,6 +153,20 @@ SYSCALL_DEFINE3(s390_pci_mmio_write, unsigned long, mmio_addr, · 29 unmodified lines
46		153
47	if (length <= 0 \|\| PAGE_SIZE - (mmio_addr & ~PAGE_MASK) < length)	154	if (length <= 0 \|\| PAGE_SIZE - (mmio_addr & ~PAGE_MASK) < length)
48	return -EINVAL;	155	return -EINVAL;
		156
		157	/*
		158	* Only support read access to MIO capable devices on a MIO enabled
		159	* system. Otherwise we would have to check for every address if it is
		160	* a special ZPCI_ADDR and we would have to do a get_pfn() which we
		161	* don't need for MIO capable devices.
		162	*/
		163	if (static_branch_likely(&have_mio)) {
		164	ret = __memcpy_toio_inuser((void __iomem *) mmio_addr,
		165	user_buffer,
		166	length);
		167	return ret;
		168	}
		169
49	if (length > 64) {	170	if (length > 64) {
50	buf = kmalloc(length, GFP_KERNEL);	171	buf = kmalloc(length, GFP_KERNEL);
51	if (!buf)	172	if (!buf)
@@ -56,7 +177,8 @@ SYSCALL_DEFINE3(s390_pci_mmio_write, unsigned long, mmio_addr, · 4 unmodified lines
56	ret = get_pfn(mmio_addr, VM_WRITE, &pfn);	177	ret = get_pfn(mmio_addr, VM_WRITE, &pfn);
57	if (ret)	178	if (ret)
58	goto out;	179	goto out;
59	io_addr = (void __iomem *)((pfn << PAGE_SHIFT) \| (mmio_addr & ~PAGE_MASK));	180	io_addr = (void __iomem *)((pfn << PAGE_SHIFT) \|
		181	(mmio_addr & ~PAGE_MASK));
60		182
61	ret = -EFAULT;	183	ret = -EFAULT;
62	if ((unsigned long) io_addr < ZPCI_IOMAP_ADDR_BASE)	184	if ((unsigned long) io_addr < ZPCI_IOMAP_ADDR_BASE)
@@ -72,6 +194,78 @@ out: · 9 unmodified lines
72	return ret;	194	return ret;
73	}	195	}
74		196
		197	static inline int __pcilg_mio_inuser(
		198	void __user dst, const void __iomem ioaddr,
		199	u64 ulen, u8 *status)
		200	{
		201	register u64 addr asm("2") = (u64 __force) ioaddr;
		202	register u64 len asm("3") = ulen;
		203	u64 cnt = ulen;
		204	int shift = ulen * 8;
		205	int cc = -ENXIO;
		206	u64 val, tmp;
		207
		208	/*
		209	* read 0 < @len <= 8 bytes from the PCI memory mapped at @ioaddr (in
		210	* user space) into a register using pcilg then store these bytes at
		211	* user address @dst
		212	*/
		213	asm volatile (
		214	" sacf 256\n"
		215	"0: .insn rre,0xb9d60000,%[val],%[ioaddr]\n"
		216	"1: ipm %[cc]\n"
		217	" srl %[cc],28\n"
		218	" ltr %[cc],%[cc]\n"
		219	" jne 4f\n"
		220	"2: ahi %[shift],-8\n"
		221	" srlg %[tmp],%[val],0(%[shift])\n"
		222	"3: stc %[tmp],0(%[dst])\n"
		223	" aghi %[dst],1\n"
		224	" brctg %[cnt],2b\n"
		225	"4: sacf 768\n"
		226	EX_TABLE(0b, 4b) EX_TABLE(1b, 4b) EX_TABLE(3b, 4b)
		227	:
		228	[cc] "+d" (cc), [val] "=d" (val), [len] "+d" (len),
		229	[dst] "+a" (dst), [cnt] "+d" (cnt), [tmp] "=d" (tmp),
		230	[shift] "+d" (shift)
		231	:
		232	[ioaddr] "a" (addr)
		233	: "cc", "memory");
		234
		235	/* did we write everything to the user space buffer? */
		236	if (!cc && cnt != 0)
		237	cc = -EFAULT;
		238
		239	*status = len >> 24 & 0xff;
		240	return cc;
		241	}
		242
		243	static inline int __memcpy_fromio_inuser(void __user *dst,
		244	const void __iomem *src,
		245	unsigned long n)
		246	{
		247	int size, rc = 0;
		248	u8 status;
		249	mm_segment_t old_fs;
		250
		251	old_fs = enable_sacf_uaccess();
		252	while (n > 0) {
		253	size = zpci_get_max_write_size((u64 __force) src,
		254	(u64 __force) dst, n,
		255	ZPCI_MAX_READ_SIZE);
		256	rc = __pcilg_mio_inuser(dst, src, size, &status);
		257	if (rc)
		258	break;
		259	src += size;
		260	dst += size;
		261	n -= size;
		262	}
		263	disable_sacf_uaccess(old_fs);
		264	if (rc)
		265	zpci_err_mmio(rc, status, (__force u64) dst);
		266	return rc;
		267	}
		268
75	SYSCALL_DEFINE3(s390_pci_mmio_read, unsigned long, mmio_addr,	269	SYSCALL_DEFINE3(s390_pci_mmio_read, unsigned long, mmio_addr,
76	void __user *, user_buffer, size_t, length)	270	void __user *, user_buffer, size_t, length)
77	{	271	{
@@ -86,12 +280,27 @@ SYSCALL_DEFINE3(s390_pci_mmio_read, unsigned long, mmio_addr, · 8 unmodified lines
86		280
87	if (length <= 0 \|\| PAGE_SIZE - (mmio_addr & ~PAGE_MASK) < length)	281	if (length <= 0 \|\| PAGE_SIZE - (mmio_addr & ~PAGE_MASK) < length)
88	return -EINVAL;	282	return -EINVAL;
		283
		284	/*
		285	* Only support write access to MIO capable devices on a MIO enabled
		286	* system. Otherwise we would have to check for every address if it is
		287	* a special ZPCI_ADDR and we would have to do a get_pfn() which we
		288	* don't need for MIO capable devices.
		289	*/
		290	if (static_branch_likely(&have_mio)) {
		291	ret = __memcpy_fromio_inuser(
		292	user_buffer, (const void __iomem *)mmio_addr,
		293	length);
		294	return ret;
		295	}
		296
89	if (length > 64) {	297	if (length > 64) {
90	buf = kmalloc(length, GFP_KERNEL);	298	buf = kmalloc(length, GFP_KERNEL);
91	if (!buf)	299	if (!buf)
92	return -ENOMEM;	300	return -ENOMEM;
93	} else	301	} else {
94	buf = local_buf;	302	buf = local_buf;
		303	}
95		304
96	ret = get_pfn(mmio_addr, VM_READ, &pfn);	305	ret = get_pfn(mmio_addr, VM_READ, &pfn);
97	if (ret)	306	if (ret)

arch/sh/include/uapi/asm/sockios.h+2−0

@@ -2,6 +2,8 @@ · 1 unmodified line
2	#ifndef __ASM_SH_SOCKIOS_H	2	#ifndef __ASM_SH_SOCKIOS_H
3	#define __ASM_SH_SOCKIOS_H	3	#define __ASM_SH_SOCKIOS_H
4		4
		5	#include <linux/time_types.h>
		6
5	/* Socket-level I/O control calls. */	7	/* Socket-level I/O control calls. */
6	#define FIOGETOWN _IOR('f', 123, int)	8	#define FIOGETOWN _IOR('f', 123, int)
7	#define FIOSETOWN _IOW('f', 124, int)	9	#define FIOSETOWN _IOW('f', 124, int)

arch/sparc/mm/srmmu.c+3−3

@@ -331,9 +331,9 @@ static void __init srmmu_nocache_init(void) · 330 unmodified lines
331		331
332	while (vaddr < srmmu_nocache_end) {	332	while (vaddr < srmmu_nocache_end) {
333	pgd = pgd_offset_k(vaddr);	333	pgd = pgd_offset_k(vaddr);
334	p4d = p4d_offset(__nocache_fix(pgd), vaddr);	334	p4d = p4d_offset(pgd, vaddr);
335	pud = pud_offset(__nocache_fix(p4d), vaddr);	335	pud = pud_offset(p4d, vaddr);
336	pmd = pmd_offset(__nocache_fix(pgd), vaddr);	336	pmd = pmd_offset(__nocache_fix(pud), vaddr);
337	pte = pte_offset_kernel(__nocache_fix(pmd), vaddr);	337	pte = pte_offset_kernel(__nocache_fix(pmd), vaddr);
338		338
339	pteval = ((paddr >> 4) \| SRMMU_ET_PTE \| SRMMU_PRIV);	339	pteval = ((paddr >> 4) \| SRMMU_ET_PTE \| SRMMU_PRIV);

arch/um/drivers/vector_user.h+1−1

@@ -17,7 +17,7 @@ · 16 unmodified lines
17	#define TRANS_TAP_LEN strlen(TRANS_TAP)	17	#define TRANS_TAP_LEN strlen(TRANS_TAP)
18		18
19	#define TRANS_GRE "gre"	19	#define TRANS_GRE "gre"
20	#define TRANS_GRE_LEN strlen(TRANS_RAW)	20	#define TRANS_GRE_LEN strlen(TRANS_GRE)
21		21
22	#define TRANS_L2TPV3 "l2tpv3"	22	#define TRANS_L2TPV3 "l2tpv3"
23	#define TRANS_L2TPV3_LEN strlen(TRANS_L2TPV3)	23	#define TRANS_L2TPV3_LEN strlen(TRANS_L2TPV3)

arch/um/include/asm/xor.h+1−1

@@ -1,6 +1,6 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 */
2	#include <asm-generic/xor.h>	2	#include <asm-generic/xor.h>
3	#include <shared/timer-internal.h>	3	#include <linux/time-internal.h>
4		4
5	/* pick an arbitrary one - measuring isn't possible with inf-cpu */	5	/* pick an arbitrary one - measuring isn't possible with inf-cpu */
6	#define XOR_SELECT_TEMPLATE(x) \	6	#define XOR_SELECT_TEMPLATE(x) \

arch/um/kernel/skas/syscall.c+1−0

@@ -11,6 +11,7 @@ · 10 unmodified lines
11	#include <sysdep/ptrace_user.h>	11	#include <sysdep/ptrace_user.h>
12	#include <sysdep/syscalls.h>	12	#include <sysdep/syscalls.h>
13	#include <linux/time-internal.h>	13	#include <linux/time-internal.h>
		14	#include <asm/unistd.h>
14		15
15	void handle_syscall(struct uml_pt_regs *r)	16	void handle_syscall(struct uml_pt_regs *r)
16	{	17	{

arch/x86/Kconfig+1−0

@@ -68,6 +68,7 @@ config X86 · 67 unmodified lines
68	select ARCH_HAS_KCOV if X86_64	68	select ARCH_HAS_KCOV if X86_64
69	select ARCH_HAS_MEM_ENCRYPT	69	select ARCH_HAS_MEM_ENCRYPT
70	select ARCH_HAS_MEMBARRIER_SYNC_CORE	70	select ARCH_HAS_MEMBARRIER_SYNC_CORE
		71	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
71	select ARCH_HAS_PMEM_API if X86_64	72	select ARCH_HAS_PMEM_API if X86_64
72	select ARCH_HAS_PTE_DEVMAP if X86_64	73	select ARCH_HAS_PTE_DEVMAP if X86_64
73	select ARCH_HAS_PTE_SPECIAL	74	select ARCH_HAS_PTE_SPECIAL

arch/x86/boot/tools/build.c+8−8

@@ -59,14 +59,14 @@ u8 buf[SETUP_SECT_MAX*512]; · 58 unmodified lines
59	#define PECOFF_COMPAT_RESERVE 0x0	59	#define PECOFF_COMPAT_RESERVE 0x0
60	#endif	60	#endif
61		61
62	unsigned long efi32_stub_entry;	62	static unsigned long efi32_stub_entry;
63	unsigned long efi64_stub_entry;	63	static unsigned long efi64_stub_entry;
64	unsigned long efi_pe_entry;	64	static unsigned long efi_pe_entry;
65	unsigned long efi32_pe_entry;	65	static unsigned long efi32_pe_entry;
66	unsigned long kernel_info;	66	static unsigned long kernel_info;
67	unsigned long startup_64;	67	static unsigned long startup_64;
68	unsigned long _ehead;	68	static unsigned long _ehead;
69	unsigned long _end;	69	static unsigned long _end;
70		70
71	/----------------------------------------------------------------------/	71	/----------------------------------------------------------------------/
72		72

arch/x86/hyperv/hv_init.c+17−2

 	rdmsrl(HV_X64_MSR_REENLIGHTENMENT_CONTROL, *((u64 *)&re_ctrl));
 	if (re_ctrl.target_vp == hv_vp_index[cpu]) {
-		/* Reassign to some other online CPU */
+		/*
+		 * Reassign reenlightenment notifications to some other online
+		 * CPU or just disable the feature if there are no online CPUs
+		 * left (happens on hibernation).
+		 */
 		new_cpu = cpumask_any_but(cpu_online_mask, cpu);
-		re_ctrl.target_vp = hv_vp_index[new_cpu];
+		if (new_cpu < nr_cpu_ids)
+			re_ctrl.target_vp = hv_vp_index[new_cpu];
+		else
+			re_ctrl.enabled = 0;
 		wrmsrl(HV_X64_MSR_REENLIGHTENMENT_CONTROL, *((u64 *)&re_ctrl));
 	}
 	hv_hypercall_pg = hv_hypercall_pg_saved;
 	hv_hypercall_pg_saved = NULL;
+	/*
+	 * Reenlightenment notifications are disabled by hv_cpu_die(0),
+	 * reenable them here if hv_reenlightenment_cb was previously set.
+	 */
+	if (hv_reenlightenment_cb)
+		set_hv_tscchange_cb(hv_reenlightenment_cb);
 }
 /* Note: when the ops are called, only CPU0 is online and IRQs are disabled. */

arch/x86/include/asm/bitops.h+6−6

@@ -52,9 +52,9 @@ static __always_inline void · 51 unmodified lines
52	arch_set_bit(long nr, volatile unsigned long *addr)	52	arch_set_bit(long nr, volatile unsigned long *addr)
53	{	53	{
54	if (__builtin_constant_p(nr)) {	54	if (__builtin_constant_p(nr)) {
55	asm volatile(LOCK_PREFIX "orb %1,%0"	55	asm volatile(LOCK_PREFIX "orb %b1,%0"
56	: CONST_MASK_ADDR(nr, addr)	56	: CONST_MASK_ADDR(nr, addr)
57	: "iq" (CONST_MASK(nr) & 0xff)	57	: "iq" (CONST_MASK(nr))
58	: "memory");	58	: "memory");
59	} else {	59	} else {
60	asm volatile(LOCK_PREFIX __ASM_SIZE(bts) " %1,%0"	60	asm volatile(LOCK_PREFIX __ASM_SIZE(bts) " %1,%0"
@@ -72,9 +72,9 @@ static __always_inline void · 11 unmodified lines
72	arch_clear_bit(long nr, volatile unsigned long *addr)	72	arch_clear_bit(long nr, volatile unsigned long *addr)
73	{	73	{
74	if (__builtin_constant_p(nr)) {	74	if (__builtin_constant_p(nr)) {
75	asm volatile(LOCK_PREFIX "andb %1,%0"	75	asm volatile(LOCK_PREFIX "andb %b1,%0"
76	: CONST_MASK_ADDR(nr, addr)	76	: CONST_MASK_ADDR(nr, addr)
77	: "iq" (CONST_MASK(nr) ^ 0xff));	77	: "iq" (~CONST_MASK(nr)));
78	} else {	78	} else {
79	asm volatile(LOCK_PREFIX __ASM_SIZE(btr) " %1,%0"	79	asm volatile(LOCK_PREFIX __ASM_SIZE(btr) " %1,%0"
80	: : RLONG_ADDR(addr), "Ir" (nr) : "memory");	80	: : RLONG_ADDR(addr), "Ir" (nr) : "memory");
@@ -123,9 +123,9 @@ static __always_inline void · 42 unmodified lines
123	arch_change_bit(long nr, volatile unsigned long *addr)	123	arch_change_bit(long nr, volatile unsigned long *addr)
124	{	124	{
125	if (__builtin_constant_p(nr)) {	125	if (__builtin_constant_p(nr)) {
126	asm volatile(LOCK_PREFIX "xorb %1,%0"	126	asm volatile(LOCK_PREFIX "xorb %b1,%0"
127	: CONST_MASK_ADDR(nr, addr)	127	: CONST_MASK_ADDR(nr, addr)
128	: "iq" ((u8)CONST_MASK(nr)));	128	: "iq" (CONST_MASK(nr)));
129	} else {	129	} else {
130	asm volatile(LOCK_PREFIX __ASM_SIZE(btc) " %1,%0"	130	asm volatile(LOCK_PREFIX __ASM_SIZE(btc) " %1,%0"
131	: : RLONG_ADDR(addr), "Ir" (nr) : "memory");	131	: : RLONG_ADDR(addr), "Ir" (nr) : "memory");

arch/x86/include/asm/ftrace.h+6−0

 #ifndef __ASSEMBLY__
+#if defined(CONFIG_FUNCTION_TRACER) && defined(CONFIG_DYNAMIC_FTRACE)
+extern void set_ftrace_ops_ro(void);
+#else
+static inline void set_ftrace_ops_ro(void) { }
+#endif
 #define ARCH_HAS_SYSCALL_MATCH_SYM_NAME
 static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)
 {

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

 	unsigned long cr4;
 	unsigned long cr4_guest_owned_bits;
 	unsigned long cr8;
+	u32 host_pkru;
 	u32 pkru;
 	u32 hflags;
 	u64 efer;
 	void (*set_idt)(struct kvm_vcpu *vcpu, struct desc_ptr *dt);
 	void (*get_gdt)(struct kvm_vcpu *vcpu, struct desc_ptr *dt);
 	void (*set_gdt)(struct kvm_vcpu *vcpu, struct desc_ptr *dt);
-	u64 (*get_dr6)(struct kvm_vcpu *vcpu);
-	void (*set_dr6)(struct kvm_vcpu *vcpu, unsigned long value);
 	void (*sync_dirty_debug_regs)(struct kvm_vcpu *vcpu);
 	void (*set_dr7)(struct kvm_vcpu *vcpu, unsigned long value);
 	void (*cache_reg)(struct kvm_vcpu *vcpu, enum kvm_reg reg);
 void kvm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr);
 void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code);
+void kvm_queue_exception_p(struct kvm_vcpu *vcpu, unsigned nr, unsigned long payload);
 void kvm_requeue_exception(struct kvm_vcpu *vcpu, unsigned nr);
 void kvm_requeue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code);
 void kvm_inject_page_fault(struct kvm_vcpu *vcpu, struct x86_exception *fault);

arch/x86/include/asm/stackprotector.h+6−1

 /*
  * Initialize the stackprotector canary value.
  *
- * NOTE: this must only be called from functions that never return,
+ * NOTE: this must only be called from functions that never return
  * and it must always be inlined.
+ *
+ * In addition, it should be called from a compilation unit for which
+ * stack protector is disabled. Alternatively, the caller should not end
+ * with a function call which gets tail-call optimized as that would
+ * lead to checking a modified canary value.
  */
 static __always_inline void boot_init_stack_canary(void)
 {

arch/x86/kernel/ftrace.c+28−1

@@ -407,7 +407,8 @@ create_trampoline(struct ftrace_ops ops, unsigned int tramp_size) · 406 unmodified lines
407		407
408	set_vm_flush_reset_perms(trampoline);	408	set_vm_flush_reset_perms(trampoline);
409		409
410	set_memory_ro((unsigned long)trampoline, npages);	410	if (likely(system_state != SYSTEM_BOOTING))
		411	set_memory_ro((unsigned long)trampoline, npages);
411	set_memory_x((unsigned long)trampoline, npages);	412	set_memory_x((unsigned long)trampoline, npages);
412	return (unsigned long)trampoline;	413	return (unsigned long)trampoline;
413	fail:	414	fail:
@@ -415,6 +416,32 @@ fail: · 1 unmodified line
415	return 0;	416	return 0;
416	}	417	}
417		418
		419	void set_ftrace_ops_ro(void)
		420	{
		421	struct ftrace_ops *ops;
		422	unsigned long start_offset;
		423	unsigned long end_offset;
		424	unsigned long npages;
		425	unsigned long size;
		426
		427	do_for_each_ftrace_op(ops, ftrace_ops_list) {
		428	if (!(ops->flags & FTRACE_OPS_FL_ALLOC_TRAMP))
		429	continue;
		430
		431	if (ops->flags & FTRACE_OPS_FL_SAVE_REGS) {
		432	start_offset = (unsigned long)ftrace_regs_caller;
		433	end_offset = (unsigned long)ftrace_regs_caller_end;
		434	} else {
		435	start_offset = (unsigned long)ftrace_caller;
		436	end_offset = (unsigned long)ftrace_epilogue;
		437	}
		438	size = end_offset - start_offset;
		439	size = size + RET_SIZE + sizeof(void *);
		440	npages = DIV_ROUND_UP(size, PAGE_SIZE);
		441	set_memory_ro((unsigned long)ops->trampoline, npages);
		442	} while_for_each_ftrace_op(ops);
		443	}
		444
418	static unsigned long calc_trampoline_call_offset(bool save_regs)	445	static unsigned long calc_trampoline_call_offset(bool save_regs)
419	{	446	{
420	unsigned long start_offset;	447	unsigned long start_offset;

arch/x86/kernel/smpboot.c+8−0

@@ -266,6 +266,14 @@ static void notrace start_secondary(void *unused) · 265 unmodified lines
266		266
267	wmb();	267	wmb();
268	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);	268	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
		269
		270	/*
		271	* Prevent tail call to cpu_startup_entry() because the stack protector
		272	* guard has been changed a couple of function calls up, in
		273	* boot_init_stack_canary() and must not be checked before tail calling
		274	* another function.
		275	*/
		276	prevent_tail_call_optimization();
269	}	277	}
270		278
271	/**	279	/**

arch/x86/kernel/unwind_orc.c+16−7

 unsigned long *unwind_get_return_address_ptr(struct unwind_state *state)
 {
+	struct task_struct *task = state->task;
 	if (unwind_done(state))
 		return NULL;
 	if (state->regs)
 		return &state->regs->ip;
+	if (task != current && state->sp == task->thread.sp) {
+		struct inactive_task_frame *frame = (void *)task->thread.sp;
+		return &frame->ret_addr;
+	}
 	if (state->sp)
 		return (unsigned long *)state->sp - 1;
 void __unwind_start(struct unwind_state *state, struct task_struct *task,
 		    struct pt_regs *regs, unsigned long *first_frame)
 {
-	if (!orc_init)
-		goto done;
 	memset(state, 0, sizeof(*state));
 	state->task = task;
+	if (!orc_init)
+		goto err;
 	/*
 	 * Refuse to unwind the stack of a task while it's executing on another
 	 * CPU.  This check is racy, but that's ok: the unwinder has other
 	 * checks to prevent it from going off the rails.
 	 */
 	if (task_on_another_cpu(task))
-		goto done;
+		goto err;
 	if (regs) {
 		if (user_mode(regs))
-			goto done;
+			goto the_end;
 		state->ip = regs->ip;
 		state->sp = regs->sp;
 		 * generate some kind of backtrace if this happens.
 		 */
 		void *next_page = (void *)PAGE_ALIGN((unsigned long)state->sp);
+		state->error = true;
 		if (get_stack_info(next_page, state->task, &state->stack_info,
 				   &state->stack_mask))
 			return;
 	return;
-done:
+err:
+	state->error = true;
+the_end:
 	state->stack_info.type = STACK_TYPE_UNKNOWN;
-	return;
 }
 EXPORT_SYMBOL_GPL(__unwind_start);

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

@@ -1427,7 +1427,7 @@ static u64 kvm_hv_flush_tlb(struct kvm_vcpu *current_vcpu, u64 ingpa, · 1426 unmodified lines
1427	*/	1427	*/
1428	kvm_make_vcpus_request_mask(kvm,	1428	kvm_make_vcpus_request_mask(kvm,
1429	KVM_REQ_TLB_FLUSH \| KVM_REQUEST_NO_WAKEUP,	1429	KVM_REQ_TLB_FLUSH \| KVM_REQUEST_NO_WAKEUP,
1430	vcpu_mask, &hv_vcpu->tlb_flush);	1430	NULL, vcpu_mask, &hv_vcpu->tlb_flush);
1431		1431
1432	ret_success:	1432	ret_success:
1433	/* We always do full TLB flush, set rep_done = rep_cnt. */	1433	/* We always do full TLB flush, set rep_done = rep_cnt. */

arch/x86/kvm/svm/nested.c+31−8

 #include <linux/kernel.h>
 #include <asm/msr-index.h>
+#include <asm/debugreg.h>
 #include "kvm_emulate.h"
 #include "trace.h"
 	svm->vmcb->save.rsp = nested_vmcb->save.rsp;
 	svm->vmcb->save.rip = nested_vmcb->save.rip;
 	svm->vmcb->save.dr7 = nested_vmcb->save.dr7;
-	svm->vmcb->save.dr6 = nested_vmcb->save.dr6;
+	svm->vcpu.arch.dr6  = nested_vmcb->save.dr6;
 	svm->vmcb->save.cpl = nested_vmcb->save.cpl;
 	svm->nested.vmcb_msrpm = nested_vmcb->control.msrpm_base_pa & ~0x0fffULL;
 	nested_vmcb->save.rsp    = vmcb->save.rsp;
 	nested_vmcb->save.rax    = vmcb->save.rax;
 	nested_vmcb->save.dr7    = vmcb->save.dr7;
-	nested_vmcb->save.dr6    = vmcb->save.dr6;
+	nested_vmcb->save.dr6    = svm->vcpu.arch.dr6;
 	nested_vmcb->save.cpl    = vmcb->save.cpl;
 	nested_vmcb->control.int_ctl           = vmcb->control.int_ctl;
 /* DB exceptions for our internal use must not cause vmexit */
 static int nested_svm_intercept_db(struct vcpu_svm *svm)
 {
-	unsigned long dr6;
+	unsigned long dr6 = svm->vmcb->save.dr6;
+	/* Always catch it and pass it to userspace if debugging.  */
+	if (svm->vcpu.guest_debug &
+	    (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP))
+		return NESTED_EXIT_HOST;
 	/* if we're not singlestepping, it's not ours */
 	if (!svm->nmi_singlestep)
-		return NESTED_EXIT_DONE;
+		goto reflected_db;
 	/* if it's not a singlestep exception, it's not ours */
-	if (kvm_get_dr(&svm->vcpu, 6, &dr6))
-		return NESTED_EXIT_DONE;
 	if (!(dr6 & DR6_BS))
-		return NESTED_EXIT_DONE;
+		goto reflected_db;
 	/* if the guest is singlestepping, it should get the vmexit */
 	if (svm->nmi_singlestep_guest_rflags & X86_EFLAGS_TF) {
 		disable_nmi_singlestep(svm);
-		return NESTED_EXIT_DONE;
+		goto reflected_db;
 	}
 	/* it's ours, the nested hypervisor must not see this one */
 	return NESTED_EXIT_HOST;
+reflected_db:
+	/*
+	 * Synchronize guest DR6 here just like in kvm_deliver_exception_payload;
+	 * it will be moved into the nested VMCB by nested_svm_vmexit.  Once
+	 * exceptions will be moved to svm_check_nested_events, all this stuff
+	 * will just go away and we could just return NESTED_EXIT_HOST
+	 * unconditionally.  db_interception will queue the exception, which
+	 * will be processed by svm_check_nested_events if a nested vmexit is
+	 * required, and we will just use kvm_deliver_exception_payload to copy
+	 * the payload to DR6 before vmexit.
+	 */
+	WARN_ON(svm->vcpu.arch.switch_db_regs & KVM_DEBUGREG_WONT_EXIT);
+	svm->vcpu.arch.dr6 &= ~(DR_TRAP_BITS | DR6_RTM);
+	svm->vcpu.arch.dr6 |= dr6 & ~DR6_FIXED_1;
+	return NESTED_EXIT_DONE;
 }
 static int nested_svm_intercept_ioio(struct vcpu_svm *svm)
 		if (svm->nested.intercept_exceptions & excp_bits) {
 			if (exit_code == SVM_EXIT_EXCP_BASE + DB_VECTOR)
 				vmexit = nested_svm_intercept_db(svm);
+			else if (exit_code == SVM_EXIT_EXCP_BASE + BP_VECTOR &&
+				 svm->vcpu.guest_debug & KVM_GUESTDBG_USE_SW_BP)
+				vmexit = NESTED_EXIT_HOST;
 			else
 				vmexit = NESTED_EXIT_DONE;
 		}

arch/x86/kvm/svm/svm.c+22−14

 	mark_dirty(svm->vmcb, VMCB_ASID);
 }
-static u64 svm_get_dr6(struct kvm_vcpu *vcpu)
+static void svm_set_dr6(struct vcpu_svm *svm, unsigned long value)
 {
-	return to_svm(vcpu)->vmcb->save.dr6;
+	struct vmcb *vmcb = svm->vmcb;
-}
-static void svm_set_dr6(struct kvm_vcpu *vcpu, unsigned long value)
-{
-	struct vcpu_svm *svm = to_svm(vcpu);
-	svm->vmcb->save.dr6 = value;
+	if (unlikely(value != vmcb->save.dr6)) {
-	mark_dirty(svm->vmcb, VMCB_DR);
+		vmcb->save.dr6 = value;
+		mark_dirty(vmcb, VMCB_DR);
+	}
 }
 static void svm_sync_dirty_debug_regs(struct kvm_vcpu *vcpu)
 	get_debugreg(vcpu->arch.db[1], 1);
 	get_debugreg(vcpu->arch.db[2], 2);
 	get_debugreg(vcpu->arch.db[3], 3);
-	vcpu->arch.dr6 = svm_get_dr6(vcpu);
+	/*
+	 * We cannot reset svm->vmcb->save.dr6 to DR6_FIXED_1|DR6_RTM here,
+	 * because db_interception might need it.  We can do it before vmentry.
+	 */
+	vcpu->arch.dr6 = svm->vmcb->save.dr6;
 	vcpu->arch.dr7 = svm->vmcb->save.dr7;
 	vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_WONT_EXIT;
 	set_dr_intercepts(svm);
 }
 	if (!(svm->vcpu.guest_debug &
 	      (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP)) &&
 		!svm->nmi_singlestep) {
-		kvm_queue_exception(&svm->vcpu, DB_VECTOR);
+		u32 payload = (svm->vmcb->save.dr6 ^ DR6_RTM) & ~DR6_FIXED_1;
+		kvm_queue_exception_p(&svm->vcpu, DB_VECTOR, payload);
 		return 1;
 	}
 	svm->vmcb->save.cr2 = vcpu->arch.cr2;
+	/*
+	 * Run with all-zero DR6 unless needed, so that we can get the exact cause
+	 * of a #DB.
+	 */
+	if (unlikely(svm->vcpu.arch.switch_db_regs & KVM_DEBUGREG_WONT_EXIT))
+		svm_set_dr6(svm, vcpu->arch.dr6);
+	else
+		svm_set_dr6(svm, DR6_FIXED_1 | DR6_RTM);
 	clgi();
 	kvm_load_guest_xsave_state(vcpu);
 	.set_idt = svm_set_idt,
 	.get_gdt = svm_get_gdt,
 	.set_gdt = svm_set_gdt,
-	.get_dr6 = svm_get_dr6,
-	.set_dr6 = svm_set_dr6,
 	.set_dr7 = svm_set_dr7,
 	.sync_dirty_debug_regs = svm_sync_dirty_debug_regs,
 	.cache_reg = svm_cache_reg,

arch/x86/kvm/vmx/vmx.c+4−37

 	vmx_vcpu_pi_load(vcpu, cpu);
-	vmx->host_pkru = read_pkru();
 	vmx->host_debugctlmsr = get_debugctlmsr();
 }
 		dr6 = vmcs_readl(EXIT_QUALIFICATION);
 		if (!(vcpu->guest_debug &
 		      (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP))) {
-			vcpu->arch.dr6 &= ~DR_TRAP_BITS;
-			vcpu->arch.dr6 |= dr6 | DR6_RTM;
 			if (is_icebp(intr_info))
 				WARN_ON(!skip_emulated_instruction(vcpu));
-			kvm_queue_exception(vcpu, DB_VECTOR);
+			kvm_queue_exception_p(vcpu, DB_VECTOR, dr6);
 			return 1;
 		}
-		kvm_run->debug.arch.dr6 = dr6 | DR6_FIXED_1;
+		kvm_run->debug.arch.dr6 = dr6 | DR6_FIXED_1 | DR6_RTM;
 		kvm_run->debug.arch.dr7 = vmcs_readl(GUEST_DR7);
 		/* fall through */
 	case BP_VECTOR:
 		 * guest debugging itself.
 		 */
 		if (vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP) {
-			vcpu->run->debug.arch.dr6 = vcpu->arch.dr6;
+			vcpu->run->debug.arch.dr6 = DR6_BD | DR6_RTM | DR6_FIXED_1;
 			vcpu->run->debug.arch.dr7 = dr7;
 			vcpu->run->debug.arch.pc = kvm_get_linear_rip(vcpu);
 			vcpu->run->debug.arch.exception = DB_VECTOR;
 			vcpu->run->exit_reason = KVM_EXIT_DEBUG;
 			return 0;
 		} else {
-			vcpu->arch.dr6 &= ~DR_TRAP_BITS;
+			kvm_queue_exception_p(vcpu, DB_VECTOR, DR6_BD);
-			vcpu->arch.dr6 |= DR6_BD | DR6_RTM;
-			kvm_queue_exception(vcpu, DB_VECTOR);
 			return 1;
 		}
 	}
 	return kvm_skip_emulated_instruction(vcpu);
 }
-static u64 vmx_get_dr6(struct kvm_vcpu *vcpu)
-{
-	return vcpu->arch.dr6;
-}
-static void vmx_set_dr6(struct kvm_vcpu *vcpu, unsigned long val)
-{
-}
 static void vmx_sync_dirty_debug_regs(struct kvm_vcpu *vcpu)
 {
 	get_debugreg(vcpu->arch.db[0], 0);
 	kvm_load_guest_xsave_state(vcpu);
-	if (static_cpu_has(X86_FEATURE_PKU) &&
-	    kvm_read_cr4_bits(vcpu, X86_CR4_PKE) &&
-	    vcpu->arch.pkru != vmx->host_pkru)
-		__write_pkru(vcpu->arch.pkru);
 	pt_guest_enter(vmx);
 	if (vcpu_to_pmu(vcpu)->version)
 	pt_guest_exit(vmx);
-	/*
-	 * eager fpu is enabled if PKEY is supported and CR4 is switched
-	 * back on host, so it is safe to read guest PKRU from current
-	 * XSAVE.
-	 */
-	if (static_cpu_has(X86_FEATURE_PKU) &&
-	    kvm_read_cr4_bits(vcpu, X86_CR4_PKE)) {
-		vcpu->arch.pkru = rdpkru();
-		if (vcpu->arch.pkru != vmx->host_pkru)
-			__write_pkru(vmx->host_pkru);
-	}
 	kvm_load_host_xsave_state(vcpu);
 	vmx->nested.nested_run_pending = 0;
 	.set_idt = vmx_set_idt,
 	.get_gdt = vmx_get_gdt,
 	.set_gdt = vmx_set_gdt,
-	.get_dr6 = vmx_get_dr6,
-	.set_dr6 = vmx_set_dr6,
 	.set_dr7 = vmx_set_dr7,
 	.sync_dirty_debug_regs = vmx_sync_dirty_debug_regs,
 	.cache_reg = vmx_cache_reg,

arch/x86/kvm/x86.c+37−23

@@ -572,11 +572,12 @@ void kvm_requeue_exception(struct kvm_vcpu *vcpu, unsigned nr) · 571 unmodified lines
572	}	572	}
573	EXPORT_SYMBOL_GPL(kvm_requeue_exception);	573	EXPORT_SYMBOL_GPL(kvm_requeue_exception);
574		574
575	static void kvm_queue_exception_p(struct kvm_vcpu *vcpu, unsigned nr,	575	void kvm_queue_exception_p(struct kvm_vcpu *vcpu, unsigned nr,
576	unsigned long payload)	576	unsigned long payload)
577	{	577	{
578	kvm_multiple_exception(vcpu, nr, false, 0, true, payload, false);	578	kvm_multiple_exception(vcpu, nr, false, 0, true, payload, false);
579	}	579	}
		580	EXPORT_SYMBOL_GPL(kvm_queue_exception_p);
580		581
581	static void kvm_queue_exception_e_p(struct kvm_vcpu *vcpu, unsigned nr,	582	static void kvm_queue_exception_e_p(struct kvm_vcpu *vcpu, unsigned nr,
582	u32 error_code, unsigned long payload)	583	u32 error_code, unsigned long payload)
@@ -836,11 +837,25 @@ void kvm_load_guest_xsave_state(struct kvm_vcpu *vcpu) · 253 unmodified lines
836	vcpu->arch.ia32_xss != host_xss)	837	vcpu->arch.ia32_xss != host_xss)
837	wrmsrl(MSR_IA32_XSS, vcpu->arch.ia32_xss);	838	wrmsrl(MSR_IA32_XSS, vcpu->arch.ia32_xss);
838	}	839	}
		840
		841	if (static_cpu_has(X86_FEATURE_PKU) &&
		842	(kvm_read_cr4_bits(vcpu, X86_CR4_PKE) \|\|
		843	(vcpu->arch.xcr0 & XFEATURE_MASK_PKRU)) &&
		844	vcpu->arch.pkru != vcpu->arch.host_pkru)
		845	__write_pkru(vcpu->arch.pkru);
839	}	846	}
840	EXPORT_SYMBOL_GPL(kvm_load_guest_xsave_state);	847	EXPORT_SYMBOL_GPL(kvm_load_guest_xsave_state);
841		848
842	void kvm_load_host_xsave_state(struct kvm_vcpu *vcpu)	849	void kvm_load_host_xsave_state(struct kvm_vcpu *vcpu)
843	{	850	{
		851	if (static_cpu_has(X86_FEATURE_PKU) &&
		852	(kvm_read_cr4_bits(vcpu, X86_CR4_PKE) \|\|
		853	(vcpu->arch.xcr0 & XFEATURE_MASK_PKRU))) {
		854	vcpu->arch.pkru = rdpkru();
		855	if (vcpu->arch.pkru != vcpu->arch.host_pkru)
		856	__write_pkru(vcpu->arch.host_pkru);
		857	}
		858
844	if (kvm_read_cr4_bits(vcpu, X86_CR4_OSXSAVE)) {	859	if (kvm_read_cr4_bits(vcpu, X86_CR4_OSXSAVE)) {
845		860
846	if (vcpu->arch.xcr0 != host_xcr0)	861	if (vcpu->arch.xcr0 != host_xcr0)
@@ -1045,12 +1060,6 @@ static void kvm_update_dr0123(struct kvm_vcpu *vcpu) · 198 unmodified lines
1045	}	1060	}
1046	}	1061	}
1047		1062
1048	static void kvm_update_dr6(struct kvm_vcpu *vcpu)
1049	{
1050	if (!(vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP))
1051	kvm_x86_ops.set_dr6(vcpu, vcpu->arch.dr6);
1052	}
1053
1054	static void kvm_update_dr7(struct kvm_vcpu *vcpu)	1063	static void kvm_update_dr7(struct kvm_vcpu *vcpu)
1055	{	1064	{
1056	unsigned long dr7;	1065	unsigned long dr7;
@@ -1090,7 +1099,6 @@ static int __kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val) · 33 unmodified lines
1090	if (val & 0xffffffff00000000ULL)	1099	if (val & 0xffffffff00000000ULL)
1091	return -1; /* #GP */	1100	return -1; /* #GP */
1092	vcpu->arch.dr6 = (val & DR6_VOLATILE) \| kvm_dr6_fixed(vcpu);	1101	vcpu->arch.dr6 = (val & DR6_VOLATILE) \| kvm_dr6_fixed(vcpu);
1093	kvm_update_dr6(vcpu);
1094	break;	1102	break;
1095	case 5:	1103	case 5:
1096	/* fall through */	1104	/* fall through */
@@ -1126,10 +1134,7 @@ int kvm_get_dr(struct kvm_vcpu vcpu, int dr, unsigned long val) · 29 unmodified lines
1126	case 4:	1134	case 4:
1127	/* fall through */	1135	/* fall through */
1128	case 6:	1136	case 6:
1129	if (vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP)	1137	*val = vcpu->arch.dr6;
1130	*val = vcpu->arch.dr6;
1131	else
1132	*val = kvm_x86_ops.get_dr6(vcpu);
1133	break;	1138	break;
1134	case 5:	1139	case 5:
1135	/* fall through */	1140	/* fall through */
@@ -3558,6 +3563,9 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) · 2422 unmodified lines
3558		3563
3559	kvm_x86_ops.vcpu_load(vcpu, cpu);	3564	kvm_x86_ops.vcpu_load(vcpu, cpu);
3560		3565
		3566	/* Save host pkru register if supported */
		3567	vcpu->arch.host_pkru = read_pkru();
		3568
3561	/* Apply any externally detected TSC adjustments (due to suspend) */	3569	/* Apply any externally detected TSC adjustments (due to suspend) */
3562	if (unlikely(vcpu->arch.tsc_offset_adjustment)) {	3570	if (unlikely(vcpu->arch.tsc_offset_adjustment)) {
3563	adjust_tsc_offset_host(vcpu, vcpu->arch.tsc_offset_adjustment);	3571	adjust_tsc_offset_host(vcpu, vcpu->arch.tsc_offset_adjustment);
@@ -3751,7 +3759,7 @@ static int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *vcpu, · 187 unmodified lines
3751	unsigned bank_num = mcg_cap & 0xff, bank;	3759	unsigned bank_num = mcg_cap & 0xff, bank;
3752		3760
3753	r = -EINVAL;	3761	r = -EINVAL;
3754	if (!bank_num \|\| bank_num >= KVM_MAX_MCE_BANKS)	3762	if (!bank_num \|\| bank_num > KVM_MAX_MCE_BANKS)
3755	goto out;	3763	goto out;
3756	if (mcg_cap & ~(kvm_mce_cap_supported \| 0xff \| 0xff0000))	3764	if (mcg_cap & ~(kvm_mce_cap_supported \| 0xff \| 0xff0000))
3757	goto out;	3765	goto out;
@@ -4009,7 +4017,6 @@ static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu, · 251 unmodified lines
4009	memcpy(vcpu->arch.db, dbgregs->db, sizeof(vcpu->arch.db));	4017	memcpy(vcpu->arch.db, dbgregs->db, sizeof(vcpu->arch.db));
4010	kvm_update_dr0123(vcpu);	4018	kvm_update_dr0123(vcpu);
4011	vcpu->arch.dr6 = dbgregs->dr6;	4019	vcpu->arch.dr6 = dbgregs->dr6;
4012	kvm_update_dr6(vcpu);
4013	vcpu->arch.dr7 = dbgregs->dr7;	4020	vcpu->arch.dr7 = dbgregs->dr7;
4014	kvm_update_dr7(vcpu);	4021	kvm_update_dr7(vcpu);
4015		4022
@@ -6659,7 +6666,7 @@ static int kvm_vcpu_do_singlestep(struct kvm_vcpu *vcpu) · 2643 unmodified lines
6659		6666
6660	if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) {	6667	if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) {
6661	kvm_run->debug.arch.dr6 = DR6_BS \| DR6_FIXED_1 \| DR6_RTM;	6668	kvm_run->debug.arch.dr6 = DR6_BS \| DR6_FIXED_1 \| DR6_RTM;
6662	kvm_run->debug.arch.pc = vcpu->arch.singlestep_rip;	6669	kvm_run->debug.arch.pc = kvm_get_linear_rip(vcpu);
6663	kvm_run->debug.arch.exception = DB_VECTOR;	6670	kvm_run->debug.arch.exception = DB_VECTOR;
6664	kvm_run->exit_reason = KVM_EXIT_DEBUG;	6671	kvm_run->exit_reason = KVM_EXIT_DEBUG;
6665	return 0;	6672	return 0;
@@ -6719,9 +6726,7 @@ static bool kvm_vcpu_check_breakpoint(struct kvm_vcpu vcpu, int r) · 53 unmodified lines
6719	vcpu->arch.db);	6726	vcpu->arch.db);
6720		6727
6721	if (dr6 != 0) {	6728	if (dr6 != 0) {
6722	vcpu->arch.dr6 &= ~DR_TRAP_BITS;	6729	kvm_queue_exception_p(vcpu, DB_VECTOR, dr6);
6723	vcpu->arch.dr6 \|= dr6 \| DR6_RTM;
6724	kvm_queue_exception(vcpu, DB_VECTOR);
6725	*r = 1;	6730	*r = 1;
6726	return true;	6731	return true;
6727	}	6732	}
@@ -8042,7 +8047,7 @@ void kvm_make_scan_ioapic_request_mask(struct kvm *kvm, · 1314 unmodified lines
8042	zalloc_cpumask_var(&cpus, GFP_ATOMIC);	8047	zalloc_cpumask_var(&cpus, GFP_ATOMIC);
8043		8048
8044	kvm_make_vcpus_request_mask(kvm, KVM_REQ_SCAN_IOAPIC,	8049	kvm_make_vcpus_request_mask(kvm, KVM_REQ_SCAN_IOAPIC,
8045	vcpu_bitmap, cpus);	8050	NULL, vcpu_bitmap, cpus);
8046		8051
8047	free_cpumask_var(cpus);	8052	free_cpumask_var(cpus);
8048	}	8053	}
@@ -8072,6 +8077,7 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_update_apicv); · 23 unmodified lines
8072	*/	8077	*/
8073	void kvm_request_apicv_update(struct kvm *kvm, bool activate, ulong bit)	8078	void kvm_request_apicv_update(struct kvm *kvm, bool activate, ulong bit)
8074	{	8079	{
		8080	struct kvm_vcpu *except;
8075	unsigned long old, new, expected;	8081	unsigned long old, new, expected;
8076		8082
8077	if (!kvm_x86_ops.check_apicv_inhibit_reasons \|\|	8083	if (!kvm_x86_ops.check_apicv_inhibit_reasons \|\|
@@ -8096,7 +8102,17 @@ void kvm_request_apicv_update(struct kvm *kvm, bool activate, ulong bit) · 18 unmodified lines
8096	trace_kvm_apicv_update_request(activate, bit);	8102	trace_kvm_apicv_update_request(activate, bit);
8097	if (kvm_x86_ops.pre_update_apicv_exec_ctrl)	8103	if (kvm_x86_ops.pre_update_apicv_exec_ctrl)
8098	kvm_x86_ops.pre_update_apicv_exec_ctrl(kvm, activate);	8104	kvm_x86_ops.pre_update_apicv_exec_ctrl(kvm, activate);
8099	kvm_make_all_cpus_request(kvm, KVM_REQ_APICV_UPDATE);	8105
		8106	/*
		8107	* Sending request to update APICV for all other vcpus,
		8108	* while update the calling vcpu immediately instead of
		8109	* waiting for another #VMEXIT to handle the request.
		8110	*/
		8111	except = kvm_get_running_vcpu();
		8112	kvm_make_all_cpus_request_except(kvm, KVM_REQ_APICV_UPDATE,
		8113	except);
		8114	if (except)
		8115	kvm_vcpu_update_apicv(except);
8100	}	8116	}
8101	EXPORT_SYMBOL_GPL(kvm_request_apicv_update);	8117	EXPORT_SYMBOL_GPL(kvm_request_apicv_update);
8102		8118
@@ -8420,7 +8436,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) · 317 unmodified lines
8420	WARN_ON(vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP);	8436	WARN_ON(vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP);
8421	kvm_x86_ops.sync_dirty_debug_regs(vcpu);	8437	kvm_x86_ops.sync_dirty_debug_regs(vcpu);
8422	kvm_update_dr0123(vcpu);	8438	kvm_update_dr0123(vcpu);
8423	kvm_update_dr6(vcpu);
8424	kvm_update_dr7(vcpu);	8439	kvm_update_dr7(vcpu);
8425	vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_RELOAD;	8440	vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_RELOAD;
8426	}	8441	}
@@ -9481,7 +9496,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) · 1054 unmodified lines
9481	memset(vcpu->arch.db, 0, sizeof(vcpu->arch.db));	9496	memset(vcpu->arch.db, 0, sizeof(vcpu->arch.db));
9482	kvm_update_dr0123(vcpu);	9497	kvm_update_dr0123(vcpu);
9483	vcpu->arch.dr6 = DR6_INIT;	9498	vcpu->arch.dr6 = DR6_INIT;
9484	kvm_update_dr6(vcpu);
9485	vcpu->arch.dr7 = DR7_FIXED_1;	9499	vcpu->arch.dr7 = DR7_FIXED_1;
9486	kvm_update_dr7(vcpu);	9500	kvm_update_dr7(vcpu);
9487		9501

arch/x86/mm/init_64.c+3−0

 #include <asm/init.h>
 #include <asm/uv/uv.h>
 #include <asm/setup.h>
+#include <asm/ftrace.h>
 #include "mm_internal.h"
 	all_end = roundup((unsigned long)_brk_end, PMD_SIZE);
 	set_memory_nx(text_end, (all_end - text_end) >> PAGE_SHIFT);
+	set_ftrace_ops_ro();
 #ifdef CONFIG_CPA_DEBUG
 	printk(KERN_INFO "Testing CPA: undo %lx-%lx\n", start, end);
 	set_memory_rw(start, (end-start) >> PAGE_SHIFT);

arch/x86/mm/mmio-mod.c+2−2

@@ -372,7 +372,7 @@ static void enter_uniprocessor(void) · 371 unmodified lines
372	int cpu;	372	int cpu;
373	int err;	373	int err;
374		374
375	if (downed_cpus == NULL &&	375	if (!cpumask_available(downed_cpus) &&
376	!alloc_cpumask_var(&downed_cpus, GFP_KERNEL)) {	376	!alloc_cpumask_var(&downed_cpus, GFP_KERNEL)) {
377	pr_notice("Failed to allocate mask\n");	377	pr_notice("Failed to allocate mask\n");
378	goto out;	378	goto out;
@@ -402,7 +402,7 @@ static void leave_uniprocessor(void) · 23 unmodified lines
402	int cpu;	402	int cpu;
403	int err;	403	int err;
404		404
405	if (downed_cpus == NULL \|\| cpumask_weight(downed_cpus) == 0)	405	if (!cpumask_available(downed_cpus) \|\| cpumask_weight(downed_cpus) == 0)
406	return;	406	return;
407	pr_notice("Re-enabling CPUs...\n");	407	pr_notice("Re-enabling CPUs...\n");
408	for_each_cpu(cpu, downed_cpus) {	408	for_each_cpu(cpu, downed_cpus) {

arch/x86/xen/smp_pv.c+1−0

@@ -93,6 +93,7 @@ asmlinkage __visible void cpu_bringup_and_idle(void) · 92 unmodified lines
93	cpu_bringup();	93	cpu_bringup();
94	boot_init_stack_canary();	94	boot_init_stack_canary();
95	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);	95	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
		96	prevent_tail_call_optimization();
96	}	97	}
97		98
98	void xen_smp_intr_free_pv(unsigned int cpu)	99	void xen_smp_intr_free_pv(unsigned int cpu)

drivers/acpi/ec.c+18−6

@@ -1994,23 +1994,35 @@ void acpi_ec_set_gpe_wake_mask(u8 action) · 1993 unmodified lines
1994	acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);	1994	acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);
1995	}	1995	}
1996		1996
1997	bool acpi_ec_other_gpes_active(void)
1998	{
1999	return acpi_any_gpe_status_set(first_ec ? first_ec->gpe : U32_MAX);
2000	}
2001
2002	bool acpi_ec_dispatch_gpe(void)	1997	bool acpi_ec_dispatch_gpe(void)
2003	{	1998	{
2004	u32 ret;	1999	u32 ret;
2005		2000
2006	if (!first_ec)	2001	if (!first_ec)
		2002	return acpi_any_gpe_status_set(U32_MAX);
		2003
		2004	/*
		2005	* Report wakeup if the status bit is set for any enabled GPE other
		2006	* than the EC one.
		2007	*/
		2008	if (acpi_any_gpe_status_set(first_ec->gpe))
		2009	return true;
		2010
		2011	if (ec_no_wakeup)
2007	return false;	2012	return false;
2008		2013
		2014	/*
		2015	* Dispatch the EC GPE in-band, but do not report wakeup in any case
		2016	* to allow the caller to process events properly after that.
		2017	*/
2009	ret = acpi_dispatch_gpe(NULL, first_ec->gpe);	2018	ret = acpi_dispatch_gpe(NULL, first_ec->gpe);
2010	if (ret == ACPI_INTERRUPT_HANDLED) {	2019	if (ret == ACPI_INTERRUPT_HANDLED) {
2011	pm_pr_dbg("EC GPE dispatched\n");	2020	pm_pr_dbg("EC GPE dispatched\n");
2012	return true;	2021
		2022	/* Flush the event and query workqueues. */
		2023	acpi_ec_flush_work();
2013	}	2024	}
		2025
2014	return false;	2026	return false;
2015	}	2027	}
2016	#endif /* CONFIG_PM_SLEEP */	2028	#endif /* CONFIG_PM_SLEEP */

drivers/acpi/internal.h+0−1

@@ -202,7 +202,6 @@ void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit); · 201 unmodified lines
202		202
203	#ifdef CONFIG_PM_SLEEP	203	#ifdef CONFIG_PM_SLEEP
204	void acpi_ec_flush_work(void);	204	void acpi_ec_flush_work(void);
205	bool acpi_ec_other_gpes_active(void);
206	bool acpi_ec_dispatch_gpe(void);	205	bool acpi_ec_dispatch_gpe(void);
207	#endif	206	#endif
208		207

drivers/acpi/sleep.c+6−23

@@ -980,13 +980,6 @@ static int acpi_s2idle_prepare_late(void) · 979 unmodified lines
980	return 0;	980	return 0;
981	}	981	}
982		982
983	static void acpi_s2idle_sync(void)
984	{
985	/* The EC driver uses special workqueues that need to be flushed. */
986	acpi_ec_flush_work();
987	acpi_os_wait_events_complete(); /* synchronize Notify handling */
988	}
989
990	static bool acpi_s2idle_wake(void)	983	static bool acpi_s2idle_wake(void)
991	{	984	{
992	if (!acpi_sci_irq_valid())	985	if (!acpi_sci_irq_valid())
@@ -1013,22 +1006,12 @@ static bool acpi_s2idle_wake(void) · 20 unmodified lines
1013	if (acpi_check_wakeup_handlers())	1006	if (acpi_check_wakeup_handlers())
1014	return true;	1007	return true;
1015		1008
1016	/*	1009	/* Check non-EC GPE wakeups and dispatch the EC GPE. */
1017	* If the status bit is set for any enabled GPE other than the	1010	if (acpi_ec_dispatch_gpe())
1018	* EC one, the wakeup is regarded as a genuine one.
1019	*/
1020	if (acpi_ec_other_gpes_active())
1021	return true;	1011	return true;
1022		1012
1023	/*	1013	/*
1024	* If the EC GPE status bit has not been set, the wakeup is	1014	* Cancel the SCI wakeup and process all pending events in case
1025	* regarded as a spurious one.
1026	*/
1027	if (!acpi_ec_dispatch_gpe())
1028	return false;
1029
1030	/*
1031	* Cancel the wakeup and process all pending events in case
1032	* there are any wakeup ones in there.	1015	* there are any wakeup ones in there.
1033	*	1016	*
1034	* Note that if any non-EC GPEs are active at this point, the	1017	* Note that if any non-EC GPEs are active at this point, the
@@ -1036,8 +1019,7 @@ static bool acpi_s2idle_wake(void) · 1 unmodified line
1036	* should be missed by canceling the wakeup here.	1019	* should be missed by canceling the wakeup here.
1037	*/	1020	*/
1038	pm_system_cancel_wakeup();	1021	pm_system_cancel_wakeup();
1039		1022	acpi_os_wait_events_complete();
1040	acpi_s2idle_sync();
1041		1023
1042	/*	1024	/*
1043	* The SCI is in the "suspended" state now and it cannot produce	1025	* The SCI is in the "suspended" state now and it cannot produce
@@ -1070,7 +1052,8 @@ static void acpi_s2idle_restore(void) · 26 unmodified lines
1070	* of GPEs.	1052	* of GPEs.
1071	*/	1053	*/
1072	acpi_os_wait_events_complete(); /* synchronize GPE processing */	1054	acpi_os_wait_events_complete(); /* synchronize GPE processing */
1073	acpi_s2idle_sync();	1055	acpi_ec_flush_work(); /* flush the EC driver's workqueues */
		1056	acpi_os_wait_events_complete(); /* synchronize Notify handling */
1074		1057
1075	s2idle_wakeup = false;	1058	s2idle_wakeup = false;
1076		1059

drivers/base/core.c+37−18

 				link->flags |= DL_FLAG_STATELESS;
 				goto reorder;
 			} else {
+				link->flags |= DL_FLAG_STATELESS;
 				goto out;
 			}
 		}
 	    flags & DL_FLAG_PM_RUNTIME)
 		pm_runtime_resume(supplier);
+	list_add_tail_rcu(&link->s_node, &supplier->links.consumers);
+	list_add_tail_rcu(&link->c_node, &consumer->links.suppliers);
 	if (flags & DL_FLAG_SYNC_STATE_ONLY) {
 		dev_dbg(consumer,
 			"Linked as a sync state only consumer to %s\n",
 			dev_name(supplier));
 		goto out;
 	}
 reorder:
 	/*
 	 * Move the consumer and all of the devices depending on it to the end
 	 */
 	device_reorder_to_tail(consumer, NULL);
-	list_add_tail_rcu(&link->s_node, &supplier->links.consumers);
-	list_add_tail_rcu(&link->c_node, &consumer->links.suppliers);
 	dev_dbg(consumer, "Linked as a consumer to %s\n", dev_name(supplier));
- out:
+out:
 	device_pm_unlock();
 	device_links_write_unlock();
 		list_add_tail(&sup->links.defer_sync, &deferred_sync);
 }
+static void device_link_drop_managed(struct device_link *link)
+{
+	link->flags &= ~DL_FLAG_MANAGED;
+	WRITE_ONCE(link->status, DL_STATE_NONE);
+	kref_put(&link->kref, __device_link_del);
+}
 /**
  * device_links_driver_bound - Update device links after probing its driver.
  * @dev: Device to update the links for.
  */
 void device_links_driver_bound(struct device *dev)
 {
-	struct device_link *link;
+	struct device_link *link, *ln;
 	LIST_HEAD(sync_list);
 	/*
 	else
 		__device_links_queue_sync_state(dev, &sync_list);
-	list_for_each_entry(link, &dev->links.suppliers, c_node) {
+	list_for_each_entry_safe(link, ln, &dev->links.suppliers, c_node) {
+		struct device *supplier;
 		if (!(link->flags & DL_FLAG_MANAGED))
 			continue;
-		WARN_ON(link->status != DL_STATE_CONSUMER_PROBE);
+		supplier = link->supplier;
-		WRITE_ONCE(link->status, DL_STATE_ACTIVE);
+		if (link->flags & DL_FLAG_SYNC_STATE_ONLY) {
+			/*
+			 * When DL_FLAG_SYNC_STATE_ONLY is set, it means no
+			 * other DL_MANAGED_LINK_FLAGS have been set. So, it's
+			 * save to drop the managed link completely.
+			 */
+			device_link_drop_managed(link);
+		} else {
+			WARN_ON(link->status != DL_STATE_CONSUMER_PROBE);
+			WRITE_ONCE(link->status, DL_STATE_ACTIVE);
+		}
+		/*
+		 * This needs to be done even for the deleted
+		 * DL_FLAG_SYNC_STATE_ONLY device link in case it was the last
+		 * device link that was preventing the supplier from getting a
+		 * sync_state() call.
+		 */
 		if (defer_sync_state_count)
-			__device_links_supplier_defer_sync(link->supplier);
+			__device_links_supplier_defer_sync(supplier);
 		else
-			__device_links_queue_sync_state(link->supplier,
+			__device_links_queue_sync_state(supplier, &sync_list);
-							&sync_list);
 	}
 	dev->links.status = DL_DEV_DRIVER_BOUND;
 	device_links_flush_sync_list(&sync_list, dev);
 }
-static void device_link_drop_managed(struct device_link *link)
-{
-	link->flags &= ~DL_FLAG_MANAGED;
-	WRITE_ONCE(link->status, DL_STATE_NONE);
-	kref_put(&link->kref, __device_link_del);
-}
 /**
  * __device_links_no_driver - Update links of a device without a driver.
  * @dev: Device without a drvier.

drivers/block/null_blk_main.c+7−0

@@ -1535,6 +1535,13 @@ static void null_config_discard(struct nullb *nullb) · 1534 unmodified lines
1535	{	1535	{
1536	if (nullb->dev->discard == false)	1536	if (nullb->dev->discard == false)
1537	return;	1537	return;
		1538
		1539	if (nullb->dev->zoned) {
		1540	nullb->dev->discard = false;
		1541	pr_info("discard option is ignored in zoned mode\n");
		1542	return;
		1543	}
		1544
1538	nullb->q->limits.discard_granularity = nullb->dev->blocksize;	1545	nullb->q->limits.discard_granularity = nullb->dev->blocksize;
1539	nullb->q->limits.discard_alignment = nullb->dev->blocksize;	1546	nullb->q->limits.discard_alignment = nullb->dev->blocksize;
1540	blk_queue_max_discard_sectors(nullb->q, UINT_MAX >> 9);	1547	blk_queue_max_discard_sectors(nullb->q, UINT_MAX >> 9);

drivers/block/null_blk_zoned.c+4−0

 		pr_err("zone_size must be power-of-two\n");
 		return -EINVAL;
 	}
+	if (dev->zone_size > dev->size) {
+		pr_err("Zone size larger than device capacity\n");
+		return -EINVAL;
+	}
 	dev->zone_size_sects = dev->zone_size << ZONE_SIZE_SHIFT;
 	dev->nr_zones = dev_size >>

drivers/bus/mhi/core/init.c+2−0

 	}
 	/* Setup cmd context */
+	ret = -ENOMEM;
 	mhi_ctxt->cmd_ctxt = mhi_alloc_coherent(mhi_cntrl,
 						sizeof(*mhi_ctxt->cmd_ctxt) *
 						NR_OF_CMD_RINGS,
 		}
 	}
+	ret = -EINVAL;
 	if (dl_chan) {
 		/*
 		 * If channel supports LPM notifications then status_cb should

drivers/char/ipmi/ipmi_ssif.c+2−2

@@ -1947,8 +1947,8 @@ static int ssif_adapter_handler(struct device adev, void opaque) · 1946 unmodified lines
1947	if (adev->type != &i2c_adapter_type)	1947	if (adev->type != &i2c_adapter_type)
1948	return 0;	1948	return 0;
1949		1949
1950	addr_info->added_client = i2c_new_device(to_i2c_adapter(adev),	1950	addr_info->added_client = i2c_new_client_device(to_i2c_adapter(adev),
1951	&addr_info->binfo);	1951	&addr_info->binfo);
1952		1952
1953	if (!addr_info->adapter_name)	1953	if (!addr_info->adapter_name)
1954	return 1; /* Only try the first I2C adapter by default. */	1954	return 1; /* Only try the first I2C adapter by default. */

drivers/clk/clk.c+3−0

@@ -3519,6 +3519,9 @@ static int __clk_core_init(struct clk_core *core) · 3518 unmodified lines
3519	out:	3519	out:
3520	clk_pm_runtime_put(core);	3520	clk_pm_runtime_put(core);
3521	unlock:	3521	unlock:
		3522	if (ret)
		3523	hlist_del_init(&core->child_node);
		3524
3522	clk_prepare_unlock();	3525	clk_prepare_unlock();
3523		3526
3524	if (!ret)	3527	if (!ret)

drivers/clk/rockchip/clk-rk3228.c+4−13

 PNAME(mux_i2s2_p)		= { "i2s2_src", "i2s2_frac", "xin12m" };
 PNAME(mux_sclk_spdif_p)		= { "sclk_spdif_src", "spdif_frac", "xin12m" };
-PNAME(mux_aclk_gpu_pre_p)	= { "cpll_gpu", "gpll_gpu", "hdmiphy_gpu", "usb480m_gpu" };
 PNAME(mux_uart0_p)		= { "uart0_src", "uart0_frac", "xin24m" };
 PNAME(mux_uart1_p)		= { "uart1_src", "uart1_frac", "xin24m" };
 PNAME(mux_uart2_p)		= { "uart2_src", "uart2_frac", "xin24m" };
 			RK2928_CLKSEL_CON(24), 6, 10, DFLAGS,
 			RK2928_CLKGATE_CON(2), 8, GFLAGS),
-	GATE(0, "cpll_gpu", "cpll", 0,
+	COMPOSITE(0, "aclk_gpu_pre", mux_pll_src_4plls_p, 0,
-			RK2928_CLKGATE_CON(3), 13, GFLAGS),
+			RK2928_CLKSEL_CON(34), 5, 2, MFLAGS, 0, 5, DFLAGS,
-	GATE(0, "gpll_gpu", "gpll", 0,
-			RK2928_CLKGATE_CON(3), 13, GFLAGS),
-	GATE(0, "hdmiphy_gpu", "hdmiphy", 0,
-			RK2928_CLKGATE_CON(3), 13, GFLAGS),
-	GATE(0, "usb480m_gpu", "usb480m", 0,
 			RK2928_CLKGATE_CON(3), 13, GFLAGS),
-	COMPOSITE_NOGATE(0, "aclk_gpu_pre", mux_aclk_gpu_pre_p, 0,
-			RK2928_CLKSEL_CON(34), 5, 2, MFLAGS, 0, 5, DFLAGS),
 	COMPOSITE(SCLK_SPI0, "sclk_spi0", mux_pll_src_2plls_p, 0,
 			RK2928_CLKSEL_CON(25), 8, 1, MFLAGS, 0, 7, DFLAGS,
 	GATE(0, "pclk_peri_noc", "pclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(12), 2, GFLAGS),
 	/* PD_GPU */
-	GATE(ACLK_GPU, "aclk_gpu", "aclk_gpu_pre", 0, RK2928_CLKGATE_CON(13), 14, GFLAGS),
+	GATE(ACLK_GPU, "aclk_gpu", "aclk_gpu_pre", 0, RK2928_CLKGATE_CON(7), 14, GFLAGS),
-	GATE(0, "aclk_gpu_noc", "aclk_gpu_pre", 0, RK2928_CLKGATE_CON(13), 15, GFLAGS),
+	GATE(0, "aclk_gpu_noc", "aclk_gpu_pre", 0, RK2928_CLKGATE_CON(7), 15, GFLAGS),
 	/* PD_BUS */
 	GATE(0, "sclk_initmem_mbist", "aclk_cpu", 0, RK2928_CLKGATE_CON(8), 1, GFLAGS),

drivers/clk/tegra/clk-tegra124.c+1−1

@@ -1292,7 +1292,7 @@ static struct tegra_clk_init_table common_init_table[] __initdata = { · 1291 unmodified lines
1292	{ TEGRA124_CLK_UARTB, TEGRA124_CLK_PLL_P, 408000000, 0 },	1292	{ TEGRA124_CLK_UARTB, TEGRA124_CLK_PLL_P, 408000000, 0 },
1293	{ TEGRA124_CLK_UARTC, TEGRA124_CLK_PLL_P, 408000000, 0 },	1293	{ TEGRA124_CLK_UARTC, TEGRA124_CLK_PLL_P, 408000000, 0 },
1294	{ TEGRA124_CLK_UARTD, TEGRA124_CLK_PLL_P, 408000000, 0 },	1294	{ TEGRA124_CLK_UARTD, TEGRA124_CLK_PLL_P, 408000000, 0 },
1295	{ TEGRA124_CLK_PLL_A, TEGRA124_CLK_CLK_MAX, 564480000, 0 },	1295	{ TEGRA124_CLK_PLL_A, TEGRA124_CLK_CLK_MAX, 282240000, 0 },
1296	{ TEGRA124_CLK_PLL_A_OUT0, TEGRA124_CLK_CLK_MAX, 11289600, 0 },	1296	{ TEGRA124_CLK_PLL_A_OUT0, TEGRA124_CLK_CLK_MAX, 11289600, 0 },
1297	{ TEGRA124_CLK_I2S0, TEGRA124_CLK_PLL_A_OUT0, 11289600, 0 },	1297	{ TEGRA124_CLK_I2S0, TEGRA124_CLK_PLL_A_OUT0, 11289600, 0 },
1298	{ TEGRA124_CLK_I2S1, TEGRA124_CLK_PLL_A_OUT0, 11289600, 0 },	1298	{ TEGRA124_CLK_I2S1, TEGRA124_CLK_PLL_A_OUT0, 11289600, 0 },

drivers/clk/ti/clk-33xx.c+1−1

@@ -212,7 +212,7 @@ static const struct omap_clkctrl_reg_data am3_mpu_clkctrl_regs[] __initconst = { · 211 unmodified lines
212	};	212	};
213		213
214	static const struct omap_clkctrl_reg_data am3_l4_rtc_clkctrl_regs[] __initconst = {	214	static const struct omap_clkctrl_reg_data am3_l4_rtc_clkctrl_regs[] __initconst = {
215	{ AM3_L4_RTC_RTC_CLKCTRL, NULL, CLKF_SW_SUP, "clk_32768_ck" },	215	{ AM3_L4_RTC_RTC_CLKCTRL, NULL, CLKF_SW_SUP, "clk-24mhz-clkctrl:0000:0" },
216	{ 0 },	216	{ 0 },
217	};	217	};
218		218

drivers/clk/ti/clkctrl.c+48−51

@@ -255,24 +255,53 @@ static struct clk_hw _ti_omap4_clkctrl_xlate(struct of_phandle_args clkspec, · 254 unmodified lines
255	return entry->clk;	255	return entry->clk;
256	}	256	}
257		257
		258	/* Get clkctrl clock base name based on clkctrl_name or dts node */
		259	static const char * __init clkctrl_get_clock_name(struct device_node *np,
		260	const char *clkctrl_name,
		261	int offset, int index,
		262	bool legacy_naming)
		263	{
		264	char *clock_name;
		265
		266	/* l4per-clkctrl:1234:0 style naming based on clkctrl_name */
		267	if (clkctrl_name && !legacy_naming) {
		268	clock_name = kasprintf(GFP_KERNEL, "%s-clkctrl:%04x:%d",
		269	clkctrl_name, offset, index);
		270	strreplace(clock_name, '_', '-');
		271
		272	return clock_name;
		273	}
		274
		275	/* l4per:1234:0 old style naming based on clkctrl_name */
		276	if (clkctrl_name)
		277	return kasprintf(GFP_KERNEL, "%s_cm:clk:%04x:%d",
		278	clkctrl_name, offset, index);
		279
		280	/* l4per_cm:1234:0 old style naming based on parent node name */
		281	if (legacy_naming)
		282	return kasprintf(GFP_KERNEL, "%pOFn:clk:%04x:%d",
		283	np->parent, offset, index);
		284
		285	/* l4per-clkctrl:1234:0 style naming based on node name */
		286	return kasprintf(GFP_KERNEL, "%pOFn:%04x:%d", np, offset, index);
		287	}
		288
258	static int __init	289	static int __init
259	_ti_clkctrl_clk_register(struct omap_clkctrl_provider *provider,	290	_ti_clkctrl_clk_register(struct omap_clkctrl_provider *provider,
260	struct device_node node, struct clk_hw clk_hw,	291	struct device_node node, struct clk_hw clk_hw,
261	u16 offset, u8 bit, const char * const *parents,	292	u16 offset, u8 bit, const char * const *parents,
262	int num_parents, const struct clk_ops *ops)	293	int num_parents, const struct clk_ops *ops,
		294	const char *clkctrl_name)
263	{	295	{
264	struct clk_init_data init = { NULL };	296	struct clk_init_data init = { NULL };
265	struct clk *clk;	297	struct clk *clk;
266	struct omap_clkctrl_clk *clkctrl_clk;	298	struct omap_clkctrl_clk *clkctrl_clk;
267	int ret = 0;	299	int ret = 0;
268		300
269	if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)	301	init.name = clkctrl_get_clock_name(node, clkctrl_name, offset, bit,
270	init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d",	302	ti_clk_get_features()->flags &
271	node->parent, node, offset,	303	TI_CLK_CLKCTRL_COMPAT);
272	bit);	304
273	else
274	init.name = kasprintf(GFP_KERNEL, "%pOFn:%04x:%d", node,
275	offset, bit);
276	clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);	305	clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);
277	if (!init.name \|\| !clkctrl_clk) {	306	if (!init.name \|\| !clkctrl_clk) {
278	ret = -ENOMEM;	307	ret = -ENOMEM;
@@ -309,7 +338,7 @@ static void __init · 30 unmodified lines
309	_ti_clkctrl_setup_gate(struct omap_clkctrl_provider *provider,	338	_ti_clkctrl_setup_gate(struct omap_clkctrl_provider *provider,
310	struct device_node *node, u16 offset,	339	struct device_node *node, u16 offset,
311	const struct omap_clkctrl_bit_data *data,	340	const struct omap_clkctrl_bit_data *data,
312	void __iomem *reg)	341	void __iomem reg, const char clkctrl_name)
313	{	342	{
314	struct clk_hw_omap *clk_hw;	343	struct clk_hw_omap *clk_hw;
315		344
@@ -322,7 +351,7 @@ _ti_clkctrl_setup_gate(struct omap_clkctrl_provider *provider, · 6 unmodified lines
322		351
323	if (_ti_clkctrl_clk_register(provider, node, &clk_hw->hw, offset,	352	if (_ti_clkctrl_clk_register(provider, node, &clk_hw->hw, offset,
324	data->bit, data->parents, 1,	353	data->bit, data->parents, 1,
325	&omap_gate_clk_ops))	354	&omap_gate_clk_ops, clkctrl_name))
326	kfree(clk_hw);	355	kfree(clk_hw);
327	}	356	}
328		357
@@ -330,7 +359,7 @@ static void __init · 1 unmodified line
330	_ti_clkctrl_setup_mux(struct omap_clkctrl_provider *provider,	359	_ti_clkctrl_setup_mux(struct omap_clkctrl_provider *provider,
331	struct device_node *node, u16 offset,	360	struct device_node *node, u16 offset,
332	const struct omap_clkctrl_bit_data *data,	361	const struct omap_clkctrl_bit_data *data,
333	void __iomem *reg)	362	void __iomem reg, const char clkctrl_name)
334	{	363	{
335	struct clk_omap_mux *mux;	364	struct clk_omap_mux *mux;
336	int num_parents = 0;	365	int num_parents = 0;
@@ -357,7 +386,7 @@ _ti_clkctrl_setup_mux(struct omap_clkctrl_provider *provider, · 20 unmodified lines
357		386
358	if (_ti_clkctrl_clk_register(provider, node, &mux->hw, offset,	387	if (_ti_clkctrl_clk_register(provider, node, &mux->hw, offset,
359	data->bit, data->parents, num_parents,	388	data->bit, data->parents, num_parents,
360	&ti_clk_mux_ops))	389	&ti_clk_mux_ops, clkctrl_name))
361	kfree(mux);	390	kfree(mux);
362	}	391	}
363		392
@@ -365,7 +394,7 @@ static void __init · 1 unmodified line
365	_ti_clkctrl_setup_div(struct omap_clkctrl_provider *provider,	394	_ti_clkctrl_setup_div(struct omap_clkctrl_provider *provider,
366	struct device_node *node, u16 offset,	395	struct device_node *node, u16 offset,
367	const struct omap_clkctrl_bit_data *data,	396	const struct omap_clkctrl_bit_data *data,
368	void __iomem *reg)	397	void __iomem reg, const char clkctrl_name)
369	{	398	{
370	struct clk_omap_divider *div;	399	struct clk_omap_divider *div;
371	const struct omap_clkctrl_div_data *div_data = data->data;	400	const struct omap_clkctrl_div_data *div_data = data->data;
@@ -393,7 +422,7 @@ _ti_clkctrl_setup_div(struct omap_clkctrl_provider *provider, · 21 unmodified lines
393		422
394	if (_ti_clkctrl_clk_register(provider, node, &div->hw, offset,	423	if (_ti_clkctrl_clk_register(provider, node, &div->hw, offset,
395	data->bit, data->parents, 1,	424	data->bit, data->parents, 1,
396	&ti_clk_divider_ops))	425	&ti_clk_divider_ops, clkctrl_name))
397	kfree(div);	426	kfree(div);
398	}	427	}
399		428
@@ -401,7 +430,7 @@ static void __init · 1 unmodified line
401	_ti_clkctrl_setup_subclks(struct omap_clkctrl_provider *provider,	430	_ti_clkctrl_setup_subclks(struct omap_clkctrl_provider *provider,
402	struct device_node *node,	431	struct device_node *node,
403	const struct omap_clkctrl_reg_data *data,	432	const struct omap_clkctrl_reg_data *data,
404	void __iomem *reg)	433	void __iomem reg, const char clkctrl_name)
405	{	434	{
406	const struct omap_clkctrl_bit_data *bits = data->bit_data;	435	const struct omap_clkctrl_bit_data *bits = data->bit_data;
407		436
@@ -412,17 +441,17 @@ _ti_clkctrl_setup_subclks(struct omap_clkctrl_provider *provider, · 4 unmodified lines
412	switch (bits->type) {	441	switch (bits->type) {
413	case TI_CLK_GATE:	442	case TI_CLK_GATE:
414	_ti_clkctrl_setup_gate(provider, node, data->offset,	443	_ti_clkctrl_setup_gate(provider, node, data->offset,
415	bits, reg);	444	bits, reg, clkctrl_name);
416	break;	445	break;
417		446
418	case TI_CLK_DIVIDER:	447	case TI_CLK_DIVIDER:
419	_ti_clkctrl_setup_div(provider, node, data->offset,	448	_ti_clkctrl_setup_div(provider, node, data->offset,
420	bits, reg);	449	bits, reg, clkctrl_name);
421	break;	450	break;
422		451
423	case TI_CLK_MUX:	452	case TI_CLK_MUX:
424	_ti_clkctrl_setup_mux(provider, node, data->offset,	453	_ti_clkctrl_setup_mux(provider, node, data->offset,
425	bits, reg);	454	bits, reg, clkctrl_name);
426	break;	455	break;
427		456
428	default:	457	default:
@@ -461,42 +490,10 @@ static char * __init clkctrl_get_name(struct device_node *np) · 32 unmodified lines
461	return name;	490	return name;
462	}	491	}
463	}	492	}
464	of_node_put(np);
465		493
466	return NULL;	494	return NULL;
467	}	495	}
468		496
469	/* Get clkctrl clock base name based on clkctrl_name or dts node */
470	static const char * __init clkctrl_get_clock_name(struct device_node *np,
471	const char *clkctrl_name,
472	int offset, int index,
473	bool legacy_naming)
474	{
475	char *clock_name;
476
477	/* l4per-clkctrl:1234:0 style naming based on clkctrl_name */
478	if (clkctrl_name && !legacy_naming) {
479	clock_name = kasprintf(GFP_KERNEL, "%s-clkctrl:%04x:%d",
480	clkctrl_name, offset, index);
481	strreplace(clock_name, '_', '-');
482
483	return clock_name;
484	}
485
486	/* l4per:1234:0 old style naming based on clkctrl_name */
487	if (clkctrl_name)
488	return kasprintf(GFP_KERNEL, "%s_cm:clk:%04x:%d",
489	clkctrl_name, offset, index);
490
491	/* l4per_cm:1234:0 old style naming based on parent node name */
492	if (legacy_naming)
493	return kasprintf(GFP_KERNEL, "%pOFn:clk:%04x:%d",
494	np->parent, offset, index);
495
496	/* l4per-clkctrl:1234:0 style naming based on node name */
497	return kasprintf(GFP_KERNEL, "%pOFn:%04x:%d", np, offset, index);
498	}
499
500	static void __init _ti_omap4_clkctrl_setup(struct device_node *node)	497	static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
501	{	498	{
502	struct omap_clkctrl_provider *provider;	499	struct omap_clkctrl_provider *provider;
@@ -664,7 +661,7 @@ clkdm_found: · 161 unmodified lines
664	hw->enable_reg.ptr = provider->base + reg_data->offset;	661	hw->enable_reg.ptr = provider->base + reg_data->offset;
665		662
666	_ti_clkctrl_setup_subclks(provider, node, reg_data,	663	_ti_clkctrl_setup_subclks(provider, node, reg_data,
667	hw->enable_reg.ptr);	664	hw->enable_reg.ptr, clkctrl_name);
668		665
669	if (reg_data->flags & CLKF_SW_SUP)	666	if (reg_data->flags & CLKF_SW_SUP)
670	hw->enable_bit = MODULEMODE_SWCTRL;	667	hw->enable_bit = MODULEMODE_SWCTRL;

drivers/clk/versatile/clk-impd1.c+1−0

@@ -206,6 +206,7 @@ static int integrator_impd1_clk_spawn(struct device *dev, · 205 unmodified lines
206	return -ENODEV;	206	return -ENODEV;
207	}	207	}
208		208
		209	of_property_read_string(np, "clock-output-names", &name);
209	parent_name = of_clk_get_parent_name(np, 0);	210	parent_name = of_clk_get_parent_name(np, 0);
210	clk = icst_clk_setup(NULL, desc, name, parent_name, map,	211	clk = icst_clk_setup(NULL, desc, name, parent_name, map,
211	ICST_INTEGRATOR_IM_PD1);	212	ICST_INTEGRATOR_IM_PD1);

drivers/dax/kmem.c+11−3

 	resource_size_t kmem_size;
 	resource_size_t kmem_end;
 	struct resource *new_res;
+	const char *new_res_name;
 	int numa_node;
 	int rc;
 	kmem_size &= ~(memory_block_size_bytes() - 1);
 	kmem_end = kmem_start + kmem_size;
-	/* Region is permanently reserved.  Hot-remove not yet implemented. */
+	new_res_name = kstrdup(dev_name(dev), GFP_KERNEL);
-	new_res = request_mem_region(kmem_start, kmem_size, dev_name(dev));
+	if (!new_res_name)
+		return -ENOMEM;
+	/* Region is permanently reserved if hotremove fails. */
+	new_res = request_mem_region(kmem_start, kmem_size, new_res_name);
 	if (!new_res) {
 		dev_warn(dev, "could not reserve region [%pa-%pa]\n",
 			 &kmem_start, &kmem_end);
+		kfree(new_res_name);
 		return -EBUSY;
 	}
 	 * unknown to us that will break add_memory() below.
 	 */
 	new_res->flags = IORESOURCE_SYSTEM_RAM;
-	new_res->name = dev_name(dev);
 	rc = add_memory(numa_node, new_res->start, resource_size(new_res));
 	if (rc) {
 		release_resource(new_res);
 		kfree(new_res);
+		kfree(new_res_name);
 		return rc;
 	}
 	dev_dax->dax_kmem_res = new_res;
 	struct resource *res = dev_dax->dax_kmem_res;
 	resource_size_t kmem_start = res->start;
 	resource_size_t kmem_size = resource_size(res);
+	const char *res_name = res->name;
 	int rc;
 	/*
 	/* Release and free dax resources */
 	release_resource(res);
 	kfree(res);
+	kfree(res_name);
 	dev_dax->dax_kmem_res = NULL;
 	return 0;

drivers/dma/dmatest.c+5−4

 		mutex_unlock(&info->lock);
 		return ret;
 	} else if (dmatest_run) {
-		if (is_threaded_test_pending(info))
+		if (!is_threaded_test_pending(info)) {
-			start_threaded_tests(info);
+			pr_info("No channels configured, continue with any\n");
-		else
+			add_threaded_test(info);
-			pr_info("Could not start test, no channels configured\n");
+		}
+		start_threaded_tests(info);
 	} else {
 		stop_threaded_test(info);
 	}

drivers/dma/idxd/device.c+7−0

@@ -62,6 +62,13 @@ int idxd_unmask_msix_vector(struct idxd_device *idxd, int vec_id) · 61 unmodified lines
62	perm.ignore = 0;	62	perm.ignore = 0;
63	iowrite32(perm.bits, idxd->reg_base + offset);	63	iowrite32(perm.bits, idxd->reg_base + offset);
64		64
		65	/*
		66	* A readback from the device ensures that any previously generated
		67	* completion record writes are visible to software based on PCI
		68	* ordering rules.
		69	*/
		70	perm.bits = ioread32(idxd->reg_base + offset);
		71
65	return 0;	72	return 0;
66	}	73	}
67		74

drivers/dma/idxd/irq.c+19−7

 	struct llist_node *head;
 	int queued = 0;
+	*processed = 0;
 	head = llist_del_all(&irq_entry->pending_llist);
 	if (!head)
 		return 0;
 	struct list_head *node, *next;
 	int queued = 0;
+	*processed = 0;
 	if (list_empty(&irq_entry->work_list))
 		return 0;
 	return queued;
 }
-irqreturn_t idxd_wq_thread(int irq, void *data)
+static int idxd_desc_process(struct idxd_irq_entry *irq_entry)
 {
-	struct idxd_irq_entry *irq_entry = data;
+	int rc, processed, total = 0;
-	int rc, processed = 0, retry = 0;
 	/*
 	 * There are two lists we are processing. The pending_llist is where
 	 */
 	do {
 		rc = irq_process_work_list(irq_entry, &processed);
-		if (rc != 0) {
+		total += processed;
-			retry++;
+		if (rc != 0)
 			continue;
-		}
 		rc = irq_process_pending_llist(irq_entry, &processed);
-	} while (rc != 0 && retry != 10);
+		total += processed;
+	} while (rc != 0);
+	return total;
+}
+irqreturn_t idxd_wq_thread(int irq, void *data)
+{
+	struct idxd_irq_entry *irq_entry = data;
+	int processed;
+	processed = idxd_desc_process(irq_entry);
 	idxd_unmask_msix_vector(irq_entry->idxd, irq_entry->id);
+	/* catch anything unprocessed after unmasking */
+	processed += idxd_desc_process(irq_entry);
 	if (processed == 0)
 		return IRQ_NONE;

drivers/dma/owl-dma.c+3−5

  * @id: physical index to this channel
  * @base: virtual memory base for the dma channel
  * @vchan: the virtual channel currently being served by this physical channel
- * @lock: a lock to use when altering an instance of this struct
  */
 struct owl_dma_pchan {
 	u32			id;
 	void __iomem		*base;
 	struct owl_dma_vchan	*vchan;
-	spinlock_t		lock;
 };
 /**
 	for (i = 0; i < od->nr_pchans; i++) {
 		pchan = &od->pchans[i];
-		spin_lock_irqsave(&pchan->lock, flags);
+		spin_lock_irqsave(&od->lock, flags);
 		if (!pchan->vchan) {
 			pchan->vchan = vchan;
-			spin_unlock_irqrestore(&pchan->lock, flags);
+			spin_unlock_irqrestore(&od->lock, flags);
 			break;
 		}
-		spin_unlock_irqrestore(&pchan->lock, flags);
+		spin_unlock_irqrestore(&od->lock, flags);
 	}
 	return pchan;

drivers/dma/tegra210-adma.c+1−1

@@ -900,7 +900,7 @@ static int tegra_adma_probe(struct platform_device *pdev) · 899 unmodified lines
900	ret = dma_async_device_register(&tdma->dma_dev);	900	ret = dma_async_device_register(&tdma->dma_dev);
901	if (ret < 0) {	901	if (ret < 0) {
902	dev_err(&pdev->dev, "ADMA registration failed: %d\n", ret);	902	dev_err(&pdev->dev, "ADMA registration failed: %d\n", ret);
903	goto irq_dispose;	903	goto rpm_put;
904	}	904	}
905		905
906	ret = of_dma_controller_register(pdev->dev.of_node,	906	ret = of_dma_controller_register(pdev->dev.of_node,

drivers/dma/ti/k3-udma.c+4−2

 		d->residue += sg_dma_len(sgent);
 	}
-	cppi5_tr_csf_set(&tr_req[tr_idx - 1].flags, CPPI5_TR_CSF_EOP);
+	cppi5_tr_csf_set(&tr_req[tr_idx - 1].flags,
+			 CPPI5_TR_CSF_SUPR_EVT | CPPI5_TR_CSF_EOP);
 	return d;
 }
 		tr_req[1].dicnt3 = 1;
 	}
-	cppi5_tr_csf_set(&tr_req[num_tr - 1].flags, CPPI5_TR_CSF_EOP);
+	cppi5_tr_csf_set(&tr_req[num_tr - 1].flags,
+			 CPPI5_TR_CSF_SUPR_EVT | CPPI5_TR_CSF_EOP);
 	if (uc->config.metadata_size)
 		d->vd.tx.metadata_ops = &metadata_ops;

drivers/dma/xilinx/zynqmp_dma.c+1−2

 	struct zynqmp_dma_desc_sw *child, *next;
 	chan->desc_free_cnt++;
+	list_del(&sdesc->node);
 	list_add_tail(&sdesc->node, &chan->free_list);
 	list_for_each_entry_safe(child, next, &sdesc->tx_list, node) {
 		chan->desc_free_cnt++;
 		dma_async_tx_callback callback;
 		void *callback_param;
-		list_del(&desc->node);
 		callback = desc->async_tx.callback;
 		callback_param = desc->async_tx.callback_param;
 		if (callback) {

drivers/firmware/efi/cper.c+62−0

@@ -407,6 +407,58 @@ static void cper_print_pcie(const char pfx, const struct cper_sec_pcie pcie, · 406 unmodified lines
407	}	407	}
408	}	408	}
409		409
		410	static const char * const fw_err_rec_type_strs[] = {
		411	"IPF SAL Error Record",
		412	"SOC Firmware Error Record Type1 (Legacy CrashLog Support)",
		413	"SOC Firmware Error Record Type2",
		414	};
		415
		416	static void cper_print_fw_err(const char *pfx,
		417	struct acpi_hest_generic_data *gdata,
		418	const struct cper_sec_fw_err_rec_ref *fw_err)
		419	{
		420	void *buf = acpi_hest_get_payload(gdata);
		421	u32 offset, length = gdata->error_data_length;
		422
		423	printk("%s""Firmware Error Record Type: %s\n", pfx,
		424	fw_err->record_type < ARRAY_SIZE(fw_err_rec_type_strs) ?
		425	fw_err_rec_type_strs[fw_err->record_type] : "unknown");
		426	printk("%s""Revision: %d\n", pfx, fw_err->revision);
		427
		428	/* Record Type based on UEFI 2.7 */
		429	if (fw_err->revision == 0) {
		430	printk("%s""Record Identifier: %08llx\n", pfx,
		431	fw_err->record_identifier);
		432	} else if (fw_err->revision == 2) {
		433	printk("%s""Record Identifier: %pUl\n", pfx,
		434	&fw_err->record_identifier_guid);
		435	}
		436
		437	/*
		438	* The FW error record may contain trailing data beyond the
		439	* structure defined by the specification. As the fields
		440	* defined (and hence the offset of any trailing data) vary
		441	* with the revision, set the offset to account for this
		442	* variation.
		443	*/
		444	if (fw_err->revision == 0) {
		445	/* record_identifier_guid not defined */
		446	offset = offsetof(struct cper_sec_fw_err_rec_ref,
		447	record_identifier_guid);
		448	} else if (fw_err->revision == 1) {
		449	/* record_identifier not defined */
		450	offset = offsetof(struct cper_sec_fw_err_rec_ref,
		451	record_identifier);
		452	} else {
		453	offset = sizeof(*fw_err);
		454	}
		455
		456	buf += offset;
		457	length -= offset;
		458
		459	print_hex_dump(pfx, "", DUMP_PREFIX_OFFSET, 16, 4, buf, length, true);
		460	}
		461
410	static void cper_print_tstamp(const char *pfx,	462	static void cper_print_tstamp(const char *pfx,
411	struct acpi_hest_generic_data_v300 *gdata)	463	struct acpi_hest_generic_data_v300 *gdata)
412	{	464	{
@@ -494,6 +546,16 @@ cper_estatus_print_section(const char pfx, struct acpi_hest_generic_data gdata · 81 unmodified lines
494	else	546	else
495	goto err_section_too_small;	547	goto err_section_too_small;
496	#endif	548	#endif
		549	} else if (guid_equal(sec_type, &CPER_SEC_FW_ERR_REC_REF)) {
		550	struct cper_sec_fw_err_rec_ref *fw_err = acpi_hest_get_payload(gdata);
		551
		552	printk("%ssection_type: Firmware Error Record Reference\n",
		553	newpfx);
		554	/* The minimal FW Error Record contains 16 bytes */
		555	if (gdata->error_data_length >= SZ_16)
		556	cper_print_fw_err(newpfx, gdata, fw_err);
		557	else
		558	goto err_section_too_small;
497	} else {	559	} else {
498	const void *err = acpi_hest_get_payload(gdata);	560	const void *err = acpi_hest_get_payload(gdata);
499		561

drivers/firmware/efi/earlycon.c+8−6

@@ -114,14 +114,16 @@ static void efi_earlycon_write_char(u32 *dst, unsigned char c, unsigned int h) · 113 unmodified lines
114	const u32 color_black = 0x00000000;	114	const u32 color_black = 0x00000000;
115	const u32 color_white = 0x00ffffff;	115	const u32 color_white = 0x00ffffff;
116	const u8 *src;	116	const u8 *src;
117	u8 s8;	117	int m, n, bytes;
118	int m;	118	u8 x;
119		119
120	src = font->data + c * font->height;	120	bytes = BITS_TO_BYTES(font->width);
121	s8 = *(src + h);	121	src = font->data + c * font->height * bytes + h * bytes;
122		122
123	for (m = 0; m < 8; m++) {	123	for (m = 0; m < font->width; m++) {
124	if ((s8 >> (7 - m)) & 1)	124	n = m % 8;
		125	x = *(src + m / 8);
		126	if ((x >> (7 - n)) & 1)
125	*dst = color_white;	127	*dst = color_white;
126	else	128	else
127	*dst = color_black;	129	*dst = color_black;

drivers/firmware/efi/efi.c+1−4

 	if (efi.smbios != EFI_INVALID_TABLE_ADDR)
 		str += sprintf(str, "SMBIOS=0x%lx\n", efi.smbios);
-	if (IS_ENABLED(CONFIG_IA64) || IS_ENABLED(CONFIG_X86)) {
+	if (IS_ENABLED(CONFIG_IA64) || IS_ENABLED(CONFIG_X86))
-		extern char *efi_systab_show_arch(char *str);
 		str = efi_systab_show_arch(str);
-	}
 	return str - buf;
 }

drivers/firmware/efi/libstub/arm-stub.c+5−1

 		si = alloc_screen_info();
 		if (!si)
 			return NULL;
-		efi_setup_gop(si, &gop_proto, size);
+		status = efi_setup_gop(si, &gop_proto, size);
+		if (status != EFI_SUCCESS) {
+			free_screen_info(si);
+			return NULL;
+		}
 	}
 	return si;
 }

drivers/firmware/efi/libstub/efistub.h+13−0

@@ -92,6 +92,19 @@ extern __pure efi_system_table_t *efi_system_table(void); · 91 unmodified lines
92	#define EFI_LOCATE_BY_REGISTER_NOTIFY 1	92	#define EFI_LOCATE_BY_REGISTER_NOTIFY 1
93	#define EFI_LOCATE_BY_PROTOCOL 2	93	#define EFI_LOCATE_BY_PROTOCOL 2
94		94
		95	/*
		96	* An efi_boot_memmap is used by efi_get_memory_map() to return the
		97	* EFI memory map in a dynamically allocated buffer.
		98	*
		99	* The buffer allocated for the EFI memory map includes extra room for
		100	* a minimum of EFI_MMAP_NR_SLACK_SLOTS additional EFI memory descriptors.
		101	* This facilitates the reuse of the EFI memory map buffer when a second
		102	* call to ExitBootServices() is needed because of intervening changes to
		103	* the EFI memory map. Other related structures, e.g. x86 e820ext, need
		104	* to factor in this headroom requirement as well.
		105	*/
		106	#define EFI_MMAP_NR_SLACK_SLOTS 8
		107
95	struct efi_boot_memmap {	108	struct efi_boot_memmap {
96	efi_memory_desc_t **map;	109	efi_memory_desc_t **map;
97	unsigned long *map_size;	110	unsigned long *map_size;

drivers/firmware/efi/libstub/mem.c+0−2

@@ -5,8 +5,6 @@ · 4 unmodified lines
5		5
6	#include "efistub.h"	6	#include "efistub.h"
7		7
8	#define EFI_MMAP_NR_SLACK_SLOTS 8
9
10	static inline bool mmap_has_headroom(unsigned long buff_size,	8	static inline bool mmap_has_headroom(unsigned long buff_size,
11	unsigned long map_size,	9	unsigned long map_size,
12	unsigned long desc_size)	10	unsigned long desc_size)

drivers/firmware/efi/libstub/tpm.c+3−2

 	efi_status_t status;
 	efi_physical_addr_t log_location = 0, log_last_entry = 0;
 	struct linux_efi_tpm_eventlog *log_tbl = NULL;
-	struct efi_tcg2_final_events_table *final_events_table;
+	struct efi_tcg2_final_events_table *final_events_table = NULL;
 	unsigned long first_entry_addr, last_entry_addr;
 	size_t log_size, last_entry_size;
 	efi_bool_t truncated;
 	 * Figure out whether any events have already been logged to the
 	 * final events structure, and if so how much space they take up
 	 */
-	final_events_table = get_efi_config_table(LINUX_EFI_TPM_FINAL_LOG_GUID);
+	if (version == EFI_TCG2_EVENT_LOG_FORMAT_TCG_2)
+		final_events_table = get_efi_config_table(LINUX_EFI_TPM_FINAL_LOG_GUID);
 	if (final_events_table && final_events_table->nr_events) {
 		struct tcg_pcr_event2_head *header;
 		int offset;

drivers/firmware/efi/libstub/x86-stub.c+9−15

@@ -606,24 +606,18 @@ static efi_status_t allocate_e820(struct boot_params *params, · 605 unmodified lines
606	struct setup_data **e820ext,	606	struct setup_data **e820ext,
607	u32 *e820ext_size)	607	u32 *e820ext_size)
608	{	608	{
609	unsigned long map_size, desc_size, buff_size;	609	unsigned long map_size, desc_size, map_key;
610	struct efi_boot_memmap boot_map;
611	efi_memory_desc_t *map;
612	efi_status_t status;	610	efi_status_t status;
613	__u32 nr_desc;	611	__u32 nr_desc, desc_version;
614		612
615	boot_map.map = &map;	613	/* Only need the size of the mem map and size of each mem descriptor */
616	boot_map.map_size = &map_size;	614	map_size = 0;
617	boot_map.desc_size = &desc_size;	615	status = efi_bs_call(get_memory_map, &map_size, NULL, &map_key,
618	boot_map.desc_ver = NULL;	616	&desc_size, &desc_version);
619	boot_map.key_ptr = NULL;	617	if (status != EFI_BUFFER_TOO_SMALL)
620	boot_map.buff_size = &buff_size;	618	return (status != EFI_SUCCESS) ? status : EFI_UNSUPPORTED;
621		619
622	status = efi_get_memory_map(&boot_map);	620	nr_desc = map_size / desc_size + EFI_MMAP_NR_SLACK_SLOTS;
623	if (status != EFI_SUCCESS)
624	return status;
625
626	nr_desc = buff_size / desc_size;
627		621
628	if (nr_desc > ARRAY_SIZE(params->e820_table)) {	622	if (nr_desc > ARRAY_SIZE(params->e820_table)) {
629	u32 nr_e820ext = nr_desc - ARRAY_SIZE(params->e820_table);	623	u32 nr_e820ext = nr_desc - ARRAY_SIZE(params->e820_table);

drivers/firmware/efi/tpm.c+4−1

 	tbl_size = sizeof(*log_tbl) + log_tbl->size;
 	memblock_reserve(efi.tpm_log, tbl_size);
-	if (efi.tpm_final_log == EFI_INVALID_TABLE_ADDR)
+	if (efi.tpm_final_log == EFI_INVALID_TABLE_ADDR ||
+	    log_tbl->version != EFI_TCG2_EVENT_LOG_FORMAT_TCG_2) {
+		pr_warn(FW_BUG "TPM Final Events table missing or invalid\n");
 		goto out;
+	}
 	final_tbl = early_memremap(efi.tpm_final_log, sizeof(*final_tbl));

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

@@ -531,7 +531,7 @@ static int pca953x_gpio_set_config(struct gpio_chip *gc, unsigned int offset, · 530 unmodified lines
531	{	531	{
532	struct pca953x_chip *chip = gpiochip_get_data(gc);	532	struct pca953x_chip *chip = gpiochip_get_data(gc);
533		533
534	switch (config) {	534	switch (pinconf_to_config_param(config)) {
535	case PIN_CONFIG_BIAS_PULL_UP:	535	case PIN_CONFIG_BIAS_PULL_UP:
536	case PIN_CONFIG_BIAS_PULL_DOWN:	536	case PIN_CONFIG_BIAS_PULL_DOWN:
537	return pca953x_gpio_set_pull_up_down(chip, offset, config);	537	return pca953x_gpio_set_pull_up_down(chip, offset, config);

drivers/gpio/gpio-tegra.c+1−0

@@ -368,6 +368,7 @@ static void tegra_gpio_irq_shutdown(struct irq_data *d) · 367 unmodified lines
368	struct tegra_gpio_info *tgi = bank->tgi;	368	struct tegra_gpio_info *tgi = bank->tgi;
369	unsigned int gpio = d->hwirq;	369	unsigned int gpio = d->hwirq;
370		370
		371	tegra_gpio_irq_mask(d);
371	gpiochip_unlock_as_irq(&tgi->gc, gpio);	372	gpiochip_unlock_as_irq(&tgi->gc, gpio);
372	}	373	}
373		374

drivers/gpio/gpiolib.c+29−5

 				  struct gpioline_info *info)
 {
 	struct gpio_chip *gc = desc->gdev->chip;
+	bool ok_for_pinctrl;
 	unsigned long flags;
+	/*
+	 * This function takes a mutex so we must check this before taking
+	 * the spinlock.
+	 *
+	 * FIXME: find a non-racy way to retrieve this information. Maybe a
+	 * lock common to both frameworks?
+	 */
+	ok_for_pinctrl =
+		pinctrl_gpio_can_use_line(gc->base + info->line_offset);
 	spin_lock_irqsave(&gpio_lock, flags);
 	if (desc->name) {
 	    test_bit(FLAG_USED_AS_IRQ, &desc->flags) ||
 	    test_bit(FLAG_EXPORT, &desc->flags) ||
 	    test_bit(FLAG_SYSFS, &desc->flags) ||
-	    !pinctrl_gpio_can_use_line(gc->base + info->line_offset))
+	    !ok_for_pinctrl)
 		info->flags |= GPIOLINE_FLAG_KERNEL;
 	if (test_bit(FLAG_IS_OUT, &desc->flags))
 		info->flags |= GPIOLINE_FLAG_IS_OUT;
 	void __user *ip = (void __user *)arg;
 	struct gpio_desc *desc;
 	__u32 offset;
+	int hwgpio;
 	/* We fail any subsequent ioctl():s when the chip is gone */
 	if (!gc)
 		if (IS_ERR(desc))
 			return PTR_ERR(desc);
+		hwgpio = gpio_chip_hwgpio(desc);
+		if (cmd == GPIO_GET_LINEINFO_WATCH_IOCTL &&
+		    test_bit(hwgpio, priv->watched_lines))
+			return -EBUSY;
 		gpio_desc_to_lineinfo(desc, &lineinfo);
 		if (copy_to_user(ip, &lineinfo, sizeof(lineinfo)))
 			return -EFAULT;
 		if (cmd == GPIO_GET_LINEINFO_WATCH_IOCTL)
-			set_bit(gpio_chip_hwgpio(desc), priv->watched_lines);
+			set_bit(hwgpio, priv->watched_lines);
 		return 0;
 	} else if (cmd == GPIO_GET_LINEHANDLE_IOCTL) {
 		if (IS_ERR(desc))
 			return PTR_ERR(desc);
-		clear_bit(gpio_chip_hwgpio(desc), priv->watched_lines);
+		hwgpio = gpio_chip_hwgpio(desc);
+		if (!test_bit(hwgpio, priv->watched_lines))
+			return -EBUSY;
+		clear_bit(hwgpio, priv->watched_lines);
 		return 0;
 	}
 	return -EINVAL;
 	gpiolib_initialized = true;
 	gpiochip_setup_devs();
-	if (IS_ENABLED(CONFIG_OF_DYNAMIC))
+#if IS_ENABLED(CONFIG_OF_DYNAMIC) && IS_ENABLED(CONFIG_OF_GPIO)
-		WARN_ON(of_reconfig_notifier_register(&gpio_of_notifier));
+	WARN_ON(of_reconfig_notifier_register(&gpio_of_notifier));
+#endif /* CONFIG_OF_DYNAMIC && CONFIG_OF_GPIO */
 	return ret;
 }

drivers/gpu/drm/amd/amdgpu/amdgpu.h+1−0

@@ -945,6 +945,7 @@ struct amdgpu_device { · 944 unmodified lines
945		945
946	/* s3/s4 mask */	946	/* s3/s4 mask */
947	bool in_suspend;	947	bool in_suspend;
		948	bool in_hibernate;
948		949
949	/* record last mm index being written through WREG32*/	950	/* record last mm index being written through WREG32*/
950	unsigned long last_mm_index;	951	unsigned long last_mm_index;

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c+3−2

 	}
 	/* Free the BO*/
-	amdgpu_bo_unref(&mem->bo);
+	drm_gem_object_put_unlocked(&mem->bo->tbo.base);
 	mutex_destroy(&mem->lock);
 	kfree(mem);
 		| KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE
 		| KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE;
-	(*mem)->bo = amdgpu_bo_ref(bo);
+	drm_gem_object_get(&bo->tbo.base);
+	(*mem)->bo = bo;
 	(*mem)->va = va;
 	(*mem)->domain = (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) ?
 		AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT;

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

 	struct amdgpu_device *adev = drm_dev->dev_private;
 	int r;
+	adev->in_hibernate = true;
 	r = amdgpu_device_suspend(drm_dev, true);
+	adev->in_hibernate = false;
 	if (r)
 		return r;
 	return amdgpu_asic_reset(adev);

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

@@ -133,8 +133,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, · 132 unmodified lines
133	u32 cpp;	133	u32 cpp;
134	u64 flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED \|	134	u64 flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED \|
135	AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS \|	135	AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS \|
136	AMDGPU_GEM_CREATE_VRAM_CLEARED \|	136	AMDGPU_GEM_CREATE_VRAM_CLEARED;
137	AMDGPU_GEM_CREATE_CPU_GTT_USWC;
138		137
139	info = drm_get_format_info(adev->ddev, mode_cmd);	138	info = drm_get_format_info(adev->ddev, mode_cmd);
140	cpp = info->cpp[0];	139	cpp = info->cpp[0];

drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c+16−6

 		/* ===  CGCG /CGLS for GFX 3D Only === */
 		gfx_v10_0_update_3d_clock_gating(adev, enable);
 		/* ===  MGCG + MGLS === */
-		/* gfx_v10_0_update_medium_grain_clock_gating(adev, enable); */
+		gfx_v10_0_update_medium_grain_clock_gating(adev, enable);
 	}
 	if (adev->cg_flags &
 	switch (adev->asic_type) {
 	case CHIP_NAVI10:
 	case CHIP_NAVI14:
-		if (!enable) {
+		amdgpu_gfx_off_ctrl(adev, enable);
-			amdgpu_gfx_off_ctrl(adev, false);
-			cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);
-		} else
-			amdgpu_gfx_off_ctrl(adev, true);
 		break;
 	default:
 		break;
 							   ref, mask);
 }
+static void gfx_v10_0_ring_soft_recovery(struct amdgpu_ring *ring,
+					 unsigned vmid)
+{
+	struct amdgpu_device *adev = ring->adev;
+	uint32_t value = 0;
+	value = REG_SET_FIELD(value, SQ_CMD, CMD, 0x03);
+	value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);
+	value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);
+	value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid);
+	WREG32_SOC15(GC, 0, mmSQ_CMD, value);
+}
 static void
 gfx_v10_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,
 				      uint32_t me, uint32_t pipe,
 	.emit_wreg = gfx_v10_0_ring_emit_wreg,
 	.emit_reg_wait = gfx_v10_0_ring_emit_reg_wait,
 	.emit_reg_write_reg_wait = gfx_v10_0_ring_emit_reg_write_reg_wait,
+	.soft_recovery = gfx_v10_0_ring_soft_recovery,
 };
 static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_compute = {

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c+5−9

@@ -1236,6 +1236,8 @@ static const struct amdgpu_gfxoff_quirk amdgpu_gfxoff_quirk_list[] = { · 1235 unmodified lines
1236	{ 0x1002, 0x15dd, 0x1002, 0x15dd, 0xc8 },	1236	{ 0x1002, 0x15dd, 0x1002, 0x15dd, 0xc8 },
1237	/* https://bugzilla.kernel.org/show_bug.cgi?id=207171 */	1237	/* https://bugzilla.kernel.org/show_bug.cgi?id=207171 */
1238	{ 0x1002, 0x15dd, 0x103c, 0x83e7, 0xd3 },	1238	{ 0x1002, 0x15dd, 0x103c, 0x83e7, 0xd3 },
		1239	/* GFXOFF is unstable on C6 parts with a VBIOS 113-RAVEN-114 */
		1240	{ 0x1002, 0x15dd, 0x1002, 0x15dd, 0xc6 },
1239	{ 0, 0, 0, 0, 0 },	1241	{ 0, 0, 0, 0, 0 },
1240	};	1242	};
1241		1243
@@ -5025,10 +5027,9 @@ static int gfx_v9_0_set_powergating_state(void *handle, · 3783 unmodified lines
5025	switch (adev->asic_type) {	5027	switch (adev->asic_type) {
5026	case CHIP_RAVEN:	5028	case CHIP_RAVEN:
5027	case CHIP_RENOIR:	5029	case CHIP_RENOIR:
5028	if (!enable) {	5030	if (!enable)
5029	amdgpu_gfx_off_ctrl(adev, false);	5031	amdgpu_gfx_off_ctrl(adev, false);
5030	cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);	5032
5031	}
5032	if (adev->pg_flags & AMD_PG_SUPPORT_RLC_SMU_HS) {	5033	if (adev->pg_flags & AMD_PG_SUPPORT_RLC_SMU_HS) {
5033	gfx_v9_0_enable_sck_slow_down_on_power_up(adev, true);	5034	gfx_v9_0_enable_sck_slow_down_on_power_up(adev, true);
5034	gfx_v9_0_enable_sck_slow_down_on_power_down(adev, true);	5035	gfx_v9_0_enable_sck_slow_down_on_power_down(adev, true);
@@ -5052,12 +5053,7 @@ static int gfx_v9_0_set_powergating_state(void *handle, · 17 unmodified lines
5052	amdgpu_gfx_off_ctrl(adev, true);	5053	amdgpu_gfx_off_ctrl(adev, true);
5053	break;	5054	break;
5054	case CHIP_VEGA12:	5055	case CHIP_VEGA12:
5055	if (!enable) {	5056	amdgpu_gfx_off_ctrl(adev, enable);
5056	amdgpu_gfx_off_ctrl(adev, false);
5057	cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);
5058	} else {
5059	amdgpu_gfx_off_ctrl(adev, true);
5060	}
5061	break;	5057	break;
5062	default:	5058	default:
5063	break;	5059	break;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c+79−84

@@ -441,7 +441,7 @@ static void dm_vupdate_high_irq(void *interrupt_params) · 440 unmodified lines
441		441
442	/**	442	/**
443	* dm_crtc_high_irq() - Handles CRTC interrupt	443	* dm_crtc_high_irq() - Handles CRTC interrupt
444	* @interrupt_params: ignored	444	* @interrupt_params: used for determining the CRTC instance
445	*	445	*
446	* Handles the CRTC/VSYNC interrupt by notfying DRM's VBLANK	446	* Handles the CRTC/VSYNC interrupt by notfying DRM's VBLANK
447	* event handler.	447	* event handler.
@@ -455,70 +455,6 @@ static void dm_crtc_high_irq(void *interrupt_params) · 7 unmodified lines
455	unsigned long flags;	455	unsigned long flags;
456		456
457	acrtc = get_crtc_by_otg_inst(adev, irq_params->irq_src - IRQ_TYPE_VBLANK);	457	acrtc = get_crtc_by_otg_inst(adev, irq_params->irq_src - IRQ_TYPE_VBLANK);
458
459	if (acrtc) {
460	acrtc_state = to_dm_crtc_state(acrtc->base.state);
461
462	DRM_DEBUG_VBL("crtc:%d, vupdate-vrr:%d\n",
463	acrtc->crtc_id,
464	amdgpu_dm_vrr_active(acrtc_state));
465
466	/* Core vblank handling at start of front-porch is only possible
467	* in non-vrr mode, as only there vblank timestamping will give
468	* valid results while done in front-porch. Otherwise defer it
469	* to dm_vupdate_high_irq after end of front-porch.
470	*/
471	if (!amdgpu_dm_vrr_active(acrtc_state))
472	drm_crtc_handle_vblank(&acrtc->base);
473
474	/* Following stuff must happen at start of vblank, for crc
475	* computation and below-the-range btr support in vrr mode.
476	*/
477	amdgpu_dm_crtc_handle_crc_irq(&acrtc->base);
478
479	if (acrtc_state->stream && adev->family >= AMDGPU_FAMILY_AI &&
480	acrtc_state->vrr_params.supported &&
481	acrtc_state->freesync_config.state == VRR_STATE_ACTIVE_VARIABLE) {
482	spin_lock_irqsave(&adev->ddev->event_lock, flags);
483	mod_freesync_handle_v_update(
484	adev->dm.freesync_module,
485	acrtc_state->stream,
486	&acrtc_state->vrr_params);
487
488	dc_stream_adjust_vmin_vmax(
489	adev->dm.dc,
490	acrtc_state->stream,
491	&acrtc_state->vrr_params.adjust);
492	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
493	}
494	}
495	}
496
497	#if defined(CONFIG_DRM_AMD_DC_DCN)
498	/**
499	* dm_dcn_crtc_high_irq() - Handles VStartup interrupt for DCN generation ASICs
500	* @interrupt params - interrupt parameters
501	*
502	* Notify DRM's vblank event handler at VSTARTUP
503	*
504	* Unlike DCE hardware, we trigger the handler at VSTARTUP. at which:
505	* * We are close enough to VUPDATE - the point of no return for hw
506	* * We are in the fixed portion of variable front porch when vrr is enabled
507	* * We are before VUPDATE, where double-buffered vrr registers are swapped
508	*
509	* It is therefore the correct place to signal vblank, send user flip events,
510	* and update VRR.
511	*/
512	static void dm_dcn_crtc_high_irq(void *interrupt_params)
513	{
514	struct common_irq_params *irq_params = interrupt_params;
515	struct amdgpu_device *adev = irq_params->adev;
516	struct amdgpu_crtc *acrtc;
517	struct dm_crtc_state *acrtc_state;
518	unsigned long flags;
519
520	acrtc = get_crtc_by_otg_inst(adev, irq_params->irq_src - IRQ_TYPE_VBLANK);
521
522	if (!acrtc)	458	if (!acrtc)
523	return;	459	return;
524		460
@@ -528,22 +464,35 @@ static void dm_dcn_crtc_high_irq(void *interrupt_params) · 3 unmodified lines
528	amdgpu_dm_vrr_active(acrtc_state),	464	amdgpu_dm_vrr_active(acrtc_state),
529	acrtc_state->active_planes);	465	acrtc_state->active_planes);
530		466
		467	/**
		468	* Core vblank handling at start of front-porch is only possible
		469	* in non-vrr mode, as only there vblank timestamping will give
		470	* valid results while done in front-porch. Otherwise defer it
		471	* to dm_vupdate_high_irq after end of front-porch.
		472	*/
		473	if (!amdgpu_dm_vrr_active(acrtc_state))
		474	drm_crtc_handle_vblank(&acrtc->base);
		475
		476	/**
		477	* Following stuff must happen at start of vblank, for crc
		478	* computation and below-the-range btr support in vrr mode.
		479	*/
531	amdgpu_dm_crtc_handle_crc_irq(&acrtc->base);	480	amdgpu_dm_crtc_handle_crc_irq(&acrtc->base);
532	drm_crtc_handle_vblank(&acrtc->base);	481
		482	/* BTR updates need to happen before VUPDATE on Vega and above. */
		483	if (adev->family < AMDGPU_FAMILY_AI)
		484	return;
533		485
534	spin_lock_irqsave(&adev->ddev->event_lock, flags);	486	spin_lock_irqsave(&adev->ddev->event_lock, flags);
535		487
536	if (acrtc_state->vrr_params.supported &&	488	if (acrtc_state->stream && acrtc_state->vrr_params.supported &&
537	acrtc_state->freesync_config.state == VRR_STATE_ACTIVE_VARIABLE) {	489	acrtc_state->freesync_config.state == VRR_STATE_ACTIVE_VARIABLE) {
538	mod_freesync_handle_v_update(	490	mod_freesync_handle_v_update(adev->dm.freesync_module,
539	adev->dm.freesync_module,	491	acrtc_state->stream,
540	acrtc_state->stream,	492	&acrtc_state->vrr_params);
541	&acrtc_state->vrr_params);
542		493
543	dc_stream_adjust_vmin_vmax(	494	dc_stream_adjust_vmin_vmax(adev->dm.dc, acrtc_state->stream,
544	adev->dm.dc,	495	&acrtc_state->vrr_params.adjust);
545	acrtc_state->stream,
546	&acrtc_state->vrr_params.adjust);
547	}	496	}
548		497
549	/*	498	/*
@@ -556,7 +505,8 @@ static void dm_dcn_crtc_high_irq(void *interrupt_params) · 6 unmodified lines
556	* avoid race conditions between flip programming and completion,	505	* avoid race conditions between flip programming and completion,
557	* which could cause too early flip completion events.	506	* which could cause too early flip completion events.
558	*/	507	*/
559	if (acrtc->pflip_status == AMDGPU_FLIP_SUBMITTED &&	508	if (adev->family >= AMDGPU_FAMILY_RV &&
		509	acrtc->pflip_status == AMDGPU_FLIP_SUBMITTED &&
560	acrtc_state->active_planes == 0) {	510	acrtc_state->active_planes == 0) {
561	if (acrtc->event) {	511	if (acrtc->event) {
562	drm_crtc_send_vblank_event(&acrtc->base, acrtc->event);	512	drm_crtc_send_vblank_event(&acrtc->base, acrtc->event);
@@ -568,7 +518,6 @@ static void dm_dcn_crtc_high_irq(void *interrupt_params) · 5 unmodified lines
568		518
569	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);	519	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
570	}	520	}
571	#endif
572		521
573	static int dm_set_clockgating_state(void *handle,	522	static int dm_set_clockgating_state(void *handle,
574	enum amd_clockgating_state state)	523	enum amd_clockgating_state state)
@@ -2445,8 +2394,36 @@ static int dcn10_register_irq_handlers(struct amdgpu_device *adev) · 1870 unmodified lines
2445	c_irq_params->adev = adev;	2394	c_irq_params->adev = adev;
2446	c_irq_params->irq_src = int_params.irq_source;	2395	c_irq_params->irq_src = int_params.irq_source;
2447		2396
		2397	amdgpu_dm_irq_register_interrupt(
		2398	adev, &int_params, dm_crtc_high_irq, c_irq_params);
		2399	}
		2400
		2401	/* Use VUPDATE_NO_LOCK interrupt on DCN, which seems to correspond to
		2402	* the regular VUPDATE interrupt on DCE. We want DC_IRQ_SOURCE_VUPDATEx
		2403	* to trigger at end of each vblank, regardless of state of the lock,
		2404	* matching DCE behaviour.
		2405	*/
		2406	for (i = DCN_1_0__SRCID__OTG0_IHC_V_UPDATE_NO_LOCK_INTERRUPT;
		2407	i <= DCN_1_0__SRCID__OTG0_IHC_V_UPDATE_NO_LOCK_INTERRUPT + adev->mode_info.num_crtc - 1;
		2408	i++) {
		2409	r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_DCE, i, &adev->vupdate_irq);
		2410
		2411	if (r) {
		2412	DRM_ERROR("Failed to add vupdate irq id!\n");
		2413	return r;
		2414	}
		2415
		2416	int_params.int_context = INTERRUPT_HIGH_IRQ_CONTEXT;
		2417	int_params.irq_source =
		2418	dc_interrupt_to_irq_source(dc, i, 0);
		2419
		2420	c_irq_params = &adev->dm.vupdate_params[int_params.irq_source - DC_IRQ_SOURCE_VUPDATE1];
		2421
		2422	c_irq_params->adev = adev;
		2423	c_irq_params->irq_src = int_params.irq_source;
		2424
2448	amdgpu_dm_irq_register_interrupt(adev, &int_params,	2425	amdgpu_dm_irq_register_interrupt(adev, &int_params,
2449	dm_dcn_crtc_high_irq, c_irq_params);	2426	dm_vupdate_high_irq, c_irq_params);
2450	}	2427	}
2451		2428
2452	/* Use GRPH_PFLIP interrupt */	2429	/* Use GRPH_PFLIP interrupt */
@@ -4453,10 +4430,6 @@ static inline int dm_set_vupdate_irq(struct drm_crtc *crtc, bool enable) · 2000 unmodified lines
4453	struct amdgpu_device *adev = crtc->dev->dev_private;	4430	struct amdgpu_device *adev = crtc->dev->dev_private;
4454	int rc;	4431	int rc;
4455		4432
4456	/* Do not set vupdate for DCN hardware */
4457	if (adev->family > AMDGPU_FAMILY_AI)
4458	return 0;
4459
4460	irq_source = IRQ_TYPE_VUPDATE + acrtc->otg_inst;	4433	irq_source = IRQ_TYPE_VUPDATE + acrtc->otg_inst;
4461		4434
4462	rc = dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;	4435	rc = dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;
@@ -7882,6 +7855,7 @@ static int dm_update_plane_state(struct dc *dc, · 3419 unmodified lines
7882	struct drm_crtc_state old_crtc_state, new_crtc_state;	7855	struct drm_crtc_state old_crtc_state, new_crtc_state;
7883	struct dm_crtc_state dm_new_crtc_state, dm_old_crtc_state;	7856	struct dm_crtc_state dm_new_crtc_state, dm_old_crtc_state;
7884	struct dm_plane_state dm_new_plane_state, dm_old_plane_state;	7857	struct dm_plane_state dm_new_plane_state, dm_old_plane_state;
		7858	struct amdgpu_crtc *new_acrtc;
7885	bool needs_reset;	7859	bool needs_reset;
7886	int ret = 0;	7860	int ret = 0;
7887		7861
@@ -7891,9 +7865,30 @@ static int dm_update_plane_state(struct dc *dc, · 3 unmodified lines
7891	dm_new_plane_state = to_dm_plane_state(new_plane_state);	7865	dm_new_plane_state = to_dm_plane_state(new_plane_state);
7892	dm_old_plane_state = to_dm_plane_state(old_plane_state);	7866	dm_old_plane_state = to_dm_plane_state(old_plane_state);
7893		7867
7894	/TODO Implement atomic check for cursor plane /	7868	/TODO Implement better atomic check for cursor plane /
7895	if (plane->type == DRM_PLANE_TYPE_CURSOR)	7869	if (plane->type == DRM_PLANE_TYPE_CURSOR) {
		7870	if (!enable \|\| !new_plane_crtc \|\|
		7871	drm_atomic_plane_disabling(plane->state, new_plane_state))
		7872	return 0;
		7873
		7874	new_acrtc = to_amdgpu_crtc(new_plane_crtc);
		7875
		7876	if ((new_plane_state->crtc_w > new_acrtc->max_cursor_width) \|\|
		7877	(new_plane_state->crtc_h > new_acrtc->max_cursor_height)) {
		7878	DRM_DEBUG_ATOMIC("Bad cursor size %d x %d\n",
		7879	new_plane_state->crtc_w, new_plane_state->crtc_h);
		7880	return -EINVAL;
		7881	}
		7882
		7883	if (new_plane_state->crtc_x <= -new_acrtc->max_cursor_width \|\|
		7884	new_plane_state->crtc_y <= -new_acrtc->max_cursor_height) {
		7885	DRM_DEBUG_ATOMIC("Bad cursor position %d, %d\n",
		7886	new_plane_state->crtc_x, new_plane_state->crtc_y);
		7887	return -EINVAL;
		7888	}
		7889
7896	return 0;	7890	return 0;
		7891	}
7897		7892
7898	needs_reset = should_reset_plane(state, plane, old_plane_state,	7893	needs_reset = should_reset_plane(state, plane, old_plane_state,
7899	new_plane_state);	7894	new_plane_state);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c+5−5

 	struct mod_hdcp_display *display = &hdcp_work[link_index].display;
 	struct mod_hdcp_link *link = &hdcp_work[link_index].link;
-	memset(display, 0, sizeof(*display));
-	memset(link, 0, sizeof(*link));
-	display->index = aconnector->base.index;
 	if (config->dpms_off) {
 		hdcp_remove_display(hdcp_work, link_index, aconnector);
 		return;
 	}
+	memset(display, 0, sizeof(*display));
+	memset(link, 0, sizeof(*link));
+	display->index = aconnector->base.index;
 	display->state = MOD_HDCP_DISPLAY_ACTIVE;
 	if (aconnector->dc_sink != NULL)

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

@@ -220,6 +220,30 @@ static enum dpcd_training_patterns · 219 unmodified lines
220	return dpcd_tr_pattern;	220	return dpcd_tr_pattern;
221	}	221	}
222		222
		223	static uint8_t dc_dp_initialize_scrambling_data_symbols(
		224	struct dc_link *link,
		225	enum dc_dp_training_pattern pattern)
		226	{
		227	uint8_t disable_scrabled_data_symbols = 0;
		228
		229	switch (pattern) {
		230	case DP_TRAINING_PATTERN_SEQUENCE_1:
		231	case DP_TRAINING_PATTERN_SEQUENCE_2:
		232	case DP_TRAINING_PATTERN_SEQUENCE_3:
		233	disable_scrabled_data_symbols = 1;
		234	break;
		235	case DP_TRAINING_PATTERN_SEQUENCE_4:
		236	disable_scrabled_data_symbols = 0;
		237	break;
		238	default:
		239	ASSERT(0);
		240	DC_LOG_HW_LINK_TRAINING("%s: Invalid HW Training pattern: %d\n",
		241	__func__, pattern);
		242	break;
		243	}
		244	return disable_scrabled_data_symbols;
		245	}
		246
223	static inline bool is_repeater(struct dc_link *link, uint32_t offset)	247	static inline bool is_repeater(struct dc_link *link, uint32_t offset)
224	{	248	{
225	return (!link->is_lttpr_mode_transparent && offset != 0);	249	return (!link->is_lttpr_mode_transparent && offset != 0);
@@ -252,6 +276,9 @@ static void dpcd_set_lt_pattern_and_lane_settings( · 26 unmodified lines
252	dpcd_pattern.v1_4.TRAINING_PATTERN_SET =	276	dpcd_pattern.v1_4.TRAINING_PATTERN_SET =
253	dc_dp_training_pattern_to_dpcd_training_pattern(link, pattern);	277	dc_dp_training_pattern_to_dpcd_training_pattern(link, pattern);
254		278
		279	dpcd_pattern.v1_4.SCRAMBLING_DISABLE =
		280	dc_dp_initialize_scrambling_data_symbols(link, pattern);
		281
255	dpcd_lt_buffer[DP_TRAINING_PATTERN_SET - DP_TRAINING_PATTERN_SET]	282	dpcd_lt_buffer[DP_TRAINING_PATTERN_SET - DP_TRAINING_PATTERN_SET]
256	= dpcd_pattern.raw;	283	= dpcd_pattern.raw;
257		284

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c+68−1

@@ -1625,12 +1625,79 @@ void dcn10_pipe_control_lock( · 1624 unmodified lines
1625	hws->funcs.verify_allow_pstate_change_high(dc);	1625	hws->funcs.verify_allow_pstate_change_high(dc);
1626	}	1626	}
1627		1627
		1628	/**
		1629	* delay_cursor_until_vupdate() - Delay cursor update if too close to VUPDATE.
		1630	*
		1631	* Software keepout workaround to prevent cursor update locking from stalling
		1632	* out cursor updates indefinitely or from old values from being retained in
		1633	* the case where the viewport changes in the same frame as the cursor.
		1634	*
		1635	* The idea is to calculate the remaining time from VPOS to VUPDATE. If it's
		1636	* too close to VUPDATE, then stall out until VUPDATE finishes.
		1637	*
		1638	* TODO: Optimize cursor programming to be once per frame before VUPDATE
		1639	* to avoid the need for this workaround.
		1640	*/
		1641	static void delay_cursor_until_vupdate(struct dc dc, struct pipe_ctx pipe_ctx)
		1642	{
		1643	struct dc_stream_state *stream = pipe_ctx->stream;
		1644	struct crtc_position position;
		1645	uint32_t vupdate_start, vupdate_end;
		1646	unsigned int lines_to_vupdate, us_to_vupdate, vpos;
		1647	unsigned int us_per_line, us_vupdate;
		1648
		1649	if (!dc->hwss.calc_vupdate_position \|\| !dc->hwss.get_position)
		1650	return;
		1651
		1652	if (!pipe_ctx->stream_res.stream_enc \|\| !pipe_ctx->stream_res.tg)
		1653	return;
		1654
		1655	dc->hwss.calc_vupdate_position(dc, pipe_ctx, &vupdate_start,
		1656	&vupdate_end);
		1657
		1658	dc->hwss.get_position(&pipe_ctx, 1, &position);
		1659	vpos = position.vertical_count;
		1660
		1661	/* Avoid wraparound calculation issues */
		1662	vupdate_start += stream->timing.v_total;
		1663	vupdate_end += stream->timing.v_total;
		1664	vpos += stream->timing.v_total;
		1665
		1666	if (vpos <= vupdate_start) {
		1667	/* VPOS is in VACTIVE or back porch. */
		1668	lines_to_vupdate = vupdate_start - vpos;
		1669	} else if (vpos > vupdate_end) {
		1670	/* VPOS is in the front porch. */
		1671	return;
		1672	} else {
		1673	/* VPOS is in VUPDATE. */
		1674	lines_to_vupdate = 0;
		1675	}
		1676
		1677	/* Calculate time until VUPDATE in microseconds. */
		1678	us_per_line =
		1679	stream->timing.h_total * 10000u / stream->timing.pix_clk_100hz;
		1680	us_to_vupdate = lines_to_vupdate * us_per_line;
		1681
		1682	/* 70 us is a conservative estimate of cursor update time*/
		1683	if (us_to_vupdate > 70)
		1684	return;
		1685
		1686	/* Stall out until the cursor update completes. */
		1687	us_vupdate = (vupdate_end - vupdate_start + 1) * us_per_line;
		1688	udelay(us_to_vupdate + us_vupdate);
		1689	}
		1690
1628	void dcn10_cursor_lock(struct dc dc, struct pipe_ctx pipe, bool lock)	1691	void dcn10_cursor_lock(struct dc dc, struct pipe_ctx pipe, bool lock)
1629	{	1692	{
1630	/* cursor lock is per MPCC tree, so only need to lock one pipe per stream */	1693	/* cursor lock is per MPCC tree, so only need to lock one pipe per stream */
1631	if (!pipe \|\| pipe->top_pipe)	1694	if (!pipe \|\| pipe->top_pipe)
1632	return;	1695	return;
1633		1696
		1697	/* Prevent cursor lock from stalling out cursor updates. */
		1698	if (lock)
		1699	delay_cursor_until_vupdate(dc, pipe);
		1700
1634	dc->res_pool->mpc->funcs->cursor_lock(dc->res_pool->mpc,	1701	dc->res_pool->mpc->funcs->cursor_lock(dc->res_pool->mpc,
1635	pipe->stream_res.opp->inst, lock);	1702	pipe->stream_res.opp->inst, lock);
1636	}	1703	}
@@ -3236,7 +3303,7 @@ int dcn10_get_vupdate_offset_from_vsync(struct pipe_ctx *pipe_ctx) · 1599 unmodified lines
3236	return vertical_line_start;	3303	return vertical_line_start;
3237	}	3304	}
3238		3305
3239	static void dcn10_calc_vupdate_position(	3306	void dcn10_calc_vupdate_position(
3240	struct dc *dc,	3307	struct dc *dc,
3241	struct pipe_ctx *pipe_ctx,	3308	struct pipe_ctx *pipe_ctx,
3242	uint32_t *start_line,	3309	uint32_t *start_line,

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

 void dcn10_hw_sequencer_construct(struct dc *dc);
 int dcn10_get_vupdate_offset_from_vsync(struct pipe_ctx *pipe_ctx);
+void dcn10_calc_vupdate_position(
+		struct dc *dc,
+		struct pipe_ctx *pipe_ctx,
+		uint32_t *start_line,
+		uint32_t *end_line);
 void dcn10_setup_vupdate_interrupt(struct dc *dc, struct pipe_ctx *pipe_ctx);
 enum dc_status dcn10_enable_stream_timing(
 		struct pipe_ctx *pipe_ctx,

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c+1−0

@@ -72,6 +72,7 @@ static const struct hw_sequencer_funcs dcn10_funcs = { · 71 unmodified lines
72	.set_clock = dcn10_set_clock,	72	.set_clock = dcn10_set_clock,
73	.get_clock = dcn10_get_clock,	73	.get_clock = dcn10_get_clock,
74	.get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync,	74	.get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync,
		75	.calc_vupdate_position = dcn10_calc_vupdate_position,
75	};	76	};
76		77
77	static const struct hwseq_private_funcs dcn10_private_funcs = {	78	static const struct hwseq_private_funcs dcn10_private_funcs = {

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c+1−0

@@ -83,6 +83,7 @@ static const struct hw_sequencer_funcs dcn20_funcs = { · 82 unmodified lines
83	.init_vm_ctx = dcn20_init_vm_ctx,	83	.init_vm_ctx = dcn20_init_vm_ctx,
84	.set_flip_control_gsl = dcn20_set_flip_control_gsl,	84	.set_flip_control_gsl = dcn20_set_flip_control_gsl,
85	.get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync,	85	.get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync,
		86	.calc_vupdate_position = dcn10_calc_vupdate_position,
86	};	87	};
87		88
88	static const struct hwseq_private_funcs dcn20_private_funcs = {	89	static const struct hwseq_private_funcs dcn20_private_funcs = {

drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c+1−0

@@ -86,6 +86,7 @@ static const struct hw_sequencer_funcs dcn21_funcs = { · 85 unmodified lines
86	.optimize_pwr_state = dcn21_optimize_pwr_state,	86	.optimize_pwr_state = dcn21_optimize_pwr_state,
87	.exit_optimized_pwr_state = dcn21_exit_optimized_pwr_state,	87	.exit_optimized_pwr_state = dcn21_exit_optimized_pwr_state,
88	.get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync,	88	.get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync,
		89	.calc_vupdate_position = dcn10_calc_vupdate_position,
89	.set_cursor_position = dcn10_set_cursor_position,	90	.set_cursor_position = dcn10_set_cursor_position,
90	.set_cursor_attribute = dcn10_set_cursor_attribute,	91	.set_cursor_attribute = dcn10_set_cursor_attribute,
91	.set_cursor_sdr_white_level = dcn10_set_cursor_sdr_white_level,	92	.set_cursor_sdr_white_level = dcn10_set_cursor_sdr_white_level,

drivers/gpu/drm/amd/display/dc/dml/Makefile+0−2

 endif
 CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags)
 CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags)
-CFLAGS_$(AMDDALPATH)/dc/dml/dml_common_defs.o := $(dml_ccflags)
 DML = display_mode_lib.o display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \
-	dml_common_defs.o
 ifdef CONFIG_DRM_AMD_DC_DCN
 DML += display_mode_vba.o dcn20/display_rq_dlg_calc_20.o dcn20/display_mode_vba_20.o

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

@@ -26,7 +26,6 @@ · 25 unmodified lines
26	#ifndef __DML20_DISPLAY_RQ_DLG_CALC_H__	26	#ifndef __DML20_DISPLAY_RQ_DLG_CALC_H__
27	#define __DML20_DISPLAY_RQ_DLG_CALC_H__	27	#define __DML20_DISPLAY_RQ_DLG_CALC_H__
28		28
29	#include "../dml_common_defs.h"
30	#include "../display_rq_dlg_helpers.h"	29	#include "../display_rq_dlg_helpers.h"
31		30
32	struct display_mode_lib;	31	struct display_mode_lib;

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

@@ -26,7 +26,6 @@ · 25 unmodified lines
26	#ifndef __DML20V2_DISPLAY_RQ_DLG_CALC_H__	26	#ifndef __DML20V2_DISPLAY_RQ_DLG_CALC_H__
27	#define __DML20V2_DISPLAY_RQ_DLG_CALC_H__	27	#define __DML20V2_DISPLAY_RQ_DLG_CALC_H__
28		28
29	#include "../dml_common_defs.h"
30	#include "../display_rq_dlg_helpers.h"	29	#include "../display_rq_dlg_helpers.h"
31		30
32	struct display_mode_lib;	31	struct display_mode_lib;

drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h+1−1

@@ -26,7 +26,7 @@ · 25 unmodified lines
26	#ifndef __DML21_DISPLAY_RQ_DLG_CALC_H__	26	#ifndef __DML21_DISPLAY_RQ_DLG_CALC_H__
27	#define __DML21_DISPLAY_RQ_DLG_CALC_H__	27	#define __DML21_DISPLAY_RQ_DLG_CALC_H__
28		28
29	#include "../dml_common_defs.h"	29	#include "dm_services.h"
30	#include "../display_rq_dlg_helpers.h"	30	#include "../display_rq_dlg_helpers.h"
31		31
32	struct display_mode_lib;	32	struct display_mode_lib;

drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h+4−2

@@ -25,8 +25,10 @@ · 24 unmodified lines
25	#ifndef __DISPLAY_MODE_LIB_H__	25	#ifndef __DISPLAY_MODE_LIB_H__
26	#define __DISPLAY_MODE_LIB_H__	26	#define __DISPLAY_MODE_LIB_H__
27		27
28		28	#include "dm_services.h"
29	#include "dml_common_defs.h"	29	#include "dc_features.h"
		30	#include "display_mode_structs.h"
		31	#include "display_mode_enums.h"
30	#include "display_mode_vba.h"	32	#include "display_mode_vba.h"
31		33
32	enum dml_project {	34	enum dml_project {

drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h+0−2

@@ -27,8 +27,6 @@ · 26 unmodified lines
27	#ifndef __DML2_DISPLAY_MODE_VBA_H__	27	#ifndef __DML2_DISPLAY_MODE_VBA_H__
28	#define __DML2_DISPLAY_MODE_VBA_H__	28	#define __DML2_DISPLAY_MODE_VBA_H__
29		29
30	#include "dml_common_defs.h"
31
32	struct display_mode_lib;	30	struct display_mode_lib;
33		31
34	void ModeSupportAndSystemConfiguration(struct display_mode_lib *mode_lib);	32	void ModeSupportAndSystemConfiguration(struct display_mode_lib *mode_lib);

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

@@ -26,7 +26,6 @@ · 25 unmodified lines
26	#ifndef __DISPLAY_RQ_DLG_HELPERS_H__	26	#ifndef __DISPLAY_RQ_DLG_HELPERS_H__
27	#define __DISPLAY_RQ_DLG_HELPERS_H__	27	#define __DISPLAY_RQ_DLG_HELPERS_H__
28		28
29	#include "dml_common_defs.h"
30	#include "display_mode_lib.h"	29	#include "display_mode_lib.h"
31		30
32	/* Function: Printer functions	31	/* Function: Printer functions

drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.h+0−2

@@ -26,8 +26,6 @@ · 25 unmodified lines
26	#ifndef __DISPLAY_RQ_DLG_CALC_H__	26	#ifndef __DISPLAY_RQ_DLG_CALC_H__
27	#define __DISPLAY_RQ_DLG_CALC_H__	27	#define __DISPLAY_RQ_DLG_CALC_H__
28		28
29	#include "dml_common_defs.h"
30
31	struct display_mode_lib;	29	struct display_mode_lib;
32		30
33	#include "display_rq_dlg_helpers.h"	31	#include "display_rq_dlg_helpers.h"

drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c+0−43

@@ -1,43 +0,0 @@
1	/*
2	* Copyright 2017 Advanced Micro Devices, Inc.
3	*
4	* Permission is hereby granted, free of charge, to any person obtaining a
5	* copy of this software and associated documentation files (the "Software"),
6	* to deal in the Software without restriction, including without limitation
7	* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8	* and/or sell copies of the Software, and to permit persons to whom the
9	* Software is furnished to do so, subject to the following conditions:
10	*
11	* The above copyright notice and this permission notice shall be included in
12	* all copies or substantial portions of the Software.
13	*
14	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15	* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16	* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17	* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20	* OTHER DEALINGS IN THE SOFTWARE.
21	*
22	* Authors: AMD
23	*
24	*/
25
26	#include "dml_common_defs.h"
27	#include "dcn_calc_math.h"
28
29	#include "dml_inline_defs.h"
30
31	double dml_round(double a)
32	{
33	double round_pt = 0.5;
34	double ceil = dml_ceil(a, 1);
35	double floor = dml_floor(a, 1);
36
37	if (a - floor >= round_pt)
38	return ceil;
39	else
40	return floor;
41	}
42
43

drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h+0−37

@@ -1,37 +0,0 @@
1	/*
2	* Copyright 2017 Advanced Micro Devices, Inc.
3	*
4	* Permission is hereby granted, free of charge, to any person obtaining a
5	* copy of this software and associated documentation files (the "Software"),
6	* to deal in the Software without restriction, including without limitation
7	* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8	* and/or sell copies of the Software, and to permit persons to whom the
9	* Software is furnished to do so, subject to the following conditions:
10	*
11	* The above copyright notice and this permission notice shall be included in
12	* all copies or substantial portions of the Software.
13	*
14	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15	* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16	* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17	* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20	* OTHER DEALINGS IN THE SOFTWARE.
21	*
22	* Authors: AMD
23	*
24	*/
25
26	#ifndef __DC_COMMON_DEFS_H__
27	#define __DC_COMMON_DEFS_H__
28
29	#include "dm_services.h"
30	#include "dc_features.h"
31	#include "display_mode_structs.h"
32	#include "display_mode_enums.h"
33
34
35	double dml_round(double a);
36
37	#endif /* __DC_COMMON_DEFS_H__ */

drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h+13−2

 #ifndef __DML_INLINE_DEFS_H__
 #define __DML_INLINE_DEFS_H__
-#include "dml_common_defs.h"
 #include "dcn_calc_math.h"
 #include "dml_logger.h"
 	return (double) dcn_bw_floor2(a, granularity);
 }
+static inline double dml_round(double a)
+{
+	double round_pt = 0.5;
+	double ceil = dml_ceil(a, 1);
+	double floor = dml_floor(a, 1);
+	if (a - floor >= round_pt)
+		return ceil;
+	else
+		return floor;
+}
 static inline int dml_log2(double x)
 {
 	return dml_round((double)dcn_bw_log(x, 2));
 static inline unsigned int dml_round_to_multiple(unsigned int num,
 						 unsigned int multiple,
-						 bool up)
+						 unsigned char up)
 {
 	unsigned int remainder;

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

 	void (*get_position)(struct pipe_ctx **pipe_ctx, int num_pipes,
 			struct crtc_position *position);
 	int (*get_vupdate_offset_from_vsync)(struct pipe_ctx *pipe_ctx);
+	void (*calc_vupdate_position)(
+			struct dc *dc,
+			struct pipe_ctx *pipe_ctx,
+			uint32_t *start_line,
+			uint32_t *end_line);
 	void (*enable_per_frame_crtc_position_reset)(struct dc *dc,
 			int group_size, struct pipe_ctx *grouped_pipes[]);
 	void (*enable_timing_synchronization)(struct dc *dc,

drivers/gpu/drm/amd/powerplay/amd_powerplay.c+3−3

 		if (*level & profile_mode_mask) {
 			hwmgr->saved_dpm_level = hwmgr->dpm_level;
 			hwmgr->en_umd_pstate = true;
-			amdgpu_device_ip_set_clockgating_state(hwmgr->adev,
-						AMD_IP_BLOCK_TYPE_GFX,
-						AMD_CG_STATE_UNGATE);
 			amdgpu_device_ip_set_powergating_state(hwmgr->adev,
 					AMD_IP_BLOCK_TYPE_GFX,
 					AMD_PG_STATE_UNGATE);
+			amdgpu_device_ip_set_clockgating_state(hwmgr->adev,
+						AMD_IP_BLOCK_TYPE_GFX,
+						AMD_CG_STATE_UNGATE);
 		}
 	} else {
 		/* exit umd pstate, restore level, enable gfx cg*/

drivers/gpu/drm/amd/powerplay/amdgpu_smu.c+4−4

 	bool use_baco = !smu->is_apu &&
 		((adev->in_gpu_reset &&
 		  (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
-		 (adev->in_runpm && amdgpu_asic_supports_baco(adev)));
+		 ((adev->in_runpm || adev->in_hibernate) && amdgpu_asic_supports_baco(adev)));
 	ret = smu_get_smc_version(smu, NULL, &smu_version);
 	if (ret) {
 		if (*level & profile_mode_mask) {
 			smu_dpm_ctx->saved_dpm_level = smu_dpm_ctx->dpm_level;
 			smu_dpm_ctx->enable_umd_pstate = true;
-			amdgpu_device_ip_set_clockgating_state(smu->adev,
-							       AMD_IP_BLOCK_TYPE_GFX,
-							       AMD_CG_STATE_UNGATE);
 			amdgpu_device_ip_set_powergating_state(smu->adev,
 							       AMD_IP_BLOCK_TYPE_GFX,
 							       AMD_PG_STATE_UNGATE);
+			amdgpu_device_ip_set_clockgating_state(smu->adev,
+							       AMD_IP_BLOCK_TYPE_GFX,
+							       AMD_CG_STATE_UNGATE);
 		}
 	} else {
 		/* exit umd pstate, restore level, enable gfx cg*/

drivers/gpu/drm/drm_edid.c+2−1

 	{ "HVR", 0xaa01, EDID_QUIRK_NON_DESKTOP },
 	{ "HVR", 0xaa02, EDID_QUIRK_NON_DESKTOP },
-	/* Oculus Rift DK1, DK2, and CV1 VR Headsets */
+	/* Oculus Rift DK1, DK2, CV1 and Rift S VR Headsets */
 	{ "OVR", 0x0001, EDID_QUIRK_NON_DESKTOP },
 	{ "OVR", 0x0003, EDID_QUIRK_NON_DESKTOP },
 	{ "OVR", 0x0004, EDID_QUIRK_NON_DESKTOP },
+	{ "OVR", 0x0012, EDID_QUIRK_NON_DESKTOP },
 	/* Windows Mixed Reality Headsets */
 	{ "ACR", 0x7fce, EDID_QUIRK_NON_DESKTOP },

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c+3−1

@@ -238,8 +238,10 @@ static int submit_pin_objects(struct etnaviv_gem_submit *submit) · 237 unmodified lines
238	}	238	}
239		239
240	if ((submit->flags & ETNA_SUBMIT_SOFTPIN) &&	240	if ((submit->flags & ETNA_SUBMIT_SOFTPIN) &&
241	submit->bos[i].va != mapping->iova)	241	submit->bos[i].va != mapping->iova) {
		242	etnaviv_gem_mapping_unreference(mapping);
242	return -EINVAL;	243	return -EINVAL;
		244	}
243		245
244	atomic_inc(&etnaviv_obj->gpu_active);	246	atomic_inc(&etnaviv_obj->gpu_active);
245		247

drivers/gpu/drm/etnaviv/etnaviv_perfmon.c+1−1

@@ -453,7 +453,7 @@ static const struct etnaviv_pm_domain pm_domain(const struct etnaviv_gpu gpu, · 452 unmodified lines
453	if (!(gpu->identity.features & meta->feature))	453	if (!(gpu->identity.features & meta->feature))
454	continue;	454	continue;
455		455
456	if (meta->nr_domains < (index - offset)) {	456	if (index - offset >= meta->nr_domains) {
457	offset += meta->nr_domains;	457	offset += meta->nr_domains;
458	continue;	458	continue;
459	}	459	}

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

@@ -485,8 +485,7 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv, · 484 unmodified lines
485	if (!ret)	485	if (!ret)
486	goto err_llb;	486	goto err_llb;
487	else if (ret > 1) {	487	else if (ret > 1) {
488	DRM_INFO("Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n");	488	DRM_INFO_ONCE("Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n");
489
490	}	489	}
491		490
492	fbc->threshold = ret;	491	fbc->threshold = ret;

drivers/gpu/drm/i915/gem/i915_gem_domain.c+1−6

 	struct drm_i915_private *i915 = to_i915(obj->base.dev);
 	struct i915_vma *vma;
-	GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
 	if (!atomic_read(&obj->bind_count))
 		return;
 void
 i915_gem_object_unpin_from_display_plane(struct i915_vma *vma)
 {
-	struct drm_i915_gem_object *obj = vma->obj;
-	assert_object_held(obj);
 	/* Bump the LRU to try and avoid premature eviction whilst flipping  */
-	i915_gem_object_bump_inactive_ggtt(obj);
+	i915_gem_object_bump_inactive_ggtt(vma->obj);
 	i915_vma_unpin(vma);
 }

drivers/gpu/drm/i915/gt/intel_context_types.h+7−1

 #define CONTEXT_NOPREEMPT		7
 	u32 *lrc_reg_state;
-	u64 lrc_desc;
+	union {
+		struct {
+			u32 lrca;
+			u32 ccid;
+		};
+		u64 desc;
+	} lrc;
 	u32 tag; /* cookie passed to HW to track this context on submission */
 	/* Time on GPU as tracked by the hw. */

drivers/gpu/drm/i915/gt/intel_engine.h+0−9

@@ -333,13 +333,4 @@ intel_engine_has_preempt_reset(const struct intel_engine_cs *engine) · 332 unmodified lines
333	return intel_engine_has_preemption(engine);	333	return intel_engine_has_preemption(engine);
334	}	334	}
335		335
336	static inline bool
337	intel_engine_has_timeslices(const struct intel_engine_cs *engine)
338	{
339	if (!IS_ACTIVE(CONFIG_DRM_I915_TIMESLICE_DURATION))
340	return false;
341
342	return intel_engine_has_semaphores(engine);
343	}
344
345	#endif /* _INTEL_RINGBUFFER_H_ */	336	#endif /* _INTEL_RINGBUFFER_H_ */

drivers/gpu/drm/i915/gt/intel_engine_cs.c+6−0

 	if (engine->id == RENDER_CLASS && IS_GEN_RANGE(dev_priv, 4, 7))
 		drm_printf(m, "\tCCID: 0x%08x\n", ENGINE_READ(engine, CCID));
+	if (HAS_EXECLISTS(dev_priv)) {
+		drm_printf(m, "\tEL_STAT_HI: 0x%08x\n",
+			   ENGINE_READ(engine, RING_EXECLIST_STATUS_HI));
+		drm_printf(m, "\tEL_STAT_LO: 0x%08x\n",
+			   ENGINE_READ(engine, RING_EXECLIST_STATUS_LO));
+	}
 	drm_printf(m, "\tRING_START: 0x%08x\n",
 		   ENGINE_READ(engine, RING_START));
 	drm_printf(m, "\tRING_HEAD:  0x%08x\n",

drivers/gpu/drm/i915/gt/intel_engine_types.h+29−6

 	 */
 	struct i915_priolist default_priolist;
+	/**
+	 * @ccid: identifier for contexts submitted to this engine
+	 */
+	u32 ccid;
+	/**
+	 * @yield: CCID at the time of the last semaphore-wait interrupt.
+	 *
+	 * Instead of leaving a semaphore busy-spinning on an engine, we would
+	 * like to switch to another ready context, i.e. yielding the semaphore
+	 * timeslice.
+	 */
+	u32 yield;
 	/**
 	 * @error_interrupt: CS Master EIR
 	 *
 	u32 context_size;
 	u32 mmio_base;
-	unsigned int context_tag;
+	unsigned long context_tag;
-#define NUM_CONTEXT_TAG roundup_pow_of_two(2 * EXECLIST_MAX_PORTS)
 	struct rb_node uabi_node;
 #define I915_ENGINE_SUPPORTS_STATS   BIT(1)
 #define I915_ENGINE_HAS_PREEMPTION   BIT(2)
 #define I915_ENGINE_HAS_SEMAPHORES   BIT(3)
-#define I915_ENGINE_NEEDS_BREADCRUMB_TASKLET BIT(4)
+#define I915_ENGINE_HAS_TIMESLICES   BIT(4)
-#define I915_ENGINE_IS_VIRTUAL       BIT(5)
+#define I915_ENGINE_NEEDS_BREADCRUMB_TASKLET BIT(5)
-#define I915_ENGINE_HAS_RELATIVE_MMIO BIT(6)
+#define I915_ENGINE_IS_VIRTUAL       BIT(6)
-#define I915_ENGINE_REQUIRES_CMD_PARSER BIT(7)
+#define I915_ENGINE_HAS_RELATIVE_MMIO BIT(7)
+#define I915_ENGINE_REQUIRES_CMD_PARSER BIT(8)
 	unsigned int flags;
 	/*
 	return engine->flags & I915_ENGINE_HAS_SEMAPHORES;
 }
+static inline bool
+intel_engine_has_timeslices(const struct intel_engine_cs *engine)
+{
+	if (!IS_ACTIVE(CONFIG_DRM_I915_TIMESLICE_DURATION))
+		return false;
+	return engine->flags & I915_ENGINE_HAS_TIMESLICES;
+}
 static inline bool
 intel_engine_needs_breadcrumb_tasklet(const struct intel_engine_cs *engine)
 {

drivers/gpu/drm/i915/gt/intel_gt_irq.c+13−2

 		}
 	}
+	if (iir & GT_WAIT_SEMAPHORE_INTERRUPT) {
+		WRITE_ONCE(engine->execlists.yield,
+			   ENGINE_READ_FW(engine, RING_EXECLIST_STATUS_HI));
+		ENGINE_TRACE(engine, "semaphore yield: %08x\n",
+			     engine->execlists.yield);
+		if (del_timer(&engine->execlists.timer))
+			tasklet = true;
+	}
 	if (iir & GT_CONTEXT_SWITCH_INTERRUPT)
 		tasklet = true;
 	const u32 irqs =
 		GT_CS_MASTER_ERROR_INTERRUPT |
 		GT_RENDER_USER_INTERRUPT |
-		GT_CONTEXT_SWITCH_INTERRUPT;
+		GT_CONTEXT_SWITCH_INTERRUPT |
+		GT_WAIT_SEMAPHORE_INTERRUPT;
 	struct intel_uncore *uncore = gt->uncore;
 	const u32 dmask = irqs << 16 | irqs;
 	const u32 smask = irqs << 16;
 	const u32 irqs =
 		GT_CS_MASTER_ERROR_INTERRUPT |
 		GT_RENDER_USER_INTERRUPT |
-		GT_CONTEXT_SWITCH_INTERRUPT;
+		GT_CONTEXT_SWITCH_INTERRUPT |
+		GT_WAIT_SEMAPHORE_INTERRUPT;
 	const u32 gt_interrupts[] = {
 		irqs << GEN8_RCS_IRQ_SHIFT | irqs << GEN8_BCS_IRQ_SHIFT,
 		irqs << GEN8_VCS0_IRQ_SHIFT | irqs << GEN8_VCS1_IRQ_SHIFT,

drivers/gpu/drm/i915/gt/intel_lrc.c+81−39

@@ -456,10 +456,10 @@ assert_priority_queue(const struct i915_request *prev, · 455 unmodified lines
456	* engine info, SW context ID and SW counter need to form a unique number	456	* engine info, SW context ID and SW counter need to form a unique number
457	* (Context ID) per lrc.	457	* (Context ID) per lrc.
458	*/	458	*/
459	static u64	459	static u32
460	lrc_descriptor(struct intel_context ce, struct intel_engine_cs engine)	460	lrc_descriptor(struct intel_context ce, struct intel_engine_cs engine)
461	{	461	{
462	u64 desc;	462	u32 desc;
463		463
464	desc = INTEL_LEGACY_32B_CONTEXT;	464	desc = INTEL_LEGACY_32B_CONTEXT;
465	if (i915_vm_is_4lvl(ce->vm))	465	if (i915_vm_is_4lvl(ce->vm))
@@ -470,21 +470,7 @@ lrc_descriptor(struct intel_context ce, struct intel_engine_cs engine) · 4 unmodified lines
470	if (IS_GEN(engine->i915, 8))	470	if (IS_GEN(engine->i915, 8))
471	desc \|= GEN8_CTX_L3LLC_COHERENT;	471	desc \|= GEN8_CTX_L3LLC_COHERENT;
472		472
473	desc \|= i915_ggtt_offset(ce->state); /* bits 12-31 */	473	return i915_ggtt_offset(ce->state) \| desc;
474	/*
475	* The following 32bits are copied into the OA reports (dword 2).
476	* Consider updating oa_get_render_ctx_id in i915_perf.c when changing
477	* anything below.
478	*/
479	if (INTEL_GEN(engine->i915) >= 11) {
480	desc \|= (u64)engine->instance << GEN11_ENGINE_INSTANCE_SHIFT;
481	/* bits 48-53 */
482
483	desc \|= (u64)engine->class << GEN11_ENGINE_CLASS_SHIFT;
484	/* bits 61-63 */
485	}
486
487	return desc;
488	}	474	}
489		475
490	static inline unsigned int dword_in_page(void *addr)	476	static inline unsigned int dword_in_page(void *addr)
@@ -1192,7 +1178,7 @@ static void reset_active(struct i915_request *rq, · 701 unmodified lines
1192	__execlists_update_reg_state(ce, engine, head);	1178	__execlists_update_reg_state(ce, engine, head);
1193		1179
1194	/* We've switched away, so this should be a no-op, but intent matters */	1180	/* We've switched away, so this should be a no-op, but intent matters */
1195	ce->lrc_desc \|= CTX_DESC_FORCE_RESTORE;	1181	ce->lrc.desc \|= CTX_DESC_FORCE_RESTORE;
1196	}	1182	}
1197		1183
1198	static u32 intel_context_get_runtime(const struct intel_context *ce)	1184	static u32 intel_context_get_runtime(const struct intel_context *ce)
@@ -1251,18 +1237,23 @@ __execlists_schedule_in(struct i915_request *rq) · 52 unmodified lines
1251	if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))	1237	if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
1252	execlists_check_context(ce, engine);	1238	execlists_check_context(ce, engine);
1253		1239
1254	ce->lrc_desc &= ~GENMASK_ULL(47, 37);
1255	if (ce->tag) {	1240	if (ce->tag) {
1256	/* Use a fixed tag for OA and friends */	1241	/* Use a fixed tag for OA and friends */
1257	ce->lrc_desc \|= (u64)ce->tag << 32;	1242	GEM_BUG_ON(ce->tag <= BITS_PER_LONG);
		1243	ce->lrc.ccid = ce->tag;
1258	} else {	1244	} else {
1259	/* We don't need a strict matching tag, just different values */	1245	/* We don't need a strict matching tag, just different values */
1260	ce->lrc_desc \|=	1246	unsigned int tag = ffs(engine->context_tag);
1261	(u64)(++engine->context_tag % NUM_CONTEXT_TAG) <<	1247
1262	GEN11_SW_CTX_ID_SHIFT;	1248	GEM_BUG_ON(tag == 0 \|\| tag >= BITS_PER_LONG);
1263	BUILD_BUG_ON(NUM_CONTEXT_TAG > GEN12_MAX_CONTEXT_HW_ID);	1249	clear_bit(tag - 1, &engine->context_tag);
		1250	ce->lrc.ccid = tag << (GEN11_SW_CTX_ID_SHIFT - 32);
		1251
		1252	BUILD_BUG_ON(BITS_PER_LONG > GEN12_MAX_CONTEXT_HW_ID);
1264	}	1253	}
1265		1254
		1255	ce->lrc.ccid \|= engine->execlists.ccid;
		1256
1266	__intel_gt_pm_get(engine->gt);	1257	__intel_gt_pm_get(engine->gt);
1267	execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_IN);	1258	execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_IN);
1268	intel_engine_context_in(engine);	1259	intel_engine_context_in(engine);
@@ -1302,7 +1293,8 @@ static void kick_siblings(struct i915_request rq, struct intel_context ce) · 33 unmodified lines
1302		1293
1303	static inline void	1294	static inline void
1304	__execlists_schedule_out(struct i915_request *rq,	1295	__execlists_schedule_out(struct i915_request *rq,
1305	struct intel_engine_cs * const engine)	1296	struct intel_engine_cs * const engine,
		1297	unsigned int ccid)
1306	{	1298	{
1307	struct intel_context * const ce = rq->context;	1299	struct intel_context * const ce = rq->context;
1308		1300
@@ -1320,6 +1312,14 @@ __execlists_schedule_out(struct i915_request *rq, · 11 unmodified lines
1320	i915_request_completed(rq))	1312	i915_request_completed(rq))
1321	intel_engine_add_retire(engine, ce->timeline);	1313	intel_engine_add_retire(engine, ce->timeline);
1322		1314
		1315	ccid >>= GEN11_SW_CTX_ID_SHIFT - 32;
		1316	ccid &= GEN12_MAX_CONTEXT_HW_ID;
		1317	if (ccid < BITS_PER_LONG) {
		1318	GEM_BUG_ON(ccid == 0);
		1319	GEM_BUG_ON(test_bit(ccid - 1, &engine->context_tag));
		1320	set_bit(ccid - 1, &engine->context_tag);
		1321	}
		1322
1323	intel_context_update_runtime(ce);	1323	intel_context_update_runtime(ce);
1324	intel_engine_context_out(engine);	1324	intel_engine_context_out(engine);
1325	execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_OUT);	1325	execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_OUT);
@@ -1345,15 +1345,17 @@ execlists_schedule_out(struct i915_request *rq) · 19 unmodified lines
1345	{	1345	{
1346	struct intel_context * const ce = rq->context;	1346	struct intel_context * const ce = rq->context;
1347	struct intel_engine_cs cur, old;	1347	struct intel_engine_cs cur, old;
		1348	u32 ccid;
1348		1349
1349	trace_i915_request_out(rq);	1350	trace_i915_request_out(rq);
1350		1351
		1352	ccid = rq->context->lrc.ccid;
1351	old = READ_ONCE(ce->inflight);	1353	old = READ_ONCE(ce->inflight);
1352	do	1354	do
1353	cur = ptr_unmask_bits(old, 2) ? ptr_dec(old) : NULL;	1355	cur = ptr_unmask_bits(old, 2) ? ptr_dec(old) : NULL;
1354	while (!try_cmpxchg(&ce->inflight, &old, cur));	1356	while (!try_cmpxchg(&ce->inflight, &old, cur));
1355	if (!cur)	1357	if (!cur)
1356	__execlists_schedule_out(rq, old);	1358	__execlists_schedule_out(rq, old, ccid);
1357		1359
1358	i915_request_put(rq);	1360	i915_request_put(rq);
1359	}	1361	}
@@ -1361,7 +1363,7 @@ execlists_schedule_out(struct i915_request *rq) · 1 unmodified line
1361	static u64 execlists_update_context(struct i915_request *rq)	1363	static u64 execlists_update_context(struct i915_request *rq)
1362	{	1364	{
1363	struct intel_context *ce = rq->context;	1365	struct intel_context *ce = rq->context;
1364	u64 desc = ce->lrc_desc;	1366	u64 desc = ce->lrc.desc;
1365	u32 tail, prev;	1367	u32 tail, prev;
1366		1368
1367	/*	1369	/*
@@ -1400,7 +1402,7 @@ static u64 execlists_update_context(struct i915_request *rq) · 32 unmodified lines
1400	*/	1402	*/
1401	wmb();	1403	wmb();
1402		1404
1403	ce->lrc_desc &= ~CTX_DESC_FORCE_RESTORE;	1405	ce->lrc.desc &= ~CTX_DESC_FORCE_RESTORE;
1404	return desc;	1406	return desc;
1405	}	1407	}
1406		1408
@@ -1719,6 +1721,9 @@ static void defer_request(struct i915_request rq, struct list_head const pl) · 312 unmodified lines
1719	struct i915_request *w =	1721	struct i915_request *w =
1720	container_of(p->waiter, typeof(*w), sched);	1722	container_of(p->waiter, typeof(*w), sched);
1721		1723
		1724	if (p->flags & I915_DEPENDENCY_WEAK)
		1725	continue;
		1726
1722	/* Leave semaphores spinning on the other engines */	1727	/* Leave semaphores spinning on the other engines */
1723	if (w->engine != rq->engine)	1728	if (w->engine != rq->engine)
1724	continue;	1729	continue;
@@ -1754,7 +1759,8 @@ static void defer_active(struct intel_engine_cs *engine) · 29 unmodified lines
1754	}	1759	}
1755		1760
1756	static bool	1761	static bool
1757	need_timeslice(struct intel_engine_cs engine, const struct i915_request rq)	1762	need_timeslice(const struct intel_engine_cs *engine,
		1763	const struct i915_request *rq)
1758	{	1764	{
1759	int hint;	1765	int hint;
1760		1766
@@ -1768,6 +1774,32 @@ need_timeslice(struct intel_engine_cs engine, const struct i915_request rq) · 7 unmodified lines
1768	return hint >= effective_prio(rq);	1774	return hint >= effective_prio(rq);
1769	}	1775	}
1770		1776
		1777	static bool
		1778	timeslice_yield(const struct intel_engine_execlists *el,
		1779	const struct i915_request *rq)
		1780	{
		1781	/*
		1782	* Once bitten, forever smitten!
		1783	*
		1784	* If the active context ever busy-waited on a semaphore,
		1785	* it will be treated as a hog until the end of its timeslice (i.e.
		1786	* until it is scheduled out and replaced by a new submission,
		1787	* possibly even its own lite-restore). The HW only sends an interrupt
		1788	* on the first miss, and we do know if that semaphore has been
		1789	* signaled, or even if it is now stuck on another semaphore. Play
		1790	* safe, yield if it might be stuck -- it will be given a fresh
		1791	* timeslice in the near future.
		1792	*/
		1793	return rq->context->lrc.ccid == READ_ONCE(el->yield);
		1794	}
		1795
		1796	static bool
		1797	timeslice_expired(const struct intel_engine_execlists *el,
		1798	const struct i915_request *rq)
		1799	{
		1800	return timer_expired(&el->timer) \|\| timeslice_yield(el, rq);
		1801	}
		1802
1771	static int	1803	static int
1772	switch_prio(struct intel_engine_cs engine, const struct i915_request rq)	1804	switch_prio(struct intel_engine_cs engine, const struct i915_request rq)
1773	{	1805	{
@@ -1783,8 +1815,7 @@ timeslice(const struct intel_engine_cs *engine) · 9 unmodified lines
1783	return READ_ONCE(engine->props.timeslice_duration_ms);	1815	return READ_ONCE(engine->props.timeslice_duration_ms);
1784	}	1816	}
1785		1817
1786	static unsigned long	1818	static unsigned long active_timeslice(const struct intel_engine_cs *engine)
1787	active_timeslice(const struct intel_engine_cs *engine)
1788	{	1819	{
1789	const struct intel_engine_execlists *execlists = &engine->execlists;	1820	const struct intel_engine_execlists *execlists = &engine->execlists;
1790	const struct i915_request rq = execlists->active;	1821	const struct i915_request rq = execlists->active;
@@ -1946,13 +1977,14 @@ static void execlists_dequeue(struct intel_engine_cs *engine) · 155 unmodified lines
1946		1977
1947	last = NULL;	1978	last = NULL;
1948	} else if (need_timeslice(engine, last) &&	1979	} else if (need_timeslice(engine, last) &&
1949	timer_expired(&engine->execlists.timer)) {	1980	timeslice_expired(execlists, last)) {
1950	ENGINE_TRACE(engine,	1981	ENGINE_TRACE(engine,
1951	"expired last=%llx:%lld, prio=%d, hint=%d\n",	1982	"expired last=%llx:%lld, prio=%d, hint=%d, yield?=%s\n",
1952	last->fence.context,	1983	last->fence.context,
1953	last->fence.seqno,	1984	last->fence.seqno,
1954	last->sched.attr.priority,	1985	last->sched.attr.priority,
1955	execlists->queue_priority_hint);	1986	execlists->queue_priority_hint,
		1987	yesno(timeslice_yield(execlists, last)));
1956		1988
1957	ring_set_paused(engine, 1);	1989	ring_set_paused(engine, 1);
1958	defer_active(engine);	1990	defer_active(engine);
@@ -2213,6 +2245,7 @@ done: · 254 unmodified lines
2213	}	2245	}
2214	clear_ports(port + 1, last_port - port);	2246	clear_ports(port + 1, last_port - port);
2215		2247
		2248	WRITE_ONCE(execlists->yield, -1);
2216	execlists_submit_ports(engine);	2249	execlists_submit_ports(engine);
2217	set_preempt_timeout(engine, *active);	2250	set_preempt_timeout(engine, *active);
2218	} else {	2251	} else {
@@ -3043,7 +3076,7 @@ __execlists_context_pin(struct intel_context *ce, · 824 unmodified lines
3043	if (IS_ERR(vaddr))	3076	if (IS_ERR(vaddr))
3044	return PTR_ERR(vaddr);	3077	return PTR_ERR(vaddr);
3045		3078
3046	ce->lrc_desc = lrc_descriptor(ce, engine) \| CTX_DESC_FORCE_RESTORE;	3079	ce->lrc.lrca = lrc_descriptor(ce, engine) \| CTX_DESC_FORCE_RESTORE;
3047	ce->lrc_reg_state = vaddr + LRC_STATE_PN * PAGE_SIZE;	3080	ce->lrc_reg_state = vaddr + LRC_STATE_PN * PAGE_SIZE;
3048	__execlists_update_reg_state(ce, engine, ce->ring->tail);	3081	__execlists_update_reg_state(ce, engine, ce->ring->tail);
3049		3082
@@ -3072,7 +3105,7 @@ static void execlists_context_reset(struct intel_context *ce) · 22 unmodified lines
3072	ce, ce->engine, ce->ring, true);	3105	ce, ce->engine, ce->ring, true);
3073	__execlists_update_reg_state(ce, ce->engine, ce->ring->tail);	3106	__execlists_update_reg_state(ce, ce->engine, ce->ring->tail);
3074		3107
3075	ce->lrc_desc \|= CTX_DESC_FORCE_RESTORE;	3108	ce->lrc.desc \|= CTX_DESC_FORCE_RESTORE;
3076	}	3109	}
3077		3110
3078	static const struct intel_context_ops execlists_context_ops = {	3111	static const struct intel_context_ops execlists_context_ops = {
@@ -3541,7 +3574,7 @@ static void enable_execlists(struct intel_engine_cs *engine) · 462 unmodified lines
3541		3574
3542	enable_error_interrupt(engine);	3575	enable_error_interrupt(engine);
3543		3576
3544	engine->context_tag = 0;	3577	engine->context_tag = GENMASK(BITS_PER_LONG - 2, 0);
3545	}	3578	}
3546		3579
3547	static bool unexpected_starting_state(struct intel_engine_cs *engine)	3580	static bool unexpected_starting_state(struct intel_engine_cs *engine)
@@ -3753,7 +3786,7 @@ out_replay: · 205 unmodified lines
3753	head, ce->ring->tail);	3786	head, ce->ring->tail);
3754	__execlists_reset_reg_state(ce, engine);	3787	__execlists_reset_reg_state(ce, engine);
3755	__execlists_update_reg_state(ce, engine, head);	3788	__execlists_update_reg_state(ce, engine, head);
3756	ce->lrc_desc \|= CTX_DESC_FORCE_RESTORE; /* paranoid: GPU was reset! */	3789	ce->lrc.desc \|= CTX_DESC_FORCE_RESTORE; /* paranoid: GPU was reset! */
3757		3790
3758	unwind:	3791	unwind:
3759	/* Push back any incomplete requests for replay after the reset. */	3792	/* Push back any incomplete requests for replay after the reset. */
@@ -4369,8 +4402,11 @@ void intel_execlists_set_default_submission(struct intel_engine_cs *engine) · 609 unmodified lines
4369	engine->flags \|= I915_ENGINE_SUPPORTS_STATS;	4402	engine->flags \|= I915_ENGINE_SUPPORTS_STATS;
4370	if (!intel_vgpu_active(engine->i915)) {	4403	if (!intel_vgpu_active(engine->i915)) {
4371	engine->flags \|= I915_ENGINE_HAS_SEMAPHORES;	4404	engine->flags \|= I915_ENGINE_HAS_SEMAPHORES;
4372	if (HAS_LOGICAL_RING_PREEMPTION(engine->i915))	4405	if (HAS_LOGICAL_RING_PREEMPTION(engine->i915)) {
4373	engine->flags \|= I915_ENGINE_HAS_PREEMPTION;	4406	engine->flags \|= I915_ENGINE_HAS_PREEMPTION;
		4407	if (IS_ACTIVE(CONFIG_DRM_I915_TIMESLICE_DURATION))
		4408	engine->flags \|= I915_ENGINE_HAS_TIMESLICES;
		4409	}
4374	}	4410	}
4375		4411
4376	if (INTEL_GEN(engine->i915) >= 12)	4412	if (INTEL_GEN(engine->i915) >= 12)
@@ -4449,6 +4485,7 @@ logical_ring_default_irqs(struct intel_engine_cs *engine) · 72 unmodified lines
4449	engine->irq_enable_mask = GT_RENDER_USER_INTERRUPT << shift;	4485	engine->irq_enable_mask = GT_RENDER_USER_INTERRUPT << shift;
4450	engine->irq_keep_mask = GT_CONTEXT_SWITCH_INTERRUPT << shift;	4486	engine->irq_keep_mask = GT_CONTEXT_SWITCH_INTERRUPT << shift;
4451	engine->irq_keep_mask \|= GT_CS_MASTER_ERROR_INTERRUPT << shift;	4487	engine->irq_keep_mask \|= GT_CS_MASTER_ERROR_INTERRUPT << shift;
		4488	engine->irq_keep_mask \|= GT_WAIT_SEMAPHORE_INTERRUPT << shift;
4452	}	4489	}
4453		4490
4454	static void rcs_submission_override(struct intel_engine_cs *engine)	4491	static void rcs_submission_override(struct intel_engine_cs *engine)
@@ -4516,6 +4553,11 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine) · 61 unmodified lines
4516	else	4553	else
4517	execlists->csb_size = GEN11_CSB_ENTRIES;	4554	execlists->csb_size = GEN11_CSB_ENTRIES;
4518		4555
		4556	if (INTEL_GEN(engine->i915) >= 11) {
		4557	execlists->ccid \|= engine->instance << (GEN11_ENGINE_INSTANCE_SHIFT - 32);
		4558	execlists->ccid \|= engine->class << (GEN11_ENGINE_CLASS_SHIFT - 32);
		4559	}
		4560
4519	reset_csb_pointers(engine);	4561	reset_csb_pointers(engine);
4520		4562
4521	/* Finally, take ownership and responsibility for cleanup! */	4563	/* Finally, take ownership and responsibility for cleanup! */

drivers/gpu/drm/i915/gt/selftest_lrc.c+18−16

@@ -929,7 +929,7 @@ create_rewinder(struct intel_context *ce, · 928 unmodified lines
929	goto err;	929	goto err;
930	}	930	}
931		931
932	cs = intel_ring_begin(rq, 10);	932	cs = intel_ring_begin(rq, 14);
933	if (IS_ERR(cs)) {	933	if (IS_ERR(cs)) {
934	err = PTR_ERR(cs);	934	err = PTR_ERR(cs);
935	goto err;	935	goto err;
@@ -941,8 +941,8 @@ create_rewinder(struct intel_context *ce, · 5 unmodified lines
941	*cs++ = MI_SEMAPHORE_WAIT \|	941	*cs++ = MI_SEMAPHORE_WAIT \|
942	MI_SEMAPHORE_GLOBAL_GTT \|	942	MI_SEMAPHORE_GLOBAL_GTT \|
943	MI_SEMAPHORE_POLL \|	943	MI_SEMAPHORE_POLL \|
944	MI_SEMAPHORE_SAD_NEQ_SDD;	944	MI_SEMAPHORE_SAD_GTE_SDD;
945	*cs++ = 0;	945	*cs++ = idx;
946	*cs++ = offset;	946	*cs++ = offset;
947	*cs++ = 0;	947	*cs++ = 0;
948		948
@@ -951,6 +951,11 @@ create_rewinder(struct intel_context *ce, · 2 unmodified lines
951	cs++ = offset + idx sizeof(u32);	951	cs++ = offset + idx sizeof(u32);
952	*cs++ = 0;	952	*cs++ = 0;
953		953
		954	*cs++ = MI_STORE_DWORD_IMM_GEN4 \| MI_USE_GGTT;
		955	*cs++ = offset;
		956	*cs++ = 0;
		957	*cs++ = idx + 1;
		958
954	intel_ring_advance(rq, cs);	959	intel_ring_advance(rq, cs);
955		960
956	rq->sched.attr.priority = I915_PRIORITY_MASK;	961	rq->sched.attr.priority = I915_PRIORITY_MASK;
@@ -984,7 +989,7 @@ static int live_timeslice_rewind(void *arg) · 27 unmodified lines
984		989
985	for_each_engine(engine, gt, id) {	990	for_each_engine(engine, gt, id) {
986	enum { A1, A2, B1 };	991	enum { A1, A2, B1 };
987	enum { X = 1, Y, Z };	992	enum { X = 1, Z, Y };
988	struct i915_request *rq[3] = {};	993	struct i915_request *rq[3] = {};
989	struct intel_context *ce;	994	struct intel_context *ce;
990	unsigned long heartbeat;	995	unsigned long heartbeat;
@@ -1017,13 +1022,13 @@ static int live_timeslice_rewind(void *arg) · 26 unmodified lines
1017	goto err;	1022	goto err;
1018	}	1023	}
1019		1024
1020	rq[0] = create_rewinder(ce, NULL, slot, 1);	1025	rq[0] = create_rewinder(ce, NULL, slot, X);
1021	if (IS_ERR(rq[0])) {	1026	if (IS_ERR(rq[0])) {
1022	intel_context_put(ce);	1027	intel_context_put(ce);
1023	goto err;	1028	goto err;
1024	}	1029	}
1025		1030
1026	rq[1] = create_rewinder(ce, NULL, slot, 2);	1031	rq[1] = create_rewinder(ce, NULL, slot, Y);
1027	intel_context_put(ce);	1032	intel_context_put(ce);
1028	if (IS_ERR(rq[1]))	1033	if (IS_ERR(rq[1]))
1029	goto err;	1034	goto err;
@@ -1041,7 +1046,7 @@ static int live_timeslice_rewind(void *arg) · 11 unmodified lines
1041	goto err;	1046	goto err;
1042	}	1047	}
1043		1048
1044	rq[2] = create_rewinder(ce, rq[0], slot, 3);	1049	rq[2] = create_rewinder(ce, rq[0], slot, Z);
1045	intel_context_put(ce);	1050	intel_context_put(ce);
1046	if (IS_ERR(rq[2]))	1051	if (IS_ERR(rq[2]))
1047	goto err;	1052	goto err;
@@ -1055,15 +1060,12 @@ static int live_timeslice_rewind(void *arg) · 7 unmodified lines
1055	GEM_BUG_ON(!timer_pending(&engine->execlists.timer));	1060	GEM_BUG_ON(!timer_pending(&engine->execlists.timer));
1056		1061
1057	/* ELSP[] = { { A:rq1, A:rq2 }, { B:rq1 } } */	1062	/* ELSP[] = { { A:rq1, A:rq2 }, { B:rq1 } } */
1058	GEM_BUG_ON(!i915_request_is_active(rq[A1]));	1063	if (i915_request_is_active(rq[A2])) { /* semaphore yielded! */
1059	GEM_BUG_ON(!i915_request_is_active(rq[A2]));	1064	/* Wait for the timeslice to kick in */
1060	GEM_BUG_ON(!i915_request_is_active(rq[B1]));	1065	del_timer(&engine->execlists.timer);
1061		1066	tasklet_hi_schedule(&engine->execlists.tasklet);
1062	/* Wait for the timeslice to kick in */	1067	intel_engine_flush_submission(engine);
1063	del_timer(&engine->execlists.timer);	1068	}
1064	tasklet_hi_schedule(&engine->execlists.tasklet);
1065	intel_engine_flush_submission(engine);
1066
1067	/* -> ELSP[] = { { A:rq1 }, { B:rq1 } } */	1069	/* -> ELSP[] = { { A:rq1 }, { B:rq1 } } */
1068	GEM_BUG_ON(!i915_request_is_active(rq[A1]));	1070	GEM_BUG_ON(!i915_request_is_active(rq[A1]));
1069	GEM_BUG_ON(!i915_request_is_active(rq[B1]));	1071	GEM_BUG_ON(!i915_request_is_active(rq[B1]));

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

@@ -217,7 +217,7 @@ static void guc_wq_item_append(struct intel_guc *guc, · 216 unmodified lines
217	static void guc_add_request(struct intel_guc guc, struct i915_request rq)	217	static void guc_add_request(struct intel_guc guc, struct i915_request rq)
218	{	218	{
219	struct intel_engine_cs *engine = rq->engine;	219	struct intel_engine_cs *engine = rq->engine;
220	u32 ctx_desc = lower_32_bits(rq->context->lrc_desc);	220	u32 ctx_desc = rq->context->lrc.ccid;
221	u32 ring_tail = intel_ring_set_tail(rq->ring, rq->tail) / sizeof(u64);	221	u32 ring_tail = intel_ring_set_tail(rq->ring, rq->tail) / sizeof(u64);
222		222
223	guc_wq_item_append(guc, engine->guc_id, ctx_desc,	223	guc_wq_item_append(guc, engine->guc_id, ctx_desc,

drivers/gpu/drm/i915/gvt/display.c+44−5

@@ -208,14 +208,41 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) · 207 unmodified lines
208	SKL_FUSE_PG_DIST_STATUS(SKL_PG0) \|	208	SKL_FUSE_PG_DIST_STATUS(SKL_PG0) \|
209	SKL_FUSE_PG_DIST_STATUS(SKL_PG1) \|	209	SKL_FUSE_PG_DIST_STATUS(SKL_PG1) \|
210	SKL_FUSE_PG_DIST_STATUS(SKL_PG2);	210	SKL_FUSE_PG_DIST_STATUS(SKL_PG2);
211	vgpu_vreg_t(vgpu, LCPLL1_CTL) \|=	211	/*
212	LCPLL_PLL_ENABLE \|	212	* Only 1 PIPE enabled in current vGPU display and PIPE_A is
213	LCPLL_PLL_LOCK;	213	* tied to TRANSCODER_A in HW, so it's safe to assume PIPE_A,
214	vgpu_vreg_t(vgpu, LCPLL2_CTL) \|= LCPLL_PLL_ENABLE;	214	* TRANSCODER_A can be enabled. PORT_x depends on the input of
215		215	* setup_virtual_dp_monitor, we can bind DPLL0 to any PORT_x
		216	* so we fixed to DPLL0 here.
		217	* Setup DPLL0: DP link clk 1620 MHz, non SSC, DP Mode
		218	*/
		219	vgpu_vreg_t(vgpu, DPLL_CTRL1) =
		220	DPLL_CTRL1_OVERRIDE(DPLL_ID_SKL_DPLL0);
		221	vgpu_vreg_t(vgpu, DPLL_CTRL1) \|=
		222	DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_1620, DPLL_ID_SKL_DPLL0);
		223	vgpu_vreg_t(vgpu, LCPLL1_CTL) =
		224	LCPLL_PLL_ENABLE \| LCPLL_PLL_LOCK;
		225	vgpu_vreg_t(vgpu, DPLL_STATUS) = DPLL_LOCK(DPLL_ID_SKL_DPLL0);
		226	/*
		227	* Golden M/N are calculated based on:
		228	* 24 bpp, 4 lanes, 154000 pixel clk (from virtual EDID),
		229	* DP link clk 1620 MHz and non-constant_n.
		230	* TODO: calculate DP link symbol clk and stream clk m/n.
		231	*/
		232	vgpu_vreg_t(vgpu, PIPE_DATA_M1(TRANSCODER_A)) = 63 << TU_SIZE_SHIFT;
		233	vgpu_vreg_t(vgpu, PIPE_DATA_M1(TRANSCODER_A)) \|= 0x5b425e;
		234	vgpu_vreg_t(vgpu, PIPE_DATA_N1(TRANSCODER_A)) = 0x800000;
		235	vgpu_vreg_t(vgpu, PIPE_LINK_M1(TRANSCODER_A)) = 0x3cd6e;
		236	vgpu_vreg_t(vgpu, PIPE_LINK_N1(TRANSCODER_A)) = 0x80000;
216	}	237	}
217		238
218	if (intel_vgpu_has_monitor_on_port(vgpu, PORT_B)) {	239	if (intel_vgpu_has_monitor_on_port(vgpu, PORT_B)) {
		240	vgpu_vreg_t(vgpu, DPLL_CTRL2) &=
		241	~DPLL_CTRL2_DDI_CLK_OFF(PORT_B);
		242	vgpu_vreg_t(vgpu, DPLL_CTRL2) \|=
		243	DPLL_CTRL2_DDI_CLK_SEL(DPLL_ID_SKL_DPLL0, PORT_B);
		244	vgpu_vreg_t(vgpu, DPLL_CTRL2) \|=
		245	DPLL_CTRL2_DDI_SEL_OVERRIDE(PORT_B);
219	vgpu_vreg_t(vgpu, SFUSE_STRAP) \|= SFUSE_STRAP_DDIB_DETECTED;	246	vgpu_vreg_t(vgpu, SFUSE_STRAP) \|= SFUSE_STRAP_DDIB_DETECTED;
220	vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) &=	247	vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) &=
221	~(TRANS_DDI_BPC_MASK \| TRANS_DDI_MODE_SELECT_MASK \|	248	~(TRANS_DDI_BPC_MASK \| TRANS_DDI_MODE_SELECT_MASK \|
@@ -236,6 +263,12 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) · 14 unmodified lines
236	}	263	}
237		264
238	if (intel_vgpu_has_monitor_on_port(vgpu, PORT_C)) {	265	if (intel_vgpu_has_monitor_on_port(vgpu, PORT_C)) {
		266	vgpu_vreg_t(vgpu, DPLL_CTRL2) &=
		267	~DPLL_CTRL2_DDI_CLK_OFF(PORT_C);
		268	vgpu_vreg_t(vgpu, DPLL_CTRL2) \|=
		269	DPLL_CTRL2_DDI_CLK_SEL(DPLL_ID_SKL_DPLL0, PORT_C);
		270	vgpu_vreg_t(vgpu, DPLL_CTRL2) \|=
		271	DPLL_CTRL2_DDI_SEL_OVERRIDE(PORT_C);
239	vgpu_vreg_t(vgpu, SDEISR) \|= SDE_PORTC_HOTPLUG_CPT;	272	vgpu_vreg_t(vgpu, SDEISR) \|= SDE_PORTC_HOTPLUG_CPT;
240	vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) &=	273	vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) &=
241	~(TRANS_DDI_BPC_MASK \| TRANS_DDI_MODE_SELECT_MASK \|	274	~(TRANS_DDI_BPC_MASK \| TRANS_DDI_MODE_SELECT_MASK \|
@@ -256,6 +289,12 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu) · 14 unmodified lines
256	}	289	}
257		290
258	if (intel_vgpu_has_monitor_on_port(vgpu, PORT_D)) {	291	if (intel_vgpu_has_monitor_on_port(vgpu, PORT_D)) {
		292	vgpu_vreg_t(vgpu, DPLL_CTRL2) &=
		293	~DPLL_CTRL2_DDI_CLK_OFF(PORT_D);
		294	vgpu_vreg_t(vgpu, DPLL_CTRL2) \|=
		295	DPLL_CTRL2_DDI_CLK_SEL(DPLL_ID_SKL_DPLL0, PORT_D);
		296	vgpu_vreg_t(vgpu, DPLL_CTRL2) \|=
		297	DPLL_CTRL2_DDI_SEL_OVERRIDE(PORT_D);
259	vgpu_vreg_t(vgpu, SDEISR) \|= SDE_PORTD_HOTPLUG_CPT;	298	vgpu_vreg_t(vgpu, SDEISR) \|= SDE_PORTD_HOTPLUG_CPT;
260	vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) &=	299	vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) &=
261	~(TRANS_DDI_BPC_MASK \| TRANS_DDI_MODE_SELECT_MASK \|	300	~(TRANS_DDI_BPC_MASK \| TRANS_DDI_MODE_SELECT_MASK \|

drivers/gpu/drm/i915/gvt/scheduler.c+7−3

@@ -290,7 +290,7 @@ static void · 289 unmodified lines
290	shadow_context_descriptor_update(struct intel_context *ce,	290	shadow_context_descriptor_update(struct intel_context *ce,
291	struct intel_vgpu_workload *workload)	291	struct intel_vgpu_workload *workload)
292	{	292	{
293	u64 desc = ce->lrc_desc;	293	u64 desc = ce->lrc.desc;
294		294
295	/*	295	/*
296	* Update bits 0-11 of the context descriptor which includes flags	296	* Update bits 0-11 of the context descriptor which includes flags
@@ -300,7 +300,7 @@ shadow_context_descriptor_update(struct intel_context *ce, · 3 unmodified lines
300	desc \|= (u64)workload->ctx_desc.addressing_mode <<	300	desc \|= (u64)workload->ctx_desc.addressing_mode <<
301	GEN8_CTX_ADDRESSING_MODE_SHIFT;	301	GEN8_CTX_ADDRESSING_MODE_SHIFT;
302		302
303	ce->lrc_desc = desc;	303	ce->lrc.desc = desc;
304	}	304	}
305		305
306	static int copy_workload_to_ring_buffer(struct intel_vgpu_workload *workload)	306	static int copy_workload_to_ring_buffer(struct intel_vgpu_workload *workload)
@@ -379,7 +379,11 @@ static void set_context_ppgtt_from_shadow(struct intel_vgpu_workload *workload, · 72 unmodified lines
379	for (i = 0; i < GVT_RING_CTX_NR_PDPS; i++) {	379	for (i = 0; i < GVT_RING_CTX_NR_PDPS; i++) {
380	struct i915_page_directory * const pd =	380	struct i915_page_directory * const pd =
381	i915_pd_entry(ppgtt->pd, i);	381	i915_pd_entry(ppgtt->pd, i);
382		382	/* skip now as current i915 ppgtt alloc won't allocate
		383	top level pdp for non 4-level table, won't impact
		384	shadow ppgtt. */
		385	if (!pd)
		386	break;
383	px_dma(pd) = mm->ppgtt_mm.shadow_pdps[i];	387	px_dma(pd) = mm->ppgtt_mm.shadow_pdps[i];
384	}	388	}
385	}	389	}

drivers/gpu/drm/i915/i915_gem_evict.c+12−14

 	active = NULL;
 	INIT_LIST_HEAD(&eviction_list);
 	list_for_each_entry_safe(vma, next, &vm->bound_list, vm_link) {
+		if (vma == active) { /* now seen this vma twice */
+			if (flags & PIN_NONBLOCK)
+				break;
+			active = ERR_PTR(-EAGAIN);
+		}
 		/*
 		 * We keep this list in a rough least-recently scanned order
 		 * of active elements (inactive elements are cheap to reap).
 		 * To notice when we complete one full cycle, we record the
 		 * first active element seen, before moving it to the tail.
 		 */
-		if (i915_vma_is_active(vma)) {
+		if (active != ERR_PTR(-EAGAIN) && i915_vma_is_active(vma)) {
-			if (vma == active) {
+			if (!active)
-				if (flags & PIN_NONBLOCK)
+				active = vma;
-					break;
-				active = ERR_PTR(-EAGAIN);
-			}
-			if (active != ERR_PTR(-EAGAIN)) {
-				if (!active)
-					active = vma;
-				list_move_tail(&vma->vm_link, &vm->bound_list);
+			list_move_tail(&vma->vm_link, &vm->bound_list);
-				continue;
+			continue;
-			}
 		}
 		if (mark_free(&scan, vma, flags, &eviction_list))

drivers/gpu/drm/i915/i915_gpu_error.c+7−5

@@ -1207,8 +1207,6 @@ static void engine_record_registers(struct intel_engine_coredump *ee) · 1206 unmodified lines
1207	static void record_request(const struct i915_request *request,	1207	static void record_request(const struct i915_request *request,
1208	struct i915_request_coredump *erq)	1208	struct i915_request_coredump *erq)
1209	{	1209	{
1210	const struct i915_gem_context *ctx;
1211
1212	erq->flags = request->fence.flags;	1210	erq->flags = request->fence.flags;
1213	erq->context = request->fence.context;	1211	erq->context = request->fence.context;
1214	erq->seqno = request->fence.seqno;	1212	erq->seqno = request->fence.seqno;
@@ -1219,9 +1217,13 @@ static void record_request(const struct i915_request *request, · 4 unmodified lines
1219		1217
1220	erq->pid = 0;	1218	erq->pid = 0;
1221	rcu_read_lock();	1219	rcu_read_lock();
1222	ctx = rcu_dereference(request->context->gem_context);	1220	if (!intel_context_is_closed(request->context)) {
1223	if (ctx)	1221	const struct i915_gem_context *ctx;
1224	erq->pid = pid_nr(ctx->pid);	1222
		1223	ctx = rcu_dereference(request->context->gem_context);
		1224	if (ctx)
		1225	erq->pid = pid_nr(ctx->pid);
		1226	}
1225	rcu_read_unlock();	1227	rcu_read_unlock();
1226	}	1228	}
1227		1229

drivers/gpu/drm/i915/i915_irq.c+3−13

 	u32 de_pipe_masked = gen8_de_pipe_fault_mask(dev_priv) |
 		GEN8_PIPE_CDCLK_CRC_DONE;
 	u32 de_pipe_enables;
-	u32 de_port_masked = GEN8_AUX_CHANNEL_A;
+	u32 de_port_masked = gen8_de_port_aux_mask(dev_priv);
 	u32 de_port_enables;
 	u32 de_misc_masked = GEN8_DE_EDP_PSR;
 	enum pipe pipe;
 	if (INTEL_GEN(dev_priv) <= 10)
 		de_misc_masked |= GEN8_DE_MISC_GSE;
-	if (INTEL_GEN(dev_priv) >= 9) {
+	if (IS_GEN9_LP(dev_priv))
-		de_port_masked |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |
+		de_port_masked |= BXT_DE_PORT_GMBUS;
-				  GEN9_AUX_CHANNEL_D;
-		if (IS_GEN9_LP(dev_priv))
-			de_port_masked |= BXT_DE_PORT_GMBUS;
-	}
-	if (INTEL_GEN(dev_priv) >= 11)
-		de_port_masked |= ICL_AUX_CHANNEL_E;
-	if (IS_CNL_WITH_PORT_F(dev_priv) || INTEL_GEN(dev_priv) >= 11)
-		de_port_masked |= CNL_AUX_CHANNEL_F;
 	de_pipe_enables = de_pipe_masked | GEN8_PIPE_VBLANK |
 					   GEN8_PIPE_FIFO_UNDERRUN;

drivers/gpu/drm/i915/i915_perf.c+2−4

 			 * dropped by GuC. They won't be part of the context
 			 * ID in the OA reports, so squash those lower bits.
 			 */
-			stream->specific_ctx_id =
+			stream->specific_ctx_id = ce->lrc.lrca >> 12;
-				lower_32_bits(ce->lrc_desc) >> 12;
 			/*
 			 * GuC uses the top bit to signal proxy submission, so
 			((1U << GEN11_SW_CTX_ID_WIDTH) - 1) << (GEN11_SW_CTX_ID_SHIFT - 32);
 		/*
 		 * Pick an unused context id
-		 * 0 - (NUM_CONTEXT_TAG - 1) are used by other contexts
+		 * 0 - BITS_PER_LONG are used by other contexts
 		 * GEN12_MAX_CONTEXT_HW_ID (0x7ff) is used by idle context
 		 */
 		stream->specific_ctx_id = (GEN12_MAX_CONTEXT_HW_ID - 1) << (GEN11_SW_CTX_ID_SHIFT - 32);
-		BUILD_BUG_ON((GEN12_MAX_CONTEXT_HW_ID - 1) < NUM_CONTEXT_TAG);
 		break;
 	}

drivers/gpu/drm/i915/i915_reg.h+1−0

@@ -3094,6 +3094,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) · 3093 unmodified lines
3094	#define GT_BSD_CS_ERROR_INTERRUPT (1 << 15)	3094	#define GT_BSD_CS_ERROR_INTERRUPT (1 << 15)
3095	#define GT_BSD_USER_INTERRUPT (1 << 12)	3095	#define GT_BSD_USER_INTERRUPT (1 << 12)
3096	#define GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 (1 << 11) /* hsw+; rsvd on snb, ivb, vlv */	3096	#define GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 (1 << 11) /* hsw+; rsvd on snb, ivb, vlv */
		3097	#define GT_WAIT_SEMAPHORE_INTERRUPT REG_BIT(11) /* bdw+ */
3097	#define GT_CONTEXT_SWITCH_INTERRUPT (1 << 8)	3098	#define GT_CONTEXT_SWITCH_INTERRUPT (1 << 8)
3098	#define GT_RENDER_L3_PARITY_ERROR_INTERRUPT (1 << 5) /* !snb */	3099	#define GT_RENDER_L3_PARITY_ERROR_INTERRUPT (1 << 5) /* !snb */
3099	#define GT_RENDER_PIPECTL_NOTIFY_INTERRUPT (1 << 4)	3100	#define GT_RENDER_PIPECTL_NOTIFY_INTERRUPT (1 << 4)

drivers/gpu/drm/i915/i915_request.c+9−3

 	GEM_BUG_ON(to == from);
 	GEM_BUG_ON(to->timeline == from->timeline);
-	if (i915_request_completed(from))
+	if (i915_request_completed(from)) {
+		i915_sw_fence_set_error_once(&to->submit, from->fence.error);
 		return 0;
+	}
 	if (to->engine->schedule) {
-		ret = i915_sched_node_add_dependency(&to->sched, &from->sched);
+		ret = i915_sched_node_add_dependency(&to->sched,
+						     &from->sched,
+						     I915_DEPENDENCY_EXTERNAL);
 		if (ret < 0)
 			return ret;
 	}
 	/* Couple the dependency tree for PI on this exposed to->fence */
 	if (to->engine->schedule) {
-		err = i915_sched_node_add_dependency(&to->sched, &from->sched);
+		err = i915_sched_node_add_dependency(&to->sched,
+						     &from->sched,
+						     I915_DEPENDENCY_WEAK);
 		if (err < 0)
 			return err;
 	}

drivers/gpu/drm/i915/i915_scheduler.c+3−3

 }
 int i915_sched_node_add_dependency(struct i915_sched_node *node,
-				   struct i915_sched_node *signal)
+				   struct i915_sched_node *signal,
+				   unsigned long flags)
 {
 	struct i915_dependency *dep;
 		return -ENOMEM;
 	if (!__i915_sched_node_add_dependency(node, signal, dep,
-					      I915_DEPENDENCY_EXTERNAL |
+					      flags | I915_DEPENDENCY_ALLOC))
-					      I915_DEPENDENCY_ALLOC))
 		i915_dependency_free(dep);
 	return 0;

drivers/gpu/drm/i915/i915_scheduler.h+2−1

@@ -34,7 +34,8 @@ bool __i915_sched_node_add_dependency(struct i915_sched_node *node, · 33 unmodified lines
34	unsigned long flags);	34	unsigned long flags);
35		35
36	int i915_sched_node_add_dependency(struct i915_sched_node *node,	36	int i915_sched_node_add_dependency(struct i915_sched_node *node,
37	struct i915_sched_node *signal);	37	struct i915_sched_node *signal,
		38	unsigned long flags);
38		39
39	void i915_sched_node_fini(struct i915_sched_node *node);	40	void i915_sched_node_fini(struct i915_sched_node *node);
40		41

drivers/gpu/drm/i915/i915_scheduler_types.h+1−0

@@ -78,6 +78,7 @@ struct i915_dependency { · 77 unmodified lines
78	unsigned long flags;	78	unsigned long flags;
79	#define I915_DEPENDENCY_ALLOC BIT(0)	79	#define I915_DEPENDENCY_ALLOC BIT(0)
80	#define I915_DEPENDENCY_EXTERNAL BIT(1)	80	#define I915_DEPENDENCY_EXTERNAL BIT(1)
		81	#define I915_DEPENDENCY_WEAK BIT(2)
81	};	82	};
82		83
83	#endif /* _I915_SCHEDULER_TYPES_H_ */	84	#endif /* _I915_SCHEDULER_TYPES_H_ */

drivers/gpu/drm/i915/i915_vma.c+9−16

 	lockdep_assert_held(&vma->vm->mutex);
-	/*
-	 * First wait upon any activity as retiring the request may
-	 * have side-effects such as unpinning or even unbinding this vma.
-	 *
-	 * XXX Actually waiting under the vm->mutex is a hinderance and
-	 * should be pipelined wherever possible. In cases where that is
-	 * unavoidable, we should lift the wait to before the mutex.
-	 */
-	ret = i915_vma_sync(vma);
-	if (ret)
-		return ret;
 	if (i915_vma_is_pinned(vma)) {
 		vma_print_allocator(vma, "is pinned");
 		return -EAGAIN;
 	if (!drm_mm_node_allocated(&vma->node))
 		return 0;
-	if (i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND))
-		/* XXX not always required: nop_clear_range */
-		wakeref = intel_runtime_pm_get(&vm->i915->runtime_pm);
 	/* Optimistic wait before taking the mutex */
 	err = i915_vma_sync(vma);
 	if (err)
 		goto out_rpm;
+	if (i915_vma_is_pinned(vma)) {
+		vma_print_allocator(vma, "is pinned");
+		return -EAGAIN;
+	}
+	if (i915_vma_is_bound(vma, I915_VMA_GLOBAL_BIND))
+		/* XXX not always required: nop_clear_range */
+		wakeref = intel_runtime_pm_get(&vm->i915->runtime_pm);
 	err = mutex_lock_interruptible(&vm->mutex);
 	if (err)
 		goto out_rpm;

drivers/gpu/drm/i915/intel_pm.c+1−1

@@ -4992,7 +4992,7 @@ static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state, · 4991 unmodified lines
4992	* WaIncreaseLatencyIPCEnabled: kbl,cfl	4992	* WaIncreaseLatencyIPCEnabled: kbl,cfl
4993	* Display WA #1141: kbl,cfl	4993	* Display WA #1141: kbl,cfl
4994	*/	4994	*/
4995	if ((IS_KABYLAKE(dev_priv) \|\| IS_COFFEELAKE(dev_priv)) \|\|	4995	if ((IS_KABYLAKE(dev_priv) \|\| IS_COFFEELAKE(dev_priv)) &&
4996	dev_priv->ipc_enabled)	4996	dev_priv->ipc_enabled)
4997	latency += 4;	4997	latency += 4;
4998		4998

drivers/gpu/drm/i915/selftests/i915_vma.c+1−1

@@ -173,7 +173,7 @@ static int igt_vma_create(void *arg) · 172 unmodified lines
173	}	173	}
174		174
175	nc = 0;	175	nc = 0;
176	for_each_prime_number(num_ctx, 2 * NUM_CONTEXT_TAG) {	176	for_each_prime_number(num_ctx, 2 * BITS_PER_LONG) {
177	for (; nc < num_ctx; nc++) {	177	for (; nc < num_ctx; nc++) {
178	ctx = mock_context(i915, "mock");	178	ctx = mock_context(i915, "mock");
179	if (!ctx)	179	if (!ctx)

drivers/gpu/drm/meson/meson_drv.c+1−3

@@ -412,9 +412,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev) · 411 unmodified lines
412	if (priv->afbcd.ops)	412	if (priv->afbcd.ops)
413	priv->afbcd.ops->init(priv);	413	priv->afbcd.ops->init(priv);
414		414
415	drm_mode_config_helper_resume(priv->drm);	415	return drm_mode_config_helper_resume(priv->drm);
416
417	return 0;
418	}	416	}
419		417
420	static int compare_of(struct device dev, void data)	418	static int compare_of(struct device dev, void data)

drivers/gpu/drm/tegra/drm.c+2−1

 static bool host1x_drm_wants_iommu(struct host1x_device *dev)
 {
+	struct host1x *host1x = dev_get_drvdata(dev->dev.parent);
 	struct iommu_domain *domain;
 	/*
 	 * sufficient and whether or not the host1x is attached to an IOMMU
 	 * doesn't matter.
 	 */
-	if (!domain && dma_get_mask(dev->dev.parent) <= DMA_BIT_MASK(32))
+	if (!domain && host1x_get_dma_mask(host1x) <= DMA_BIT_MASK(32))
 		return true;
 	return domain != NULL;

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h+1−1

@@ -850,7 +850,7 @@ extern void vmw_bo_bo_free(struct ttm_buffer_object *bo); · 849 unmodified lines
850	extern int vmw_bo_init(struct vmw_private *dev_priv,	850	extern int vmw_bo_init(struct vmw_private *dev_priv,
851	struct vmw_buffer_object *vmw_bo,	851	struct vmw_buffer_object *vmw_bo,
852	size_t size, struct ttm_placement *placement,	852	size_t size, struct ttm_placement *placement,
853	bool interuptable,	853	bool interruptible,
854	void (bo_free)(struct ttm_buffer_object bo));	854	void (bo_free)(struct ttm_buffer_object bo));
855	extern int vmw_user_bo_verify_access(struct ttm_buffer_object *bo,	855	extern int vmw_user_bo_verify_access(struct ttm_buffer_object *bo,
856	struct ttm_object_file *tfile);	856	struct ttm_object_file *tfile);

drivers/gpu/drm/vmwgfx/vmwgfx_fence.c+1−1

@@ -515,7 +515,7 @@ bool vmw_fence_obj_signaled(struct vmw_fence_obj *fence) · 514 unmodified lines
515	struct vmw_fence_manager *fman = fman_from_fence(fence);	515	struct vmw_fence_manager *fman = fman_from_fence(fence);
516		516
517	if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->base.flags))	517	if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->base.flags))
518	return 1;	518	return true;
519		519
520	vmw_fences_update(fman);	520	vmw_fences_update(fman);
521		521

drivers/gpu/drm/vmwgfx/vmwgfx_surface.c+1−1

@@ -1651,7 +1651,7 @@ vmw_gb_surface_reference_internal(struct drm_device *dev, · 1650 unmodified lines
1651	struct vmw_surface_metadata *metadata;	1651	struct vmw_surface_metadata *metadata;
1652	struct ttm_base_object *base;	1652	struct ttm_base_object *base;
1653	uint32_t backup_handle;	1653	uint32_t backup_handle;
1654	int ret = -EINVAL;	1654	int ret;
1655		1655
1656	ret = vmw_surface_handle_reference(dev_priv, file_priv, req->sid,	1656	ret = vmw_surface_handle_reference(dev_priv, file_priv, req->sid,
1657	req->handle_type, &base);	1657	req->handle_type, &base);

drivers/gpu/host1x/dev.c+55−4

@@ -192,17 +192,55 @@ static void host1x_setup_sid_table(struct host1x *host) · 191 unmodified lines
192	}	192	}
193	}	193	}
194		194
		195	static bool host1x_wants_iommu(struct host1x *host1x)
		196	{
		197	/*
		198	* If we support addressing a maximum of 32 bits of physical memory
		199	* and if the host1x firewall is enabled, there's no need to enable
		200	* IOMMU support. This can happen for example on Tegra20, Tegra30
		201	* and Tegra114.
		202	*
		203	* Tegra124 and later can address up to 34 bits of physical memory and
		204	* many platforms come equipped with more than 2 GiB of system memory,
		205	* which requires crossing the 4 GiB boundary. But there's a catch: on
		206	* SoCs before Tegra186 (i.e. Tegra124 and Tegra210), the host1x can
		207	* only address up to 32 bits of memory in GATHER opcodes, which means
		208	* that command buffers need to either be in the first 2 GiB of system
		209	* memory (which could quickly lead to memory exhaustion), or command
		210	* buffers need to be treated differently from other buffers (which is
		211	* not possible with the current ABI).
		212	*
		213	* A third option is to use the IOMMU in these cases to make sure all
		214	* buffers will be mapped into a 32-bit IOVA space that host1x can
		215	* address. This allows all of the system memory to be used and works
		216	* within the limitations of the host1x on these SoCs.
		217	*
		218	* In summary, default to enable IOMMU on Tegra124 and later. For any
		219	* of the earlier SoCs, only use the IOMMU for additional safety when
		220	* the host1x firewall is disabled.
		221	*/
		222	if (host1x->info->dma_mask <= DMA_BIT_MASK(32)) {
		223	if (IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL))
		224	return false;
		225	}
		226
		227	return true;
		228	}
		229
195	static struct iommu_domain host1x_iommu_attach(struct host1x host)	230	static struct iommu_domain host1x_iommu_attach(struct host1x host)
196	{	231	{
197	struct iommu_domain *domain = iommu_get_domain_for_dev(host->dev);	232	struct iommu_domain *domain = iommu_get_domain_for_dev(host->dev);
198	int err;	233	int err;
199		234
200	/*	235	/*
201	* If the host1x firewall is enabled, there's no need to enable IOMMU	236	* We may not always want to enable IOMMU support (for example if the
202	* support. Similarly, if host1x is already attached to an IOMMU (via	237	* host1x firewall is already enabled and we don't support addressing
203	* the DMA API), don't try to attach again.	238	* more than 32 bits of physical memory), so check for that first.
		239	*
		240	* Similarly, if host1x is already attached to an IOMMU (via the DMA
		241	* API), don't try to attach again.
204	*/	242	*/
205	if (IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL) \|\| domain)	243	if (!host1x_wants_iommu(host) \|\| domain)
206	return domain;	244	return domain;
207		245
208	host->group = iommu_group_get(host->dev);	246	host->group = iommu_group_get(host->dev);
@@ -502,6 +540,19 @@ static void __exit tegra_host1x_exit(void) · 293 unmodified lines
502	}	540	}
503	module_exit(tegra_host1x_exit);	541	module_exit(tegra_host1x_exit);
504		542
		543	/**
		544	* host1x_get_dma_mask() - query the supported DMA mask for host1x
		545	* @host1x: host1x instance
		546	*
		547	* Note that this returns the supported DMA mask for host1x, which can be
		548	* different from the applicable DMA mask under certain circumstances.
		549	*/
		550	u64 host1x_get_dma_mask(struct host1x *host1x)
		551	{
		552	return host1x->info->dma_mask;
		553	}
		554	EXPORT_SYMBOL(host1x_get_dma_mask);
		555
505	MODULE_AUTHOR("Thierry Reding <thierry.reding@avionic-design.de>");	556	MODULE_AUTHOR("Thierry Reding <thierry.reding@avionic-design.de>");
506	MODULE_AUTHOR("Terje Bergstrom <tbergstrom@nvidia.com>");	557	MODULE_AUTHOR("Terje Bergstrom <tbergstrom@nvidia.com>");
507	MODULE_DESCRIPTION("Host1x driver for Tegra products");	558	MODULE_DESCRIPTION("Host1x driver for Tegra products");

drivers/hwmon/da9052-hwmon.c+2−2

@@ -244,9 +244,9 @@ static ssize_t da9052_tsi_show(struct device *dev, · 243 unmodified lines
244	int channel = to_sensor_dev_attr(devattr)->index;	244	int channel = to_sensor_dev_attr(devattr)->index;
245	int ret;	245	int ret;
246		246
247	mutex_lock(&hwmon->hwmon_lock);	247	mutex_lock(&hwmon->da9052->auxadc_lock);
248	ret = __da9052_read_tsi(dev, channel);	248	ret = __da9052_read_tsi(dev, channel);
249	mutex_unlock(&hwmon->hwmon_lock);	249	mutex_unlock(&hwmon->da9052->auxadc_lock);
250		250
251	if (ret < 0)	251	if (ret < 0)
252	return ret;	252	return ret;

drivers/hwmon/drivetemp.c+1−1

@@ -346,7 +346,7 @@ static int drivetemp_identify_sata(struct drivetemp_data *st) · 345 unmodified lines
346	st->have_temp_highest = temp_is_valid(buf[SCT_STATUS_TEMP_HIGHEST]);	346	st->have_temp_highest = temp_is_valid(buf[SCT_STATUS_TEMP_HIGHEST]);
347		347
348	if (!have_sct_data_table)	348	if (!have_sct_data_table)
349	goto skip_sct;	349	goto skip_sct_data;
350		350
351	/* Request and read temperature history table */	351	/* Request and read temperature history table */
352	memset(buf, '\0', sizeof(st->smartdata));	352	memset(buf, '\0', sizeof(st->smartdata));

drivers/hwmon/nct7904.c+11−1

 #define FANCTL_MAX		4	/* Counted from 1 */
 #define TCPU_MAX		8	/* Counted from 1 */
 #define TEMP_MAX		4	/* Counted from 1 */
+#define SMI_STS_MAX		10	/* Counted from 1 */
 #define VT_ADC_CTRL0_REG	0x20	/* Bank 0 */
 #define VT_ADC_CTRL1_REG	0x21	/* Bank 0 */
 	struct nct7904_data *data = dev_get_drvdata(dev);
 	int ret, temp;
 	unsigned int reg1, reg2, reg3;
+	s8 temps;
 	switch (attr) {
 	case hwmon_temp_input:
 	if (ret < 0)
 		return ret;
-	*val = ret * 1000;
+	temps = ret;
+	*val = temps * 1000;
 	return 0;
 }
 		data->fan_mode[i] = ret;
 	}
+	/* Read all of SMI status register to clear alarms */
+	for (i = 0; i < SMI_STS_MAX; i++) {
+		ret = nct7904_read_reg(data, BANK_0, SMI_STS1_REG + i);
+		if (ret < 0)
+			return ret;
+	}
 	hwmon_dev =
 		devm_hwmon_device_register_with_info(dev, client->name, data,
 						     &nct7904_chip_info, NULL);

drivers/hwtracing/coresight/coresight-cti-platform.c+2−2

@@ -120,7 +120,7 @@ static int cti_plat_create_v8_etm_connection(struct device *dev, · 119 unmodified lines
120		120
121	/* Can optionally have an etm node - return if not */	121	/* Can optionally have an etm node - return if not */
122	cs_fwnode = fwnode_find_reference(root_fwnode, CTI_DT_CSDEV_ASSOC, 0);	122	cs_fwnode = fwnode_find_reference(root_fwnode, CTI_DT_CSDEV_ASSOC, 0);
123	if (IS_ERR_OR_NULL(cs_fwnode))	123	if (IS_ERR(cs_fwnode))
124	return 0;	124	return 0;
125		125
126	/* allocate memory */	126	/* allocate memory */
@@ -393,7 +393,7 @@ static int cti_plat_create_connection(struct device *dev, · 266 unmodified lines
393	/* associated device ? */	393	/* associated device ? */
394	cs_fwnode = fwnode_find_reference(fwnode,	394	cs_fwnode = fwnode_find_reference(fwnode,
395	CTI_DT_CSDEV_ASSOC, 0);	395	CTI_DT_CSDEV_ASSOC, 0);
396	if (!IS_ERR_OR_NULL(cs_fwnode)) {	396	if (!IS_ERR(cs_fwnode)) {
397	assoc_name = cti_plat_get_csdev_or_node_name(cs_fwnode,	397	assoc_name = cti_plat_get_csdev_or_node_name(cs_fwnode,
398	&csdev);	398	&csdev);
399	fwnode_handle_put(cs_fwnode);	399	fwnode_handle_put(cs_fwnode);

drivers/i2c/algos/i2c-algo-pca.c+1−1

@@ -542,7 +542,7 @@ int i2c_pca_add_numbered_bus(struct i2c_adapter *adap) · 541 unmodified lines
542	EXPORT_SYMBOL(i2c_pca_add_numbered_bus);	542	EXPORT_SYMBOL(i2c_pca_add_numbered_bus);
543		543
544	MODULE_AUTHOR("Ian Campbell <icampbell@arcom.com>, "	544	MODULE_AUTHOR("Ian Campbell <icampbell@arcom.com>, "
545	"Wolfram Sang <w.sang@pengutronix.de>");	545	"Wolfram Sang <kernel@pengutronix.de>");
546	MODULE_DESCRIPTION("I2C-Bus PCA9564/PCA9665 algorithm");	546	MODULE_DESCRIPTION("I2C-Bus PCA9564/PCA9665 algorithm");
547	MODULE_LICENSE("GPL");	547	MODULE_LICENSE("GPL");
548		548

drivers/i2c/busses/i2c-altera.c+9−1

  * @isr_mask: cached copy of local ISR enables.
  * @isr_status: cached copy of local ISR status.
  * @lock: spinlock for IRQ synchronization.
+ * @isr_mutex: mutex for IRQ thread.
  */
 struct altr_i2c_dev {
 	void __iomem *base;
 	u32 isr_mask;
 	u32 isr_status;
 	spinlock_t lock;	/* IRQ synchronization */
+	struct mutex isr_mutex;
 };
 static void
 	struct altr_i2c_dev *idev = _dev;
 	u32 status = idev->isr_status;
+	mutex_lock(&idev->isr_mutex);
 	if (!idev->msg) {
 		dev_warn(idev->dev, "unexpected interrupt\n");
 		altr_i2c_int_clear(idev, ALTR_I2C_ALL_IRQ);
-		return IRQ_HANDLED;
+		goto out;
 	}
 	read = (idev->msg->flags & I2C_M_RD) != 0;
 		complete(&idev->msg_complete);
 		dev_dbg(idev->dev, "Message Complete\n");
 	}
+out:
+	mutex_unlock(&idev->isr_mutex);
 	return IRQ_HANDLED;
 }
 	u32 value;
 	u8 addr = i2c_8bit_addr_from_msg(msg);
+	mutex_lock(&idev->isr_mutex);
 	idev->msg = msg;
 	idev->msg_len = msg->len;
 	idev->buf = msg->buf;
 		altr_i2c_int_enable(idev, imask, true);
 		altr_i2c_fill_tx_fifo(idev);
 	}
+	mutex_unlock(&idev->isr_mutex);
 	time_left = wait_for_completion_timeout(&idev->msg_complete,
 						ALTR_I2C_XFER_TIMEOUT);
 	idev->dev = &pdev->dev;
 	init_completion(&idev->msg_complete);
 	spin_lock_init(&idev->lock);
+	mutex_init(&idev->isr_mutex);
 	ret = device_property_read_u32(idev->dev, "fifo-size",
 				       &idev->fifo_size);

drivers/i2c/busses/i2c-at91-master.c+17−3

 							 PINCTRL_STATE_DEFAULT);
 	dev->pinctrl_pins_gpio = pinctrl_lookup_state(dev->pinctrl,
 						      "gpio");
+	if (IS_ERR(dev->pinctrl_pins_default) ||
+	    IS_ERR(dev->pinctrl_pins_gpio)) {
+		dev_info(&pdev->dev, "pinctrl states incomplete for recovery\n");
+		return -EINVAL;
+	}
+	/*
+	 * pins will be taken as GPIO, so we might as well inform pinctrl about
+	 * this and move the state to GPIO
+	 */
+	pinctrl_select_state(dev->pinctrl, dev->pinctrl_pins_gpio);
 	rinfo->sda_gpiod = devm_gpiod_get(&pdev->dev, "sda", GPIOD_IN);
 	if (PTR_ERR(rinfo->sda_gpiod) == -EPROBE_DEFER)
 		return -EPROBE_DEFER;
 		return -EPROBE_DEFER;
 	if (IS_ERR(rinfo->sda_gpiod) ||
-	    IS_ERR(rinfo->scl_gpiod) ||
+	    IS_ERR(rinfo->scl_gpiod)) {
-	    IS_ERR(dev->pinctrl_pins_default) ||
-	    IS_ERR(dev->pinctrl_pins_gpio)) {
 		dev_info(&pdev->dev, "recovery information incomplete\n");
 		if (!IS_ERR(rinfo->sda_gpiod)) {
 			gpiod_put(rinfo->sda_gpiod);
 			gpiod_put(rinfo->scl_gpiod);
 			rinfo->scl_gpiod = NULL;
 		}
+		pinctrl_select_state(dev->pinctrl, dev->pinctrl_pins_default);
 		return -EINVAL;
 	}
+	/* change the state of the pins back to their default state */
+	pinctrl_select_state(dev->pinctrl, dev->pinctrl_pins_default);
 	dev_info(&pdev->dev, "using scl, sda for recovery\n");
 	rinfo->prepare_recovery = at91_prepare_twi_recovery;

drivers/i2c/i2c-core-base.c+17−7

  *   Mux support by Rodolfo Giometti <giometti@enneenne.com> and
  *   Michael Lawnick <michael.lawnick.ext@nsn.com>
  *
- * Copyright (C) 2013-2017 Wolfram Sang <wsa@the-dreams.de>
+ * Copyright (C) 2013-2017 Wolfram Sang <wsa@kernel.org>
  */
 #define pr_fmt(fmt) "i2c-core: " fmt
 		} else if (ACPI_COMPANION(dev)) {
 			irq = i2c_acpi_get_irq(client);
 		}
-		if (irq == -EPROBE_DEFER)
+		if (irq == -EPROBE_DEFER) {
-			return irq;
+			status = irq;
+			goto put_sync_adapter;
+		}
 		if (irq < 0)
 			irq = 0;
 	 */
 	if (!driver->id_table &&
 	    !i2c_acpi_match_device(dev->driver->acpi_match_table, client) &&
-	    !i2c_of_match_device(dev->driver->of_match_table, client))
+	    !i2c_of_match_device(dev->driver->of_match_table, client)) {
-		return -ENODEV;
+		status = -ENODEV;
+		goto put_sync_adapter;
+	}
 	if (client->flags & I2C_CLIENT_WAKE) {
 		int wakeirq;
 		wakeirq = of_irq_get_byname(dev->of_node, "wakeup");
-		if (wakeirq == -EPROBE_DEFER)
+		if (wakeirq == -EPROBE_DEFER) {
-			return wakeirq;
+			status = wakeirq;
+			goto put_sync_adapter;
+		}
 		device_init_wakeup(&client->dev, true);
 err_clear_wakeup_irq:
 	dev_pm_clear_wake_irq(&client->dev);
 	device_init_wakeup(&client->dev, false);
+put_sync_adapter:
+	if (client->flags & I2C_CLIENT_HOST_NOTIFY)
+		pm_runtime_put_sync(&client->adapter->dev);
 	return status;
 }

drivers/i2c/i2c-core-of.c+1−1

@@ -5,7 +5,7 @@ · 4 unmodified lines
5	* Copyright (C) 2008 Jochen Friedrich <jochen@scram.de>	5	* Copyright (C) 2008 Jochen Friedrich <jochen@scram.de>
6	* based on a previous patch from Jon Smirl <jonsmirl@gmail.com>	6	* based on a previous patch from Jon Smirl <jonsmirl@gmail.com>
7	*	7	*
8	* Copyright (C) 2013, 2018 Wolfram Sang <wsa@the-dreams.de>	8	* Copyright (C) 2013, 2018 Wolfram Sang <wsa@kernel.org>
9	*/	9	*/
10		10
11	#include <dt-bindings/i2c/i2c.h>	11	#include <dt-bindings/i2c/i2c.h>

drivers/i2c/muxes/i2c-demux-pinctrl.c+1−0

@@ -272,6 +272,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) · 271 unmodified lines
272	err_rollback_available:	272	err_rollback_available:
273	device_remove_file(&pdev->dev, &dev_attr_available_masters);	273	device_remove_file(&pdev->dev, &dev_attr_available_masters);
274	err_rollback:	274	err_rollback:
		275	i2c_demux_deactivate_master(priv);
275	for (j = 0; j < i; j++) {	276	for (j = 0; j < i; j++) {
276	of_node_put(priv->chan[j].parent_np);	277	of_node_put(priv->chan[j].parent_np);
277	of_changeset_destroy(&priv->chan[j].chgset);	278	of_changeset_destroy(&priv->chan[j].chgset);

drivers/iio/accel/sca3000.c+1−1

@@ -980,7 +980,7 @@ static int sca3000_read_data(struct sca3000_state *st, · 979 unmodified lines
980	st->tx[0] = SCA3000_READ_REG(reg_address_high);	980	st->tx[0] = SCA3000_READ_REG(reg_address_high);
981	ret = spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));	981	ret = spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
982	if (ret) {	982	if (ret) {
983	dev_err(get_device(&st->us->dev), "problem reading register");	983	dev_err(&st->us->dev, "problem reading register\n");
984	return ret;	984	return ret;
985	}	985	}
986		986

drivers/iio/adc/stm32-adc.c+4−4

@@ -1812,18 +1812,18 @@ static int stm32_adc_chan_of_init(struct iio_dev *indio_dev) · 1811 unmodified lines
1812	return 0;	1812	return 0;
1813	}	1813	}
1814		1814
1815	static int stm32_adc_dma_request(struct iio_dev *indio_dev)	1815	static int stm32_adc_dma_request(struct device dev, struct iio_dev indio_dev)
1816	{	1816	{
1817	struct stm32_adc *adc = iio_priv(indio_dev);	1817	struct stm32_adc *adc = iio_priv(indio_dev);
1818	struct dma_slave_config config;	1818	struct dma_slave_config config;
1819	int ret;	1819	int ret;
1820		1820
1821	adc->dma_chan = dma_request_chan(&indio_dev->dev, "rx");	1821	adc->dma_chan = dma_request_chan(dev, "rx");
1822	if (IS_ERR(adc->dma_chan)) {	1822	if (IS_ERR(adc->dma_chan)) {
1823	ret = PTR_ERR(adc->dma_chan);	1823	ret = PTR_ERR(adc->dma_chan);
1824	if (ret != -ENODEV) {	1824	if (ret != -ENODEV) {
1825	if (ret != -EPROBE_DEFER)	1825	if (ret != -EPROBE_DEFER)
1826	dev_err(&indio_dev->dev,	1826	dev_err(dev,
1827	"DMA channel request failed with %d\n",	1827	"DMA channel request failed with %d\n",
1828	ret);	1828	ret);
1829	return ret;	1829	return ret;
@@ -1930,7 +1930,7 @@ static int stm32_adc_probe(struct platform_device *pdev) · 100 unmodified lines
1930	if (ret < 0)	1930	if (ret < 0)
1931	return ret;	1931	return ret;
1932		1932
1933	ret = stm32_adc_dma_request(indio_dev);	1933	ret = stm32_adc_dma_request(dev, indio_dev);
1934	if (ret < 0)	1934	if (ret < 0)
1935	return ret;	1935	return ret;
1936		1936

drivers/iio/adc/stm32-dfsdm-adc.c+11−10

 struct stm32_dfsdm_dev_data {
 	int type;
-	int (*init)(struct iio_dev *indio_dev);
+	int (*init)(struct device *dev, struct iio_dev *indio_dev);
 	unsigned int num_channels;
 	const struct regmap_config *regmap_cfg;
 };
 	}
 }
-static int stm32_dfsdm_dma_request(struct iio_dev *indio_dev)
+static int stm32_dfsdm_dma_request(struct device *dev,
+				   struct iio_dev *indio_dev)
 {
 	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
-	adc->dma_chan = dma_request_chan(&indio_dev->dev, "rx");
+	adc->dma_chan = dma_request_chan(dev, "rx");
 	if (IS_ERR(adc->dma_chan)) {
 		int ret = PTR_ERR(adc->dma_chan);
 					  &adc->dfsdm->ch_list[ch->channel]);
 }
-static int stm32_dfsdm_audio_init(struct iio_dev *indio_dev)
+static int stm32_dfsdm_audio_init(struct device *dev, struct iio_dev *indio_dev)
 {
 	struct iio_chan_spec *ch;
 	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
 	indio_dev->num_channels = 1;
 	indio_dev->channels = ch;
-	return stm32_dfsdm_dma_request(indio_dev);
+	return stm32_dfsdm_dma_request(dev, indio_dev);
 }
-static int stm32_dfsdm_adc_init(struct iio_dev *indio_dev)
+static int stm32_dfsdm_adc_init(struct device *dev, struct iio_dev *indio_dev)
 {
 	struct iio_chan_spec *ch;
 	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
 	init_completion(&adc->completion);
 	/* Optionally request DMA */
-	ret = stm32_dfsdm_dma_request(indio_dev);
+	ret = stm32_dfsdm_dma_request(dev, indio_dev);
 	if (ret) {
 		if (ret != -ENODEV) {
 			if (ret != -EPROBE_DEFER)
-				dev_err(&indio_dev->dev,
+				dev_err(dev,
 					"DMA channel request failed with %d\n",
 					ret);
 			return ret;
 		}
-		dev_dbg(&indio_dev->dev, "No DMA support\n");
+		dev_dbg(dev, "No DMA support\n");
 		return 0;
 	}
 		adc->dfsdm->fl_list[adc->fl_id].sync_mode = val;
 	adc->dev_data = dev_data;
-	ret = dev_data->init(iio);
+	ret = dev_data->init(dev, iio);
 	if (ret < 0)
 		return ret;

drivers/iio/adc/ti-ads8344.c+5−3

 	u8 rx_buf[3];
 };
-#define ADS8344_VOLTAGE_CHANNEL(chan, si)				\
+#define ADS8344_VOLTAGE_CHANNEL(chan, addr)				\
 	{								\
 		.type = IIO_VOLTAGE,					\
 		.indexed = 1,						\
 		.channel = chan,					\
 		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),		\
 		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\
+		.address = addr,					\
 	}
-#define ADS8344_VOLTAGE_CHANNEL_DIFF(chan1, chan2, si)			\
+#define ADS8344_VOLTAGE_CHANNEL_DIFF(chan1, chan2, addr)		\
 	{								\
 		.type = IIO_VOLTAGE,					\
 		.indexed = 1,						\
 		.differential = 1,					\
 		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),		\
 		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),	\
+		.address = addr,					\
 	}
 static const struct iio_chan_spec ads8344_channels[] = {
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
 		mutex_lock(&adc->lock);
-		*value = ads8344_adc_conversion(adc, channel->scan_index,
+		*value = ads8344_adc_conversion(adc, channel->address,
 						channel->differential);
 		mutex_unlock(&adc->lock);
 		if (*value < 0)

drivers/iio/chemical/atlas-sensor.c+13−1

@@ -198,7 +198,19 @@ static const struct iio_chan_spec atlas_orp_channels[] = { · 197 unmodified lines
198	};	198	};
199		199
200	static const struct iio_chan_spec atlas_do_channels[] = {	200	static const struct iio_chan_spec atlas_do_channels[] = {
201	ATLAS_CONCENTRATION_CHANNEL(0, ATLAS_REG_DO_DATA),	201	{
		202	.type = IIO_CONCENTRATION,
		203	.address = ATLAS_REG_DO_DATA,
		204	.info_mask_separate =
		205	BIT(IIO_CHAN_INFO_RAW) \| BIT(IIO_CHAN_INFO_SCALE),
		206	.scan_index = 0,
		207	.scan_type = {
		208	.sign = 'u',
		209	.realbits = 32,
		210	.storagebits = 32,
		211	.endianness = IIO_BE,
		212	},
		213	},
202	IIO_CHAN_SOFT_TIMESTAMP(1),	214	IIO_CHAN_SOFT_TIMESTAMP(1),
203	{	215	{
204	.type = IIO_TEMP,	216	.type = IIO_TEMP,

drivers/iio/dac/vf610_dac.c+1−0

@@ -226,6 +226,7 @@ static int vf610_dac_probe(struct platform_device *pdev) · 225 unmodified lines
226	return 0;	226	return 0;
227		227
228	error_iio_device_register:	228	error_iio_device_register:
		229	vf610_dac_exit(info);
229	clk_disable_unprepare(info->clk);	230	clk_disable_unprepare(info->clk);
230		231
231	return ret;	232	return ret;

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c+5−2

 			ref_sensor = iio_priv(hw->iio_devs[ST_LSM6DSX_ID_ACC]);
 			odr = st_lsm6dsx_check_odr(ref_sensor, val, &odr_val);
-			if (odr < 0)
+			if (odr < 0) {
-				return odr;
+				err = odr;
+				goto release;
+			}
 			sensor->ext_info.slv_odr = val;
 			sensor->odr = odr;
 		break;
 	}
+release:
 	iio_device_release_direct_mode(iio_dev);
 	return err;

drivers/infiniband/core/cache.c+5−2

 	if (err)
 		return err;
-	rdma_for_each_port (device, p)
+	rdma_for_each_port (device, p) {
-		ib_cache_update(device, p, true);
+		err = ib_cache_update(device, p, true);
+		if (err)
+			return err;
+	}
 	return 0;
 }

drivers/infiniband/core/nldev.c+1−2

 	has_cap_net_admin = netlink_capable(skb, CAP_NET_ADMIN);
 	ret = fill_func(msg, has_cap_net_admin, res, port);
-	rdma_restrack_put(res);
 	if (ret)
 		goto err_free;
+	rdma_restrack_put(res);
 	nlmsg_end(msg, nlh);
 	ib_device_put(device);
 	return rdma_nl_unicast(sock_net(skb->sk), msg, NETLINK_CB(skb).portid);

drivers/infiniband/core/rdma_core.c+2−1

@@ -459,7 +459,8 @@ alloc_begin_fd_uobject(const struct uverbs_api_object *obj, · 458 unmodified lines
459	struct ib_uobject *uobj;	459	struct ib_uobject *uobj;
460	struct file *filp;	460	struct file *filp;
461		461
462	if (WARN_ON(fd_type->fops->release != &uverbs_uobject_fd_release))	462	if (WARN_ON(fd_type->fops->release != &uverbs_uobject_fd_release &&
		463	fd_type->fops->release != &uverbs_async_event_release))
463	return ERR_PTR(-EINVAL);	464	return ERR_PTR(-EINVAL);
464		465
465	new_fd = get_unused_fd_flags(O_CLOEXEC);	466	new_fd = get_unused_fd_flags(O_CLOEXEC);

drivers/infiniband/core/uverbs.h+4−0

 void ib_uverbs_init_async_event_file(struct ib_uverbs_async_event_file *ev_file);
 void ib_uverbs_free_event_queue(struct ib_uverbs_event_queue *event_queue);
 void ib_uverbs_flow_resources_free(struct ib_uflow_resources *uflow_res);
+int uverbs_async_event_release(struct inode *inode, struct file *filp);
 int ib_alloc_ucontext(struct uverbs_attr_bundle *attrs);
 int ib_init_ucontext(struct uverbs_attr_bundle *attrs);
 			   struct ib_ucq_object *uobj);
 void ib_uverbs_release_uevent(struct ib_uevent_object *uobj);
 void ib_uverbs_release_file(struct kref *ref);
+void ib_uverbs_async_handler(struct ib_uverbs_async_event_file *async_file,
+			     __u64 element, __u64 event,
+			     struct list_head *obj_list, u32 *counter);
 void ib_uverbs_comp_handler(struct ib_cq *cq, void *cq_context);
 void ib_uverbs_cq_event_handler(struct ib_event *event, void *context_ptr);

drivers/infiniband/core/uverbs_main.c+4−8

 	.owner	 = THIS_MODULE,
 	.read	 = ib_uverbs_async_event_read,
 	.poll    = ib_uverbs_async_event_poll,
-	.release = uverbs_uobject_fd_release,
+	.release = uverbs_async_event_release,
 	.fasync  = ib_uverbs_async_event_fasync,
 	.llseek	 = no_llseek,
 };
 	kill_fasync(&ev_queue->async_queue, SIGIO, POLL_IN);
 }
-static void
+void ib_uverbs_async_handler(struct ib_uverbs_async_event_file *async_file,
-ib_uverbs_async_handler(struct ib_uverbs_async_event_file *async_file,
+			     __u64 element, __u64 event,
-			__u64 element, __u64 event, struct list_head *obj_list,
+			     struct list_head *obj_list, u32 *counter)
-			u32 *counter)
 {
 	struct ib_uverbs_event *entry;
 	unsigned long flags;
 		 */
 		mutex_unlock(&uverbs_dev->lists_mutex);
-		ib_uverbs_async_handler(READ_ONCE(file->async_file), 0,
-					IB_EVENT_DEVICE_FATAL, NULL, NULL);
 		uverbs_destroy_ufile_hw(file, RDMA_REMOVE_DRIVER_REMOVE);
 		kref_put(&file->ref, ib_uverbs_release_file);

drivers/infiniband/core/uverbs_std_types_async_fd.c+29−1

@@ -26,10 +26,38 @@ static int uverbs_async_event_destroy_uobj(struct ib_uobject *uobj, · 25 unmodified lines
26	container_of(uobj, struct ib_uverbs_async_event_file, uobj);	26	container_of(uobj, struct ib_uverbs_async_event_file, uobj);
27		27
28	ib_unregister_event_handler(&event_file->event_handler);	28	ib_unregister_event_handler(&event_file->event_handler);
29	ib_uverbs_free_event_queue(&event_file->ev_queue);	29
		30	if (why == RDMA_REMOVE_DRIVER_REMOVE)
		31	ib_uverbs_async_handler(event_file, 0, IB_EVENT_DEVICE_FATAL,
		32	NULL, NULL);
30	return 0;	33	return 0;
31	}	34	}
32		35
		36	int uverbs_async_event_release(struct inode inode, struct file filp)
		37	{
		38	struct ib_uverbs_async_event_file *event_file;
		39	struct ib_uobject *uobj = filp->private_data;
		40	int ret;
		41
		42	if (!uobj)
		43	return uverbs_uobject_fd_release(inode, filp);
		44
		45	event_file =
		46	container_of(uobj, struct ib_uverbs_async_event_file, uobj);
		47
		48	/*
		49	* The async event FD has to deliver IB_EVENT_DEVICE_FATAL even after
		50	* disassociation, so cleaning the event list must only happen after
		51	* release. The user knows it has reached the end of the event stream
		52	* when it sees IB_EVENT_DEVICE_FATAL.
		53	*/
		54	uverbs_uobject_get(uobj);
		55	ret = uverbs_uobject_fd_release(inode, filp);
		56	ib_uverbs_free_event_queue(&event_file->ev_queue);
		57	uverbs_uobject_put(uobj);
		58	return ret;
		59	}
		60
33	DECLARE_UVERBS_NAMED_METHOD(	61	DECLARE_UVERBS_NAMED_METHOD(
34	UVERBS_METHOD_ASYNC_EVENT_ALLOC,	62	UVERBS_METHOD_ASYNC_EVENT_ALLOC,
35	UVERBS_ATTR_FD(UVERBS_ATTR_ASYNC_EVENT_ALLOC_FD_HANDLE,	63	UVERBS_ATTR_FD(UVERBS_ATTR_ASYNC_EVENT_ALLOC_FD_HANDLE,

drivers/infiniband/hw/cxgb4/cm.c+3−4

 			srqidx = ABORT_RSS_SRQIDX_G(
 					be32_to_cpu(req->srqidx_status));
 			if (srqidx) {
-				complete_cached_srq_buffers(ep,
+				complete_cached_srq_buffers(ep, srqidx);
-							    req->srqidx_status);
 			} else {
 				/* Hold ep ref until finish_peer_abort() */
 				c4iw_get_ep(&ep->com);
 		return 0;
 	}
-	ep->srqe_idx = t4_tcb_get_field32(tcb, TCB_RQ_START_W, TCB_RQ_START_W,
+	ep->srqe_idx = t4_tcb_get_field32(tcb, TCB_RQ_START_W, TCB_RQ_START_M,
-			TCB_RQ_START_S);
+					  TCB_RQ_START_S);
 cleanup:
 	pr_debug("ep %p tid %u %016x\n", ep, ep->hwtid, ep->srqe_idx);

drivers/infiniband/hw/hfi1/user_sdma.c+0−4

 	set_comp_state(pq, cq, info.comp_idx, QUEUED, 0);
 	pq->state = SDMA_PKT_Q_ACTIVE;
-	/* Send the first N packets in the request to buy us some time */
-	ret = user_sdma_send_pkts(req, pcount);
-	if (unlikely(ret < 0 && ret != -EBUSY))
-		goto free_req;
 	/*
 	 * This is a somewhat blocking send implementation.

drivers/infiniband/hw/i40iw/i40iw_cm.c+0−8

 	struct rtable *rt;
 	struct neighbour *neigh;
 	int rc = arpindex;
-	struct net_device *netdev = iwdev->netdev;
 	__be32 dst_ipaddr = htonl(dst_ip);
 	__be32 src_ipaddr = htonl(src_ip);
 		return rc;
 	}
-	if (netif_is_bond_slave(netdev))
-		netdev = netdev_master_upper_dev_get(netdev);
 	neigh = dst_neigh_lookup(&rt->dst, &dst_ipaddr);
 	rcu_read_lock();
 {
 	struct neighbour *neigh;
 	int rc = arpindex;
-	struct net_device *netdev = iwdev->netdev;
 	struct dst_entry *dst;
 	struct sockaddr_in6 dst_addr;
 	struct sockaddr_in6 src_addr;
 		return rc;
 	}
-	if (netif_is_bond_slave(netdev))
-		netdev = netdev_master_upper_dev_get(netdev);
 	neigh = dst_neigh_lookup(dst, dst_addr.sin6_addr.in6_u.u6_addr32);
 	rcu_read_lock();

drivers/infiniband/hw/i40iw/i40iw_hw.c+1−1

@@ -534,7 +534,7 @@ void i40iw_manage_arp_cache(struct i40iw_device *iwdev, · 533 unmodified lines
534	int arp_index;	534	int arp_index;
535		535
536	arp_index = i40iw_arp_table(iwdev, ip_addr, ipv4, mac_addr, action);	536	arp_index = i40iw_arp_table(iwdev, ip_addr, ipv4, mac_addr, action);
537	if (arp_index == -1)	537	if (arp_index < 0)
538	return;	538	return;
539	cqp_request = i40iw_get_cqp_request(&iwdev->cqp, false);	539	cqp_request = i40iw_get_cqp_request(&iwdev->cqp, false);
540	if (!cqp_request)	540	if (!cqp_request)

drivers/infiniband/hw/mlx4/qp.c+11−3

 	int send_size;
 	int header_size;
 	int spc;
+	int err;
 	int i;
 	if (wr->wr.opcode != IB_WR_SEND)
 	sqp->ud_header.lrh.virtual_lane    = 0;
 	sqp->ud_header.bth.solicited_event = !!(wr->wr.send_flags & IB_SEND_SOLICITED);
-	ib_get_cached_pkey(ib_dev, sqp->qp.port, 0, &pkey);
+	err = ib_get_cached_pkey(ib_dev, sqp->qp.port, 0, &pkey);
+	if (err)
+		return err;
 	sqp->ud_header.bth.pkey = cpu_to_be16(pkey);
 	if (sqp->qp.mlx4_ib_qp_type == MLX4_IB_QPT_TUN_SMI_OWNER)
 		sqp->ud_header.bth.destination_qpn = cpu_to_be32(wr->remote_qpn);
 	}
 	sqp->ud_header.bth.solicited_event = !!(wr->wr.send_flags & IB_SEND_SOLICITED);
 	if (!sqp->qp.ibqp.qp_num)
-		ib_get_cached_pkey(ib_dev, sqp->qp.port, sqp->pkey_index, &pkey);
+		err = ib_get_cached_pkey(ib_dev, sqp->qp.port, sqp->pkey_index,
+					 &pkey);
 	else
-		ib_get_cached_pkey(ib_dev, sqp->qp.port, wr->pkey_index, &pkey);
+		err = ib_get_cached_pkey(ib_dev, sqp->qp.port, wr->pkey_index,
+					 &pkey);
+	if (err)
+		return err;
 	sqp->ud_header.bth.pkey = cpu_to_be16(pkey);
 	sqp->ud_header.bth.destination_qpn = cpu_to_be32(wr->remote_qpn);
 	sqp->ud_header.bth.psn = cpu_to_be32((sqp->send_psn++) & ((1 << 24) - 1));

drivers/infiniband/sw/rxe/rxe_mmap.c+1−1

@@ -151,7 +151,7 @@ struct rxe_mmap_info rxe_create_mmap_info(struct rxe_dev rxe, u32 size, · 150 unmodified lines
151		151
152	ip = kmalloc(sizeof(*ip), GFP_KERNEL);	152	ip = kmalloc(sizeof(*ip), GFP_KERNEL);
153	if (!ip)	153	if (!ip)
154	return NULL;	154	return ERR_PTR(-ENOMEM);
155		155
156	size = PAGE_ALIGN(size);	156	size = PAGE_ALIGN(size);
157		157

drivers/infiniband/sw/rxe/rxe_queue.c+7−4

 	if (outbuf) {
 		ip = rxe_create_mmap_info(rxe, buf_size, udata, buf);
-		if (!ip)
+		if (IS_ERR(ip)) {
+			err = PTR_ERR(ip);
 			goto err1;
+		}
-		err = copy_to_user(outbuf, &ip->info, sizeof(ip->info));
+		if (copy_to_user(outbuf, &ip->info, sizeof(ip->info))) {
-		if (err)
+			err = -EFAULT;
 			goto err2;
+		}
 		spin_lock_bh(&rxe->pending_lock);
 		list_add(&ip->pending_mmaps, &rxe->pending_mmaps);
 err2:
 	kfree(ip);
 err1:
-	return -EINVAL;
+	return err;
 }
 inline void rxe_queue_reset(struct rxe_queue *q)

drivers/iommu/amd_iommu.c+2−1

@@ -127,7 +127,8 @@ static inline int get_acpihid_device_id(struct device *dev, · 126 unmodified lines
127	return -ENODEV;	127	return -ENODEV;
128		128
129	list_for_each_entry(p, &acpihid_map, list) {	129	list_for_each_entry(p, &acpihid_map, list) {
130	if (acpi_dev_hid_uid_match(adev, p->hid, p->uid)) {	130	if (acpi_dev_hid_uid_match(adev, p->hid,
		131	p->uid[0] ? p->uid : NULL)) {
131	if (entry)	132	if (entry)
132	*entry = p;	133	*entry = p;
133	return p->devid;	134	return p->devid;

drivers/iommu/amd_iommu_init.c+5−4

 		}
 		case IVHD_DEV_ACPI_HID: {
 			u16 devid;
-			u8 hid[ACPIHID_HID_LEN] = {0};
+			u8 hid[ACPIHID_HID_LEN];
-			u8 uid[ACPIHID_UID_LEN] = {0};
+			u8 uid[ACPIHID_UID_LEN];
 			int ret;
 			if (h->type != 0x40) {
 				break;
 			}
+			uid[0] = '\0';
 			switch (e->uidf) {
 			case UID_NOT_PRESENT:
 				break;
 			case UID_IS_CHARACTER:
-				memcpy(uid, (u8 *)(&e->uid), ACPIHID_UID_LEN - 1);
+				memcpy(uid, &e->uid, e->uidl);
-				uid[ACPIHID_UID_LEN - 1] = '\0';
+				uid[e->uidl] = '\0';
 				break;
 			default:

drivers/iommu/iommu.c+11−6

 	return ret;
 }
+static bool iommu_is_attach_deferred(struct iommu_domain *domain,
+				     struct device *dev)
+{
+	if (domain->ops->is_attach_deferred)
+		return domain->ops->is_attach_deferred(domain, dev);
+	return false;
+}
 /**
  * iommu_group_add_device - add a device to an iommu group
  * @group: the group into which to add the device (reference should be held)
 	mutex_lock(&group->mutex);
 	list_add_tail(&device->list, &group->devices);
-	if (group->domain)
+	if (group->domain  && !iommu_is_attach_deferred(group->domain, dev))
 		ret = __iommu_attach_device(group->domain, dev);
 	mutex_unlock(&group->mutex);
 	if (ret)
 				 struct device *dev)
 {
 	int ret;
-	if ((domain->ops->is_attach_deferred != NULL) &&
-	    domain->ops->is_attach_deferred(domain, dev))
-		return 0;
 	if (unlikely(domain->ops->attach_dev == NULL))
 		return -ENODEV;
 static void __iommu_detach_device(struct iommu_domain *domain,
 				  struct device *dev)
 {
-	if ((domain->ops->is_attach_deferred != NULL) &&
+	if (iommu_is_attach_deferred(domain, dev))
-	    domain->ops->is_attach_deferred(domain, dev))
 		return;
 	if (unlikely(domain->ops->detach_dev == NULL))

drivers/ipack/carriers/tpci200.c+1−0

@@ -306,6 +306,7 @@ static int tpci200_register(struct tpci200_board *tpci200) · 305 unmodified lines
306	"(bn 0x%X, sn 0x%X) failed to map driver user space!",	306	"(bn 0x%X, sn 0x%X) failed to map driver user space!",
307	tpci200->info->pdev->bus->number,	307	tpci200->info->pdev->bus->number,
308	tpci200->info->pdev->devfn);	308	tpci200->info->pdev->devfn);
		309	res = -ENOMEM;
309	goto out_release_mem8_space;	310	goto out_release_mem8_space;
310	}	311	}
311		312

drivers/misc/cardreader/rtsx_pcr.c+3−0

@@ -142,6 +142,9 @@ static void rtsx_comm_pm_full_on(struct rtsx_pcr *pcr) · 141 unmodified lines
142		142
143	rtsx_disable_aspm(pcr);	143	rtsx_disable_aspm(pcr);
144		144
		145	/* Fixes DMA transfer timout issue after disabling ASPM on RTS5260 */
		146	msleep(1);
		147
145	if (option->ltr_enabled)	148	if (option->ltr_enabled)
146	rtsx_set_ltr_latency(pcr, option->ltr_active_latency);	149	rtsx_set_ltr_latency(pcr, option->ltr_active_latency);
147		150

drivers/misc/mei/client.c+2−0

 	down_write(&dev->me_clients_rwsem);
 	me_cl = __mei_me_cl_by_uuid(dev, uuid);
 	__mei_me_cl_del(dev, me_cl);
+	mei_me_cl_put(me_cl);
 	up_write(&dev->me_clients_rwsem);
 }
 	down_write(&dev->me_clients_rwsem);
 	me_cl = __mei_me_cl_by_uuid_id(dev, uuid, id);
 	__mei_me_cl_del(dev, me_cl);
+	mei_me_cl_put(me_cl);
 	up_write(&dev->me_clients_rwsem);
 }

drivers/mmc/core/block.c+2−1

 	struct mmc_request *mrq = &mqrq->brq.mrq;
 	struct request_queue *q = req->q;
 	struct mmc_host *host = mq->card->host;
+	enum mmc_issue_type issue_type = mmc_issue_type(mq, req);
 	unsigned long flags;
 	bool put_card;
 	int err;
 	spin_lock_irqsave(&mq->lock, flags);
-	mq->in_flight[mmc_issue_type(mq, req)] -= 1;
+	mq->in_flight[issue_type] -= 1;
 	put_card = (mmc_tot_in_flight(mq) == 0);

drivers/mmc/core/queue.c+5−11

@@ -107,11 +107,10 @@ static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req) · 106 unmodified lines
107	case MMC_ISSUE_DCMD:	107	case MMC_ISSUE_DCMD:
108	if (host->cqe_ops->cqe_timeout(host, mrq, &recovery_needed)) {	108	if (host->cqe_ops->cqe_timeout(host, mrq, &recovery_needed)) {
109	if (recovery_needed)	109	if (recovery_needed)
110	__mmc_cqe_recovery_notifier(mq);	110	mmc_cqe_recovery_notifier(mrq);
111	return BLK_EH_RESET_TIMER;	111	return BLK_EH_RESET_TIMER;
112	}	112	}
113	/* No timeout (XXX: huh? comment doesn't make much sense) */	113	/* The request has gone already */
114	blk_mq_complete_request(req);
115	return BLK_EH_DONE;	114	return BLK_EH_DONE;
116	default:	115	default:
117	/* Timeout is handled by mmc core */	116	/* Timeout is handled by mmc core */
@@ -127,18 +126,13 @@ static enum blk_eh_timer_return mmc_mq_timed_out(struct request *req, · 9 unmodified lines
127	struct mmc_card *card = mq->card;	126	struct mmc_card *card = mq->card;
128	struct mmc_host *host = card->host;	127	struct mmc_host *host = card->host;
129	unsigned long flags;	128	unsigned long flags;
130	int ret;	129	bool ignore_tout;
131		130
132	spin_lock_irqsave(&mq->lock, flags);	131	spin_lock_irqsave(&mq->lock, flags);
133		132	ignore_tout = mq->recovery_needed \|\| !mq->use_cqe \|\| host->hsq_enabled;
134	if (mq->recovery_needed \|\| !mq->use_cqe \|\| host->hsq_enabled)
135	ret = BLK_EH_RESET_TIMER;
136	else
137	ret = mmc_cqe_timed_out(req);
138
139	spin_unlock_irqrestore(&mq->lock, flags);	133	spin_unlock_irqrestore(&mq->lock, flags);
140		134
141	return ret;	135	return ignore_tout ? BLK_EH_RESET_TIMER : mmc_cqe_timed_out(req);
142	}	136	}
143		137
144	static void mmc_mq_recovery_handler(struct work_struct *work)	138	static void mmc_mq_recovery_handler(struct work_struct *work)

drivers/mmc/host/alcor.c+5−1

 	if (ret) {
 		dev_err(&pdev->dev, "Failed to get irq for data line\n");
-		return ret;
+		goto free_host;
 	}
 	mutex_init(&host->cmd_mutex);
 	dev_set_drvdata(&pdev->dev, host);
 	mmc_add_host(mmc);
 	return 0;
+free_host:
+	mmc_free_host(mmc);
+	return ret;
 }
 static int alcor_pci_sdmmc_drv_remove(struct platform_device *pdev)

drivers/mmc/host/sdhci-acpi.c+6−4

 }
 static const struct sdhci_acpi_slot sdhci_acpi_slot_amd_emmc = {
-	.chip   = &sdhci_acpi_chip_amd,
+	.chip		= &sdhci_acpi_chip_amd,
-	.caps   = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
+	.caps		= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
-	.quirks = SDHCI_QUIRK_32BIT_DMA_ADDR | SDHCI_QUIRK_32BIT_DMA_SIZE |
+	.quirks		= SDHCI_QUIRK_32BIT_DMA_ADDR |
-			SDHCI_QUIRK_32BIT_ADMA_SIZE,
+			  SDHCI_QUIRK_32BIT_DMA_SIZE |
+			  SDHCI_QUIRK_32BIT_ADMA_SIZE,
+	.quirks2	= SDHCI_QUIRK2_BROKEN_64_BIT_DMA,
 	.probe_slot     = sdhci_acpi_emmc_amd_probe_slot,
 };

drivers/mmc/host/sdhci-pci-gli.c+23−0

 #define   SDHCI_GLI_9750_DRIVING_2    GENMASK(27, 26)
 #define   GLI_9750_DRIVING_1_VALUE    0xFFF
 #define   GLI_9750_DRIVING_2_VALUE    0x3
+#define   SDHCI_GLI_9750_SEL_1        BIT(29)
+#define   SDHCI_GLI_9750_SEL_2        BIT(31)
+#define   SDHCI_GLI_9750_ALL_RST      (BIT(24)|BIT(25)|BIT(28)|BIT(30))
 #define SDHCI_GLI_9750_PLL	      0x864
 #define   SDHCI_GLI_9750_PLL_TX2_INV    BIT(23)
 				    GLI_9750_DRIVING_1_VALUE);
 	driving_value |= FIELD_PREP(SDHCI_GLI_9750_DRIVING_2,
 				    GLI_9750_DRIVING_2_VALUE);
+	driving_value &= ~(SDHCI_GLI_9750_SEL_1|SDHCI_GLI_9750_SEL_2|SDHCI_GLI_9750_ALL_RST);
+	driving_value |= SDHCI_GLI_9750_SEL_2;
 	sdhci_writel(host, driving_value, SDHCI_GLI_9750_DRIVING);
 	sw_ctrl_value &= ~SDHCI_GLI_9750_SW_CTRL_4;
 	return value;
 }
+#ifdef CONFIG_PM_SLEEP
+static int sdhci_pci_gli_resume(struct sdhci_pci_chip *chip)
+{
+	struct sdhci_pci_slot *slot = chip->slots[0];
+	pci_free_irq_vectors(slot->chip->pdev);
+	gli_pcie_enable_msi(slot);
+	return sdhci_pci_resume_host(chip);
+}
+#endif
 static const struct sdhci_ops sdhci_gl9755_ops = {
 	.set_clock		= sdhci_set_clock,
 	.enable_dma		= sdhci_pci_enable_dma,
 	.quirks2	= SDHCI_QUIRK2_BROKEN_DDR50,
 	.probe_slot	= gli_probe_slot_gl9755,
 	.ops            = &sdhci_gl9755_ops,
+#ifdef CONFIG_PM_SLEEP
+	.resume         = sdhci_pci_gli_resume,
+#endif
 };
 static const struct sdhci_ops sdhci_gl9750_ops = {
 	.quirks2	= SDHCI_QUIRK2_BROKEN_DDR50,
 	.probe_slot	= gli_probe_slot_gl9750,
 	.ops            = &sdhci_gl9750_ops,
+#ifdef CONFIG_PM_SLEEP
+	.resume         = sdhci_pci_gli_resume,
+#endif
 };

drivers/mtd/mtdcore.c+1−1

@@ -555,7 +555,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd) · 554 unmodified lines
555		555
556	config.id = -1;	556	config.id = -1;
557	config.dev = &mtd->dev;	557	config.dev = &mtd->dev;
558	config.name = mtd->name;	558	config.name = dev_name(&mtd->dev);
559	config.owner = THIS_MODULE;	559	config.owner = THIS_MODULE;
560	config.reg_read = mtd_nvmem_reg_read;	560	config.reg_read = mtd_nvmem_reg_read;
561	config.size = mtd->size;	561	config.size = mtd->size;

drivers/mtd/nand/raw/brcmnand/brcmnand.c+1−2

 		flash_dma_writel(ctrl, FLASH_DMA_ERROR_STATUS, 0);
 	}
-	if (has_edu(ctrl))
+	if (has_edu(ctrl)) {
 		ctrl->edu_config = edu_readl(ctrl, EDU_CONFIG);
-	else {
 		edu_writel(ctrl, EDU_CONFIG, ctrl->edu_config);
 		edu_readl(ctrl, EDU_CONFIG);
 		brcmnand_edu_init(ctrl);

drivers/mtd/nand/spi/core.c+4−0

@@ -1089,6 +1089,10 @@ static int spinand_init(struct spinand_device *spinand) · 1088 unmodified lines
1089		1089
1090	mtd->oobavail = ret;	1090	mtd->oobavail = ret;
1091		1091
		1092	/* Propagate ECC information to mtd_info */
		1093	mtd->ecc_strength = nand->eccreq.strength;
		1094	mtd->ecc_step_size = nand->eccreq.step_size;
		1095
1092	return 0;	1096	return 0;
1093		1097
1094	err_cleanup_nanddev:	1098	err_cleanup_nanddev:

drivers/mtd/ubi/debug.c+2−10

 {
 	struct ubi_device *ubi = s->private;
-	if (*pos == 0)
-		return SEQ_START_TOKEN;
 	if (*pos < ubi->peb_count)
 		return pos;
 {
 	struct ubi_device *ubi = s->private;
-	if (v == SEQ_START_TOKEN)
-		return pos;
 	(*pos)++;
 	if (*pos < ubi->peb_count)
 	int err;
 	/* If this is the start, print a header */
-	if (iter == SEQ_START_TOKEN) {
+	if (*block_number == 0)
-		seq_puts(s,
+		seq_puts(s, "physical_block_number\terase_count\n");
-			 "physical_block_number\terase_count\tblock_status\tread_status\n");
-		return 0;
-	}
 	err = ubi_io_is_bad(ubi, *block_number);
 	if (err)

drivers/net/bareudp.c+4−14

 	oiph = skb_network_header(skb);
 	skb_reset_network_header(skb);
-	if (family == AF_INET)
+	if (!IS_ENABLED(CONFIG_IPV6) || family == AF_INET)
 		err = IP_ECN_decapsulate(oiph, skb);
-#if IS_ENABLED(CONFIG_IPV6)
 	else
 		err = IP6_ECN_decapsulate(oiph, skb);
-#endif
 	if (unlikely(err)) {
 		if (log_ecn_error) {
-			if  (family == AF_INET)
+			if  (!IS_ENABLED(CONFIG_IPV6) || family == AF_INET)
 				net_info_ratelimited("non-ECT from %pI4 "
 						     "with TOS=%#x\n",
 						     &((struct iphdr *)oiph)->saddr,
 						     ((struct iphdr *)oiph)->tos);
-#if IS_ENABLED(CONFIG_IPV6)
 			else
 				net_info_ratelimited("non-ECT from %pI6\n",
 						     &((struct ipv6hdr *)oiph)->saddr);
-#endif
 		}
 		if (err > 1) {
 			++bareudp->dev->stats.rx_frame_errors;
 	return err;
 }
-#if IS_ENABLED(CONFIG_IPV6)
 static int bareudp6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
 			     struct bareudp_dev *bareudp,
 			     const struct ip_tunnel_info *info)
 	dst_release(dst);
 	return err;
 }
-#endif
 static netdev_tx_t bareudp_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	}
 	rcu_read_lock();
-#if IS_ENABLED(CONFIG_IPV6)
+	if (IS_ENABLED(CONFIG_IPV6) && info->mode & IP_TUNNEL_INFO_IPV6)
-	if (info->mode & IP_TUNNEL_INFO_IPV6)
 		err = bareudp6_xmit_skb(skb, dev, bareudp, info);
 	else
-#endif
 		err = bareudp_xmit_skb(skb, dev, bareudp, info);
 	rcu_read_unlock();
 	use_cache = ip_tunnel_dst_cache_usable(skb, info);
-	if (ip_tunnel_info_af(info) == AF_INET) {
+	if (!IS_ENABLED(CONFIG_IPV6) || ip_tunnel_info_af(info) == AF_INET) {
 		struct rtable *rt;
 		__be32 saddr;
 		ip_rt_put(rt);
 		info->key.u.ipv4.src = saddr;
-#if IS_ENABLED(CONFIG_IPV6)
 	} else if (ip_tunnel_info_af(info) == AF_INET6) {
 		struct dst_entry *dst;
 		struct in6_addr saddr;
 		dst_release(dst);
 		info->key.u.ipv6.src = saddr;
-#endif
 	} else {
 		return -EINVAL;
 	}

drivers/net/can/ifi_canfd/ifi_canfd.c+4−1

 	u32 id, rev;
 	addr = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(addr))
+		return PTR_ERR(addr);
 	irq = platform_get_irq(pdev, 0);
-	if (IS_ERR(addr) || irq < 0)
+	if (irq < 0)
 		return -EINVAL;
 	id = readl(addr + IFI_CANFD_IP_ID);

drivers/net/can/sun4i_can.c+1−1

@@ -792,7 +792,7 @@ static int sun4ican_probe(struct platform_device *pdev) · 791 unmodified lines
792		792
793	addr = devm_platform_ioremap_resource(pdev, 0);	793	addr = devm_platform_ioremap_resource(pdev, 0);
794	if (IS_ERR(addr)) {	794	if (IS_ERR(addr)) {
795	err = -EBUSY;	795	err = PTR_ERR(addr);
796	goto exit;	796	goto exit;
797	}	797	}
798		798

drivers/net/dsa/b53/b53_srab.c+1−1

@@ -609,7 +609,7 @@ static int b53_srab_probe(struct platform_device *pdev) · 608 unmodified lines
609		609
610	priv->regs = devm_platform_ioremap_resource(pdev, 0);	610	priv->regs = devm_platform_ioremap_resource(pdev, 0);
611	if (IS_ERR(priv->regs))	611	if (IS_ERR(priv->regs))
612	return -ENOMEM;	612	return PTR_ERR(priv->regs);
613		613
614	dev = b53_switch_alloc(&pdev->dev, &b53_srab_ops, priv);	614	dev = b53_switch_alloc(&pdev->dev, &b53_srab_ops, priv);
615	if (!dev)	615	if (!dev)

drivers/net/dsa/dsa_loop.c+1−0

@@ -360,6 +360,7 @@ static void __exit dsa_loop_exit(void) · 359 unmodified lines
360	}	360	}
361	module_exit(dsa_loop_exit);	361	module_exit(dsa_loop_exit);
362		362
		363	MODULE_SOFTDEP("pre: dsa_loop_bdinfo");
363	MODULE_LICENSE("GPL");	364	MODULE_LICENSE("GPL");
364	MODULE_AUTHOR("Florian Fainelli");	365	MODULE_AUTHOR("Florian Fainelli");
365	MODULE_DESCRIPTION("DSA loopback driver");	366	MODULE_DESCRIPTION("DSA loopback driver");

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

 	mt7530_write(priv, MT7530_PVC_P(port),
 		     PORT_SPEC_TAG);
-	/* Disable auto learning on the cpu port */
+	/* Unknown multicast frame forwarding to the cpu port */
-	mt7530_set(priv, MT7530_PSC_P(port), SA_DIS);
+	mt7530_rmw(priv, MT7530_MFC, UNM_FFP_MASK, UNM_FFP(BIT(port)));
-	/* Unknown unicast frame fordwarding to the cpu port */
-	mt7530_set(priv, MT7530_MFC, UNU_FFP(BIT(port)));
 	/* Set CPU port number */
 	if (priv->id == ID_MT7621)
 	/* Enable and reset MIB counters */
 	mt7530_mib_reset(ds);
-	mt7530_clear(priv, MT7530_MFC, UNU_FFP_MASK);
 	for (i = 0; i < MT7530_NUM_PORTS; i++) {
 		/* Disable forwarding by default on all ports */
 		mt7530_rmw(priv, MT7530_PCR_P(i), PCR_MATRIX_MASK,

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

@@ -31,6 +31,7 @@ enum { · 30 unmodified lines
31	#define MT7530_MFC 0x10	31	#define MT7530_MFC 0x10
32	#define BC_FFP(x) (((x) & 0xff) << 24)	32	#define BC_FFP(x) (((x) & 0xff) << 24)
33	#define UNM_FFP(x) (((x) & 0xff) << 16)	33	#define UNM_FFP(x) (((x) & 0xff) << 16)
		34	#define UNM_FFP_MASK UNM_FFP(~0)
34	#define UNU_FFP(x) (((x) & 0xff) << 8)	35	#define UNU_FFP(x) (((x) & 0xff) << 8)
35	#define UNU_FFP_MASK UNU_FFP(~0)	36	#define UNU_FFP_MASK UNU_FFP(~0)
36	#define CPU_EN BIT(7)	37	#define CPU_EN BIT(7)

drivers/net/dsa/ocelot/felix.c+11−12

 	struct ocelot *ocelot = &felix->ocelot;
 	phy_interface_t *port_phy_modes;
 	resource_size_t switch_base;
+	struct resource res;
 	int port, i, err;
 	ocelot->num_phys_ports = num_phys_ports;
 	for (i = 0; i < TARGET_MAX; i++) {
 		struct regmap *target;
-		struct resource *res;
 		if (!felix->info->target_io_res[i].name)
 			continue;
-		res = &felix->info->target_io_res[i];
+		memcpy(&res, &felix->info->target_io_res[i], sizeof(res));
-		res->flags = IORESOURCE_MEM;
+		res.flags = IORESOURCE_MEM;
-		res->start += switch_base;
+		res.start += switch_base;
-		res->end += switch_base;
+		res.end += switch_base;
-		target = ocelot_regmap_init(ocelot, res);
+		target = ocelot_regmap_init(ocelot, &res);
 		if (IS_ERR(target)) {
 			dev_err(ocelot->dev,
 				"Failed to map device memory space\n");
 	for (port = 0; port < num_phys_ports; port++) {
 		struct ocelot_port *ocelot_port;
 		void __iomem *port_regs;
-		struct resource *res;
 		ocelot_port = devm_kzalloc(ocelot->dev,
 					   sizeof(struct ocelot_port),
 			return -ENOMEM;
 		}
-		res = &felix->info->port_io_res[port];
+		memcpy(&res, &felix->info->port_io_res[port], sizeof(res));
-		res->flags = IORESOURCE_MEM;
+		res.flags = IORESOURCE_MEM;
-		res->start += switch_base;
+		res.start += switch_base;
-		res->end += switch_base;
+		res.end += switch_base;
-		port_regs = devm_ioremap_resource(ocelot->dev, res);
+		port_regs = devm_ioremap_resource(ocelot->dev, &res);
 		if (IS_ERR(port_regs)) {
 			dev_err(ocelot->dev,
 				"failed to map registers for port %d\n", port);

drivers/net/dsa/ocelot/felix.h+3−3

@@ -8,9 +8,9 @@ · 7 unmodified lines
8		8
9	/* Platform-specific information */	9	/* Platform-specific information */
10	struct felix_info {	10	struct felix_info {
11	struct resource *target_io_res;	11	const struct resource *target_io_res;
12	struct resource *port_io_res;	12	const struct resource *port_io_res;
13	struct resource *imdio_res;	13	const struct resource *imdio_res;
14	const struct reg_field *regfields;	14	const struct reg_field *regfields;
15	const u32 const map;	15	const u32 const map;
16	const struct ocelot_ops *ops;	16	const struct ocelot_ops *ops;

drivers/net/dsa/ocelot/felix_vsc9959.c+10−12

 	[GCB]	= vsc9959_gcb_regmap,
 };
-/* Addresses are relative to the PCI device's base address and
+/* Addresses are relative to the PCI device's base address */
- * will be fixed up at ioremap time.
+static const struct resource vsc9959_target_io_res[] = {
- */
-static struct resource vsc9959_target_io_res[] = {
 	[ANA] = {
 		.start	= 0x0280000,
 		.end	= 0x028ffff,
 	},
 };
-static struct resource vsc9959_port_io_res[] = {
+static const struct resource vsc9959_port_io_res[] = {
 	{
 		.start	= 0x0100000,
 		.end	= 0x010ffff,
 /* Port MAC 0 Internal MDIO bus through which the SerDes acting as an
  * SGMII/QSGMII MAC PCS can be found.
  */
-static struct resource vsc9959_imdio_res = {
+static const struct resource vsc9959_imdio_res = {
 	.start		= 0x8030,
 	.end		= 0x8040,
 	.name		= "imdio",
 	struct device *dev = ocelot->dev;
 	resource_size_t imdio_base;
 	void __iomem *imdio_regs;
-	struct resource *res;
+	struct resource res;
 	struct enetc_hw *hw;
 	struct mii_bus *bus;
 	int port;
 	imdio_base = pci_resource_start(felix->pdev,
 					felix->info->imdio_pci_bar);
-	res = felix->info->imdio_res;
+	memcpy(&res, felix->info->imdio_res, sizeof(res));
-	res->flags = IORESOURCE_MEM;
+	res.flags = IORESOURCE_MEM;
-	res->start += imdio_base;
+	res.start += imdio_base;
-	res->end += imdio_base;
+	res.end += imdio_base;
-	imdio_regs = devm_ioremap_resource(dev, res);
+	imdio_regs = devm_ioremap_resource(dev, &res);
 	if (IS_ERR(imdio_regs)) {
 		dev_err(dev, "failed to map internal MDIO registers\n");
 		return PTR_ERR(imdio_regs);

drivers/net/ethernet/apple/bmac.c+1−1

@@ -1182,7 +1182,7 @@ bmac_get_station_address(struct net_device dev, unsigned char ea) · 1181 unmodified lines
1182	int i;	1182	int i;
1183	unsigned short data;	1183	unsigned short data;
1184		1184
1185	for (i = 0; i < 6; i++)	1185	for (i = 0; i < 3; i++)
1186	{	1186	{
1187	reset_and_select_srom(dev);	1187	reset_and_select_srom(dev);
1188	data = read_srom(dev, i + EnetAddressOffset/2, SROMAddressBits);	1188	data = read_srom(dev, i + EnetAddressOffset/2, SROMAddressBits);

drivers/net/ethernet/broadcom/Kconfig+1−0

@@ -69,6 +69,7 @@ config BCMGENET · 68 unmodified lines
69	select BCM7XXX_PHY	69	select BCM7XXX_PHY
70	select MDIO_BCM_UNIMAC	70	select MDIO_BCM_UNIMAC
71	select DIMLIB	71	select DIMLIB
		72	select BROADCOM_PHY if ARCH_BCM2835
72	help	73	help
73	This driver supports the built-in Ethernet MACs found in the	74	This driver supports the built-in Ethernet MACs found in the
74	Broadcom BCM7xxx Set Top Box family chipset.	75	Broadcom BCM7xxx Set Top Box family chipset.

drivers/net/ethernet/freescale/Kconfig+2−0

 	depends on QUICC_ENGINE && PPC32
 	select FSL_PQ_MDIO
 	select PHYLIB
+	select FIXED_PHY
 	---help---
 	  This driver supports the Gigabit Ethernet mode of the QUICC Engine,
 	  which is available on some Freescale SOCs.
 	depends on HAS_DMA
 	select FSL_PQ_MDIO
 	select PHYLIB
+	select FIXED_PHY
 	select CRC32
 	---help---
 	  This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,

drivers/net/ethernet/freescale/dpaa/Kconfig+1−0

@@ -3,6 +3,7 @@ menuconfig FSL_DPAA_ETH · 2 unmodified lines
3	tristate "DPAA Ethernet"	3	tristate "DPAA Ethernet"
4	depends on FSL_DPAA && FSL_FMAN	4	depends on FSL_DPAA && FSL_FMAN
5	select PHYLIB	5	select PHYLIB
		6	select FIXED_PHY
6	select FSL_FMAN_MAC	7	select FSL_FMAN_MAC
7	---help---	8	---help---
8	Data Path Acceleration Architecture Ethernet driver,	9	Data Path Acceleration Architecture Ethernet driver,

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c+17−12

 	for (i = 1; i < DPAA2_ETH_MAX_SG_ENTRIES; i++) {
 		addr = dpaa2_sg_get_addr(&sgt[i]);
 		sg_vaddr = dpaa2_iova_to_virt(priv->iommu_domain, addr);
-		dma_unmap_page(dev, addr, DPAA2_ETH_RX_BUF_SIZE,
+		dma_unmap_page(dev, addr, priv->rx_buf_size,
 			       DMA_BIDIRECTIONAL);
 		free_pages((unsigned long)sg_vaddr, 0);
 		/* Get the address and length from the S/G entry */
 		sg_addr = dpaa2_sg_get_addr(sge);
 		sg_vaddr = dpaa2_iova_to_virt(priv->iommu_domain, sg_addr);
-		dma_unmap_page(dev, sg_addr, DPAA2_ETH_RX_BUF_SIZE,
+		dma_unmap_page(dev, sg_addr, priv->rx_buf_size,
 			       DMA_BIDIRECTIONAL);
 		sg_length = dpaa2_sg_get_len(sge);
 				(page_address(page) - page_address(head_page));
 			skb_add_rx_frag(skb, i - 1, head_page, page_offset,
-					sg_length, DPAA2_ETH_RX_BUF_SIZE);
+					sg_length, priv->rx_buf_size);
 		}
 		if (dpaa2_sg_is_final(sge))
 	for (i = 0; i < count; i++) {
 		vaddr = dpaa2_iova_to_virt(priv->iommu_domain, buf_array[i]);
-		dma_unmap_page(dev, buf_array[i], DPAA2_ETH_RX_BUF_SIZE,
+		dma_unmap_page(dev, buf_array[i], priv->rx_buf_size,
 			       DMA_BIDIRECTIONAL);
 		free_pages((unsigned long)vaddr, 0);
 	}
 		break;
 	case XDP_REDIRECT:
 		dma_unmap_page(priv->net_dev->dev.parent, addr,
-			       DPAA2_ETH_RX_BUF_SIZE, DMA_BIDIRECTIONAL);
+			       priv->rx_buf_size, DMA_BIDIRECTIONAL);
 		ch->buf_count--;
 		xdp.data_hard_start = vaddr;
 		err = xdp_do_redirect(priv->net_dev, &xdp, xdp_prog);
 	trace_dpaa2_rx_fd(priv->net_dev, fd);
 	vaddr = dpaa2_iova_to_virt(priv->iommu_domain, addr);
-	dma_sync_single_for_cpu(dev, addr, DPAA2_ETH_RX_BUF_SIZE,
+	dma_sync_single_for_cpu(dev, addr, priv->rx_buf_size,
 				DMA_BIDIRECTIONAL);
 	fas = dpaa2_get_fas(vaddr, false);
 			return;
 		}
-		dma_unmap_page(dev, addr, DPAA2_ETH_RX_BUF_SIZE,
+		dma_unmap_page(dev, addr, priv->rx_buf_size,
 			       DMA_BIDIRECTIONAL);
 		skb = build_linear_skb(ch, fd, vaddr);
 	} else if (fd_format == dpaa2_fd_sg) {
 		WARN_ON(priv->xdp_prog);
-		dma_unmap_page(dev, addr, DPAA2_ETH_RX_BUF_SIZE,
+		dma_unmap_page(dev, addr, priv->rx_buf_size,
 			       DMA_BIDIRECTIONAL);
 		skb = build_frag_skb(priv, ch, buf_data);
 		free_pages((unsigned long)vaddr, 0);
 		if (!page)
 			goto err_alloc;
-		addr = dma_map_page(dev, page, 0, DPAA2_ETH_RX_BUF_SIZE,
+		addr = dma_map_page(dev, page, 0, priv->rx_buf_size,
 				    DMA_BIDIRECTIONAL);
 		if (unlikely(dma_mapping_error(dev, addr)))
 			goto err_map;
 		/* tracing point */
 		trace_dpaa2_eth_buf_seed(priv->net_dev,
 					 page, DPAA2_ETH_RX_BUF_RAW_SIZE,
-					 addr, DPAA2_ETH_RX_BUF_SIZE,
+					 addr, priv->rx_buf_size,
 					 bpid);
 	}
 	int mfl, linear_mfl;
 	mfl = DPAA2_ETH_L2_MAX_FRM(mtu);
-	linear_mfl = DPAA2_ETH_RX_BUF_SIZE - DPAA2_ETH_RX_HWA_SIZE -
+	linear_mfl = priv->rx_buf_size - DPAA2_ETH_RX_HWA_SIZE -
 		     dpaa2_eth_rx_head_room(priv) - XDP_PACKET_HEADROOM;
 	if (mfl > linear_mfl) {
 	else
 		rx_buf_align = DPAA2_ETH_RX_BUF_ALIGN;
+	/* We need to ensure that the buffer size seen by WRIOP is a multiple
+	 * of 64 or 256 bytes depending on the WRIOP version.
+	 */
+	priv->rx_buf_size = ALIGN_DOWN(DPAA2_ETH_RX_BUF_SIZE, rx_buf_align);
 	/* tx buffer */
 	buf_layout.private_data_size = DPAA2_ETH_SWA_SIZE;
 	buf_layout.pass_timestamp = true;
 	pools_params.num_dpbp = 1;
 	pools_params.pools[0].dpbp_id = priv->dpbp_dev->obj_desc.id;
 	pools_params.pools[0].backup_pool = 0;
-	pools_params.pools[0].buffer_size = DPAA2_ETH_RX_BUF_SIZE;
+	pools_params.pools[0].buffer_size = priv->rx_buf_size;
 	err = dpni_set_pools(priv->mc_io, 0, priv->mc_token, &pools_params);
 	if (err) {
 		dev_err(dev, "dpni_set_pools() failed\n");

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h+1−0

@@ -382,6 +382,7 @@ struct dpaa2_eth_priv { · 381 unmodified lines
382	u16 tx_data_offset;	382	u16 tx_data_offset;
383		383
384	struct fsl_mc_device *dpbp_dev;	384	struct fsl_mc_device *dpbp_dev;
		385	u16 rx_buf_size;
385	u16 bpid;	386	u16 bpid;
386	struct iommu_domain *iommu_domain;	387	struct iommu_domain *iommu_domain;
387		388

drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c+1−1

@@ -635,7 +635,7 @@ static int num_rules(struct dpaa2_eth_priv *priv) · 634 unmodified lines
635		635
636	static int update_cls_rule(struct net_device *net_dev,	636	static int update_cls_rule(struct net_device *net_dev,
637	struct ethtool_rx_flow_spec *new_fs,	637	struct ethtool_rx_flow_spec *new_fs,
638	int location)	638	unsigned int location)
639	{	639	{
640	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);	640	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);
641	struct dpaa2_eth_cls_rule *rule;	641	struct dpaa2_eth_cls_rule *rule;

drivers/net/ethernet/freescale/ucc_geth.c+7−6

@@ -42,6 +42,7 @@ · 41 unmodified lines
42	#include <soc/fsl/qe/ucc.h>	42	#include <soc/fsl/qe/ucc.h>
43	#include <soc/fsl/qe/ucc_fast.h>	43	#include <soc/fsl/qe/ucc_fast.h>
44	#include <asm/machdep.h>	44	#include <asm/machdep.h>
		45	#include <net/sch_generic.h>
45		46
46	#include "ucc_geth.h"	47	#include "ucc_geth.h"
47		48
@@ -1548,11 +1549,8 @@ static int ugeth_disable(struct ucc_geth_private *ugeth, enum comm_dir mode) · 1500 unmodified lines
1548		1549
1549	static void ugeth_quiesce(struct ucc_geth_private *ugeth)	1550	static void ugeth_quiesce(struct ucc_geth_private *ugeth)
1550	{	1551	{
1551	/* Prevent any further xmits, plus detach the device. */	1552	/* Prevent any further xmits */
1552	netif_device_detach(ugeth->ndev);	1553	netif_tx_stop_all_queues(ugeth->ndev);
1553
1554	/* Wait for any current xmits to finish. */
1555	netif_tx_disable(ugeth->ndev);
1556		1554
1557	/* Disable the interrupt to avoid NAPI rescheduling. */	1555	/* Disable the interrupt to avoid NAPI rescheduling. */
1558	disable_irq(ugeth->ug_info->uf_info.irq);	1556	disable_irq(ugeth->ug_info->uf_info.irq);
@@ -1565,7 +1563,10 @@ static void ugeth_activate(struct ucc_geth_private *ugeth) · 6 unmodified lines
1565	{	1563	{
1566	napi_enable(&ugeth->napi);	1564	napi_enable(&ugeth->napi);
1567	enable_irq(ugeth->ug_info->uf_info.irq);	1565	enable_irq(ugeth->ug_info->uf_info.irq);
1568	netif_device_attach(ugeth->ndev);	1566
		1567	/* allow to xmit again */
		1568	netif_tx_wake_all_queues(ugeth->ndev);
		1569	__netdev_watchdog_up(ugeth->ndev);
1569	}	1570	}
1570		1571
1571	/* Called every time the controller might need to be made	1572	/* Called every time the controller might need to be made

drivers/net/ethernet/hisilicon/Kconfig+1−1

@@ -64,7 +64,7 @@ config HNS_MDIO · 63 unmodified lines
64	the PHY	64	the PHY
65		65
66	config HNS	66	config HNS
67	tristate "Hisilicon Network Subsystem Support (Framework)"	67	tristate
68	---help---	68	---help---
69	This selects the framework support for Hisilicon Network Subsystem. It	69	This selects the framework support for Hisilicon Network Subsystem. It
70	is needed by any driver which provides HNS acceleration engine or make	70	is needed by any driver which provides HNS acceleration engine or make

drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c+12−4

@@ -45,6 +45,8 @@ · 44 unmodified lines
45		45
46	#define MGMT_MSG_TIMEOUT 5000	46	#define MGMT_MSG_TIMEOUT 5000
47		47
		48	#define SET_FUNC_PORT_MGMT_TIMEOUT 25000
		49
48	#define mgmt_to_pfhwdev(pf_mgmt) \	50	#define mgmt_to_pfhwdev(pf_mgmt) \
49	container_of(pf_mgmt, struct hinic_pfhwdev, pf_to_mgmt)	51	container_of(pf_mgmt, struct hinic_pfhwdev, pf_to_mgmt)
50		52
@@ -238,12 +240,13 @@ static int msg_to_mgmt_sync(struct hinic_pf_to_mgmt *pf_to_mgmt, · 187 unmodified lines
238	u8 *buf_in, u16 in_size,	240	u8 *buf_in, u16 in_size,
239	u8 buf_out, u16 out_size,	241	u8 buf_out, u16 out_size,
240	enum mgmt_direction_type direction,	242	enum mgmt_direction_type direction,
241	u16 resp_msg_id)	243	u16 resp_msg_id, u32 timeout)
242	{	244	{
243	struct hinic_hwif *hwif = pf_to_mgmt->hwif;	245	struct hinic_hwif *hwif = pf_to_mgmt->hwif;
244	struct pci_dev *pdev = hwif->pdev;	246	struct pci_dev *pdev = hwif->pdev;
245	struct hinic_recv_msg *recv_msg;	247	struct hinic_recv_msg *recv_msg;
246	struct completion *recv_done;	248	struct completion *recv_done;
		249	unsigned long timeo;
247	u16 msg_id;	250	u16 msg_id;
248	int err;	251	int err;
249		252
@@ -267,8 +270,9 @@ static int msg_to_mgmt_sync(struct hinic_pf_to_mgmt *pf_to_mgmt, · 17 unmodified lines
267	goto unlock_sync_msg;	270	goto unlock_sync_msg;
268	}	271	}
269		272
270	if (!wait_for_completion_timeout(recv_done,	273	timeo = msecs_to_jiffies(timeout ? timeout : MGMT_MSG_TIMEOUT);
271	msecs_to_jiffies(MGMT_MSG_TIMEOUT))) {	274
		275	if (!wait_for_completion_timeout(recv_done, timeo)) {
272	dev_err(&pdev->dev, "MGMT timeout, MSG id = %d\n", msg_id);	276	dev_err(&pdev->dev, "MGMT timeout, MSG id = %d\n", msg_id);
273	err = -ETIMEDOUT;	277	err = -ETIMEDOUT;
274	goto unlock_sync_msg;	278	goto unlock_sync_msg;
@@ -342,6 +346,7 @@ int hinic_msg_to_mgmt(struct hinic_pf_to_mgmt *pf_to_mgmt, · 67 unmodified lines
342	{	346	{
343	struct hinic_hwif *hwif = pf_to_mgmt->hwif;	347	struct hinic_hwif *hwif = pf_to_mgmt->hwif;
344	struct pci_dev *pdev = hwif->pdev;	348	struct pci_dev *pdev = hwif->pdev;
		349	u32 timeout = 0;
345		350
346	if (sync != HINIC_MGMT_MSG_SYNC) {	351	if (sync != HINIC_MGMT_MSG_SYNC) {
347	dev_err(&pdev->dev, "Invalid MGMT msg type\n");	352	dev_err(&pdev->dev, "Invalid MGMT msg type\n");
@@ -353,9 +358,12 @@ int hinic_msg_to_mgmt(struct hinic_pf_to_mgmt *pf_to_mgmt, · 5 unmodified lines
353	return -EINVAL;	358	return -EINVAL;
354	}	359	}
355		360
		361	if (cmd == HINIC_PORT_CMD_SET_FUNC_STATE)
		362	timeout = SET_FUNC_PORT_MGMT_TIMEOUT;
		363
356	return msg_to_mgmt_sync(pf_to_mgmt, mod, cmd, buf_in, in_size,	364	return msg_to_mgmt_sync(pf_to_mgmt, mod, cmd, buf_in, in_size,
357	buf_out, out_size, MGMT_DIRECT_SEND,	365	buf_out, out_size, MGMT_DIRECT_SEND,
358	MSG_NOT_RESP);	366	MSG_NOT_RESP, timeout);
359	}	367	}
360		368
361	/**	369	/**

drivers/net/ethernet/huawei/hinic/hinic_main.c+2−14

 {
 	struct hinic_dev *nic_dev = netdev_priv(netdev);
 	unsigned int flags;
-	int err;
 	down(&nic_dev->mgmt_lock);
 	up(&nic_dev->mgmt_lock);
-	err = hinic_port_set_func_state(nic_dev, HINIC_FUNC_PORT_DISABLE);
+	hinic_port_set_state(nic_dev, HINIC_PORT_DISABLE);
-	if (err) {
-		netif_err(nic_dev, drv, netdev,
-			  "Failed to set func port state\n");
-		nic_dev->flags |= (flags & HINIC_INTF_UP);
-		return err;
-	}
-	err = hinic_port_set_state(nic_dev, HINIC_PORT_DISABLE);
+	hinic_port_set_func_state(nic_dev, HINIC_FUNC_PORT_DISABLE);
-	if (err) {
-		netif_err(nic_dev, drv, netdev, "Failed to set port state\n");
-		nic_dev->flags |= (flags & HINIC_INTF_UP);
-		return err;
-	}
 	if (nic_dev->flags & HINIC_RSS_ENABLE) {
 		hinic_rss_deinit(nic_dev);

drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c+1−1

@@ -1070,7 +1070,7 @@ void mvpp2_cls_oversize_rxq_set(struct mvpp2_port *port) · 1069 unmodified lines
1070	(port->first_rxq >> MVPP2_CLS_OVERSIZE_RXQ_LOW_BITS));	1070	(port->first_rxq >> MVPP2_CLS_OVERSIZE_RXQ_LOW_BITS));
1071		1071
1072	val = mvpp2_read(port->priv, MVPP2_CLS_SWFWD_PCTRL_REG);	1072	val = mvpp2_read(port->priv, MVPP2_CLS_SWFWD_PCTRL_REG);
1073	val \|= MVPP2_CLS_SWFWD_PCTRL_MASK(port->id);	1073	val &= ~MVPP2_CLS_SWFWD_PCTRL_MASK(port->id);
1074	mvpp2_write(port->priv, MVPP2_CLS_SWFWD_PCTRL_REG, val);	1074	mvpp2_write(port->priv, MVPP2_CLS_SWFWD_PCTRL_REG, val);
1075	}	1075	}
1076		1076

drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c+6−2

 	hw->irq_name = devm_kmalloc_array(&hw->pdev->dev, num_vec, NAME_SIZE,
 					  GFP_KERNEL);
-	if (!hw->irq_name)
+	if (!hw->irq_name) {
+		err = -ENOMEM;
 		goto err_free_netdev;
+	}
 	hw->affinity_mask = devm_kcalloc(&hw->pdev->dev, num_vec,
 					 sizeof(cpumask_var_t), GFP_KERNEL);
-	if (!hw->affinity_mask)
+	if (!hw->affinity_mask) {
+		err = -ENOMEM;
 		goto err_free_netdev;
+	}
 	err = pci_alloc_irq_vectors(hw->pdev, num_vec, num_vec, PCI_IRQ_MSIX);
 	if (err < 0) {

drivers/net/ethernet/marvell/pxa168_eth.c+1−1

@@ -1418,7 +1418,7 @@ static int pxa168_eth_probe(struct platform_device *pdev) · 1417 unmodified lines
1418		1418
1419	pep->base = devm_platform_ioremap_resource(pdev, 0);	1419	pep->base = devm_platform_ioremap_resource(pdev, 0);
1420	if (IS_ERR(pep->base)) {	1420	if (IS_ERR(pep->base)) {
1421	err = -ENOMEM;	1421	err = PTR_ERR(pep->base);
1422	goto err_netdev;	1422	goto err_netdev;
1423	}	1423	}
1424		1424

drivers/net/ethernet/mellanox/mlx4/fw.c+1−1

@@ -2734,7 +2734,7 @@ void mlx4_opreq_action(struct work_struct *work) · 2733 unmodified lines
2734	if (err) {	2734	if (err) {
2735	mlx4_err(dev, "Failed to retrieve required operation: %d\n",	2735	mlx4_err(dev, "Failed to retrieve required operation: %d\n",
2736	err);	2736	err);
2737	return;	2737	goto out;
2738	}	2738	}
2739	MLX4_GET(modifier, outbox, GET_OP_REQ_MODIFIER_OFFSET);	2739	MLX4_GET(modifier, outbox, GET_OP_REQ_MODIFIER_OFFSET);
2740	MLX4_GET(token, outbox, GET_OP_REQ_TOKEN_OFFSET);	2740	MLX4_GET(token, outbox, GET_OP_REQ_TOKEN_OFFSET);

drivers/net/ethernet/mellanox/mlx5/core/cmd.c+55−4

@@ -848,6 +848,14 @@ static void free_msg(struct mlx5_core_dev dev, struct mlx5_cmd_msg msg); · 847 unmodified lines
848	static void mlx5_free_cmd_msg(struct mlx5_core_dev *dev,	848	static void mlx5_free_cmd_msg(struct mlx5_core_dev *dev,
849	struct mlx5_cmd_msg *msg);	849	struct mlx5_cmd_msg *msg);
850		850
		851	static bool opcode_allowed(struct mlx5_cmd *cmd, u16 opcode)
		852	{
		853	if (cmd->allowed_opcode == CMD_ALLOWED_OPCODE_ALL)
		854	return true;
		855
		856	return cmd->allowed_opcode == opcode;
		857	}
		858
851	static void cmd_work_handler(struct work_struct *work)	859	static void cmd_work_handler(struct work_struct *work)
852	{	860	{
853	struct mlx5_cmd_work_ent *ent = container_of(work, struct mlx5_cmd_work_ent, work);	861	struct mlx5_cmd_work_ent *ent = container_of(work, struct mlx5_cmd_work_ent, work);
@@ -861,6 +869,7 @@ static void cmd_work_handler(struct work_struct *work) · 7 unmodified lines
861	int alloc_ret;	869	int alloc_ret;
862	int cmd_mode;	870	int cmd_mode;
863		871
		872	complete(&ent->handling);
864	sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;	873	sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;
865	down(sem);	874	down(sem);
866	if (!ent->page_queue) {	875	if (!ent->page_queue) {
@@ -913,7 +922,9 @@ static void cmd_work_handler(struct work_struct *work) · 46 unmodified lines
913		922
914	/* Skip sending command to fw if internal error */	923	/* Skip sending command to fw if internal error */
915	if (pci_channel_offline(dev->pdev) \|\|	924	if (pci_channel_offline(dev->pdev) \|\|
916	dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR) {	925	dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR \|\|
		926	cmd->state != MLX5_CMDIF_STATE_UP \|\|
		927	!opcode_allowed(&dev->cmd, ent->op)) {
917	u8 status = 0;	928	u8 status = 0;
918	u32 drv_synd;	929	u32 drv_synd;
919		930
@@ -978,6 +989,11 @@ static int wait_func(struct mlx5_core_dev dev, struct mlx5_cmd_work_ent ent) · 58 unmodified lines
978	struct mlx5_cmd *cmd = &dev->cmd;	989	struct mlx5_cmd *cmd = &dev->cmd;
979	int err;	990	int err;
980		991
		992	if (!wait_for_completion_timeout(&ent->handling, timeout) &&
		993	cancel_work_sync(&ent->work)) {
		994	ent->ret = -ECANCELED;
		995	goto out_err;
		996	}
981	if (cmd->mode == CMD_MODE_POLLING \|\| ent->polling) {	997	if (cmd->mode == CMD_MODE_POLLING \|\| ent->polling) {
982	wait_for_completion(&ent->done);	998	wait_for_completion(&ent->done);
983	} else if (!wait_for_completion_timeout(&ent->done, timeout)) {	999	} else if (!wait_for_completion_timeout(&ent->done, timeout)) {
@@ -985,12 +1001,17 @@ static int wait_func(struct mlx5_core_dev dev, struct mlx5_cmd_work_ent ent) · 1 unmodified line
985	mlx5_cmd_comp_handler(dev, 1UL << ent->idx, true);	1001	mlx5_cmd_comp_handler(dev, 1UL << ent->idx, true);
986	}	1002	}
987		1003
		1004	out_err:
988	err = ent->ret;	1005	err = ent->ret;
989		1006
990	if (err == -ETIMEDOUT) {	1007	if (err == -ETIMEDOUT) {
991	mlx5_core_warn(dev, "%s(0x%x) timeout. Will cause a leak of a command resource\n",	1008	mlx5_core_warn(dev, "%s(0x%x) timeout. Will cause a leak of a command resource\n",
992	mlx5_command_str(msg_to_opcode(ent->in)),	1009	mlx5_command_str(msg_to_opcode(ent->in)),
993	msg_to_opcode(ent->in));	1010	msg_to_opcode(ent->in));
		1011	} else if (err == -ECANCELED) {
		1012	mlx5_core_warn(dev, "%s(0x%x) canceled on out of queue timeout.\n",
		1013	mlx5_command_str(msg_to_opcode(ent->in)),
		1014	msg_to_opcode(ent->in));
994	}	1015	}
995	mlx5_core_dbg(dev, "err %d, delivery status %s(%d)\n",	1016	mlx5_core_dbg(dev, "err %d, delivery status %s(%d)\n",
996	err, deliv_status_to_str(ent->status), ent->status);	1017	err, deliv_status_to_str(ent->status), ent->status);
@@ -1026,6 +1047,7 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev dev, struct mlx5_cmd_msg in, · 29 unmodified lines
1026	ent->token = token;	1047	ent->token = token;
1027	ent->polling = force_polling;	1048	ent->polling = force_polling;
1028		1049
		1050	init_completion(&ent->handling);
1029	if (!callback)	1051	if (!callback)
1030	init_completion(&ent->done);	1052	init_completion(&ent->done);
1031		1053
@@ -1045,6 +1067,8 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev dev, struct mlx5_cmd_msg in, · 13 unmodified lines
1045	err = wait_func(dev, ent);	1067	err = wait_func(dev, ent);
1046	if (err == -ETIMEDOUT)	1068	if (err == -ETIMEDOUT)
1047	goto out;	1069	goto out;
		1070	if (err == -ECANCELED)
		1071	goto out_free;
1048		1072
1049	ds = ent->ts2 - ent->ts1;	1073	ds = ent->ts2 - ent->ts1;
1050	op = MLX5_GET(mbox_in, in->first.data, opcode);	1074	op = MLX5_GET(mbox_in, in->first.data, opcode);
@@ -1391,6 +1415,22 @@ static void create_debugfs_files(struct mlx5_core_dev *dev) · 340 unmodified lines
1391	mlx5_cmdif_debugfs_init(dev);	1415	mlx5_cmdif_debugfs_init(dev);
1392	}	1416	}
1393		1417
		1418	void mlx5_cmd_allowed_opcode(struct mlx5_core_dev *dev, u16 opcode)
		1419	{
		1420	struct mlx5_cmd *cmd = &dev->cmd;
		1421	int i;
		1422
		1423	for (i = 0; i < cmd->max_reg_cmds; i++)
		1424	down(&cmd->sem);
		1425	down(&cmd->pages_sem);
		1426
		1427	cmd->allowed_opcode = opcode;
		1428
		1429	up(&cmd->pages_sem);
		1430	for (i = 0; i < cmd->max_reg_cmds; i++)
		1431	up(&cmd->sem);
		1432	}
		1433
1394	static void mlx5_cmd_change_mod(struct mlx5_core_dev *dev, int mode)	1434	static void mlx5_cmd_change_mod(struct mlx5_core_dev *dev, int mode)
1395	{	1435	{
1396	struct mlx5_cmd *cmd = &dev->cmd;	1436	struct mlx5_cmd *cmd = &dev->cmd;
@@ -1667,12 +1707,14 @@ static int cmd_exec(struct mlx5_core_dev dev, void in, int in_size, void *out, · 270 unmodified lines
1667	int err;	1707	int err;
1668	u8 status = 0;	1708	u8 status = 0;
1669	u32 drv_synd;	1709	u32 drv_synd;
		1710	u16 opcode;
1670	u8 token;	1711	u8 token;
1671		1712
		1713	opcode = MLX5_GET(mbox_in, in, opcode);
1672	if (pci_channel_offline(dev->pdev) \|\|	1714	if (pci_channel_offline(dev->pdev) \|\|
1673	dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR) {	1715	dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR \|\|
1674	u16 opcode = MLX5_GET(mbox_in, in, opcode);	1716	dev->cmd.state != MLX5_CMDIF_STATE_UP \|\|
1675		1717	!opcode_allowed(&dev->cmd, opcode)) {
1676	err = mlx5_internal_err_ret_value(dev, opcode, &drv_synd, &status);	1718	err = mlx5_internal_err_ret_value(dev, opcode, &drv_synd, &status);
1677	MLX5_SET(mbox_out, out, status, status);	1719	MLX5_SET(mbox_out, out, status, status);
1678	MLX5_SET(mbox_out, out, syndrome, drv_synd);	1720	MLX5_SET(mbox_out, out, syndrome, drv_synd);
@@ -1937,6 +1979,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) · 258 unmodified lines
1937	goto err_free_page;	1979	goto err_free_page;
1938	}	1980	}
1939		1981
		1982	cmd->state = MLX5_CMDIF_STATE_DOWN;
1940	cmd->checksum_disabled = 1;	1983	cmd->checksum_disabled = 1;
1941	cmd->max_reg_cmds = (1 << cmd->log_sz) - 1;	1984	cmd->max_reg_cmds = (1 << cmd->log_sz) - 1;
1942	cmd->bitmask = (1UL << cmd->max_reg_cmds) - 1;	1985	cmd->bitmask = (1UL << cmd->max_reg_cmds) - 1;
@@ -1974,6 +2017,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) · 31 unmodified lines
1974	mlx5_core_dbg(dev, "descriptor at dma 0x%llx\n", (unsigned long long)(cmd->dma));	2017	mlx5_core_dbg(dev, "descriptor at dma 0x%llx\n", (unsigned long long)(cmd->dma));
1975		2018
1976	cmd->mode = CMD_MODE_POLLING;	2019	cmd->mode = CMD_MODE_POLLING;
		2020	cmd->allowed_opcode = CMD_ALLOWED_OPCODE_ALL;
1977		2021
1978	create_msg_cache(dev);	2022	create_msg_cache(dev);
1979		2023
@@ -2013,3 +2057,10 @@ void mlx5_cmd_cleanup(struct mlx5_core_dev *dev) · 33 unmodified lines
2013	dma_pool_destroy(cmd->pool);	2057	dma_pool_destroy(cmd->pool);
2014	}	2058	}
2015	EXPORT_SYMBOL(mlx5_cmd_cleanup);	2059	EXPORT_SYMBOL(mlx5_cmd_cleanup);
		2060
		2061	void mlx5_cmd_set_state(struct mlx5_core_dev *dev,
		2062	enum mlx5_cmdif_state cmdif_state)
		2063	{
		2064	dev->cmd.state = cmdif_state;
		2065	}
		2066	EXPORT_SYMBOL(mlx5_cmd_set_state);

drivers/net/ethernet/mellanox/mlx5/core/en.h+1−1

@@ -1121,7 +1121,7 @@ void mlx5e_close_drop_rq(struct mlx5e_rq *drop_rq); · 1120 unmodified lines
1121	int mlx5e_create_indirect_rqt(struct mlx5e_priv *priv);	1121	int mlx5e_create_indirect_rqt(struct mlx5e_priv *priv);
1122		1122
1123	int mlx5e_create_indirect_tirs(struct mlx5e_priv *priv, bool inner_ttc);	1123	int mlx5e_create_indirect_tirs(struct mlx5e_priv *priv, bool inner_ttc);
1124	void mlx5e_destroy_indirect_tirs(struct mlx5e_priv *priv, bool inner_ttc);	1124	void mlx5e_destroy_indirect_tirs(struct mlx5e_priv *priv);
1125		1125
1126	int mlx5e_create_direct_rqts(struct mlx5e_priv priv, struct mlx5e_tir tirs);	1126	int mlx5e_create_direct_rqts(struct mlx5e_priv priv, struct mlx5e_tir tirs);
1127	void mlx5e_destroy_direct_rqts(struct mlx5e_priv priv, struct mlx5e_tir tirs);	1127	void mlx5e_destroy_direct_rqts(struct mlx5e_priv priv, struct mlx5e_tir tirs);

drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c+3−2

 		       struct netlink_ext_ack *extack)
 {
 	struct mlx5_tc_ct_priv *ct_priv = mlx5_tc_ct_get_ct_priv(priv);
+	struct flow_rule *rule = flow_cls_offload_flow_rule(f);
 	struct flow_dissector_key_ct *mask, *key;
 	bool trk, est, untrk, unest, new;
 	u32 ctstate = 0, ctstate_mask = 0;
 	u16 ct_state, ct_state_mask;
 	struct flow_match_ct match;
-	if (!flow_rule_match_key(f->rule, FLOW_DISSECTOR_KEY_CT))
+	if (!flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CT))
 		return 0;
 	if (!ct_priv) {
 		return -EOPNOTSUPP;
 	}
-	flow_rule_match_ct(f->rule, &match);
+	flow_rule_match_ct(rule, &match);
 	key = match.key;
 	mask = match.mask;

drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h+3−1

@@ -130,7 +130,9 @@ mlx5_tc_ct_parse_match(struct mlx5e_priv *priv, · 129 unmodified lines
130	struct flow_cls_offload *f,	130	struct flow_cls_offload *f,
131	struct netlink_ext_ack *extack)	131	struct netlink_ext_ack *extack)
132	{	132	{
133	if (!flow_rule_match_key(f->rule, FLOW_DISSECTOR_KEY_CT))	133	struct flow_rule *rule = flow_cls_offload_flow_rule(f);
		134
		135	if (!flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CT))
134	return 0;	136	return 0;
135		137
136	NL_SET_ERR_MSG_MOD(extack, "mlx5 tc ct offload isn't enabled.");	138	NL_SET_ERR_MSG_MOD(extack, "mlx5 tc ct offload isn't enabled.");

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c+1−1

@@ -69,8 +69,8 @@ static void mlx5e_ktls_del(struct net_device *netdev, · 68 unmodified lines
69	struct mlx5e_ktls_offload_context_tx *tx_priv =	69	struct mlx5e_ktls_offload_context_tx *tx_priv =
70	mlx5e_get_ktls_tx_priv_ctx(tls_ctx);	70	mlx5e_get_ktls_tx_priv_ctx(tls_ctx);
71		71
72	mlx5_ktls_destroy_key(priv->mdev, tx_priv->key_id);
73	mlx5e_destroy_tis(priv->mdev, tx_priv->tisn);	72	mlx5e_destroy_tis(priv->mdev, tx_priv->tisn);
		73	mlx5_ktls_destroy_key(priv->mdev, tx_priv->key_id);
74	kvfree(tx_priv);	74	kvfree(tx_priv);
75	}	75	}
76		76

drivers/net/ethernet/mellanox/mlx5/core/en_main.c+7−5

 		mlx5_core_modify_tir(mdev, priv->indir_tir[tt].tirn, in, inlen);
 	}
-	if (!mlx5e_tunnel_inner_ft_supported(priv->mdev))
+	/* Verify inner tirs resources allocated */
+	if (!priv->inner_indir_tir[0].tirn)
 		return;
 	for (tt = 0; tt < MLX5E_NUM_INDIR_TIRS; tt++) {
 	return err;
 }
-void mlx5e_destroy_indirect_tirs(struct mlx5e_priv *priv, bool inner_ttc)
+void mlx5e_destroy_indirect_tirs(struct mlx5e_priv *priv)
 {
 	int i;
 	for (i = 0; i < MLX5E_NUM_INDIR_TIRS; i++)
 		mlx5e_destroy_tir(priv->mdev, &priv->indir_tir[i]);
-	if (!inner_ttc || !mlx5e_tunnel_inner_ft_supported(priv->mdev))
+	/* Verify inner tirs resources allocated */
+	if (!priv->inner_indir_tir[0].tirn)
 		return;
 	for (i = 0; i < MLX5E_NUM_INDIR_TIRS; i++)
 err_destroy_direct_tirs:
 	mlx5e_destroy_direct_tirs(priv, priv->direct_tir);
 err_destroy_indirect_tirs:
-	mlx5e_destroy_indirect_tirs(priv, true);
+	mlx5e_destroy_indirect_tirs(priv);
 err_destroy_direct_rqts:
 	mlx5e_destroy_direct_rqts(priv, priv->direct_tir);
 err_destroy_indirect_rqts:
 	mlx5e_destroy_direct_tirs(priv, priv->xsk_tir);
 	mlx5e_destroy_direct_rqts(priv, priv->xsk_tir);
 	mlx5e_destroy_direct_tirs(priv, priv->direct_tir);
-	mlx5e_destroy_indirect_tirs(priv, true);
+	mlx5e_destroy_indirect_tirs(priv);
 	mlx5e_destroy_direct_rqts(priv, priv->direct_tir);
 	mlx5e_destroy_rqt(priv, &priv->indir_rqt);
 	mlx5e_close_drop_rq(&priv->drop_rq);

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c+4−8

 	return netdev->netdev_ops == &mlx5e_netdev_ops_uplink_rep;
 }
-bool mlx5e_eswitch_rep(struct net_device *netdev)
+bool mlx5e_eswitch_vf_rep(struct net_device *netdev)
 {
-	if (netdev->netdev_ops == &mlx5e_netdev_ops_rep ||
+	return netdev->netdev_ops == &mlx5e_netdev_ops_rep;
-	    netdev->netdev_ops == &mlx5e_netdev_ops_uplink_rep)
-		return true;
-	return false;
 }
 static void mlx5e_build_rep_params(struct net_device *netdev)
 err_destroy_direct_tirs:
 	mlx5e_destroy_direct_tirs(priv, priv->direct_tir);
 err_destroy_indirect_tirs:
-	mlx5e_destroy_indirect_tirs(priv, false);
+	mlx5e_destroy_indirect_tirs(priv);
 err_destroy_direct_rqts:
 	mlx5e_destroy_direct_rqts(priv, priv->direct_tir);
 err_destroy_indirect_rqts:
 	mlx5e_destroy_rep_root_ft(priv);
 	mlx5e_destroy_ttc_table(priv, &priv->fs.ttc);
 	mlx5e_destroy_direct_tirs(priv, priv->direct_tir);
-	mlx5e_destroy_indirect_tirs(priv, false);
+	mlx5e_destroy_indirect_tirs(priv);
 	mlx5e_destroy_direct_rqts(priv, priv->direct_tir);
 	mlx5e_destroy_rqt(priv, &priv->indir_rqt);
 	mlx5e_close_drop_rq(&priv->drop_rq);

drivers/net/ethernet/mellanox/mlx5/core/en_rep.h+6−1

 void mlx5e_rep_queue_neigh_stats_work(struct mlx5e_priv *priv);
-bool mlx5e_eswitch_rep(struct net_device *netdev);
+bool mlx5e_eswitch_vf_rep(struct net_device *netdev);
 bool mlx5e_eswitch_uplink_rep(struct net_device *netdev);
+static inline bool mlx5e_eswitch_rep(struct net_device *netdev)
+{
+	return mlx5e_eswitch_vf_rep(netdev) ||
+	       mlx5e_eswitch_uplink_rep(netdev);
+}
 #else /* CONFIG_MLX5_ESWITCH */
 static inline bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv) { return false; }

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c+33−7

 	return true;
 }
+static bool same_port_devs(struct mlx5e_priv *priv, struct mlx5e_priv *peer_priv)
+{
+	return priv->mdev == peer_priv->mdev;
+}
 static bool same_hw_devs(struct mlx5e_priv *priv, struct mlx5e_priv *peer_priv)
 {
 	struct mlx5_core_dev *fmdev, *pmdev;
 }
-static bool is_merged_eswitch_dev(struct mlx5e_priv *priv,
+static bool is_merged_eswitch_vfs(struct mlx5e_priv *priv,
 				  struct net_device *peer_netdev)
 {
 	struct mlx5e_priv *peer_priv;
 	peer_priv = netdev_priv(peer_netdev);
 	return (MLX5_CAP_ESW(priv->mdev, merged_eswitch) &&
-		mlx5e_eswitch_rep(priv->netdev) &&
+		mlx5e_eswitch_vf_rep(priv->netdev) &&
-		mlx5e_eswitch_rep(peer_netdev) &&
+		mlx5e_eswitch_vf_rep(peer_netdev) &&
 		same_hw_devs(priv, peer_priv));
 }
 bool mlx5e_encap_take(struct mlx5e_encap_entry *e)
 {
 	return refcount_inc_not_zero(&e->refcnt);
 	return err;
 }
+static bool same_hw_reps(struct mlx5e_priv *priv,
+			 struct net_device *peer_netdev)
+{
+	struct mlx5e_priv *peer_priv;
+	peer_priv = netdev_priv(peer_netdev);
+	return mlx5e_eswitch_rep(priv->netdev) &&
+	       mlx5e_eswitch_rep(peer_netdev) &&
+	       same_hw_devs(priv, peer_priv);
+}
+static bool is_lag_dev(struct mlx5e_priv *priv,
+		       struct net_device *peer_netdev)
+{
+	return ((mlx5_lag_is_sriov(priv->mdev) ||
+		 mlx5_lag_is_multipath(priv->mdev)) &&
+		 same_hw_reps(priv, peer_netdev));
+}
 bool mlx5e_is_valid_eswitch_fwd_dev(struct mlx5e_priv *priv,
 				    struct net_device *out_dev)
 {
-	if (is_merged_eswitch_dev(priv, out_dev))
+	if (is_merged_eswitch_vfs(priv, out_dev))
+		return true;
+	if (is_lag_dev(priv, out_dev))
 		return true;
 	return mlx5e_eswitch_rep(out_dev) &&
-	       same_hw_devs(priv, netdev_priv(out_dev));
+	       same_port_devs(priv, netdev_priv(out_dev));
 }
 static bool is_duplicated_output_device(struct net_device *dev,

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c+6−3

 void mlx5e_free_txqsq_descs(struct mlx5e_txqsq *sq)
 {
 	struct mlx5e_tx_wqe_info *wi;
+	u32 dma_fifo_cc, nbytes = 0;
+	u16 ci, sqcc, npkts = 0;
 	struct sk_buff *skb;
-	u32 dma_fifo_cc;
-	u16 sqcc;
-	u16 ci;
 	int i;
 	sqcc = sq->cc;
 		}
 		dev_kfree_skb_any(skb);
+		npkts++;
+		nbytes += wi->num_bytes;
 		sqcc += wi->num_wqebbs;
 	}
 	sq->dma_fifo_cc = dma_fifo_cc;
 	sq->cc = sqcc;
+	netdev_tx_completed_queue(sq->txq, npkts, nbytes);
 }
 #ifdef CONFIG_MLX5_CORE_IPOIB

drivers/net/ethernet/mellanox/mlx5/core/eq.c+3−0

 		.nent = MLX5_NUM_CMD_EQE,
 		.mask[0] = 1ull << MLX5_EVENT_TYPE_CMD,
 	};
+	mlx5_cmd_allowed_opcode(dev, MLX5_CMD_OP_CREATE_EQ);
 	err = setup_async_eq(dev, &table->cmd_eq, &param, "cmd");
 	if (err)
 		goto err1;
 	mlx5_cmd_use_events(dev);
+	mlx5_cmd_allowed_opcode(dev, CMD_ALLOWED_OPCODE_ALL);
 	param = (struct mlx5_eq_param) {
 		.irq_index = 0,
 	mlx5_cmd_use_polling(dev);
 	cleanup_async_eq(dev, &table->cmd_eq, "cmd");
 err1:
+	mlx5_cmd_allowed_opcode(dev, CMD_ALLOWED_OPCODE_ALL);
 	mlx5_eq_notifier_unregister(dev, &table->cq_err_nb);
 	return err;
 }

drivers/net/ethernet/mellanox/mlx5/core/events.c+3−1

 	events->dev = dev;
 	dev->priv.events = events;
 	events->wq = create_singlethread_workqueue("mlx5_events");
-	if (!events->wq)
+	if (!events->wq) {
+		kfree(events);
 		return -ENOMEM;
+	}
 	INIT_WORK(&events->pcie_core_work, mlx5_pcie_event);
 	return 0;

drivers/net/ethernet/mellanox/mlx5/core/fs_core.c+19−11

 		if (node->del_hw_func)
 			node->del_hw_func(node);
 		if (parent_node) {
-			/* Only root namespace doesn't have parent and we just
-			 * need to free its node.
-			 */
 			down_write_ref_node(parent_node, locked);
 			list_del_init(&node->list);
-			if (node->del_sw_func)
-				node->del_sw_func(node);
-			up_write_ref_node(parent_node, locked);
-		} else {
-			kfree(node);
 		}
+		node->del_sw_func(node);
+		if (parent_node)
+			up_write_ref_node(parent_node, locked);
 		node = NULL;
 	}
 	if (!node && parent_node)
 	fs_get_obj(ft, node);
 	rhltable_destroy(&ft->fgs_hash);
-	fs_get_obj(prio, ft->node.parent);
+	if (ft->node.parent) {
-	prio->num_ft--;
+		fs_get_obj(prio, ft->node.parent);
+		prio->num_ft--;
+	}
 	kfree(ft);
 }
 	return 0;
 }
+static void del_sw_root_ns(struct fs_node *node)
+{
+	struct mlx5_flow_root_namespace *root_ns;
+	struct mlx5_flow_namespace *ns;
+	fs_get_obj(ns, node);
+	root_ns = container_of(ns, struct mlx5_flow_root_namespace, ns);
+	mutex_destroy(&root_ns->chain_lock);
+	kfree(node);
+}
 static struct mlx5_flow_root_namespace
 *create_root_ns(struct mlx5_flow_steering *steering,
 		enum fs_flow_table_type table_type)
 	ns = &root_ns->ns;
 	fs_init_namespace(ns);
 	mutex_init(&root_ns->chain_lock);
-	tree_init_node(&ns->node, NULL, NULL);
+	tree_init_node(&ns->node, NULL, del_sw_root_ns);
 	tree_add_node(&ns->node, NULL);
 	return root_ns;

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c+2−2

@@ -396,7 +396,7 @@ static int mlx5i_init_rx(struct mlx5e_priv *priv) · 395 unmodified lines
396	err_destroy_direct_tirs:	396	err_destroy_direct_tirs:
397	mlx5e_destroy_direct_tirs(priv, priv->direct_tir);	397	mlx5e_destroy_direct_tirs(priv, priv->direct_tir);
398	err_destroy_indirect_tirs:	398	err_destroy_indirect_tirs:
399	mlx5e_destroy_indirect_tirs(priv, true);	399	mlx5e_destroy_indirect_tirs(priv);
400	err_destroy_direct_rqts:	400	err_destroy_direct_rqts:
401	mlx5e_destroy_direct_rqts(priv, priv->direct_tir);	401	mlx5e_destroy_direct_rqts(priv, priv->direct_tir);
402	err_destroy_indirect_rqts:	402	err_destroy_indirect_rqts:
@@ -412,7 +412,7 @@ static void mlx5i_cleanup_rx(struct mlx5e_priv *priv) · 9 unmodified lines
412	{	412	{
413	mlx5i_destroy_flow_steering(priv);	413	mlx5i_destroy_flow_steering(priv);
414	mlx5e_destroy_direct_tirs(priv, priv->direct_tir);	414	mlx5e_destroy_direct_tirs(priv, priv->direct_tir);
415	mlx5e_destroy_indirect_tirs(priv, true);	415	mlx5e_destroy_indirect_tirs(priv);
416	mlx5e_destroy_direct_rqts(priv, priv->direct_tir);	416	mlx5e_destroy_direct_rqts(priv, priv->direct_tir);
417	mlx5e_destroy_rqt(priv, &priv->indir_rqt);	417	mlx5e_destroy_rqt(priv, &priv->indir_rqt);
418	mlx5e_close_drop_rq(&priv->drop_rq);	418	mlx5e_close_drop_rq(&priv->drop_rq);

drivers/net/ethernet/mellanox/mlx5/core/main.c+6−1

 		goto err_cmd_cleanup;
 	}
+	mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_UP);
 	err = mlx5_core_enable_hca(dev, 0);
 	if (err) {
 		mlx5_core_err(dev, "enable hca failed\n");
 err_disable_hca:
 	mlx5_core_disable_hca(dev, 0);
 err_cmd_cleanup:
+	mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_DOWN);
 	mlx5_cmd_cleanup(dev);
 	return err;
 	}
 	mlx5_reclaim_startup_pages(dev);
 	mlx5_core_disable_hca(dev, 0);
+	mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_DOWN);
 	mlx5_cmd_cleanup(dev);
 	return 0;
 	err = mlx5_function_setup(dev, boot);
 	if (err)
-		goto out;
+		goto err_function;
 	if (boot) {
 		err = mlx5_init_once(dev);
 		mlx5_cleanup_once(dev);
 function_teardown:
 	mlx5_function_teardown(dev, boot);
+err_function:
 	dev->state = MLX5_DEVICE_STATE_INTERNAL_ERROR;
 	mutex_unlock(&dev->intf_state_mutex);

drivers/net/ethernet/mellanox/mlxsw/spectrum.c+12−2

 			mlxsw_sp_port_remove(mlxsw_sp, i);
 	mlxsw_sp_cpu_port_remove(mlxsw_sp);
 	kfree(mlxsw_sp->ports);
+	mlxsw_sp->ports = NULL;
 }
 static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp)
 	mlxsw_sp_cpu_port_remove(mlxsw_sp);
 err_cpu_port_create:
 	kfree(mlxsw_sp->ports);
+	mlxsw_sp->ports = NULL;
 	return err;
 }
 	return mlxsw_core_res_get(mlxsw_core, local_ports_in_x_res_id);
 }
+static struct mlxsw_sp_port *
+mlxsw_sp_port_get_by_local_port(struct mlxsw_sp *mlxsw_sp, u8 local_port)
+{
+	if (mlxsw_sp->ports && mlxsw_sp->ports[local_port])
+		return mlxsw_sp->ports[local_port];
+	return NULL;
+}
 static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,
 			       unsigned int count,
 			       struct netlink_ext_ack *extack)
 	int i;
 	int err;
-	mlxsw_sp_port = mlxsw_sp->ports[local_port];
+	mlxsw_sp_port = mlxsw_sp_port_get_by_local_port(mlxsw_sp, local_port);
 	if (!mlxsw_sp_port) {
 		dev_err(mlxsw_sp->bus_info->dev, "Port number \"%d\" does not exist\n",
 			local_port);
 	int offset;
 	int i;
-	mlxsw_sp_port = mlxsw_sp->ports[local_port];
+	mlxsw_sp_port = mlxsw_sp_port_get_by_local_port(mlxsw_sp, local_port);
 	if (!mlxsw_sp_port) {
 		dev_err(mlxsw_sp->bus_info->dev, "Port number \"%d\" does not exist\n",
 			local_port);

drivers/net/ethernet/mellanox/mlxsw/switchx2.c+8−0

 		if (mlxsw_sx_port_created(mlxsw_sx, i))
 			mlxsw_sx_port_remove(mlxsw_sx, i);
 	kfree(mlxsw_sx->ports);
+	mlxsw_sx->ports = NULL;
 }
 static int mlxsw_sx_ports_create(struct mlxsw_sx *mlxsw_sx)
 		if (mlxsw_sx_port_created(mlxsw_sx, i))
 			mlxsw_sx_port_remove(mlxsw_sx, i);
 	kfree(mlxsw_sx->ports);
+	mlxsw_sx->ports = NULL;
 	return err;
 }
 	u8 module, width;
 	int err;
+	if (!mlxsw_sx->ports || !mlxsw_sx->ports[local_port]) {
+		dev_err(mlxsw_sx->bus_info->dev, "Port number \"%d\" does not exist\n",
+			local_port);
+		return -EINVAL;
+	}
 	if (new_type == DEVLINK_PORT_TYPE_AUTO)
 		return -EOPNOTSUPP;

drivers/net/ethernet/microchip/encx24j600.c+4−1

 	if (unlikely(ret)) {
 		netif_err(priv, probe, ndev, "Error %d initializing card encx24j600 card\n",
 			  ret);
-		goto out_free;
+		goto out_stop;
 	}
 	eidled = encx24j600_read_reg(priv, EIDLED);
 out_unregister:
 	unregister_netdev(priv->ndev);
+out_stop:
+	kthread_stop(priv->kworker_task);
 out_free:
 	free_netdev(ndev);
 	struct encx24j600_priv *priv = dev_get_drvdata(&spi->dev);
 	unregister_netdev(priv->ndev);
+	kthread_stop(priv->kworker_task);
 	free_netdev(priv->ndev);

drivers/net/ethernet/mscc/ocelot.c+1−1

@@ -1467,7 +1467,7 @@ static void ocelot_port_attr_ageing_set(struct ocelot *ocelot, int port, · 1466 unmodified lines
1467	unsigned long ageing_clock_t)	1467	unsigned long ageing_clock_t)
1468	{	1468	{
1469	unsigned long ageing_jiffies = clock_t_to_jiffies(ageing_clock_t);	1469	unsigned long ageing_jiffies = clock_t_to_jiffies(ageing_clock_t);
1470	u32 ageing_time = jiffies_to_msecs(ageing_jiffies) / 1000;	1470	u32 ageing_time = jiffies_to_msecs(ageing_jiffies);
1471		1471
1472	ocelot_set_ageing_time(ocelot, ageing_time);	1472	ocelot_set_ageing_time(ocelot, ageing_time);
1473	}	1473	}

drivers/net/ethernet/netronome/nfp/abm/main.c+3−1

 		goto err_free_alink;
 	alink->prio_map = kzalloc(abm->prio_map_len, GFP_KERNEL);
-	if (!alink->prio_map)
+	if (!alink->prio_map) {
+		err = -ENOMEM;
 		goto err_free_alink;
+	}
 	/* This is a multi-host app, make sure MAC/PHY is up, but don't
 	 * make the MAC/PHY state follow the state of any of the ports.

drivers/net/ethernet/pensando/ionic/ionic_lif.c+12−7

 	dev_info(ionic->dev, "FW Up: restarting LIFs\n");
 	ionic_init_devinfo(ionic);
+	ionic_port_init(ionic);
 	err = ionic_qcqs_alloc(lif);
 	if (err)
 		goto err_out;
 	if (is_zero_ether_addr(ctx.comp.lif_getattr.mac))
 		return 0;
-	if (!ether_addr_equal(ctx.comp.lif_getattr.mac, netdev->dev_addr)) {
+	if (!is_zero_ether_addr(netdev->dev_addr)) {
+		/* If the netdev mac is non-zero and doesn't match the default
+		 * device address, it was set by something earlier and we're
+		 * likely here again after a fw-upgrade reset.  We need to be
+		 * sure the netdev mac is in our filter list.
+		 */
+		if (!ether_addr_equal(ctx.comp.lif_getattr.mac,
+				      netdev->dev_addr))
+			ionic_lif_addr(lif, netdev->dev_addr, true);
+	} else {
+		/* Update the netdev mac with the device's mac */
 		memcpy(addr.sa_data, ctx.comp.lif_getattr.mac, netdev->addr_len);
 		addr.sa_family = AF_INET;
 		err = eth_prepare_mac_addr_change(netdev, &addr);
 			return 0;
 		}
-		if (!is_zero_ether_addr(netdev->dev_addr)) {
-			netdev_dbg(lif->netdev, "deleting station MAC addr %pM\n",
-				   netdev->dev_addr);
-			ionic_lif_addr(lif, netdev->dev_addr, false);
-		}
 		eth_commit_mac_addr_change(netdev, &addr);
 	}

drivers/net/ethernet/pensando/ionic/ionic_main.c+9−9

 	size_t sz;
 	int err;
-	if (idev->port_info)
-		return 0;
-	idev->port_info_sz = ALIGN(sizeof(*idev->port_info), PAGE_SIZE);
-	idev->port_info = dma_alloc_coherent(ionic->dev, idev->port_info_sz,
-					     &idev->port_info_pa,
-					     GFP_KERNEL);
 	if (!idev->port_info) {
-		dev_err(ionic->dev, "Failed to allocate port info, aborting\n");
+		idev->port_info_sz = ALIGN(sizeof(*idev->port_info), PAGE_SIZE);
-		return -ENOMEM;
+		idev->port_info = dma_alloc_coherent(ionic->dev,
+						     idev->port_info_sz,
+						     &idev->port_info_pa,
+						     GFP_KERNEL);
+		if (!idev->port_info) {
+			dev_err(ionic->dev, "Failed to allocate port info\n");
+			return -ENOMEM;
+		}
 	}
 	sz = min(sizeof(ident->port.config), sizeof(idev->dev_cmd_regs->data));

drivers/net/ethernet/realtek/r8169_main.c+17−2

 		RTL_R32(tp, EPHYAR) & EPHYAR_DATA_MASK : ~0;
 }
+static void r8168fp_adjust_ocp_cmd(struct rtl8169_private *tp, u32 *cmd, int type)
+{
+	/* based on RTL8168FP_OOBMAC_BASE in vendor driver */
+	if (tp->mac_version == RTL_GIGA_MAC_VER_52 && type == ERIAR_OOB)
+		*cmd |= 0x7f0 << 18;
+}
 DECLARE_RTL_COND(rtl_eriar_cond)
 {
 	return RTL_R32(tp, ERIAR) & ERIAR_FLAG;
 static void _rtl_eri_write(struct rtl8169_private *tp, int addr, u32 mask,
 			   u32 val, int type)
 {
+	u32 cmd = ERIAR_WRITE_CMD | type | mask | addr;
 	BUG_ON((addr & 3) || (mask == 0));
 	RTL_W32(tp, ERIDR, val);
-	RTL_W32(tp, ERIAR, ERIAR_WRITE_CMD | type | mask | addr);
+	r8168fp_adjust_ocp_cmd(tp, &cmd, type);
+	RTL_W32(tp, ERIAR, cmd);
 	rtl_udelay_loop_wait_low(tp, &rtl_eriar_cond, 100, 100);
 }
 static u32 _rtl_eri_read(struct rtl8169_private *tp, int addr, int type)
 {
-	RTL_W32(tp, ERIAR, ERIAR_READ_CMD | type | ERIAR_MASK_1111 | addr);
+	u32 cmd = ERIAR_READ_CMD | type | ERIAR_MASK_1111 | addr;
+	r8168fp_adjust_ocp_cmd(tp, &cmd, type);
+	RTL_W32(tp, ERIAR, cmd);
 	return rtl_udelay_loop_wait_high(tp, &rtl_eriar_cond, 100, 100) ?
 		RTL_R32(tp, ERIDR) : ~0;
 		{ 0x7cf, 0x348,	RTL_GIGA_MAC_VER_07 },
 		{ 0x7cf, 0x248,	RTL_GIGA_MAC_VER_07 },
 		{ 0x7cf, 0x340,	RTL_GIGA_MAC_VER_13 },
+		/* RTL8401, reportedly works if treated as RTL8101e */
+		{ 0x7cf, 0x240,	RTL_GIGA_MAC_VER_13 },
 		{ 0x7cf, 0x343,	RTL_GIGA_MAC_VER_10 },
 		{ 0x7cf, 0x342,	RTL_GIGA_MAC_VER_16 },
 		{ 0x7c8, 0x348,	RTL_GIGA_MAC_VER_09 },

drivers/net/ethernet/sgi/ioc3-eth.c+4−4

@@ -848,14 +848,14 @@ static int ioc3eth_probe(struct platform_device *pdev) · 847 unmodified lines
848	ip = netdev_priv(dev);	848	ip = netdev_priv(dev);
849	ip->dma_dev = pdev->dev.parent;	849	ip->dma_dev = pdev->dev.parent;
850	ip->regs = devm_platform_ioremap_resource(pdev, 0);	850	ip->regs = devm_platform_ioremap_resource(pdev, 0);
851	if (!ip->regs) {	851	if (IS_ERR(ip->regs)) {
852	err = -ENOMEM;	852	err = PTR_ERR(ip->regs);
853	goto out_free;	853	goto out_free;
854	}	854	}
855		855
856	ip->ssram = devm_platform_ioremap_resource(pdev, 1);	856	ip->ssram = devm_platform_ioremap_resource(pdev, 1);
857	if (!ip->ssram) {	857	if (IS_ERR(ip->ssram)) {
858	err = -ENOMEM;	858	err = PTR_ERR(ip->ssram);
859	goto out_free;	859	goto out_free;
860	}	860	}
861		861

drivers/net/ethernet/smsc/smsc911x.c+5−4

 	retval = smsc911x_init(dev);
 	if (retval < 0)
-		goto out_disable_resources;
+		goto out_init_fail;
 	netif_carrier_off(dev);
 	retval = smsc911x_mii_init(pdev, dev);
 	if (retval) {
 		SMSC_WARN(pdata, probe, "Error %i initialising mii", retval);
-		goto out_disable_resources;
+		goto out_init_fail;
 	}
 	retval = register_netdev(dev);
 	if (retval) {
 		SMSC_WARN(pdata, probe, "Error %i registering device", retval);
-		goto out_disable_resources;
+		goto out_init_fail;
 	} else {
 		SMSC_TRACE(pdata, probe,
 			   "Network interface: \"%s\"", dev->name);
 	return 0;
-out_disable_resources:
+out_init_fail:
 	pm_runtime_put(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
+out_disable_resources:
 	(void)smsc911x_disable_resources(pdev);
 out_enable_resources_fail:
 	smsc911x_free_resources(pdev);

drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c+13−0

@@ -319,6 +319,19 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) · 318 unmodified lines
319	/* Enable PTP clock */	319	/* Enable PTP clock */
320	regmap_read(gmac->nss_common, NSS_COMMON_CLK_GATE, &val);	320	regmap_read(gmac->nss_common, NSS_COMMON_CLK_GATE, &val);
321	val \|= NSS_COMMON_CLK_GATE_PTP_EN(gmac->id);	321	val \|= NSS_COMMON_CLK_GATE_PTP_EN(gmac->id);
		322	switch (gmac->phy_mode) {
		323	case PHY_INTERFACE_MODE_RGMII:
		324	val \|= NSS_COMMON_CLK_GATE_RGMII_RX_EN(gmac->id) \|
		325	NSS_COMMON_CLK_GATE_RGMII_TX_EN(gmac->id);
		326	break;
		327	case PHY_INTERFACE_MODE_SGMII:
		328	val \|= NSS_COMMON_CLK_GATE_GMII_RX_EN(gmac->id) \|
		329	NSS_COMMON_CLK_GATE_GMII_TX_EN(gmac->id);
		330	break;
		331	default:
		332	/* We don't get here; the switch above will have errored out */
		333	unreachable();
		334	}
322	regmap_write(gmac->nss_common, NSS_COMMON_CLK_GATE, val);	335	regmap_write(gmac->nss_common, NSS_COMMON_CLK_GATE, val);
323		336
324	if (gmac->phy_mode == PHY_INTERFACE_MODE_SGMII) {	337	if (gmac->phy_mode == PHY_INTERFACE_MODE_SGMII) {

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c+15−2

 	unsigned int value;
 };
+struct ethqos_emac_driver_data {
+	const struct ethqos_emac_por *por;
+	unsigned int num_por;
+};
 struct qcom_ethqos {
 	struct platform_device *pdev;
 	void __iomem *rgmii_base;
 	{ .offset = RGMII_IO_MACRO_CONFIG2,	.value = 0x00002060 },
 };
+static const struct ethqos_emac_driver_data emac_v2_3_0_data = {
+	.por = emac_v2_3_0_por,
+	.num_por = ARRAY_SIZE(emac_v2_3_0_por),
+};
 static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
 {
 	unsigned int val;
 	struct device_node *np = pdev->dev.of_node;
 	struct plat_stmmacenet_data *plat_dat;
 	struct stmmac_resources stmmac_res;
+	const struct ethqos_emac_driver_data *data;
 	struct qcom_ethqos *ethqos;
 	struct resource *res;
 	int ret;
 		goto err_mem;
 	}
-	ethqos->por = of_device_get_match_data(&pdev->dev);
+	data = of_device_get_match_data(&pdev->dev);
+	ethqos->por = data->por;
+	ethqos->num_por = data->num_por;
 	ethqos->rgmii_clk = devm_clk_get(&pdev->dev, "rgmii");
 	if (IS_ERR(ethqos->rgmii_clk)) {
 }
 static const struct of_device_id qcom_ethqos_match[] = {
-	{ .compatible = "qcom,qcs404-ethqos", .data = &emac_v2_3_0_por},
+	{ .compatible = "qcom,qcs404-ethqos", .data = &emac_v2_3_0_data},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, qcom_ethqos_match);

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c+2−2

 			return ret;
 	}
-	netif_device_attach(ndev);
 	mutex_lock(&priv->lock);
 	stmmac_reset_queues_param(priv);
 	phylink_mac_change(priv->phylink, true);
+	netif_device_attach(ndev);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(stmmac_resume);

drivers/net/ethernet/sun/cassini.c+1−2

 					  cas_cacheline_size)) {
 			dev_err(&pdev->dev, "Could not set PCI cache "
 			       "line size\n");
-			goto err_write_cacheline;
+			goto err_out_free_res;
 		}
 	}
 #endif
 err_out_free_res:
 	pci_release_regions(pdev);
-err_write_cacheline:
 	/* Try to restore it in case the error occurred after we
 	 * set it.
 	 */

drivers/net/ethernet/ti/Kconfig+6−10

 config TI_CPSW
 	tristate "TI CPSW Switch Support"
 	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST
+	depends on TI_CPTS || !TI_CPTS
 	select TI_DAVINCI_MDIO
 	select MFD_SYSCON
 	select PAGE_POOL
 	tristate "TI CPSW Switch Support with switchdev"
 	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST
 	depends on NET_SWITCHDEV
+	depends on TI_CPTS || !TI_CPTS
 	select PAGE_POOL
 	select TI_DAVINCI_MDIO
 	select MFD_SYSCON
 	  will be called cpsw_new.
 config TI_CPTS
-	bool "TI Common Platform Time Sync (CPTS) Support"
+	tristate "TI Common Platform Time Sync (CPTS) Support"
-	depends on TI_CPSW || TI_KEYSTONE_NETCP || TI_CPSW_SWITCHDEV || COMPILE_TEST
+	depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST
 	depends on COMMON_CLK
-	depends on POSIX_TIMERS
+	depends on PTP_1588_CLOCK
 	---help---
 	  This driver supports the Common Platform Time Sync unit of
 	  the CPSW Ethernet Switch and Keystone 2 1g/10g Switch Subsystem.
 	  The unit can time stamp PTP UDP/IPv4 and Layer 2 packets, and the
 	  driver offers a PTP Hardware Clock.
-config TI_CPTS_MOD
-	tristate
-	depends on TI_CPTS
-	depends on PTP_1588_CLOCK
-	default y if TI_CPSW=y || TI_KEYSTONE_NETCP=y || TI_CPSW_SWITCHDEV=y
-	default m
 config TI_K3_AM65_CPSW_NUSS
 	tristate "TI K3 AM654x/J721E CPSW Ethernet driver"
 	depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER
 	select TI_DAVINCI_MDIO
 	depends on OF
 	depends on KEYSTONE_NAVIGATOR_DMA && KEYSTONE_NAVIGATOR_QMSS
+	depends on TI_CPTS || !TI_CPTS
 	---help---
 	  This driver supports TI's Keystone NETCP Core.

drivers/net/ethernet/ti/Makefile+1−1

@@ -13,7 +13,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += ti_davinci_emac.o · 12 unmodified lines
13	ti_davinci_emac-y := davinci_emac.o davinci_cpdma.o	13	ti_davinci_emac-y := davinci_emac.o davinci_cpdma.o
14	obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o	14	obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
15	obj-$(CONFIG_TI_CPSW_PHY_SEL) += cpsw-phy-sel.o	15	obj-$(CONFIG_TI_CPSW_PHY_SEL) += cpsw-phy-sel.o
16	obj-$(CONFIG_TI_CPTS_MOD) += cpts.o	16	obj-$(CONFIG_TI_CPTS) += cpts.o
17	obj-$(CONFIG_TI_CPSW) += ti_cpsw.o	17	obj-$(CONFIG_TI_CPSW) += ti_cpsw.o
18	ti_cpsw-y := cpsw.o davinci_cpdma.o cpsw_ale.o cpsw_priv.o cpsw_sl.o cpsw_ethtool.o	18	ti_cpsw-y := cpsw.o davinci_cpdma.o cpsw_ale.o cpsw_priv.o cpsw_sl.o cpsw_ethtool.o
19	obj-$(CONFIG_TI_CPSW_SWITCHDEV) += ti_cpsw_new.o	19	obj-$(CONFIG_TI_CPSW_SWITCHDEV) += ti_cpsw_new.o

drivers/net/ethernet/ti/am65-cpsw-nuss.c+2−1

@@ -1895,8 +1895,9 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev) · 1894 unmodified lines
1895	ale_params.nu_switch_ale = true;	1895	ale_params.nu_switch_ale = true;
1896		1896
1897	common->ale = cpsw_ale_create(&ale_params);	1897	common->ale = cpsw_ale_create(&ale_params);
1898	if (!common->ale) {	1898	if (IS_ERR(common->ale)) {
1899	dev_err(dev, "error initializing ale engine\n");	1899	dev_err(dev, "error initializing ale engine\n");
		1900	ret = PTR_ERR(common->ale);
1900	goto err_of_clear;	1901	goto err_of_clear;
1901	}	1902	}
1902		1903

drivers/net/ethernet/ti/cpsw.c+4−0

 	struct cpsw_common *cpsw = dev_get_drvdata(dev);
 	int i;
+	rtnl_lock();
 	for (i = 0; i < cpsw->data.slaves; i++)
 		if (cpsw->slaves[i].ndev)
 			if (netif_running(cpsw->slaves[i].ndev))
 				cpsw_ndo_stop(cpsw->slaves[i].ndev);
+	rtnl_unlock();
 	/* Select sleep pin state */
 	pinctrl_pm_select_sleep_state(dev);

drivers/net/ethernet/ti/cpsw_ale.c+1−1

@@ -955,7 +955,7 @@ struct cpsw_ale cpsw_ale_create(struct cpsw_ale_params params) · 954 unmodified lines
955		955
956	ale = devm_kzalloc(params->dev, sizeof(*ale), GFP_KERNEL);	956	ale = devm_kzalloc(params->dev, sizeof(*ale), GFP_KERNEL);
957	if (!ale)	957	if (!ale)
958	return NULL;	958	return ERR_PTR(-ENOMEM);
959		959
960	ale->p0_untag_vid_mask =	960	ale->p0_untag_vid_mask =
961	devm_kmalloc_array(params->dev, BITS_TO_LONGS(VLAN_N_VID),	961	devm_kmalloc_array(params->dev, BITS_TO_LONGS(VLAN_N_VID),

drivers/net/ethernet/ti/cpsw_priv.c+2−2

@@ -490,9 +490,9 @@ int cpsw_init_common(struct cpsw_common cpsw, void __iomem ss_regs, · 489 unmodified lines
490	ale_params.ale_ports = CPSW_ALE_PORTS_NUM;	490	ale_params.ale_ports = CPSW_ALE_PORTS_NUM;
491		491
492	cpsw->ale = cpsw_ale_create(&ale_params);	492	cpsw->ale = cpsw_ale_create(&ale_params);
493	if (!cpsw->ale) {	493	if (IS_ERR(cpsw->ale)) {
494	dev_err(dev, "error initializing ale engine\n");	494	dev_err(dev, "error initializing ale engine\n");
495	return -ENODEV;	495	return PTR_ERR(cpsw->ale);
496	}	496	}
497		497
498	dma_params.dev = dev;	498	dma_params.dev = dev;

drivers/net/ethernet/ti/netcp_ethss.c+2−2

@@ -3704,9 +3704,9 @@ static int gbe_probe(struct netcp_device netcp_device, struct device dev, · 3703 unmodified lines
3704	ale_params.nu_switch_ale = true;	3704	ale_params.nu_switch_ale = true;
3705	}	3705	}
3706	gbe_dev->ale = cpsw_ale_create(&ale_params);	3706	gbe_dev->ale = cpsw_ale_create(&ale_params);
3707	if (!gbe_dev->ale) {	3707	if (IS_ERR(gbe_dev->ale)) {
3708	dev_err(gbe_dev->dev, "error initializing ale engine\n");	3708	dev_err(gbe_dev->dev, "error initializing ale engine\n");
3709	ret = -ENODEV;	3709	ret = PTR_ERR(gbe_dev->ale);
3710	goto free_sec_ports;	3710	goto free_sec_ports;
3711	} else {	3711	} else {
3712	dev_dbg(gbe_dev->dev, "Created a gbe ale engine\n");	3712	dev_dbg(gbe_dev->dev, "Created a gbe ale engine\n");

drivers/net/hamradio/bpqether.c+2−1

@@ -127,7 +127,8 @@ static inline struct net_device bpq_get_ax25_dev(struct net_device dev) · 126 unmodified lines
127	{	127	{
128	struct bpqdev *bpq;	128	struct bpqdev *bpq;
129		129
130	list_for_each_entry_rcu(bpq, &bpq_devices, bpq_list) {	130	list_for_each_entry_rcu(bpq, &bpq_devices, bpq_list,
		131	lockdep_rtnl_is_held()) {
131	if (bpq->ethdev == dev)	132	if (bpq->ethdev == dev)
132	return bpq->axdev;	133	return bpq->axdev;
133	}	134	}

drivers/net/ipa/gsi.c+1−0

@@ -1392,6 +1392,7 @@ static int gsi_channel_poll(struct napi_struct *napi, int budget) · 1391 unmodified lines
1392	while (count < budget) {	1392	while (count < budget) {
1393	struct gsi_trans *trans;	1393	struct gsi_trans *trans;
1394		1394
		1395	count++;
1395	trans = gsi_channel_poll_one(channel);	1396	trans = gsi_channel_poll_one(channel);
1396	if (!trans)	1397	if (!trans)
1397	break;	1398	break;

drivers/net/ipa/gsi_trans.c+3−2

 	/* assert(which < trans->tre_count); */
 	/* Set the page information for the buffer.  We also need to fill in
-	 * the DMA address for the buffer (something dma_map_sg() normally
+	 * the DMA address and length for the buffer (something dma_map_sg()
-	 * does).
+	 * normally does).
 	 */
 	sg = &trans->sgl[which];
 	sg_set_buf(sg, buf, size);
 	sg_dma_address(sg) = addr;
+	sg_dma_len(sg) = sg->length;
 	info = &trans->info[which];
 	info->opcode = opcode;

drivers/net/ipa/ipa_cmd.c+3−11

 void ipa_cmd_tag_process_add(struct gsi_trans *trans)
 {
-	ipa_cmd_register_write_add(trans, 0, 0, 0, true);
-#if 1
-	/* Reference these functions to avoid a compile error */
-	(void)ipa_cmd_ip_packet_init_add;
-	(void)ipa_cmd_ip_tag_status_add;
-	(void) ipa_cmd_transfer_add;
-#else
 	struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi);
-	struct gsi_endpoint *endpoint;
+	struct ipa_endpoint *endpoint;
 	endpoint = ipa->name_map[IPA_ENDPOINT_AP_LAN_RX];
-	ipa_cmd_ip_packet_init_add(trans, endpoint->endpoint_id);
+	ipa_cmd_register_write_add(trans, 0, 0, 0, true);
+	ipa_cmd_ip_packet_init_add(trans, endpoint->endpoint_id);
 	ipa_cmd_ip_tag_status_add(trans, 0xcba987654321);
 	ipa_cmd_transfer_add(trans, 4);
-#endif
 }
 /* Returns the number of commands required for the tag process */

drivers/net/ipa/ipa_smp2p.c+1−1

@@ -53,7 +53,7 @@ · 52 unmodified lines
53	* @clock_on: Whether IPA clock is on	53	* @clock_on: Whether IPA clock is on
54	* @notified: Whether modem has been notified of clock state	54	* @notified: Whether modem has been notified of clock state
55	* @disabled: Whether setup ready interrupt handling is disabled	55	* @disabled: Whether setup ready interrupt handling is disabled
56	* @mutex mutex: Motex protecting ready interrupt/shutdown interlock	56	* @mutex: Mutex protecting ready-interrupt/shutdown interlock
57	* @panic_notifier: Panic notifier structure	57	* @panic_notifier: Panic notifier structure
58	*/	58	*/
59	struct ipa_smp2p {	59	struct ipa_smp2p {

drivers/net/netdevsim/dev.c+1−2

@@ -858,8 +858,7 @@ nsim_dev_devlink_trap_policer_counter_get(struct devlink *devlink, · 857 unmodified lines
858	return -EINVAL;	858	return -EINVAL;
859		859
860	cnt = &nsim_dev->trap_data->trap_policers_cnt_arr[policer->id - 1];	860	cnt = &nsim_dev->trap_data->trap_policers_cnt_arr[policer->id - 1];
861	p_drops = cnt;	861	p_drops = (cnt)++;
862	*cnt += jiffies % 64;
863		862
864	return 0;	863	return 0;
865	}	864	}

drivers/net/phy/broadcom.c+6−2

 	else
 		val |= BCM54XX_SHD_SCR3_DLLAPD_DIS;
-	if (phydev->dev_flags & PHY_BRCM_DIS_TXCRXC_NOENRGY)
+	if (phydev->dev_flags & PHY_BRCM_DIS_TXCRXC_NOENRGY) {
-		val |= BCM54XX_SHD_SCR3_TRDDAPD;
+		if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810)
+			val |= BCM54810_SHD_SCR3_TRDDAPD;
+		else
+			val |= BCM54XX_SHD_SCR3_TRDDAPD;
+	}
 	if (orig != val)
 		bcm_phy_write_shadow(phydev, BCM54XX_SHD_SCR3, val);

drivers/net/phy/mscc/mscc.h+2−0

 	u64 *stats;
 	int nstats;
 	bool pkg_init;
+	/* PHY address within the package. */
+	u8 addr;
 	/* For multiple port PHYs; the MDIO address of the base PHY in the
 	 * package.
 	 */

drivers/net/phy/mscc/mscc_mac.h+3−3

@@ -152,8 +152,8 @@ · 151 unmodified lines
152	#define MSCC_MAC_PAUSE_CFG_STATE_PAUSE_STATE BIT(0)	152	#define MSCC_MAC_PAUSE_CFG_STATE_PAUSE_STATE BIT(0)
153	#define MSCC_MAC_PAUSE_CFG_STATE_MAC_TX_PAUSE_GEN BIT(4)	153	#define MSCC_MAC_PAUSE_CFG_STATE_MAC_TX_PAUSE_GEN BIT(4)
154		154
155	#define MSCC_PROC_0_IP_1588_TOP_CFG_STAT_MODE_CTL 0x2	155	#define MSCC_PROC_IP_1588_TOP_CFG_STAT_MODE_CTL 0x2
156	#define MSCC_PROC_0_IP_1588_TOP_CFG_STAT_MODE_CTL_PROTOCOL_MODE(x) (x)	156	#define MSCC_PROC_IP_1588_TOP_CFG_STAT_MODE_CTL_PROTOCOL_MODE(x) (x)
157	#define MSCC_PROC_0_IP_1588_TOP_CFG_STAT_MODE_CTL_PROTOCOL_MODE_M GENMASK(2, 0)	157	#define MSCC_PROC_IP_1588_TOP_CFG_STAT_MODE_CTL_PROTOCOL_MODE_M GENMASK(2, 0)
158		158
159	#endif /* _MSCC_PHY_LINE_MAC_H_ */	159	#endif /* _MSCC_PHY_LINE_MAC_H_ */

drivers/net/phy/mscc/mscc_macsec.c+10−6

@@ -316,6 +316,8 @@ static void vsc8584_macsec_mac_init(struct phy_device *phydev, · 315 unmodified lines
316	/* Must be called with mdio_lock taken */	316	/* Must be called with mdio_lock taken */
317	static int __vsc8584_macsec_init(struct phy_device *phydev)	317	static int __vsc8584_macsec_init(struct phy_device *phydev)
318	{	318	{
		319	struct vsc8531_private *priv = phydev->priv;
		320	enum macsec_bank proc_bank;
319	u32 val;	321	u32 val;
320		322
321	vsc8584_macsec_block_init(phydev, MACSEC_INGR);	323	vsc8584_macsec_block_init(phydev, MACSEC_INGR);
@@ -351,12 +353,14 @@ static int __vsc8584_macsec_init(struct phy_device *phydev) · 29 unmodified lines
351	val \|= MSCC_FCBUF_ENA_CFG_TX_ENA \| MSCC_FCBUF_ENA_CFG_RX_ENA;	353	val \|= MSCC_FCBUF_ENA_CFG_TX_ENA \| MSCC_FCBUF_ENA_CFG_RX_ENA;
352	vsc8584_macsec_phy_write(phydev, FC_BUFFER, MSCC_FCBUF_ENA_CFG, val);	354	vsc8584_macsec_phy_write(phydev, FC_BUFFER, MSCC_FCBUF_ENA_CFG, val);
353		355
354	val = vsc8584_macsec_phy_read(phydev, IP_1588,	356	proc_bank = (priv->addr < 2) ? PROC_0 : PROC_2;
355	MSCC_PROC_0_IP_1588_TOP_CFG_STAT_MODE_CTL);	357
356	val &= ~MSCC_PROC_0_IP_1588_TOP_CFG_STAT_MODE_CTL_PROTOCOL_MODE_M;	358	val = vsc8584_macsec_phy_read(phydev, proc_bank,
357	val \|= MSCC_PROC_0_IP_1588_TOP_CFG_STAT_MODE_CTL_PROTOCOL_MODE(4);	359	MSCC_PROC_IP_1588_TOP_CFG_STAT_MODE_CTL);
358	vsc8584_macsec_phy_write(phydev, IP_1588,	360	val &= ~MSCC_PROC_IP_1588_TOP_CFG_STAT_MODE_CTL_PROTOCOL_MODE_M;
359	MSCC_PROC_0_IP_1588_TOP_CFG_STAT_MODE_CTL, val);	361	val \|= MSCC_PROC_IP_1588_TOP_CFG_STAT_MODE_CTL_PROTOCOL_MODE(4);
		362	vsc8584_macsec_phy_write(phydev, proc_bank,
		363	MSCC_PROC_IP_1588_TOP_CFG_STAT_MODE_CTL, val);
360		364
361	return 0;	365	return 0;
362	}	366	}

drivers/net/phy/mscc/mscc_macsec.h+2−1

 	FC_BUFFER   = 0x04,
 	HOST_MAC    = 0x05,
 	LINE_MAC    = 0x06,
-	IP_1588     = 0x0e,
+	PROC_0      = 0x0e,
+	PROC_2      = 0x0f,
 	MACSEC_INGR = 0x38,
 	MACSEC_EGR  = 0x3c,
 };

drivers/net/phy/mscc/mscc_main.c+4−0

 	else
 		vsc8531->base_addr = phydev->mdio.addr - addr;
+	vsc8531->addr = addr;
 	/* Some parts of the init sequence are identical for every PHY in the
 	 * package. Some parts are modifying the GPIO register bank which is a
 	 * set of registers that are affecting all PHYs, a few resetting the
 	else
 		vsc8531->base_addr = phydev->mdio.addr - addr;
+	vsc8531->addr = addr;
 	/* Some parts of the init sequence are identical for every PHY in the
 	 * package. Some parts are modifying the GPIO register bank which is a
 	 * set of registers that are affecting all PHYs, a few resetting the

drivers/net/phy/phy.c+5−3

 		/* Restart autonegotiation so the new modes get sent to the
 		 * link partner.
 		 */
-		ret = phy_restart_aneg(phydev);
+		if (phydev->autoneg == AUTONEG_ENABLE) {
-		if (ret < 0)
+			ret = phy_restart_aneg(phydev);
-			return ret;
+			if (ret < 0)
+				return ret;
+		}
 	}
 	return 0;

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

@@ -1233,7 +1233,7 @@ int phy_sfp_probe(struct phy_device *phydev, · 1232 unmodified lines
1233	const struct sfp_upstream_ops *ops)	1233	const struct sfp_upstream_ops *ops)
1234	{	1234	{
1235	struct sfp_bus *bus;	1235	struct sfp_bus *bus;
1236	int ret;	1236	int ret = 0;
1237		1237
1238	if (phydev->mdio.dev.fwnode) {	1238	if (phydev->mdio.dev.fwnode) {
1239	bus = sfp_bus_find_fwnode(phydev->mdio.dev.fwnode);	1239	bus = sfp_bus_find_fwnode(phydev->mdio.dev.fwnode);
@@ -1245,7 +1245,7 @@ int phy_sfp_probe(struct phy_device *phydev, · 5 unmodified lines
1245	ret = sfp_bus_add_upstream(bus, phydev, ops);	1245	ret = sfp_bus_add_upstream(bus, phydev, ops);
1246	sfp_bus_put(bus);	1246	sfp_bus_put(bus);
1247	}	1247	}
1248	return 0;	1248	return ret;
1249	}	1249	}
1250	EXPORT_SYMBOL(phy_sfp_probe);	1250	EXPORT_SYMBOL(phy_sfp_probe);
1251		1251

drivers/net/ppp/pppoe.c+3−0

@@ -490,6 +490,9 @@ static int pppoe_disc_rcv(struct sk_buff skb, struct net_device dev, · 489 unmodified lines
490	if (!skb)	490	if (!skb)
491	goto out;	491	goto out;
492		492
		493	if (skb->pkt_type != PACKET_HOST)
		494	goto abort;
		495
493	if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))	496	if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
494	goto abort;	497	goto abort;
495		498

drivers/net/usb/cdc_ether.c+9−2

 	.driver_info = 0,
 },
-/* Microsoft Surface 3 dock (based on Realtek RTL8153) */
+/* Microsoft Surface Ethernet Adapter (based on Realtek RTL8153) */
 {
 	USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x07c6, USB_CLASS_COMM,
 			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
 	.driver_info = 0,
 },
-	/* TP-LINK UE300 USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */
+/* Microsoft Surface Ethernet Adapter (based on Realtek RTL8153B) */
+{
+	USB_DEVICE_AND_INTERFACE_INFO(MICROSOFT_VENDOR_ID, 0x0927, USB_CLASS_COMM,
+			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
+	.driver_info = 0,
+},
+/* TP-LINK UE300 USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */
 {
 	USB_DEVICE_AND_INTERFACE_INFO(TPLINK_VENDOR_ID, 0x0601, USB_CLASS_COMM,
 			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),

drivers/net/usb/hso.c+1−1

@@ -2659,7 +2659,7 @@ static struct hso_device *hso_create_bulk_serial_device( · 2658 unmodified lines
2659	if (!	2659	if (!
2660	(serial->out_endp =	2660	(serial->out_endp =
2661	hso_get_ep(interface, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT))) {	2661	hso_get_ep(interface, USB_ENDPOINT_XFER_BULK, USB_DIR_OUT))) {
2662	dev_err(&interface->dev, "Failed to find BULK IN ep\n");	2662	dev_err(&interface->dev, "Failed to find BULK OUT ep\n");
2663	goto exit2;	2663	goto exit2;
2664	}	2664	}
2665		2665

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

@@ -6880,6 +6880,7 @@ static const struct usb_device_id rtl8152_table[] = { · 6879 unmodified lines
6880	{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},	6880	{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
6881	{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},	6881	{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},
6882	{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},	6882	{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},
		6883	{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},
6883	{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},	6884	{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
6884	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},	6885	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
6885	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},	6886	{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},

drivers/net/virtio_net.c+4−2

 			break;
 	} while (rq->vq->num_free);
 	if (virtqueue_kick_prepare(rq->vq) && virtqueue_notify(rq->vq)) {
-		u64_stats_update_begin(&rq->stats.syncp);
+		unsigned long flags;
+		flags = u64_stats_update_begin_irqsave(&rq->stats.syncp);
 		rq->stats.kicks++;
-		u64_stats_update_end(&rq->stats.syncp);
+		u64_stats_update_end_irqrestore(&rq->stats.syncp, flags);
 	}
 	return !oom;

drivers/net/wireguard/messages.h+1−1

@@ -32,7 +32,7 @@ enum cookie_values { · 31 unmodified lines
32	};	32	};
33		33
34	enum counter_values {	34	enum counter_values {
35	COUNTER_BITS_TOTAL = 2048,	35	COUNTER_BITS_TOTAL = 8192,
36	COUNTER_REDUNDANT_BITS = BITS_PER_LONG,	36	COUNTER_REDUNDANT_BITS = BITS_PER_LONG,
37	COUNTER_WINDOW_SIZE = COUNTER_BITS_TOTAL - COUNTER_REDUNDANT_BITS	37	COUNTER_WINDOW_SIZE = COUNTER_BITS_TOTAL - COUNTER_REDUNDANT_BITS
38	};	38	};

drivers/net/wireguard/noise.c+9−13

 	if (unlikely(!keypair))
 		return NULL;
+	spin_lock_init(&keypair->receiving_counter.lock);
 	keypair->internal_id = atomic64_inc_return(&keypair_counter);
 	keypair->entry.type = INDEX_HASHTABLE_KEYPAIR;
 	keypair->entry.peer = peer;
 	memzero_explicit(output, BLAKE2S_HASH_SIZE + 1);
 }
-static void symmetric_key_init(struct noise_symmetric_key *key)
-{
-	spin_lock_init(&key->counter.receive.lock);
-	atomic64_set(&key->counter.counter, 0);
-	memset(key->counter.receive.backtrack, 0,
-	       sizeof(key->counter.receive.backtrack));
-	key->birthdate = ktime_get_coarse_boottime_ns();
-	key->is_valid = true;
-}
 static void derive_keys(struct noise_symmetric_key *first_dst,
 			struct noise_symmetric_key *second_dst,
 			const u8 chaining_key[NOISE_HASH_LEN])
 {
+	u64 birthdate = ktime_get_coarse_boottime_ns();
 	kdf(first_dst->key, second_dst->key, NULL, NULL,
 	    NOISE_SYMMETRIC_KEY_LEN, NOISE_SYMMETRIC_KEY_LEN, 0, 0,
 	    chaining_key);
-	symmetric_key_init(first_dst);
+	first_dst->birthdate = second_dst->birthdate = birthdate;
-	symmetric_key_init(second_dst);
+	first_dst->is_valid = second_dst->is_valid = true;
 }
 static bool __must_check mix_dh(u8 chaining_key[NOISE_HASH_LEN],
 	u8 e[NOISE_PUBLIC_KEY_LEN];
 	u8 ephemeral_private[NOISE_PUBLIC_KEY_LEN];
 	u8 static_private[NOISE_PUBLIC_KEY_LEN];
+	u8 preshared_key[NOISE_SYMMETRIC_KEY_LEN];
 	down_read(&wg->static_identity.lock);
 	memcpy(chaining_key, handshake->chaining_key, NOISE_HASH_LEN);
 	memcpy(ephemeral_private, handshake->ephemeral_private,
 	       NOISE_PUBLIC_KEY_LEN);
+	memcpy(preshared_key, handshake->preshared_key,
+	       NOISE_SYMMETRIC_KEY_LEN);
 	up_read(&handshake->lock);
 	if (state != HANDSHAKE_CREATED_INITIATION)
 		goto fail;
 	/* psk */
-	mix_psk(chaining_key, hash, key, handshake->preshared_key);
+	mix_psk(chaining_key, hash, key, preshared_key);
 	/* {} */
 	if (!message_decrypt(NULL, src->encrypted_nothing,
 	memzero_explicit(chaining_key, NOISE_HASH_LEN);
 	memzero_explicit(ephemeral_private, NOISE_PUBLIC_KEY_LEN);
 	memzero_explicit(static_private, NOISE_PUBLIC_KEY_LEN);
+	memzero_explicit(preshared_key, NOISE_SYMMETRIC_KEY_LEN);
 	up_read(&wg->static_identity.lock);
 	return ret_peer;
 }

drivers/net/wireguard/noise.h+6−8

 #include <linux/mutex.h>
 #include <linux/kref.h>
-union noise_counter {
+struct noise_replay_counter {
-	struct {
+	u64 counter;
-		u64 counter;
+	spinlock_t lock;
-		unsigned long backtrack[COUNTER_BITS_TOTAL / BITS_PER_LONG];
+	unsigned long backtrack[COUNTER_BITS_TOTAL / BITS_PER_LONG];
-		spinlock_t lock;
-	} receive;
-	atomic64_t counter;
 };
 struct noise_symmetric_key {
 	u8 key[NOISE_SYMMETRIC_KEY_LEN];
-	union noise_counter counter;
 	u64 birthdate;
 	bool is_valid;
 };
 struct noise_keypair {
 	struct index_hashtable_entry entry;
 	struct noise_symmetric_key sending;
+	atomic64_t sending_counter;
 	struct noise_symmetric_key receiving;
+	struct noise_replay_counter receiving_counter;
 	__le32 remote_index;
 	bool i_am_the_initiator;
 	struct kref refcount;

drivers/net/wireguard/queueing.h+9−1

 	return real_protocol && skb->protocol == real_protocol;
 }
-static inline void wg_reset_packet(struct sk_buff *skb)
+static inline void wg_reset_packet(struct sk_buff *skb, bool encapsulating)
 {
+	u8 l4_hash = skb->l4_hash;
+	u8 sw_hash = skb->sw_hash;
+	u32 hash = skb->hash;
 	skb_scrub_packet(skb, true);
 	memset(&skb->headers_start, 0,
 	       offsetof(struct sk_buff, headers_end) -
 		       offsetof(struct sk_buff, headers_start));
+	if (encapsulating) {
+		skb->l4_hash = l4_hash;
+		skb->sw_hash = sw_hash;
+		skb->hash = hash;
+	}
 	skb->queue_mapping = 0;
 	skb->nohdr = 0;
 	skb->peeked = 0;

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

@@ -245,20 +245,20 @@ static void keep_key_fresh(struct wg_peer *peer) · 244 unmodified lines
245	}	245	}
246	}	246	}
247		247
248	static bool decrypt_packet(struct sk_buff skb, struct noise_symmetric_key key)	248	static bool decrypt_packet(struct sk_buff skb, struct noise_keypair keypair)
249	{	249	{
250	struct scatterlist sg[MAX_SKB_FRAGS + 8];	250	struct scatterlist sg[MAX_SKB_FRAGS + 8];
251	struct sk_buff *trailer;	251	struct sk_buff *trailer;
252	unsigned int offset;	252	unsigned int offset;
253	int num_frags;	253	int num_frags;
254		254
255	if (unlikely(!key))	255	if (unlikely(!keypair))
256	return false;	256	return false;
257		257
258	if (unlikely(!READ_ONCE(key->is_valid) \|\|	258	if (unlikely(!READ_ONCE(keypair->receiving.is_valid) \|\|
259	wg_birthdate_has_expired(key->birthdate, REJECT_AFTER_TIME) \|\|	259	wg_birthdate_has_expired(keypair->receiving.birthdate, REJECT_AFTER_TIME) \|\|
260	key->counter.receive.counter >= REJECT_AFTER_MESSAGES)) {	260	keypair->receiving_counter.counter >= REJECT_AFTER_MESSAGES)) {
261	WRITE_ONCE(key->is_valid, false);	261	WRITE_ONCE(keypair->receiving.is_valid, false);
262	return false;	262	return false;
263	}	263	}
264		264
@@ -283,7 +283,7 @@ static bool decrypt_packet(struct sk_buff skb, struct noise_symmetric_key key) · 18 unmodified lines
283		283
284	if (!chacha20poly1305_decrypt_sg_inplace(sg, skb->len, NULL, 0,	284	if (!chacha20poly1305_decrypt_sg_inplace(sg, skb->len, NULL, 0,
285	PACKET_CB(skb)->nonce,	285	PACKET_CB(skb)->nonce,
286	key->key))	286	keypair->receiving.key))
287	return false;	287	return false;
288		288
289	/* Another ugly situation of pushing and pulling the header so as to	289	/* Another ugly situation of pushing and pulling the header so as to
@@ -298,41 +298,41 @@ static bool decrypt_packet(struct sk_buff skb, struct noise_symmetric_key key) · 8 unmodified lines
298	}	298	}
299		299
300	/* This is RFC6479, a replay detection bitmap algorithm that avoids bitshifts */	300	/* This is RFC6479, a replay detection bitmap algorithm that avoids bitshifts */
301	static bool counter_validate(union noise_counter *counter, u64 their_counter)	301	static bool counter_validate(struct noise_replay_counter *counter, u64 their_counter)
302	{	302	{
303	unsigned long index, index_current, top, i;	303	unsigned long index, index_current, top, i;
304	bool ret = false;	304	bool ret = false;
305		305
306	spin_lock_bh(&counter->receive.lock);	306	spin_lock_bh(&counter->lock);
307		307
308	if (unlikely(counter->receive.counter >= REJECT_AFTER_MESSAGES + 1 \|\|	308	if (unlikely(counter->counter >= REJECT_AFTER_MESSAGES + 1 \|\|
309	their_counter >= REJECT_AFTER_MESSAGES))	309	their_counter >= REJECT_AFTER_MESSAGES))
310	goto out;	310	goto out;
311		311
312	++their_counter;	312	++their_counter;
313		313
314	if (unlikely((COUNTER_WINDOW_SIZE + their_counter) <	314	if (unlikely((COUNTER_WINDOW_SIZE + their_counter) <
315	counter->receive.counter))	315	counter->counter))
316	goto out;	316	goto out;
317		317
318	index = their_counter >> ilog2(BITS_PER_LONG);	318	index = their_counter >> ilog2(BITS_PER_LONG);
319		319
320	if (likely(their_counter > counter->receive.counter)) {	320	if (likely(their_counter > counter->counter)) {
321	index_current = counter->receive.counter >> ilog2(BITS_PER_LONG);	321	index_current = counter->counter >> ilog2(BITS_PER_LONG);
322	top = min_t(unsigned long, index - index_current,	322	top = min_t(unsigned long, index - index_current,
323	COUNTER_BITS_TOTAL / BITS_PER_LONG);	323	COUNTER_BITS_TOTAL / BITS_PER_LONG);
324	for (i = 1; i <= top; ++i)	324	for (i = 1; i <= top; ++i)
325	counter->receive.backtrack[(i + index_current) &	325	counter->backtrack[(i + index_current) &
326	((COUNTER_BITS_TOTAL / BITS_PER_LONG) - 1)] = 0;	326	((COUNTER_BITS_TOTAL / BITS_PER_LONG) - 1)] = 0;
327	counter->receive.counter = their_counter;	327	counter->counter = their_counter;
328	}	328	}
329		329
330	index &= (COUNTER_BITS_TOTAL / BITS_PER_LONG) - 1;	330	index &= (COUNTER_BITS_TOTAL / BITS_PER_LONG) - 1;
331	ret = !test_and_set_bit(their_counter & (BITS_PER_LONG - 1),	331	ret = !test_and_set_bit(their_counter & (BITS_PER_LONG - 1),
332	&counter->receive.backtrack[index]);	332	&counter->backtrack[index]);
333		333
334	out:	334	out:
335	spin_unlock_bh(&counter->receive.lock);	335	spin_unlock_bh(&counter->lock);
336	return ret;	336	return ret;
337	}	337	}
338		338
@@ -472,19 +472,19 @@ int wg_packet_rx_poll(struct napi_struct *napi, int budget) · 133 unmodified lines
472	if (unlikely(state != PACKET_STATE_CRYPTED))	472	if (unlikely(state != PACKET_STATE_CRYPTED))
473	goto next;	473	goto next;
474		474
475	if (unlikely(!counter_validate(&keypair->receiving.counter,	475	if (unlikely(!counter_validate(&keypair->receiving_counter,
476	PACKET_CB(skb)->nonce))) {	476	PACKET_CB(skb)->nonce))) {
477	net_dbg_ratelimited("%s: Packet has invalid nonce %llu (max %llu)\n",	477	net_dbg_ratelimited("%s: Packet has invalid nonce %llu (max %llu)\n",
478	peer->device->dev->name,	478	peer->device->dev->name,
479	PACKET_CB(skb)->nonce,	479	PACKET_CB(skb)->nonce,
480	keypair->receiving.counter.receive.counter);	480	keypair->receiving_counter.counter);
481	goto next;	481	goto next;
482	}	482	}
483		483
484	if (unlikely(wg_socket_endpoint_from_skb(&endpoint, skb)))	484	if (unlikely(wg_socket_endpoint_from_skb(&endpoint, skb)))
485	goto next;	485	goto next;
486		486
487	wg_reset_packet(skb);	487	wg_reset_packet(skb, false);
488	wg_packet_consume_data_done(peer, skb, &endpoint);	488	wg_packet_consume_data_done(peer, skb, &endpoint);
489	free = false;	489	free = false;
490		490
@@ -511,8 +511,8 @@ void wg_packet_decrypt_worker(struct work_struct *work) · 20 unmodified lines
511	struct sk_buff *skb;	511	struct sk_buff *skb;
512		512
513	while ((skb = ptr_ring_consume_bh(&queue->ring)) != NULL) {	513	while ((skb = ptr_ring_consume_bh(&queue->ring)) != NULL) {
514	enum packet_state state = likely(decrypt_packet(skb,	514	enum packet_state state =
515	&PACKET_CB(skb)->keypair->receiving)) ?	515	likely(decrypt_packet(skb, PACKET_CB(skb)->keypair)) ?
516	PACKET_STATE_CRYPTED : PACKET_STATE_DEAD;	516	PACKET_STATE_CRYPTED : PACKET_STATE_DEAD;
517	wg_queue_enqueue_per_peer_napi(skb, state);	517	wg_queue_enqueue_per_peer_napi(skb, state);
518	if (need_resched())	518	if (need_resched())

drivers/net/wireguard/selftest/counter.c+12−5

 #ifdef DEBUG
 bool __init wg_packet_counter_selftest(void)
 {
+	struct noise_replay_counter *counter;
 	unsigned int test_num = 0, i;
-	union noise_counter counter;
 	bool success = true;
-#define T_INIT do {                                               \
+	counter = kmalloc(sizeof(*counter), GFP_KERNEL);
-		memset(&counter, 0, sizeof(union noise_counter)); \
+	if (unlikely(!counter)) {
-		spin_lock_init(&counter.receive.lock);            \
+		pr_err("nonce counter self-test malloc: FAIL\n");
+		return false;
+	}
+#define T_INIT do {                                    \
+		memset(counter, 0, sizeof(*counter));  \
+		spin_lock_init(&counter->lock);        \
 	} while (0)
 #define T_LIM (COUNTER_WINDOW_SIZE + 1)
 #define T(n, v) do {                                                  \
 		++test_num;                                           \
-		if (counter_validate(&counter, n) != (v)) {           \
+		if (counter_validate(counter, n) != (v)) {            \
 			pr_err("nonce counter self-test %u: FAIL\n",  \
 			       test_num);                             \
 			success = false;                              \
 	if (success)
 		pr_info("nonce counter self-tests: pass\n");
+	kfree(counter);
 	return success;
 }
 #endif

drivers/net/wireguard/send.c+11−8

 	rcu_read_lock_bh();
 	keypair = rcu_dereference_bh(peer->keypairs.current_keypair);
 	send = keypair && READ_ONCE(keypair->sending.is_valid) &&
-	       (atomic64_read(&keypair->sending.counter.counter) > REKEY_AFTER_MESSAGES ||
+	       (atomic64_read(&keypair->sending_counter) > REKEY_AFTER_MESSAGES ||
 		(keypair->i_am_the_initiator &&
 		 wg_birthdate_has_expired(keypair->sending.birthdate, REKEY_AFTER_TIME)));
 	rcu_read_unlock_bh();
 	struct sk_buff *trailer;
 	int num_frags;
+	/* Force hash calculation before encryption so that flow analysis is
+	 * consistent over the inner packet.
+	 */
+	skb_get_hash(skb);
 	/* Calculate lengths. */
 	padding_len = calculate_skb_padding(skb);
 	trailer_len = padding_len + noise_encrypted_len(0);
 		skb_list_walk_safe(first, skb, next) {
 			if (likely(encrypt_packet(skb,
 					PACKET_CB(first)->keypair))) {
-				wg_reset_packet(skb);
+				wg_reset_packet(skb, true);
 			} else {
 				state = PACKET_STATE_DEAD;
 				break;
 void wg_packet_send_staged_packets(struct wg_peer *peer)
 {
-	struct noise_symmetric_key *key;
 	struct noise_keypair *keypair;
 	struct sk_buff_head packets;
 	struct sk_buff *skb;
 	rcu_read_unlock_bh();
 	if (unlikely(!keypair))
 		goto out_nokey;
-	key = &keypair->sending;
+	if (unlikely(!READ_ONCE(keypair->sending.is_valid)))
-	if (unlikely(!READ_ONCE(key->is_valid)))
 		goto out_nokey;
-	if (unlikely(wg_birthdate_has_expired(key->birthdate,
+	if (unlikely(wg_birthdate_has_expired(keypair->sending.birthdate,
 					      REJECT_AFTER_TIME)))
 		goto out_invalid;
 		 */
 		PACKET_CB(skb)->ds = ip_tunnel_ecn_encap(0, ip_hdr(skb), skb);
 		PACKET_CB(skb)->nonce =
-				atomic64_inc_return(&key->counter.counter) - 1;
+				atomic64_inc_return(&keypair->sending_counter) - 1;
 		if (unlikely(PACKET_CB(skb)->nonce >= REJECT_AFTER_MESSAGES))
 			goto out_invalid;
 	}
 	return;
 out_invalid:
-	WRITE_ONCE(key->is_valid, false);
+	WRITE_ONCE(keypair->sending.is_valid, false);
 out_nokey:
 	wg_noise_keypair_put(keypair, false);

drivers/net/wireless/intel/iwlwifi/pcie/drv.c+4−0

 			iwl_trans->cfg = &iwl_ax101_cfg_quz_hr;
 		else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr)
 			iwl_trans->cfg = &iwl_ax201_cfg_quz_hr;
+		else if (iwl_trans->cfg == &killer1650s_2ax_cfg_qu_b0_hr_b0)
+			iwl_trans->cfg = &iwl_ax1650s_cfg_quz_hr;
+		else if (iwl_trans->cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0)
+			iwl_trans->cfg = &iwl_ax1650i_cfg_quz_hr;
 	}
 #endif

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

 	while (nvme_cqe_pending(nvmeq)) {
 		found++;
+		/*
+		 * load-load control dependency between phase and the rest of
+		 * the cqe requires a full read memory barrier
+		 */
+		dma_rmb();
 		nvme_handle_cqe(nvmeq, nvmeq->cq_head);
 		nvme_update_cq_head(nvmeq);
 	}

drivers/pinctrl/actions/pinctrl-s700.c+1−1

@@ -1435,7 +1435,7 @@ static const char * const sd2_groups[] = { · 1434 unmodified lines
1435	static const char * const i2c0_groups[] = {	1435	static const char * const i2c0_groups[] = {
1436	"uart0_rx_mfp",	1436	"uart0_rx_mfp",
1437	"uart0_tx_mfp",	1437	"uart0_tx_mfp",
1438	"i2c0_mfp_mfp",	1438	"i2c0_mfp",
1439	};	1439	};
1440		1440
1441	static const char * const i2c1_groups[] = {	1441	static const char * const i2c1_groups[] = {

drivers/pinctrl/intel/pinctrl-baytrail.c+1−0

@@ -1286,6 +1286,7 @@ static const struct gpio_chip byt_gpio_chip = { · 1285 unmodified lines
1286	.direction_output = byt_gpio_direction_output,	1286	.direction_output = byt_gpio_direction_output,
1287	.get = byt_gpio_get,	1287	.get = byt_gpio_get,
1288	.set = byt_gpio_set,	1288	.set = byt_gpio_set,
		1289	.set_config = gpiochip_generic_config,
1289	.dbg_show = byt_gpio_dbg_show,	1290	.dbg_show = byt_gpio_dbg_show,
1290	};	1291	};
1291		1292

drivers/pinctrl/intel/pinctrl-cherryview.c+4−0

 	struct chv_pinctrl *pctrl = gpiochip_get_data(gc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned long pending;
+	unsigned long flags;
 	u32 intr_line;
 	chained_irq_enter(chip, desc);
+	raw_spin_lock_irqsave(&chv_lock, flags);
 	pending = readl(pctrl->regs + CHV_INTSTAT);
+	raw_spin_unlock_irqrestore(&chv_lock, flags);
 	for_each_set_bit(intr_line, &pending, pctrl->community->nirqs) {
 		unsigned int irq, offset;

drivers/pinctrl/intel/pinctrl-sunrisepoint.c+8−7

 #include "pinctrl-intel.h"
-#define SPT_PAD_OWN	0x020
+#define SPT_PAD_OWN		0x020
-#define SPT_PADCFGLOCK	0x0a0
+#define SPT_H_PADCFGLOCK	0x090
-#define SPT_HOSTSW_OWN	0x0d0
+#define SPT_LP_PADCFGLOCK	0x0a0
-#define SPT_GPI_IS	0x100
+#define SPT_HOSTSW_OWN		0x0d0
-#define SPT_GPI_IE	0x120
+#define SPT_GPI_IS		0x100
+#define SPT_GPI_IE		0x120
 #define SPT_COMMUNITY(b, s, e)				\
 	{						\
 		.barno = (b),				\
 		.padown_offset = SPT_PAD_OWN,		\
-		.padcfglock_offset = SPT_PADCFGLOCK,	\
+		.padcfglock_offset = SPT_LP_PADCFGLOCK,	\
 		.hostown_offset = SPT_HOSTSW_OWN,	\
 		.is_offset = SPT_GPI_IS,		\
 		.ie_offset = SPT_GPI_IE,		\
 	{						\
 		.barno = (b),				\
 		.padown_offset = SPT_PAD_OWN,		\
-		.padcfglock_offset = SPT_PADCFGLOCK,	\
+		.padcfglock_offset = SPT_H_PADCFGLOCK,	\
 		.hostown_offset = SPT_HOSTSW_OWN,	\
 		.is_offset = SPT_GPI_IS,		\
 		.ie_offset = SPT_GPI_IE,		\

drivers/pinctrl/mediatek/pinctrl-paris.c+0−2

@@ -164,8 +164,6 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev, · 163 unmodified lines
164	case MTK_PIN_CONFIG_PU_ADV:	164	case MTK_PIN_CONFIG_PU_ADV:
165	case MTK_PIN_CONFIG_PD_ADV:	165	case MTK_PIN_CONFIG_PD_ADV:
166	if (hw->soc->adv_pull_get) {	166	if (hw->soc->adv_pull_get) {
167	bool pullup;
168
169	pullup = param == MTK_PIN_CONFIG_PU_ADV;	167	pullup = param == MTK_PIN_CONFIG_PU_ADV;
170	err = hw->soc->adv_pull_get(hw, desc, pullup, &ret);	168	err = hw->soc->adv_pull_get(hw, desc, pullup, &ret);
171	} else	169	} else

drivers/pinctrl/qcom/pinctrl-msm.c+26−1

@@ -697,7 +697,7 @@ static void msm_gpio_update_dual_edge_pos(struct msm_pinctrl *pctrl, · 696 unmodified lines
697		697
698	pol = msm_readl_intr_cfg(pctrl, g);	698	pol = msm_readl_intr_cfg(pctrl, g);
699	pol ^= BIT(g->intr_polarity_bit);	699	pol ^= BIT(g->intr_polarity_bit);
700	msm_writel_intr_cfg(val, pctrl, g);	700	msm_writel_intr_cfg(pol, pctrl, g);
701		701
702	val2 = msm_readl_io(pctrl, g) & BIT(g->in_bit);	702	val2 = msm_readl_io(pctrl, g) & BIT(g->in_bit);
703	intstat = msm_readl_intr_status(pctrl, g);	703	intstat = msm_readl_intr_status(pctrl, g);
@@ -1034,6 +1034,29 @@ static void msm_gpio_irq_relres(struct irq_data *d) · 330 unmodified lines
1034	module_put(gc->owner);	1034	module_put(gc->owner);
1035	}	1035	}
1036		1036
		1037	static int msm_gpio_irq_set_affinity(struct irq_data *d,
		1038	const struct cpumask *dest, bool force)
		1039	{
		1040	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
		1041	struct msm_pinctrl *pctrl = gpiochip_get_data(gc);
		1042
		1043	if (d->parent_data && test_bit(d->hwirq, pctrl->skip_wake_irqs))
		1044	return irq_chip_set_affinity_parent(d, dest, force);
		1045
		1046	return 0;
		1047	}
		1048
		1049	static int msm_gpio_irq_set_vcpu_affinity(struct irq_data d, void vcpu_info)
		1050	{
		1051	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
		1052	struct msm_pinctrl *pctrl = gpiochip_get_data(gc);
		1053
		1054	if (d->parent_data && test_bit(d->hwirq, pctrl->skip_wake_irqs))
		1055	return irq_chip_set_vcpu_affinity_parent(d, vcpu_info);
		1056
		1057	return 0;
		1058	}
		1059
1037	static void msm_gpio_irq_handler(struct irq_desc *desc)	1060	static void msm_gpio_irq_handler(struct irq_desc *desc)
1038	{	1061	{
1039	struct gpio_chip *gc = irq_desc_get_handler_data(desc);	1062	struct gpio_chip *gc = irq_desc_get_handler_data(desc);
@@ -1132,6 +1155,8 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl) · 92 unmodified lines
1132	pctrl->irq_chip.irq_set_wake = msm_gpio_irq_set_wake;	1155	pctrl->irq_chip.irq_set_wake = msm_gpio_irq_set_wake;
1133	pctrl->irq_chip.irq_request_resources = msm_gpio_irq_reqres;	1156	pctrl->irq_chip.irq_request_resources = msm_gpio_irq_reqres;
1134	pctrl->irq_chip.irq_release_resources = msm_gpio_irq_relres;	1157	pctrl->irq_chip.irq_release_resources = msm_gpio_irq_relres;
		1158	pctrl->irq_chip.irq_set_affinity = msm_gpio_irq_set_affinity;
		1159	pctrl->irq_chip.irq_set_vcpu_affinity = msm_gpio_irq_set_vcpu_affinity;
1135		1160
1136	np = of_parse_phandle(pctrl->dev->of_node, "wakeup-parent", 0);	1161	np = of_parse_phandle(pctrl->dev->of_node, "wakeup-parent", 0);
1137	if (np) {	1162	if (np) {

drivers/rapidio/devices/rio_mport_cdev.c+5−0

 				rmcd_error("pinned %ld out of %ld pages",
 					   pinned, nr_pages);
 			ret = -EFAULT;
+			/*
+			 * Set nr_pages up to mean "how many pages to unpin, in
+			 * the error handler:
+			 */
+			nr_pages = pinned;
 			goto err_pg;
 		}

drivers/s390/net/ism_drv.c+3−1

 	ism->smcd = smcd_alloc_dev(&pdev->dev, dev_name(&pdev->dev), &ism_ops,
 				   ISM_NR_DMBS);
-	if (!ism->smcd)
+	if (!ism->smcd) {
+		ret = -ENOMEM;
 		goto err_resource;
+	}
 	ism->smcd->priv = ism;
 	ret = ism_dev_init(ism);

drivers/scsi/qla2xxx/qla_attr.c+0−3

@@ -1850,9 +1850,6 @@ qla2x00_port_speed_show(struct device dev, struct device_attribute attr, · 1849 unmodified lines
1850	return -EINVAL;	1850	return -EINVAL;
1851	}	1851	}
1852		1852
1853	ql_log(ql_log_info, vha, 0x70d6,
1854	"port speed:%d\n", ha->link_data_rate);
1855
1856	return scnprintf(buf, PAGE_SIZE, "%s\n", spd[ha->link_data_rate]);	1853	return scnprintf(buf, PAGE_SIZE, "%s\n", spd[ha->link_data_rate]);
1857	}	1854	}
1858		1855

drivers/scsi/scsi_pm.c+8−2

@@ -80,6 +80,10 @@ static int scsi_dev_type_resume(struct device *dev, · 79 unmodified lines
80	dev_dbg(dev, "scsi resume: %d\n", err);	80	dev_dbg(dev, "scsi resume: %d\n", err);
81		81
82	if (err == 0) {	82	if (err == 0) {
		83	bool was_runtime_suspended;
		84
		85	was_runtime_suspended = pm_runtime_suspended(dev);
		86
83	pm_runtime_disable(dev);	87	pm_runtime_disable(dev);
84	err = pm_runtime_set_active(dev);	88	err = pm_runtime_set_active(dev);
85	pm_runtime_enable(dev);	89	pm_runtime_enable(dev);
@@ -93,8 +97,10 @@ static int scsi_dev_type_resume(struct device *dev, · 7 unmodified lines
93	*/	97	*/
94	if (!err && scsi_is_sdev_device(dev)) {	98	if (!err && scsi_is_sdev_device(dev)) {
95	struct scsi_device *sdev = to_scsi_device(dev);	99	struct scsi_device *sdev = to_scsi_device(dev);
96		100	if (was_runtime_suspended)
97	blk_set_runtime_active(sdev->request_queue);	101	blk_post_runtime_resume(sdev->request_queue, 0);
		102	else
		103	blk_set_runtime_active(sdev->request_queue);
98	}	104	}
99	}	105	}
100		106

drivers/staging/greybus/uart.c+2−2

@@ -526,9 +526,9 @@ static void gb_tty_set_termios(struct tty_struct *tty, · 525 unmodified lines
526	}	526	}
527		527
528	if (C_CRTSCTS(tty) && C_BAUD(tty) != B0)	528	if (C_CRTSCTS(tty) && C_BAUD(tty) != B0)
529	newline.flow_control \|= GB_SERIAL_AUTO_RTSCTS_EN;	529	newline.flow_control = GB_SERIAL_AUTO_RTSCTS_EN;
530	else	530	else
531	newline.flow_control &= ~GB_SERIAL_AUTO_RTSCTS_EN;	531	newline.flow_control = 0;
532		532
533	if (memcmp(&gb_tty->line_coding, &newline, sizeof(newline))) {	533	if (memcmp(&gb_tty->line_coding, &newline, sizeof(newline))) {
534	memcpy(&gb_tty->line_coding, &newline, sizeof(newline));	534	memcpy(&gb_tty->line_coding, &newline, sizeof(newline));

drivers/staging/iio/resolver/ad2s1210.c+12−5

 static int ad2s1210_config_read(struct ad2s1210_state *st,
 				unsigned char address)
 {
-	struct spi_transfer xfer = {
+	struct spi_transfer xfers[] = {
-		.len = 2,
+		{
-		.rx_buf = st->rx,
+			.len = 1,
-		.tx_buf = st->tx,
+			.rx_buf = &st->rx[0],
+			.tx_buf = &st->tx[0],
+			.cs_change = 1,
+		}, {
+			.len = 1,
+			.rx_buf = &st->rx[1],
+			.tx_buf = &st->tx[1],
+		},
 	};
 	int ret = 0;
 	ad2s1210_set_mode(MOD_CONFIG, st);
 	st->tx[0] = address | AD2S1210_MSB_IS_HIGH;
 	st->tx[1] = AD2S1210_REG_FAULT;
-	ret = spi_sync_transfer(st->sdev, &xfer, 1);
+	ret = spi_sync_transfer(st->sdev, xfers, 2);
 	if (ret < 0)
 		return ret;

drivers/staging/kpc2000/kpc2000/core.c+4−5

 {
 	int err = 0;
 	struct kp2000_device *pcard;
-	int rv;
 	unsigned long reg_bar_phys_addr;
 	unsigned long reg_bar_phys_len;
 	unsigned long dma_bar_phys_addr;
 	if (err < 0)
 		goto err_release_dma;
-	rv = request_irq(pcard->pdev->irq, kp2000_irq_handler, IRQF_SHARED,
+	err = request_irq(pcard->pdev->irq, kp2000_irq_handler, IRQF_SHARED,
-			 pcard->name, pcard);
+			  pcard->name, pcard);
-	if (rv) {
+	if (err) {
 		dev_err(&pcard->pdev->dev,
-			"%s: failed to request_irq: %d\n", __func__, rv);
+			"%s: failed to request_irq: %d\n", __func__, err);
 		goto err_disable_msi;
 	}

drivers/staging/wfx/scan.c+3−1

 	wvif->scan_abort = false;
 	reinit_completion(&wvif->scan_complete);
 	timeout = hif_scan(wvif, req, start_idx, i - start_idx);
-	if (timeout < 0)
+	if (timeout < 0) {
+		wfx_tx_unlock(wvif->wdev);
 		return timeout;
+	}
 	ret = wait_for_completion_timeout(&wvif->scan_complete, timeout);
 	if (req->channels[start_idx]->max_power != wvif->vif->bss_conf.txpower)
 		hif_set_output_power(wvif, wvif->vif->bss_conf.txpower);

drivers/target/target_core_transport.c+1−0

@@ -3350,6 +3350,7 @@ static void target_tmr_work(struct work_struct *work) · 3349 unmodified lines
3350		3350
3351	cmd->se_tfo->queue_tm_rsp(cmd);	3351	cmd->se_tfo->queue_tm_rsp(cmd);
3352		3352
		3353	transport_lun_remove_cmd(cmd);
3353	transport_cmd_check_stop_to_fabric(cmd);	3354	transport_cmd_check_stop_to_fabric(cmd);
3354	return;	3355	return;
3355		3356

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

@@ -883,6 +883,7 @@ console_initcall(sifive_console_init); · 882 unmodified lines
883		883
884	static void __ssp_add_console_port(struct sifive_serial_port *ssp)	884	static void __ssp_add_console_port(struct sifive_serial_port *ssp)
885	{	885	{
		886	spin_lock_init(&ssp->port.lock);
886	sifive_serial_console_ports[ssp->port.line] = ssp;	887	sifive_serial_console_ports[ssp->port.line] = ssp;
887	}	888	}
888		889

drivers/usb/cdns3/gadget.c+11−11

drivers/usb/core/devio.c+13−3

@@ -251,9 +251,19 @@ static int usbdev_mmap(struct file file, struct vm_area_struct vma) · 250 unmodified lines
251	usbm->vma_use_count = 1;	251	usbm->vma_use_count = 1;
252	INIT_LIST_HEAD(&usbm->memlist);	252	INIT_LIST_HEAD(&usbm->memlist);
253		253
254	if (dma_mmap_coherent(hcd->self.sysdev, vma, mem, dma_handle, size)) {	254	if (hcd->localmem_pool \|\| !hcd_uses_dma(hcd)) {
255	dec_usb_memory_use_count(usbm, &usbm->vma_use_count);	255	if (remap_pfn_range(vma, vma->vm_start,
256	return -EAGAIN;	256	virt_to_phys(usbm->mem) >> PAGE_SHIFT,
		257	size, vma->vm_page_prot) < 0) {
		258	dec_usb_memory_use_count(usbm, &usbm->vma_use_count);
		259	return -EAGAIN;
		260	}
		261	} else {
		262	if (dma_mmap_coherent(hcd->self.sysdev, vma, mem, dma_handle,
		263	size)) {
		264	dec_usb_memory_use_count(usbm, &usbm->vma_use_count);
		265	return -EAGAIN;
		266	}
257	}	267	}
258		268
259	vma->vm_flags \|= VM_IO;	269	vma->vm_flags \|= VM_IO;

drivers/usb/core/hub.c+5−1

 #define USB_VENDOR_GENESYS_LOGIC		0x05e3
 #define USB_VENDOR_SMSC				0x0424
+#define USB_PRODUCT_USB5534B			0x5534
 #define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND	0x01
 #define HUB_QUIRK_DISABLE_AUTOSUSPEND		0x02
 }
 static const struct usb_device_id hub_id_table[] = {
-    { .match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_INT_CLASS,
+    { .match_flags = USB_DEVICE_ID_MATCH_VENDOR
+                   | USB_DEVICE_ID_MATCH_PRODUCT
+                   | USB_DEVICE_ID_MATCH_INT_CLASS,
       .idVendor = USB_VENDOR_SMSC,
+      .idProduct = USB_PRODUCT_USB5534B,
       .bInterfaceClass = USB_CLASS_HUB,
       .driver_info = HUB_QUIRK_DISABLE_AUTOSUSPEND},
     { .match_flags = USB_DEVICE_ID_MATCH_VENDOR

drivers/usb/dwc3/Kconfig+1−0

@@ -4,6 +4,7 @@ config USB_DWC3 · 3 unmodified lines
4	tristate "DesignWare USB3 DRD Core Support"	4	tristate "DesignWare USB3 DRD Core Support"
5	depends on (USB \|\| USB_GADGET) && HAS_DMA	5	depends on (USB \|\| USB_GADGET) && HAS_DMA
6	select USB_XHCI_PLATFORM if USB_XHCI_HCD	6	select USB_XHCI_PLATFORM if USB_XHCI_HCD
		7	select USB_ROLE_SWITCH if USB_DWC3_DUAL_ROLE
7	help	8	help
8	Say Y or M here if your system has a Dual Role SuperSpeed	9	Say Y or M here if your system has a Dual Role SuperSpeed
9	USB controller based on the DesignWare USB3 IP Core.	10	USB controller based on the DesignWare USB3 IP Core.

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

@@ -114,6 +114,7 @@ static const struct property_entry dwc3_pci_intel_properties[] = { · 113 unmodified lines
114		114
115	static const struct property_entry dwc3_pci_mrfld_properties[] = {	115	static const struct property_entry dwc3_pci_mrfld_properties[] = {
116	PROPERTY_ENTRY_STRING("dr_mode", "otg"),	116	PROPERTY_ENTRY_STRING("dr_mode", "otg"),
		117	PROPERTY_ENTRY_STRING("linux,extcon-name", "mrfld_bcove_pwrsrc"),
117	PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),	118	PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
118	{}	119	{}
119	};	120	};

drivers/usb/dwc3/gadget.c+0−3

@@ -2483,9 +2483,6 @@ static int dwc3_gadget_ep_reclaim_trb_sg(struct dwc3_ep *dep, · 2482 unmodified lines
2483	for_each_sg(sg, s, pending, i) {	2483	for_each_sg(sg, s, pending, i) {
2484	trb = &dep->trb_pool[dep->trb_dequeue];	2484	trb = &dep->trb_pool[dep->trb_dequeue];
2485		2485
2486	if (trb->ctrl & DWC3_TRB_CTRL_HWO)
2487	break;
2488
2489	req->sg = sg_next(s);	2486	req->sg = sg_next(s);
2490	req->num_pending_sgs--;	2487	req->num_pending_sgs--;
2491		2488

drivers/usb/gadget/configfs.c+3−0

@@ -260,6 +260,9 @@ static ssize_t gadget_dev_desc_UDC_store(struct config_item *item, · 259 unmodified lines
260	char *name;	260	char *name;
261	int ret;	261	int ret;
262		262
		263	if (strlen(page) < len)
		264	return -EOVERFLOW;
		265
263	name = kstrdup(page, GFP_KERNEL);	266	name = kstrdup(page, GFP_KERNEL);
264	if (!name)	267	if (!name)
265	return -ENOMEM;	268	return -ENOMEM;

drivers/usb/gadget/legacy/audio.c+3−1

 		struct usb_descriptor_header *usb_desc;
 		usb_desc = usb_otg_descriptor_alloc(cdev->gadget);
-		if (!usb_desc)
+		if (!usb_desc) {
+			status = -ENOMEM;
 			goto fail;
+		}
 		usb_otg_descriptor_init(cdev->gadget, usb_desc);
 		otg_desc[0] = usb_desc;
 		otg_desc[1] = NULL;

drivers/usb/gadget/legacy/cdc2.c+3−1

 		struct usb_descriptor_header *usb_desc;
 		usb_desc = usb_otg_descriptor_alloc(gadget);
-		if (!usb_desc)
+		if (!usb_desc) {
+			status = -ENOMEM;
 			goto fail1;
+		}
 		usb_otg_descriptor_init(gadget, usb_desc);
 		otg_desc[0] = usb_desc;
 		otg_desc[1] = NULL;

drivers/usb/gadget/legacy/inode.c+1−2

 	req->buf = dev->rbuf;
 	req->context = NULL;
-	value = -EOPNOTSUPP;
 	switch (ctrl->bRequest) {
 	case USB_REQ_GET_DESCRIPTOR:
 dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
 {
 	struct dev_data		*dev = fd->private_data;
-	ssize_t			value = len, length = len;
+	ssize_t			value, length = len;
 	unsigned		total;
 	u32			tag;
 	char			*kbuf;

drivers/usb/gadget/legacy/ncm.c+3−1

 		struct usb_descriptor_header *usb_desc;
 		usb_desc = usb_otg_descriptor_alloc(gadget);
-		if (!usb_desc)
+		if (!usb_desc) {
+			status = -ENOMEM;
 			goto fail;
+		}
 		usb_otg_descriptor_init(gadget, usb_desc);
 		otg_desc[0] = usb_desc;
 		otg_desc[1] = NULL;

drivers/usb/gadget/legacy/raw_gadget.c+252−63

@@ -7,6 +7,7 @@ · 6 unmodified lines
7	*/	7	*/
8		8
9	#include <linux/compiler.h>	9	#include <linux/compiler.h>
		10	#include <linux/ctype.h>
10	#include <linux/debugfs.h>	11	#include <linux/debugfs.h>
11	#include <linux/delay.h>	12	#include <linux/delay.h>
12	#include <linux/kref.h>	13	#include <linux/kref.h>
@@ -123,8 +124,6 @@ static void raw_event_queue_destroy(struct raw_event_queue *queue) · 110 unmodified lines
123		124
124	struct raw_dev;	125	struct raw_dev;
125		126
126	#define USB_RAW_MAX_ENDPOINTS 32
127
128	enum ep_state {	127	enum ep_state {
129	STATE_EP_DISABLED,	128	STATE_EP_DISABLED,
130	STATE_EP_ENABLED,	129	STATE_EP_ENABLED,
@@ -134,6 +133,7 @@ struct raw_ep { · 3 unmodified lines
134	struct raw_dev *dev;	133	struct raw_dev *dev;
135	enum ep_state state;	134	enum ep_state state;
136	struct usb_ep *ep;	135	struct usb_ep *ep;
		136	u8 addr;
137	struct usb_request *req;	137	struct usb_request *req;
138	bool urb_queued;	138	bool urb_queued;
139	bool disabling;	139	bool disabling;
@@ -168,7 +168,8 @@ struct raw_dev { · 28 unmodified lines
168	bool ep0_out_pending;	168	bool ep0_out_pending;
169	bool ep0_urb_queued;	169	bool ep0_urb_queued;
170	ssize_t ep0_status;	170	ssize_t ep0_status;
171	struct raw_ep eps[USB_RAW_MAX_ENDPOINTS];	171	struct raw_ep eps[USB_RAW_EPS_NUM_MAX];
		172	int eps_num;
172		173
173	struct completion ep0_done;	174	struct completion ep0_done;
174	struct raw_event_queue queue;	175	struct raw_event_queue queue;
@@ -202,8 +203,8 @@ static void dev_free(struct kref *kref) · 27 unmodified lines
202	usb_ep_free_request(dev->gadget->ep0, dev->req);	203	usb_ep_free_request(dev->gadget->ep0, dev->req);
203	}	204	}
204	raw_event_queue_destroy(&dev->queue);	205	raw_event_queue_destroy(&dev->queue);
205	for (i = 0; i < USB_RAW_MAX_ENDPOINTS; i++) {	206	for (i = 0; i < dev->eps_num; i++) {
206	if (dev->eps[i].state != STATE_EP_ENABLED)	207	if (dev->eps[i].state == STATE_EP_DISABLED)
207	continue;	208	continue;
208	usb_ep_disable(dev->eps[i].ep);	209	usb_ep_disable(dev->eps[i].ep);
209	usb_ep_free_request(dev->eps[i].ep, dev->eps[i].req);	210	usb_ep_free_request(dev->eps[i].ep, dev->eps[i].req);
@@ -249,12 +250,26 @@ static void gadget_ep0_complete(struct usb_ep ep, struct usb_request req) · 39 unmodified lines
249	complete(&dev->ep0_done);	250	complete(&dev->ep0_done);
250	}	251	}
251		252
		253	static u8 get_ep_addr(const char *name)
		254	{
		255	/* If the endpoint has fixed function (named as e.g. "ep12out-bulk"),
		256	* parse the endpoint address from its name. We deliberately use
		257	* deprecated simple_strtoul() function here, as the number isn't
		258	* followed by '\0' nor '\n'.
		259	*/
		260	if (isdigit(name[2]))
		261	return simple_strtoul(&name[2], NULL, 10);
		262	/* Otherwise the endpoint is configurable (named as e.g. "ep-a"). */
		263	return USB_RAW_EP_ADDR_ANY;
		264	}
		265
252	static int gadget_bind(struct usb_gadget *gadget,	266	static int gadget_bind(struct usb_gadget *gadget,
253	struct usb_gadget_driver *driver)	267	struct usb_gadget_driver *driver)
254	{	268	{
255	int ret = 0;	269	int ret = 0, i = 0;
256	struct raw_dev *dev = container_of(driver, struct raw_dev, driver);	270	struct raw_dev *dev = container_of(driver, struct raw_dev, driver);
257	struct usb_request *req;	271	struct usb_request *req;
		272	struct usb_ep *ep;
258	unsigned long flags;	273	unsigned long flags;
259		274
260	if (strcmp(gadget->name, dev->udc_name) != 0)	275	if (strcmp(gadget->name, dev->udc_name) != 0)
@@ -273,6 +288,13 @@ static int gadget_bind(struct usb_gadget *gadget, · 12 unmodified lines
273	dev->req->context = dev;	288	dev->req->context = dev;
274	dev->req->complete = gadget_ep0_complete;	289	dev->req->complete = gadget_ep0_complete;
275	dev->gadget = gadget;	290	dev->gadget = gadget;
		291	gadget_for_each_ep(ep, dev->gadget) {
		292	dev->eps[i].ep = ep;
		293	dev->eps[i].addr = get_ep_addr(ep->name);
		294	dev->eps[i].state = STATE_EP_DISABLED;
		295	i++;
		296	}
		297	dev->eps_num = i;
276	spin_unlock_irqrestore(&dev->lock, flags);	298	spin_unlock_irqrestore(&dev->lock, flags);
277		299
278	/* Matches kref_put() in gadget_unbind(). */	300	/* Matches kref_put() in gadget_unbind(). */
@@ -555,7 +577,7 @@ static void raw_alloc_io_data(struct usb_raw_ep_io io, void __user *ptr, · 276 unmodified lines
555		577
556	if (copy_from_user(io, ptr, sizeof(*io)))	578	if (copy_from_user(io, ptr, sizeof(*io)))
557	return ERR_PTR(-EFAULT);	579	return ERR_PTR(-EFAULT);
558	if (io->ep >= USB_RAW_MAX_ENDPOINTS)	580	if (io->ep >= USB_RAW_EPS_NUM_MAX)
559	return ERR_PTR(-EINVAL);	581	return ERR_PTR(-EINVAL);
560	if (!usb_raw_io_flags_valid(io->flags))	582	if (!usb_raw_io_flags_valid(io->flags))
561	return ERR_PTR(-EINVAL);	583	return ERR_PTR(-EINVAL);
@@ -669,43 +691,61 @@ static int raw_ioctl_ep0_read(struct raw_dev *dev, unsigned long value) · 107 unmodified lines
669	if (IS_ERR(data))	691	if (IS_ERR(data))
670	return PTR_ERR(data);	692	return PTR_ERR(data);
671	ret = raw_process_ep0_io(dev, &io, data, false);	693	ret = raw_process_ep0_io(dev, &io, data, false);
672	if (ret)	694	if (ret < 0)
673	goto free;	695	goto free;
674		696
675	length = min(io.length, (unsigned int)ret);	697	length = min(io.length, (unsigned int)ret);
676	if (copy_to_user((void __user *)(value + sizeof(io)), data, length))	698	if (copy_to_user((void __user *)(value + sizeof(io)), data, length))
677	ret = -EFAULT;	699	ret = -EFAULT;
		700	else
		701	ret = length;
678	free:	702	free:
679	kfree(data);	703	kfree(data);
680	return ret;	704	return ret;
681	}	705	}
682		706
683	static bool check_ep_caps(struct usb_ep *ep,	707	static int raw_ioctl_ep0_stall(struct raw_dev *dev, unsigned long value)
684	struct usb_endpoint_descriptor *desc)
685	{	708	{
686	switch (usb_endpoint_type(desc)) {	709	int ret = 0;
687	case USB_ENDPOINT_XFER_ISOC:	710	unsigned long flags;
688	if (!ep->caps.type_iso)	711
689	return false;	712	if (value)
690	break;	713	return -EINVAL;
691	case USB_ENDPOINT_XFER_BULK:	714	spin_lock_irqsave(&dev->lock, flags);
692	if (!ep->caps.type_bulk)	715	if (dev->state != STATE_DEV_RUNNING) {
693	return false;	716	dev_dbg(dev->dev, "fail, device is not running\n");
694	break;	717	ret = -EINVAL;
695	case USB_ENDPOINT_XFER_INT:	718	goto out_unlock;
696	if (!ep->caps.type_int)	719	}
697	return false;	720	if (!dev->gadget) {
698	break;	721	dev_dbg(dev->dev, "fail, gadget is not bound\n");
699	default:	722	ret = -EBUSY;
700	return false;	723	goto out_unlock;
		724	}
		725	if (dev->ep0_urb_queued) {
		726	dev_dbg(&dev->gadget->dev, "fail, urb already queued\n");
		727	ret = -EBUSY;
		728	goto out_unlock;
		729	}
		730	if (!dev->ep0_in_pending && !dev->ep0_out_pending) {
		731	dev_dbg(&dev->gadget->dev, "fail, no request pending\n");
		732	ret = -EBUSY;
		733	goto out_unlock;
701	}	734	}
702		735
703	if (usb_endpoint_dir_in(desc) && !ep->caps.dir_in)	736	ret = usb_ep_set_halt(dev->gadget->ep0);
704	return false;	737	if (ret < 0)
705	if (usb_endpoint_dir_out(desc) && !ep->caps.dir_out)	738	dev_err(&dev->gadget->dev,
706	return false;	739	"fail, usb_ep_set_halt returned %d\n", ret);
		740
		741	if (dev->ep0_in_pending)
		742	dev->ep0_in_pending = false;
		743	else
		744	dev->ep0_out_pending = false;
707		745
708	return true;	746	out_unlock:
		747	spin_unlock_irqrestore(&dev->lock, flags);
		748	return ret;
709	}	749	}
710		750
711	static int raw_ioctl_ep_enable(struct raw_dev *dev, unsigned long value)	751	static int raw_ioctl_ep_enable(struct raw_dev *dev, unsigned long value)
@@ -713,7 +753,7 @@ static int raw_ioctl_ep_enable(struct raw_dev *dev, unsigned long value) · 1 unmodified line
713	int ret = 0, i;	753	int ret = 0, i;
714	unsigned long flags;	754	unsigned long flags;
715	struct usb_endpoint_descriptor *desc;	755	struct usb_endpoint_descriptor *desc;
716	struct usb_ep *ep = NULL;	756	struct raw_ep *ep;
717		757
718	desc = memdup_user((void __user )value, sizeof(desc));	758	desc = memdup_user((void __user )value, sizeof(desc));
719	if (IS_ERR(desc))	759	if (IS_ERR(desc))
@@ -741,41 +781,32 @@ static int raw_ioctl_ep_enable(struct raw_dev *dev, unsigned long value) · 21 unmodified lines
741	goto out_free;	781	goto out_free;
742	}	782	}
743		783
744	for (i = 0; i < USB_RAW_MAX_ENDPOINTS; i++) {	784	for (i = 0; i < dev->eps_num; i++) {
745	if (dev->eps[i].state == STATE_EP_ENABLED)	785	ep = &dev->eps[i];
		786	if (ep->state != STATE_EP_DISABLED)
746	continue;	787	continue;
747	break;	788	if (ep->addr != usb_endpoint_num(desc) &&
748	}	789	ep->addr != USB_RAW_EP_ADDR_ANY)
749	if (i == USB_RAW_MAX_ENDPOINTS) {
750	dev_dbg(&dev->gadget->dev,
751	"fail, no device endpoints available\n");
752	ret = -EBUSY;
753	goto out_free;
754	}
755
756	gadget_for_each_ep(ep, dev->gadget) {
757	if (ep->enabled)
758	continue;	790	continue;
759	if (!check_ep_caps(ep, desc))	791	if (!usb_gadget_ep_match_desc(dev->gadget, ep->ep, desc, NULL))
760	continue;	792	continue;
761	ep->desc = desc;	793	ep->ep->desc = desc;
762	ret = usb_ep_enable(ep);	794	ret = usb_ep_enable(ep->ep);
763	if (ret < 0) {	795	if (ret < 0) {
764	dev_err(&dev->gadget->dev,	796	dev_err(&dev->gadget->dev,
765	"fail, usb_ep_enable returned %d\n", ret);	797	"fail, usb_ep_enable returned %d\n", ret);
766	goto out_free;	798	goto out_free;
767	}	799	}
768	dev->eps[i].req = usb_ep_alloc_request(ep, GFP_ATOMIC);	800	ep->req = usb_ep_alloc_request(ep->ep, GFP_ATOMIC);
769	if (!dev->eps[i].req) {	801	if (!ep->req) {
770	dev_err(&dev->gadget->dev,	802	dev_err(&dev->gadget->dev,
771	"fail, usb_ep_alloc_request failed\n");	803	"fail, usb_ep_alloc_request failed\n");
772	usb_ep_disable(ep);	804	usb_ep_disable(ep->ep);
773	ret = -ENOMEM;	805	ret = -ENOMEM;
774	goto out_free;	806	goto out_free;
775	}	807	}
776	dev->eps[i].ep = ep;	808	ep->state = STATE_EP_ENABLED;
777	dev->eps[i].state = STATE_EP_ENABLED;	809	ep->ep->driver_data = ep;
778	ep->driver_data = &dev->eps[i];
779	ret = i;	810	ret = i;
780	goto out_unlock;	811	goto out_unlock;
781	}	812	}
@@ -794,10 +825,6 @@ static int raw_ioctl_ep_disable(struct raw_dev *dev, unsigned long value) · 12 unmodified lines
794	{	825	{
795	int ret = 0, i = value;	826	int ret = 0, i = value;
796	unsigned long flags;	827	unsigned long flags;
797	const void *desc;
798
799	if (i < 0 \|\| i >= USB_RAW_MAX_ENDPOINTS)
800	return -EINVAL;
801		828
802	spin_lock_irqsave(&dev->lock, flags);	829	spin_lock_irqsave(&dev->lock, flags);
803	if (dev->state != STATE_DEV_RUNNING) {	830	if (dev->state != STATE_DEV_RUNNING) {
@@ -810,7 +837,12 @@ static int raw_ioctl_ep_disable(struct raw_dev *dev, unsigned long value) · 6 unmodified lines
810	ret = -EBUSY;	837	ret = -EBUSY;
811	goto out_unlock;	838	goto out_unlock;
812	}	839	}
813	if (dev->eps[i].state != STATE_EP_ENABLED) {	840	if (i < 0 \|\| i >= dev->eps_num) {
		841	dev_dbg(dev->dev, "fail, invalid endpoint\n");
		842	ret = -EBUSY;
		843	goto out_unlock;
		844	}
		845	if (dev->eps[i].state == STATE_EP_DISABLED) {
814	dev_dbg(&dev->gadget->dev, "fail, endpoint is not enabled\n");	846	dev_dbg(&dev->gadget->dev, "fail, endpoint is not enabled\n");
815	ret = -EINVAL;	847	ret = -EINVAL;
816	goto out_unlock;	848	goto out_unlock;
@@ -834,10 +866,8 @@ static int raw_ioctl_ep_disable(struct raw_dev *dev, unsigned long value) · 17 unmodified lines
834		866
835	spin_lock_irqsave(&dev->lock, flags);	867	spin_lock_irqsave(&dev->lock, flags);
836	usb_ep_free_request(dev->eps[i].ep, dev->eps[i].req);	868	usb_ep_free_request(dev->eps[i].ep, dev->eps[i].req);
837	desc = dev->eps[i].ep->desc;	869	kfree(dev->eps[i].ep->desc);
838	dev->eps[i].ep = NULL;
839	dev->eps[i].state = STATE_EP_DISABLED;	870	dev->eps[i].state = STATE_EP_DISABLED;
840	kfree(desc);
841	dev->eps[i].disabling = false;	871	dev->eps[i].disabling = false;
842		872
843	out_unlock:	873	out_unlock:
@@ -845,6 +875,74 @@ out_unlock: · 1 unmodified line
845	return ret;	875	return ret;
846	}	876	}
847		877
		878	static int raw_ioctl_ep_set_clear_halt_wedge(struct raw_dev *dev,
		879	unsigned long value, bool set, bool halt)
		880	{
		881	int ret = 0, i = value;
		882	unsigned long flags;
		883
		884	spin_lock_irqsave(&dev->lock, flags);
		885	if (dev->state != STATE_DEV_RUNNING) {
		886	dev_dbg(dev->dev, "fail, device is not running\n");
		887	ret = -EINVAL;
		888	goto out_unlock;
		889	}
		890	if (!dev->gadget) {
		891	dev_dbg(dev->dev, "fail, gadget is not bound\n");
		892	ret = -EBUSY;
		893	goto out_unlock;
		894	}
		895	if (i < 0 \|\| i >= dev->eps_num) {
		896	dev_dbg(dev->dev, "fail, invalid endpoint\n");
		897	ret = -EBUSY;
		898	goto out_unlock;
		899	}
		900	if (dev->eps[i].state == STATE_EP_DISABLED) {
		901	dev_dbg(&dev->gadget->dev, "fail, endpoint is not enabled\n");
		902	ret = -EINVAL;
		903	goto out_unlock;
		904	}
		905	if (dev->eps[i].disabling) {
		906	dev_dbg(&dev->gadget->dev,
		907	"fail, disable is in progress\n");
		908	ret = -EINVAL;
		909	goto out_unlock;
		910	}
		911	if (dev->eps[i].urb_queued) {
		912	dev_dbg(&dev->gadget->dev,
		913	"fail, waiting for urb completion\n");
		914	ret = -EINVAL;
		915	goto out_unlock;
		916	}
		917	if (usb_endpoint_xfer_isoc(dev->eps[i].ep->desc)) {
		918	dev_dbg(&dev->gadget->dev,
		919	"fail, can't halt/wedge ISO endpoint\n");
		920	ret = -EINVAL;
		921	goto out_unlock;
		922	}
		923
		924	if (set && halt) {
		925	ret = usb_ep_set_halt(dev->eps[i].ep);
		926	if (ret < 0)
		927	dev_err(&dev->gadget->dev,
		928	"fail, usb_ep_set_halt returned %d\n", ret);
		929	} else if (!set && halt) {
		930	ret = usb_ep_clear_halt(dev->eps[i].ep);
		931	if (ret < 0)
		932	dev_err(&dev->gadget->dev,
		933	"fail, usb_ep_clear_halt returned %d\n", ret);
		934	} else if (set && !halt) {
		935	ret = usb_ep_set_wedge(dev->eps[i].ep);
		936	if (ret < 0)
		937	dev_err(&dev->gadget->dev,
		938	"fail, usb_ep_set_wedge returned %d\n", ret);
		939	}
		940
		941	out_unlock:
		942	spin_unlock_irqrestore(&dev->lock, flags);
		943	return ret;
		944	}
		945
848	static void gadget_ep_complete(struct usb_ep ep, struct usb_request req)	946	static void gadget_ep_complete(struct usb_ep ep, struct usb_request req)
849	{	947	{
850	struct raw_ep r_ep = (struct raw_ep )ep->driver_data;	948	struct raw_ep r_ep = (struct raw_ep )ep->driver_data;
@@ -866,7 +964,7 @@ static int raw_process_ep_io(struct raw_dev dev, struct usb_raw_ep_io io, · 15 unmodified lines
866	{	964	{
867	int ret = 0;	965	int ret = 0;
868	unsigned long flags;	966	unsigned long flags;
869	struct raw_ep *ep = &dev->eps[io->ep];	967	struct raw_ep *ep;
870	DECLARE_COMPLETION_ONSTACK(done);	968	DECLARE_COMPLETION_ONSTACK(done);
871		969
872	spin_lock_irqsave(&dev->lock, flags);	970	spin_lock_irqsave(&dev->lock, flags);
@@ -880,6 +978,12 @@ static int raw_process_ep_io(struct raw_dev dev, struct usb_raw_ep_io io, · 7 unmodified lines
880	ret = -EBUSY;	978	ret = -EBUSY;
881	goto out_unlock;	979	goto out_unlock;
882	}	980	}
		981	if (io->ep >= dev->eps_num) {
		982	dev_dbg(&dev->gadget->dev, "fail, invalid endpoint\n");
		983	ret = -EINVAL;
		984	goto out_unlock;
		985	}
		986	ep = &dev->eps[io->ep];
883	if (ep->state != STATE_EP_ENABLED) {	987	if (ep->state != STATE_EP_ENABLED) {
884	dev_dbg(&dev->gadget->dev, "fail, endpoint is not enabled\n");	988	dev_dbg(&dev->gadget->dev, "fail, endpoint is not enabled\n");
885	ret = -EBUSY;	989	ret = -EBUSY;
@@ -964,12 +1068,14 @@ static int raw_ioctl_ep_read(struct raw_dev *dev, unsigned long value) · 78 unmodified lines
964	if (IS_ERR(data))	1068	if (IS_ERR(data))
965	return PTR_ERR(data);	1069	return PTR_ERR(data);
966	ret = raw_process_ep_io(dev, &io, data, false);	1070	ret = raw_process_ep_io(dev, &io, data, false);
967	if (ret)	1071	if (ret < 0)
968	goto free;	1072	goto free;
969		1073
970	length = min(io.length, (unsigned int)ret);	1074	length = min(io.length, (unsigned int)ret);
971	if (copy_to_user((void __user *)(value + sizeof(io)), data, length))	1075	if (copy_to_user((void __user *)(value + sizeof(io)), data, length))
972	ret = -EFAULT;	1076	ret = -EFAULT;
		1077	else
		1078	ret = length;
973	free:	1079	free:
974	kfree(data);	1080	kfree(data);
975	return ret;	1081	return ret;
@@ -1023,6 +1129,71 @@ out_unlock: · 47 unmodified lines
1023	return ret;	1129	return ret;
1024	}	1130	}
1025		1131
		1132	static void fill_ep_caps(struct usb_ep_caps *caps,
		1133	struct usb_raw_ep_caps *raw_caps)
		1134	{
		1135	raw_caps->type_control = caps->type_control;
		1136	raw_caps->type_iso = caps->type_iso;
		1137	raw_caps->type_bulk = caps->type_bulk;
		1138	raw_caps->type_int = caps->type_int;
		1139	raw_caps->dir_in = caps->dir_in;
		1140	raw_caps->dir_out = caps->dir_out;
		1141	}
		1142
		1143	static void fill_ep_limits(struct usb_ep ep, struct usb_raw_ep_limits limits)
		1144	{
		1145	limits->maxpacket_limit = ep->maxpacket_limit;
		1146	limits->max_streams = ep->max_streams;
		1147	}
		1148
		1149	static int raw_ioctl_eps_info(struct raw_dev *dev, unsigned long value)
		1150	{
		1151	int ret = 0, i;
		1152	unsigned long flags;
		1153	struct usb_raw_eps_info *info;
		1154	struct raw_ep *ep;
		1155
		1156	info = kmalloc(sizeof(*info), GFP_KERNEL);
		1157	if (!info) {
		1158	ret = -ENOMEM;
		1159	goto out;
		1160	}
		1161
		1162	spin_lock_irqsave(&dev->lock, flags);
		1163	if (dev->state != STATE_DEV_RUNNING) {
		1164	dev_dbg(dev->dev, "fail, device is not running\n");
		1165	ret = -EINVAL;
		1166	spin_unlock_irqrestore(&dev->lock, flags);
		1167	goto out_free;
		1168	}
		1169	if (!dev->gadget) {
		1170	dev_dbg(dev->dev, "fail, gadget is not bound\n");
		1171	ret = -EBUSY;
		1172	spin_unlock_irqrestore(&dev->lock, flags);
		1173	goto out_free;
		1174	}
		1175
		1176	memset(info, 0, sizeof(*info));
		1177	for (i = 0; i < dev->eps_num; i++) {
		1178	ep = &dev->eps[i];
		1179	strscpy(&info->eps[i].name[0], ep->ep->name,
		1180	USB_RAW_EP_NAME_MAX);
		1181	info->eps[i].addr = ep->addr;
		1182	fill_ep_caps(&ep->ep->caps, &info->eps[i].caps);
		1183	fill_ep_limits(ep->ep, &info->eps[i].limits);
		1184	}
		1185	ret = dev->eps_num;
		1186	spin_unlock_irqrestore(&dev->lock, flags);
		1187
		1188	if (copy_to_user((void __user )value, info, sizeof(info)))
		1189	ret = -EFAULT;
		1190
		1191	out_free:
		1192	kfree(info);
		1193	out:
		1194	return ret;
		1195	}
		1196
1026	static long raw_ioctl(struct file *fd, unsigned int cmd, unsigned long value)	1197	static long raw_ioctl(struct file *fd, unsigned int cmd, unsigned long value)
1027	{	1198	{
1028	struct raw_dev *dev = fd->private_data;	1199	struct raw_dev *dev = fd->private_data;
@@ -1065,6 +1236,24 @@ static long raw_ioctl(struct file *fd, unsigned int cmd, unsigned long value) · 36 unmodified lines
1065	case USB_RAW_IOCTL_VBUS_DRAW:	1236	case USB_RAW_IOCTL_VBUS_DRAW:
1066	ret = raw_ioctl_vbus_draw(dev, value);	1237	ret = raw_ioctl_vbus_draw(dev, value);
1067	break;	1238	break;
		1239	case USB_RAW_IOCTL_EPS_INFO:
		1240	ret = raw_ioctl_eps_info(dev, value);
		1241	break;
		1242	case USB_RAW_IOCTL_EP0_STALL:
		1243	ret = raw_ioctl_ep0_stall(dev, value);
		1244	break;
		1245	case USB_RAW_IOCTL_EP_SET_HALT:
		1246	ret = raw_ioctl_ep_set_clear_halt_wedge(
		1247	dev, value, true, true);
		1248	break;
		1249	case USB_RAW_IOCTL_EP_CLEAR_HALT:
		1250	ret = raw_ioctl_ep_set_clear_halt_wedge(
		1251	dev, value, false, true);
		1252	break;
		1253	case USB_RAW_IOCTL_EP_SET_WEDGE:
		1254	ret = raw_ioctl_ep_set_clear_halt_wedge(
		1255	dev, value, true, false);
		1256	break;
1068	default:	1257	default:
1069	ret = -EINVAL;	1258	ret = -EINVAL;
1070	}	1259	}

drivers/usb/gadget/udc/atmel_usba_udc.c+2−2

@@ -185,7 +185,7 @@ static int regs_dbg_release(struct inode inode, struct file file) · 184 unmodified lines
185	return 0;	185	return 0;
186	}	186	}
187		187
188	const struct file_operations queue_dbg_fops = {	188	static const struct file_operations queue_dbg_fops = {
189	.owner = THIS_MODULE,	189	.owner = THIS_MODULE,
190	.open = queue_dbg_open,	190	.open = queue_dbg_open,
191	.llseek = no_llseek,	191	.llseek = no_llseek,
@@ -193,7 +193,7 @@ const struct file_operations queue_dbg_fops = { · 1 unmodified line
193	.release = queue_dbg_release,	193	.release = queue_dbg_release,
194	};	194	};
195		195
196	const struct file_operations regs_dbg_fops = {	196	static const struct file_operations regs_dbg_fops = {
197	.owner = THIS_MODULE,	197	.owner = THIS_MODULE,
198	.open = regs_dbg_open,	198	.open = regs_dbg_open,
199	.llseek = generic_file_llseek,	199	.llseek = generic_file_llseek,

drivers/usb/gadget/udc/net2272.c+2−0

@@ -2647,6 +2647,8 @@ net2272_plat_probe(struct platform_device *pdev) · 2646 unmodified lines
2647	err_req:	2647	err_req:
2648	release_mem_region(base, len);	2648	release_mem_region(base, len);
2649	err:	2649	err:
		2650	kfree(dev);
		2651
2650	return ret;	2652	return ret;
2651	}	2653	}
2652		2654

drivers/usb/gadget/udc/tegra-xudc.c+4−4

@@ -3840,11 +3840,11 @@ static int __maybe_unused tegra_xudc_suspend(struct device *dev) · 3839 unmodified lines
3840		3840
3841	flush_work(&xudc->usb_role_sw_work);	3841	flush_work(&xudc->usb_role_sw_work);
3842		3842
3843	/* Forcibly disconnect before powergating. */	3843	if (!pm_runtime_status_suspended(dev)) {
3844	tegra_xudc_device_mode_off(xudc);	3844	/* Forcibly disconnect before powergating. */
3845		3845	tegra_xudc_device_mode_off(xudc);
3846	if (!pm_runtime_status_suspended(dev))
3847	tegra_xudc_powergate(xudc);	3846	tegra_xudc_powergate(xudc);
		3847	}
3848		3848
3849	pm_runtime_disable(dev);	3849	pm_runtime_disable(dev);
3850		3850

drivers/usb/host/xhci-plat.c+3−1

 	struct clk *reg_clk = xhci->reg_clk;
 	struct usb_hcd *shared_hcd = xhci->shared_hcd;
+	pm_runtime_get_sync(&dev->dev);
 	xhci->xhc_state |= XHCI_STATE_REMOVING;
 	usb_remove_hcd(shared_hcd);
 	clk_disable_unprepare(reg_clk);
 	usb_put_hcd(hcd);
-	pm_runtime_set_suspended(&dev->dev);
 	pm_runtime_disable(&dev->dev);
+	pm_runtime_put_noidle(&dev->dev);
+	pm_runtime_set_suspended(&dev->dev);
 	return 0;
 }

drivers/usb/host/xhci-ring.c+2−2

@@ -3433,8 +3433,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, · 3432 unmodified lines
3433	/* New sg entry */	3433	/* New sg entry */
3434	--num_sgs;	3434	--num_sgs;
3435	sent_len -= block_len;	3435	sent_len -= block_len;
3436	if (num_sgs != 0) {	3436	sg = sg_next(sg);
3437	sg = sg_next(sg);	3437	if (num_sgs != 0 && sg) {
3438	block_len = sg_dma_len(sg);	3438	block_len = sg_dma_len(sg);
3439	addr = (u64) sg_dma_address(sg);	3439	addr = (u64) sg_dma_address(sg);
3440	addr += sent_len;	3440	addr += sent_len;

drivers/usb/mtu3/mtu3_debugfs.c+2−2

@@ -276,7 +276,7 @@ static const struct file_operations mtu3_ep_fops = { · 275 unmodified lines
276	.release = single_release,	276	.release = single_release,
277	};	277	};
278		278
279	static struct debugfs_reg32 mtu3_prb_regs[] = {	279	static const struct debugfs_reg32 mtu3_prb_regs[] = {
280	dump_prb_reg("enable", U3D_SSUSB_PRB_CTRL0),	280	dump_prb_reg("enable", U3D_SSUSB_PRB_CTRL0),
281	dump_prb_reg("byte-sell", U3D_SSUSB_PRB_CTRL1),	281	dump_prb_reg("byte-sell", U3D_SSUSB_PRB_CTRL1),
282	dump_prb_reg("byte-selh", U3D_SSUSB_PRB_CTRL2),	282	dump_prb_reg("byte-selh", U3D_SSUSB_PRB_CTRL2),
@@ -349,7 +349,7 @@ static const struct file_operations mtu3_probe_fops = { · 66 unmodified lines
349	static void mtu3_debugfs_create_prb_files(struct mtu3 *mtu)	349	static void mtu3_debugfs_create_prb_files(struct mtu3 *mtu)
350	{	350	{
351	struct ssusb_mtk *ssusb = mtu->ssusb;	351	struct ssusb_mtk *ssusb = mtu->ssusb;
352	struct debugfs_reg32 *regs;	352	const struct debugfs_reg32 *regs;
353	struct dentry *dir_prb;	353	struct dentry *dir_prb;
354	int i;	354	int i;
355		355

drivers/usb/phy/phy-twl6030-usb.c+9−3

 	if (status < 0) {
 		dev_err(&pdev->dev, "can't get IRQ %d, err %d\n",
 			twl->irq1, status);
-		return status;
+		goto err_put_regulator;
 	}
 	status = request_threaded_irq(twl->irq2, NULL, twl6030_usb_irq,
 	if (status < 0) {
 		dev_err(&pdev->dev, "can't get IRQ %d, err %d\n",
 			twl->irq2, status);
-		free_irq(twl->irq1, twl);
+		goto err_free_irq1;
-		return status;
 	}
 	twl->asleep = 0;
 	dev_info(&pdev->dev, "Initialized TWL6030 USB module\n");
 	return 0;
+err_free_irq1:
+	free_irq(twl->irq1, twl);
+err_put_regulator:
+	regulator_put(twl->usb3v3);
+	return status;
 }
 static int twl6030_usb_remove(struct platform_device *pdev)

drivers/usb/typec/mux/intel_pmc_mux.c+3−3

 #define PMC_USB_ALTMODE_DP_MODE_SHIFT	8
 /* TBT specific Mode Data bits */
+#define PMC_USB_ALTMODE_HPD_HIGH	BIT(14)
 #define PMC_USB_ALTMODE_TBT_TYPE	BIT(17)
 #define PMC_USB_ALTMODE_CABLE_TYPE	BIT(18)
 #define PMC_USB_ALTMODE_ACTIVE_LINK	BIT(20)
 #define PMC_USB_ALTMODE_TBT_GEN(_g_)	(((_g_) & GENMASK(1, 0)) << 28)
 /* Display HPD Request bits */
+#define PMC_USB_DP_HPD_LVL		BIT(4)
 #define PMC_USB_DP_HPD_IRQ		BIT(5)
-#define PMC_USB_DP_HPD_LVL		BIT(6)
 struct pmc_usb;
 			 PMC_USB_ALTMODE_DP_MODE_SHIFT;
 	if (data->status & DP_STATUS_HPD_STATE)
-		req.mode_data |= PMC_USB_DP_HPD_LVL <<
+		req.mode_data |= PMC_USB_ALTMODE_HPD_HIGH;
-				 PMC_USB_ALTMODE_DP_MODE_SHIFT;
 	return pmc_usb_command(port, (void *)&req, sizeof(req));
 }

drivers/vdpa/vdpa_sim/vdpa_sim.c+7−8

@@ -89,15 +89,14 @@ static struct vdpasim dev_to_sim(struct device dev) · 88 unmodified lines
89	static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx)	89	static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx)
90	{	90	{
91	struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx];	91	struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx];
92	int ret;
93		92
94	ret = vringh_init_iotlb(&vq->vring, vdpasim_features,	93	vringh_init_iotlb(&vq->vring, vdpasim_features,
95	VDPASIM_QUEUE_MAX, false,	94	VDPASIM_QUEUE_MAX, false,
96	(struct vring_desc *)(uintptr_t)vq->desc_addr,	95	(struct vring_desc *)(uintptr_t)vq->desc_addr,
97	(struct vring_avail *)	96	(struct vring_avail *)
98	(uintptr_t)vq->driver_addr,	97	(uintptr_t)vq->driver_addr,
99	(struct vring_used *)	98	(struct vring_used *)
100	(uintptr_t)vq->device_addr);	99	(uintptr_t)vq->device_addr);
101	}	100	}
102		101
103	static void vdpasim_vq_reset(struct vdpasim_virtqueue *vq)	102	static void vdpasim_vq_reset(struct vdpasim_virtqueue *vq)

drivers/vhost/vhost.c+2−2

@@ -730,7 +730,7 @@ static inline void __user vhost_vq_meta_fetch(struct vhost_virtqueue vq, · 729 unmodified lines
730	if (!map)	730	if (!map)
731	return NULL;	731	return NULL;
732		732
733	return (void *)(uintptr_t)(map->addr + addr - map->start);	733	return (void __user *)(uintptr_t)(map->addr + addr - map->start);
734	}	734	}
735		735
736	/* Can we switch to this memory table? */	736	/* Can we switch to this memory table? */
@@ -869,7 +869,7 @@ static void __user __vhost_get_user_slow(struct vhost_virtqueue vq, · 132 unmodified lines
869	* not happen in this case.	869	* not happen in this case.
870	*/	870	*/
871	static inline void __user __vhost_get_user(struct vhost_virtqueue vq,	871	static inline void __user __vhost_get_user(struct vhost_virtqueue vq,
872	void *addr, unsigned int size,	872	void __user *addr, unsigned int size,
873	int type)	873	int type)
874	{	874	{
875	void __user *uaddr = vhost_vq_meta_fetch(vq,	875	void __user *uaddr = vhost_vq_meta_fetch(vq,

fs/afs/fs_probe.c+5−13

 	struct afs_server *server = call->server;
 	unsigned int server_index = call->server_index;
 	unsigned int index = call->addr_ix;
-	unsigned int rtt = UINT_MAX;
+	unsigned int rtt_us = 0;
 	bool have_result = false;
-	u64 _rtt;
 	int ret = call->error;
 	_enter("%pU,%u", &server->uuid, index);
 		}
 	}
-	/* Get the RTT and scale it to fit into a 32-bit value that represents
+	rtt_us = rxrpc_kernel_get_srtt(call->net->socket, call->rxcall);
-	 * over a minute of time so that we can access it with one instruction
+	if (rtt_us < server->probe.rtt) {
-	 * on a 32-bit system.
+		server->probe.rtt = rtt_us;
-	 */
-	_rtt = rxrpc_kernel_get_rtt(call->net->socket, call->rxcall);
-	_rtt /= 64;
-	rtt = (_rtt > UINT_MAX) ? UINT_MAX : _rtt;
-	if (rtt < server->probe.rtt) {
-		server->probe.rtt = rtt;
 		alist->preferred = index;
 		have_result = true;
 	}
 	spin_unlock(&server->probe_lock);
 	_debug("probe [%u][%u] %pISpc rtt=%u ret=%d",
-	       server_index, index, &alist->addrs[index].transport,
+	       server_index, index, &alist->addrs[index].transport, rtt_us, ret);
-	       (unsigned int)rtt, ret);
 	have_result |= afs_fs_probe_done(server);
 	if (have_result)

fs/afs/fsclient.c+4−4

 		ASSERTCMP(req->offset, <=, PAGE_SIZE);
 		if (req->offset == PAGE_SIZE) {
 			req->offset = 0;
-			if (req->page_done)
-				req->page_done(req);
 			req->index++;
 			if (req->remain > 0)
 				goto begin_page;
 		if (req->offset < PAGE_SIZE)
 			zero_user_segment(req->pages[req->index],
 					  req->offset, PAGE_SIZE);
-		if (req->page_done)
-			req->page_done(req);
 		req->offset = 0;
 	}
+	if (req->page_done)
+		for (req->index = 0; req->index < req->nr_pages; req->index++)
+			req->page_done(req);
 	_leave(" = 0 [done]");
 	return 0;
 }

fs/afs/vl_probe.c+5−13

 	struct afs_addr_list *alist = call->alist;
 	struct afs_vlserver *server = call->vlserver;
 	unsigned int server_index = call->server_index;
+	unsigned int rtt_us = 0;
 	unsigned int index = call->addr_ix;
-	unsigned int rtt = UINT_MAX;
 	bool have_result = false;
-	u64 _rtt;
 	int ret = call->error;
 	_enter("%s,%u,%u,%d,%d", server->name, server_index, index, ret, call->abort_code);
 		}
 	}
-	/* Get the RTT and scale it to fit into a 32-bit value that represents
+	rtt_us = rxrpc_kernel_get_srtt(call->net->socket, call->rxcall);
-	 * over a minute of time so that we can access it with one instruction
+	if (rtt_us < server->probe.rtt) {
-	 * on a 32-bit system.
+		server->probe.rtt = rtt_us;
-	 */
-	_rtt = rxrpc_kernel_get_rtt(call->net->socket, call->rxcall);
-	_rtt /= 64;
-	rtt = (_rtt > UINT_MAX) ? UINT_MAX : _rtt;
-	if (rtt < server->probe.rtt) {
-		server->probe.rtt = rtt;
 		alist->preferred = index;
 		have_result = true;
 	}
 	spin_unlock(&server->probe_lock);
 	_debug("probe [%u][%u] %pISpc rtt=%u ret=%d",
-	       server_index, index, &alist->addrs[index].transport,
+	       server_index, index, &alist->addrs[index].transport, rtt_us, ret);
-	       (unsigned int)rtt, ret);
 	have_result |= afs_vl_probe_done(server);
 	if (have_result) {

fs/afs/yfsclient.c+4−4

 		ASSERTCMP(req->offset, <=, PAGE_SIZE);
 		if (req->offset == PAGE_SIZE) {
 			req->offset = 0;
-			if (req->page_done)
-				req->page_done(req);
 			req->index++;
 			if (req->remain > 0)
 				goto begin_page;
 		if (req->offset < PAGE_SIZE)
 			zero_user_segment(req->pages[req->index],
 					  req->offset, PAGE_SIZE);
-		if (req->page_done)
-			req->page_done(req);
 		req->offset = 0;
 	}
+	if (req->page_done)
+		for (req->index = 0; req->index < req->nr_pages; req->index++)
+			req->page_done(req);
 	_leave(" = 0 [done]");
 	return 0;
 }

fs/cachefiles/rdwr.c+6−6

 	object = container_of(op->op.object, struct cachefiles_object, fscache);
 	spin_lock(&object->work_lock);
 	list_add_tail(&monitor->op_link, &op->to_do);
+	fscache_enqueue_retrieval(op);
 	spin_unlock(&object->work_lock);
-	fscache_enqueue_retrieval(op);
 	fscache_put_retrieval(op);
 	return 0;
 }
 	struct inode *inode;
 	sector_t block;
 	unsigned shift;
-	int ret;
+	int ret, ret2;
 	object = container_of(op->op.object,
 			      struct cachefiles_object, fscache);
 	block = page->index;
 	block <<= shift;
-	ret = bmap(inode, &block);
+	ret2 = bmap(inode, &block);
-	ASSERT(ret < 0);
+	ASSERT(ret2 == 0);
 	_debug("%llx -> %llx",
 	       (unsigned long long) (page->index << shift),
 		block = page->index;
 		block <<= shift;
-		ret = bmap(inode, &block);
+		ret2 = bmap(inode, &block);
-		ASSERT(!ret);
+		ASSERT(ret2 == 0);
 		_debug("%llx -> %llx",
 		       (unsigned long long) (page->index << shift),

fs/cifs/cifssmb.c+1−1

 			}
 		}
+		kref_put(&wdata2->refcount, cifs_writedata_release);
 		if (rc) {
-			kref_put(&wdata2->refcount, cifs_writedata_release);
 			if (is_retryable_error(rc))
 				continue;
 			i += nr_pages;

fs/cifs/file.c+1−1

@@ -4060,7 +4060,7 @@ cifs_read(struct file file, char read_data, size_t read_size, loff_t *offset) · 4059 unmodified lines
4060	* than it negotiated since it will refuse the read	4060	* than it negotiated since it will refuse the read
4061	* then.	4061	* then.
4062	*/	4062	*/
4063	if ((tcon->ses) && !(tcon->ses->capabilities &	4063	if (!(tcon->ses->capabilities &
4064	tcon->ses->server->vals->cap_large_files)) {	4064	tcon->ses->server->vals->cap_large_files)) {
4065	current_read_size = min_t(uint,	4065	current_read_size = min_t(uint,
4066	current_read_size, CIFSMaxBufSize);	4066	current_read_size, CIFSMaxBufSize);

fs/cifs/inode.c+1−1

@@ -730,7 +730,7 @@ static __u64 simple_hashstr(const char *str) · 729 unmodified lines
730	* cifs_backup_query_path_info - SMB1 fallback code to get ino	730	* cifs_backup_query_path_info - SMB1 fallback code to get ino
731	*	731	*
732	* Fallback code to get file metadata when we don't have access to	732	* Fallback code to get file metadata when we don't have access to
733	* @full_path (EACCESS) and have backup creds.	733	* @full_path (EACCES) and have backup creds.
734	*	734	*
735	* @data will be set to search info result buffer	735	* @data will be set to search info result buffer
736	* @resp_buf will be set to cifs resp buf and needs to be freed with	736	* @resp_buf will be set to cifs resp buf and needs to be freed with

fs/eventpoll.c+28−20

 		 * event delivery.
 		 */
 		init_wait(&wait);
-		write_lock_irq(&ep->lock);
-		__add_wait_queue_exclusive(&ep->wq, &wait);
-		write_unlock_irq(&ep->lock);
+		write_lock_irq(&ep->lock);
 		/*
-		 * We don't want to sleep if the ep_poll_callback() sends us
+		 * Barrierless variant, waitqueue_active() is called under
-		 * a wakeup in between. That's why we set the task state
+		 * the same lock on wakeup ep_poll_callback() side, so it
-		 * to TASK_INTERRUPTIBLE before doing the checks.
+		 * is safe to avoid an explicit barrier.
 		 */
-		set_current_state(TASK_INTERRUPTIBLE);
+		__set_current_state(TASK_INTERRUPTIBLE);
 		/*
-		 * Always short-circuit for fatal signals to allow
+		 * Do the final check under the lock. ep_scan_ready_list()
-		 * threads to make a timely exit without the chance of
+		 * plays with two lists (->rdllist and ->ovflist) and there
-		 * finding more events available and fetching
+		 * is always a race when both lists are empty for short
-		 * repeatedly.
+		 * period of time although events are pending, so lock is
+		 * important.
 		 */
-		if (fatal_signal_pending(current)) {
+		eavail = ep_events_available(ep);
-			res = -EINTR;
+		if (!eavail) {
-			break;
+			if (signal_pending(current))
+				res = -EINTR;
+			else
+				__add_wait_queue_exclusive(&ep->wq, &wait);
 		}
+		write_unlock_irq(&ep->lock);
-		eavail = ep_events_available(ep);
+		if (eavail || res)
-		if (eavail)
-			break;
-		if (signal_pending(current)) {
-			res = -EINTR;
 			break;
-		}
 		if (!schedule_hrtimeout_range(to, slack, HRTIMER_MODE_ABS)) {
 			timed_out = 1;
 	}
 send_events:
+	if (fatal_signal_pending(current)) {
+		/*
+		 * Always short-circuit for fatal signals to allow
+		 * threads to make a timely exit without the chance of
+		 * finding more events available and fetching
+		 * repeatedly.
+		 */
+		res = -EINTR;
+	}
 	/*
 	 * Try to transfer events to user space. In case we get 0 events and
 	 * there's still timeout left over, we go trying again in search of

fs/exec.c+2−2

 	 */
 	set_mm_exe_file(bprm->mm, bprm->file);
+	would_dump(bprm, bprm->file);
 	/*
 	 * Release all of the old mmap stuff
 	 */
 	if (retval < 0)
 		goto out;
-	would_dump(bprm, bprm->file);
 	retval = exec_binprm(bprm);
 	if (retval < 0)
 		goto out;

fs/exfat/file.c+7−6

@@ -348,12 +348,13 @@ out: · 347 unmodified lines
348	}	348	}
349		349
350	const struct file_operations exfat_file_operations = {	350	const struct file_operations exfat_file_operations = {
351	.llseek = generic_file_llseek,	351	.llseek = generic_file_llseek,
352	.read_iter = generic_file_read_iter,	352	.read_iter = generic_file_read_iter,
353	.write_iter = generic_file_write_iter,	353	.write_iter = generic_file_write_iter,
354	.mmap = generic_file_mmap,	354	.mmap = generic_file_mmap,
355	.fsync = generic_file_fsync,	355	.fsync = generic_file_fsync,
356	.splice_read = generic_file_splice_read,	356	.splice_read = generic_file_splice_read,
		357	.splice_write = iter_file_splice_write,
357	};	358	};
358		359
359	const struct inode_operations exfat_file_inode_operations = {	360	const struct inode_operations exfat_file_inode_operations = {

fs/exfat/namei.c+1−0

@@ -692,6 +692,7 @@ static int exfat_find(struct inode dir, struct qstr qname, · 691 unmodified lines
692	exfat_fs_error(sb,	692	exfat_fs_error(sb,
693	"non-zero size file starts with zero cluster (size : %llu, p_dir : %u, entry : 0x%08x)",	693	"non-zero size file starts with zero cluster (size : %llu, p_dir : %u, entry : 0x%08x)",
694	i_size_read(dir), ei->dir.dir, ei->entry);	694	i_size_read(dir), ei->dir.dir, ei->entry);
		695	kfree(es);
695	return -EIO;	696	return -EIO;
696	}	697	}
697		698

fs/exfat/super.c+19−0

@@ -203,6 +203,12 @@ enum { · 202 unmodified lines
203	Opt_errors,	203	Opt_errors,
204	Opt_discard,	204	Opt_discard,
205	Opt_time_offset,	205	Opt_time_offset,
		206
		207	/* Deprecated options */
		208	Opt_utf8,
		209	Opt_debug,
		210	Opt_namecase,
		211	Opt_codepage,
206	};	212	};
207		213
208	static const struct constant_table exfat_param_enums[] = {	214	static const struct constant_table exfat_param_enums[] = {
@@ -223,6 +229,14 @@ static const struct fs_parameter_spec exfat_parameters[] = { · 14 unmodified lines
223	fsparam_enum("errors", Opt_errors, exfat_param_enums),	229	fsparam_enum("errors", Opt_errors, exfat_param_enums),
224	fsparam_flag("discard", Opt_discard),	230	fsparam_flag("discard", Opt_discard),
225	fsparam_s32("time_offset", Opt_time_offset),	231	fsparam_s32("time_offset", Opt_time_offset),
		232	__fsparam(NULL, "utf8", Opt_utf8, fs_param_deprecated,
		233	NULL),
		234	__fsparam(NULL, "debug", Opt_debug, fs_param_deprecated,
		235	NULL),
		236	__fsparam(fs_param_is_u32, "namecase", Opt_namecase,
		237	fs_param_deprecated, NULL),
		238	__fsparam(fs_param_is_u32, "codepage", Opt_codepage,
		239	fs_param_deprecated, NULL),
226	{}	240	{}
227	};	241	};
228		242
@@ -278,6 +292,11 @@ static int exfat_parse_param(struct fs_context fc, struct fs_parameter param) · 49 unmodified lines
278	return -EINVAL;	292	return -EINVAL;
279	opts->time_offset = result.int_32;	293	opts->time_offset = result.int_32;
280	break;	294	break;
		295	case Opt_utf8:
		296	case Opt_debug:
		297	case Opt_namecase:
		298	case Opt_codepage:
		299	break;
281	default:	300	default:
282	return -EINVAL;	301	return -EINVAL;
283	}	302	}

fs/ext4/ext4.h+1−1

@@ -722,7 +722,7 @@ enum { · 721 unmodified lines
722	#define EXT4_MAX_BLOCK_FILE_PHYS 0xFFFFFFFF	722	#define EXT4_MAX_BLOCK_FILE_PHYS 0xFFFFFFFF
723		723
724	/* Max logical block we can support */	724	/* Max logical block we can support */
725	#define EXT4_MAX_LOGICAL_BLOCK 0xFFFFFFFF	725	#define EXT4_MAX_LOGICAL_BLOCK 0xFFFFFFFE
726		726
727	/*	727	/*
728	* Structure of an inode on the disk	728	* Structure of an inode on the disk

fs/ext4/extents.c+31−0

@@ -4832,6 +4832,28 @@ static const struct iomap_ops ext4_iomap_xattr_ops = { · 4831 unmodified lines
4832	.iomap_begin = ext4_iomap_xattr_begin,	4832	.iomap_begin = ext4_iomap_xattr_begin,
4833	};	4833	};
4834		4834
		4835	static int ext4_fiemap_check_ranges(struct inode inode, u64 start, u64 len)
		4836	{
		4837	u64 maxbytes;
		4838
		4839	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
		4840	maxbytes = inode->i_sb->s_maxbytes;
		4841	else
		4842	maxbytes = EXT4_SB(inode->i_sb)->s_bitmap_maxbytes;
		4843
		4844	if (*len == 0)
		4845	return -EINVAL;
		4846	if (start > maxbytes)
		4847	return -EFBIG;
		4848
		4849	/*
		4850	* Shrink request scope to what the fs can actually handle.
		4851	*/
		4852	if (len > maxbytes \|\| (maxbytes - len) < start)
		4853	*len = maxbytes - start;
		4854	return 0;
		4855	}
		4856
4835	static int _ext4_fiemap(struct inode inode, struct fiemap_extent_info fieinfo,	4857	static int _ext4_fiemap(struct inode inode, struct fiemap_extent_info fieinfo,
4836	__u64 start, __u64 len, bool from_es_cache)	4858	__u64 start, __u64 len, bool from_es_cache)
4837	{	4859	{
@@ -4852,6 +4874,15 @@ static int _ext4_fiemap(struct inode inode, struct fiemap_extent_info fieinfo, · 14 unmodified lines
4852	if (fiemap_check_flags(fieinfo, ext4_fiemap_flags))	4874	if (fiemap_check_flags(fieinfo, ext4_fiemap_flags))
4853	return -EBADR;	4875	return -EBADR;
4854		4876
		4877	/*
		4878	* For bitmap files the maximum size limit could be smaller than
		4879	* s_maxbytes, so check len here manually instead of just relying on the
		4880	* generic check.
		4881	*/
		4882	error = ext4_fiemap_check_ranges(inode, start, &len);
		4883	if (error)
		4884	return error;
		4885
4855	if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) {	4886	if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) {
4856	fieinfo->fi_flags &= ~FIEMAP_FLAG_XATTR;	4887	fieinfo->fi_flags &= ~FIEMAP_FLAG_XATTR;
4857	error = iomap_fiemap(inode, fieinfo, start, len,	4888	error = iomap_fiemap(inode, fieinfo, start, len,

fs/ext4/ioctl.c+2−31

@@ -733,29 +733,6 @@ static void ext4_fill_fsxattr(struct inode inode, struct fsxattr fa) · 732 unmodified lines
733	fa->fsx_projid = from_kprojid(&init_user_ns, ei->i_projid);	733	fa->fsx_projid = from_kprojid(&init_user_ns, ei->i_projid);
734	}	734	}
735		735
736	/* copied from fs/ioctl.c */
737	static int fiemap_check_ranges(struct super_block *sb,
738	u64 start, u64 len, u64 *new_len)
739	{
740	u64 maxbytes = (u64) sb->s_maxbytes;
741
742	*new_len = len;
743
744	if (len == 0)
745	return -EINVAL;
746
747	if (start > maxbytes)
748	return -EFBIG;
749
750	/*
751	* Shrink request scope to what the fs can actually handle.
752	*/
753	if (len > maxbytes \|\| (maxbytes - len) < start)
754	*new_len = maxbytes - start;
755
756	return 0;
757	}
758
759	/* So that the fiemap access checks can't overflow on 32 bit machines. */	736	/* So that the fiemap access checks can't overflow on 32 bit machines. */
760	#define FIEMAP_MAX_EXTENTS (UINT_MAX / sizeof(struct fiemap_extent))	737	#define FIEMAP_MAX_EXTENTS (UINT_MAX / sizeof(struct fiemap_extent))
761		738
@@ -765,8 +742,6 @@ static int ext4_ioctl_get_es_cache(struct file *filp, unsigned long arg) · 3 unmodified lines
765	struct fiemap __user ufiemap = (struct fiemap __user ) arg;	742	struct fiemap __user ufiemap = (struct fiemap __user ) arg;
766	struct fiemap_extent_info fieinfo = { 0, };	743	struct fiemap_extent_info fieinfo = { 0, };
767	struct inode *inode = file_inode(filp);	744	struct inode *inode = file_inode(filp);
768	struct super_block *sb = inode->i_sb;
769	u64 len;
770	int error;	745	int error;
771		746
772	if (copy_from_user(&fiemap, ufiemap, sizeof(fiemap)))	747	if (copy_from_user(&fiemap, ufiemap, sizeof(fiemap)))
@@ -775,11 +750,6 @@ static int ext4_ioctl_get_es_cache(struct file *filp, unsigned long arg) · 2 unmodified lines
775	if (fiemap.fm_extent_count > FIEMAP_MAX_EXTENTS)	750	if (fiemap.fm_extent_count > FIEMAP_MAX_EXTENTS)
776	return -EINVAL;	751	return -EINVAL;
777		752
778	error = fiemap_check_ranges(sb, fiemap.fm_start, fiemap.fm_length,
779	&len);
780	if (error)
781	return error;
782
783	fieinfo.fi_flags = fiemap.fm_flags;	753	fieinfo.fi_flags = fiemap.fm_flags;
784	fieinfo.fi_extents_max = fiemap.fm_extent_count;	754	fieinfo.fi_extents_max = fiemap.fm_extent_count;
785	fieinfo.fi_extents_start = ufiemap->fm_extents;	755	fieinfo.fi_extents_start = ufiemap->fm_extents;
@@ -792,7 +762,8 @@ static int ext4_ioctl_get_es_cache(struct file *filp, unsigned long arg) · 6 unmodified lines
792	if (fieinfo.fi_flags & FIEMAP_FLAG_SYNC)	762	if (fieinfo.fi_flags & FIEMAP_FLAG_SYNC)
793	filemap_write_and_wait(inode->i_mapping);	763	filemap_write_and_wait(inode->i_mapping);
794		764
795	error = ext4_get_es_cache(inode, &fieinfo, fiemap.fm_start, len);	765	error = ext4_get_es_cache(inode, &fieinfo, fiemap.fm_start,
		766	fiemap.fm_length);
796	fiemap.fm_flags = fieinfo.fi_flags;	767	fiemap.fm_flags = fieinfo.fi_flags;
797	fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped;	768	fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped;
798	if (copy_to_user(ufiemap, &fiemap, sizeof(fiemap)))	769	if (copy_to_user(ufiemap, &fiemap, sizeof(fiemap)))

fs/file.c+1−1

@@ -70,7 +70,7 @@ static void copy_fd_bitmaps(struct fdtable nfdt, struct fdtable ofdt, · 69 unmodified lines
70	*/	70	*/
71	static void copy_fdtable(struct fdtable nfdt, struct fdtable ofdt)	71	static void copy_fdtable(struct fdtable nfdt, struct fdtable ofdt)
72	{	72	{
73	unsigned int cpy, set;	73	size_t cpy, set;
74		74
75	BUG_ON(nfdt->max_fds < ofdt->max_fds);	75	BUG_ON(nfdt->max_fds < ofdt->max_fds);
76		76

fs/gfs2/bmap.c+9−7

 		/* Advance in metadata tree. */
 		(mp->mp_list[hgt])++;
-		if (mp->mp_list[hgt] >= sdp->sd_inptrs) {
+		if (hgt) {
-			if (!hgt)
+			if (mp->mp_list[hgt] >= sdp->sd_inptrs)
+				goto lower_metapath;
+		} else {
+			if (mp->mp_list[hgt] >= sdp->sd_diptrs)
 				break;
-			goto lower_metapath;
 		}
 fill_up_metapath:
 					ret = -ENOENT;
 					goto unlock;
 				} else {
-					/* report a hole */
 					iomap->offset = pos;
 					iomap->length = length;
-					goto do_alloc;
+					goto hole_found;
 				}
 			}
 			iomap->length = size;
 	return ret;
 do_alloc:
-	iomap->addr = IOMAP_NULL_ADDR;
-	iomap->type = IOMAP_HOLE;
 	if (flags & IOMAP_REPORT) {
 		if (pos >= size)
 			ret = -ENOENT;
 		if (pos < size && height == ip->i_height)
 			ret = gfs2_hole_size(inode, lblock, len, mp, iomap);
 	}
+hole_found:
+	iomap->addr = IOMAP_NULL_ADDR;
+	iomap->type = IOMAP_HOLE;
 	goto out;
 }

fs/gfs2/glock.c+2−4

 				fs_err(sdp, "Error %d syncing glock \n", ret);
 				gfs2_dump_glock(NULL, gl, true);
 			}
-			return;
+			goto skip_inval;
 		}
 	}
 	if (test_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags)) {
 		clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags);
 	}
+skip_inval:
 	gfs2_glock_hold(gl);
 	/*
 	 * Check for an error encountered since we called go_sync and go_inval.
 			goto out_unlock;
 		if (nonblock)
 			goto out_sched;
-		smp_mb();
-		if (atomic_read(&gl->gl_revokes) != 0)
-			goto out_sched;
 		set_bit(GLF_DEMOTE_IN_PROGRESS, &gl->gl_flags);
 		GLOCK_BUG_ON(gl, gl->gl_demote_state == LM_ST_EXCLUSIVE);
 		gl->gl_target = gl->gl_demote_state;

fs/gfs2/inode.c+4−3

 				error = finish_no_open(file, NULL);
 		}
 		gfs2_glock_dq_uninit(ghs);
-		return error;
+		goto fail;
 	} else if (error != -ENOENT) {
 		goto fail_gunlock;
 	}
 		error = finish_open(file, dentry, gfs2_open_common);
 	}
 	gfs2_glock_dq_uninit(ghs);
+	gfs2_qa_put(ip);
 	gfs2_glock_dq_uninit(ghs + 1);
 	clear_bit(GLF_INODE_CREATING, &io_gl->gl_flags);
 	gfs2_glock_put(io_gl);
+	gfs2_qa_put(dip);
 	return error;
 fail_gunlock3:
 	clear_bit(GLF_INODE_CREATING, &io_gl->gl_flags);
 	gfs2_glock_put(io_gl);
 fail_free_inode:
-	gfs2_qa_put(ip);
 	if (ip->i_gl) {
 		glock_clear_object(ip->i_gl, ip);
 		gfs2_glock_put(ip->i_gl);
 out_child:
 	gfs2_glock_dq(ghs);
 out_parent:
-	gfs2_qa_put(ip);
+	gfs2_qa_put(dip);
 	gfs2_holder_uninit(ghs);
 	gfs2_holder_uninit(ghs + 1);
 	return error;

fs/gfs2/log.c+8−3

 	struct buffer_head *bh = bd->bd_bh;
 	struct gfs2_glock *gl = bd->bd_gl;
+	sdp->sd_log_num_revoke++;
+	if (atomic_inc_return(&gl->gl_revokes) == 1)
+		gfs2_glock_hold(gl);
 	bh->b_private = NULL;
 	bd->bd_blkno = bh->b_blocknr;
 	gfs2_remove_from_ail(bd); /* drops ref on bh */
 	bd->bd_bh = NULL;
-	sdp->sd_log_num_revoke++;
-	if (atomic_inc_return(&gl->gl_revokes) == 1)
-		gfs2_glock_hold(gl);
 	set_bit(GLF_LFLUSH, &gl->gl_flags);
 	list_add(&bd->bd_list, &sdp->sd_log_revokes);
 }
 	while (!kthread_should_stop()) {
+		if (gfs2_withdrawn(sdp)) {
+			msleep_interruptible(HZ);
+			continue;
+		}
 		/* Check for errors writing to the journal */
 		if (sdp->sd_log_error) {
 			gfs2_lm(sdp,
 				"prevent further damage.\n",
 				sdp->sd_fsname, sdp->sd_log_error);
 			gfs2_withdraw(sdp);
+			continue;
 		}
 		did_flush = false;

fs/gfs2/lops.c+12−7

@@ -263,7 +263,7 @@ static struct bio gfs2_log_alloc_bio(struct gfs2_sbd sdp, u64 blkno, · 262 unmodified lines
263	struct super_block *sb = sdp->sd_vfs;	263	struct super_block *sb = sdp->sd_vfs;
264	struct bio *bio = bio_alloc(GFP_NOIO, BIO_MAX_PAGES);	264	struct bio *bio = bio_alloc(GFP_NOIO, BIO_MAX_PAGES);
265		265
266	bio->bi_iter.bi_sector = blkno << (sb->s_blocksize_bits - 9);	266	bio->bi_iter.bi_sector = blkno << sdp->sd_fsb2bb_shift;
267	bio_set_dev(bio, sb->s_bdev);	267	bio_set_dev(bio, sb->s_bdev);
268	bio->bi_end_io = end_io;	268	bio->bi_end_io = end_io;
269	bio->bi_private = sdp;	269	bio->bi_private = sdp;
@@ -509,7 +509,7 @@ int gfs2_find_jhead(struct gfs2_jdesc jd, struct gfs2_log_header_host head, · 239 unmodified lines
509	unsigned int bsize = sdp->sd_sb.sb_bsize, off;	509	unsigned int bsize = sdp->sd_sb.sb_bsize, off;
510	unsigned int bsize_shift = sdp->sd_sb.sb_bsize_shift;	510	unsigned int bsize_shift = sdp->sd_sb.sb_bsize_shift;
511	unsigned int shift = PAGE_SHIFT - bsize_shift;	511	unsigned int shift = PAGE_SHIFT - bsize_shift;
512	unsigned int readahead_blocks = BIO_MAX_PAGES << shift;	512	unsigned int max_bio_size = 2 * 1024 * 1024;
513	struct gfs2_journal_extent *je;	513	struct gfs2_journal_extent *je;
514	int sz, ret = 0;	514	int sz, ret = 0;
515	struct bio *bio = NULL;	515	struct bio *bio = NULL;
@@ -537,12 +537,17 @@ int gfs2_find_jhead(struct gfs2_jdesc jd, struct gfs2_log_header_host head, · 21 unmodified lines
537	off = 0;	537	off = 0;
538	}	538	}
539		539
540	if (!bio \|\| (bio_chained && !off)) {	540	if (!bio \|\| (bio_chained && !off) \|\|
		541	bio->bi_iter.bi_size >= max_bio_size) {
541	/* start new bio */	542	/* start new bio */
542	} else {	543	} else {
543	sz = bio_add_page(bio, page, bsize, off);	544	sector_t sector = dblock << sdp->sd_fsb2bb_shift;
544	if (sz == bsize)	545
545	goto block_added;	546	if (bio_end_sector(bio) == sector) {
		547	sz = bio_add_page(bio, page, bsize, off);
		548	if (sz == bsize)
		549	goto block_added;
		550	}
546	if (off) {	551	if (off) {
547	unsigned int blocks =	552	unsigned int blocks =
548	(PAGE_SIZE - off) >> bsize_shift;	553	(PAGE_SIZE - off) >> bsize_shift;
@@ -568,7 +573,7 @@ block_added: · 19 unmodified lines
568	off += bsize;	573	off += bsize;
569	if (off == PAGE_SIZE)	574	if (off == PAGE_SIZE)
570	page = NULL;	575	page = NULL;
571	if (blocks_submitted < blocks_read + readahead_blocks) {	576	if (blocks_submitted < 2 * max_bio_size >> bsize_shift) {
572	/* Keep at least one bio in flight */	577	/* Keep at least one bio in flight */
573	continue;	578	continue;
574	}	579	}

fs/gfs2/meta_io.c+1−1

@@ -252,7 +252,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags, · 251 unmodified lines
252	int num = 0;	252	int num = 0;
253		253
254	if (unlikely(gfs2_withdrawn(sdp)) &&	254	if (unlikely(gfs2_withdrawn(sdp)) &&
255	(!sdp->sd_jdesc \|\| (blkno != sdp->sd_jdesc->jd_no_addr))) {	255	(!sdp->sd_jdesc \|\| gl != sdp->sd_jinode_gl)) {
256	*bhp = NULL;	256	*bhp = NULL;
257	return -EIO;	257	return -EIO;
258	}	258	}

fs/gfs2/quota.c+5−8

 	u32 x;
 	int error = 0;
-	if (capable(CAP_SYS_RESOURCE) ||
+	if (sdp->sd_args.ar_quota != GFS2_QUOTA_ON)
-	    sdp->sd_args.ar_quota != GFS2_QUOTA_ON)
 		return 0;
 	error = gfs2_quota_hold(ip, uid, gid);
 	int found;
 	if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags))
-		goto out;
+		return;
 	for (x = 0; x < ip->i_qadata->qa_qd_num; x++) {
 		struct gfs2_quota_data *qd;
 			qd_unlock(qda[x]);
 	}
-out:
 	gfs2_quota_unhold(ip);
 }
 	if (!test_bit(GIF_QD_LOCKED, &ip->i_flags))
 		return 0;
-        if (sdp->sd_args.ar_quota != GFS2_QUOTA_ON)
-                return 0;
 	for (x = 0; x < ip->i_qadata->qa_qd_num; x++) {
 		qd = ip->i_qadata->qa_qd[x];
 	if (ip->i_diskflags & GFS2_DIF_SYSTEM)
 		return;
-	BUG_ON(ip->i_qadata->qa_ref <= 0);
+	if (gfs2_assert_withdraw(sdp, ip->i_qadata &&
+				 ip->i_qadata->qa_ref > 0))
+		return;
 	for (x = 0; x < ip->i_qadata->qa_qd_num; x++) {
 		qd = ip->i_qadata->qa_qd[x];

fs/gfs2/quota.h+2−1

@@ -44,7 +44,8 @@ static inline int gfs2_quota_lock_check(struct gfs2_inode *ip, · 43 unmodified lines
44	int ret;	44	int ret;
45		45
46	ap->allowed = UINT_MAX; /* Assume we are permitted a whole lot */	46	ap->allowed = UINT_MAX; /* Assume we are permitted a whole lot */
47	if (sdp->sd_args.ar_quota == GFS2_QUOTA_OFF)	47	if (capable(CAP_SYS_RESOURCE) \|\|
		48	sdp->sd_args.ar_quota == GFS2_QUOTA_OFF)
48	return 0;	49	return 0;
49	ret = gfs2_quota_lock(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);	50	ret = gfs2_quota_lock(ip, NO_UID_QUOTA_CHANGE, NO_GID_QUOTA_CHANGE);
50	if (ret)	51	if (ret)

fs/gfs2/super.c+0−1

@@ -1404,7 +1404,6 @@ out: · 1403 unmodified lines
1404	if (ip->i_qadata)	1404	if (ip->i_qadata)
1405	gfs2_assert_warn(sdp, ip->i_qadata->qa_ref == 0);	1405	gfs2_assert_warn(sdp, ip->i_qadata->qa_ref == 0);
1406	gfs2_rs_delete(ip, NULL);	1406	gfs2_rs_delete(ip, NULL);
1407	gfs2_qa_put(ip);
1408	gfs2_ordered_del_inode(ip);	1407	gfs2_ordered_del_inode(ip);
1409	clear_inode(inode);	1408	clear_inode(inode);
1410	gfs2_dir_hash_inval(ip);	1409	gfs2_dir_hash_inval(ip);

fs/gfs2/util.c+6−4

 	if (!sb_rdonly(sdp->sd_vfs))
 		ret = gfs2_make_fs_ro(sdp);
+	if (sdp->sd_lockstruct.ls_ops->lm_lock == NULL) { /* lock_nolock */
+		if (!ret)
+			ret = -EIO;
+		clear_bit(SDF_WITHDRAW_RECOVERY, &sdp->sd_flags);
+		goto skip_recovery;
+	}
 	/*
 	 * Drop the glock for our journal so another node can recover it.
 	 */
 		wait_on_bit(&gl->gl_flags, GLF_FREEING, TASK_UNINTERRUPTIBLE);
 	}
-	if (sdp->sd_lockstruct.ls_ops->lm_lock == NULL) { /* lock_nolock */
-		clear_bit(SDF_WITHDRAW_RECOVERY, &sdp->sd_flags);
-		goto skip_recovery;
-	}
 	/*
 	 * Dequeue the "live" glock, but keep a reference so it's never freed.
 	 */

fs/io_uring.c+38−31

@@ -619,6 +619,8 @@ struct io_kiocb { · 618 unmodified lines
619	bool needs_fixed_file;	619	bool needs_fixed_file;
620	u8 opcode;	620	u8 opcode;
621		621
		622	u16 buf_index;
		623
622	struct io_ring_ctx *ctx;	624	struct io_ring_ctx *ctx;
623	struct list_head list;	625	struct list_head list;
624	unsigned int flags;	626	unsigned int flags;
@@ -924,6 +926,7 @@ static struct io_ring_ctx io_ring_ctx_alloc(struct io_uring_params p) · 299 unmodified lines
924	goto err;	926	goto err;
925		927
926	ctx->flags = p->flags;	928	ctx->flags = p->flags;
		929	init_waitqueue_head(&ctx->sqo_wait);
927	init_waitqueue_head(&ctx->cq_wait);	930	init_waitqueue_head(&ctx->cq_wait);
928	INIT_LIST_HEAD(&ctx->cq_overflow_list);	931	INIT_LIST_HEAD(&ctx->cq_overflow_list);
929	init_completion(&ctx->completions[0]);	932	init_completion(&ctx->completions[0]);
@@ -1394,10 +1397,6 @@ static void io_free_req_many(struct io_ring_ctx ctx, struct req_batch rb) · 464 unmodified lines
1394	for (i = 0; i < rb->to_free; i++) {	1397	for (i = 0; i < rb->to_free; i++) {
1395	struct io_kiocb *req = rb->reqs[i];	1398	struct io_kiocb *req = rb->reqs[i];
1396		1399
1397	if (req->flags & REQ_F_FIXED_FILE) {
1398	req->file = NULL;
1399	percpu_ref_put(req->fixed_file_refs);
1400	}
1401	if (req->flags & REQ_F_INFLIGHT)	1400	if (req->flags & REQ_F_INFLIGHT)
1402	inflight++;	1401	inflight++;
1403	__io_req_aux_free(req);	1402	__io_req_aux_free(req);
@@ -1670,7 +1669,7 @@ static inline bool io_req_multi_free(struct req_batch rb, struct io_kiocb req) · 266 unmodified lines
1670	if ((req->flags & REQ_F_LINK_HEAD) \|\| io_is_fallback_req(req))	1669	if ((req->flags & REQ_F_LINK_HEAD) \|\| io_is_fallback_req(req))
1671	return false;	1670	return false;
1672		1671
1673	if (!(req->flags & REQ_F_FIXED_FILE) \|\| req->io)	1672	if (req->file \|\| req->io)
1674	rb->need_iter++;	1673	rb->need_iter++;
1675		1674
1676	rb->reqs[rb->to_free++] = req;	1675	rb->reqs[rb->to_free++] = req;
@@ -2104,9 +2103,7 @@ static int io_prep_rw(struct io_kiocb req, const struct io_uring_sqe sqe, · 427 unmodified lines
2104		2103
2105	req->rw.addr = READ_ONCE(sqe->addr);	2104	req->rw.addr = READ_ONCE(sqe->addr);
2106	req->rw.len = READ_ONCE(sqe->len);	2105	req->rw.len = READ_ONCE(sqe->len);
2107	/* we own ->private, reuse it for the buffer index / buffer ID */	2106	req->buf_index = READ_ONCE(sqe->buf_index);
2108	req->rw.kiocb.private = (void *) (unsigned long)
2109	READ_ONCE(sqe->buf_index);
2110	return 0;	2107	return 0;
2111	}	2108	}
2112		2109
@@ -2149,7 +2146,7 @@ static ssize_t io_import_fixed(struct io_kiocb *req, int rw, · 36 unmodified lines
2149	struct io_ring_ctx *ctx = req->ctx;	2146	struct io_ring_ctx *ctx = req->ctx;
2150	size_t len = req->rw.len;	2147	size_t len = req->rw.len;
2151	struct io_mapped_ubuf *imu;	2148	struct io_mapped_ubuf *imu;
2152	unsigned index, buf_index;	2149	u16 index, buf_index;
2153	size_t offset;	2150	size_t offset;
2154	u64 buf_addr;	2151	u64 buf_addr;
2155		2152
@@ -2157,7 +2154,7 @@ static ssize_t io_import_fixed(struct io_kiocb *req, int rw, · 1 unmodified line
2157	if (unlikely(!ctx->user_bufs))	2154	if (unlikely(!ctx->user_bufs))
2158	return -EFAULT;	2155	return -EFAULT;
2159		2156
2160	buf_index = (unsigned long) req->rw.kiocb.private;	2157	buf_index = req->buf_index;
2161	if (unlikely(buf_index >= ctx->nr_user_bufs))	2158	if (unlikely(buf_index >= ctx->nr_user_bufs))
2162	return -EFAULT;	2159	return -EFAULT;
2163		2160
@@ -2273,10 +2270,10 @@ static void __user io_rw_buffer_select(struct io_kiocb req, size_t *len, · 109 unmodified lines
2273	bool needs_lock)	2270	bool needs_lock)
2274	{	2271	{
2275	struct io_buffer *kbuf;	2272	struct io_buffer *kbuf;
2276	int bgid;	2273	u16 bgid;
2277		2274
2278	kbuf = (struct io_buffer *) (unsigned long) req->rw.addr;	2275	kbuf = (struct io_buffer *) (unsigned long) req->rw.addr;
2279	bgid = (int) (unsigned long) req->rw.kiocb.private;	2276	bgid = req->buf_index;
2280	kbuf = io_buffer_select(req, len, bgid, kbuf, needs_lock);	2277	kbuf = io_buffer_select(req, len, bgid, kbuf, needs_lock);
2281	if (IS_ERR(kbuf))	2278	if (IS_ERR(kbuf))
2282	return kbuf;	2279	return kbuf;
@@ -2367,7 +2364,7 @@ static ssize_t io_import_iovec(int rw, struct io_kiocb *req, · 84 unmodified lines
2367	}	2364	}
2368		2365
2369	/* buffer index only valid with fixed read/write, or buffer select */	2366	/* buffer index only valid with fixed read/write, or buffer select */
2370	if (req->rw.kiocb.private && !(req->flags & REQ_F_BUFFER_SELECT))	2367	if (req->buf_index && !(req->flags & REQ_F_BUFFER_SELECT))
2371	return -EINVAL;	2368	return -EINVAL;
2372		2369
2373	if (opcode == IORING_OP_READ \|\| opcode == IORING_OP_WRITE) {	2370	if (opcode == IORING_OP_READ \|\| opcode == IORING_OP_WRITE) {
@@ -2767,16 +2764,16 @@ static int io_splice(struct io_kiocb *req, bool force_nonblock) · 393 unmodified lines
2767	struct file *out = sp->file_out;	2764	struct file *out = sp->file_out;
2768	unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED;	2765	unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED;
2769	loff_t poff_in, poff_out;	2766	loff_t poff_in, poff_out;
2770	long ret;	2767	long ret = 0;
2771		2768
2772	if (force_nonblock)	2769	if (force_nonblock)
2773	return -EAGAIN;	2770	return -EAGAIN;
2774		2771
2775	poff_in = (sp->off_in == -1) ? NULL : &sp->off_in;	2772	poff_in = (sp->off_in == -1) ? NULL : &sp->off_in;
2776	poff_out = (sp->off_out == -1) ? NULL : &sp->off_out;	2773	poff_out = (sp->off_out == -1) ? NULL : &sp->off_out;
2777	ret = do_splice(in, poff_in, out, poff_out, sp->len, flags);	2774
2778	if (force_nonblock && ret == -EAGAIN)	2775	if (sp->len)
2779	return -EAGAIN;	2776	ret = do_splice(in, poff_in, out, poff_out, sp->len, flags);
2780		2777
2781	io_put_file(req, in, (sp->flags & SPLICE_F_FD_IN_FIXED));	2778	io_put_file(req, in, (sp->flags & SPLICE_F_FD_IN_FIXED));
2782	req->flags &= ~REQ_F_NEED_CLEANUP;	2779	req->flags &= ~REQ_F_NEED_CLEANUP;
@@ -4138,12 +4135,14 @@ static int __io_async_wake(struct io_kiocb req, struct io_poll_iocb poll, · 1355 unmodified lines
4138	req->result = mask;	4135	req->result = mask;
4139	init_task_work(&req->task_work, func);	4136	init_task_work(&req->task_work, func);
4140	/*	4137	/*
4141	* If this fails, then the task is exiting. Punt to one of the io-wq	4138	* If this fails, then the task is exiting. When a task exits, the
4142	* threads to ensure the work gets run, we can't always rely on exit	4139	* work gets canceled, so just cancel this request as well instead
4143	* cancelation taking care of this.	4140	* of executing it. We can't safely execute it anyway, as we may not
		4141	* have the needed state needed for it anyway.
4144	*/	4142	*/
4145	ret = task_work_add(tsk, &req->task_work, true);	4143	ret = task_work_add(tsk, &req->task_work, true);
4146	if (unlikely(ret)) {	4144	if (unlikely(ret)) {
		4145	WRITE_ONCE(poll->canceled, true);
4147	tsk = io_wq_get_task(req->ctx->io_wq);	4146	tsk = io_wq_get_task(req->ctx->io_wq);
4148	task_work_add(tsk, &req->task_work, true);	4147	task_work_add(tsk, &req->task_work, true);
4149	}	4148	}
@@ -5014,12 +5013,13 @@ static int io_req_defer(struct io_kiocb req, const struct io_uring_sqe sqe) · 864 unmodified lines
5014	if (!req_need_defer(req) && list_empty_careful(&ctx->defer_list))	5013	if (!req_need_defer(req) && list_empty_careful(&ctx->defer_list))
5015	return 0;	5014	return 0;
5016		5015
5017	if (!req->io && io_alloc_async_ctx(req))	5016	if (!req->io) {
5018	return -EAGAIN;	5017	if (io_alloc_async_ctx(req))
5019		5018	return -EAGAIN;
5020	ret = io_req_defer_prep(req, sqe);	5019	ret = io_req_defer_prep(req, sqe);
5021	if (ret < 0)	5020	if (ret < 0)
5022	return ret;	5021	return ret;
		5022	}
5023		5023
5024	spin_lock_irq(&ctx->completion_lock);	5024	spin_lock_irq(&ctx->completion_lock);
5025	if (!req_need_defer(req) && list_empty(&ctx->defer_list)) {	5025	if (!req_need_defer(req) && list_empty(&ctx->defer_list)) {
@@ -5306,7 +5306,8 @@ static int io_issue_sqe(struct io_kiocb req, const struct io_uring_sqe sqe, · 280 unmodified lines
5306	if (ret)	5306	if (ret)
5307	return ret;	5307	return ret;
5308		5308
5309	if (ctx->flags & IORING_SETUP_IOPOLL) {	5309	/* If the op doesn't have a file, we're not polling for it */
		5310	if ((ctx->flags & IORING_SETUP_IOPOLL) && req->file) {
5310	const bool in_async = io_wq_current_is_worker();	5311	const bool in_async = io_wq_current_is_worker();
5311		5312
5312	if (req->result == -EAGAIN)	5313	if (req->result == -EAGAIN)
@@ -5607,9 +5608,15 @@ fail_req: · 294 unmodified lines
5607	io_double_put_req(req);	5608	io_double_put_req(req);
5608	}	5609	}
5609	} else if (req->flags & REQ_F_FORCE_ASYNC) {	5610	} else if (req->flags & REQ_F_FORCE_ASYNC) {
5610	ret = io_req_defer_prep(req, sqe);	5611	if (!req->io) {
5611	if (unlikely(ret < 0))	5612	ret = -EAGAIN;
5612	goto fail_req;	5613	if (io_alloc_async_ctx(req))
		5614	goto fail_req;
		5615	ret = io_req_defer_prep(req, sqe);
		5616	if (unlikely(ret < 0))
		5617	goto fail_req;
		5618	}
		5619
5613	/*	5620	/*
5614	* Never try inline submit of IOSQE_ASYNC is set, go straight	5621	* Never try inline submit of IOSQE_ASYNC is set, go straight
5615	* to async execution.	5622	* to async execution.
@@ -6025,6 +6032,7 @@ static int io_sq_thread(void *data) · 409 unmodified lines
6025	finish_wait(&ctx->sqo_wait, &wait);	6032	finish_wait(&ctx->sqo_wait, &wait);
6026		6033
6027	ctx->rings->sq_flags &= ~IORING_SQ_NEED_WAKEUP;	6034	ctx->rings->sq_flags &= ~IORING_SQ_NEED_WAKEUP;
		6035	ret = 0;
6028	continue;	6036	continue;
6029	}	6037	}
6030	finish_wait(&ctx->sqo_wait, &wait);	6038	finish_wait(&ctx->sqo_wait, &wait);
@@ -6838,7 +6846,6 @@ static int io_sq_offload_start(struct io_ring_ctx *ctx, · 807 unmodified lines
6838	{	6846	{
6839	int ret;	6847	int ret;
6840		6848
6841	init_waitqueue_head(&ctx->sqo_wait);
6842	mmgrab(current->mm);	6849	mmgrab(current->mm);
6843	ctx->sqo_mm = current->mm;	6850	ctx->sqo_mm = current->mm;
6844		6851

fs/nfs/fscache.c+18−21

 	nfss->fscache_key = NULL;
 	nfss->fscache = NULL;
-	if (!(nfss->options & NFS_OPTION_FSCACHE))
-		return;
 	if (!uniq) {
 		uniq = "";
 		ulen = 1;
 	/* create a cache index for looking up filehandles */
 	nfss->fscache = fscache_acquire_cookie(nfss->nfs_client->fscache,
 					       &nfs_fscache_super_index_def,
-					       key, sizeof(*key) + ulen,
+					       &key->key,
+					       sizeof(key->key) + ulen,
 					       NULL, 0,
 					       nfss, 0, true);
 	dfprintk(FSCACHE, "NFS: get superblock cookie (0x%p/0x%p)\n",
 	}
 }
+static void nfs_fscache_update_auxdata(struct nfs_fscache_inode_auxdata *auxdata,
+				  struct nfs_inode *nfsi)
+{
+	memset(auxdata, 0, sizeof(*auxdata));
+	auxdata->mtime_sec  = nfsi->vfs_inode.i_mtime.tv_sec;
+	auxdata->mtime_nsec = nfsi->vfs_inode.i_mtime.tv_nsec;
+	auxdata->ctime_sec  = nfsi->vfs_inode.i_ctime.tv_sec;
+	auxdata->ctime_nsec = nfsi->vfs_inode.i_ctime.tv_nsec;
+	if (NFS_SERVER(&nfsi->vfs_inode)->nfs_client->rpc_ops->version == 4)
+		auxdata->change_attr = inode_peek_iversion_raw(&nfsi->vfs_inode);
+}
 /*
  * Initialise the per-inode cache cookie pointer for an NFS inode.
  */
 	if (!(nfss->fscache && S_ISREG(inode->i_mode)))
 		return;
-	memset(&auxdata, 0, sizeof(auxdata));
+	nfs_fscache_update_auxdata(&auxdata, nfsi);
-	auxdata.mtime_sec  = nfsi->vfs_inode.i_mtime.tv_sec;
-	auxdata.mtime_nsec = nfsi->vfs_inode.i_mtime.tv_nsec;
-	auxdata.ctime_sec  = nfsi->vfs_inode.i_ctime.tv_sec;
-	auxdata.ctime_nsec = nfsi->vfs_inode.i_ctime.tv_nsec;
-	if (NFS_SERVER(&nfsi->vfs_inode)->nfs_client->rpc_ops->version == 4)
-		auxdata.change_attr = inode_peek_iversion_raw(&nfsi->vfs_inode);
 	nfsi->fscache = fscache_acquire_cookie(NFS_SB(inode->i_sb)->fscache,
 					       &nfs_fscache_inode_object_def,
 	dfprintk(FSCACHE, "NFS: clear cookie (0x%p/0x%p)\n", nfsi, cookie);
-	memset(&auxdata, 0, sizeof(auxdata));
+	nfs_fscache_update_auxdata(&auxdata, nfsi);
-	auxdata.mtime_sec  = nfsi->vfs_inode.i_mtime.tv_sec;
-	auxdata.mtime_nsec = nfsi->vfs_inode.i_mtime.tv_nsec;
-	auxdata.ctime_sec  = nfsi->vfs_inode.i_ctime.tv_sec;
-	auxdata.ctime_nsec = nfsi->vfs_inode.i_ctime.tv_nsec;
 	fscache_relinquish_cookie(cookie, &auxdata, false);
 	nfsi->fscache = NULL;
 }
 	if (!fscache_cookie_valid(cookie))
 		return;
-	memset(&auxdata, 0, sizeof(auxdata));
+	nfs_fscache_update_auxdata(&auxdata, nfsi);
-	auxdata.mtime_sec  = nfsi->vfs_inode.i_mtime.tv_sec;
-	auxdata.mtime_nsec = nfsi->vfs_inode.i_mtime.tv_nsec;
-	auxdata.ctime_sec  = nfsi->vfs_inode.i_ctime.tv_sec;
-	auxdata.ctime_nsec = nfsi->vfs_inode.i_ctime.tv_nsec;
 	if (inode_is_open_for_write(inode)) {
 		dfprintk(FSCACHE, "NFS: nfsi 0x%p disabling cache\n", nfsi);

fs/nfs/mount_clnt.c+2−1

 #define encode_dirpath_sz	(1 + XDR_QUADLEN(MNTPATHLEN))
 #define MNT_status_sz		(1)
 #define MNT_fhandle_sz		XDR_QUADLEN(NFS2_FHSIZE)
+#define MNT_fhandlev3_sz	XDR_QUADLEN(NFS3_FHSIZE)
 #define MNT_authflav3_sz	(1 + NFS_MAX_SECFLAVORS)
 /*
  */
 #define MNT_enc_dirpath_sz	encode_dirpath_sz
 #define MNT_dec_mountres_sz	(MNT_status_sz + MNT_fhandle_sz)
-#define MNT_dec_mountres3_sz	(MNT_status_sz + MNT_fhandle_sz + \
+#define MNT_dec_mountres3_sz	(MNT_status_sz + MNT_fhandlev3_sz + \
 				 MNT_authflav3_sz)
 /*

fs/nfs/nfs4proc.c+1−1

@@ -6347,7 +6347,7 @@ static int _nfs4_proc_delegreturn(struct inode inode, const struct cred cred, · 6346 unmodified lines
6347	.rpc_client = server->client,	6347	.rpc_client = server->client,
6348	.rpc_message = &msg,	6348	.rpc_message = &msg,
6349	.callback_ops = &nfs4_delegreturn_ops,	6349	.callback_ops = &nfs4_delegreturn_ops,
6350	.flags = RPC_TASK_ASYNC \| RPC_TASK_CRED_NOREF \| RPC_TASK_TIMEOUT,	6350	.flags = RPC_TASK_ASYNC \| RPC_TASK_TIMEOUT,
6351	};	6351	};
6352	int status = 0;	6352	int status = 0;
6353		6353

fs/nfs/nfs4state.c+1−1

 		state = new;
 		state->owner = owner;
 		atomic_inc(&owner->so_count);
-		list_add_rcu(&state->inode_states, &nfsi->open_states);
 		ihold(inode);
 		state->inode = inode;
+		list_add_rcu(&state->inode_states, &nfsi->open_states);
 		spin_unlock(&inode->i_lock);
 		/* Note: The reclaim code dictates that we add stateless
 		 * and read-only stateids to the end of the list */

fs/nfs/pagelist.c+3−2

 		.callback_ops = call_ops,
 		.callback_data = hdr,
 		.workqueue = nfsiod_workqueue,
-		.flags = RPC_TASK_ASYNC | RPC_TASK_CRED_NOREF | flags,
+		.flags = RPC_TASK_ASYNC | flags,
 	};
 	hdr->rw_ops->rw_initiate(hdr, &msg, rpc_ops, &task_setup_data, how);
 					hdr->cred,
 					NFS_PROTO(hdr->inode),
 					desc->pg_rpc_callops,
-					desc->pg_ioflags, 0);
+					desc->pg_ioflags,
+					RPC_TASK_CRED_NOREF);
 	return ret;
 }

fs/nfs/pnfs_nfs.c+2−1

 			nfs_init_commit(data, NULL, NULL, cinfo);
 			nfs_initiate_commit(NFS_CLIENT(inode), data,
 					    NFS_PROTO(data->inode),
-					    data->mds_ops, how, 0);
+					    data->mds_ops, how,
+					    RPC_TASK_CRED_NOREF);
 		} else {
 			nfs_init_commit(data, NULL, data->lseg, cinfo);
 			initiate_commit(data, how);

fs/nfs/super.c+0−1

@@ -1189,7 +1189,6 @@ static void nfs_get_cache_cookie(struct super_block *sb, · 1188 unmodified lines
1189	uniq = ctx->fscache_uniq;	1189	uniq = ctx->fscache_uniq;
1190	ulen = strlen(ctx->fscache_uniq);	1190	ulen = strlen(ctx->fscache_uniq);
1191	}	1191	}
1192	return;
1193	}	1192	}
1194		1193
1195	nfs_fscache_get_super_cookie(sb, uniq, ulen);	1194	nfs_fscache_get_super_cookie(sb, uniq, ulen);

fs/nfs/write.c+2−2

@@ -1695,7 +1695,7 @@ int nfs_initiate_commit(struct rpc_clnt clnt, struct nfs_commit_data data, · 1694 unmodified lines
1695	.callback_ops = call_ops,	1695	.callback_ops = call_ops,
1696	.callback_data = data,	1696	.callback_data = data,
1697	.workqueue = nfsiod_workqueue,	1697	.workqueue = nfsiod_workqueue,
1698	.flags = RPC_TASK_ASYNC \| RPC_TASK_CRED_NOREF \| flags,	1698	.flags = RPC_TASK_ASYNC \| flags,
1699	.priority = priority,	1699	.priority = priority,
1700	};	1700	};
1701	/* Set up the initial task struct. */	1701	/* Set up the initial task struct. */
@@ -1813,7 +1813,7 @@ nfs_commit_list(struct inode inode, struct list_head head, int how, · 111 unmodified lines
1813	nfs_init_commit(data, head, NULL, cinfo);	1813	nfs_init_commit(data, head, NULL, cinfo);
1814	atomic_inc(&cinfo->mds->rpcs_out);	1814	atomic_inc(&cinfo->mds->rpcs_out);
1815	return nfs_initiate_commit(NFS_CLIENT(inode), data, NFS_PROTO(inode),	1815	return nfs_initiate_commit(NFS_CLIENT(inode), data, NFS_PROTO(inode),
1816	data->mds_ops, how, 0);	1816	data->mds_ops, how, RPC_TASK_CRED_NOREF);
1817	}	1817	}
1818		1818
1819	/*	1819	/*

fs/overlayfs/export.c+3−0

@@ -783,6 +783,9 @@ static struct ovl_fh ovl_fid_to_fh(struct fid fid, int buflen, int fh_type) · 782 unmodified lines
783	if (fh_type != OVL_FILEID_V0)	783	if (fh_type != OVL_FILEID_V0)
784	return ERR_PTR(-EINVAL);	784	return ERR_PTR(-EINVAL);
785		785
		786	if (buflen <= OVL_FH_WIRE_OFFSET)
		787	return ERR_PTR(-EINVAL);
		788
786	fh = kzalloc(buflen, GFP_KERNEL);	789	fh = kzalloc(buflen, GFP_KERNEL);
787	if (!fh)	790	if (!fh)
788	return ERR_PTR(-ENOMEM);	791	return ERR_PTR(-ENOMEM);

fs/overlayfs/inode.c+18−0

@@ -58,6 +58,24 @@ int ovl_setattr(struct dentry dentry, struct iattr attr) · 57 unmodified lines
58	if (attr->ia_valid & (ATTR_KILL_SUID\|ATTR_KILL_SGID))	58	if (attr->ia_valid & (ATTR_KILL_SUID\|ATTR_KILL_SGID))
59	attr->ia_valid &= ~ATTR_MODE;	59	attr->ia_valid &= ~ATTR_MODE;
60		60
		61	/*
		62	* We might have to translate ovl file into real file object
		63	* once use cases emerge. For now, simply don't let underlying
		64	* filesystem rely on attr->ia_file
		65	*/
		66	attr->ia_valid &= ~ATTR_FILE;
		67
		68	/*
		69	* If open(O_TRUNC) is done, VFS calls ->setattr with ATTR_OPEN
		70	* set. Overlayfs does not pass O_TRUNC flag to underlying
		71	* filesystem during open -> do not pass ATTR_OPEN. This
		72	* disables optimization in fuse which assumes open(O_TRUNC)
		73	* already set file size to 0. But we never passed O_TRUNC to
		74	* fuse. So by clearing ATTR_OPEN, fuse will be forced to send
		75	* setattr request to server.
		76	*/
		77	attr->ia_valid &= ~ATTR_OPEN;
		78
61	inode_lock(upperdentry->d_inode);	79	inode_lock(upperdentry->d_inode);
62	old_cred = ovl_override_creds(dentry->d_sb);	80	old_cred = ovl_override_creds(dentry->d_sb);
63	err = notify_change(upperdentry, attr, NULL);	81	err = notify_change(upperdentry, attr, NULL);

fs/splice.c+1−1

@@ -1494,7 +1494,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags) · 1493 unmodified lines
1494	* Check pipe occupancy without the inode lock first. This function	1494	* Check pipe occupancy without the inode lock first. This function
1495	* is speculative anyways, so missing one is ok.	1495	* is speculative anyways, so missing one is ok.
1496	*/	1496	*/
1497	if (pipe_full(pipe->head, pipe->tail, pipe->max_usage))	1497	if (!pipe_full(pipe->head, pipe->tail, pipe->max_usage))
1498	return 0;	1498	return 0;
1499		1499
1500	ret = 0;	1500	ret = 0;

fs/ubifs/auth.c+4−13

@@ -79,13 +79,9 @@ int ubifs_prepare_auth_node(struct ubifs_info c, void node, · 78 unmodified lines
79	struct shash_desc *inhash)	79	struct shash_desc *inhash)
80	{	80	{
81	struct ubifs_auth_node *auth = node;	81	struct ubifs_auth_node *auth = node;
82	u8 *hash;	82	u8 hash[UBIFS_HASH_ARR_SZ];
83	int err;	83	int err;
84		84
85	hash = kmalloc(crypto_shash_descsize(c->hash_tfm), GFP_NOFS);
86	if (!hash)
87	return -ENOMEM;
88
89	{	85	{
90	SHASH_DESC_ON_STACK(hash_desc, c->hash_tfm);	86	SHASH_DESC_ON_STACK(hash_desc, c->hash_tfm);
91		87
@@ -94,21 +90,16 @@ int ubifs_prepare_auth_node(struct ubifs_info c, void node, · 2 unmodified lines
94		90
95	err = crypto_shash_final(hash_desc, hash);	91	err = crypto_shash_final(hash_desc, hash);
96	if (err)	92	if (err)
97	goto out;	93	return err;
98	}	94	}
99		95
100	err = ubifs_hash_calc_hmac(c, hash, auth->hmac);	96	err = ubifs_hash_calc_hmac(c, hash, auth->hmac);
101	if (err)	97	if (err)
102	goto out;	98	return err;
103		99
104	auth->ch.node_type = UBIFS_AUTH_NODE;	100	auth->ch.node_type = UBIFS_AUTH_NODE;
105	ubifs_prepare_node(c, auth, ubifs_auth_node_sz(c), 0);	101	ubifs_prepare_node(c, auth, ubifs_auth_node_sz(c), 0);
106		102	return 0;
107	err = 0;
108	out:
109	kfree(hash);
110
111	return err;
112	}	103	}
113		104
114	static struct shash_desc ubifs_get_desc(const struct ubifs_info c,	105	static struct shash_desc ubifs_get_desc(const struct ubifs_info c,

fs/ubifs/file.c+1−5

 	struct ubifs_info *c = inode->i_sb->s_fs_info;
 	struct ubifs_budget_req req = { .dirtied_ino = 1,
 			.dirtied_ino_d = ALIGN(ui->data_len, 8) };
-	int iflags = I_DIRTY_TIME;
 	int err, release;
 	if (!IS_ENABLED(CONFIG_UBIFS_ATIME_SUPPORT))
 	if (flags & S_MTIME)
 		inode->i_mtime = *time;
-	if (!(inode->i_sb->s_flags & SB_LAZYTIME))
-		iflags |= I_DIRTY_SYNC;
 	release = ui->dirty;
-	__mark_inode_dirty(inode, iflags);
+	__mark_inode_dirty(inode, I_DIRTY_SYNC);
 	mutex_unlock(&ui->ui_mutex);
 	if (release)
 		ubifs_release_budget(c, &req);

fs/ubifs/replay.c+2−11

 	struct ubifs_scan_node *snod;
 	int n_nodes = 0;
 	int err;
-	u8 *hash, *hmac;
+	u8 hash[UBIFS_HASH_ARR_SZ];
+	u8 hmac[UBIFS_HMAC_ARR_SZ];
 	if (!ubifs_authenticated(c))
 		return sleb->nodes_cnt;
-	hash = kmalloc(crypto_shash_descsize(c->hash_tfm), GFP_NOFS);
-	hmac = kmalloc(c->hmac_desc_len, GFP_NOFS);
-	if (!hash || !hmac) {
-		err = -ENOMEM;
-		goto out;
-	}
 	list_for_each_entry(snod, &sleb->nodes, list) {
 		n_nodes++;
 		err = 0;
 	}
 out:
-	kfree(hash);
-	kfree(hmac);
 	return err ? err : n_nodes - n_not_auth;
 }

include/drm/drm_modes.h+1−1

@@ -48,7 +48,7 @@ struct videomode; · 47 unmodified lines
48	* @MODE_HSYNC: hsync out of range	48	* @MODE_HSYNC: hsync out of range
49	* @MODE_VSYNC: vsync out of range	49	* @MODE_VSYNC: vsync out of range
50	* @MODE_H_ILLEGAL: mode has illegal horizontal timings	50	* @MODE_H_ILLEGAL: mode has illegal horizontal timings
51	* @MODE_V_ILLEGAL: mode has illegal horizontal timings	51	* @MODE_V_ILLEGAL: mode has illegal vertical timings
52	* @MODE_BAD_WIDTH: requires an unsupported linepitch	52	* @MODE_BAD_WIDTH: requires an unsupported linepitch
53	* @MODE_NOMODE: no mode with a matching name	53	* @MODE_NOMODE: no mode with a matching name
54	* @MODE_NO_INTERLACE: interlaced mode not supported	54	* @MODE_NO_INTERLACE: interlaced mode not supported

include/linux/brcmphy.h+1−0

@@ -245,6 +245,7 @@ · 244 unmodified lines
245	#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN (1 << 0)	245	#define BCM54810_EXP_BROADREACH_LRE_MISC_CTL_EN (1 << 0)
246	#define BCM54810_SHD_CLK_CTL 0x3	246	#define BCM54810_SHD_CLK_CTL 0x3
247	#define BCM54810_SHD_CLK_CTL_GTXCLK_EN (1 << 9)	247	#define BCM54810_SHD_CLK_CTL_GTXCLK_EN (1 << 9)
		248	#define BCM54810_SHD_SCR3_TRDDAPD 0x0100
248		249
249	/* BCM54612E Registers */	250	/* BCM54612E Registers */
250	#define BCM54612E_EXP_SPARE0 (MII_BCM54XX_EXP_SEL_ETC + 0x34)	251	#define BCM54612E_EXP_SPARE0 (MII_BCM54XX_EXP_SEL_ETC + 0x34)

include/linux/compiler.h+6−0

@@ -356,4 +356,10 @@ static inline void offset_to_ptr(const int off) · 355 unmodified lines
356	/* &a[0] degrades to a pointer: a different type from an array */	356	/* &a[0] degrades to a pointer: a different type from an array */
357	#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))	357	#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
358		358
		359	/*
		360	* This is needed in functions which generate the stack canary, see
		361	* arch/x86/kernel/smpboot.c::start_secondary() for an example.
		362	*/
		363	#define prevent_tail_call_optimization() mb()
		364
359	#endif /* __LINUX_COMPILER_H */	365	#endif /* __LINUX_COMPILER_H */

include/linux/cper.h+9−0

@@ -521,6 +521,15 @@ struct cper_sec_pcie { · 520 unmodified lines
521	u8 aer_info[96];	521	u8 aer_info[96];
522	};	522	};
523		523
		524	/* Firmware Error Record Reference, UEFI v2.7 sec N.2.10 */
		525	struct cper_sec_fw_err_rec_ref {
		526	u8 record_type;
		527	u8 revision;
		528	u8 reserved[6];
		529	u64 record_identifier;
		530	guid_t record_identifier_guid;
		531	};
		532
524	/* Reset to default packing */	533	/* Reset to default packing */
525	#pragma pack()	534	#pragma pack()
526		535

include/linux/efi.h+2−0

@@ -1245,4 +1245,6 @@ struct linux_efi_memreserve { · 1244 unmodified lines
1245		1245
1246	void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size);	1246	void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size);
1247		1247
		1248	char efi_systab_show_arch(char str);
		1249
1248	#endif /* _LINUX_EFI_H */	1250	#endif /* _LINUX_EFI_H */

include/linux/ftrace.h+23−0

@@ -210,6 +210,29 @@ struct ftrace_ops { · 209 unmodified lines
210	#endif	210	#endif
211	};	211	};
212		212
		213	extern struct ftrace_ops __rcu *ftrace_ops_list;
		214	extern struct ftrace_ops ftrace_list_end;
		215
		216	/*
		217	* Traverse the ftrace_global_list, invoking all entries. The reason that we
		218	* can use rcu_dereference_raw_check() is that elements removed from this list
		219	* are simply leaked, so there is no need to interact with a grace-period
		220	* mechanism. The rcu_dereference_raw_check() calls are needed to handle
		221	* concurrent insertions into the ftrace_global_list.
		222	*
		223	* Silly Alpha and silly pointer-speculation compiler optimizations!
		224	*/
		225	#define do_for_each_ftrace_op(op, list) \
		226	op = rcu_dereference_raw_check(list); \
		227	do
		228
		229	/*
		230	* Optimized for just a single item in the list (as that is the normal case).
		231	*/
		232	#define while_for_each_ftrace_op(op) \
		233	while (likely(op = rcu_dereference_raw_check((op)->next)) && \
		234	unlikely((op) != &ftrace_list_end))
		235
213	/*	236	/*
214	* Type of the current tracing.	237	* Type of the current tracing.
215	*/	238	*/

include/linux/host1x.h+3−0

 	HOST1X_CLASS_GR3D = 0x60,
 };
+struct host1x;
 struct host1x_client;
 struct iommu_group;
+u64 host1x_get_dma_mask(struct host1x *host1x);
 /**
  * struct host1x_client_ops - host1x client operations
  * @init: host1x client initialization code

include/linux/i2c-mux.h+1−1

@@ -29,7 +29,7 @@ struct i2c_mux_core { · 28 unmodified lines
29		29
30	int num_adapters;	30	int num_adapters;
31	int max_adapters;	31	int max_adapters;
32	struct i2c_adapter *adapter[0];	32	struct i2c_adapter *adapter[];
33	};	33	};
34		34
35	struct i2c_mux_core i2c_mux_alloc(struct i2c_adapter parent,	35	struct i2c_mux_core i2c_mux_alloc(struct i2c_adapter parent,

include/linux/i2c.h+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	/*	2	/*
3	* i2c.h - definitions for the Linux i2c bus interface	3	* i2c.h - definitions for the Linux i2c bus interface
4	* Copyright (C) 1995-2000 Simon G. Vogl	4	* Copyright (C) 1995-2000 Simon G. Vogl
5	* Copyright (C) 2013-2019 Wolfram Sang <wsa@the-dreams.de>	5	* Copyright (C) 2013-2019 Wolfram Sang <wsa@kernel.org>
6	*	6	*
7	* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and	7	* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
8	* Frodo Looijaard <frodol@dds.nl>	8	* Frodo Looijaard <frodol@dds.nl>

include/linux/kvm_host.h+3−0

 void kvm_reload_remote_mmus(struct kvm *kvm);
 bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req,
+				 struct kvm_vcpu *except,
 				 unsigned long *vcpu_bitmap, cpumask_var_t tmp);
 bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req);
+bool kvm_make_all_cpus_request_except(struct kvm *kvm, unsigned int req,
+				      struct kvm_vcpu *except);
 bool kvm_make_cpus_request_mask(struct kvm *kvm, unsigned int req,
 				unsigned long *vcpu_bitmap);

include/linux/lsm_hook_defs.h+1−1

@@ -243,7 +243,7 @@ LSM_HOOK(int, -EINVAL, getprocattr, struct task_struct p, char name, · 242 unmodified lines
243	char **value)	243	char **value)
244	LSM_HOOK(int, -EINVAL, setprocattr, const char name, void value, size_t size)	244	LSM_HOOK(int, -EINVAL, setprocattr, const char name, void value, size_t size)
245	LSM_HOOK(int, 0, ismaclabel, const char *name)	245	LSM_HOOK(int, 0, ismaclabel, const char *name)
246	LSM_HOOK(int, 0, secid_to_secctx, u32 secid, char **secdata,	246	LSM_HOOK(int, -EOPNOTSUPP, secid_to_secctx, u32 secid, char **secdata,
247	u32 *seclen)	247	u32 *seclen)
248	LSM_HOOK(int, 0, secctx_to_secid, const char secdata, u32 seclen, u32 secid)	248	LSM_HOOK(int, 0, secctx_to_secid, const char secdata, u32 seclen, u32 secid)
249	LSM_HOOK(void, LSM_RET_VOID, release_secctx, char *secdata, u32 seclen)	249	LSM_HOOK(void, LSM_RET_VOID, release_secctx, char *secdata, u32 seclen)

include/linux/memcontrol.h+2−0

@@ -783,6 +783,8 @@ static inline void memcg_memory_event(struct mem_cgroup *memcg, · 782 unmodified lines
783	atomic_long_inc(&memcg->memory_events[event]);	783	atomic_long_inc(&memcg->memory_events[event]);
784	cgroup_file_notify(&memcg->events_file);	784	cgroup_file_notify(&memcg->events_file);
785		785
		786	if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))
		787	break;
786	if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_LOCAL_EVENTS)	788	if (cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_LOCAL_EVENTS)
787	break;	789	break;
788	} while ((memcg = parent_mem_cgroup(memcg)) &&	790	} while ((memcg = parent_mem_cgroup(memcg)) &&

include/linux/mlx5/driver.h+16−0

 	MLX5_PORT_DOWN      = 2,
 };
+enum mlx5_cmdif_state {
+	MLX5_CMDIF_STATE_UNINITIALIZED,
+	MLX5_CMDIF_STATE_UP,
+	MLX5_CMDIF_STATE_DOWN,
+};
 struct mlx5_cmd_first {
 	__be32		data[4];
 };
 struct mlx5_cmd {
 	struct mlx5_nb    nb;
+	enum mlx5_cmdif_state	state;
 	void	       *cmd_alloc_buf;
 	dma_addr_t	alloc_dma;
 	int		alloc_size;
 	struct semaphore sem;
 	struct semaphore pages_sem;
 	int	mode;
+	u16     allowed_opcode;
 	struct mlx5_cmd_work_ent *ent_arr[MLX5_MAX_COMMANDS];
 	struct dma_pool *pool;
 	struct mlx5_cmd_debug dbg;
 	struct delayed_work	cb_timeout_work;
 	void		       *context;
 	int			idx;
+	struct completion	handling;
 	struct completion	done;
 	struct mlx5_cmd        *cmd;
 	struct work_struct	work;
 	return min_t(u32, last_frag_stride_idx - fbc->strides_offset, fbc->sz_m1);
 }
+enum {
+	CMD_ALLOWED_OPCODE_ALL,
+};
 int mlx5_cmd_init(struct mlx5_core_dev *dev);
 void mlx5_cmd_cleanup(struct mlx5_core_dev *dev);
+void mlx5_cmd_set_state(struct mlx5_core_dev *dev,
+			enum mlx5_cmdif_state cmdif_state);
 void mlx5_cmd_use_events(struct mlx5_core_dev *dev);
 void mlx5_cmd_use_polling(struct mlx5_core_dev *dev);
+void mlx5_cmd_allowed_opcode(struct mlx5_core_dev *dev, u16 opcode);
 struct mlx5_async_ctx {
 	struct mlx5_core_dev *dev;

include/linux/ptp_clock_kernel.h+4−4

@@ -105,10 +105,10 @@ struct ptp_system_timestamp { · 104 unmodified lines
105	* parameter func: the desired function to use.	105	* parameter func: the desired function to use.
106	* parameter chan: the function channel index to use.	106	* parameter chan: the function channel index to use.
107	*	107	*
108	* @do_work: Request driver to perform auxiliary (periodic) operations	108	* @do_aux_work: Request driver to perform auxiliary (periodic) operations
109	* Driver should return delay of the next auxiliary work scheduling	109	* Driver should return delay of the next auxiliary work
110	* time (>=0) or negative value in case further scheduling	110	* scheduling time (>=0) or negative value in case further
111	* is not required.	111	* scheduling is not required.
112	*	112	*
113	* Drivers should embed their ptp_clock_info within a private	113	* Drivers should embed their ptp_clock_info within a private
114	* structure, obtaining a reference to it using container_of().	114	* structure, obtaining a reference to it using container_of().

include/linux/skmsg.h+1−0

@@ -187,6 +187,7 @@ static inline void sk_msg_xfer(struct sk_msg dst, struct sk_msg src, · 186 unmodified lines
187	dst->sg.data[which] = src->sg.data[which];	187	dst->sg.data[which] = src->sg.data[which];
188	dst->sg.data[which].length = size;	188	dst->sg.data[which].length = size;
189	dst->sg.size += size;	189	dst->sg.size += size;
		190	src->sg.size -= size;
190	src->sg.data[which].length -= size;	191	src->sg.data[which].length -= size;
191	src->sg.data[which].offset += size;	192	src->sg.data[which].offset += size;
192	}	193	}

include/linux/sunrpc/gss_api.h+3−0

 struct gss_ctx {
 	struct gss_api_mech	*mech_type;
 	void			*internal_ctx_id;
+	unsigned int		slack, align;
 };
 #define GSS_C_NO_BUFFER		((struct xdr_netobj) 0)
 u32 gss_unwrap(
 		struct gss_ctx		*ctx_id,
 		int			offset,
+		int			len,
 		struct xdr_buf		*inbuf);
 u32 gss_delete_sec_context(
 		struct gss_ctx		**ctx_id);
 	u32 (*gss_unwrap)(
 			struct gss_ctx		*ctx_id,
 			int			offset,
+			int			len,
 			struct xdr_buf		*buf);
 	void (*gss_delete_sec_context)(
 			void			*internal_ctx_id);

include/linux/sunrpc/gss_krb5.h+3−3

@@ -83,7 +83,7 @@ struct gss_krb5_enctype { · 82 unmodified lines
83	u32 (encrypt_v2) (struct krb5_ctx kctx, u32 offset,	83	u32 (encrypt_v2) (struct krb5_ctx kctx, u32 offset,
84	struct xdr_buf *buf,	84	struct xdr_buf *buf,
85	struct page *pages); / v2 encryption function */	85	struct page *pages); / v2 encryption function */
86	u32 (decrypt_v2) (struct krb5_ctx kctx, u32 offset,	86	u32 (decrypt_v2) (struct krb5_ctx kctx, u32 offset, u32 len,
87	struct xdr_buf buf, u32 headskip,	87	struct xdr_buf buf, u32 headskip,
88	u32 tailskip); / v2 decryption function */	88	u32 tailskip); / v2 decryption function */
89	};	89	};
@@ -255,7 +255,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx_id, int offset, · 165 unmodified lines
255	struct xdr_buf outbuf, struct page *pages);	255	struct xdr_buf outbuf, struct page *pages);
256		256
257	u32	257	u32
258	gss_unwrap_kerberos(struct gss_ctx *ctx_id, int offset,	258	gss_unwrap_kerberos(struct gss_ctx *ctx_id, int offset, int len,
259	struct xdr_buf *buf);	259	struct xdr_buf *buf);
260		260
261		261
@@ -312,7 +312,7 @@ gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset, · 50 unmodified lines
312	struct page **pages);	312	struct page **pages);
313		313
314	u32	314	u32
315	gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset,	315	gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, u32 len,
316	struct xdr_buf buf, u32 plainoffset,	316	struct xdr_buf buf, u32 plainoffset,
317	u32 *plainlen);	317	u32 *plainlen);
318		318

include/linux/sunrpc/xdr.h+1−0

@@ -184,6 +184,7 @@ xdr_adjust_iovec(struct kvec iov, __be32 p) · 183 unmodified lines
184	extern void xdr_shift_buf(struct xdr_buf *, size_t);	184	extern void xdr_shift_buf(struct xdr_buf *, size_t);
185	extern void xdr_buf_from_iov(struct kvec , struct xdr_buf );	185	extern void xdr_buf_from_iov(struct kvec , struct xdr_buf );
186	extern int xdr_buf_subsegment(struct xdr_buf , struct xdr_buf , unsigned int, unsigned int);	186	extern int xdr_buf_subsegment(struct xdr_buf , struct xdr_buf , unsigned int, unsigned int);
		187	extern void xdr_buf_trim(struct xdr_buf *, unsigned int);
187	extern int read_bytes_from_xdr_buf(struct xdr_buf , unsigned int, void , unsigned int);	188	extern int read_bytes_from_xdr_buf(struct xdr_buf , unsigned int, void , unsigned int);
188	extern int write_bytes_to_xdr_buf(struct xdr_buf , unsigned int, void , unsigned int);	189	extern int write_bytes_to_xdr_buf(struct xdr_buf , unsigned int, void , unsigned int);
189		190

include/net/act_api.h+2−1

@@ -75,7 +75,8 @@ static inline void tcf_tm_dump(struct tcf_t dtm, const struct tcf_t stm) · 74 unmodified lines
75	{	75	{
76	dtm->install = jiffies_to_clock_t(jiffies - stm->install);	76	dtm->install = jiffies_to_clock_t(jiffies - stm->install);
77	dtm->lastuse = jiffies_to_clock_t(jiffies - stm->lastuse);	77	dtm->lastuse = jiffies_to_clock_t(jiffies - stm->lastuse);
78	dtm->firstuse = jiffies_to_clock_t(jiffies - stm->firstuse);	78	dtm->firstuse = stm->firstuse ?
		79	jiffies_to_clock_t(jiffies - stm->firstuse) : 0;
79	dtm->expires = jiffies_to_clock_t(stm->expires);	80	dtm->expires = jiffies_to_clock_t(stm->expires);
80	}	81	}
81		82

include/net/af_rxrpc.h+1−1

@@ -59,7 +59,7 @@ bool rxrpc_kernel_abort_call(struct socket , struct rxrpc_call , · 58 unmodified lines
59	void rxrpc_kernel_end_call(struct socket , struct rxrpc_call );	59	void rxrpc_kernel_end_call(struct socket , struct rxrpc_call );
60	void rxrpc_kernel_get_peer(struct socket , struct rxrpc_call ,	60	void rxrpc_kernel_get_peer(struct socket , struct rxrpc_call ,
61	struct sockaddr_rxrpc *);	61	struct sockaddr_rxrpc *);
62	u64 rxrpc_kernel_get_rtt(struct socket , struct rxrpc_call );	62	u32 rxrpc_kernel_get_srtt(struct socket , struct rxrpc_call );
63	int rxrpc_kernel_charge_accept(struct socket *, rxrpc_notify_rx_t,	63	int rxrpc_kernel_charge_accept(struct socket *, rxrpc_notify_rx_t,
64	rxrpc_user_attach_call_t, unsigned long, gfp_t,	64	rxrpc_user_attach_call_t, unsigned long, gfp_t,
65	unsigned int);	65	unsigned int);

include/net/ip_fib.h+0−1

@@ -257,7 +257,6 @@ struct fib_dump_filter { · 256 unmodified lines
257	u32 table_id;	257	u32 table_id;
258	/* filter_set is an optimization that an entry is set */	258	/* filter_set is an optimization that an entry is set */
259	bool filter_set;	259	bool filter_set;
260	bool dump_all_families;
261	bool dump_routes;	260	bool dump_routes;
262	bool dump_exceptions;	261	bool dump_exceptions;
263	unsigned char protocol;	262	unsigned char protocol;

include/net/netfilter/nf_conntrack.h+1−1

@@ -87,7 +87,7 @@ struct nf_conn { · 86 unmodified lines
87	struct hlist_node nat_bysource;	87	struct hlist_node nat_bysource;
88	#endif	88	#endif
89	/* all members below initialized via memset */	89	/* all members below initialized via memset */
90	u8 __nfct_init_offset[0];	90	struct { } __nfct_init_offset;
91		91
92	/* If we were expected by an expectation, this will be it */	92	/* If we were expected by an expectation, this will be it */
93	struct nf_conn *master;	93	struct nf_conn *master;

include/net/netfilter/nf_flow_table.h+1−0

@@ -127,6 +127,7 @@ enum nf_flow_flags { · 126 unmodified lines
127	NF_FLOW_HW_DYING,	127	NF_FLOW_HW_DYING,
128	NF_FLOW_HW_DEAD,	128	NF_FLOW_HW_DEAD,
129	NF_FLOW_HW_REFRESH,	129	NF_FLOW_HW_REFRESH,
		130	NF_FLOW_HW_PENDING,
130	};	131	};
131		132
132	enum flow_offload_type {	133	enum flow_offload_type {

include/net/tcp.h+13−1

 	rx_opt->num_sacks = 0;
 }
-u32 tcp_default_init_rwnd(u32 mss);
 void tcp_cwnd_restart(struct sock *sk, s32 delta);
 static inline void tcp_slow_start_after_idle_check(struct sock *sk)
 	return tcp_win_from_space(sk, READ_ONCE(sk->sk_rcvbuf));
 }
+/* We provision sk_rcvbuf around 200% of sk_rcvlowat.
+ * If 87.5 % (7/8) of the space has been consumed, we want to override
+ * SO_RCVLOWAT constraint, since we are receiving skbs with too small
+ * len/truesize ratio.
+ */
+static inline bool tcp_rmem_pressure(const struct sock *sk)
+{
+	int rcvbuf = READ_ONCE(sk->sk_rcvbuf);
+	int threshold = rcvbuf - (rcvbuf >> 3);
+	return atomic_read(&sk->sk_rmem_alloc) > threshold;
+}
 extern void tcp_openreq_init_rwin(struct request_sock *req,
 				  const struct sock *sk_listener,
 				  const struct dst_entry *dst);

include/net/udp_tunnel.h+0−2

 			 __be16 df, __be16 src_port, __be16 dst_port,
 			 bool xnet, bool nocheck);
-#if IS_ENABLED(CONFIG_IPV6)
 int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,
 			 struct sk_buff *skb,
 			 struct net_device *dev, struct in6_addr *saddr,
 			 struct in6_addr *daddr,
 			 __u8 prio, __u8 ttl, __be32 label,
 			 __be16 src_port, __be16 dst_port, bool nocheck);
-#endif
 void udp_tunnel_sock_release(struct socket *sock);

include/sound/rawmidi.h+1−0

@@ -61,6 +61,7 @@ struct snd_rawmidi_runtime { · 60 unmodified lines
61	size_t avail_min; /* min avail for wakeup */	61	size_t avail_min; /* min avail for wakeup */
62	size_t avail; /* max used buffer for wakeup */	62	size_t avail; /* max used buffer for wakeup */
63	size_t xruns; /* over/underruns counter */	63	size_t xruns; /* over/underruns counter */
		64	int buffer_ref; /* buffer reference count */
64	/* misc */	65	/* misc */
65	spinlock_t lock;	66	spinlock_t lock;
66	wait_queue_head_t sleep;	67	wait_queue_head_t sleep;

include/trace/events/rxrpc.h+42−10

 TRACE_EVENT(rxrpc_rtt_rx,
 	    TP_PROTO(struct rxrpc_call *call, enum rxrpc_rtt_rx_trace why,
 		     rxrpc_serial_t send_serial, rxrpc_serial_t resp_serial,
-		     s64 rtt, u8 nr, s64 avg),
+		     u32 rtt, u32 rto),
-	    TP_ARGS(call, why, send_serial, resp_serial, rtt, nr, avg),
+	    TP_ARGS(call, why, send_serial, resp_serial, rtt, rto),
 	    TP_STRUCT__entry(
 		    __field(unsigned int,		call		)
 		    __field(enum rxrpc_rtt_rx_trace,	why		)
-		    __field(u8,				nr		)
 		    __field(rxrpc_serial_t,		send_serial	)
 		    __field(rxrpc_serial_t,		resp_serial	)
-		    __field(s64,			rtt		)
+		    __field(u32,			rtt		)
-		    __field(u64,			avg		)
+		    __field(u32,			rto		)
 			     ),
 	    TP_fast_assign(
 		    __entry->send_serial = send_serial;
 		    __entry->resp_serial = resp_serial;
 		    __entry->rtt = rtt;
-		    __entry->nr = nr;
+		    __entry->rto = rto;
-		    __entry->avg = avg;
 			   ),
-	    TP_printk("c=%08x %s sr=%08x rr=%08x rtt=%lld nr=%u avg=%lld",
+	    TP_printk("c=%08x %s sr=%08x rr=%08x rtt=%u rto=%u",
 		      __entry->call,
 		      __print_symbolic(__entry->why, rxrpc_rtt_rx_traces),
 		      __entry->send_serial,
 		      __entry->resp_serial,
 		      __entry->rtt,
-		      __entry->nr,
+		      __entry->rto)
-		      __entry->avg)
 	    );
 TRACE_EVENT(rxrpc_timer,
 		      __entry->serial)
 	    );
+TRACE_EVENT(rxrpc_rx_discard_ack,
+	    TP_PROTO(unsigned int debug_id, rxrpc_serial_t serial,
+		     rxrpc_seq_t first_soft_ack, rxrpc_seq_t call_ackr_first,
+		     rxrpc_seq_t prev_pkt, rxrpc_seq_t call_ackr_prev),
+	    TP_ARGS(debug_id, serial, first_soft_ack, call_ackr_first,
+		    prev_pkt, call_ackr_prev),
+	    TP_STRUCT__entry(
+		    __field(unsigned int,	debug_id	)
+		    __field(rxrpc_serial_t,	serial		)
+		    __field(rxrpc_seq_t,	first_soft_ack)
+		    __field(rxrpc_seq_t,	call_ackr_first)
+		    __field(rxrpc_seq_t,	prev_pkt)
+		    __field(rxrpc_seq_t,	call_ackr_prev)
+			     ),
+	    TP_fast_assign(
+		    __entry->debug_id		= debug_id;
+		    __entry->serial		= serial;
+		    __entry->first_soft_ack	= first_soft_ack;
+		    __entry->call_ackr_first	= call_ackr_first;
+		    __entry->prev_pkt		= prev_pkt;
+		    __entry->call_ackr_prev	= call_ackr_prev;
+			   ),
+	    TP_printk("c=%08x r=%08x %08x<%08x %08x<%08x",
+		      __entry->debug_id,
+		      __entry->serial,
+		      __entry->first_soft_ack,
+		      __entry->call_ackr_first,
+		      __entry->prev_pkt,
+		      __entry->call_ackr_prev)
+	    );
 #endif /* _TRACE_RXRPC_H */
 /* This part must be outside protection */

include/uapi/linux/usb/raw_gadget.h+95−13

@@ -93,6 +93,64 @@ struct usb_raw_ep_io { · 92 unmodified lines
93	__u8 data[0];	93	__u8 data[0];
94	};	94	};
95		95
		96	/* Maximum number of non-control endpoints in struct usb_raw_eps_info. */
		97	#define USB_RAW_EPS_NUM_MAX 30
		98
		99	/* Maximum length of UDC endpoint name in struct usb_raw_ep_info. */
		100	#define USB_RAW_EP_NAME_MAX 16
		101
		102	/* Used as addr in struct usb_raw_ep_info if endpoint accepts any address. */
		103	#define USB_RAW_EP_ADDR_ANY 0xff
		104
		105	/*
		106	* struct usb_raw_ep_caps - exposes endpoint capabilities from struct usb_ep
		107	* (technically from its member struct usb_ep_caps).
		108	*/
		109	struct usb_raw_ep_caps {
		110	__u32 type_control : 1;
		111	__u32 type_iso : 1;
		112	__u32 type_bulk : 1;
		113	__u32 type_int : 1;
		114	__u32 dir_in : 1;
		115	__u32 dir_out : 1;
		116	};
		117
		118	/*
		119	* struct usb_raw_ep_limits - exposes endpoint limits from struct usb_ep.
		120	* @maxpacket_limit: Maximum packet size value supported by this endpoint.
		121	* @max_streams: maximum number of streams supported by this endpoint
		122	* (actual number is 2^n).
		123	* @reserved: Empty, reserved for potential future extensions.
		124	*/
		125	struct usb_raw_ep_limits {
		126	__u16 maxpacket_limit;
		127	__u16 max_streams;
		128	__u32 reserved;
		129	};
		130
		131	/*
		132	* struct usb_raw_ep_info - stores information about a gadget endpoint.
		133	* @name: Name of the endpoint as it is defined in the UDC driver.
		134	* @addr: Address of the endpoint that must be specified in the endpoint
		135	* descriptor passed to USB_RAW_IOCTL_EP_ENABLE ioctl.
		136	* @caps: Endpoint capabilities.
		137	* @limits: Endpoint limits.
		138	*/
		139	struct usb_raw_ep_info {
		140	__u8 name[USB_RAW_EP_NAME_MAX];
		141	__u32 addr;
		142	struct usb_raw_ep_caps caps;
		143	struct usb_raw_ep_limits limits;
		144	};
		145
		146	/*
		147	* struct usb_raw_eps_info - argument for USB_RAW_IOCTL_EPS_INFO ioctl.
		148	* eps: Structures that store information about non-control endpoints.
		149	*/
		150	struct usb_raw_eps_info {
		151	struct usb_raw_ep_info eps[USB_RAW_EPS_NUM_MAX];
		152	};
		153
96	/*	154	/*
97	* Initializes a Raw Gadget instance.	155	* Initializes a Raw Gadget instance.
98	* Accepts a pointer to the usb_raw_init struct as an argument.	156	* Accepts a pointer to the usb_raw_init struct as an argument.
@@ -115,37 +173,38 @@ struct usb_raw_ep_io { · 16 unmodified lines
115	#define USB_RAW_IOCTL_EVENT_FETCH _IOR('U', 2, struct usb_raw_event)	173	#define USB_RAW_IOCTL_EVENT_FETCH _IOR('U', 2, struct usb_raw_event)
116		174
117	/*	175	/*
118	* Queues an IN (OUT for READ) urb as a response to the last control request	176	* Queues an IN (OUT for READ) request as a response to the last setup request
119	* received on endpoint 0, provided that was an IN (OUT for READ) request and	177	* received on endpoint 0 (provided that was an IN (OUT for READ) request), and
120	* waits until the urb is completed. Copies received data to user for READ.	178	* waits until the request is completed. Copies received data to user for READ.
121	* Accepts a pointer to the usb_raw_ep_io struct as an argument.	179	* Accepts a pointer to the usb_raw_ep_io struct as an argument.
122	* Returns length of trasferred data on success or negative error code on	180	* Returns length of transferred data on success or negative error code on
123	* failure.	181	* failure.
124	*/	182	*/
125	#define USB_RAW_IOCTL_EP0_WRITE _IOW('U', 3, struct usb_raw_ep_io)	183	#define USB_RAW_IOCTL_EP0_WRITE _IOW('U', 3, struct usb_raw_ep_io)
126	#define USB_RAW_IOCTL_EP0_READ _IOWR('U', 4, struct usb_raw_ep_io)	184	#define USB_RAW_IOCTL_EP0_READ _IOWR('U', 4, struct usb_raw_ep_io)
127		185
128	/*	186	/*
129	* Finds an endpoint that supports the transfer type specified in the	187	* Finds an endpoint that satisfies the parameters specified in the provided
130	* descriptor and enables it.	188	* descriptors (address, transfer type, etc.) and enables it.
131	* Accepts a pointer to the usb_endpoint_descriptor struct as an argument.	189	* Accepts a pointer to the usb_raw_ep_descs struct as an argument.
132	* Returns enabled endpoint handle on success or negative error code on failure.	190	* Returns enabled endpoint handle on success or negative error code on failure.
133	*/	191	*/
134	#define USB_RAW_IOCTL_EP_ENABLE _IOW('U', 5, struct usb_endpoint_descriptor)	192	#define USB_RAW_IOCTL_EP_ENABLE _IOW('U', 5, struct usb_endpoint_descriptor)
135		193
136	/* Disables specified endpoint.	194	/*
		195	* Disables specified endpoint.
137	* Accepts endpoint handle as an argument.	196	* Accepts endpoint handle as an argument.
138	* Returns 0 on success or negative error code on failure.	197	* Returns 0 on success or negative error code on failure.
139	*/	198	*/
140	#define USB_RAW_IOCTL_EP_DISABLE _IOW('U', 6, __u32)	199	#define USB_RAW_IOCTL_EP_DISABLE _IOW('U', 6, __u32)
141		200
142	/*	201	/*
143	* Queues an IN (OUT for READ) urb as a response to the last control request	202	* Queues an IN (OUT for READ) request as a response to the last setup request
144	* received on endpoint usb_raw_ep_io.ep, provided that was an IN (OUT for READ)	203	* received on endpoint usb_raw_ep_io.ep (provided that was an IN (OUT for READ)
145	* request and waits until the urb is completed. Copies received data to user	204	* request), and waits until the request is completed. Copies received data to
146	* for READ.	205	* user for READ.
147	* Accepts a pointer to the usb_raw_ep_io struct as an argument.	206	* Accepts a pointer to the usb_raw_ep_io struct as an argument.
148	* Returns length of trasferred data on success or negative error code on	207	* Returns length of transferred data on success or negative error code on
149	* failure.	208	* failure.
150	*/	209	*/
151	#define USB_RAW_IOCTL_EP_WRITE _IOW('U', 7, struct usb_raw_ep_io)	210	#define USB_RAW_IOCTL_EP_WRITE _IOW('U', 7, struct usb_raw_ep_io)
@@ -164,4 +223,27 @@ struct usb_raw_ep_io { · 12 unmodified lines
164	*/	223	*/
165	#define USB_RAW_IOCTL_VBUS_DRAW _IOW('U', 10, __u32)	224	#define USB_RAW_IOCTL_VBUS_DRAW _IOW('U', 10, __u32)
166		225
		226	/*
		227	* Fills in the usb_raw_eps_info structure with information about non-control
		228	* endpoints available for the currently connected UDC.
		229	* Returns the number of available endpoints on success or negative error code
		230	* on failure.
		231	*/
		232	#define USB_RAW_IOCTL_EPS_INFO _IOR('U', 11, struct usb_raw_eps_info)
		233
		234	/*
		235	* Stalls a pending control request on endpoint 0.
		236	* Returns 0 on success or negative error code on failure.
		237	*/
		238	#define USB_RAW_IOCTL_EP0_STALL _IO('U', 12)
		239
		240	/*
		241	* Sets or clears halt or wedge status of the endpoint.
		242	* Accepts endpoint handle as an argument.
		243	* Returns 0 on success or negative error code on failure.
		244	*/
		245	#define USB_RAW_IOCTL_EP_SET_HALT _IOW('U', 13, __u32)
		246	#define USB_RAW_IOCTL_EP_CLEAR_HALT _IOW('U', 14, __u32)
		247	#define USB_RAW_IOCTL_EP_SET_WEDGE _IOW('U', 15, __u32)
		248
167	#endif /* _UAPI__LINUX_USB_RAW_GADGET_H */	249	#endif /* _UAPI__LINUX_USB_RAW_GADGET_H */

init/Kconfig+3−0

@@ -2261,6 +2261,9 @@ config ASN1 · 2260 unmodified lines
2261		2261
2262	source "kernel/Kconfig.locks"	2262	source "kernel/Kconfig.locks"
2263		2263
		2264	config ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
		2265	bool
		2266
2264	config ARCH_HAS_SYNC_CORE_BEFORE_USERMODE	2267	config ARCH_HAS_SYNC_CORE_BEFORE_USERMODE
2265	bool	2268	bool
2266		2269

init/main.c+8−4

 	char *data, *copy;
 	int ret;
+	/* Cut out the bootconfig data even if we have no bootconfig option */
 	data = get_boot_config_from_initrd(&size, &csum);
-	if (!data)
-		goto not_found;
 	strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
 	parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
 	if (!bootconfig_found)
 		return;
+	if (!data) {
+		pr_err("'bootconfig' found on command line, but no bootconfig found\n");
+		return;
+	}
 	if (size >= XBC_DATA_MAX) {
 		pr_err("bootconfig size %d greater than max size %d\n",
 			size, XBC_DATA_MAX);
 		extra_init_args = xbc_make_cmdline("init");
 	}
 	return;
-not_found:
-	pr_err("'bootconfig' found on command line, but no bootconfig found\n");
 }
 #else
 	/* Do the rest non-__init'ed, we're now alive */
 	arch_call_rest_init();
+	prevent_tail_call_optimization();
 }
 /* Call all constructor functions linked into the kernel. */

ipc/util.c+6−6

@@ -764,21 +764,21 @@ static struct kern_ipc_perm sysvipc_find_ipc(struct ipc_ids ids, loff_t pos, · 763 unmodified lines
764	total++;	764	total++;
765	}	765	}
766		766
767	*new_pos = pos + 1;	767	ipc = NULL;
768	if (total >= ids->in_use)	768	if (total >= ids->in_use)
769	return NULL;	769	goto out;
770		770
771	for (; pos < ipc_mni; pos++) {	771	for (; pos < ipc_mni; pos++) {
772	ipc = idr_find(&ids->ipcs_idr, pos);	772	ipc = idr_find(&ids->ipcs_idr, pos);
773	if (ipc != NULL) {	773	if (ipc != NULL) {
774	rcu_read_lock();	774	rcu_read_lock();
775	ipc_lock_object(ipc);	775	ipc_lock_object(ipc);
776	return ipc;	776	break;
777	}	777	}
778	}	778	}
779		779	out:
780	/* Out of range - return NULL to terminate iteration */	780	*new_pos = pos + 1;
781	return NULL;	781	return ipc;
782	}	782	}
783		783
784	static void sysvipc_proc_next(struct seq_file s, void it, loff_t pos)	784	static void sysvipc_proc_next(struct seq_file s, void it, loff_t pos)

kernel/bpf/arraymap.c+6−1

 	if (!(map->map_flags & BPF_F_MMAPABLE))
 		return -EINVAL;
-	return remap_vmalloc_range(vma, array_map_vmalloc_addr(array), pgoff);
+	if (vma->vm_pgoff * PAGE_SIZE + (vma->vm_end - vma->vm_start) >
+	    PAGE_ALIGN((u64)array->map.max_entries * array->elem_size))
+		return -EINVAL;
+	return remap_vmalloc_range(vma, array_map_vmalloc_addr(array),
+				   vma->vm_pgoff + pgoff);
 }
 const struct bpf_map_ops array_map_ops = {

kernel/bpf/syscall.c+17−4

 	mutex_lock(&map->freeze_mutex);
-	if ((vma->vm_flags & VM_WRITE) && map->frozen) {
+	if (vma->vm_flags & VM_WRITE) {
-		err = -EPERM;
+		if (map->frozen) {
-		goto out;
+			err = -EPERM;
+			goto out;
+		}
+		/* map is meant to be read-only, so do not allow mapping as
+		 * writable, because it's possible to leak a writable page
+		 * reference and allows user-space to still modify it after
+		 * freezing, while verifier will assume contents do not change
+		 */
+		if (map->map_flags & BPF_F_RDONLY_PROG) {
+			err = -EACCES;
+			goto out;
+		}
 	}
 	/* set default open/close callbacks */
 	if (err)
 		goto free_value;
-	if (copy_to_user(uvalue, value, value_size) != 0)
+	if (copy_to_user(uvalue, value, value_size) != 0) {
+		err = -EFAULT;
 		goto free_value;
+	}
 	err = 0;

kernel/bpf/verifier.c+20−1

@@ -4340,7 +4340,9 @@ static void do_refine_retval_range(struct bpf_reg_state *regs, int ret_type, · 4339 unmodified lines
4340		4340
4341	if (ret_type != RET_INTEGER \|\|	4341	if (ret_type != RET_INTEGER \|\|
4342	(func_id != BPF_FUNC_get_stack &&	4342	(func_id != BPF_FUNC_get_stack &&
4343	func_id != BPF_FUNC_probe_read_str))	4343	func_id != BPF_FUNC_probe_read_str &&
		4344	func_id != BPF_FUNC_probe_read_kernel_str &&
		4345	func_id != BPF_FUNC_probe_read_user_str))
4344	return;	4346	return;
4345		4347
4346	ret_reg->smax_value = meta->msize_max_value;	4348	ret_reg->smax_value = meta->msize_max_value;
@@ -7059,6 +7061,23 @@ static int check_return_code(struct bpf_verifier_env *env) · 2712 unmodified lines
7059	return 0;	7061	return 0;
7060	range = tnum_const(0);	7062	range = tnum_const(0);
7061	break;	7063	break;
		7064	case BPF_PROG_TYPE_TRACING:
		7065	switch (env->prog->expected_attach_type) {
		7066	case BPF_TRACE_FENTRY:
		7067	case BPF_TRACE_FEXIT:
		7068	range = tnum_const(0);
		7069	break;
		7070	case BPF_TRACE_RAW_TP:
		7071	case BPF_MODIFY_RETURN:
		7072	return 0;
		7073	default:
		7074	return -ENOTSUPP;
		7075	}
		7076	break;
		7077	case BPF_PROG_TYPE_EXT:
		7078	/* freplace program can return anything as its return value
		7079	* depends on the to-be-replaced kernel func or bpf program.
		7080	*/
7062	default:	7081	default:
7063	return 0;	7082	return 0;
7064	}	7083	}

kernel/fork.c+7−6

 	      int __user *child_tidptr)
 {
 	struct kernel_clone_args args = {
-		.flags		= (clone_flags & ~CSIGNAL),
+		.flags		= (lower_32_bits(clone_flags) & ~CSIGNAL),
 		.pidfd		= parent_tidptr,
 		.child_tid	= child_tidptr,
 		.parent_tid	= parent_tidptr,
-		.exit_signal	= (clone_flags & CSIGNAL),
+		.exit_signal	= (lower_32_bits(clone_flags) & CSIGNAL),
 		.stack		= stack_start,
 		.stack_size	= stack_size,
 	};
 pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
 {
 	struct kernel_clone_args args = {
-		.flags		= ((flags | CLONE_VM | CLONE_UNTRACED) & ~CSIGNAL),
+		.flags		= ((lower_32_bits(flags) | CLONE_VM |
-		.exit_signal	= (flags & CSIGNAL),
+				    CLONE_UNTRACED) & ~CSIGNAL),
+		.exit_signal	= (lower_32_bits(flags) & CSIGNAL),
 		.stack		= (unsigned long)fn,
 		.stack_size	= (unsigned long)arg,
 	};
 #endif
 {
 	struct kernel_clone_args args = {
-		.flags		= (clone_flags & ~CSIGNAL),
+		.flags		= (lower_32_bits(clone_flags) & ~CSIGNAL),
 		.pidfd		= parent_tidptr,
 		.child_tid	= child_tidptr,
 		.parent_tid	= parent_tidptr,
-		.exit_signal	= (clone_flags & CSIGNAL),
+		.exit_signal	= (lower_32_bits(clone_flags) & CSIGNAL),
 		.stack		= newsp,
 		.tls		= tls,
 	};

kernel/sched/debug.c+2−2

@@ -948,8 +948,8 @@ void proc_sched_show_task(struct task_struct p, struct pid_namespace ns, · 947 unmodified lines
948	P(se.avg.util_est.enqueued);	948	P(se.avg.util_est.enqueued);
949	#endif	949	#endif
950	#ifdef CONFIG_UCLAMP_TASK	950	#ifdef CONFIG_UCLAMP_TASK
951	__PS("uclamp.min", p->uclamp[UCLAMP_MIN].value);	951	__PS("uclamp.min", p->uclamp_req[UCLAMP_MIN].value);
952	__PS("uclamp.max", p->uclamp[UCLAMP_MAX].value);	952	__PS("uclamp.max", p->uclamp_req[UCLAMP_MAX].value);
953	__PS("effective uclamp.min", uclamp_eff_value(p, UCLAMP_MIN));	953	__PS("effective uclamp.min", uclamp_eff_value(p, UCLAMP_MIN));
954	__PS("effective uclamp.max", uclamp_eff_value(p, UCLAMP_MAX));	954	__PS("effective uclamp.max", uclamp_eff_value(p, UCLAMP_MAX));
955	#endif	955	#endif

kernel/sched/fair.c+37−12

@@ -4774,7 +4774,6 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) · 4773 unmodified lines
4774	struct rq *rq = rq_of(cfs_rq);	4774	struct rq *rq = rq_of(cfs_rq);
4775	struct cfs_bandwidth *cfs_b = tg_cfs_bandwidth(cfs_rq->tg);	4775	struct cfs_bandwidth *cfs_b = tg_cfs_bandwidth(cfs_rq->tg);
4776	struct sched_entity *se;	4776	struct sched_entity *se;
4777	int enqueue = 1;
4778	long task_delta, idle_task_delta;	4777	long task_delta, idle_task_delta;
4779		4778
4780	se = cfs_rq->tg->se[cpu_of(rq)];	4779	se = cfs_rq->tg->se[cpu_of(rq)];
@@ -4798,26 +4797,44 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) · 17 unmodified lines
4798	idle_task_delta = cfs_rq->idle_h_nr_running;	4797	idle_task_delta = cfs_rq->idle_h_nr_running;
4799	for_each_sched_entity(se) {	4798	for_each_sched_entity(se) {
4800	if (se->on_rq)	4799	if (se->on_rq)
4801	enqueue = 0;	4800	break;
		4801	cfs_rq = cfs_rq_of(se);
		4802	enqueue_entity(cfs_rq, se, ENQUEUE_WAKEUP);
		4803
		4804	cfs_rq->h_nr_running += task_delta;
		4805	cfs_rq->idle_h_nr_running += idle_task_delta;
		4806
		4807	/* end evaluation on encountering a throttled cfs_rq */
		4808	if (cfs_rq_throttled(cfs_rq))
		4809	goto unthrottle_throttle;
		4810	}
4802		4811
		4812	for_each_sched_entity(se) {
4803	cfs_rq = cfs_rq_of(se);	4813	cfs_rq = cfs_rq_of(se);
4804	if (enqueue) {	4814
4805	enqueue_entity(cfs_rq, se, ENQUEUE_WAKEUP);	4815	update_load_avg(cfs_rq, se, UPDATE_TG);
4806	} else {	4816	se_update_runnable(se);
4807	update_load_avg(cfs_rq, se, 0);
4808	se_update_runnable(se);
4809	}
4810		4817
4811	cfs_rq->h_nr_running += task_delta;	4818	cfs_rq->h_nr_running += task_delta;
4812	cfs_rq->idle_h_nr_running += idle_task_delta;	4819	cfs_rq->idle_h_nr_running += idle_task_delta;
4813		4820
		4821
		4822	/* end evaluation on encountering a throttled cfs_rq */
4814	if (cfs_rq_throttled(cfs_rq))	4823	if (cfs_rq_throttled(cfs_rq))
4815	break;	4824	goto unthrottle_throttle;
		4825
		4826	/*
		4827	* One parent has been throttled and cfs_rq removed from the
		4828	* list. Add it back to not break the leaf list.
		4829	*/
		4830	if (throttled_hierarchy(cfs_rq))
		4831	list_add_leaf_cfs_rq(cfs_rq);
4816	}	4832	}
4817		4833
4818	if (!se)	4834	/* At this point se is NULL and we are at root level*/
4819	add_nr_running(rq, task_delta);	4835	add_nr_running(rq, task_delta);
4820		4836
		4837	unthrottle_throttle:
4821	/*	4838	/*
4822	* The cfs_rq_throttled() breaks in the above iteration can result in	4839	* The cfs_rq_throttled() breaks in the above iteration can result in
4823	* incomplete leaf list maintenance, resulting in triggering the	4840	* incomplete leaf list maintenance, resulting in triggering the
@@ -4826,7 +4843,8 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) · 2 unmodified lines
4826	for_each_sched_entity(se) {	4843	for_each_sched_entity(se) {
4827	cfs_rq = cfs_rq_of(se);	4844	cfs_rq = cfs_rq_of(se);
4828		4845
4829	list_add_leaf_cfs_rq(cfs_rq);	4846	if (list_add_leaf_cfs_rq(cfs_rq))
		4847	break;
4830	}	4848	}
4831		4849
4832	assert_list_leaf_cfs_rq(rq);	4850	assert_list_leaf_cfs_rq(rq);
@@ -5479,6 +5497,13 @@ enqueue_task_fair(struct rq rq, struct task_struct p, int flags) · 646 unmodified lines
5479	/* end evaluation on encountering a throttled cfs_rq */	5497	/* end evaluation on encountering a throttled cfs_rq */
5480	if (cfs_rq_throttled(cfs_rq))	5498	if (cfs_rq_throttled(cfs_rq))
5481	goto enqueue_throttle;	5499	goto enqueue_throttle;
		5500
		5501	/*
		5502	* One parent has been throttled and cfs_rq removed from the
		5503	* list. Add it back to not break the leaf list.
		5504	*/
		5505	if (throttled_hierarchy(cfs_rq))
		5506	list_add_leaf_cfs_rq(cfs_rq);
5482	}	5507	}
5483		5508
5484	enqueue_throttle:	5509	enqueue_throttle:

kernel/trace/bpf_trace.c+66−34

@@ -323,17 +323,15 @@ static const struct bpf_func_proto *bpf_get_probe_write_proto(void) · 322 unmodified lines
323		323
324	/*	324	/*
325	* Only limited trace_printk() conversion specifiers allowed:	325	* Only limited trace_printk() conversion specifiers allowed:
326	* %d %i %u %x %ld %li %lu %lx %lld %lli %llu %llx %p %s	326	* %d %i %u %x %ld %li %lu %lx %lld %lli %llu %llx %p %pks %pus %s
327	*/	327	*/
328	BPF_CALL_5(bpf_trace_printk, char *, fmt, u32, fmt_size, u64, arg1,	328	BPF_CALL_5(bpf_trace_printk, char *, fmt, u32, fmt_size, u64, arg1,
329	u64, arg2, u64, arg3)	329	u64, arg2, u64, arg3)
330	{	330	{
		331	int i, mod[3] = {}, fmt_cnt = 0;
		332	char buf[64], fmt_ptype;
		333	void *unsafe_ptr = NULL;
331	bool str_seen = false;	334	bool str_seen = false;
332	int mod[3] = {};
333	int fmt_cnt = 0;
334	u64 unsafe_addr;
335	char buf[64];
336	int i;
337		335
338	/*	336	/*
339	* bpf_check()->check_func_arg()->check_stack_boundary()	337	* bpf_check()->check_func_arg()->check_stack_boundary()
@@ -359,40 +357,71 @@ BPF_CALL_5(bpf_trace_printk, char *, fmt, u32, fmt_size, u64, arg1, · 19 unmodified lines
359	if (fmt[i] == 'l') {	357	if (fmt[i] == 'l') {
360	mod[fmt_cnt]++;	358	mod[fmt_cnt]++;
361	i++;	359	i++;
362	} else if (fmt[i] == 'p' \|\| fmt[i] == 's') {	360	} else if (fmt[i] == 'p') {
363	mod[fmt_cnt]++;	361	mod[fmt_cnt]++;
		362	if ((fmt[i + 1] == 'k' \|\|
		363	fmt[i + 1] == 'u') &&
		364	fmt[i + 2] == 's') {
		365	fmt_ptype = fmt[i + 1];
		366	i += 2;
		367	goto fmt_str;
		368	}
		369
364	/* disallow any further format extensions */	370	/* disallow any further format extensions */
365	if (fmt[i + 1] != 0 &&	371	if (fmt[i + 1] != 0 &&
366	!isspace(fmt[i + 1]) &&	372	!isspace(fmt[i + 1]) &&
367	!ispunct(fmt[i + 1]))	373	!ispunct(fmt[i + 1]))
368	return -EINVAL;	374	return -EINVAL;
369	fmt_cnt++;	375
370	if (fmt[i] == 's') {	376	goto fmt_next;
371	if (str_seen)	377	} else if (fmt[i] == 's') {
372	/* allow only one '%s' per fmt string */	378	mod[fmt_cnt]++;
373	return -EINVAL;	379	fmt_ptype = fmt[i];
374	str_seen = true;	380	fmt_str:
375		381	if (str_seen)
376	switch (fmt_cnt) {	382	/* allow only one '%s' per fmt string */
377	case 1:	383	return -EINVAL;
378	unsafe_addr = arg1;	384	str_seen = true;
379	arg1 = (long) buf;	385
380	break;	386	if (fmt[i + 1] != 0 &&
381	case 2:	387	!isspace(fmt[i + 1]) &&
382	unsafe_addr = arg2;	388	!ispunct(fmt[i + 1]))
383	arg2 = (long) buf;	389	return -EINVAL;
384	break;	390
385	case 3:	391	switch (fmt_cnt) {
386	unsafe_addr = arg3;	392	case 0:
387	arg3 = (long) buf;	393	unsafe_ptr = (void *)(long)arg1;
388	break;	394	arg1 = (long)buf;
389	}	395	break;
390	buf[0] = 0;	396	case 1:
391	strncpy_from_unsafe(buf,	397	unsafe_ptr = (void *)(long)arg2;
392	(void *) (long) unsafe_addr,	398	arg2 = (long)buf;
		399	break;
		400	case 2:
		401	unsafe_ptr = (void *)(long)arg3;
		402	arg3 = (long)buf;
		403	break;
		404	}
		405
		406	buf[0] = 0;
		407	switch (fmt_ptype) {
		408	case 's':
		409	#ifdef CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
		410	strncpy_from_unsafe(buf, unsafe_ptr,
393	sizeof(buf));	411	sizeof(buf));
		412	break;
		413	#endif
		414	case 'k':
		415	strncpy_from_unsafe_strict(buf, unsafe_ptr,
		416	sizeof(buf));
		417	break;
		418	case 'u':
		419	strncpy_from_unsafe_user(buf,
		420	(__force void __user *)unsafe_ptr,
		421	sizeof(buf));
		422	break;
394	}	423	}
395	continue;	424	goto fmt_next;
396	}	425	}
397		426
398	if (fmt[i] == 'l') {	427	if (fmt[i] == 'l') {
@@ -403,6 +432,7 @@ BPF_CALL_5(bpf_trace_printk, char *, fmt, u32, fmt_size, u64, arg1, · 4 unmodified lines
403	if (fmt[i] != 'i' && fmt[i] != 'd' &&	432	if (fmt[i] != 'i' && fmt[i] != 'd' &&
404	fmt[i] != 'u' && fmt[i] != 'x')	433	fmt[i] != 'u' && fmt[i] != 'x')
405	return -EINVAL;	434	return -EINVAL;
		435	fmt_next:
406	fmt_cnt++;	436	fmt_cnt++;
407	}	437	}
408		438
@@ -825,14 +855,16 @@ bpf_tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) · 416 unmodified lines
825	return &bpf_probe_read_user_proto;	855	return &bpf_probe_read_user_proto;
826	case BPF_FUNC_probe_read_kernel:	856	case BPF_FUNC_probe_read_kernel:
827	return &bpf_probe_read_kernel_proto;	857	return &bpf_probe_read_kernel_proto;
828	case BPF_FUNC_probe_read:
829	return &bpf_probe_read_compat_proto;
830	case BPF_FUNC_probe_read_user_str:	858	case BPF_FUNC_probe_read_user_str:
831	return &bpf_probe_read_user_str_proto;	859	return &bpf_probe_read_user_str_proto;
832	case BPF_FUNC_probe_read_kernel_str:	860	case BPF_FUNC_probe_read_kernel_str:
833	return &bpf_probe_read_kernel_str_proto;	861	return &bpf_probe_read_kernel_str_proto;
		862	#ifdef CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
		863	case BPF_FUNC_probe_read:
		864	return &bpf_probe_read_compat_proto;
834	case BPF_FUNC_probe_read_str:	865	case BPF_FUNC_probe_read_str:
835	return &bpf_probe_read_compat_str_proto;	866	return &bpf_probe_read_compat_str_proto;
		867	#endif
836	#ifdef CONFIG_CGROUPS	868	#ifdef CONFIG_CGROUPS
837	case BPF_FUNC_get_current_cgroup_id:	869	case BPF_FUNC_get_current_cgroup_id:
838	return &bpf_get_current_cgroup_id_proto;	870	return &bpf_get_current_cgroup_id_proto;

kernel/trace/ftrace_internal.h+0−22

@@ -4,28 +4,6 @@ · 3 unmodified lines
4		4
5	#ifdef CONFIG_FUNCTION_TRACER	5	#ifdef CONFIG_FUNCTION_TRACER
6		6
7	/*
8	* Traverse the ftrace_global_list, invoking all entries. The reason that we
9	* can use rcu_dereference_raw_check() is that elements removed from this list
10	* are simply leaked, so there is no need to interact with a grace-period
11	* mechanism. The rcu_dereference_raw_check() calls are needed to handle
12	* concurrent insertions into the ftrace_global_list.
13	*
14	* Silly Alpha and silly pointer-speculation compiler optimizations!
15	*/
16	#define do_for_each_ftrace_op(op, list) \
17	op = rcu_dereference_raw_check(list); \
18	do
19
20	/*
21	* Optimized for just a single item in the list (as that is the normal case).
22	*/
23	#define while_for_each_ftrace_op(op) \
24	while (likely(op = rcu_dereference_raw_check((op)->next)) && \
25	unlikely((op) != &ftrace_list_end))
26
27	extern struct ftrace_ops __rcu *ftrace_ops_list;
28	extern struct ftrace_ops ftrace_list_end;
29	extern struct mutex ftrace_lock;	7	extern struct mutex ftrace_lock;
30	extern struct ftrace_ops global_ops;	8	extern struct ftrace_ops global_ops;
31		9

kernel/trace/preemptirq_delay_test.c+10−2

 #include <linux/printk.h>
 #include <linux/string.h>
 #include <linux/sysfs.h>
+#include <linux/completion.h>
 static ulong delay = 100;
 static char test_mode[12] = "irq";
 MODULE_PARM_DESC(test_mode, "Mode of the test such as preempt, irq, or alternate (default irq)");
 MODULE_PARM_DESC(burst_size, "The size of a burst (default 1)");
+static struct completion done;
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 static void busy_wait(ulong time)
 	for (i = 0; i < s; i++)
 		(testfuncs[i])(i);
+	complete(&done);
 	set_current_state(TASK_INTERRUPTIBLE);
 	while (!kthread_should_stop()) {
 		schedule();
 static int preemptirq_run_test(void)
 {
 	struct task_struct *task;
 	char task_name[50];
+	init_completion(&done);
 	snprintf(task_name, sizeof(task_name), "%s_test", test_mode);
 	task =  kthread_run(preemptirq_delay_run, NULL, task_name);
 	if (IS_ERR(task))
 		return PTR_ERR(task);
-	if (task)
+	if (task) {
+		wait_for_completion(&done);
 		kthread_stop(task);
+	}
 	return 0;
 }

kernel/trace/ring_buffer.c+13−21

 	case RINGBUF_TYPE_DATA:
 		return rb_event_data_length(event);
 	default:
-		BUG();
+		WARN_ON_ONCE(1);
 	}
 	/* not hit */
 	return 0;
 {
 	if (extended_time(event))
 		event = skip_time_extend(event);
-	BUG_ON(event->type_len > RINGBUF_TYPE_DATA_TYPE_LEN_MAX);
+	WARN_ON_ONCE(event->type_len > RINGBUF_TYPE_DATA_TYPE_LEN_MAX);
 	/* If length is in len field, then array[0] has the data */
 	if (event->type_len)
 		return (void *)&event->array[0];
 		return;
 	default:
-		BUG();
+		RB_WARN_ON(cpu_buffer, 1);
 	}
 	return;
 }
 		return;
 	default:
-		BUG();
+		RB_WARN_ON(iter->cpu_buffer, 1);
 	}
 	return;
 }
 		return event;
 	default:
-		BUG();
+		RB_WARN_ON(cpu_buffer, 1);
 	}
 	return NULL;
 	struct ring_buffer_per_cpu *cpu_buffer;
 	struct ring_buffer_event *event;
 	int nr_loops = 0;
-	bool failed = false;
 	if (ts)
 		*ts = 0;
 		return NULL;
 	/*
-	 * We repeat when a time extend is encountered or we hit
+	 * As the writer can mess with what the iterator is trying
-	 * the end of the page. Since the time extend is always attached
+	 * to read, just give up if we fail to get an event after
-	 * to a data event, we should never loop more than three times.
+	 * three tries. The iterator is not as reliable when reading
-	 * Once for going to next page, once on time extend, and
+	 * the ring buffer with an active write as the consumer is.
-	 * finally once to get the event.
+	 * Do not warn if the three failures is reached.
-	 * We should never hit the following condition more than thrice,
-	 * unless the buffer is very small, and there's a writer
-	 * that is causing the reader to fail getting an event.
 	 */
-	if (++nr_loops > 3) {
+	if (++nr_loops > 3)
-		RB_WARN_ON(cpu_buffer, !failed);
 		return NULL;
-	}
 	if (rb_per_cpu_empty(cpu_buffer))
 		return NULL;
 	}
 	event = rb_iter_head_event(iter);
-	if (!event) {
+	if (!event)
-		failed = true;
 		goto again;
-	}
 	switch (event->type_len) {
 	case RINGBUF_TYPE_PADDING:
 		return event;
 	default:
-		BUG();
+		RB_WARN_ON(cpu_buffer, 1);
 	}
 	return NULL;

kernel/umh.c+6−0

 {
 	struct umh_info *umh_info = info->data;
+	/* cleanup if umh_pipe_setup() was successful but exec failed */
+	if (info->pid && info->retval) {
+		fput(umh_info->pipe_to_umh);
+		fput(umh_info->pipe_from_umh);
+	}
 	argv_free(info->argv);
 	umh_info->pid = info->pid;
 }

lib/test_printf.c+18−1

 #define PTR_STR "ffff0123456789ab"
 #define PTR_VAL_NO_CRNG "(____ptrval____)"
 #define ZEROS "00000000"	/* hex 32 zero bits */
+#define ONES "ffffffff"		/* hex 32 one bits */
 static int __init
 plain_format(void)
 #define PTR_STR "456789ab"
 #define PTR_VAL_NO_CRNG "(ptrval)"
 #define ZEROS ""
+#define ONES ""
 static int __init
 plain_format(void)
 	test(buf, fmt, p);
 }
+/*
+ * NULL pointers aren't hashed.
+ */
 static void __init
 null_pointer(void)
 {
-	test_hashed("%p", NULL);
+	test(ZEROS "00000000", "%p", NULL);
 	test(ZEROS "00000000", "%px", NULL);
 	test("(null)", "%pE", NULL);
 }
+/*
+ * Error pointers aren't hashed.
+ */
+static void __init
+error_pointer(void)
+{
+	test(ONES "fffffff5", "%p", ERR_PTR(-11));
+	test(ONES "fffffff5", "%px", ERR_PTR(-11));
+	test("(efault)", "%pE", ERR_PTR(-11));
+}
 #define PTR_INVALID ((void *)0x000000ab)
 static void __init
 {
 	plain();
 	null_pointer();
+	error_pointer();
 	invalid_pointer();
 	symbol_ptr();
 	kernel_ptr();

lib/vsprintf.c+19−0

@@ -794,6 +794,13 @@ static char ptr_to_id(char buf, char end, const void ptr, · 793 unmodified lines
794	unsigned long hashval;	794	unsigned long hashval;
795	int ret;	795	int ret;
796		796
		797	/*
		798	* Print the real pointer value for NULL and error pointers,
		799	* as they are not actual addresses.
		800	*/
		801	if (IS_ERR_OR_NULL(ptr))
		802	return pointer_string(buf, end, ptr, spec);
		803
797	/* When debugging early boot use non-cryptographically secure hash. */	804	/* When debugging early boot use non-cryptographically secure hash. */
798	if (unlikely(debug_boot_weak_hash)) {	805	if (unlikely(debug_boot_weak_hash)) {
799	hashval = hash_long((unsigned long)ptr, 32);	806	hashval = hash_long((unsigned long)ptr, 32);
@@ -2168,6 +2175,10 @@ char fwnode_string(char buf, char end, struct fwnode_handle fwnode, · 1368 unmodified lines
2168	* f full name	2175	* f full name
2169	* P node name, including a possible unit address	2176	* P node name, including a possible unit address
2170	* - 'x' For printing the address. Equivalent to "%lx".	2177	* - 'x' For printing the address. Equivalent to "%lx".
		2178	* - '[ku]s' For a BPF/tracing related format specifier, e.g. used out of
		2179	* bpf_trace_printk() where [ku] prefix specifies either kernel (k)
		2180	* or user (u) memory to probe, and:
		2181	* s a string, equivalent to "%s" on direct vsnprintf() use
2171	*	2182	*
2172	* ** When making changes please also update:	2183	* ** When making changes please also update:
2173	* Documentation/core-api/printk-formats.rst	2184	* Documentation/core-api/printk-formats.rst
@@ -2251,6 +2262,14 @@ char pointer(const char fmt, char buf, char end, void *ptr, · 77 unmodified lines
2251	if (!IS_ERR(ptr))	2262	if (!IS_ERR(ptr))
2252	break;	2263	break;
2253	return err_ptr(buf, end, ptr, spec);	2264	return err_ptr(buf, end, ptr, spec);
		2265	case 'u':
		2266	case 'k':
		2267	switch (fmt[1]) {
		2268	case 's':
		2269	return string(buf, end, ptr, spec);
		2270	default:
		2271	return error_string(buf, end, "(einval)", spec);
		2272	}
2254	}	2273	}
2255		2274
2256	/* default is to _not_ leak addresses, hash before printing */	2275	/* default is to _not_ leak addresses, hash before printing */

mm/gup.c+7−5

 	if (!vma_permits_fault(vma, fault_flags))
 		return -EFAULT;
+	if ((fault_flags & FAULT_FLAG_KILLABLE) &&
+	    fatal_signal_pending(current))
+		return -EINTR;
 	ret = handle_mm_fault(vma, address, fault_flags);
 	major |= ret & VM_FAULT_MAJOR;
 	if (ret & VM_FAULT_ERROR) {
 	if (ret & VM_FAULT_RETRY) {
 		down_read(&mm->mmap_sem);
-		if (!(fault_flags & FAULT_FLAG_TRIED)) {
+		*unlocked = true;
-			*unlocked = true;
+		fault_flags |= FAULT_FLAG_TRIED;
-			fault_flags |= FAULT_FLAG_TRIED;
+		goto retry;
-			goto retry;
-		}
 	}
 	if (tsk) {

mm/kasan/Makefile+14−9

@@ -1,23 +1,28 @@
1	# SPDX-License-Identifier: GPL-2.0	1	# SPDX-License-Identifier: GPL-2.0
2	KASAN_SANITIZE := n	2	KASAN_SANITIZE := n
3	UBSAN_SANITIZE_common.o := n	3	UBSAN_SANITIZE := n
4	UBSAN_SANITIZE_generic.o := n
5	UBSAN_SANITIZE_generic_report.o := n
6	UBSAN_SANITIZE_tags.o := n
7	KCOV_INSTRUMENT := n	4	KCOV_INSTRUMENT := n
8		5
		6	# Disable ftrace to avoid recursion.
9	CFLAGS_REMOVE_common.o = $(CC_FLAGS_FTRACE)	7	CFLAGS_REMOVE_common.o = $(CC_FLAGS_FTRACE)
10	CFLAGS_REMOVE_generic.o = $(CC_FLAGS_FTRACE)	8	CFLAGS_REMOVE_generic.o = $(CC_FLAGS_FTRACE)
11	CFLAGS_REMOVE_generic_report.o = $(CC_FLAGS_FTRACE)	9	CFLAGS_REMOVE_generic_report.o = $(CC_FLAGS_FTRACE)
		10	CFLAGS_REMOVE_init.o = $(CC_FLAGS_FTRACE)
		11	CFLAGS_REMOVE_quarantine.o = $(CC_FLAGS_FTRACE)
		12	CFLAGS_REMOVE_report.o = $(CC_FLAGS_FTRACE)
12	CFLAGS_REMOVE_tags.o = $(CC_FLAGS_FTRACE)	13	CFLAGS_REMOVE_tags.o = $(CC_FLAGS_FTRACE)
		14	CFLAGS_REMOVE_tags_report.o = $(CC_FLAGS_FTRACE)
13		15
14	# Function splitter causes unnecessary splits in __asan_load1/__asan_store1	16	# Function splitter causes unnecessary splits in __asan_load1/__asan_store1
15	# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63533	17	# see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63533
16		18	CFLAGS_common.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) -DDISABLE_BRANCH_PROFILING
17	CFLAGS_common.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector)	19	CFLAGS_generic.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) -DDISABLE_BRANCH_PROFILING
18	CFLAGS_generic.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector)	20	CFLAGS_generic_report.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) -DDISABLE_BRANCH_PROFILING
19	CFLAGS_generic_report.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector)	21	CFLAGS_init.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) -DDISABLE_BRANCH_PROFILING
20	CFLAGS_tags.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector)	22	CFLAGS_quarantine.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) -DDISABLE_BRANCH_PROFILING
		23	CFLAGS_report.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) -DDISABLE_BRANCH_PROFILING
		24	CFLAGS_tags.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) -DDISABLE_BRANCH_PROFILING
		25	CFLAGS_tags_report.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) -DDISABLE_BRANCH_PROFILING
21		26
22	obj-$(CONFIG_KASAN) := common.o init.o report.o	27	obj-$(CONFIG_KASAN) := common.o init.o report.o
23	obj-$(CONFIG_KASAN_GENERIC) += generic.o generic_report.o quarantine.o	28	obj-$(CONFIG_KASAN_GENERIC) += generic.o generic_report.o quarantine.o

mm/kasan/generic.c+0−1

@@ -15,7 +15,6 @@ · 14 unmodified lines
15	*/	15	*/
16		16
17	#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt	17	#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
18	#define DISABLE_BRANCH_PROFILING
19		18
20	#include <linux/export.h>	19	#include <linux/export.h>
21	#include <linux/interrupt.h>	20	#include <linux/interrupt.h>

mm/kasan/kasan.h+32−2

@@ -212,8 +212,6 @@ static inline const void arch_kasan_set_tag(const void addr, u8 tag) · 211 unmodified lines
212	asmlinkage void kasan_unpoison_task_stack_below(const void *watermark);	212	asmlinkage void kasan_unpoison_task_stack_below(const void *watermark);
213	void __asan_register_globals(struct kasan_global *globals, size_t size);	213	void __asan_register_globals(struct kasan_global *globals, size_t size);
214	void __asan_unregister_globals(struct kasan_global *globals, size_t size);	214	void __asan_unregister_globals(struct kasan_global *globals, size_t size);
215	void __asan_loadN(unsigned long addr, size_t size);
216	void __asan_storeN(unsigned long addr, size_t size);
217	void __asan_handle_no_return(void);	215	void __asan_handle_no_return(void);
218	void __asan_alloca_poison(unsigned long addr, size_t size);	216	void __asan_alloca_poison(unsigned long addr, size_t size);
219	void __asan_allocas_unpoison(const void stack_top, const void stack_bottom);	217	void __asan_allocas_unpoison(const void stack_top, const void stack_bottom);
@@ -228,6 +226,8 @@ void __asan_load8(unsigned long addr); · 8 unmodified lines
228	void __asan_store8(unsigned long addr);	226	void __asan_store8(unsigned long addr);
229	void __asan_load16(unsigned long addr);	227	void __asan_load16(unsigned long addr);
230	void __asan_store16(unsigned long addr);	228	void __asan_store16(unsigned long addr);
		229	void __asan_loadN(unsigned long addr, size_t size);
		230	void __asan_storeN(unsigned long addr, size_t size);
231		231
232	void __asan_load1_noabort(unsigned long addr);	232	void __asan_load1_noabort(unsigned long addr);
233	void __asan_store1_noabort(unsigned long addr);	233	void __asan_store1_noabort(unsigned long addr);
@@ -239,6 +239,21 @@ void __asan_load8_noabort(unsigned long addr); · 5 unmodified lines
239	void __asan_store8_noabort(unsigned long addr);	239	void __asan_store8_noabort(unsigned long addr);
240	void __asan_load16_noabort(unsigned long addr);	240	void __asan_load16_noabort(unsigned long addr);
241	void __asan_store16_noabort(unsigned long addr);	241	void __asan_store16_noabort(unsigned long addr);
		242	void __asan_loadN_noabort(unsigned long addr, size_t size);
		243	void __asan_storeN_noabort(unsigned long addr, size_t size);
		244
		245	void __asan_report_load1_noabort(unsigned long addr);
		246	void __asan_report_store1_noabort(unsigned long addr);
		247	void __asan_report_load2_noabort(unsigned long addr);
		248	void __asan_report_store2_noabort(unsigned long addr);
		249	void __asan_report_load4_noabort(unsigned long addr);
		250	void __asan_report_store4_noabort(unsigned long addr);
		251	void __asan_report_load8_noabort(unsigned long addr);
		252	void __asan_report_store8_noabort(unsigned long addr);
		253	void __asan_report_load16_noabort(unsigned long addr);
		254	void __asan_report_store16_noabort(unsigned long addr);
		255	void __asan_report_load_n_noabort(unsigned long addr, size_t size);
		256	void __asan_report_store_n_noabort(unsigned long addr, size_t size);
242		257
243	void __asan_set_shadow_00(const void *addr, size_t size);	258	void __asan_set_shadow_00(const void *addr, size_t size);
244	void __asan_set_shadow_f1(const void *addr, size_t size);	259	void __asan_set_shadow_f1(const void *addr, size_t size);
@@ -247,4 +262,19 @@ void __asan_set_shadow_f3(const void *addr, size_t size); · 2 unmodified lines
247	void __asan_set_shadow_f5(const void *addr, size_t size);	262	void __asan_set_shadow_f5(const void *addr, size_t size);
248	void __asan_set_shadow_f8(const void *addr, size_t size);	263	void __asan_set_shadow_f8(const void *addr, size_t size);
249		264
		265	void __hwasan_load1_noabort(unsigned long addr);
		266	void __hwasan_store1_noabort(unsigned long addr);
		267	void __hwasan_load2_noabort(unsigned long addr);
		268	void __hwasan_store2_noabort(unsigned long addr);
		269	void __hwasan_load4_noabort(unsigned long addr);
		270	void __hwasan_store4_noabort(unsigned long addr);
		271	void __hwasan_load8_noabort(unsigned long addr);
		272	void __hwasan_store8_noabort(unsigned long addr);
		273	void __hwasan_load16_noabort(unsigned long addr);
		274	void __hwasan_store16_noabort(unsigned long addr);
		275	void __hwasan_loadN_noabort(unsigned long addr, size_t size);
		276	void __hwasan_storeN_noabort(unsigned long addr, size_t size);
		277
		278	void __hwasan_tag_memory(unsigned long addr, u8 tag, unsigned long size);
		279
250	#endif	280	#endif

mm/kasan/tags.c+0−1

@@ -12,7 +12,6 @@ · 11 unmodified lines
12	*/	12	*/
13		13
14	#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt	14	#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
15	#define DISABLE_BRANCH_PROFILING
16		15
17	#include <linux/export.h>	16	#include <linux/export.h>
18	#include <linux/interrupt.h>	17	#include <linux/interrupt.h>

mm/mremap.c+1−1

@@ -794,7 +794,7 @@ out: · 793 unmodified lines
794	if (locked && new_len > old_len)	794	if (locked && new_len > old_len)
795	mm_populate(new_addr + old_len, new_len - old_len);	795	mm_populate(new_addr + old_len, new_len - old_len);
796	userfaultfd_unmap_complete(mm, &uf_unmap_early);	796	userfaultfd_unmap_complete(mm, &uf_unmap_early);
797	mremap_userfaultfd_complete(&uf, addr, new_addr, old_len);	797	mremap_userfaultfd_complete(&uf, addr, ret, old_len);
798	userfaultfd_unmap_complete(mm, &uf_unmap);	798	userfaultfd_unmap_complete(mm, &uf_unmap);
799	return ret;	799	return ret;
800	}	800	}

mm/z3fold.c+6−5

 	slots = handle_to_slots(handle);
 	write_lock(&slots->lock);
 	*(unsigned long *)handle = 0;
-	write_unlock(&slots->lock);
+	if (zhdr->slots == slots) {
-	if (zhdr->slots == slots)
+		write_unlock(&slots->lock);
 		return; /* simple case, nothing else to do */
+	}
 	/* we are freeing a foreign handle if we are here */
 	zhdr->foreign_handles--;
 	is_free = true;
-	read_lock(&slots->lock);
 	if (!test_bit(HANDLES_ORPHANED, &slots->pool)) {
-		read_unlock(&slots->lock);
+		write_unlock(&slots->lock);
 		return;
 	}
 	for (i = 0; i <= BUDDY_MASK; i++) {
 			break;
 		}
 	}
-	read_unlock(&slots->lock);
+	write_unlock(&slots->lock);
 	if (is_free) {
 		struct z3fold_pool *pool = slots_to_pool(slots);
 	zhdr->start_middle = 0;
 	zhdr->cpu = -1;
 	zhdr->foreign_handles = 0;
+	zhdr->mapped_count = 0;
 	zhdr->slots = slots;
 	zhdr->pool = pool;
 	INIT_LIST_HEAD(&zhdr->buddy);

net/ax25/af_ax25.c+4−2

@@ -635,8 +635,10 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname, · 634 unmodified lines
635	break;	635	break;
636		636
637	case SO_BINDTODEVICE:	637	case SO_BINDTODEVICE:
638	if (optlen > IFNAMSIZ)	638	if (optlen > IFNAMSIZ - 1)
639	optlen = IFNAMSIZ;	639	optlen = IFNAMSIZ - 1;
		640
		641	memset(devname, 0, sizeof(devname));
640		642
641	if (copy_from_user(devname, optval, optlen)) {	643	if (copy_from_user(devname, optval, optlen)) {
642	res = -EFAULT;	644	res = -EFAULT;

net/core/dev.c+18−6

 	return 0;
 }
-static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc,
+static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc,
 				    struct packet_type **ppt_prev)
 {
 	struct packet_type *ptype, *pt_prev;
 	rx_handler_func_t *rx_handler;
+	struct sk_buff *skb = *pskb;
 	struct net_device *orig_dev;
 	bool deliver_exact = false;
 	int ret = NET_RX_DROP;
 		ret2 = do_xdp_generic(rcu_dereference(skb->dev->xdp_prog), skb);
 		preempt_enable();
-		if (ret2 != XDP_PASS)
+		if (ret2 != XDP_PASS) {
-			return NET_RX_DROP;
+			ret = NET_RX_DROP;
+			goto out;
+		}
 		skb_reset_mac_len(skb);
 	}
 	}
 out:
+	/* The invariant here is that if *ppt_prev is not NULL
+	 * then skb should also be non-NULL.
+	 *
+	 * Apparently *ppt_prev assignment above holds this invariant due to
+	 * skb dereferencing near it.
+	 */
+	*pskb = skb;
 	return ret;
 }
 	struct packet_type *pt_prev = NULL;
 	int ret;
-	ret = __netif_receive_skb_core(skb, pfmemalloc, &pt_prev);
+	ret = __netif_receive_skb_core(&skb, pfmemalloc, &pt_prev);
 	if (pt_prev)
 		ret = INDIRECT_CALL_INET(pt_prev->func, ipv6_rcv, ip_rcv, skb,
 					 skb->dev, pt_prev, orig_dev);
 		struct packet_type *pt_prev = NULL;
 		skb_list_del_init(skb);
-		__netif_receive_skb_core(skb, pfmemalloc, &pt_prev);
+		__netif_receive_skb_core(&skb, pfmemalloc, &pt_prev);
 		if (!pt_prev)
 			continue;
 		if (pt_curr != pt_prev || od_curr != orig_dev) {
 			netdev_dbg(upper, "Disabling feature %pNF on lower dev %s.\n",
 				   &feature, lower->name);
 			lower->wanted_features &= ~feature;
-			netdev_update_features(lower);
+			__netdev_update_features(lower);
 			if (unlikely(lower->features & feature))
 				netdev_WARN(upper, "failed to disable %pNF on %s!\n",
 					    &feature, lower->name);
+			else
+				netdev_features_change(lower);
 		}
 	}
 }

net/core/filter.c+1−1

 			}
 			pop = 0;
 		} else if (pop >= sge->length - a) {
-			sge->length = a;
 			pop -= (sge->length - a);
+			sge->length = a;
 		}
 	}

net/core/flow_dissector.c+21−5

 	return ret;
 }
-int skb_flow_dissector_bpf_prog_detach(const union bpf_attr *attr)
+static int flow_dissector_bpf_prog_detach(struct net *net)
 {
 	struct bpf_prog *attached;
-	struct net *net;
-	net = current->nsproxy->net_ns;
 	mutex_lock(&flow_dissector_mutex);
 	attached = rcu_dereference_protected(net->flow_dissector_prog,
 					     lockdep_is_held(&flow_dissector_mutex));
 	return 0;
 }
+int skb_flow_dissector_bpf_prog_detach(const union bpf_attr *attr)
+{
+	return flow_dissector_bpf_prog_detach(current->nsproxy->net_ns);
+}
+static void __net_exit flow_dissector_pernet_pre_exit(struct net *net)
+{
+	/* We're not racing with attach/detach because there are no
+	 * references to netns left when pre_exit gets called.
+	 */
+	if (rcu_access_pointer(net->flow_dissector_prog))
+		flow_dissector_bpf_prog_detach(net);
+}
+static struct pernet_operations flow_dissector_pernet_ops __net_initdata = {
+	.pre_exit = flow_dissector_pernet_pre_exit,
+};
 /**
  * __skb_flow_get_ports - extract the upper layer ports and return them
  * @skb: sk_buff to extract the ports from
 	skb_flow_dissector_init(&flow_keys_basic_dissector,
 				flow_keys_basic_dissector_keys,
 				ARRAY_SIZE(flow_keys_basic_dissector_keys));
-	return 0;
-}
+	return register_pernet_subsys(&flow_dissector_pernet_ops);
+}
 core_initcall(init_default_flow_dissectors);

net/core/netprio_cgroup.c+2−0

@@ -236,6 +236,8 @@ static void net_prio_attach(struct cgroup_taskset *tset) · 235 unmodified lines
236	struct task_struct *p;	236	struct task_struct *p;
237	struct cgroup_subsys_state *css;	237	struct cgroup_subsys_state *css;
238		238
		239	cgroup_sk_alloc_disable();
		240
239	cgroup_taskset_for_each(p, css, tset) {	241	cgroup_taskset_for_each(p, css, tset) {
240	void v = (void )(unsigned long)css->id;	242	void v = (void )(unsigned long)css->id;
241		243

net/dsa/tag_mtk.c+15−0

 #define MTK_HDR_XMIT_TAGGED_TPID_8100	1
 #define MTK_HDR_RECV_SOURCE_PORT_MASK	GENMASK(2, 0)
 #define MTK_HDR_XMIT_DP_BIT_MASK	GENMASK(5, 0)
+#define MTK_HDR_XMIT_SA_DIS		BIT(6)
 static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,
 				    struct net_device *dev)
 	struct dsa_port *dp = dsa_slave_to_port(dev);
 	u8 *mtk_tag;
 	bool is_vlan_skb = true;
+	unsigned char *dest = eth_hdr(skb)->h_dest;
+	bool is_multicast_skb = is_multicast_ether_addr(dest) &&
+				!is_broadcast_ether_addr(dest);
 	/* Build the special tag after the MAC Source Address. If VLAN header
 	 * is present, it's required that VLAN header and special tag is
 		     MTK_HDR_XMIT_UNTAGGED;
 	mtk_tag[1] = (1 << dp->index) & MTK_HDR_XMIT_DP_BIT_MASK;
+	/* Disable SA learning for multicast frames */
+	if (unlikely(is_multicast_skb))
+		mtk_tag[1] |= MTK_HDR_XMIT_SA_DIS;
 	/* Tag control information is kept for 802.1Q */
 	if (!is_vlan_skb) {
 		mtk_tag[2] = 0;
 {
 	int port;
 	__be16 *phdr, hdr;
+	unsigned char *dest = eth_hdr(skb)->h_dest;
+	bool is_multicast_skb = is_multicast_ether_addr(dest) &&
+				!is_broadcast_ether_addr(dest);
 	if (unlikely(!pskb_may_pull(skb, MTK_HDR_LEN)))
 		return NULL;
 	if (!skb->dev)
 		return NULL;
+	/* Only unicast or broadcast frames are offloaded */
+	if (likely(!is_multicast_skb))
+		skb->offload_fwd_mark = 1;
 	return skb;
 }

net/ethtool/netlink.c+2−2

@@ -342,7 +342,7 @@ static int ethnl_default_doit(struct sk_buff skb, struct genl_info info) · 341 unmodified lines
342	ret = ops->reply_size(req_info, reply_data);	342	ret = ops->reply_size(req_info, reply_data);
343	if (ret < 0)	343	if (ret < 0)
344	goto err_cleanup;	344	goto err_cleanup;
345	reply_len = ret;	345	reply_len = ret + ethnl_reply_header_size();
346	ret = -ENOMEM;	346	ret = -ENOMEM;
347	rskb = ethnl_reply_init(reply_len, req_info->dev, ops->reply_cmd,	347	rskb = ethnl_reply_init(reply_len, req_info->dev, ops->reply_cmd,
348	ops->hdr_attr, info, &reply_payload);	348	ops->hdr_attr, info, &reply_payload);
@@ -588,7 +588,7 @@ static void ethnl_default_notify(struct net_device *dev, unsigned int cmd, · 239 unmodified lines
588	ret = ops->reply_size(req_info, reply_data);	588	ret = ops->reply_size(req_info, reply_data);
589	if (ret < 0)	589	if (ret < 0)
590	goto err_cleanup;	590	goto err_cleanup;
591	reply_len = ret;	591	reply_len = ret + ethnl_reply_header_size();
592	ret = -ENOMEM;	592	ret = -ENOMEM;
593	skb = genlmsg_new(reply_len, GFP_KERNEL);	593	skb = genlmsg_new(reply_len, GFP_KERNEL);
594	if (!skb)	594	if (!skb)

net/ethtool/strset.c+0−1

@@ -324,7 +324,6 @@ static int strset_reply_size(const struct ethnl_req_info *req_base, · 323 unmodified lines
324	int len = 0;	324	int len = 0;
325	int ret;	325	int ret;
326		326
327	len += ethnl_reply_header_size();
328	for (i = 0; i < ETH_SS_COUNT; i++) {	327	for (i = 0; i < ETH_SS_COUNT; i++) {
329	const struct strset_info *set_info = &data->sets[i];	328	const struct strset_info *set_info = &data->sets[i];
330		329

net/ipv4/cipso_ipv4.c+4−2

 			return ret_val;
 		}
-		secattr->flags |= NETLBL_SECATTR_MLS_CAT;
+		if (secattr->attr.mls.cat)
+			secattr->flags |= NETLBL_SECATTR_MLS_CAT;
 	}
 	return 0;
 			return ret_val;
 		}
-		secattr->flags |= NETLBL_SECATTR_MLS_CAT;
+		if (secattr->attr.mls.cat)
+			secattr->flags |= NETLBL_SECATTR_MLS_CAT;
 	}
 	return 0;

net/ipv4/fib_frontend.c+1−2

 	else
 		filter->dump_exceptions = false;
-	filter->dump_all_families = (rtm->rtm_family == AF_UNSPEC);
 	filter->flags    = rtm->rtm_flags;
 	filter->protocol = rtm->rtm_protocol;
 	filter->rt_type  = rtm->rtm_type;
 	if (filter.table_id) {
 		tb = fib_get_table(net, filter.table_id);
 		if (!tb) {
-			if (filter.dump_all_families)
+			if (rtnl_msg_family(cb->nlh) != PF_INET)
 				return skb->len;
 			NL_SET_ERR_MSG(cb->extack, "ipv4: FIB table does not exist");

net/ipv4/inet_connection_sock.c+24−19

 #include <net/addrconf.h>
 #if IS_ENABLED(CONFIG_IPV6)
-/* match_wildcard == true:  IPV6_ADDR_ANY equals to any IPv6 addresses if IPv6
+/* match_sk*_wildcard == true:  IPV6_ADDR_ANY equals to any IPv6 addresses
- *                          only, and any IPv4 addresses if not IPv6 only
+ *				if IPv6 only, and any IPv4 addresses
- * match_wildcard == false: addresses must be exactly the same, i.e.
+ *				if not IPv6 only
- *                          IPV6_ADDR_ANY only equals to IPV6_ADDR_ANY,
+ * match_sk*_wildcard == false: addresses must be exactly the same, i.e.
- *                          and 0.0.0.0 equals to 0.0.0.0 only
+ *				IPV6_ADDR_ANY only equals to IPV6_ADDR_ANY,
+ *				and 0.0.0.0 equals to 0.0.0.0 only
  */
 static bool ipv6_rcv_saddr_equal(const struct in6_addr *sk1_rcv_saddr6,
 				 const struct in6_addr *sk2_rcv_saddr6,
 				 __be32 sk1_rcv_saddr, __be32 sk2_rcv_saddr,
 				 bool sk1_ipv6only, bool sk2_ipv6only,
-				 bool match_wildcard)
+				 bool match_sk1_wildcard,
+				 bool match_sk2_wildcard)
 {
 	int addr_type = ipv6_addr_type(sk1_rcv_saddr6);
 	int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED;
 		if (!sk2_ipv6only) {
 			if (sk1_rcv_saddr == sk2_rcv_saddr)
 				return true;
-			if (!sk1_rcv_saddr || !sk2_rcv_saddr)
+			return (match_sk1_wildcard && !sk1_rcv_saddr) ||
-				return match_wildcard;
+				(match_sk2_wildcard && !sk2_rcv_saddr);
 		}
 		return false;
 	}
 	if (addr_type == IPV6_ADDR_ANY && addr_type2 == IPV6_ADDR_ANY)
 		return true;
-	if (addr_type2 == IPV6_ADDR_ANY && match_wildcard &&
+	if (addr_type2 == IPV6_ADDR_ANY && match_sk2_wildcard &&
 	    !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))
 		return true;
-	if (addr_type == IPV6_ADDR_ANY && match_wildcard &&
+	if (addr_type == IPV6_ADDR_ANY && match_sk1_wildcard &&
 	    !(sk1_ipv6only && addr_type2 == IPV6_ADDR_MAPPED))
 		return true;
 }
 #endif
-/* match_wildcard == true:  0.0.0.0 equals to any IPv4 addresses
+/* match_sk*_wildcard == true:  0.0.0.0 equals to any IPv4 addresses
- * match_wildcard == false: addresses must be exactly the same, i.e.
+ * match_sk*_wildcard == false: addresses must be exactly the same, i.e.
- *                          0.0.0.0 only equals to 0.0.0.0
+ *				0.0.0.0 only equals to 0.0.0.0
  */
 static bool ipv4_rcv_saddr_equal(__be32 sk1_rcv_saddr, __be32 sk2_rcv_saddr,
-				 bool sk2_ipv6only, bool match_wildcard)
+				 bool sk2_ipv6only, bool match_sk1_wildcard,
+				 bool match_sk2_wildcard)
 {
 	if (!sk2_ipv6only) {
 		if (sk1_rcv_saddr == sk2_rcv_saddr)
 			return true;
-		if (!sk1_rcv_saddr || !sk2_rcv_saddr)
+		return (match_sk1_wildcard && !sk1_rcv_saddr) ||
-			return match_wildcard;
+			(match_sk2_wildcard && !sk2_rcv_saddr);
 	}
 	return false;
 }
 					    sk2->sk_rcv_saddr,
 					    ipv6_only_sock(sk),
 					    ipv6_only_sock(sk2),
+					    match_wildcard,
 					    match_wildcard);
 #endif
 	return ipv4_rcv_saddr_equal(sk->sk_rcv_saddr, sk2->sk_rcv_saddr,
-				    ipv6_only_sock(sk2), match_wildcard);
+				    ipv6_only_sock(sk2), match_wildcard,
+				    match_wildcard);
 }
 EXPORT_SYMBOL(inet_rcv_saddr_equal);
 					    tb->fast_rcv_saddr,
 					    sk->sk_rcv_saddr,
 					    tb->fast_ipv6_only,
-					    ipv6_only_sock(sk), true);
+					    ipv6_only_sock(sk), true, false);
 #endif
 	return ipv4_rcv_saddr_equal(tb->fast_rcv_saddr, sk->sk_rcv_saddr,
-				    ipv6_only_sock(sk), true);
+				    ipv6_only_sock(sk), true, false);
 }
 /* Obtain a reference to a local port for the given sock,

net/ipv4/ipip.c+1−1

@@ -698,7 +698,7 @@ out: · 697 unmodified lines
698		698
699	rtnl_link_failed:	699	rtnl_link_failed:
700	#if IS_ENABLED(CONFIG_MPLS)	700	#if IS_ENABLED(CONFIG_MPLS)
701	xfrm4_tunnel_deregister(&mplsip_handler, AF_INET);	701	xfrm4_tunnel_deregister(&mplsip_handler, AF_MPLS);
702	xfrm_tunnel_mplsip_failed:	702	xfrm_tunnel_mplsip_failed:
703		703
704	#endif	704	#endif

net/ipv4/ipmr.c+5−3

 static void ipmr_expire_process(struct timer_list *t);
 #ifdef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-#define ipmr_for_each_table(mrt, net) \
+#define ipmr_for_each_table(mrt, net)					\
-	list_for_each_entry_rcu(mrt, &net->ipv4.mr_tables, list)
+	list_for_each_entry_rcu(mrt, &net->ipv4.mr_tables, list,	\
+				lockdep_rtnl_is_held() ||		\
+				list_empty(&net->ipv4.mr_tables))
 static struct mr_table *ipmr_mr_table_iter(struct net *net,
 					   struct mr_table *mrt)
 		mrt = ipmr_get_table(sock_net(skb->sk), filter.table_id);
 		if (!mrt) {
-			if (filter.dump_all_families)
+			if (rtnl_msg_family(cb->nlh) != RTNL_FAMILY_IPMR)
 				return skb->len;
 			NL_SET_ERR_MSG(cb->extack, "ipv4: MR table does not exist");

net/ipv4/nexthop.c+2−1

 	return 0;
 nla_put_failure:
+	nlmsg_cancel(skb, nlh);
 	return -EMSGSIZE;
 }
 		if (!valid_group_nh(nh, len, extack))
 			return -EINVAL;
 	}
-	for (i = NHA_GROUP + 1; i < __NHA_MAX; ++i) {
+	for (i = NHA_GROUP_TYPE + 1; i < __NHA_MAX; ++i) {
 		if (!tb[i])
 			continue;

net/ipv4/route.c+7−9

 	atomic_t *p_id = ip_idents + hash % IP_IDENTS_SZ;
 	u32 old = READ_ONCE(*p_tstamp);
 	u32 now = (u32)jiffies;
-	u32 new, delta = 0;
+	u32 delta = 0;
 	if (old != now && cmpxchg(p_tstamp, old, now) == old)
 		delta = prandom_u32_max(now - old);
-	/* Do not use atomic_add_return() as it makes UBSAN unhappy */
+	/* If UBSAN reports an error there, please make sure your compiler
-	do {
+	 * supports -fno-strict-overflow before reporting it that was a bug
-		old = (u32)atomic_read(p_id);
+	 * in UBSAN, and it has been fixed in GCC-8.
-		new = old + delta + segs;
+	 */
-	} while (atomic_cmpxchg(p_id, old, new) != old);
+	return atomic_add_return(segs + delta, p_id) - segs;
-	return new - segs;
 }
 EXPORT_SYMBOL(ip_idents_reserve);
 	/* Check for load limit; set rate_last to the latest sent
 	 * redirect.
 	 */
-	if (peer->rate_tokens == 0 ||
+	if (peer->n_redirects == 0 ||
 	    time_after(jiffies,
 		       (peer->rate_last +
 			(ip_rt_redirect_load << peer->n_redirects)))) {

net/ipv4/tcp.c+19−8

@@ -476,9 +476,17 @@ static void tcp_tx_timestamp(struct sock *sk, u16 tsflags) · 475 unmodified lines
476	static inline bool tcp_stream_is_readable(const struct tcp_sock *tp,	476	static inline bool tcp_stream_is_readable(const struct tcp_sock *tp,
477	int target, struct sock *sk)	477	int target, struct sock *sk)
478	{	478	{
479	return (READ_ONCE(tp->rcv_nxt) - READ_ONCE(tp->copied_seq) >= target) \|\|	479	int avail = READ_ONCE(tp->rcv_nxt) - READ_ONCE(tp->copied_seq);
480	(sk->sk_prot->stream_memory_read ?	480
481	sk->sk_prot->stream_memory_read(sk) : false);	481	if (avail > 0) {
		482	if (avail >= target)
		483	return true;
		484	if (tcp_rmem_pressure(sk))
		485	return true;
		486	}
		487	if (sk->sk_prot->stream_memory_read)
		488	return sk->sk_prot->stream_memory_read(sk);
		489	return false;
482	}	490	}
483		491
484	/*	492	/*
@@ -1756,10 +1764,11 @@ static int tcp_zerocopy_receive(struct sock *sk, · 1271 unmodified lines
1756		1764
1757	down_read(&current->mm->mmap_sem);	1765	down_read(&current->mm->mmap_sem);
1758		1766
1759	ret = -EINVAL;
1760	vma = find_vma(current->mm, address);	1767	vma = find_vma(current->mm, address);
1761	if (!vma \|\| vma->vm_start > address \|\| vma->vm_ops != &tcp_vm_ops)	1768	if (!vma \|\| vma->vm_start > address \|\| vma->vm_ops != &tcp_vm_ops) {
1762	goto out;	1769	up_read(&current->mm->mmap_sem);
		1770	return -EINVAL;
		1771	}
1763	zc->length = min_t(unsigned long, zc->length, vma->vm_end - address);	1772	zc->length = min_t(unsigned long, zc->length, vma->vm_end - address);
1764		1773
1765	tp = tcp_sk(sk);	1774	tp = tcp_sk(sk);
@@ -2154,13 +2163,15 @@ skip_copy: · 388 unmodified lines
2154	tp->urg_data = 0;	2163	tp->urg_data = 0;
2155	tcp_fast_path_check(sk);	2164	tcp_fast_path_check(sk);
2156	}	2165	}
2157	if (used + offset < skb->len)
2158	continue;
2159		2166
2160	if (TCP_SKB_CB(skb)->has_rxtstamp) {	2167	if (TCP_SKB_CB(skb)->has_rxtstamp) {
2161	tcp_update_recv_tstamps(skb, &tss);	2168	tcp_update_recv_tstamps(skb, &tss);
2162	cmsg_flags \|= 2;	2169	cmsg_flags \|= 2;
2163	}	2170	}
		2171
		2172	if (used + offset < skb->len)
		2173	continue;
		2174
2164	if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)	2175	if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
2165	goto found_fin_ok;	2176	goto found_fin_ok;
2166	if (!(flags & MSG_PEEK))	2177	if (!(flags & MSG_PEEK))

net/ipv4/tcp_bpf.c+6−4

 	if (!ret) {
 		msg->sg.start = i;
-		msg->sg.size -= apply_bytes;
 		sk_psock_queue_msg(psock, tmp);
 		sk_psock_data_ready(sk, psock);
 	} else {
 	struct sk_psock *psock;
 	int copied, ret;
+	if (unlikely(flags & MSG_ERRQUEUE))
+		return inet_recv_error(sk, msg, len, addr_len);
 	psock = sk_psock_get(sk);
 	if (unlikely(!psock))
 		return tcp_recvmsg(sk, msg, len, nonblock, flags, addr_len);
-	if (unlikely(flags & MSG_ERRQUEUE))
-		return inet_recv_error(sk, msg, len, addr_len);
 	if (!skb_queue_empty(&sk->sk_receive_queue) &&
-	    sk_psock_queue_empty(psock))
+	    sk_psock_queue_empty(psock)) {
+		sk_psock_put(sk, psock);
 		return tcp_recvmsg(sk, msg, len, nonblock, flags, addr_len);
+	}
 	lock_sock(sk);
 msg_bytes_ready:
 	copied = __tcp_bpf_recvmsg(sk, psock, msg, len, flags);

net/ipv4/tcp_input.c+2−1

@@ -4757,7 +4757,8 @@ void tcp_data_ready(struct sock *sk) · 4756 unmodified lines
4757	const struct tcp_sock *tp = tcp_sk(sk);	4757	const struct tcp_sock *tp = tcp_sk(sk);
4758	int avail = tp->rcv_nxt - tp->copied_seq;	4758	int avail = tp->rcv_nxt - tp->copied_seq;
4759		4759
4760	if (avail < sk->sk_rcvlowat && !sock_flag(sk, SOCK_DONE))	4760	if (avail < sk->sk_rcvlowat && !tcp_rmem_pressure(sk) &&
		4761	!sock_flag(sk, SOCK_DONE))
4761	return;	4762	return;
4762		4763
4763	sk->sk_data_ready(sk);	4764	sk->sk_data_ready(sk);

net/ipv6/calipso.c+2−1

@@ -1047,7 +1047,8 @@ static int calipso_opt_getattr(const unsigned char *calipso, · 1046 unmodified lines
1047	goto getattr_return;	1047	goto getattr_return;
1048	}	1048	}
1049		1049
1050	secattr->flags \|= NETLBL_SECATTR_MLS_CAT;	1050	if (secattr->attr.mls.cat)
		1051	secattr->flags \|= NETLBL_SECATTR_MLS_CAT;
1051	}	1052	}
1052		1053
1053	secattr->type = NETLBL_NLTYPE_CALIPSO;	1054	secattr->type = NETLBL_NLTYPE_CALIPSO;

net/ipv6/ip6_fib.c+1−1

@@ -664,7 +664,7 @@ static int inet6_dump_fib(struct sk_buff skb, struct netlink_callback cb) · 663 unmodified lines
664	if (arg.filter.table_id) {	664	if (arg.filter.table_id) {
665	tb = fib6_get_table(net, arg.filter.table_id);	665	tb = fib6_get_table(net, arg.filter.table_id);
666	if (!tb) {	666	if (!tb) {
667	if (arg.filter.dump_all_families)	667	if (rtnl_msg_family(cb->nlh) != PF_INET6)
668	goto out;	668	goto out;
669		669
670	NL_SET_ERR_MSG_MOD(cb->extack, "FIB table does not exist");	670	NL_SET_ERR_MSG_MOD(cb->extack, "FIB table does not exist");

net/ipv6/ip6mr.c+3−2

 #ifdef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES
 #define ip6mr_for_each_table(mrt, net) \
 	list_for_each_entry_rcu(mrt, &net->ipv6.mr6_tables, list, \
-				lockdep_rtnl_is_held())
+				lockdep_rtnl_is_held() || \
+				list_empty(&net->ipv6.mr6_tables))
 static struct mr_table *ip6mr_mr_table_iter(struct net *net,
 					    struct mr_table *mrt)
 		mrt = ip6mr_get_table(sock_net(skb->sk), filter.table_id);
 		if (!mrt) {
-			if (filter.dump_all_families)
+			if (rtnl_msg_family(cb->nlh) != RTNL_FAMILY_IP6MR)
 				return skb->len;
 			NL_SET_ERR_MSG_MOD(cb->extack, "MR table does not exist");

net/ipv6/route.c+4−2

 	const struct in6_addr *daddr, *saddr;
 	struct rt6_info *rt6 = (struct rt6_info *)dst;
-	if (dst_metric_locked(dst, RTAX_MTU))
+	/* Note: do *NOT* check dst_metric_locked(dst, RTAX_MTU)
-		return;
+	 * IPv6 pmtu discovery isn't optional, so 'mtu lock' cannot disable it.
+	 * [see also comment in rt6_mtu_change_route()]
+	 */
 	if (iph) {
 		daddr = &iph->daddr;

net/mptcp/crypto.c+9−15

 void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u8 *msg, int len, void *hmac)
 {
 	u8 input[SHA256_BLOCK_SIZE + SHA256_DIGEST_SIZE];
-	__be32 mptcp_hashed_key[SHA256_DIGEST_WORDS];
-	__be32 *hash_out = (__force __be32 *)hmac;
 	struct sha256_state state;
 	u8 key1be[8];
 	u8 key2be[8];
 	sha256_init(&state);
 	sha256_update(&state, input, SHA256_BLOCK_SIZE + SHA256_DIGEST_SIZE);
-	sha256_final(&state, (u8 *)mptcp_hashed_key);
+	sha256_final(&state, (u8 *)hmac);
-	/* takes only first 160 bits */
-	for (i = 0; i < 5; i++)
-		hash_out[i] = mptcp_hashed_key[i];
 }
 #ifdef CONFIG_MPTCP_HMAC_TEST
 };
 /* we can't reuse RFC 4231 test vectors, as we have constraint on the
- * input and key size, and we truncate the output.
+ * input and key size.
  */
 static struct test_cast tests[] = {
 	{
 		.key = "0b0b0b0b0b0b0b0b",
 		.msg = "48692054",
-		.result = "8385e24fb4235ac37556b6b886db106284a1da67",
+		.result = "8385e24fb4235ac37556b6b886db106284a1da671699f46db1f235ec622dcafa",
 	},
 	{
 		.key = "aaaaaaaaaaaaaaaa",
 		.msg = "dddddddd",
-		.result = "2c5e219164ff1dca1c4a92318d847bb6b9d44492",
+		.result = "2c5e219164ff1dca1c4a92318d847bb6b9d44492984e1eb71aff9022f71046e9",
 	},
 	{
 		.key = "0102030405060708",
 		.msg = "cdcdcdcd",
-		.result = "e73b9ba9969969cefb04aa0d6df18ec2fcc075b6",
+		.result = "e73b9ba9969969cefb04aa0d6df18ec2fcc075b6f23b4d8c4da736a5dbbc6e7d",
 	},
 };
 static int __init test_mptcp_crypto(void)
 {
-	char hmac[20], hmac_hex[41];
+	char hmac[32], hmac_hex[65];
 	u32 nonce1, nonce2;
 	u64 key1, key2;
 	u8 msg[8];
 		put_unaligned_be32(nonce2, &msg[4]);
 		mptcp_crypto_hmac_sha(key1, key2, msg, 8, hmac);
-		for (j = 0; j < 20; ++j)
+		for (j = 0; j < 32; ++j)
 			sprintf(&hmac_hex[j << 1], "%02x", hmac[j] & 0xff);
-		hmac_hex[40] = 0;
+		hmac_hex[64] = 0;
-		if (memcmp(hmac_hex, tests[i].result, 40))
+		if (memcmp(hmac_hex, tests[i].result, 64))
 			pr_err("test %d failed, got %s expected %s", i,
 			       hmac_hex, tests[i].result);
 		else

net/mptcp/options.c+5−4

 #define pr_fmt(fmt) "MPTCP: " fmt
 #include <linux/kernel.h>
+#include <crypto/sha.h>
 #include <net/tcp.h>
 #include <net/mptcp.h>
 #include "protocol.h"
 static u64 add_addr_generate_hmac(u64 key1, u64 key2, u8 addr_id,
 				  struct in_addr *addr)
 {
-	u8 hmac[MPTCP_ADDR_HMAC_LEN];
+	u8 hmac[SHA256_DIGEST_SIZE];
 	u8 msg[7];
 	msg[0] = addr_id;
 	mptcp_crypto_hmac_sha(key1, key2, msg, 7, hmac);
-	return get_unaligned_be64(hmac);
+	return get_unaligned_be64(&hmac[SHA256_DIGEST_SIZE - sizeof(u64)]);
 }
 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
 static u64 add_addr6_generate_hmac(u64 key1, u64 key2, u8 addr_id,
 				   struct in6_addr *addr)
 {
-	u8 hmac[MPTCP_ADDR_HMAC_LEN];
+	u8 hmac[SHA256_DIGEST_SIZE];
 	u8 msg[19];
 	msg[0] = addr_id;
 	mptcp_crypto_hmac_sha(key1, key2, msg, 19, hmac);
-	return get_unaligned_be64(hmac);
+	return get_unaligned_be64(&hmac[SHA256_DIGEST_SIZE - sizeof(u64)]);
 }
 #endif

net/mptcp/protocol.c+2−0

@@ -1629,6 +1629,8 @@ bool mptcp_finish_join(struct sock *sk) · 1628 unmodified lines
1629		1629
1630	ret = mptcp_pm_allow_new_subflow(msk);	1630	ret = mptcp_pm_allow_new_subflow(msk);
1631	if (ret) {	1631	if (ret) {
		1632	subflow->map_seq = msk->ack_seq;
		1633
1632	/* active connections are already on conn_list */	1634	/* active connections are already on conn_list */
1633	spin_lock_bh(&msk->join_list_lock);	1635	spin_lock_bh(&msk->join_list_lock);
1634	if (!WARN_ON_ONCE(!list_empty(&subflow->node)))	1636	if (!WARN_ON_ONCE(!list_empty(&subflow->node)))

net/mptcp/protocol.h+0−1

@@ -81,7 +81,6 @@ · 80 unmodified lines
81		81
82	/* MPTCP ADD_ADDR flags */	82	/* MPTCP ADD_ADDR flags */
83	#define MPTCP_ADDR_ECHO BIT(0)	83	#define MPTCP_ADDR_ECHO BIT(0)
84	#define MPTCP_ADDR_HMAC_LEN 20
85	#define MPTCP_ADDR_IPVERSION_4 4	84	#define MPTCP_ADDR_IPVERSION_4 4
86	#define MPTCP_ADDR_IPVERSION_6 6	85	#define MPTCP_ADDR_IPVERSION_6 6
87		86

net/mptcp/subflow.c+20−5

 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <crypto/algapi.h>
+#include <crypto/sha.h>
 #include <net/sock.h>
 #include <net/inet_common.h>
 #include <net/inet_hashtables.h>
 				       const struct sk_buff *skb)
 {
 	struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req);
-	u8 hmac[MPTCPOPT_HMAC_LEN];
+	u8 hmac[SHA256_DIGEST_SIZE];
 	struct mptcp_sock *msk;
 	int local_id;
 /* validate received truncated hmac and create hmac for third ACK */
 static bool subflow_thmac_valid(struct mptcp_subflow_context *subflow)
 {
-	u8 hmac[MPTCPOPT_HMAC_LEN];
+	u8 hmac[SHA256_DIGEST_SIZE];
 	u64 thmac;
 	subflow_generate_hmac(subflow->remote_key, subflow->local_key,
 			subflow->ssn_offset = TCP_SKB_CB(skb)->seq;
 		}
 	} else if (subflow->mp_join) {
+		u8 hmac[SHA256_DIGEST_SIZE];
 		pr_debug("subflow=%p, thmac=%llu, remote_nonce=%u",
 			 subflow, subflow->thmac,
 			 subflow->remote_nonce);
 		subflow_generate_hmac(subflow->local_key, subflow->remote_key,
 				      subflow->local_nonce,
 				      subflow->remote_nonce,
-				      subflow->hmac);
+				      hmac);
+		memcpy(subflow->hmac, hmac, MPTCPOPT_HMAC_LEN);
 		if (skb)
 			subflow->ssn_offset = TCP_SKB_CB(skb)->seq;
 			       const struct mptcp_options_received *mp_opt)
 {
 	const struct mptcp_subflow_request_sock *subflow_req;
-	u8 hmac[MPTCPOPT_HMAC_LEN];
+	u8 hmac[SHA256_DIGEST_SIZE];
 	struct mptcp_sock *msk;
 	bool ret;
 			      subflow_req->local_nonce, hmac);
 	ret = true;
-	if (crypto_memneq(hmac, mp_opt->hmac, sizeof(hmac)))
+	if (crypto_memneq(hmac, mp_opt->hmac, MPTCPOPT_HMAC_LEN))
 		ret = false;
 	sock_put((struct sock *)msk);
 	if (err)
 		return err;
+	/* the newly created socket really belongs to the owning MPTCP master
+	 * socket, even if for additional subflows the allocation is performed
+	 * by a kernel workqueue. Adjust inode references, so that the
+	 * procfs/diag interaces really show this one belonging to the correct
+	 * user.
+	 */
+	SOCK_INODE(sf)->i_ino = SOCK_INODE(sk->sk_socket)->i_ino;
+	SOCK_INODE(sf)->i_uid = SOCK_INODE(sk->sk_socket)->i_uid;
+	SOCK_INODE(sf)->i_gid = SOCK_INODE(sk->sk_socket)->i_gid;
 	subflow = mptcp_subflow_ctx(sf->sk);
 	pr_debug("subflow=%p", subflow);

net/netfilter/nf_conntrack_core.c+14−3

 	ct->status = 0;
 	ct->timeout = 0;
 	write_pnet(&ct->ct_net, net);
-	memset(&ct->__nfct_init_offset[0], 0,
+	memset(&ct->__nfct_init_offset, 0,
 	       offsetof(struct nf_conn, proto) -
-	       offsetof(struct nf_conn, __nfct_init_offset[0]));
+	       offsetof(struct nf_conn, __nfct_init_offset));
 	nf_ct_zone_add(ct, zone);
 		nf_conntrack_lock(lockp);
 		if (*bucket < nf_conntrack_htable_size) {
 			hlist_nulls_for_each_entry(h, n, &nf_conntrack_hash[*bucket], hnnode) {
-				if (NF_CT_DIRECTION(h) != IP_CT_DIR_ORIGINAL)
+				if (NF_CT_DIRECTION(h) != IP_CT_DIR_REPLY)
 					continue;
+				/* All nf_conn objects are added to hash table twice, one
+				 * for original direction tuple, once for the reply tuple.
+				 *
+				 * Exception: In the IPS_NAT_CLASH case, only the reply
+				 * tuple is added (the original tuple already existed for
+				 * a different object).
+				 *
+				 * We only need to call the iterator once for each
+				 * conntrack, so we just use the 'reply' direction
+				 * tuple while iterating.
+				 */
 				ct = nf_ct_tuplehash_to_ctrack(h);
 				if (iter(ct, data))
 					goto found;

net/netfilter/nf_flow_table_core.c+5−3

 	if (nf_flow_has_expired(flow))
 		flow_offload_fixup_ct(flow->ct);
-	else if (test_bit(NF_FLOW_TEARDOWN, &flow->flags))
+	else
 		flow_offload_fixup_ct_timeout(flow->ct);
 	flow_offload_free(flow);
 {
 	struct nf_flowtable *flow_table = data;
-	if (nf_flow_has_expired(flow) || nf_ct_is_dying(flow->ct) ||
+	if (nf_flow_has_expired(flow) || nf_ct_is_dying(flow->ct))
-	    test_bit(NF_FLOW_TEARDOWN, &flow->flags)) {
+		set_bit(NF_FLOW_TEARDOWN, &flow->flags);
+	if (test_bit(NF_FLOW_TEARDOWN, &flow->flags)) {
 		if (test_bit(NF_FLOW_HW, &flow->flags)) {
 			if (!test_bit(NF_FLOW_HW_DYING, &flow->flags))
 				nf_flow_offload_del(flow_table, flow);

net/netfilter/nf_flow_table_offload.c+8−2

 			WARN_ON_ONCE(1);
 	}
+	clear_bit(NF_FLOW_HW_PENDING, &offload->flow->flags);
 	kfree(offload);
 }
 {
 	struct flow_offload_work *offload;
+	if (test_and_set_bit(NF_FLOW_HW_PENDING, &flow->flags))
+		return NULL;
 	offload = kmalloc(sizeof(struct flow_offload_work), GFP_ATOMIC);
-	if (!offload)
+	if (!offload) {
+		clear_bit(NF_FLOW_HW_PENDING, &flow->flags);
 		return NULL;
+	}
 	offload->cmd = cmd;
 	offload->flow = flow;
 int nf_flow_table_offload_init(void)
 {
 	nf_flow_offload_wq  = alloc_workqueue("nf_flow_table_offload",
-					      WQ_UNBOUND | WQ_MEM_RECLAIM, 0);
+					      WQ_UNBOUND, 0);
 	if (!nf_flow_offload_wq)
 		return -ENOMEM;

net/netfilter/nft_set_rbtree.c+11−0

 				parent = rcu_dereference_raw(parent->rb_left);
 				continue;
 			}
+			if (nft_set_elem_expired(&rbe->ext))
+				return false;
 			if (nft_rbtree_interval_end(rbe)) {
 				if (nft_set_is_anonymous(set))
 					return false;
 	if (set->flags & NFT_SET_INTERVAL && interval != NULL &&
 	    nft_set_elem_active(&interval->ext, genmask) &&
+	    !nft_set_elem_expired(&interval->ext) &&
 	    nft_rbtree_interval_start(interval)) {
 		*ext = &interval->ext;
 		return true;
 				continue;
 			}
+			if (nft_set_elem_expired(&rbe->ext))
+				return false;
 			if (!nft_set_ext_exists(&rbe->ext, NFT_SET_EXT_FLAGS) ||
 			    (*nft_set_ext_flags(&rbe->ext) & NFT_SET_ELEM_INTERVAL_END) ==
 			    (flags & NFT_SET_ELEM_INTERVAL_END)) {
 	if (set->flags & NFT_SET_INTERVAL && interval != NULL &&
 	    nft_set_elem_active(&interval->ext, genmask) &&
+	    !nft_set_elem_expired(&interval->ext) &&
 	    ((!nft_rbtree_interval_end(interval) &&
 	      !(flags & NFT_SET_ELEM_INTERVAL_END)) ||
 	     (nft_rbtree_interval_end(interval) &&
 		if (iter->count < iter->skip)
 			goto cont;
+		if (nft_set_elem_expired(&rbe->ext))
+			goto cont;
 		if (!nft_set_elem_active(&rbe->ext, iter->genmask))
 			goto cont;

net/netlabel/netlabel_kapi.c+6−0

 	if ((off & (BITS_PER_LONG - 1)) != 0)
 		return -EINVAL;
+	/* a null catmap is equivalent to an empty one */
+	if (!catmap) {
+		*offset = (u32)-1;
+		return 0;
+	}
 	if (off < catmap->startbit) {
 		off = catmap->startbit;
 		*offset = off;

net/qrtr/qrtr.c+1−1

@@ -854,7 +854,7 @@ static int qrtr_bcast_enqueue(struct qrtr_node node, struct sk_buff skb, · 853 unmodified lines
854	}	854	}
855	mutex_unlock(&qrtr_node_lock);	855	mutex_unlock(&qrtr_node_lock);
856		856
857	qrtr_local_enqueue(node, skb, type, from, to);	857	qrtr_local_enqueue(NULL, skb, type, from, to);
858		858
859	return 0;	859	return 0;
860	}	860	}

net/rxrpc/Makefile+1−0

@@ -25,6 +25,7 @@ rxrpc-y := \ · 24 unmodified lines
25	peer_event.o \	25	peer_event.o \
26	peer_object.o \	26	peer_object.o \
27	recvmsg.o \	27	recvmsg.o \
		28	rtt.o \
28	security.o \	29	security.o \
29	sendmsg.o \	30	sendmsg.o \
30	skbuff.o \	31	skbuff.o \

net/rxrpc/ar-internal.h+17−8

@@ -7,6 +7,7 @@ · 6 unmodified lines
7		7
8	#include <linux/atomic.h>	8	#include <linux/atomic.h>
9	#include <linux/seqlock.h>	9	#include <linux/seqlock.h>
		10	#include <linux/win_minmax.h>
10	#include <net/net_namespace.h>	11	#include <net/net_namespace.h>
11	#include <net/netns/generic.h>	12	#include <net/netns/generic.h>
12	#include <net/sock.h>	13	#include <net/sock.h>
@@ -311,11 +312,14 @@ struct rxrpc_peer { · 298 unmodified lines
311	#define RXRPC_RTT_CACHE_SIZE 32	312	#define RXRPC_RTT_CACHE_SIZE 32
312	spinlock_t rtt_input_lock; /* RTT lock for input routine */	313	spinlock_t rtt_input_lock; /* RTT lock for input routine */
313	ktime_t rtt_last_req; /* Time of last RTT request */	314	ktime_t rtt_last_req; /* Time of last RTT request */
314	u64 rtt; /* Current RTT estimate (in nS) */	315	unsigned int rtt_count; /* Number of samples we've got */
315	u64 rtt_sum; /* Sum of cache contents */	316
316	u64 rtt_cache[RXRPC_RTT_CACHE_SIZE]; /* Determined RTT cache */	317	u32 srtt_us; /* smoothed round trip time << 3 in usecs */
317	u8 rtt_cursor; /* next entry at which to insert */	318	u32 mdev_us; /* medium deviation */
318	u8 rtt_usage; /* amount of cache actually used */	319	u32 mdev_max_us; /* maximal mdev for the last rtt period */
		320	u32 rttvar_us; /* smoothed mdev_max */
		321	u32 rto_j; /* Retransmission timeout in jiffies */
		322	u8 backoff; /* Backoff timeout */
319		323
320	u8 cong_cwnd; /* Congestion window size */	324	u8 cong_cwnd; /* Congestion window size */
321	};	325	};
@@ -1041,7 +1045,6 @@ extern unsigned long rxrpc_idle_ack_delay; · 719 unmodified lines
1041	extern unsigned int rxrpc_rx_window_size;	1045	extern unsigned int rxrpc_rx_window_size;
1042	extern unsigned int rxrpc_rx_mtu;	1046	extern unsigned int rxrpc_rx_mtu;
1043	extern unsigned int rxrpc_rx_jumbo_max;	1047	extern unsigned int rxrpc_rx_jumbo_max;
1044	extern unsigned long rxrpc_resend_timeout;
1045		1048
1046	extern const s8 rxrpc_ack_priority[];	1049	extern const s8 rxrpc_ack_priority[];
1047		1050
@@ -1069,8 +1072,6 @@ void rxrpc_send_keepalive(struct rxrpc_peer *); · 21 unmodified lines
1069	* peer_event.c	1072	* peer_event.c
1070	*/	1073	*/
1071	void rxrpc_error_report(struct sock *);	1074	void rxrpc_error_report(struct sock *);
1072	void rxrpc_peer_add_rtt(struct rxrpc_call *, enum rxrpc_rtt_rx_trace,
1073	rxrpc_serial_t, rxrpc_serial_t, ktime_t, ktime_t);
1074	void rxrpc_peer_keepalive_worker(struct work_struct *);	1075	void rxrpc_peer_keepalive_worker(struct work_struct *);
1075		1076
1076	/*	1077	/*
@@ -1102,6 +1103,14 @@ extern const struct seq_operations rxrpc_peer_seq_ops; · 25 unmodified lines
1102	void rxrpc_notify_socket(struct rxrpc_call *);	1103	void rxrpc_notify_socket(struct rxrpc_call *);
1103	int rxrpc_recvmsg(struct socket , struct msghdr , size_t, int);	1104	int rxrpc_recvmsg(struct socket , struct msghdr , size_t, int);
1104		1105
		1106	/*
		1107	* rtt.c
		1108	*/
		1109	void rxrpc_peer_add_rtt(struct rxrpc_call *, enum rxrpc_rtt_rx_trace,
		1110	rxrpc_serial_t, rxrpc_serial_t, ktime_t, ktime_t);
		1111	unsigned long rxrpc_get_rto_backoff(struct rxrpc_peer *, bool);
		1112	void rxrpc_peer_init_rtt(struct rxrpc_peer *);
		1113
1105	/*	1114	/*
1106	* rxkad.c	1115	* rxkad.c
1107	*/	1116	*/

net/rxrpc/call_accept.c+1−1

@@ -248,7 +248,7 @@ static void rxrpc_send_ping(struct rxrpc_call call, struct sk_buff skb) · 247 unmodified lines
248	struct rxrpc_skb_priv *sp = rxrpc_skb(skb);	248	struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
249	ktime_t now = skb->tstamp;	249	ktime_t now = skb->tstamp;
250		250
251	if (call->peer->rtt_usage < 3 \|\|	251	if (call->peer->rtt_count < 3 \|\|
252	ktime_before(ktime_add_ms(call->peer->rtt_last_req, 1000), now))	252	ktime_before(ktime_add_ms(call->peer->rtt_last_req, 1000), now))
253	rxrpc_propose_ACK(call, RXRPC_ACK_PING, sp->hdr.serial,	253	rxrpc_propose_ACK(call, RXRPC_ACK_PING, sp->hdr.serial,
254	true, true,	254	true, true,

net/rxrpc/call_event.c+8−14

 	} else {
 		unsigned long now = jiffies, ack_at;
-		if (call->peer->rtt_usage > 0)
+		if (call->peer->srtt_us != 0)
-			ack_at = nsecs_to_jiffies(call->peer->rtt);
+			ack_at = usecs_to_jiffies(call->peer->srtt_us >> 3);
 		else
 			ack_at = expiry;
 static void rxrpc_resend(struct rxrpc_call *call, unsigned long now_j)
 {
 	struct sk_buff *skb;
-	unsigned long resend_at;
+	unsigned long resend_at, rto_j;
 	rxrpc_seq_t cursor, seq, top;
-	ktime_t now, max_age, oldest, ack_ts, timeout, min_timeo;
+	ktime_t now, max_age, oldest, ack_ts;
 	int ix;
 	u8 annotation, anno_type, retrans = 0, unacked = 0;
 	_enter("{%d,%d}", call->tx_hard_ack, call->tx_top);
-	if (call->peer->rtt_usage > 1)
+	rto_j = call->peer->rto_j;
-		timeout = ns_to_ktime(call->peer->rtt * 3 / 2);
-	else
-		timeout = ms_to_ktime(rxrpc_resend_timeout);
-	min_timeo = ns_to_ktime((1000000000 / HZ) * 4);
-	if (ktime_before(timeout, min_timeo))
-		timeout = min_timeo;
 	now = ktime_get_real();
-	max_age = ktime_sub(now, timeout);
+	max_age = ktime_sub(now, jiffies_to_usecs(rto_j));
 	spin_lock_bh(&call->lock);
 	}
 	resend_at = nsecs_to_jiffies(ktime_to_ns(ktime_sub(now, oldest)));
-	resend_at += jiffies + rxrpc_resend_timeout;
+	resend_at += jiffies + rto_j;
 	WRITE_ONCE(call->resend_at, resend_at);
 	if (unacked)
 					rxrpc_timer_set_for_resend);
 		spin_unlock_bh(&call->lock);
 		ack_ts = ktime_sub(now, call->acks_latest_ts);
-		if (ktime_to_ns(ack_ts) < call->peer->rtt)
+		if (ktime_to_us(ack_ts) < (call->peer->srtt_us >> 3))
 			goto out;
 		rxrpc_propose_ACK(call, RXRPC_ACK_PING, 0, true, false,
 				  rxrpc_propose_ack_ping_for_lost_ack);

net/rxrpc/input.c+37−7

 		/* We analyse the number of packets that get ACK'd per RTT
 		 * period and increase the window if we managed to fill it.
 		 */
-		if (call->peer->rtt_usage == 0)
+		if (call->peer->rtt_count == 0)
 			goto out;
 		if (ktime_before(skb->tstamp,
-				 ktime_add_ns(call->cong_tstamp,
+				 ktime_add_us(call->cong_tstamp,
-					      call->peer->rtt)))
+					      call->peer->srtt_us >> 3)))
 			goto out_no_clear_ca;
 		change = rxrpc_cong_rtt_window_end;
 		call->cong_tstamp = skb->tstamp;
 	}
 }
+/*
+ * Return true if the ACK is valid - ie. it doesn't appear to have regressed
+ * with respect to the ack state conveyed by preceding ACKs.
+ */
+static bool rxrpc_is_ack_valid(struct rxrpc_call *call,
+			       rxrpc_seq_t first_pkt, rxrpc_seq_t prev_pkt)
+{
+	rxrpc_seq_t base = READ_ONCE(call->ackr_first_seq);
+	if (after(first_pkt, base))
+		return true; /* The window advanced */
+	if (before(first_pkt, base))
+		return false; /* firstPacket regressed */
+	if (after_eq(prev_pkt, call->ackr_prev_seq))
+		return true; /* previousPacket hasn't regressed. */
+	/* Some rx implementations put a serial number in previousPacket. */
+	if (after_eq(prev_pkt, base + call->tx_winsize))
+		return false;
+	return true;
+}
 /*
  * Process an ACK packet.
  *
 	}
 	/* Discard any out-of-order or duplicate ACKs (outside lock). */
-	if (before(first_soft_ack, call->ackr_first_seq) ||
+	if (!rxrpc_is_ack_valid(call, first_soft_ack, prev_pkt)) {
-	    before(prev_pkt, call->ackr_prev_seq))
+		trace_rxrpc_rx_discard_ack(call->debug_id, sp->hdr.serial,
+					   first_soft_ack, call->ackr_first_seq,
+					   prev_pkt, call->ackr_prev_seq);
 		return;
+	}
 	buf.info.rxMTU = 0;
 	ioffset = offset + nr_acks + 3;
 	spin_lock(&call->input_lock);
 	/* Discard any out-of-order or duplicate ACKs (inside lock). */
-	if (before(first_soft_ack, call->ackr_first_seq) ||
+	if (!rxrpc_is_ack_valid(call, first_soft_ack, prev_pkt)) {
-	    before(prev_pkt, call->ackr_prev_seq))
+		trace_rxrpc_rx_discard_ack(call->debug_id, sp->hdr.serial,
+					   first_soft_ack, call->ackr_first_seq,
+					   prev_pkt, call->ackr_prev_seq);
 		goto out;
+	}
 	call->acks_latest_ts = skb->tstamp;
 	call->ackr_first_seq = first_soft_ack;

net/rxrpc/misc.c+0−5

  */
 unsigned int rxrpc_rx_jumbo_max = 4;
-/*
- * Time till packet resend (in milliseconds).
- */
-unsigned long rxrpc_resend_timeout = 4 * HZ;
 const s8 rxrpc_ack_priority[] = {
 	[0]				= 0,
 	[RXRPC_ACK_DELAY]		= 1,

net/rxrpc/output.c+3−6

 	    (test_and_clear_bit(RXRPC_CALL_EV_ACK_LOST, &call->events) ||
 	     retrans ||
 	     call->cong_mode == RXRPC_CALL_SLOW_START ||
-	     (call->peer->rtt_usage < 3 && sp->hdr.seq & 1) ||
+	     (call->peer->rtt_count < 3 && sp->hdr.seq & 1) ||
 	     ktime_before(ktime_add_ms(call->peer->rtt_last_req, 1000),
 			  ktime_get_real())))
 		whdr.flags |= RXRPC_REQUEST_ACK;
 		if (whdr.flags & RXRPC_REQUEST_ACK) {
 			call->peer->rtt_last_req = skb->tstamp;
 			trace_rxrpc_rtt_tx(call, rxrpc_rtt_tx_data, serial);
-			if (call->peer->rtt_usage > 1) {
+			if (call->peer->rtt_count > 1) {
 				unsigned long nowj = jiffies, ack_lost_at;
-				ack_lost_at = nsecs_to_jiffies(2 * call->peer->rtt);
+				ack_lost_at = rxrpc_get_rto_backoff(call->peer, retrans);
-				if (ack_lost_at < 1)
-					ack_lost_at = 1;
 				ack_lost_at += nowj;
 				WRITE_ONCE(call->ack_lost_at, ack_lost_at);
 				rxrpc_reduce_call_timer(call, ack_lost_at, nowj,

net/rxrpc/peer_event.c+0−46

@@ -295,52 +295,6 @@ static void rxrpc_distribute_error(struct rxrpc_peer *peer, int error, · 294 unmodified lines
295	}	295	}
296	}	296	}
297		297
298	/*
299	* Add RTT information to cache. This is called in softirq mode and has
300	* exclusive access to the peer RTT data.
301	*/
302	void rxrpc_peer_add_rtt(struct rxrpc_call *call, enum rxrpc_rtt_rx_trace why,
303	rxrpc_serial_t send_serial, rxrpc_serial_t resp_serial,
304	ktime_t send_time, ktime_t resp_time)
305	{
306	struct rxrpc_peer *peer = call->peer;
307	s64 rtt;
308	u64 sum = peer->rtt_sum, avg;
309	u8 cursor = peer->rtt_cursor, usage = peer->rtt_usage;
310
311	rtt = ktime_to_ns(ktime_sub(resp_time, send_time));
312	if (rtt < 0)
313	return;
314
315	spin_lock(&peer->rtt_input_lock);
316
317	/* Replace the oldest datum in the RTT buffer */
318	sum -= peer->rtt_cache[cursor];
319	sum += rtt;
320	peer->rtt_cache[cursor] = rtt;
321	peer->rtt_cursor = (cursor + 1) & (RXRPC_RTT_CACHE_SIZE - 1);
322	peer->rtt_sum = sum;
323	if (usage < RXRPC_RTT_CACHE_SIZE) {
324	usage++;
325	peer->rtt_usage = usage;
326	}
327
328	spin_unlock(&peer->rtt_input_lock);
329
330	/* Now recalculate the average */
331	if (usage == RXRPC_RTT_CACHE_SIZE) {
332	avg = sum / RXRPC_RTT_CACHE_SIZE;
333	} else {
334	avg = sum;
335	do_div(avg, usage);
336	}
337
338	/* Don't need to update this under lock */
339	peer->rtt = avg;
340	trace_rxrpc_rtt_rx(call, why, send_serial, resp_serial, rtt,
341	usage, avg);
342	}
343
344	/*	298	/*
345	* Perform keep-alive pings.	299	* Perform keep-alive pings.
346	*/	300	*/

net/rxrpc/peer_object.c+7−5

 		spin_lock_init(&peer->rtt_input_lock);
 		peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
+		rxrpc_peer_init_rtt(peer);
 		if (RXRPC_TX_SMSS > 2190)
 			peer->cong_cwnd = 2;
 		else if (RXRPC_TX_SMSS > 1095)
 EXPORT_SYMBOL(rxrpc_kernel_get_peer);
 /**
- * rxrpc_kernel_get_rtt - Get a call's peer RTT
+ * rxrpc_kernel_get_srtt - Get a call's peer smoothed RTT
  * @sock: The socket on which the call is in progress.
  * @call: The call to query
  *
- * Get the call's peer RTT.
+ * Get the call's peer smoothed RTT.
  */
-u64 rxrpc_kernel_get_rtt(struct socket *sock, struct rxrpc_call *call)
+u32 rxrpc_kernel_get_srtt(struct socket *sock, struct rxrpc_call *call)
 {
-	return call->peer->rtt;
+	return call->peer->srtt_us >> 3;
 }
-EXPORT_SYMBOL(rxrpc_kernel_get_rtt);
+EXPORT_SYMBOL(rxrpc_kernel_get_srtt);

net/rxrpc/proc.c+4−4

@@ -222,7 +222,7 @@ static int rxrpc_peer_seq_show(struct seq_file seq, void v) · 221 unmodified lines
222	seq_puts(seq,	222	seq_puts(seq,
223	"Proto Local "	223	"Proto Local "
224	" Remote "	224	" Remote "
225	" Use CW MTU LastUse RTT Rc\n"	225	" Use CW MTU LastUse RTT RTO\n"
226	);	226	);
227	return 0;	227	return 0;
228	}	228	}
@@ -236,15 +236,15 @@ static int rxrpc_peer_seq_show(struct seq_file seq, void v) · 7 unmodified lines
236	now = ktime_get_seconds();	236	now = ktime_get_seconds();
237	seq_printf(seq,	237	seq_printf(seq,
238	"UDP %-47.47s %-47.47s %3u"	238	"UDP %-47.47s %-47.47s %3u"
239	" %3u %5u %6llus %12llu %2u\n",	239	" %3u %5u %6llus %8u %8u\n",
240	lbuff,	240	lbuff,
241	rbuff,	241	rbuff,
242	atomic_read(&peer->usage),	242	atomic_read(&peer->usage),
243	peer->cong_cwnd,	243	peer->cong_cwnd,
244	peer->mtu,	244	peer->mtu,
245	now - peer->last_tx_at,	245	now - peer->last_tx_at,
246	peer->rtt,	246	peer->srtt_us >> 3,
247	peer->rtt_cursor);	247	jiffies_to_usecs(peer->rto_j));
248		248
249	return 0;	249	return 0;
250	}	250	}

net/rxrpc/rtt.c+195−0

@@ -0,0 +1,195 @@
	1	// SPDX-License-Identifier: GPL-2.0
	2	/* RTT/RTO calculation.
	3	*
	4	* Adapted from TCP for AF_RXRPC by David Howells (dhowells@redhat.com)
	5	*
	6	* https://tools.ietf.org/html/rfc6298
	7	* https://tools.ietf.org/html/rfc1122#section-4.2.3.1
	8	* http://ccr.sigcomm.org/archive/1995/jan95/ccr-9501-partridge87.pdf
	9	*/
	10
	11	#include <linux/net.h>
	12	#include "ar-internal.h"
	13
	14	#define RXRPC_RTO_MAX ((unsigned)(120 * HZ))
	15	#define RXRPC_TIMEOUT_INIT ((unsigned)(1HZ)) / RFC6298 2.1 initial RTO value */
	16	#define rxrpc_jiffies32 ((u32)jiffies) /* As rxrpc_jiffies32 */
	17	#define rxrpc_min_rtt_wlen 300 /* As sysctl_tcp_min_rtt_wlen */
	18
	19	static u32 rxrpc_rto_min_us(struct rxrpc_peer *peer)
	20	{
	21	return 200;
	22	}
	23
	24	static u32 __rxrpc_set_rto(const struct rxrpc_peer *peer)
	25	{
	26	return _usecs_to_jiffies((peer->srtt_us >> 3) + peer->rttvar_us);
	27	}
	28
	29	static u32 rxrpc_bound_rto(u32 rto)
	30	{
	31	return min(rto, RXRPC_RTO_MAX);
	32	}
	33
	34	/*
	35	* Called to compute a smoothed rtt estimate. The data fed to this
	36	* routine either comes from timestamps, or from segments that were
	37	* known _not_ to have been retransmitted [see Karn/Partridge
	38	* Proceedings SIGCOMM 87]. The algorithm is from the SIGCOMM 88
	39	* piece by Van Jacobson.
	40	* NOTE: the next three routines used to be one big routine.
	41	* To save cycles in the RFC 1323 implementation it was better to break
	42	* it up into three procedures. -- erics
	43	*/
	44	static void rxrpc_rtt_estimator(struct rxrpc_peer *peer, long sample_rtt_us)
	45	{
	46	long m = sample_rtt_us; /* RTT */
	47	u32 srtt = peer->srtt_us;
	48
	49	/* The following amusing code comes from Jacobson's
	50	* article in SIGCOMM '88. Note that rtt and mdev
	51	* are scaled versions of rtt and mean deviation.
	52	* This is designed to be as fast as possible
	53	* m stands for "measurement".
	54	*
	55	* On a 1990 paper the rto value is changed to:
	56	* RTO = rtt + 4 * mdev
	57	*
	58	* Funny. This algorithm seems to be very broken.
	59	* These formulae increase RTO, when it should be decreased, increase
	60	* too slowly, when it should be increased quickly, decrease too quickly
	61	* etc. I guess in BSD RTO takes ONE value, so that it is absolutely
	62	* does not matter how to _calculate_ it. Seems, it was trap
	63	* that VJ failed to avoid. 8)
	64	*/
	65	if (srtt != 0) {
	66	m -= (srtt >> 3); /* m is now error in rtt est */
	67	srtt += m; /* rtt = 7/8 rtt + 1/8 new */
	68	if (m < 0) {
	69	m = -m; /* m is now abs(error) */
	70	m -= (peer->mdev_us >> 2); /* similar update on mdev */
	71	/* This is similar to one of Eifel findings.
	72	* Eifel blocks mdev updates when rtt decreases.
	73	* This solution is a bit different: we use finer gain
	74	* for mdev in this case (alpha*beta).
	75	* Like Eifel it also prevents growth of rto,
	76	* but also it limits too fast rto decreases,
	77	* happening in pure Eifel.
	78	*/
	79	if (m > 0)
	80	m >>= 3;
	81	} else {
	82	m -= (peer->mdev_us >> 2); /* similar update on mdev */
	83	}
	84
	85	peer->mdev_us += m; /* mdev = 3/4 mdev + 1/4 new */
	86	if (peer->mdev_us > peer->mdev_max_us) {
	87	peer->mdev_max_us = peer->mdev_us;
	88	if (peer->mdev_max_us > peer->rttvar_us)
	89	peer->rttvar_us = peer->mdev_max_us;
	90	}
	91	} else {
	92	/* no previous measure. */
	93	srtt = m << 3; /* take the measured time to be rtt */
	94	peer->mdev_us = m << 1; /* make sure rto = 3rtt /
	95	peer->rttvar_us = max(peer->mdev_us, rxrpc_rto_min_us(peer));
	96	peer->mdev_max_us = peer->rttvar_us;
	97	}
	98
	99	peer->srtt_us = max(1U, srtt);
	100	}
	101
	102	/*
	103	* Calculate rto without backoff. This is the second half of Van Jacobson's
	104	* routine referred to above.
	105	*/
	106	static void rxrpc_set_rto(struct rxrpc_peer *peer)
	107	{
	108	u32 rto;
	109
	110	/* 1. If rtt variance happened to be less 50msec, it is hallucination.
	111	* It cannot be less due to utterly erratic ACK generation made
	112	* at least by solaris and freebsd. "Erratic ACKs" has _nothing_
	113	* to do with delayed acks, because at cwnd>2 true delack timeout
	114	* is invisible. Actually, Linux-2.4 also generates erratic
	115	* ACKs in some circumstances.
	116	*/
	117	rto = __rxrpc_set_rto(peer);
	118
	119	/* 2. Fixups made earlier cannot be right.
	120	* If we do not estimate RTO correctly without them,
	121	* all the algo is pure shit and should be replaced
	122	* with correct one. It is exactly, which we pretend to do.
	123	*/
	124
	125	/* NOTE: clamping at RXRPC_RTO_MIN is not required, current algo
	126	* guarantees that rto is higher.
	127	*/
	128	peer->rto_j = rxrpc_bound_rto(rto);
	129	}
	130
	131	static void rxrpc_ack_update_rtt(struct rxrpc_peer *peer, long rtt_us)
	132	{
	133	if (rtt_us < 0)
	134	return;
	135
	136	//rxrpc_update_rtt_min(peer, rtt_us);
	137	rxrpc_rtt_estimator(peer, rtt_us);
	138	rxrpc_set_rto(peer);
	139
	140	/* RFC6298: only reset backoff on valid RTT measurement. */
	141	peer->backoff = 0;
	142	}
	143
	144	/*
	145	* Add RTT information to cache. This is called in softirq mode and has
	146	* exclusive access to the peer RTT data.
	147	*/
	148	void rxrpc_peer_add_rtt(struct rxrpc_call *call, enum rxrpc_rtt_rx_trace why,
	149	rxrpc_serial_t send_serial, rxrpc_serial_t resp_serial,
	150	ktime_t send_time, ktime_t resp_time)
	151	{
	152	struct rxrpc_peer *peer = call->peer;
	153	s64 rtt_us;
	154
	155	rtt_us = ktime_to_us(ktime_sub(resp_time, send_time));
	156	if (rtt_us < 0)
	157	return;
	158
	159	spin_lock(&peer->rtt_input_lock);
	160	rxrpc_ack_update_rtt(peer, rtt_us);
	161	if (peer->rtt_count < 3)
	162	peer->rtt_count++;
	163	spin_unlock(&peer->rtt_input_lock);
	164
	165	trace_rxrpc_rtt_rx(call, why, send_serial, resp_serial,
	166	peer->srtt_us >> 3, peer->rto_j);
	167	}
	168
	169	/*
	170	* Get the retransmission timeout to set in jiffies, backing it off each time
	171	* we retransmit.
	172	*/
	173	unsigned long rxrpc_get_rto_backoff(struct rxrpc_peer *peer, bool retrans)
	174	{
	175	u64 timo_j;
	176	u8 backoff = READ_ONCE(peer->backoff);
	177
	178	timo_j = peer->rto_j;
	179	timo_j <<= backoff;
	180	if (retrans && timo_j * 2 <= RXRPC_RTO_MAX)
	181	WRITE_ONCE(peer->backoff, backoff + 1);
	182
	183	if (timo_j < 1)
	184	timo_j = 1;
	185
	186	return timo_j;
	187	}
	188
	189	void rxrpc_peer_init_rtt(struct rxrpc_peer *peer)
	190	{
	191	peer->rto_j = RXRPC_TIMEOUT_INIT;
	192	peer->mdev_us = jiffies_to_usecs(RXRPC_TIMEOUT_INIT);
	193	peer->backoff = 0;
	194	//minmax_reset(&peer->rtt_min, rxrpc_jiffies32, ~0U);
	195	}

net/rxrpc/rxkad.c+1−2

 	ret = rxkad_decrypt_ticket(conn, skb, ticket, ticket_len, &session_key,
 				   &expiry, _abort_code);
 	if (ret < 0)
-		goto temporary_error_free_resp;
+		goto temporary_error_free_ticket;
 	/* use the session key from inside the ticket to decrypt the
 	 * response */
 temporary_error_free_ticket:
 	kfree(ticket);
-temporary_error_free_resp:
 	kfree(response);
 temporary_error:
 	/* Ignore the response packet if we got a temporary error such as

net/rxrpc/sendmsg.c+9−17

 					    struct rxrpc_call *call)
 {
 	rxrpc_seq_t tx_start, tx_win;
-	signed long rtt2, timeout;
+	signed long rtt, timeout;
-	u64 rtt;
-	rtt = READ_ONCE(call->peer->rtt);
+	rtt = READ_ONCE(call->peer->srtt_us) >> 3;
-	rtt2 = nsecs_to_jiffies64(rtt) * 2;
+	rtt = usecs_to_jiffies(rtt) * 2;
-	if (rtt2 < 2)
+	if (rtt < 2)
-		rtt2 = 2;
+		rtt = 2;
-	timeout = rtt2;
+	timeout = rtt;
 	tx_start = READ_ONCE(call->tx_hard_ack);
 	for (;;) {
 			return -EINTR;
 		if (tx_win != tx_start) {
-			timeout = rtt2;
+			timeout = rtt;
 			tx_start = tx_win;
 		}
 		_debug("need instant resend %d", ret);
 		rxrpc_instant_resend(call, ix);
 	} else {
-		unsigned long now = jiffies, resend_at;
+		unsigned long now = jiffies;
+		unsigned long resend_at = now + call->peer->rto_j;
-		if (call->peer->rtt_usage > 1)
-			resend_at = nsecs_to_jiffies(call->peer->rtt * 3 / 2);
-		else
-			resend_at = rxrpc_resend_timeout;
-		if (resend_at < 1)
-			resend_at = 1;
-		resend_at += now;
 		WRITE_ONCE(call->resend_at, resend_at);
 		rxrpc_reduce_call_timer(call, resend_at, now,
 					rxrpc_timer_set_for_send);

net/rxrpc/sysctl.c+0−9

@@ -71,15 +71,6 @@ static struct ctl_table rxrpc_sysctl_table[] = { · 70 unmodified lines
71	.extra1 = (void *)&one_jiffy,	71	.extra1 = (void *)&one_jiffy,
72	.extra2 = (void *)&max_jiffies,	72	.extra2 = (void *)&max_jiffies,
73	},	73	},
74	{
75	.procname = "resend_timeout",
76	.data = &rxrpc_resend_timeout,
77	.maxlen = sizeof(unsigned long),
78	.mode = 0644,
79	.proc_handler = proc_doulongvec_ms_jiffies_minmax,
80	.extra1 = (void *)&one_jiffy,
81	.extra2 = (void *)&max_jiffies,
82	},
83		74
84	/* Non-time values */	75	/* Non-time values */
85	{	76	{

net/sctp/sm_sideeffect.c+11−3

 			timeout = asoc->timeouts[cmd->obj.to];
 			BUG_ON(!timeout);
-			timer->expires = jiffies + timeout;
+			/*
-			sctp_association_hold(asoc);
+			 * SCTP has a hard time with timer starts.  Because we process
-			add_timer(timer);
+			 * timer starts as side effects, it can be hard to tell if we
+			 * have already started a timer or not, which leads to BUG
+			 * halts when we call add_timer. So here, instead of just starting
+			 * a timer, if the timer is already started, and just mod
+			 * the timer with the shorter of the two expiration times
+			 */
+			if (!timer_pending(timer))
+				sctp_association_hold(asoc);
+			timer_reduce(timer, jiffies + timeout);
 			break;
 		case SCTP_CMD_TIMER_RESTART:

net/sctp/sm_statefuns.c+5−4

 	/* Update the content of current association. */
 	sctp_add_cmd_sf(commands, SCTP_CMD_UPDATE_ASSOC, SCTP_ASOC(new_asoc));
 	sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP, SCTP_ULPEVENT(ev));
-	if (sctp_state(asoc, SHUTDOWN_PENDING) &&
+	if ((sctp_state(asoc, SHUTDOWN_PENDING) ||
+	     sctp_state(asoc, SHUTDOWN_SENT)) &&
 	    (sctp_sstate(asoc->base.sk, CLOSING) ||
 	     sock_flag(asoc->base.sk, SOCK_DEAD))) {
-		/* if were currently in SHUTDOWN_PENDING, but the socket
+		/* If the socket has been closed by user, don't
-		 * has been closed by user, don't transition to ESTABLISHED.
+		 * transition to ESTABLISHED. Instead trigger SHUTDOWN
-		 * Instead trigger SHUTDOWN bundled with COOKIE_ACK.
+		 * bundled with COOKIE_ACK.
 		 */
 		sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(repl));
 		return sctp_sf_do_9_2_start_shutdown(net, ep, asoc,

net/sunrpc/auth_gss/auth_gss.c+5−7

@@ -2032,7 +2032,6 @@ gss_unwrap_resp_priv(struct rpc_task task, struct rpc_cred cred, · 2031 unmodified lines
2032	struct xdr_buf *rcv_buf = &rqstp->rq_rcv_buf;	2032	struct xdr_buf *rcv_buf = &rqstp->rq_rcv_buf;
2033	struct kvec *head = rqstp->rq_rcv_buf.head;	2033	struct kvec *head = rqstp->rq_rcv_buf.head;
2034	struct rpc_auth *auth = cred->cr_auth;	2034	struct rpc_auth *auth = cred->cr_auth;
2035	unsigned int savedlen = rcv_buf->len;
2036	u32 offset, opaque_len, maj_stat;	2035	u32 offset, opaque_len, maj_stat;
2037	__be32 *p;	2036	__be32 *p;
2038		2037
@@ -2043,9 +2042,9 @@ gss_unwrap_resp_priv(struct rpc_task task, struct rpc_cred cred, · 4 unmodified lines
2043	offset = (u8 )(p) - (u8 )head->iov_base;	2042	offset = (u8 )(p) - (u8 )head->iov_base;
2044	if (offset + opaque_len > rcv_buf->len)	2043	if (offset + opaque_len > rcv_buf->len)
2045	goto unwrap_failed;	2044	goto unwrap_failed;
2046	rcv_buf->len = offset + opaque_len;
2047		2045
2048	maj_stat = gss_unwrap(ctx->gc_gss_ctx, offset, rcv_buf);	2046	maj_stat = gss_unwrap(ctx->gc_gss_ctx, offset,
		2047	offset + opaque_len, rcv_buf);
2049	if (maj_stat == GSS_S_CONTEXT_EXPIRED)	2048	if (maj_stat == GSS_S_CONTEXT_EXPIRED)
2050	clear_bit(RPCAUTH_CRED_UPTODATE, &cred->cr_flags);	2049	clear_bit(RPCAUTH_CRED_UPTODATE, &cred->cr_flags);
2051	if (maj_stat != GSS_S_COMPLETE)	2050	if (maj_stat != GSS_S_COMPLETE)
@@ -2059,10 +2058,9 @@ gss_unwrap_resp_priv(struct rpc_task task, struct rpc_cred cred, · 7 unmodified lines
2059	*/	2058	*/
2060	xdr_init_decode(xdr, rcv_buf, p, rqstp);	2059	xdr_init_decode(xdr, rcv_buf, p, rqstp);
2061		2060
2062	auth->au_rslack = auth->au_verfsize + 2 +	2061	auth->au_rslack = auth->au_verfsize + 2 + ctx->gc_gss_ctx->slack;
2063	XDR_QUADLEN(savedlen - rcv_buf->len);	2062	auth->au_ralign = auth->au_verfsize + 2 + ctx->gc_gss_ctx->align;
2064	auth->au_ralign = auth->au_verfsize + 2 +	2063
2065	XDR_QUADLEN(savedlen - rcv_buf->len);
2066	return 0;	2064	return 0;
2067	unwrap_failed:	2065	unwrap_failed:
2068	trace_rpcgss_unwrap_failed(task);	2066	trace_rpcgss_unwrap_failed(task);

net/sunrpc/auth_gss/gss_krb5_crypto.c+4−4

@@ -851,8 +851,8 @@ out_err: · 850 unmodified lines
851	}	851	}
852		852
853	u32	853	u32
854	gss_krb5_aes_decrypt(struct krb5_ctx kctx, u32 offset, struct xdr_buf buf,	854	gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, u32 len,
855	u32 headskip, u32 tailskip)	855	struct xdr_buf buf, u32 headskip, u32 *tailskip)
856	{	856	{
857	struct xdr_buf subbuf;	857	struct xdr_buf subbuf;
858	u32 ret = 0;	858	u32 ret = 0;
@@ -881,7 +881,7 @@ gss_krb5_aes_decrypt(struct krb5_ctx kctx, u32 offset, struct xdr_buf buf, · 22 unmodified lines
881		881
882	/* create a segment skipping the header and leaving out the checksum */	882	/* create a segment skipping the header and leaving out the checksum */
883	xdr_buf_subsegment(buf, &subbuf, offset + GSS_KRB5_TOK_HDR_LEN,	883	xdr_buf_subsegment(buf, &subbuf, offset + GSS_KRB5_TOK_HDR_LEN,
884	(buf->len - offset - GSS_KRB5_TOK_HDR_LEN -	884	(len - offset - GSS_KRB5_TOK_HDR_LEN -
885	kctx->gk5e->cksumlength));	885	kctx->gk5e->cksumlength));
886		886
887	nblocks = (subbuf.len + blocksize - 1) / blocksize;	887	nblocks = (subbuf.len + blocksize - 1) / blocksize;
@@ -926,7 +926,7 @@ gss_krb5_aes_decrypt(struct krb5_ctx kctx, u32 offset, struct xdr_buf buf, · 38 unmodified lines
926	goto out_err;	926	goto out_err;
927		927
928	/* Get the packet's hmac value */	928	/* Get the packet's hmac value */
929	ret = read_bytes_from_xdr_buf(buf, buf->len - kctx->gk5e->cksumlength,	929	ret = read_bytes_from_xdr_buf(buf, len - kctx->gk5e->cksumlength,
930	pkt_hmac, kctx->gk5e->cksumlength);	930	pkt_hmac, kctx->gk5e->cksumlength);
931	if (ret)	931	if (ret)
932	goto out_err;	932	goto out_err;

net/sunrpc/auth_gss/gss_krb5_wrap.c+29−15

 }
 static u32
-gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)
+gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, int len,
+		       struct xdr_buf *buf, unsigned int *slack,
+		       unsigned int *align)
 {
 	int			signalg;
 	int			sealalg;
 	u32			conflen = kctx->gk5e->conflen;
 	int			crypt_offset;
 	u8			*cksumkey;
+	unsigned int		saved_len = buf->len;
 	dprintk("RPC:       gss_unwrap_kerberos\n");
 	ptr = (u8 *)buf->head[0].iov_base + offset;
 	if (g_verify_token_header(&kctx->mech_used, &bodysize, &ptr,
-					buf->len - offset))
+					len - offset))
 		return GSS_S_DEFECTIVE_TOKEN;
 	if ((ptr[0] != ((KG_TOK_WRAP_MSG >> 8) & 0xff)) ||
 	    (!kctx->initiate && direction != 0))
 		return GSS_S_BAD_SIG;
+	buf->len = len;
 	if (kctx->enctype == ENCTYPE_ARCFOUR_HMAC) {
 		struct crypto_sync_skcipher *cipher;
 		int err;
 	data_len = (buf->head[0].iov_base + buf->head[0].iov_len) - data_start;
 	memmove(orig_start, data_start, data_len);
 	buf->head[0].iov_len -= (data_start - orig_start);
-	buf->len -= (data_start - orig_start);
+	buf->len = len - (data_start - orig_start);
 	if (gss_krb5_remove_padding(buf, blocksize))
 		return GSS_S_DEFECTIVE_TOKEN;
+	/* slack must include room for krb5 padding */
+	*slack = XDR_QUADLEN(saved_len - buf->len);
+	/* The GSS blob always precedes the RPC message payload */
+	*align = *slack;
 	return GSS_S_COMPLETE;
 }
 }
 static u32
-gss_unwrap_kerberos_v2(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)
+gss_unwrap_kerberos_v2(struct krb5_ctx *kctx, int offset, int len,
+		       struct xdr_buf *buf, unsigned int *slack,
+		       unsigned int *align)
 {
 	time64_t	now;
 	u8		*ptr;
 	if (rrc != 0)
 		rotate_left(offset + 16, buf, rrc);
-	err = (*kctx->gk5e->decrypt_v2)(kctx, offset, buf,
+	err = (*kctx->gk5e->decrypt_v2)(kctx, offset, len, buf,
 					&headskip, &tailskip);
 	if (err)
 		return GSS_S_FAILURE;
 	 * it against the original
 	 */
 	err = read_bytes_from_xdr_buf(buf,
-				buf->len - GSS_KRB5_TOK_HDR_LEN - tailskip,
+				len - GSS_KRB5_TOK_HDR_LEN - tailskip,
 				decrypted_hdr, GSS_KRB5_TOK_HDR_LEN);
 	if (err) {
 		dprintk("%s: error %u getting decrypted_hdr\n", __func__, err);
 	 * Note that buf->head[0].iov_len may indicate the available
 	 * head buffer space rather than that actually occupied.
 	 */
-	movelen = min_t(unsigned int, buf->head[0].iov_len, buf->len);
+	movelen = min_t(unsigned int, buf->head[0].iov_len, len);
 	movelen -= offset + GSS_KRB5_TOK_HDR_LEN + headskip;
-	if (offset + GSS_KRB5_TOK_HDR_LEN + headskip + movelen >
+	BUG_ON(offset + GSS_KRB5_TOK_HDR_LEN + headskip + movelen >
-	    buf->head[0].iov_len)
+							buf->head[0].iov_len);
-		return GSS_S_FAILURE;
 	memmove(ptr, ptr + GSS_KRB5_TOK_HDR_LEN + headskip, movelen);
 	buf->head[0].iov_len -= GSS_KRB5_TOK_HDR_LEN + headskip;
-	buf->len -= GSS_KRB5_TOK_HDR_LEN + headskip;
+	buf->len = len - GSS_KRB5_TOK_HDR_LEN + headskip;
 	/* Trim off the trailing "extra count" and checksum blob */
-	buf->len -= ec + GSS_KRB5_TOK_HDR_LEN + tailskip;
+	xdr_buf_trim(buf, ec + GSS_KRB5_TOK_HDR_LEN + tailskip);
+	*align = XDR_QUADLEN(GSS_KRB5_TOK_HDR_LEN + headskip);
+	*slack = *align + XDR_QUADLEN(ec + GSS_KRB5_TOK_HDR_LEN + tailskip);
 	return GSS_S_COMPLETE;
 }
 }
 u32
-gss_unwrap_kerberos(struct gss_ctx *gctx, int offset, struct xdr_buf *buf)
+gss_unwrap_kerberos(struct gss_ctx *gctx, int offset,
+		    int len, struct xdr_buf *buf)
 {
 	struct krb5_ctx	*kctx = gctx->internal_ctx_id;
 	case ENCTYPE_DES_CBC_RAW:
 	case ENCTYPE_DES3_CBC_RAW:
 	case ENCTYPE_ARCFOUR_HMAC:
-		return gss_unwrap_kerberos_v1(kctx, offset, buf);
+		return gss_unwrap_kerberos_v1(kctx, offset, len, buf,
+					      &gctx->slack, &gctx->align);
 	case ENCTYPE_AES128_CTS_HMAC_SHA1_96:
 	case ENCTYPE_AES256_CTS_HMAC_SHA1_96:
-		return gss_unwrap_kerberos_v2(kctx, offset, buf);
+		return gss_unwrap_kerberos_v2(kctx, offset, len, buf,
+					      &gctx->slack, &gctx->align);
 	}
 }

net/sunrpc/auth_gss/gss_mech_switch.c+2−1

 u32
 gss_unwrap(struct gss_ctx	*ctx_id,
 	   int			offset,
+	   int			len,
 	   struct xdr_buf	*buf)
 {
 	return ctx_id->mech_type->gm_ops
-		->gss_unwrap(ctx_id, offset, buf);
+		->gss_unwrap(ctx_id, offset, len, buf);
 }

net/sunrpc/auth_gss/svcauth_gss.c+3−7

 	if (svc_getnl(&buf->head[0]) != seq)
 		goto out;
 	/* trim off the mic and padding at the end before returning */
-	buf->len -= 4 + round_up_to_quad(mic.len);
+	xdr_buf_trim(buf, round_up_to_quad(mic.len) + 4);
 	stat = 0;
 out:
 	kfree(mic.data);
 unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx)
 {
 	u32 priv_len, maj_stat;
-	int pad, saved_len, remaining_len, offset;
+	int pad, remaining_len, offset;
 	clear_bit(RQ_SPLICE_OK, &rqstp->rq_flags);
 	buf->len -= pad;
 	fix_priv_head(buf, pad);
-	/* Maybe it would be better to give gss_unwrap a length parameter: */
+	maj_stat = gss_unwrap(ctx, 0, priv_len, buf);
-	saved_len = buf->len;
-	buf->len = priv_len;
-	maj_stat = gss_unwrap(ctx, 0, buf);
 	pad = priv_len - buf->len;
-	buf->len = saved_len;
 	buf->len -= pad;
 	/* The upper layers assume the buffer is aligned on 4-byte boundaries.
 	 * In the krb5p case, at least, the data ends up offset, so we need to

net/sunrpc/clnt.c+7−2

 	 * here.
 	 */
 	rpc_clnt_debugfs_unregister(clnt);
+	rpc_free_clid(clnt);
 	rpc_clnt_remove_pipedir(clnt);
+	xprt_put(rcu_dereference_raw(clnt->cl_xprt));
 	kfree(clnt);
 	rpciod_down();
 	rpc_unregister_client(clnt);
 	rpc_free_iostats(clnt->cl_metrics);
 	clnt->cl_metrics = NULL;
-	xprt_put(rcu_dereference_raw(clnt->cl_xprt));
 	xprt_iter_destroy(&clnt->cl_xpi);
 	put_cred(clnt->cl_cred);
-	rpc_free_clid(clnt);
 	INIT_WORK(&clnt->cl_work, rpc_free_client_work);
 	schedule_work(&clnt->cl_work);
 {
 	struct rpc_clnt	*clnt = task->tk_client;
+	if (RPC_SIGNALLED(task)) {
+		rpc_call_rpcerror(task, -ERESTARTSYS);
+		return;
+	}
 	if (xprt_adjust_timeout(task->tk_rqstp) == 0)
 		return;

net/sunrpc/xdr.c+41−0

@@ -1150,6 +1150,47 @@ xdr_buf_subsegment(struct xdr_buf buf, struct xdr_buf subbuf, · 1149 unmodified lines
1150	}	1150	}
1151	EXPORT_SYMBOL_GPL(xdr_buf_subsegment);	1151	EXPORT_SYMBOL_GPL(xdr_buf_subsegment);
1152		1152
		1153	/**
		1154	* xdr_buf_trim - lop at most "len" bytes off the end of "buf"
		1155	* @buf: buf to be trimmed
		1156	* @len: number of bytes to reduce "buf" by
		1157	*
		1158	* Trim an xdr_buf by the given number of bytes by fixing up the lengths. Note
		1159	* that it's possible that we'll trim less than that amount if the xdr_buf is
		1160	* too small, or if (for instance) it's all in the head and the parser has
		1161	* already read too far into it.
		1162	*/
		1163	void xdr_buf_trim(struct xdr_buf *buf, unsigned int len)
		1164	{
		1165	size_t cur;
		1166	unsigned int trim = len;
		1167
		1168	if (buf->tail[0].iov_len) {
		1169	cur = min_t(size_t, buf->tail[0].iov_len, trim);
		1170	buf->tail[0].iov_len -= cur;
		1171	trim -= cur;
		1172	if (!trim)
		1173	goto fix_len;
		1174	}
		1175
		1176	if (buf->page_len) {
		1177	cur = min_t(unsigned int, buf->page_len, trim);
		1178	buf->page_len -= cur;
		1179	trim -= cur;
		1180	if (!trim)
		1181	goto fix_len;
		1182	}
		1183
		1184	if (buf->head[0].iov_len) {
		1185	cur = min_t(size_t, buf->head[0].iov_len, trim);
		1186	buf->head[0].iov_len -= cur;
		1187	trim -= cur;
		1188	}
		1189	fix_len:
		1190	buf->len -= (len - trim);
		1191	}
		1192	EXPORT_SYMBOL_GPL(xdr_buf_trim);
		1193
1153	static void __read_bytes_from_xdr_buf(struct xdr_buf subbuf, void obj, unsigned int len)	1194	static void __read_bytes_from_xdr_buf(struct xdr_buf subbuf, void obj, unsigned int len)
1154	{	1195	{
1155	unsigned int this_len;	1196	unsigned int this_len;

net/tipc/socket.c+31−11

 	return 0;
 }
-static void tipc_sk_send_ack(struct tipc_sock *tsk)
+static struct sk_buff *tipc_sk_build_ack(struct tipc_sock *tsk)
 {
 	struct sock *sk = &tsk->sk;
-	struct net *net = sock_net(sk);
 	struct sk_buff *skb = NULL;
 	struct tipc_msg *msg;
 	u32 peer_port = tsk_peer_port(tsk);
 	u32 dnode = tsk_peer_node(tsk);
 	if (!tipc_sk_connected(sk))
-		return;
+		return NULL;
 	skb = tipc_msg_create(CONN_MANAGER, CONN_ACK, INT_H_SIZE, 0,
 			      dnode, tsk_own_node(tsk), peer_port,
 			      tsk->portid, TIPC_OK);
 	if (!skb)
-		return;
+		return NULL;
 	msg = buf_msg(skb);
 	msg_set_conn_ack(msg, tsk->rcv_unacked);
 	tsk->rcv_unacked = 0;
 		tsk->rcv_win = tsk_adv_blocks(tsk->sk.sk_rcvbuf);
 		msg_set_adv_win(msg, tsk->rcv_win);
 	}
-	tipc_node_xmit_skb(net, skb, dnode, msg_link_selector(msg));
+	return skb;
+}
+static void tipc_sk_send_ack(struct tipc_sock *tsk)
+{
+	struct sk_buff *skb;
+	skb = tipc_sk_build_ack(tsk);
+	if (!skb)
+		return;
+	tipc_node_xmit_skb(sock_net(&tsk->sk), skb, tsk_peer_node(tsk),
+			   msg_link_selector(buf_msg(skb)));
 }
 static int tipc_wait_for_rcvmsg(struct socket *sock, long *timeop)
 	bool peek = flags & MSG_PEEK;
 	int offset, required, copy, copied = 0;
 	int hlen, dlen, err, rc;
-	bool ack = false;
 	long timeout;
 	/* Catch invalid receive attempts */
 		/* Copy data if msg ok, otherwise return error/partial data */
 		if (likely(!err)) {
-			ack = msg_ack_required(hdr);
 			offset = skb_cb->bytes_read;
 			copy = min_t(int, dlen - offset, buflen - copied);
 			rc = skb_copy_datagram_msg(skb, hlen + offset, m, copy);
 		/* Send connection flow control advertisement when applicable */
 		tsk->rcv_unacked += tsk_inc(tsk, hlen + dlen);
-		if (ack || tsk->rcv_unacked >= tsk->rcv_win / TIPC_ACK_RATE)
+		if (tsk->rcv_unacked >= tsk->rcv_win / TIPC_ACK_RATE)
 			tipc_sk_send_ack(tsk);
 		/* Exit if all requested data or FIN/error received */
  * tipc_sk_filter_connect - check incoming message for a connection-based socket
  * @tsk: TIPC socket
  * @skb: pointer to message buffer.
+ * @xmitq: for Nagle ACK if any
  * Returns true if message should be added to receive queue, false otherwise
  */
-static bool tipc_sk_filter_connect(struct tipc_sock *tsk, struct sk_buff *skb)
+static bool tipc_sk_filter_connect(struct tipc_sock *tsk, struct sk_buff *skb,
+				   struct sk_buff_head *xmitq)
 {
 	struct sock *sk = &tsk->sk;
 	struct net *net = sock_net(sk);
 		if (!skb_queue_empty(&sk->sk_write_queue))
 			tipc_sk_push_backlog(tsk);
 		/* Accept only connection-based messages sent by peer */
-		if (likely(con_msg && !err && pport == oport && pnode == onode))
+		if (likely(con_msg && !err && pport == oport &&
+			   pnode == onode)) {
+			if (msg_ack_required(hdr)) {
+				struct sk_buff *skb;
+				skb = tipc_sk_build_ack(tsk);
+				if (skb)
+					__skb_queue_tail(xmitq, skb);
+			}
 			return true;
+		}
 		if (!tsk_peer_msg(tsk, hdr))
 			return false;
 		if (!err)
 	while ((skb = __skb_dequeue(&inputq))) {
 		hdr = buf_msg(skb);
 		limit = rcvbuf_limit(sk, skb);
-		if ((sk_conn && !tipc_sk_filter_connect(tsk, skb)) ||
+		if ((sk_conn && !tipc_sk_filter_connect(tsk, skb, xmitq)) ||
 		    (!sk_conn && msg_connected(hdr)) ||
 		    (!grp && msg_in_group(hdr)))
 			err = TIPC_ERR_NO_PORT;

net/tipc/subscr.h+10−0

@@ -96,6 +96,16 @@ void tipc_sub_get(struct tipc_subscription *subscription); · 95 unmodified lines
96	(swap_ ? swab32(val__) : val__); \	96	(swap_ ? swab32(val__) : val__); \
97	})	97	})
98		98
		99	/* tipc_sub_write - write val_ to field_ of struct sub_ in user endian format
		100	*/
		101	#define tipc_sub_write(sub_, field_, val_) \
		102	({ \
		103	struct tipc_subscr *sub__ = sub_; \
		104	u32 val__ = val_; \
		105	int swap_ = !((sub__)->filter & TIPC_FILTER_MASK); \
		106	(sub__)->field_ = swap_ ? swab32(val__) : val__; \
		107	})
		108
99	/* tipc_evt_write - write val_ to field_ of struct evt_ in user endian format	109	/* tipc_evt_write - write val_ to field_ of struct evt_ in user endian format
100	*/	110	*/
101	#define tipc_evt_write(evt_, field_, val_) \	111	#define tipc_evt_write(evt_, field_, val_) \

net/tipc/topsrv.c+8−5

 		if (!s || !memcmp(s, &sub->evt.s, sizeof(*s))) {
 			tipc_sub_unsubscribe(sub);
 			atomic_dec(&tn->subscription_count);
-		} else if (s) {
+			if (s)
-			break;
+				break;
 		}
 	}
 	spin_unlock_bh(&con->sub_lock);
 {
 	struct tipc_net *tn = tipc_net(srv->net);
 	struct tipc_subscription *sub;
+	u32 s_filter = tipc_sub_read(s, filter);
-	if (tipc_sub_read(s, filter) & TIPC_SUB_CANCEL) {
+	if (s_filter & TIPC_SUB_CANCEL) {
-		s->filter &= __constant_ntohl(~TIPC_SUB_CANCEL);
+		tipc_sub_write(s, filter, s_filter & ~TIPC_SUB_CANCEL);
 		tipc_conn_delete_sub(con, s);
 		return 0;
 	}
 		return -EWOULDBLOCK;
 	if (ret == sizeof(s)) {
 		read_lock_bh(&sk->sk_callback_lock);
-		ret = tipc_conn_rcv_sub(srv, con, &s);
+		/* RACE: the connection can be closed in the meantime */
+		if (likely(connected(con)))
+			ret = tipc_conn_rcv_sub(srv, con, &s);
 		read_unlock_bh(&sk->sk_callback_lock);
 		if (!ret)
 			return 0;

net/tipc/udp_media.c+5−1

 			 struct udp_bearer *ub, struct udp_media_addr *src,
 			 struct udp_media_addr *dst, struct dst_cache *cache)
 {
-	struct dst_entry *ndst = dst_cache_get(cache);
+	struct dst_entry *ndst;
 	int ttl, err = 0;
+	local_bh_disable();
+	ndst = dst_cache_get(cache);
 	if (dst->proto == htons(ETH_P_IP)) {
 		struct rtable *rt = (struct rtable *)ndst;
 					   src->port, dst->port, false);
 #endif
 	}
+	local_bh_enable();
 	return err;
 tx_error:
+	local_bh_enable();
 	kfree_skb(skb);
 	return err;
 }

net/tls/tls_sw.c+10−7

 static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk,
 			       bool full_record, u8 record_type,
-			       size_t *copied, int flags)
+			       ssize_t *copied, int flags)
 {
 	struct tls_context *tls_ctx = tls_get_ctx(sk);
 	struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx);
 	psock = sk_psock_get(sk);
 	if (!psock || !policy) {
 		err = tls_push_record(sk, flags, record_type);
-		if (err && err != -EINPROGRESS) {
+		if (err && sk->sk_err == EBADMSG) {
 			*copied -= sk_msg_free(sk, msg);
 			tls_free_open_rec(sk);
+			err = -sk->sk_err;
 		}
 		if (psock)
 			sk_psock_put(sk, psock);
 	switch (psock->eval) {
 	case __SK_PASS:
 		err = tls_push_record(sk, flags, record_type);
-		if (err && err != -EINPROGRESS) {
+		if (err && sk->sk_err == EBADMSG) {
 			*copied -= sk_msg_free(sk, msg);
 			tls_free_open_rec(sk);
+			err = -sk->sk_err;
 			goto out_err;
 		}
 		break;
 	unsigned char record_type = TLS_RECORD_TYPE_DATA;
 	bool is_kvec = iov_iter_is_kvec(&msg->msg_iter);
 	bool eor = !(msg->msg_flags & MSG_MORE);
-	size_t try_to_copy, copied = 0;
+	size_t try_to_copy;
+	ssize_t copied = 0;
 	struct sk_msg *msg_pl, *msg_en;
 	struct tls_rec *rec;
 	int required_size;
 	release_sock(sk);
 	mutex_unlock(&tls_ctx->tx_lock);
-	return copied ? copied : ret;
+	return copied > 0 ? copied : ret;
 }
 static int tls_sw_do_sendpage(struct sock *sk, struct page *page,
 	struct sk_msg *msg_pl;
 	struct tls_rec *rec;
 	int num_async = 0;
-	size_t copied = 0;
+	ssize_t copied = 0;
 	bool full_record;
 	int record_room;
 	int ret = 0;
 	}
 sendpage_end:
 	ret = sk_stream_error(sk, flags, ret);
-	return copied ? copied : ret;
+	return copied > 0 ? copied : ret;
 }
 int tls_sw_sendpage_locked(struct sock *sk, struct page *page,

samples/bpf/lwt_len_hist_user.c+0−2

@@ -15,8 +15,6 @@ · 14 unmodified lines
15	#define MAX_INDEX 64	15	#define MAX_INDEX 64
16	#define MAX_STARS 38	16	#define MAX_STARS 38
17		17
18	char bpf_log_buf[BPF_LOG_BUF_SIZE];
19
20	static void stars(char *str, long val, long max, int width)	18	static void stars(char *str, long val, long max, int width)
21	{	19	{
22	int i;	20	int i;

security/apparmor/apparmorfs.c+2−1

 	 */
 	error = aa_may_manage_policy(label, ns, mask);
 	if (error)
-		return error;
+		goto end_section;
 	data = aa_simple_write_to_buffer(buf, size, size, pos);
 	error = PTR_ERR(data);
 		error = aa_replace_profiles(ns, label, mask, data);
 		aa_put_loaddata(data);
 	}
+end_section:
 	end_current_label_crit_section(label);
 	return error;

security/apparmor/audit.c+2−1

 	rule->label = aa_label_parse(&root_ns->unconfined->label, rulestr,
 				     GFP_KERNEL, true, false);
 	if (IS_ERR(rule->label)) {
+		int err = PTR_ERR(rule->label);
 		aa_audit_rule_free(rule);
-		return PTR_ERR(rule->label);
+		return err;
 	}
 	*vrule = rule;

security/apparmor/domain.c+1−2

 		ctx->nnp = aa_get_label(label);
 	if (!fqname || !*fqname) {
+		aa_put_label(label);
 		AA_DEBUG("no profile name");
 		return -EINVAL;
 	}
 			op = OP_CHANGE_PROFILE;
 	}
-	label = aa_get_current_label();
 	if (*fqname == '&') {
 		stack = true;
 		/* don't have label_parse() do stacking */

security/integrity/evm/evm_crypto.c+23−23

@@ -73,7 +73,7 @@ static struct shash_desc *init_desc(char type, uint8_t hash_algo) · 72 unmodified lines
73	{	73	{
74	long rc;	74	long rc;
75	const char *algo;	75	const char *algo;
76	struct crypto_shash **tfm;	76	struct crypto_shash *tfm, tmp_tfm;
77	struct shash_desc *desc;	77	struct shash_desc *desc;
78		78
79	if (type == EVM_XATTR_HMAC) {	79	if (type == EVM_XATTR_HMAC) {
@@ -91,31 +91,31 @@ static struct shash_desc *init_desc(char type, uint8_t hash_algo) · 11 unmodified lines
91	algo = hash_algo_name[hash_algo];	91	algo = hash_algo_name[hash_algo];
92	}	92	}
93		93
94	if (*tfm == NULL) {	94	if (*tfm)
95	mutex_lock(&mutex);	95	goto alloc;
96	if (*tfm)	96	mutex_lock(&mutex);
97	goto out;	97	if (*tfm)
98	*tfm = crypto_alloc_shash(algo, 0, CRYPTO_NOLOAD);	98	goto unlock;
99	if (IS_ERR(*tfm)) {	99
100	rc = PTR_ERR(*tfm);	100	tmp_tfm = crypto_alloc_shash(algo, 0, CRYPTO_NOLOAD);
101	pr_err("Can not allocate %s (reason: %ld)\n", algo, rc);	101	if (IS_ERR(tmp_tfm)) {
102	*tfm = NULL;	102	pr_err("Can not allocate %s (reason: %ld)\n", algo,
		103	PTR_ERR(tmp_tfm));
		104	mutex_unlock(&mutex);
		105	return ERR_CAST(tmp_tfm);
		106	}
		107	if (type == EVM_XATTR_HMAC) {
		108	rc = crypto_shash_setkey(tmp_tfm, evmkey, evmkey_len);
		109	if (rc) {
		110	crypto_free_shash(tmp_tfm);
103	mutex_unlock(&mutex);	111	mutex_unlock(&mutex);
104	return ERR_PTR(rc);	112	return ERR_PTR(rc);
105	}	113	}
106	if (type == EVM_XATTR_HMAC) {
107	rc = crypto_shash_setkey(*tfm, evmkey, evmkey_len);
108	if (rc) {
109	crypto_free_shash(*tfm);
110	*tfm = NULL;
111	mutex_unlock(&mutex);
112	return ERR_PTR(rc);
113	}
114	}
115	out:
116	mutex_unlock(&mutex);
117	}	114	}
118		115	*tfm = tmp_tfm;
		116	unlock:
		117	mutex_unlock(&mutex);
		118	alloc:
119	desc = kmalloc(sizeof(desc) + crypto_shash_descsize(tfm),	119	desc = kmalloc(sizeof(desc) + crypto_shash_descsize(tfm),
120	GFP_KERNEL);	120	GFP_KERNEL);
121	if (!desc)	121	if (!desc)
@@ -207,7 +207,7 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry, · 85 unmodified lines
207	data->hdr.length = crypto_shash_digestsize(desc->tfm);	207	data->hdr.length = crypto_shash_digestsize(desc->tfm);
208		208
209	error = -ENODATA;	209	error = -ENODATA;
210	list_for_each_entry_rcu(xattr, &evm_config_xattrnames, list) {	210	list_for_each_entry_lockless(xattr, &evm_config_xattrnames, list) {
211	bool is_ima = false;	211	bool is_ima = false;
212		212
213	if (strcmp(xattr->name, XATTR_NAME_IMA) == 0)	213	if (strcmp(xattr->name, XATTR_NAME_IMA) == 0)

security/integrity/evm/evm_main.c+2−2

@@ -97,7 +97,7 @@ static int evm_find_protected_xattrs(struct dentry *dentry) · 96 unmodified lines
97	if (!(inode->i_opflags & IOP_XATTR))	97	if (!(inode->i_opflags & IOP_XATTR))
98	return -EOPNOTSUPP;	98	return -EOPNOTSUPP;
99		99
100	list_for_each_entry_rcu(xattr, &evm_config_xattrnames, list) {	100	list_for_each_entry_lockless(xattr, &evm_config_xattrnames, list) {
101	error = __vfs_getxattr(dentry, inode, xattr->name, NULL, 0);	101	error = __vfs_getxattr(dentry, inode, xattr->name, NULL, 0);
102	if (error < 0) {	102	if (error < 0) {
103	if (error == -ENODATA)	103	if (error == -ENODATA)
@@ -228,7 +228,7 @@ static int evm_protected_xattr(const char *req_xattr_name) · 124 unmodified lines
228	struct xattr_list *xattr;	228	struct xattr_list *xattr;
229		229
230	namelen = strlen(req_xattr_name);	230	namelen = strlen(req_xattr_name);
231	list_for_each_entry_rcu(xattr, &evm_config_xattrnames, list) {	231	list_for_each_entry_lockless(xattr, &evm_config_xattrnames, list) {
232	if ((strlen(xattr->name) == namelen)	232	if ((strlen(xattr->name) == namelen)
233	&& (strncmp(req_xattr_name, xattr->name, namelen) == 0)) {	233	&& (strncmp(req_xattr_name, xattr->name, namelen) == 0)) {
234	found = 1;	234	found = 1;

security/integrity/evm/evm_secfs.c+8−1

 		goto out;
 	}
-	/* Guard against races in evm_read_xattrs */
+	/*
+	 * xattr_list_mutex guards against races in evm_read_xattrs().
+	 * Entries are only added to the evm_config_xattrnames list
+	 * and never deleted. Therefore, the list is traversed
+	 * using list_for_each_entry_lockless() without holding
+	 * the mutex in evm_calc_hmac_or_hash(), evm_find_protected_xattrs()
+	 * and evm_protected_xattr().
+	 */
 	mutex_lock(&xattr_list_mutex);
 	list_for_each_entry(tmp, &evm_config_xattrnames, list) {
 		if (strcmp(xattr->name, tmp->name) == 0) {

security/integrity/ima/ima_crypto.c+6−6

@@ -411,7 +411,7 @@ int ima_calc_file_hash(struct file file, struct ima_digest_data hash) · 410 unmodified lines
411	loff_t i_size;	411	loff_t i_size;
412	int rc;	412	int rc;
413	struct file *f = file;	413	struct file *f = file;
414	bool new_file_instance = false, modified_flags = false;	414	bool new_file_instance = false, modified_mode = false;
415		415
416	/*	416	/*
417	* For consistency, fail file's opened with the O_DIRECT flag on	417	* For consistency, fail file's opened with the O_DIRECT flag on
@@ -431,13 +431,13 @@ int ima_calc_file_hash(struct file file, struct ima_digest_data hash) · 13 unmodified lines
431	f = dentry_open(&file->f_path, flags, file->f_cred);	431	f = dentry_open(&file->f_path, flags, file->f_cred);
432	if (IS_ERR(f)) {	432	if (IS_ERR(f)) {
433	/*	433	/*
434	* Cannot open the file again, lets modify f_flags	434	* Cannot open the file again, lets modify f_mode
435	* of original and continue	435	* of original and continue
436	*/	436	*/
437	pr_info_ratelimited("Unable to reopen file for reading.\n");	437	pr_info_ratelimited("Unable to reopen file for reading.\n");
438	f = file;	438	f = file;
439	f->f_flags \|= FMODE_READ;	439	f->f_mode \|= FMODE_READ;
440	modified_flags = true;	440	modified_mode = true;
441	} else {	441	} else {
442	new_file_instance = true;	442	new_file_instance = true;
443	}	443	}
@@ -455,8 +455,8 @@ int ima_calc_file_hash(struct file file, struct ima_digest_data hash) · 11 unmodified lines
455	out:	455	out:
456	if (new_file_instance)	456	if (new_file_instance)
457	fput(f);	457	fput(f);
458	else if (modified_flags)	458	else if (modified_mode)
459	f->f_flags &= ~FMODE_READ;	459	f->f_mode &= ~FMODE_READ;
460	return rc;	460	return rc;
461	}	461	}
462		462

security/integrity/ima/ima_fs.c+1−2

 		integrity_audit_msg(AUDIT_INTEGRITY_STATUS, NULL, NULL,
 				    "policy_update", "signed policy required",
 				    1, 0);
-		if (ima_appraise & IMA_APPRAISE_ENFORCE)
+		result = -EACCES;
-			result = -EACCES;
 	} else {
 		result = ima_parse_add_rule(data);
 	}

security/security.c+14−2

@@ -1965,8 +1965,20 @@ EXPORT_SYMBOL(security_ismaclabel); · 1964 unmodified lines
1965		1965
1966	int security_secid_to_secctx(u32 secid, char *secdata, u32 seclen)	1966	int security_secid_to_secctx(u32 secid, char *secdata, u32 seclen)
1967	{	1967	{
1968	return call_int_hook(secid_to_secctx, -EOPNOTSUPP, secid, secdata,	1968	struct security_hook_list *hp;
1969	seclen);	1969	int rc;
		1970
		1971	/*
		1972	* Currently, only one LSM can implement secid_to_secctx (i.e this
		1973	* LSM hook is not "stackable").
		1974	*/
		1975	hlist_for_each_entry(hp, &security_hook_heads.secid_to_secctx, list) {
		1976	rc = hp->hook.secid_to_secctx(secid, secdata, seclen);
		1977	if (rc != LSM_RET_DEFAULT(secid_to_secctx))
		1978	return rc;
		1979	}
		1980
		1981	return LSM_RET_DEFAULT(secid_to_secctx);
1970	}	1982	}
1971	EXPORT_SYMBOL(security_secid_to_secctx);	1983	EXPORT_SYMBOL(security_secid_to_secctx);
1972		1984

sound/core/pcm_lib.c+1−0

@@ -433,6 +433,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, · 432 unmodified lines
433		433
434	no_delta_check:	434	no_delta_check:
435	if (runtime->status->hw_ptr == new_hw_ptr) {	435	if (runtime->status->hw_ptr == new_hw_ptr) {
		436	runtime->hw_ptr_jiffies = curr_jiffies;
436	update_audio_tstamp(substream, &curr_tstamp, &audio_tstamp);	437	update_audio_tstamp(substream, &curr_tstamp, &audio_tstamp);
437	return 0;	438	return 0;
438	}	439	}

sound/core/rawmidi.c+27−4

 		runtime->event(runtime->substream);
 }
+/* buffer refcount management: call with runtime->lock held */
+static inline void snd_rawmidi_buffer_ref(struct snd_rawmidi_runtime *runtime)
+{
+	runtime->buffer_ref++;
+}
+static inline void snd_rawmidi_buffer_unref(struct snd_rawmidi_runtime *runtime)
+{
+	runtime->buffer_ref--;
+}
 static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream)
 {
 	struct snd_rawmidi_runtime *runtime;
 		if (!newbuf)
 			return -ENOMEM;
 		spin_lock_irq(&runtime->lock);
+		if (runtime->buffer_ref) {
+			spin_unlock_irq(&runtime->lock);
+			kvfree(newbuf);
+			return -EBUSY;
+		}
 		oldbuf = runtime->buffer;
 		runtime->buffer = newbuf;
 		runtime->buffer_size = params->buffer_size;
 	long result = 0, count1;
 	struct snd_rawmidi_runtime *runtime = substream->runtime;
 	unsigned long appl_ptr;
+	int err = 0;
 	spin_lock_irqsave(&runtime->lock, flags);
+	snd_rawmidi_buffer_ref(runtime);
 	while (count > 0 && runtime->avail) {
 		count1 = runtime->buffer_size - runtime->appl_ptr;
 		if (count1 > count)
 		if (userbuf) {
 			spin_unlock_irqrestore(&runtime->lock, flags);
 			if (copy_to_user(userbuf + result,
-					 runtime->buffer + appl_ptr, count1)) {
+					 runtime->buffer + appl_ptr, count1))
-				return result > 0 ? result : -EFAULT;
+				err = -EFAULT;
-			}
 			spin_lock_irqsave(&runtime->lock, flags);
+			if (err)
+				goto out;
 		}
 		result += count1;
 		count -= count1;
 	}
+ out:
+	snd_rawmidi_buffer_unref(runtime);
 	spin_unlock_irqrestore(&runtime->lock, flags);
-	return result;
+	return result > 0 ? result : err;
 }
 long snd_rawmidi_kernel_read(struct snd_rawmidi_substream *substream,
 			return -EAGAIN;
 		}
 	}
+	snd_rawmidi_buffer_ref(runtime);
 	while (count > 0 && runtime->avail > 0) {
 		count1 = runtime->buffer_size - runtime->appl_ptr;
 		if (count1 > count)
 	}
       __end:
 	count1 = runtime->avail < runtime->buffer_size;
+	snd_rawmidi_buffer_unref(runtime);
 	spin_unlock_irqrestore(&runtime->lock, flags);
 	if (count1)
 		snd_rawmidi_output_trigger(substream, 1);

sound/firewire/amdtp-stream-trace.h+1−2

@@ -66,8 +66,7 @@ TRACE_EVENT(amdtp_packet, · 65 unmodified lines
66	__entry->irq,	66	__entry->irq,
67	__entry->index,	67	__entry->index,
68	__print_array(__get_dynamic_array(cip_header),	68	__print_array(__get_dynamic_array(cip_header),
69	__get_dynamic_array_len(cip_header),	69	__get_dynamic_array_len(cip_header), 1))
70	sizeof(u8)))
71	);	70	);
72		71
73	#endif	72	#endif

sound/pci/hda/patch_realtek.c+75−3

 	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),
 	SND_PCI_QUIRK(0x1458, 0xa0cd, "Gigabyte X570 Aorus Master", ALC1220_FIXUP_CLEVO_P950),
+	SND_PCI_QUIRK(0x1458, 0xa0ce, "Gigabyte X570 Aorus Xtreme", ALC1220_FIXUP_CLEVO_P950),
 	SND_PCI_QUIRK(0x1462, 0x1228, "MSI-GP63", ALC1220_FIXUP_CLEVO_P950),
 	SND_PCI_QUIRK(0x1462, 0x1275, "MSI-GL63", ALC1220_FIXUP_CLEVO_P950),
 	SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950),
 	SND_PCI_QUIRK(0x1558, 0x97e1, "Clevo P970[ER][CDFN]", ALC1220_FIXUP_CLEVO_P950),
 	SND_PCI_QUIRK(0x1558, 0x65d1, "Clevo PB51[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
 	SND_PCI_QUIRK(0x1558, 0x67d1, "Clevo PB71[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
+	SND_PCI_QUIRK(0x1558, 0x50d3, "Clevo PC50[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
+	SND_PCI_QUIRK(0x1558, 0x70d1, "Clevo PC70[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
+	SND_PCI_QUIRK(0x1558, 0x7714, "Clevo X170", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
 	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),
 	SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),
 	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530),
 	}
 }
+static void alc225_fixup_s3_pop_noise(struct hda_codec *codec,
+				      const struct hda_fixup *fix, int action)
+{
+	if (action != HDA_FIXUP_ACT_PRE_PROBE)
+		return;
+	codec->power_save_node = 1;
+}
 /* Forcibly assign NID 0x03 to HP/LO while NID 0x02 to SPK for EQ */
 static void alc274_fixup_bind_dacs(struct hda_codec *codec,
 				    const struct hda_fixup *fix, int action)
 	ALC269_FIXUP_HP_LINE1_MIC1_LED,
 	ALC269_FIXUP_INV_DMIC,
 	ALC269_FIXUP_LENOVO_DOCK,
+	ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST,
 	ALC269_FIXUP_NO_SHUTUP,
 	ALC286_FIXUP_SONY_MIC_NO_PRESENCE,
 	ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,
 	ALC233_FIXUP_ACER_HEADSET_MIC,
 	ALC294_FIXUP_LENOVO_MIC_LOCATION,
 	ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE,
+	ALC225_FIXUP_S3_POP_NOISE,
 	ALC700_FIXUP_INTEL_REFERENCE,
 	ALC274_FIXUP_DELL_BIND_DACS,
 	ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
 	ALC294_FIXUP_ASUS_DUAL_SPK,
 	ALC285_FIXUP_THINKPAD_HEADSET_JACK,
 	ALC294_FIXUP_ASUS_HPE,
+	ALC294_FIXUP_ASUS_COEF_1B,
 	ALC285_FIXUP_HP_GPIO_LED,
 	ALC285_FIXUP_HP_MUTE_LED,
 	ALC236_FIXUP_HP_MUTE_LED,
+	ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,
+	ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
 };
 static const struct hda_fixup alc269_fixups[] = {
 		.chained = true,
 		.chain_id = ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT
 	},
+	[ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc269_fixup_limit_int_mic_boost,
+		.chained = true,
+		.chain_id = ALC269_FIXUP_LENOVO_DOCK,
+	},
 	[ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc269_fixup_pincfg_no_hp_to_lineout,
 			{ }
 		},
 		.chained = true,
+		.chain_id = ALC225_FIXUP_S3_POP_NOISE
+	},
+	[ALC225_FIXUP_S3_POP_NOISE] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc225_fixup_s3_pop_noise,
+		.chained = true,
 		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
 	},
 	[ALC700_FIXUP_INTEL_REFERENCE] = {
 		.chained = true,
 		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC
 	},
+	[ALC294_FIXUP_ASUS_COEF_1B] = {
+		.type = HDA_FIXUP_VERBS,
+		.v.verbs = (const struct hda_verb[]) {
+			/* Set bit 10 to correct noisy output after reboot from
+			 * Windows 10 (due to pop noise reduction?)
+			 */
+			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x1b },
+			{ 0x20, AC_VERB_SET_PROC_COEF, 0x4e4b },
+			{ }
+		},
+	},
 	[ALC285_FIXUP_HP_GPIO_LED] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc285_fixup_hp_gpio_led,
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc236_fixup_hp_mute_led,
 	},
+	[ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET] = {
+		.type = HDA_FIXUP_VERBS,
+		.v.verbs = (const struct hda_verb[]) {
+			{ 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc5 },
+			{ }
+		},
+	},
+	[ALC295_FIXUP_ASUS_MIC_NO_PRESENCE] = {
+		.type = HDA_FIXUP_PINS,
+		.v.pins = (const struct hda_pintbl[]) {
+			{ 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */
+			{ }
+		},
+		.chained = true,
+		.chain_id = ALC269_FIXUP_HEADSET_MODE
+	},
 };
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),
 	SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC),
 	SND_PCI_QUIRK(0x1043, 0x19ce, "ASUS B9450FA", ALC294_FIXUP_ASUS_HPE),
+	SND_PCI_QUIRK(0x1043, 0x19e1, "ASUS UX581LV", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
 	SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC),
+	SND_PCI_QUIRK(0x1043, 0x1b11, "ASUS UX431DA", ALC294_FIXUP_ASUS_COEF_1B),
 	SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),
 	SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
 	SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE),
 	SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_HEADSET_MODE),
 	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),
+	SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
+	SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
 	SND_PCI_QUIRK(0x144d, 0xc740, "Samsung Ativ book 8 (NP870Z5G)", ALC269_FIXUP_ATIV_BOOK_8),
 	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_HEADSET_MIC),
 	SND_PCI_QUIRK(0x1462, 0xb120, "MSI Cubi MS-B120", ALC283_FIXUP_HEADSET_MIC),
 	SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
 	SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE),
 	SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),
-	SND_PCI_QUIRK(0x17aa, 0x21f6, "Thinkpad T530", ALC269_FIXUP_LENOVO_DOCK),
+	SND_PCI_QUIRK(0x17aa, 0x21f6, "Thinkpad T530", ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST),
 	SND_PCI_QUIRK(0x17aa, 0x21fa, "Thinkpad X230", ALC269_FIXUP_LENOVO_DOCK),
 	SND_PCI_QUIRK(0x17aa, 0x21f3, "Thinkpad T430", ALC269_FIXUP_LENOVO_DOCK),
 	SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK),
 	{.id = ALC269_FIXUP_HEADSET_MODE, .name = "headset-mode"},
 	{.id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, .name = "headset-mode-no-hp-mic"},
 	{.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},
+	{.id = ALC269_FIXUP_LENOVO_DOCK_LIMIT_BOOST, .name = "lenovo-dock-limit-boost"},
 	{.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},
 	{.id = ALC269_FIXUP_HP_DOCK_GPIO_MIC1_LED, .name = "hp-dock-gpio-mic1-led"},
 	{.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"},
 		{0x12, 0x90a60130},
 		{0x17, 0x90170110},
 		{0x21, 0x03211020}),
+	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
+		{0x12, 0x90a60120},
+		{0x17, 0x90170110},
+		{0x21, 0x04211030}),
+	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
+		{0x12, 0x90a60130},
+		{0x17, 0x90170110},
+		{0x21, 0x03211020}),
+	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1043, "ASUS", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
+		{0x12, 0x90a60130},
+		{0x17, 0x90170110},
+		{0x21, 0x03211020}),
 	SND_HDA_PIN_QUIRK(0x10ec0295, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
 		{0x14, 0x90170110},
 		{0x21, 0x04211020}),
 		spec->gen.mixer_nid = 0;
 		break;
 	case 0x10ec0225:
-		codec->power_save_node = 1;
-		/* fall through */
 	case 0x10ec0295:
 	case 0x10ec0299:
 		spec->codec_variant = ALC269_TYPE_ALC225;

sound/pci/ice1712/ice1712.c+2−1

 	pci_write_config_byte(ice->pci, 0x61, ice->eeprom.data[ICE_EEP1_ACLINK]);
 	pci_write_config_byte(ice->pci, 0x62, ice->eeprom.data[ICE_EEP1_I2SID]);
 	pci_write_config_byte(ice->pci, 0x63, ice->eeprom.data[ICE_EEP1_SPDIF]);
-	if (ice->eeprom.subvendor != ICE1712_SUBDEVICE_STDSP24) {
+	if (ice->eeprom.subvendor != ICE1712_SUBDEVICE_STDSP24 &&
+	    ice->eeprom.subvendor != ICE1712_SUBDEVICE_STAUDIO_ADCIII) {
 		ice->gpio.write_mask = ice->eeprom.gpiomask;
 		ice->gpio.direction = ice->eeprom.gpiodir;
 		snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK,

sound/usb/mixer_maps.c+5−0

 		.map = trx40_mobo_map,
 		.connector_map = trx40_mobo_connector_map,
 	},
+	{	/* Asrock TRX40 Creator */
+		.id = USB_ID(0x26ce, 0x0a01),
+		.map = trx40_mobo_map,
+		.connector_map = trx40_mobo_connector_map,
+	},
 	{ 0 } /* terminator */
 };

sound/usb/quirks-table.h+1−0

@@ -3563,6 +3563,7 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), · 3562 unmodified lines
3563	ALC1220_VB_DESKTOP(0x0414, 0xa002), /* Gigabyte TRX40 Aorus Pro WiFi */	3563	ALC1220_VB_DESKTOP(0x0414, 0xa002), /* Gigabyte TRX40 Aorus Pro WiFi */
3564	ALC1220_VB_DESKTOP(0x0db0, 0x0d64), /* MSI TRX40 Creator */	3564	ALC1220_VB_DESKTOP(0x0db0, 0x0d64), /* MSI TRX40 Creator */
3565	ALC1220_VB_DESKTOP(0x0db0, 0x543d), /* MSI TRX40 */	3565	ALC1220_VB_DESKTOP(0x0db0, 0x543d), /* MSI TRX40 */
		3566	ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */
3566	#undef ALC1220_VB_DESKTOP	3567	#undef ALC1220_VB_DESKTOP
3567		3568
3568	#undef USB_DEVICE_VENDOR_SPEC	3569	#undef USB_DEVICE_VENDOR_SPEC

sound/usb/quirks.c+5−4

 	    && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
 		msleep(20);
-	/* Zoom R16/24, Logitech H650e, Jabra 550a needs a tiny delay here,
+	/* Zoom R16/24, Logitech H650e, Jabra 550a, Kingston HyperX needs a tiny
-	 * otherwise requests like get/set frequency return as failed despite
+	 * delay here, otherwise requests like get/set frequency return as
-	 * actually succeeding.
+	 * failed despite actually succeeding.
 	 */
 	if ((chip->usb_id == USB_ID(0x1686, 0x00dd) ||
 	     chip->usb_id == USB_ID(0x046d, 0x0a46) ||
-	     chip->usb_id == USB_ID(0x0b0e, 0x0349)) &&
+	     chip->usb_id == USB_ID(0x0b0e, 0x0349) ||
+	     chip->usb_id == USB_ID(0x0951, 0x16ad)) &&
 	    (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
 		usleep_range(1000, 2000);
 }

tools/bootconfig/main.c+1−0

@@ -337,6 +337,7 @@ int apply_xbc(const char path, const char xbc_path) · 336 unmodified lines
337	pr_err("Failed to apply a boot config magic: %d\n", ret);	337	pr_err("Failed to apply a boot config magic: %d\n", ret);
338	goto out;	338	goto out;
339	}	339	}
		340	ret = 0;
340	out:	341	out:
341	close(fd);	342	close(fd);
342	free(data);	343	free(data);

tools/lib/bpf/bpf_tracing.h+2−2

@@ -148,11 +148,11 @@ struct pt_regs; · 147 unmodified lines
148	#define PT_REGS_PARM3_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[4])	148	#define PT_REGS_PARM3_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[4])
149	#define PT_REGS_PARM4_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[5])	149	#define PT_REGS_PARM4_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[5])
150	#define PT_REGS_PARM5_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[6])	150	#define PT_REGS_PARM5_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[6])
151	#define PT_REGS_RET_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), grps[14])	151	#define PT_REGS_RET_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[14])
152	#define PT_REGS_FP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[11])	152	#define PT_REGS_FP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[11])
153	#define PT_REGS_RC_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[2])	153	#define PT_REGS_RC_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[2])
154	#define PT_REGS_SP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[15])	154	#define PT_REGS_SP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), gprs[15])
155	#define PT_REGS_IP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), pdw.addr)	155	#define PT_REGS_IP_CORE(x) BPF_CORE_READ((PT_REGS_S390 *)(x), psw.addr)
156		156
157	#elif defined(bpf_target_arm)	157	#elif defined(bpf_target_arm)
158		158

tools/testing/selftests/bpf/prog_tests/mmap.c+20−1

 	const size_t map_sz = roundup_page(sizeof(struct map_data));
 	const int zero = 0, one = 1, two = 2, far = 1500;
 	const long page_size = sysconf(_SC_PAGE_SIZE);
-	int err, duration = 0, i, data_map_fd, data_map_id, tmp_fd;
+	int err, duration = 0, i, data_map_fd, data_map_id, tmp_fd, rdmap_fd;
 	struct bpf_map *data_map, *bss_map;
 	void *bss_mmaped = NULL, *map_mmaped = NULL, *tmp1, *tmp2;
 	struct test_mmap__bss *bss_data;
 	data_map = skel->maps.data_map;
 	data_map_fd = bpf_map__fd(data_map);
+	rdmap_fd = bpf_map__fd(skel->maps.rdonly_map);
+	tmp1 = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, rdmap_fd, 0);
+	if (CHECK(tmp1 != MAP_FAILED, "rdonly_write_mmap", "unexpected success\n")) {
+		munmap(tmp1, 4096);
+		goto cleanup;
+	}
+	/* now double-check if it's mmap()'able at all */
+	tmp1 = mmap(NULL, 4096, PROT_READ, MAP_SHARED, rdmap_fd, 0);
+	if (CHECK(tmp1 == MAP_FAILED, "rdonly_read_mmap", "failed: %d\n", errno))
+		goto cleanup;
 	/* get map's ID */
 	memset(&map_info, 0, map_info_sz);
 	err = bpf_obj_get_info_by_fd(data_map_fd, &map_info, &map_info_sz);
 	munmap(tmp2, 4 * page_size);
+	/* map all 4 pages, but with pg_off=1 page, should fail */
+	tmp1 = mmap(NULL, 4 * page_size, PROT_READ, MAP_SHARED | MAP_FIXED,
+		    data_map_fd, page_size /* initial page shift */);
+	if (CHECK(tmp1 != MAP_FAILED, "adv_mmap7", "unexpected success")) {
+		munmap(tmp1, 4 * page_size);
+		goto cleanup;
+	}
 	tmp1 = mmap(NULL, map_sz, PROT_READ, MAP_SHARED, data_map_fd, 0);
 	if (CHECK(tmp1 == MAP_FAILED, "last_mmap", "failed %d\n", errno))
 		goto cleanup;

tools/testing/selftests/bpf/progs/test_mmap.c+8−0

@@ -7,6 +7,14 @@ · 6 unmodified lines
7		7
8	char _license[] SEC("license") = "GPL";	8	char _license[] SEC("license") = "GPL";
9		9
		10	struct {
		11	__uint(type, BPF_MAP_TYPE_ARRAY);
		12	__uint(max_entries, 4096);
		13	__uint(map_flags, BPF_F_MMAPABLE \| BPF_F_RDONLY_PROG);
		14	__type(key, __u32);
		15	__type(value, char);
		16	} rdonly_map SEC(".maps");
		17
10	struct {	18	struct {
11	__uint(type, BPF_MAP_TYPE_ARRAY);	19	__uint(type, BPF_MAP_TYPE_ARRAY);
12	__uint(max_entries, 512 * 4); /* at least 4 pages of data */	20	__uint(max_entries, 512 * 4); /* at least 4 pages of data */

tools/testing/selftests/bpf/progs/test_overhead.c+2−2

@@ -30,13 +30,13 @@ int prog3(struct bpf_raw_tracepoint_args *ctx) · 29 unmodified lines
30	SEC("fentry/__set_task_comm")	30	SEC("fentry/__set_task_comm")
31	int BPF_PROG(prog4, struct task_struct tsk, const char buf, bool exec)	31	int BPF_PROG(prog4, struct task_struct tsk, const char buf, bool exec)
32	{	32	{
33	return !tsk;	33	return 0;
34	}	34	}
35		35
36	SEC("fexit/__set_task_comm")	36	SEC("fexit/__set_task_comm")
37	int BPF_PROG(prog5, struct task_struct tsk, const char buf, bool exec)	37	int BPF_PROG(prog5, struct task_struct tsk, const char buf, bool exec)
38	{	38	{
39	return !tsk;	39	return 0;
40	}	40	}
41		41
42	char _license[] SEC("license") = "GPL";	42	char _license[] SEC("license") = "GPL";

tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c+1−0

@@ -351,6 +351,7 @@ static int test_alloc_errors(char *heap_name) · 350 unmodified lines
351	}	351	}
352		352
353	printf("Expected error checking passed\n");	353	printf("Expected error checking passed\n");
		354	ret = 0;
354	out:	355	out:
355	if (dmabuf_fd >= 0)	356	if (dmabuf_fd >= 0)
356	close(dmabuf_fd);	357	close(dmabuf_fd);

tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh+1−1

@@ -300,7 +300,7 @@ test_uc_aware() · 299 unmodified lines
300	local i	300	local i
301		301
302	for ((i = 0; i < attempts; ++i)); do	302	for ((i = 0; i < attempts; ++i)); do
303	if $ARPING -c 1 -I $h1 -b 192.0.2.66 -q -w 0.1; then	303	if $ARPING -c 1 -I $h1 -b 192.0.2.66 -q -w 1; then
304	((passes++))	304	((passes++))
305	fi	305	fi
306		306

tools/testing/selftests/drivers/net/netdevsim/devlink_trap.sh+4−0

 	local packets_t0
 	local packets_t1
+	RET=0
 	if [ $(devlink_trap_policers_num_get) -eq 0 ]; then
 		check_err 1 "Failed to dump policers"
 	fi
 trap_policer_bind_test()
 {
+	RET=0
 	devlink trap group set $DEVLINK_DEV group l2_drops policer 1
 	check_err $? "Failed to bind a valid policer"
 	if [ $(devlink_trap_group_policer_get "l2_drops") -ne 1 ]; then

tools/testing/selftests/ftrace/test.d/preemptirq/irqsoff_tracer.tc+8−1

     exit_unsupported
 }
-modprobe $MOD || unsup "$MOD module not available"
+unres() { #msg
+    reset_tracer
+    rmmod $MOD || true
+    echo $1
+    exit_unresolved
+}
+modprobe $MOD || unres "$MOD module not available"
 rmmod $MOD
 grep -q "preemptoff" available_tracers || unsup "preemptoff tracer not enabled"

tools/testing/selftests/kvm/Makefile+1−0

@@ -54,6 +54,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/vmx_dirty_log_test · 53 unmodified lines
54	TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test	54	TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
55	TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test	55	TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test
56	TEST_GEN_PROGS_x86_64 += x86_64/xss_msr_test	56	TEST_GEN_PROGS_x86_64 += x86_64/xss_msr_test
		57	TEST_GEN_PROGS_x86_64 += x86_64/debug_regs
57	TEST_GEN_PROGS_x86_64 += clear_dirty_log_test	58	TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
58	TEST_GEN_PROGS_x86_64 += demand_paging_test	59	TEST_GEN_PROGS_x86_64 += demand_paging_test
59	TEST_GEN_PROGS_x86_64 += dirty_log_test	60	TEST_GEN_PROGS_x86_64 += dirty_log_test

tools/testing/selftests/kvm/include/kvm_util.h+2−0

 void vcpu_run(struct kvm_vm *vm, uint32_t vcpuid);
 int _vcpu_run(struct kvm_vm *vm, uint32_t vcpuid);
 void vcpu_run_complete_io(struct kvm_vm *vm, uint32_t vcpuid);
+void vcpu_set_guest_debug(struct kvm_vm *vm, uint32_t vcpuid,
+			  struct kvm_guest_debug *debug);
 void vcpu_set_mp_state(struct kvm_vm *vm, uint32_t vcpuid,
 		       struct kvm_mp_state *mp_state);
 void vcpu_regs_get(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_regs *regs);

tools/testing/selftests/kvm/lib/kvm_util.c+9−0

@@ -1201,6 +1201,15 @@ void vcpu_run_complete_io(struct kvm_vm *vm, uint32_t vcpuid) · 1200 unmodified lines
1201	ret, errno);	1201	ret, errno);
1202	}	1202	}
1203		1203
		1204	void vcpu_set_guest_debug(struct kvm_vm *vm, uint32_t vcpuid,
		1205	struct kvm_guest_debug *debug)
		1206	{
		1207	struct vcpu *vcpu = vcpu_find(vm, vcpuid);
		1208	int ret = ioctl(vcpu->fd, KVM_SET_GUEST_DEBUG, debug);
		1209
		1210	TEST_ASSERT(ret == 0, "KVM_SET_GUEST_DEBUG failed: %d", ret);
		1211	}
		1212
1204	/*	1213	/*
1205	* VM VCPU Set MP State	1214	* VM VCPU Set MP State
1206	*	1215	*

tools/testing/selftests/kvm/x86_64/debug_regs.c+202−0

@@ -0,0 +1,202 @@
	1	// SPDX-License-Identifier: GPL-2.0
	2	/*
	3	* KVM guest debug register tests
	4	*
	5	* Copyright (C) 2020, Red Hat, Inc.
	6	*/
	7	#include <stdio.h>
	8	#include <string.h>
	9	#include "kvm_util.h"
	10	#include "processor.h"
	11
	12	#define VCPU_ID 0
	13
	14	#define DR6_BD (1 << 13)
	15	#define DR7_GD (1 << 13)
	16
	17	/* For testing data access debug BP */
	18	uint32_t guest_value;
	19
	20	extern unsigned char sw_bp, hw_bp, write_data, ss_start, bd_start;
	21
	22	static void guest_code(void)
	23	{
	24	/*
	25	* Software BP tests.
	26	*
	27	* NOTE: sw_bp need to be before the cmd here, because int3 is an
	28	* exception rather than a normal trap for KVM_SET_GUEST_DEBUG (we
	29	* capture it using the vcpu exception bitmap).
	30	*/
	31	asm volatile("sw_bp: int3");
	32
	33	/* Hardware instruction BP test */
	34	asm volatile("hw_bp: nop");
	35
	36	/* Hardware data BP test */
	37	asm volatile("mov $1234,%%rax;\n\t"
	38	"mov %%rax,%0;\n\t write_data:"
	39	: "=m" (guest_value) : : "rax");
	40
	41	/* Single step test, covers 2 basic instructions and 2 emulated */
	42	asm volatile("ss_start: "
	43	"xor %%rax,%%rax\n\t"
	44	"cpuid\n\t"
	45	"movl $0x1a0,%%ecx\n\t"
	46	"rdmsr\n\t"
	47	: : : "rax", "ecx");
	48
	49	/* DR6.BD test */
	50	asm volatile("bd_start: mov %%dr0, %%rax" : : : "rax");
	51	GUEST_DONE();
	52	}
	53
	54	#define CLEAR_DEBUG() memset(&debug, 0, sizeof(debug))
	55	#define APPLY_DEBUG() vcpu_set_guest_debug(vm, VCPU_ID, &debug)
	56	#define CAST_TO_RIP(v) ((unsigned long long)&(v))
	57	#define SET_RIP(v) do { \
	58	vcpu_regs_get(vm, VCPU_ID, &regs); \
	59	regs.rip = (v); \
	60	vcpu_regs_set(vm, VCPU_ID, &regs); \
	61	} while (0)
	62	#define MOVE_RIP(v) SET_RIP(regs.rip + (v));
	63
	64	int main(void)
	65	{
	66	struct kvm_guest_debug debug;
	67	unsigned long long target_dr6, target_rip;
	68	struct kvm_regs regs;
	69	struct kvm_run *run;
	70	struct kvm_vm *vm;
	71	struct ucall uc;
	72	uint64_t cmd;
	73	int i;
	74	/* Instruction lengths starting at ss_start */
	75	int ss_size[4] = {
	76	3, /* xor */
	77	2, /* cpuid */
	78	5, /* mov */
	79	2, /* rdmsr */
	80	};
	81
	82	if (!kvm_check_cap(KVM_CAP_SET_GUEST_DEBUG)) {
	83	print_skip("KVM_CAP_SET_GUEST_DEBUG not supported");
	84	return 0;
	85	}
	86
	87	vm = vm_create_default(VCPU_ID, 0, guest_code);
	88	vcpu_set_cpuid(vm, VCPU_ID, kvm_get_supported_cpuid());
	89	run = vcpu_state(vm, VCPU_ID);
	90
	91	/* Test software BPs - int3 */
	92	CLEAR_DEBUG();
	93	debug.control = KVM_GUESTDBG_ENABLE \| KVM_GUESTDBG_USE_SW_BP;
	94	APPLY_DEBUG();
	95	vcpu_run(vm, VCPU_ID);
	96	TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG &&
	97	run->debug.arch.exception == BP_VECTOR &&
	98	run->debug.arch.pc == CAST_TO_RIP(sw_bp),
	99	"INT3: exit %d exception %d rip 0x%llx (should be 0x%llx)",
	100	run->exit_reason, run->debug.arch.exception,
	101	run->debug.arch.pc, CAST_TO_RIP(sw_bp));
	102	MOVE_RIP(1);
	103
	104	/* Test instruction HW BP over DR[0-3] */
	105	for (i = 0; i < 4; i++) {
	106	CLEAR_DEBUG();
	107	debug.control = KVM_GUESTDBG_ENABLE \| KVM_GUESTDBG_USE_HW_BP;
	108	debug.arch.debugreg[i] = CAST_TO_RIP(hw_bp);
	109	debug.arch.debugreg[7] = 0x400 \| (1UL << (2*i+1));
	110	APPLY_DEBUG();
	111	vcpu_run(vm, VCPU_ID);
	112	target_dr6 = 0xffff0ff0 \| (1UL << i);
	113	TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG &&
	114	run->debug.arch.exception == DB_VECTOR &&
	115	run->debug.arch.pc == CAST_TO_RIP(hw_bp) &&
	116	run->debug.arch.dr6 == target_dr6,
	117	"INS_HW_BP (DR%d): exit %d exception %d rip 0x%llx "
	118	"(should be 0x%llx) dr6 0x%llx (should be 0x%llx)",
	119	i, run->exit_reason, run->debug.arch.exception,
	120	run->debug.arch.pc, CAST_TO_RIP(hw_bp),
	121	run->debug.arch.dr6, target_dr6);
	122	}
	123	/* Skip "nop" */
	124	MOVE_RIP(1);
	125
	126	/* Test data access HW BP over DR[0-3] */
	127	for (i = 0; i < 4; i++) {
	128	CLEAR_DEBUG();
	129	debug.control = KVM_GUESTDBG_ENABLE \| KVM_GUESTDBG_USE_HW_BP;
	130	debug.arch.debugreg[i] = CAST_TO_RIP(guest_value);
	131	debug.arch.debugreg[7] = 0x00000400 \| (1UL << (2*i+1)) \|
	132	(0x000d0000UL << (4*i));
	133	APPLY_DEBUG();
	134	vcpu_run(vm, VCPU_ID);
	135	target_dr6 = 0xffff0ff0 \| (1UL << i);
	136	TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG &&
	137	run->debug.arch.exception == DB_VECTOR &&
	138	run->debug.arch.pc == CAST_TO_RIP(write_data) &&
	139	run->debug.arch.dr6 == target_dr6,
	140	"DATA_HW_BP (DR%d): exit %d exception %d rip 0x%llx "
	141	"(should be 0x%llx) dr6 0x%llx (should be 0x%llx)",
	142	i, run->exit_reason, run->debug.arch.exception,
	143	run->debug.arch.pc, CAST_TO_RIP(write_data),
	144	run->debug.arch.dr6, target_dr6);
	145	/* Rollback the 4-bytes "mov" */
	146	MOVE_RIP(-7);
	147	}
	148	/* Skip the 4-bytes "mov" */
	149	MOVE_RIP(7);
	150
	151	/* Test single step */
	152	target_rip = CAST_TO_RIP(ss_start);
	153	target_dr6 = 0xffff4ff0ULL;
	154	vcpu_regs_get(vm, VCPU_ID, &regs);
	155	for (i = 0; i < (sizeof(ss_size) / sizeof(ss_size[0])); i++) {
	156	target_rip += ss_size[i];
	157	CLEAR_DEBUG();
	158	debug.control = KVM_GUESTDBG_ENABLE \| KVM_GUESTDBG_SINGLESTEP;
	159	debug.arch.debugreg[7] = 0x00000400;
	160	APPLY_DEBUG();
	161	vcpu_run(vm, VCPU_ID);
	162	TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG &&
	163	run->debug.arch.exception == DB_VECTOR &&
	164	run->debug.arch.pc == target_rip &&
	165	run->debug.arch.dr6 == target_dr6,
	166	"SINGLE_STEP[%d]: exit %d exception %d rip 0x%llx "
	167	"(should be 0x%llx) dr6 0x%llx (should be 0x%llx)",
	168	i, run->exit_reason, run->debug.arch.exception,
	169	run->debug.arch.pc, target_rip, run->debug.arch.dr6,
	170	target_dr6);
	171	}
	172
	173	/* Finally test global disable */
	174	CLEAR_DEBUG();
	175	debug.control = KVM_GUESTDBG_ENABLE \| KVM_GUESTDBG_USE_HW_BP;
	176	debug.arch.debugreg[7] = 0x400 \| DR7_GD;
	177	APPLY_DEBUG();
	178	vcpu_run(vm, VCPU_ID);
	179	target_dr6 = 0xffff0ff0 \| DR6_BD;
	180	TEST_ASSERT(run->exit_reason == KVM_EXIT_DEBUG &&
	181	run->debug.arch.exception == DB_VECTOR &&
	182	run->debug.arch.pc == CAST_TO_RIP(bd_start) &&
	183	run->debug.arch.dr6 == target_dr6,
	184	"DR7.GD: exit %d exception %d rip 0x%llx "
	185	"(should be 0x%llx) dr6 0x%llx (should be 0x%llx)",
	186	run->exit_reason, run->debug.arch.exception,
	187	run->debug.arch.pc, target_rip, run->debug.arch.dr6,
	188	target_dr6);
	189
	190	/* Disable all debug controls, run to the end */
	191	CLEAR_DEBUG();
	192	APPLY_DEBUG();
	193
	194	vcpu_run(vm, VCPU_ID);
	195	TEST_ASSERT(run->exit_reason == KVM_EXIT_IO, "KVM_EXIT_IO");
	196	cmd = get_ucall(vm, VCPU_ID, &uc);
	197	TEST_ASSERT(cmd == UCALL_DONE, "UCALL_DONE");
	198
	199	kvm_vm_free(vm);
	200
	201	return 0;
	202	}

tools/testing/selftests/lkdtm/run.sh+12−10

 # Figure out which test to run from our script name.
 test=$(basename $0 .sh)
 # Look up details about the test from master list of LKDTM tests.
-line=$(egrep '^#?'"$test"'\b' tests.txt)
+line=$(grep -E '^#?'"$test"'\b' tests.txt)
 if [ -z "$line" ]; then
 	echo "Skipped: missing test '$test' in tests.txt"
 	exit $KSELFTEST_SKIP_TEST
 fi
 # Check that the test is known to LKDTM.
-if ! egrep -q '^'"$test"'$' "$TRIGGER" ; then
+if ! grep -E -q '^'"$test"'$' "$TRIGGER" ; then
 	echo "Skipped: test '$test' missing in $TRIGGER!"
 	exit $KSELFTEST_SKIP_TEST
 fi
 	expect="call trace:"
 fi
-# Clear out dmesg for output reporting
-dmesg -c >/dev/null
 # Prepare log for report checking
-LOG=$(mktemp --tmpdir -t lkdtm-XXXXXX)
+LOG=$(mktemp --tmpdir -t lkdtm-log-XXXXXX)
+DMESG=$(mktemp --tmpdir -t lkdtm-dmesg-XXXXXX)
 cleanup() {
-	rm -f "$LOG"
+	rm -f "$LOG" "$DMESG"
 }
 trap cleanup EXIT
+# Save existing dmesg so we can detect new content below
+dmesg > "$DMESG"
 # Most shells yell about signals and we're expecting the "cat" process
 # to usually be killed by the kernel. So we have to run it in a sub-shell
 # and silence errors.
 ($SHELL -c 'cat <(echo '"$test"') >'"$TRIGGER" 2>/dev/null) || true
 # Record and dump the results
-dmesg -c >"$LOG"
+dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$DMESG" - > "$LOG" || true
 cat "$LOG"
 # Check for expected output
-if egrep -qi "$expect" "$LOG" ; then
+if grep -E -qi "$expect" "$LOG" ; then
 	echo "$test: saw '$expect': ok"
 	exit 0
 else
-	if egrep -qi XFAIL: "$LOG" ; then
+	if grep -E -qi XFAIL: "$LOG" ; then
 		echo "$test: saw 'XFAIL': [SKIP]"
 		exit $KSELFTEST_SKIP_TEST
 	else

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

@@ -30,7 +30,7 @@ ret=0 · 29 unmodified lines
30		30
31	cleanup()	31	cleanup()
32	{	32	{
33	rm -f $out	33	rm -f $err
34	ip netns del $ns1	34	ip netns del $ns1
35	}	35	}
36		36

tools/testing/selftests/nsfs/pidns.c+1−1

@@ -27,7 +27,7 @@ · 26 unmodified lines
27	#define __stack_aligned__ __attribute__((aligned(16)))	27	#define __stack_aligned__ __attribute__((aligned(16)))
28	struct cr_clone_arg {	28	struct cr_clone_arg {
29	char stack[128] __stack_aligned__;	29	char stack[128] __stack_aligned__;
30	char stack_ptr[0];	30	char stack_ptr[];
31	};	31	};
32		32
33	static int child(void *args)	33	static int child(void *args)

tools/testing/selftests/vm/.gitignore+1−0

@@ -6,6 +6,7 @@ map_populate · 5 unmodified lines
6	thuge-gen	6	thuge-gen
7	compaction_test	7	compaction_test
8	mlock2-tests	8	mlock2-tests
		9	mremap_dontunmap
9	on-fault-limit	10	on-fault-limit
10	transhuge-stress	11	transhuge-stress
11	userfaultfd	12	userfaultfd

tools/testing/selftests/vm/write_to_hugetlbfs.c+0−2

@@ -74,8 +74,6 @@ int main(int argc, char **argv) · 73 unmodified lines
74	int write = 0;	74	int write = 0;
75	int reserve = 1;	75	int reserve = 1;
76		76
77	unsigned long i;
78
79	if (signal(SIGINT, sig_handler) == SIG_ERR)	77	if (signal(SIGINT, sig_handler) == SIG_ERR)
80	err(1, "\ncan't catch SIGINT\n");	78	err(1, "\ncan't catch SIGINT\n");
81		79

tools/testing/selftests/wireguard/qemu/Makefile+1−1

@@ -44,7 +44,7 @@ endef · 43 unmodified lines
44	$(eval $(call tar_download,MUSL,musl,1.2.0,.tar.gz,https://musl.libc.org/releases/,c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8))	44	$(eval $(call tar_download,MUSL,musl,1.2.0,.tar.gz,https://musl.libc.org/releases/,c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8))
45	$(eval $(call tar_download,IPERF,iperf,3.7,.tar.gz,https://downloads.es.net/pub/iperf/,d846040224317caf2f75c843d309a950a7db23f9b44b94688ccbe557d6d1710c))	45	$(eval $(call tar_download,IPERF,iperf,3.7,.tar.gz,https://downloads.es.net/pub/iperf/,d846040224317caf2f75c843d309a950a7db23f9b44b94688ccbe557d6d1710c))
46	$(eval $(call tar_download,BASH,bash,5.0,.tar.gz,https://ftp.gnu.org/gnu/bash/,b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d))	46	$(eval $(call tar_download,BASH,bash,5.0,.tar.gz,https://ftp.gnu.org/gnu/bash/,b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d))
47	$(eval $(call tar_download,IPROUTE2,iproute2,5.4.0,.tar.xz,https://www.kernel.org/pub/linux/utils/net/iproute2/,fe97aa60a0d4c5ac830be18937e18dc3400ca713a33a89ad896ff1e3d46086ae))	47	$(eval $(call tar_download,IPROUTE2,iproute2,5.6.0,.tar.xz,https://www.kernel.org/pub/linux/utils/net/iproute2/,1b5b0e25ce6e23da7526ea1da044e814ad85ba761b10dd29c2b027c056b04692))
48	$(eval $(call tar_download,IPTABLES,iptables,1.8.4,.tar.bz2,https://www.netfilter.org/projects/iptables/files/,993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c))	48	$(eval $(call tar_download,IPTABLES,iptables,1.8.4,.tar.bz2,https://www.netfilter.org/projects/iptables/files/,993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c))
49	$(eval $(call tar_download,NMAP,nmap,7.80,.tar.bz2,https://nmap.org/dist/,fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa))	49	$(eval $(call tar_download,NMAP,nmap,7.80,.tar.bz2,https://nmap.org/dist/,fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa))
50	$(eval $(call tar_download,IPUTILS,iputils,s20190709,.tar.gz,https://github.com/iputils/iputils/archive/s20190709.tar.gz/#,a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a))	50	$(eval $(call tar_download,IPUTILS,iputils,s20190709,.tar.gz,https://github.com/iputils/iputils/archive/s20190709.tar.gz/#,a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a))

virt/kvm/kvm_main.c+11−3

 }
 bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req,
+				 struct kvm_vcpu *except,
 				 unsigned long *vcpu_bitmap, cpumask_var_t tmp)
 {
 	int i, cpu, me;
 	me = get_cpu();
 	kvm_for_each_vcpu(i, vcpu, kvm) {
-		if (vcpu_bitmap && !test_bit(i, vcpu_bitmap))
+		if ((vcpu_bitmap && !test_bit(i, vcpu_bitmap)) ||
+		    vcpu == except)
 			continue;
 		kvm_make_request(req, vcpu);
 	return called;
 }
-bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req)
+bool kvm_make_all_cpus_request_except(struct kvm *kvm, unsigned int req,
+				      struct kvm_vcpu *except)
 {
 	cpumask_var_t cpus;
 	bool called;
 	zalloc_cpumask_var(&cpus, GFP_ATOMIC);
-	called = kvm_make_vcpus_request_mask(kvm, req, NULL, cpus);
+	called = kvm_make_vcpus_request_mask(kvm, req, except, NULL, cpus);
 	free_cpumask_var(cpus);
 	return called;
 }
+bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req)
+{
+	return kvm_make_all_cpus_request_except(kvm, req, NULL);
+}
 #ifndef CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL
 void kvm_flush_remote_tlbs(struct kvm *kvm)
 {

Merge 5.7-rc7 into staging-next

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -82,7 +82,7 @@ static int cdns3_ep_run_stream_transfer(struct cdns3_endpoint *priv_ep, · 81 unmodified lines
82	* @ptr: address of device controller register to be read and changed	82	* @ptr: address of device controller register to be read and changed
83	* @mask: bits requested to clar	83	* @mask: bits requested to clar
84	*/	84	*/
85	void cdns3_clear_register_bit(void __iomem *ptr, u32 mask)	85	static void cdns3_clear_register_bit(void __iomem *ptr, u32 mask)
86	{	86	{
87	mask = readl(ptr) & ~mask;	87	mask = readl(ptr) & ~mask;
88	writel(mask, ptr);	88	writel(mask, ptr);
@@ -137,7 +137,7 @@ struct usb_request cdns3_next_request(struct list_head list) · 48 unmodified lines
137	*	137	*
138	* Returns buffer or NULL if no buffers in list	138	* Returns buffer or NULL if no buffers in list
139	*/	139	*/
140	struct cdns3_aligned_buf cdns3_next_align_buf(struct list_head list)	140	static struct cdns3_aligned_buf cdns3_next_align_buf(struct list_head list)
141	{	141	{
142	return list_first_entry_or_null(list, struct cdns3_aligned_buf, list);	142	return list_first_entry_or_null(list, struct cdns3_aligned_buf, list);
143	}	143	}
@@ -148,7 +148,7 @@ struct cdns3_aligned_buf cdns3_next_align_buf(struct list_head list) · 4 unmodified lines
148	*	148	*
149	* Returns request or NULL if no requests in list	149	* Returns request or NULL if no requests in list
150	*/	150	*/
151	struct cdns3_request cdns3_next_priv_request(struct list_head list)	151	static struct cdns3_request cdns3_next_priv_request(struct list_head list)
152	{	152	{
153	return list_first_entry_or_null(list, struct cdns3_request, list);	153	return list_first_entry_or_null(list, struct cdns3_request, list);
154	}	154	}
@@ -190,7 +190,7 @@ dma_addr_t cdns3_trb_virt_to_dma(struct cdns3_endpoint *priv_ep, · 35 unmodified lines
190	return priv_ep->trb_pool_dma + offset;	190	return priv_ep->trb_pool_dma + offset;
191	}	191	}
192		192
193	int cdns3_ring_size(struct cdns3_endpoint *priv_ep)	193	static int cdns3_ring_size(struct cdns3_endpoint *priv_ep)
194	{	194	{
195	switch (priv_ep->type) {	195	switch (priv_ep->type) {
196	case USB_ENDPOINT_XFER_ISOC:	196	case USB_ENDPOINT_XFER_ISOC:
@@ -345,7 +345,7 @@ static void cdns3_ep_inc_deq(struct cdns3_endpoint *priv_ep) · 148 unmodified lines
345	cdns3_ep_inc_trb(&priv_ep->dequeue, &priv_ep->ccs, priv_ep->num_trbs);	345	cdns3_ep_inc_trb(&priv_ep->dequeue, &priv_ep->ccs, priv_ep->num_trbs);
346	}	346	}
347		347
348	void cdns3_move_deq_to_next_trb(struct cdns3_request *priv_req)	348	static void cdns3_move_deq_to_next_trb(struct cdns3_request *priv_req)
349	{	349	{
350	struct cdns3_endpoint *priv_ep = priv_req->priv_ep;	350	struct cdns3_endpoint *priv_ep = priv_req->priv_ep;
351	int current_trb = priv_req->start_trb;	351	int current_trb = priv_req->start_trb;
@@ -511,7 +511,7 @@ static void cdns3_wa2_descmiss_copy_data(struct cdns3_endpoint *priv_ep, · 159 unmodified lines
511	}	511	}
512	}	512	}
513		513
514	struct usb_request cdns3_wa2_gadget_giveback(struct cdns3_device priv_dev,	514	static struct usb_request cdns3_wa2_gadget_giveback(struct cdns3_device priv_dev,
515	struct cdns3_endpoint *priv_ep,	515	struct cdns3_endpoint *priv_ep,
516	struct cdns3_request *priv_req)	516	struct cdns3_request *priv_req)
517	{	517	{
@@ -551,7 +551,7 @@ struct usb_request cdns3_wa2_gadget_giveback(struct cdns3_device priv_dev, · 33 unmodified lines
551	return &priv_req->request;	551	return &priv_req->request;
552	}	552	}
553		553
554	int cdns3_wa2_gadget_ep_queue(struct cdns3_device *priv_dev,	554	static int cdns3_wa2_gadget_ep_queue(struct cdns3_device *priv_dev,
555	struct cdns3_endpoint *priv_ep,	555	struct cdns3_endpoint *priv_ep,
556	struct cdns3_request *priv_req)	556	struct cdns3_request *priv_req)
557	{	557	{
@@ -836,7 +836,7 @@ void cdns3_gadget_giveback(struct cdns3_endpoint *priv_ep, · 278 unmodified lines
836	cdns3_gadget_ep_free_request(&priv_ep->endpoint, request);	836	cdns3_gadget_ep_free_request(&priv_ep->endpoint, request);
837	}	837	}
838		838
839	void cdns3_wa1_restore_cycle_bit(struct cdns3_endpoint *priv_ep)	839	static void cdns3_wa1_restore_cycle_bit(struct cdns3_endpoint *priv_ep)
840	{	840	{
841	/* Work around for stale data address in TRB*/	841	/* Work around for stale data address in TRB*/
842	if (priv_ep->wa1_set) {	842	if (priv_ep->wa1_set) {
@@ -1904,7 +1904,7 @@ static int cdns3_ep_onchip_buffer_reserve(struct cdns3_device *priv_dev, · 1061 unmodified lines
1904	return 0;	1904	return 0;
1905	}	1905	}
1906		1906
1907	void cdns3_stream_ep_reconfig(struct cdns3_device *priv_dev,	1907	static void cdns3_stream_ep_reconfig(struct cdns3_device *priv_dev,
1908	struct cdns3_endpoint *priv_ep)	1908	struct cdns3_endpoint *priv_ep)
1909	{	1909	{
1910	if (!priv_ep->use_streams \|\| priv_dev->gadget.speed < USB_SPEED_SUPER)	1910	if (!priv_ep->use_streams \|\| priv_dev->gadget.speed < USB_SPEED_SUPER)
@@ -1925,7 +1925,7 @@ void cdns3_stream_ep_reconfig(struct cdns3_device *priv_dev, · 14 unmodified lines
1925	EP_CFG_TDL_CHK \| EP_CFG_SID_CHK);	1925	EP_CFG_TDL_CHK \| EP_CFG_SID_CHK);
1926	}	1926	}
1927		1927
1928	void cdns3_configure_dmult(struct cdns3_device *priv_dev,	1928	static void cdns3_configure_dmult(struct cdns3_device *priv_dev,
1929	struct cdns3_endpoint *priv_ep)	1929	struct cdns3_endpoint *priv_ep)
1930	{	1930	{
1931	struct cdns3_usb_regs __iomem *regs = priv_dev->regs;	1931	struct cdns3_usb_regs __iomem *regs = priv_dev->regs;
@@ -2548,7 +2548,7 @@ found: · 616 unmodified lines
2548	link_trb = priv_req->trb;	2548	link_trb = priv_req->trb;
2549		2549
2550	/* Update ring only if removed request is on pending_req_list list */	2550	/* Update ring only if removed request is on pending_req_list list */
2551	if (req_on_hw_ring) {	2551	if (req_on_hw_ring && link_trb) {
2552	link_trb->buffer = TRB_BUFFER(priv_ep->trb_pool_dma +	2552	link_trb->buffer = TRB_BUFFER(priv_ep->trb_pool_dma +
2553	((priv_req->end_trb + 1) * TRB_SIZE));	2553	((priv_req->end_trb + 1) * TRB_SIZE));
2554	link_trb->control = (link_trb->control & TRB_CYCLE) \|	2554	link_trb->control = (link_trb->control & TRB_CYCLE) \|