313 files changed, 3033 insertions, 1471 deletions

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index efc7aa7a0670..533ff5c68970 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4846,3 +4846,8 @@
         xirc2ps_cs=     [NET,PCMCIA]
                         Format:
                         <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]
+
+        xhci-hcd.quirks         [USB,KNL]
+                        A hex value specifying bitmask with supplemental xhci
+                        host controller quirks. Meaning of each bit can be
+                        consulted in header drivers/usb/host/xhci.h.
diff --git a/MAINTAINERS b/MAINTAINERS
index 07d1576fc766..13fef810e3fa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -581,7 +581,7 @@ W:	https://www.infradead.org/~dhowells/kafs/
 
 AGPGART DRIVER
 M:      David Airlie <airlied@linux.ie>
-T:      git git://people.freedesktop.org/~airlied/linux (part of drm maint)
+T:      git git://anongit.freedesktop.org/drm/drm
 S:      Maintained
 F:      drivers/char/agp/
 F:      include/linux/agp*
@@ -4630,7 +4630,7 @@ F:	include/uapi/drm/vmwgfx_drm.h
 DRM DRIVERS
 M:      David Airlie <airlied@linux.ie>
 L:      dri-devel@lists.freedesktop.org
-T:      git git://people.freedesktop.org/~airlied/linux
+T:      git git://anongit.freedesktop.org/drm/drm
 B:      https://bugs.freedesktop.org/
 C:      irc://chat.freenode.net/dri-devel
 S:      Maintained
@@ -10213,11 +10213,13 @@ F:	sound/soc/codecs/sgtl5000*
 
 NXP TDA998X DRM DRIVER
 M:      Russell King <linux@armlinux.org.uk>
-S:      Supported
+S:      Maintained
 T:      git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
 T:      git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes
 F:      drivers/gpu/drm/i2c/tda998x_drv.c
 F:      include/drm/i2c/tda998x.h
+F:      include/dt-bindings/display/tda998x.h
+K:      "nxp,tda998x"
 
 NXP TFA9879 DRIVER
 M:      Peter Rosin <peda@axentia.se>
@@ -11835,7 +11837,7 @@ S:	Supported
 F:      arch/hexagon/
 
 QUALCOMM HIDMA DRIVER
-M:      Sinan Kaya <okaya@codeaurora.org>
+M:      Sinan Kaya <okaya@kernel.org>
 L:      linux-arm-kernel@lists.infradead.org
 L:      linux-arm-msm@vger.kernel.org
 L:      dmaengine@vger.kernel.org
diff --git a/Makefile b/Makefile
index c5ce55cbc543..925c55f2524f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 4
 PATCHLEVEL = 18
 SUBLEVEL = 0
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
 NAME = Merciless Moray
 
 # *DOCUMENTATION*
@@ -507,11 +507,6 @@ ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLA
   KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
 endif
 
-ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/cc-can-link.sh $(CC)), y)
-  CC_CAN_LINK := y
-  export CC_CAN_LINK
-endif
-
 # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.
 # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
 # CC_VERSION_TEXT is referenced from Kconfig (so it needs export),
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index f9e8667f5886..73b514dddf65 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -168,7 +168,6 @@
                         AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_dat3.mmc0_dat3 */
                         AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_cmd.mmc0_cmd */
                         AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_clk.mmc0_clk */
-                        AM33XX_IOPAD(0x9a0, PIN_INPUT | MUX_MODE4)              /* mcasp0_aclkr.mmc0_sdwp */
                 >;
         };
 
diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi
index ca294914bbb1..4b6062b631b1 100644
--- a/arch/arm/boot/dts/am3517.dtsi
+++ b/arch/arm/boot/dts/am3517.dtsi
@@ -39,6 +39,8 @@
                         ti,davinci-ctrl-ram-size = <0x2000>;
                         ti,davinci-rmii-en = /bits/ 8 <1>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
+                        clocks = <&emac_ick>;
+                        clock-names = "ick";
                 };
 
                 davinci_mdio: ethernet@5c030000 {
@@ -49,6 +51,8 @@
                         bus_freq = <1000000>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        clocks = <&emac_fck>;
+                        clock-names = "fck";
                 };
 
                 uart4: serial@4809e000 {
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index 440351ad0b80..d4be3fd0b6f4 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -610,6 +610,8 @@
 
                 touchscreen-size-x = <480>;
                 touchscreen-size-y = <272>;
+
+                wakeup-source;
         };
 
         tlv320aic3106: tlv320aic3106@1b {
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 9dcd14edc202..e03495a799ce 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1580,7 +1580,6 @@
                                 dr_mode = "otg";
                                 snps,dis_u3_susphy_quirk;
                                 snps,dis_u2_susphy_quirk;
-                                snps,dis_metastability_quirk;
                         };
                 };
 
@@ -1608,6 +1607,7 @@
                                 dr_mode = "otg";
                                 snps,dis_u3_susphy_quirk;
                                 snps,dis_u2_susphy_quirk;
+                                snps,dis_metastability_quirk;
                         };
                 };
 
diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index df9eca94d812..8a878687197b 100644
--- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
@@ -770,7 +770,7 @@
 
         pinctrl_ts: tsgrp {
                 fsl,pins = <
-                        MX51_PAD_CSI1_D8__GPIO3_12              0x85
+                        MX51_PAD_CSI1_D8__GPIO3_12              0x04
                         MX51_PAD_CSI1_D9__GPIO3_13              0x85
                 >;
         };
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 054591dc9a00..4cd2f4a2bff4 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -141,9 +141,11 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_ULPI=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ETH=m
+CONFIG_USB_ULPI_BUS=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index f70507ab91ee..200ebda47e0c 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -302,6 +302,7 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_ULPI=y
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -338,6 +339,7 @@ CONFIG_USB_GADGETFS=m
 CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
+CONFIG_USB_ULPI_BUS=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
diff --git a/arch/arm/crypto/speck-neon-core.S b/arch/arm/crypto/speck-neon-core.S
index 3c1e203e53b9..57caa742016e 100644
--- a/arch/arm/crypto/speck-neon-core.S
+++ b/arch/arm/crypto/speck-neon-core.S
@@ -272,9 +272,11 @@
          * Allocate stack space to store 128 bytes worth of tweaks.  For
          * performance, this space is aligned to a 16-byte boundary so that we
          * can use the load/store instructions that declare 16-byte alignment.
+         * For Thumb2 compatibility, don't do the 'bic' directly on 'sp'.
          */
-        sub             sp, #128
-        bic             sp, #0xf
+        sub             r12, sp, #128
+        bic             r12, #0xf
+        mov             sp, r12
 
 .if \n == 64
         // Load first tweak
diff --git a/arch/arm/firmware/Makefile b/arch/arm/firmware/Makefile
index a71f16536b6c..6e41336b0bc4 100644
--- a/arch/arm/firmware/Makefile
+++ b/arch/arm/firmware/Makefile
@@ -1 +1,4 @@
 obj-$(CONFIG_TRUSTED_FOUNDATIONS)       += trusted_foundations.o
+
+# tf_generic_smc() fails to build with -fsanitize-coverage=trace-pc
+KCOV_INSTRUMENT                := n
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index 6e8b71613039..f6a62ae44a65 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -1844,7 +1844,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
                 /* there are 2 passes here */
                 bpf_jit_dump(prog->len, image_size, 2, ctx.target);
 
-        set_memory_ro((unsigned long)header, header->pages);
+        bpf_jit_binary_lock_ro(header);
         prog->bpf_func = (void *)ctx.target;
         prog->jited = 1;
         prog->jited_len = image_size;
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 45272266dafb..7976d2d242fa 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -10,7 +10,7 @@
 #
 # Copyright (C) 1995-2001 by Russell King
 
-LDFLAGS_vmlinux :=-p --no-undefined -X
+LDFLAGS_vmlinux :=--no-undefined -X
 CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
 GZFLAGS         :=-9
 
@@ -60,15 +60,13 @@ ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)
 KBUILD_CPPFLAGS += -mbig-endian
 CHECKFLAGS      += -D__AARCH64EB__
 AS              += -EB
-LD              += -EB
-LDFLAGS         += -maarch64linuxb
+LDFLAGS         += -EB -maarch64elfb
 UTS_MACHINE     := aarch64_be
 else
 KBUILD_CPPFLAGS += -mlittle-endian
 CHECKFLAGS      += -D__AARCH64EL__
 AS              += -EL
-LD              += -EL
-LDFLAGS         += -maarch64linux
+LDFLAGS         += -EL -maarch64elf
 UTS_MACHINE     := aarch64
 endif
 
diff --git a/arch/m68k/include/asm/mcf_pgalloc.h b/arch/m68k/include/asm/mcf_pgalloc.h
index 8b707c249026..12fe700632f4 100644
--- a/arch/m68k/include/asm/mcf_pgalloc.h
+++ b/arch/m68k/include/asm/mcf_pgalloc.h
@@ -44,6 +44,7 @@ extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)
 static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page,
                                   unsigned long address)
 {
+        pgtable_page_dtor(page);
         __free_page(page);
 }
 
@@ -74,8 +75,9 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
         return page;
 }
 
-extern inline void pte_free(struct mm_struct *mm, struct page *page)
+static inline void pte_free(struct mm_struct *mm, struct page *page)
 {
+        pgtable_page_dtor(page);
         __free_page(page);
 }
 
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 8d85046adcc8..9670e70139fd 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -29,6 +29,7 @@
 #include <linux/kallsyms.h>
 #include <linux/random.h>
 #include <linux/prctl.h>
+#include <linux/nmi.h>
 
 #include <asm/asm.h>
 #include <asm/bootinfo.h>
@@ -655,28 +656,42 @@ unsigned long arch_align_stack(unsigned long sp)
         return sp & ALMASK;
 }
 
-static void arch_dump_stack(void *info)
+static DEFINE_PER_CPU(call_single_data_t, backtrace_csd);
+static struct cpumask backtrace_csd_busy;
+
+static void handle_backtrace(void *info)
 {
-        struct pt_regs *regs;
+        nmi_cpu_backtrace(get_irq_regs());
+        cpumask_clear_cpu(smp_processor_id(), &backtrace_csd_busy);
+}
 
-        regs = get_irq_regs();
+static void raise_backtrace(cpumask_t *mask)
+{
+        call_single_data_t *csd;
+        int cpu;
 
-        if (regs)
-                show_regs(regs);
+        for_each_cpu(cpu, mask) {
+                /*
+                 * If we previously sent an IPI to the target CPU & it hasn't
+                 * cleared its bit in the busy cpumask then it didn't handle
+                 * our previous IPI & it's not safe for us to reuse the
+                 * call_single_data_t.
+                 */
+                if (cpumask_test_and_set_cpu(cpu, &backtrace_csd_busy)) {
+                        pr_warn("Unable to send backtrace IPI to CPU%u - perhaps it hung?\n",
+                                cpu);
+                        continue;
+                }
 
-        dump_stack();
+                csd = &per_cpu(backtrace_csd, cpu);
+                csd->func = handle_backtrace;
+                smp_call_function_single_async(cpu, csd);
+        }
 }
 
 void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)
 {
-        long this_cpu = get_cpu();
-
-        if (cpumask_test_cpu(this_cpu, mask) && !exclude_self)
-                dump_stack();
-
-        smp_call_function_many(mask, arch_dump_stack, NULL, 1);
-
-        put_cpu();
+        nmi_trigger_cpumask_backtrace(mask, exclude_self, raise_backtrace);
 }
 
 int mips_get_process_fp_mode(struct task_struct *task)
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index d67fa74622ee..8d505a21396e 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -351,6 +351,7 @@ static void __show_regs(const struct pt_regs *regs)
 void show_regs(struct pt_regs *regs)
 {
         __show_regs((struct pt_regs *)regs);
+        dump_stack();
 }
 
 void show_registers(struct pt_regs *regs)
diff --git a/arch/mips/mm/ioremap.c b/arch/mips/mm/ioremap.c
index 1986e09fb457..1601d90b087b 100644
--- a/arch/mips/mm/ioremap.c
+++ b/arch/mips/mm/ioremap.c
@@ -9,6 +9,7 @@
 #include <linux/export.h>
 #include <asm/addrspace.h>
 #include <asm/byteorder.h>
+#include <linux/ioport.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
@@ -98,6 +99,20 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr,
         return error;
 }
 
+static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
+                               void *arg)
+{
+        unsigned long i;
+
+        for (i = 0; i < nr_pages; i++) {
+                if (pfn_valid(start_pfn + i) &&
+                    !PageReserved(pfn_to_page(start_pfn + i)))
+                        return 1;
+        }
+
+        return 0;
+}
+
 /*
  * Generic mapping function (not visible outside):
  */
@@ -116,8 +131,8 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr,
 
 void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long flags)
 {
+        unsigned long offset, pfn, last_pfn;
         struct vm_struct * area;
-        unsigned long offset;
         phys_addr_t last_addr;
         void * addr;
 
@@ -137,18 +152,16 @@ void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long
                 return (void __iomem *) CKSEG1ADDR(phys_addr);
 
         /*
-         * Don't allow anybody to remap normal RAM that we're using..
+         * Don't allow anybody to remap RAM that may be allocated by the page
+         * allocator, since that could lead to races & data clobbering.
          */
-        if (phys_addr < virt_to_phys(high_memory)) {
-                char *t_addr, *t_end;
-                struct page *page;
-
-                t_addr = __va(phys_addr);
-                t_end = t_addr + (size - 1);
-
-                for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++)
-                        if(!PageReserved(page))
-                                return NULL;
+        pfn = PFN_DOWN(phys_addr);
+        last_pfn = PFN_DOWN(last_addr);
+        if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
+                                  __ioremap_check_ram) == 1) {
+                WARN_ONCE(1, "ioremap on RAM at %pa - %pa\n",
+                          &phys_addr, &last_addr);
+                return NULL;
         }
 
         /*
diff --git a/arch/openrisc/include/asm/pgalloc.h b/arch/openrisc/include/asm/pgalloc.h
index 3e1a46615120..8999b9226512 100644
--- a/arch/openrisc/include/asm/pgalloc.h
+++ b/arch/openrisc/include/asm/pgalloc.h
@@ -98,8 +98,12 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte)
         __free_page(pte);
 }
 
+#define __pte_free_tlb(tlb, pte, addr)  \
+do {                                    \
+        pgtable_page_dtor(pte);         \
+        tlb_remove_page((tlb), (pte));  \
+} while (0)
 
-#define __pte_free_tlb(tlb, pte, addr) tlb_remove_page((tlb), (pte))
 #define pmd_pgtable(pmd) pmd_page(pmd)
 
 #define check_pgt_cache()          do { } while (0)
diff --git a/arch/openrisc/kernel/entry.S b/arch/openrisc/kernel/entry.S
index 690d55272ba6..0c826ad6e994 100644
--- a/arch/openrisc/kernel/entry.S
+++ b/arch/openrisc/kernel/entry.S
@@ -277,12 +277,6 @@ EXCEPTION_ENTRY(_data_page_fault_handler)
         l.addi  r3,r1,0                    // pt_regs
         /* r4 set be EXCEPTION_HANDLE */   // effective address of fault
 
-        /*
-         * __PHX__: TODO
-         *
-         * all this can be written much simpler. look at
-         * DTLB miss handler in the CONFIG_GUARD_PROTECTED_CORE part
-         */
 #ifdef CONFIG_OPENRISC_NO_SPR_SR_DSX
         l.lwz   r6,PT_PC(r3)               // address of an offending insn
         l.lwz   r6,0(r6)                   // instruction that caused pf
@@ -314,7 +308,7 @@ EXCEPTION_ENTRY(_data_page_fault_handler)
 
 #else
 
-        l.lwz   r6,PT_SR(r3)               // SR
+        l.mfspr r6,r0,SPR_SR               // SR
         l.andi  r6,r6,SPR_SR_DSX           // check for delay slot exception
         l.sfne  r6,r0                      // exception happened in delay slot
         l.bnf   7f
diff --git a/arch/openrisc/kernel/head.S b/arch/openrisc/kernel/head.S
index fb02b2a1d6f2..9fc6b60140f0 100644
--- a/arch/openrisc/kernel/head.S
+++ b/arch/openrisc/kernel/head.S
@@ -210,8 +210,7 @@
  *       r4  - EEAR     exception EA
  *       r10 - current  pointing to current_thread_info struct
  *       r12 - syscall  0, since we didn't come from syscall
- *       r13 - temp     it actually contains new SR, not needed anymore
- *       r31 - handler  address of the handler we'll jump to
+ *       r30 - handler  address of the handler we'll jump to
  *
  *       handler has to save remaining registers to the exception
  *       ksp frame *before* tainting them!
@@ -244,6 +243,7 @@
         /* r1 is KSP, r30 is __pa(KSP) */                       ;\
         tophys  (r30,r1)                                        ;\
         l.sw    PT_GPR12(r30),r12                               ;\
+        /* r4 use for tmp before EA */                          ;\
         l.mfspr r12,r0,SPR_EPCR_BASE                            ;\
         l.sw    PT_PC(r30),r12                                  ;\
         l.mfspr r12,r0,SPR_ESR_BASE                             ;\
@@ -263,7 +263,10 @@
         /* r12 == 1 if we come from syscall */                  ;\
         CLEAR_GPR(r12)                                          ;\
         /* ----- turn on MMU ----- */                           ;\
-        l.ori   r30,r0,(EXCEPTION_SR)                           ;\
+        /* Carry DSX into exception SR */                       ;\
+        l.mfspr r30,r0,SPR_SR                                   ;\
+        l.andi  r30,r30,SPR_SR_DSX                              ;\
+        l.ori   r30,r30,(EXCEPTION_SR)                          ;\
         l.mtspr r0,r30,SPR_ESR_BASE                             ;\
         /* r30: EA address of handler */                        ;\
         LOAD_SYMBOL_2_GPR(r30,handler)                          ;\
diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c
index fac246e6f37a..d8981cbb852a 100644
--- a/arch/openrisc/kernel/traps.c
+++ b/arch/openrisc/kernel/traps.c
@@ -300,7 +300,7 @@ static inline int in_delay_slot(struct pt_regs *regs)
                 return 0;
         }
 #else
-        return regs->sr & SPR_SR_DSX;
+        return mfspr(SPR_SR) & SPR_SR_DSX;
 #endif
 }
 
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index f12680c9b947..4764fdeb4f1f 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -107,6 +107,7 @@ config ARCH_RV32I
         select GENERIC_LIB_ASHLDI3
         select GENERIC_LIB_ASHRDI3
         select GENERIC_LIB_LSHRDI3
+        select GENERIC_LIB_UCMPDI2
 
 config ARCH_RV64I
         bool "RV64I"
diff --git a/arch/riscv/include/uapi/asm/elf.h b/arch/riscv/include/uapi/asm/elf.h
index 5cae4c30cd8e..1e0dfc36aab9 100644
--- a/arch/riscv/include/uapi/asm/elf.h
+++ b/arch/riscv/include/uapi/asm/elf.h
@@ -21,8 +21,13 @@ typedef struct user_regs_struct elf_gregset_t;
 
 typedef union __riscv_fp_state elf_fpregset_t;
 
-#define ELF_RISCV_R_SYM(r_info) ((r_info) >> 32)
-#define ELF_RISCV_R_TYPE(r_info) ((r_info) & 0xffffffff)
+#if __riscv_xlen == 64
+#define ELF_RISCV_R_SYM(r_info)         ELF64_R_SYM(r_info)
+#define ELF_RISCV_R_TYPE(r_info)        ELF64_R_TYPE(r_info)
+#else
+#define ELF_RISCV_R_SYM(r_info)         ELF32_R_SYM(r_info)
+#define ELF_RISCV_R_TYPE(r_info)        ELF32_R_TYPE(r_info)
+#endif
 
 /*
  * RISC-V relocation types
diff --git a/arch/riscv/kernel/irq.c b/arch/riscv/kernel/irq.c
index b74cbfbce2d0..7bcdaed15703 100644
--- a/arch/riscv/kernel/irq.c
+++ b/arch/riscv/kernel/irq.c
@@ -16,10 +16,6 @@
 #include <linux/irqchip.h>
 #include <linux/irqdomain.h>
 
-#ifdef CONFIG_RISCV_INTC
-#include <linux/irqchip/irq-riscv-intc.h>
-#endif
-
 void __init init_IRQ(void)
 {
         irqchip_init();
diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c
index 1d5e9b934b8c..3303ed2cd419 100644
--- a/arch/riscv/kernel/module.c
+++ b/arch/riscv/kernel/module.c
@@ -37,7 +37,7 @@ static int apply_r_riscv_64_rela(struct module *me, u32 *location, Elf_Addr v)
 static int apply_r_riscv_branch_rela(struct module *me, u32 *location,
                                      Elf_Addr v)
 {
-        s64 offset = (void *)v - (void *)location;
+        ptrdiff_t offset = (void *)v - (void *)location;
         u32 imm12 = (offset & 0x1000) << (31 - 12);
         u32 imm11 = (offset & 0x800) >> (11 - 7);
         u32 imm10_5 = (offset & 0x7e0) << (30 - 10);
@@ -50,7 +50,7 @@ static int apply_r_riscv_branch_rela(struct module *me, u32 *location,
 static int apply_r_riscv_jal_rela(struct module *me, u32 *location,
                                   Elf_Addr v)
 {
-        s64 offset = (void *)v - (void *)location;
+        ptrdiff_t offset = (void *)v - (void *)location;
         u32 imm20 = (offset & 0x100000) << (31 - 20);
         u32 imm19_12 = (offset & 0xff000);
         u32 imm11 = (offset & 0x800) << (20 - 11);
@@ -63,7 +63,7 @@ static int apply_r_riscv_jal_rela(struct module *me, u32 *location,
 static int apply_r_riscv_rcv_branch_rela(struct module *me, u32 *location,
                                          Elf_Addr v)
 {
-        s64 offset = (void *)v - (void *)location;
+        ptrdiff_t offset = (void *)v - (void *)location;
         u16 imm8 = (offset & 0x100) << (12 - 8);
         u16 imm7_6 = (offset & 0xc0) >> (6 - 5);
         u16 imm5 = (offset & 0x20) >> (5 - 2);
@@ -78,7 +78,7 @@ static int apply_r_riscv_rcv_branch_rela(struct module *me, u32 *location,
 static int apply_r_riscv_rvc_jump_rela(struct module *me, u32 *location,
                                        Elf_Addr v)
 {
-        s64 offset = (void *)v - (void *)location;
+        ptrdiff_t offset = (void *)v - (void *)location;
         u16 imm11 = (offset & 0x800) << (12 - 11);
         u16 imm10 = (offset & 0x400) >> (10 - 8);
         u16 imm9_8 = (offset & 0x300) << (12 - 11);
@@ -96,7 +96,7 @@ static int apply_r_riscv_rvc_jump_rela(struct module *me, u32 *location,
 static int apply_r_riscv_pcrel_hi20_rela(struct module *me, u32 *location,
                                          Elf_Addr v)
 {
-        s64 offset = (void *)v - (void *)location;
+        ptrdiff_t offset = (void *)v - (void *)location;
         s32 hi20;
 
         if (offset != (s32)offset) {
@@ -178,7 +178,7 @@ static int apply_r_riscv_lo12_s_rela(struct module *me, u32 *location,
 static int apply_r_riscv_got_hi20_rela(struct module *me, u32 *location,
                                        Elf_Addr v)
 {
-        s64 offset = (void *)v - (void *)location;
+        ptrdiff_t offset = (void *)v - (void *)location;
         s32 hi20;
 
         /* Always emit the got entry */
@@ -200,7 +200,7 @@ static int apply_r_riscv_got_hi20_rela(struct module *me, u32 *location,
 static int apply_r_riscv_call_plt_rela(struct module *me, u32 *location,
                                        Elf_Addr v)
 {
-        s64 offset = (void *)v - (void *)location;
+        ptrdiff_t offset = (void *)v - (void *)location;
         s32 fill_v = offset;
         u32 hi20, lo12;
 
@@ -227,7 +227,7 @@ static int apply_r_riscv_call_plt_rela(struct module *me, u32 *location,
 static int apply_r_riscv_call_rela(struct module *me, u32 *location,
                                    Elf_Addr v)
 {
-        s64 offset = (void *)v - (void *)location;
+        ptrdiff_t offset = (void *)v - (void *)location;
         s32 fill_v = offset;
         u32 hi20, lo12;
 
@@ -263,14 +263,14 @@ static int apply_r_riscv_align_rela(struct module *me, u32 *location,
 static int apply_r_riscv_add32_rela(struct module *me, u32 *location,
                                     Elf_Addr v)
 {
-        *(u32 *)location += (*(u32 *)v);
+        *(u32 *)location += (u32)v;
         return 0;
 }
 
 static int apply_r_riscv_sub32_rela(struct module *me, u32 *location,
                                     Elf_Addr v)
 {
-        *(u32 *)location -= (*(u32 *)v);
+        *(u32 *)location -= (u32)v;
         return 0;
 }
 
@@ -347,7 +347,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
                         unsigned int j;
 
                         for (j = 0; j < sechdrs[relsec].sh_size / sizeof(*rel); j++) {
-                                u64 hi20_loc =
+                                unsigned long hi20_loc =
                                         sechdrs[sechdrs[relsec].sh_info].sh_addr
                                         + rel[j].r_offset;
                                 u32 hi20_type = ELF_RISCV_R_TYPE(rel[j].r_info);
@@ -360,12 +360,12 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
                                         Elf_Sym *hi20_sym =
                                                 (Elf_Sym *)sechdrs[symindex].sh_addr
                                                 + ELF_RISCV_R_SYM(rel[j].r_info);
-                                        u64 hi20_sym_val =
+                                        unsigned long hi20_sym_val =
                                                 hi20_sym->st_value
                                                 + rel[j].r_addend;
 
                                         /* Calculate lo12 */
-                                        u64 offset = hi20_sym_val - hi20_loc;
+                                        size_t offset = hi20_sym_val - hi20_loc;
                                         if (IS_ENABLED(CONFIG_MODULE_SECTIONS)
                                             && hi20_type == R_RISCV_GOT_HI20) {
                                                 offset = module_emit_got_entry(
diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c
index ba3e80712797..9f82a7e34c64 100644
--- a/arch/riscv/kernel/ptrace.c
+++ b/arch/riscv/kernel/ptrace.c
@@ -50,7 +50,7 @@ static int riscv_gpr_set(struct task_struct *target,
         struct pt_regs *regs;
 
         regs = task_pt_regs(target);
-        ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &regs, 0, -1);
+        ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, regs, 0, -1);
         return ret;
 }
 
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index ee44a48faf79..f0d2070866d4 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -220,8 +220,3 @@ void __init setup_arch(char **cmdline_p)
         riscv_fill_hwcap();
 }
 
-static int __init riscv_device_init(void)
-{
-        return of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-subsys_initcall_sync(riscv_device_init);
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index c77df8142be2..58a522f9bcc3 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -28,7 +28,9 @@ static void __init zone_sizes_init(void)
 {
         unsigned long max_zone_pfns[MAX_NR_ZONES] = { 0, };
 
+#ifdef CONFIG_ZONE_DMA32
         max_zone_pfns[ZONE_DMA32] = PFN_DOWN(min(4UL * SZ_1G, max_low_pfn));
+#endif
         max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
 
         free_area_init_nodes(max_zone_pfns);
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index baed39772c84..e44bb2b2873e 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -160,6 +160,7 @@ config S390
         select HAVE_OPROFILE
         select HAVE_PERF_EVENTS
         select HAVE_REGS_AND_STACK_ACCESS_API
+        select HAVE_RSEQ
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_VIRT_CPU_ACCOUNTING
         select MODULES_USE_ELF_RELA
diff --git a/arch/s390/kernel/compat_wrapper.c b/arch/s390/kernel/compat_wrapper.c
index 607c5e9fba3d..2ce28bf0c5ec 100644
--- a/arch/s390/kernel/compat_wrapper.c
+++ b/arch/s390/kernel/compat_wrapper.c
@@ -183,3 +183,4 @@ COMPAT_SYSCALL_WRAP2(s390_guarded_storage, int, command, struct gs_cb *, gs_cb);
 COMPAT_SYSCALL_WRAP5(statx, int, dfd, const char __user *, path, unsigned, flags, unsigned, mask, struct statx __user *, buffer);
 COMPAT_SYSCALL_WRAP4(s390_sthyi, unsigned long, code, void __user *, info, u64 __user *, rc, unsigned long, flags);
 COMPAT_SYSCALL_WRAP5(kexec_file_load, int, kernel_fd, int, initrd_fd, unsigned long, cmdline_len, const char __user *, cmdline_ptr, unsigned long, flags)
+COMPAT_SYSCALL_WRAP4(rseq, struct rseq __user *, rseq, u32, rseq_len, int, flags, u32, sig)
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index f03402efab4b..150130c897c3 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -357,6 +357,10 @@ ENTRY(system_call)
         stg     %r2,__PT_R2(%r11)               # store return value
 
 .Lsysc_return:
+#ifdef CONFIG_DEBUG_RSEQ
+        lgr     %r2,%r11
+        brasl   %r14,rseq_syscall
+#endif
         LOCKDEP_SYS_EXIT
 .Lsysc_tif:
         TSTMSK  __PT_FLAGS(%r11),_PIF_WORK
@@ -1265,7 +1269,7 @@ cleanup_critical:
         jl      0f
         clg     %r9,BASED(.Lcleanup_table+104)  # .Lload_fpu_regs_end
         jl      .Lcleanup_load_fpu_regs
-0:      BR_EX   %r14
+0:      BR_EX   %r14,%r11
 
         .align  8
 .Lcleanup_table:
@@ -1301,7 +1305,7 @@ cleanup_critical:
         ni      __SIE_PROG0C+3(%r9),0xfe        # no longer in SIE
         lctlg   %c1,%c1,__LC_USER_ASCE          # load primary asce
         larl    %r9,sie_exit                    # skip forward to sie_exit
-        BR_EX   %r14
+        BR_EX   %r14,%r11
 #endif
 
 .Lcleanup_system_call:
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index 2d2960ab3e10..22f08245aa5d 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -498,7 +498,7 @@ void do_signal(struct pt_regs *regs)
                 }
                 /* No longer in a system call */
                 clear_pt_regs_flag(regs, PIF_SYSCALL);
-
+                rseq_signal_deliver(&ksig, regs);
                 if (is_compat_task())
                         handle_signal32(&ksig, oldset, regs);
                 else
@@ -537,4 +537,5 @@ void do_notify_resume(struct pt_regs *regs)
 {
         clear_thread_flag(TIF_NOTIFY_RESUME);
         tracehook_notify_resume(regs);
+        rseq_handle_notify_resume(NULL, regs);
 }
diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl
index 8b210ead7956..022fc099b628 100644
--- a/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@ -389,3 +389,5 @@
 379  common     statx                   sys_statx                       compat_sys_statx
 380  common     s390_sthyi              sys_s390_sthyi                  compat_sys_s390_sthyi
 381  common     kexec_file_load         sys_kexec_file_load             compat_sys_kexec_file_load
+382  common     io_pgetevents           sys_io_pgetevents               compat_sys_io_pgetevents
+383  common     rseq                    sys_rseq                        compat_sys_rseq
diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
index 84bd6329a88d..e3bd5627afef 100644
--- a/arch/s390/mm/pgalloc.c
+++ b/arch/s390/mm/pgalloc.c
@@ -252,6 +252,8 @@ void page_table_free(struct mm_struct *mm, unsigned long *table)
                 spin_unlock_bh(&mm->context.lock);
                 if (mask != 0)
                         return;
+        } else {
+                atomic_xor_bits(&page->_refcount, 3U << 24);
         }
 
         pgtable_page_dtor(page);
@@ -304,6 +306,8 @@ static void __tlb_remove_table(void *_table)
                         break;
                 /* fallthrough */
         case 3:         /* 4K page table with pgstes */
+                if (mask & 3)
+                        atomic_xor_bits(&page->_refcount, 3 << 24);
                 pgtable_page_dtor(page);
                 __free_page(page);
                 break;
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index d2db8acb1a55..5f0234ec8038 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -1286,6 +1286,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
                 goto free_addrs;
         }
         if (bpf_jit_prog(&jit, fp)) {
+                bpf_jit_binary_free(header);
                 fp = orig_fp;
                 goto free_addrs;
         }
diff --git a/arch/x86/crypto/aegis128-aesni-asm.S b/arch/x86/crypto/aegis128-aesni-asm.S
index 9254e0b6cc06..717bf0776421 100644
--- a/arch/x86/crypto/aegis128-aesni-asm.S
+++ b/arch/x86/crypto/aegis128-aesni-asm.S
@@ -535,6 +535,7 @@ ENTRY(crypto_aegis128_aesni_enc_tail)
         movdqu STATE3, 0x40(STATEP)
 
         FRAME_END
+        ret
 ENDPROC(crypto_aegis128_aesni_enc_tail)
 
 .macro decrypt_block a s0 s1 s2 s3 s4 i
diff --git a/arch/x86/crypto/aegis128l-aesni-asm.S b/arch/x86/crypto/aegis128l-aesni-asm.S
index 9263c344f2c7..4eda2b8db9e1 100644
--- a/arch/x86/crypto/aegis128l-aesni-asm.S
+++ b/arch/x86/crypto/aegis128l-aesni-asm.S
@@ -645,6 +645,7 @@ ENTRY(crypto_aegis128l_aesni_enc_tail)
         state_store0
 
         FRAME_END
+        ret
 ENDPROC(crypto_aegis128l_aesni_enc_tail)
 
 /*
diff --git a/arch/x86/crypto/aegis256-aesni-asm.S b/arch/x86/crypto/aegis256-aesni-asm.S
index 1d977d515bf9..32aae8397268 100644
--- a/arch/x86/crypto/aegis256-aesni-asm.S
+++ b/arch/x86/crypto/aegis256-aesni-asm.S
@@ -543,6 +543,7 @@ ENTRY(crypto_aegis256_aesni_enc_tail)
         state_store0
 
         FRAME_END
+        ret
 ENDPROC(crypto_aegis256_aesni_enc_tail)
 
 /*
diff --git a/arch/x86/crypto/morus1280-avx2-asm.S b/arch/x86/crypto/morus1280-avx2-asm.S
index 37d422e77931..07653d4582a6 100644
--- a/arch/x86/crypto/morus1280-avx2-asm.S
+++ b/arch/x86/crypto/morus1280-avx2-asm.S
@@ -453,6 +453,7 @@ ENTRY(crypto_morus1280_avx2_enc_tail)
         vmovdqu STATE4, (4 * 32)(%rdi)
 
         FRAME_END
+        ret
 ENDPROC(crypto_morus1280_avx2_enc_tail)
 
 /*
diff --git a/arch/x86/crypto/morus1280-sse2-asm.S b/arch/x86/crypto/morus1280-sse2-asm.S
index 1fe637c7be9d..bd1aa1b60869 100644
--- a/arch/x86/crypto/morus1280-sse2-asm.S
+++ b/arch/x86/crypto/morus1280-sse2-asm.S
@@ -652,6 +652,7 @@ ENTRY(crypto_morus1280_sse2_enc_tail)
         movdqu STATE4_HI, (9 * 16)(%rdi)
 
         FRAME_END
+        ret
 ENDPROC(crypto_morus1280_sse2_enc_tail)
 
 /*
diff --git a/arch/x86/crypto/morus640-sse2-asm.S b/arch/x86/crypto/morus640-sse2-asm.S
index 71c72a0a0862..efa02816d921 100644
--- a/arch/x86/crypto/morus640-sse2-asm.S
+++ b/arch/x86/crypto/morus640-sse2-asm.S
@@ -437,6 +437,7 @@ ENTRY(crypto_morus640_sse2_enc_tail)
         movdqu STATE4, (4 * 16)(%rdi)
 
         FRAME_END
+        ret
 ENDPROC(crypto_morus640_sse2_enc_tail)
 
 /*
diff --git a/arch/x86/hyperv/hv_apic.c b/arch/x86/hyperv/hv_apic.c
index f68855499391..402338365651 100644
--- a/arch/x86/hyperv/hv_apic.c
+++ b/arch/x86/hyperv/hv_apic.c
@@ -114,6 +114,8 @@ static bool __send_ipi_mask_ex(const struct cpumask *mask, int vector)
                 ipi_arg->vp_set.format = HV_GENERIC_SET_SPARSE_4K;
                 nr_bank = cpumask_to_vpset(&(ipi_arg->vp_set), mask);
         }
+        if (nr_bank < 0)
+                goto ipi_mask_ex_done;
         if (!nr_bank)
                 ipi_arg->vp_set.format = HV_GENERIC_SET_ALL;
 
@@ -158,6 +160,9 @@ static bool __send_ipi_mask(const struct cpumask *mask, int vector)
 
         for_each_cpu(cur_cpu, mask) {
                 vcpu = hv_cpu_number_to_vp_number(cur_cpu);
+                if (vcpu == VP_INVAL)
+                        goto ipi_mask_done;
+
                 /*
                  * This particular version of the IPI hypercall can
                  * only target upto 64 CPUs.
diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index 4c431e1c1eff..1ff420217298 100644
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -265,7 +265,7 @@ void __init hyperv_init(void)
 {
         u64 guest_id, required_msrs;
         union hv_x64_msr_hypercall_contents hypercall_msr;
-        int cpuhp;
+        int cpuhp, i;
 
         if (x86_hyper_type != X86_HYPER_MS_HYPERV)
                 return;
@@ -293,6 +293,9 @@ void __init hyperv_init(void)
         if (!hv_vp_index)
                 return;
 
+        for (i = 0; i < num_possible_cpus(); i++)
+                hv_vp_index[i] = VP_INVAL;
+
         hv_vp_assist_page = kcalloc(num_possible_cpus(),
                                     sizeof(*hv_vp_assist_page), GFP_KERNEL);
         if (!hv_vp_assist_page) {
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index 219faaec51df..990770f9e76b 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -46,6 +46,65 @@
 #define _ASM_SI         __ASM_REG(si)
 #define _ASM_DI         __ASM_REG(di)
 
+#ifndef __x86_64__
+/* 32 bit */
+
+#define _ASM_ARG1       _ASM_AX
+#define _ASM_ARG2       _ASM_DX
+#define _ASM_ARG3       _ASM_CX
+
+#define _ASM_ARG1L      eax
+#define _ASM_ARG2L      edx
+#define _ASM_ARG3L      ecx
+
+#define _ASM_ARG1W      ax
+#define _ASM_ARG2W      dx
+#define _ASM_ARG3W      cx
+
+#define _ASM_ARG1B      al
+#define _ASM_ARG2B      dl
+#define _ASM_ARG3B      cl
+
+#else
+/* 64 bit */
+
+#define _ASM_ARG1       _ASM_DI
+#define _ASM_ARG2       _ASM_SI
+#define _ASM_ARG3       _ASM_DX
+#define _ASM_ARG4       _ASM_CX
+#define _ASM_ARG5       r8
+#define _ASM_ARG6       r9
+
+#define _ASM_ARG1Q      rdi
+#define _ASM_ARG2Q      rsi
+#define _ASM_ARG3Q      rdx
+#define _ASM_ARG4Q      rcx
+#define _ASM_ARG5Q      r8
+#define _ASM_ARG6Q      r9
+
+#define _ASM_ARG1L      edi
+#define _ASM_ARG2L      esi
+#define _ASM_ARG3L      edx
+#define _ASM_ARG4L      ecx
+#define _ASM_ARG5L      r8d
+#define _ASM_ARG6L      r9d
+
+#define _ASM_ARG1W      di
+#define _ASM_ARG2W      si
+#define _ASM_ARG3W      dx
+#define _ASM_ARG4W      cx
+#define _ASM_ARG5W      r8w
+#define _ASM_ARG6W      r9w
+
+#define _ASM_ARG1B      dil
+#define _ASM_ARG2B      sil
+#define _ASM_ARG3B      dl
+#define _ASM_ARG4B      cl
+#define _ASM_ARG5B      r8b
+#define _ASM_ARG6B      r9b
+
+#endif
+
 /*
  * Macros to generate condition code outputs from inline assembly,
  * The output operand must be type "bool".
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index 89f08955fff7..c4fc17220df9 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -13,7 +13,7 @@
  * Interrupt control:
  */
 
-static inline unsigned long native_save_fl(void)
+extern inline unsigned long native_save_fl(void)
 {
         unsigned long flags;
 
diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index 3cd14311edfa..5a7375ed5f7c 100644
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -9,6 +9,8 @@
 #include <asm/hyperv-tlfs.h>
 #include <asm/nospec-branch.h>
 
+#define VP_INVAL        U32_MAX
+
 struct ms_hyperv_info {
         u32 features;
         u32 misc_features;
@@ -20,7 +22,6 @@ struct ms_hyperv_info {
 
 extern struct ms_hyperv_info ms_hyperv;
 
-
 /*
  * Generate the guest ID.
  */
@@ -281,6 +282,8 @@ static inline int cpumask_to_vpset(struct hv_vpset *vpset,
          */
         for_each_cpu(cpu, cpus) {
                 vcpu = hv_cpu_number_to_vp_number(cpu);
+                if (vcpu == VP_INVAL)
+                        return -1;
                 vcpu_bank = vcpu / 64;
                 vcpu_offset = vcpu % 64;
                 __set_bit(vcpu_offset, (unsigned long *)
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 02d6f5cf4e70..8824d01c0c35 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -61,6 +61,7 @@ obj-y			+= alternative.o i8253.o hw_breakpoint.o
 obj-y                   += tsc.o tsc_msr.o io_delay.o rtc.o
 obj-y                   += pci-iommu_table.o
 obj-y                   += resource.o
+obj-y                   += irqflags.o
 
 obj-y                           += process.o
 obj-y                           += fpu/
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 082d7875cef8..38915fbfae73 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -543,7 +543,9 @@ static void bsp_init_amd(struct cpuinfo_x86 *c)
                 nodes_per_socket = ((value >> 3) & 7) + 1;
         }
 
-        if (c->x86 >= 0x15 && c->x86 <= 0x17) {
+        if (!boot_cpu_has(X86_FEATURE_AMD_SSBD) &&
+            !boot_cpu_has(X86_FEATURE_VIRT_SSBD) &&
+            c->x86 >= 0x15 && c->x86 <= 0x17) {
                 unsigned int bit;
 
                 switch (c->x86) {
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 404df26b7de8..5c0ea39311fe 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -155,7 +155,8 @@ x86_virt_spec_ctrl(u64 guest_spec_ctrl, u64 guest_virt_spec_ctrl, bool setguest)
                 guestval |= guest_spec_ctrl & x86_spec_ctrl_mask;
 
                 /* SSBD controlled in MSR_SPEC_CTRL */
-                if (static_cpu_has(X86_FEATURE_SPEC_CTRL_SSBD))
+                if (static_cpu_has(X86_FEATURE_SPEC_CTRL_SSBD) ||
+                    static_cpu_has(X86_FEATURE_AMD_SSBD))
                         hostval |= ssbd_tif_to_spec_ctrl(ti->flags);
 
                 if (hostval != guestval) {
@@ -533,9 +534,10 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void)
                  * Intel uses the SPEC CTRL MSR Bit(2) for this, while AMD may
                  * use a completely different MSR and bit dependent on family.
                  */
-                if (!static_cpu_has(X86_FEATURE_MSR_SPEC_CTRL))
+                if (!static_cpu_has(X86_FEATURE_SPEC_CTRL_SSBD) &&
+                    !static_cpu_has(X86_FEATURE_AMD_SSBD)) {
                         x86_amd_ssb_disable();
-                else {
+                } else {
                         x86_spec_ctrl_base |= SPEC_CTRL_SSBD;
                         x86_spec_ctrl_mask |= SPEC_CTRL_SSBD;
                         wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base);
diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
index 4021d3859499..40eee6cc4124 100644
--- a/arch/x86/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
@@ -106,7 +106,8 @@ mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos)
 
         memset(line, 0, LINE_SIZE);
 
-        length = strncpy_from_user(line, buf, LINE_SIZE - 1);
+        len = min_t(size_t, len, LINE_SIZE - 1);
+        length = strncpy_from_user(line, buf, len);
         if (length < 0)
                 return length;
 
diff --git a/arch/x86/kernel/irqflags.S b/arch/x86/kernel/irqflags.S
new file mode 100644
index 000000000000..ddeeaac8adda
--- /dev/null
+++ b/arch/x86/kernel/irqflags.S
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#include <asm/asm.h>
+#include <asm/export.h>
+#include <linux/linkage.h>
+
+/*
+ * unsigned long native_save_fl(void)
+ */
+ENTRY(native_save_fl)
+        pushf
+        pop %_ASM_AX
+        ret
+ENDPROC(native_save_fl)
+EXPORT_SYMBOL(native_save_fl)
+
+/*
+ * void native_restore_fl(unsigned long flags)
+ * %eax/%rdi: flags
+ */
+ENTRY(native_restore_fl)
+        push %_ASM_ARG1
+        popf
+        ret
+ENDPROC(native_restore_fl)
+EXPORT_SYMBOL(native_restore_fl)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index c2f7d1d2a5c3..db9656e13ea0 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -221,6 +221,11 @@ static void notrace start_secondary(void *unused)
 #ifdef CONFIG_X86_32
         /* switch away from the initial page table */
         load_cr3(swapper_pg_dir);
+        /*
+         * Initialize the CR4 shadow before doing anything that could
+         * try to read it.
+         */
+        cr4_init_shadow();
         __flush_tlb_all();
 #endif
         load_current_idt();
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index fc0c2e2328cd..fe9d46d81750 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -51,16 +51,23 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state)
                 return_ACPI_STATUS(status);
         }
 
-        /*
-         * 1) Disable all GPEs
-         * 2) Enable all wakeup GPEs
-         */
+        /* Disable all GPEs */
         status = acpi_hw_disable_all_gpes();
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
+        /*
+         * If the target sleep state is S5, clear all GPEs and fixed events too
+         */
+        if (sleep_state == ACPI_STATE_S5) {
+                status = acpi_hw_clear_acpi_status();
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }
         acpi_gbl_system_awake_and_running = FALSE;
 
+         /* Enable all wakeup GPEs */
         status = acpi_hw_enable_all_wakeup_gpes();
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
diff --git a/drivers/acpi/acpica/uterror.c b/drivers/acpi/acpica/uterror.c
index 5a64ddaed8a3..e47430272692 100644
--- a/drivers/acpi/acpica/uterror.c
+++ b/drivers/acpi/acpica/uterror.c
@@ -182,19 +182,19 @@ acpi_ut_prefixed_namespace_error(const char *module_name,
         switch (lookup_status) {
         case AE_ALREADY_EXISTS:
 
-                acpi_os_printf("\n" ACPI_MSG_BIOS_ERROR);
+                acpi_os_printf(ACPI_MSG_BIOS_ERROR);
                 message = "Failure creating";
                 break;
 
         case AE_NOT_FOUND:
 
-                acpi_os_printf("\n" ACPI_MSG_BIOS_ERROR);
+                acpi_os_printf(ACPI_MSG_BIOS_ERROR);
                 message = "Could not resolve";
                 break;
 
         default:
 
-                acpi_os_printf("\n" ACPI_MSG_ERROR);
+                acpi_os_printf(ACPI_MSG_ERROR);
                 message = "Failure resolving";
                 break;
         }
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index b0113a5802a3..d79ad844c78f 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -717,10 +717,11 @@ void battery_hook_register(struct acpi_battery_hook *hook)
                          */
                         pr_err("extension failed to load: %s", hook->name);
                         __battery_hook_unregister(hook, 0);
-                        return;
+                        goto end;
                 }
         }
         pr_info("new extension: %s\n", hook->name);
+end:
         mutex_unlock(&hook_mutex);
 }
 EXPORT_SYMBOL_GPL(battery_hook_register);
@@ -732,7 +733,7 @@ EXPORT_SYMBOL_GPL(battery_hook_register);
 */
 static void battery_hook_add_battery(struct acpi_battery *battery)
 {
-        struct acpi_battery_hook *hook_node;
+        struct acpi_battery_hook *hook_node, *tmp;
 
         mutex_lock(&hook_mutex);
         INIT_LIST_HEAD(&battery->list);
@@ -744,15 +745,15 @@ static void battery_hook_add_battery(struct acpi_battery *battery)
          * when a battery gets hotplugged or initialized
          * during the battery module initialization.
          */
-        list_for_each_entry(hook_node, &battery_hook_list, list) {
+        list_for_each_entry_safe(hook_node, tmp, &battery_hook_list, list) {
                 if (hook_node->add_battery(battery->bat)) {
                         /*
                          * The notification of the extensions has failed, to
                          * prevent further errors we will unload the extension.
                          */
-                        __battery_hook_unregister(hook_node, 0);
                         pr_err("error in extension, unloading: %s",
                                         hook_node->name);
+                        __battery_hook_unregister(hook_node, 0);
                 }
         }
         mutex_unlock(&hook_mutex);
diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c
index e5ea1974d1e3..d1e26cb599bf 100644
--- a/drivers/acpi/pptt.c
+++ b/drivers/acpi/pptt.c
@@ -481,8 +481,14 @@ static int topology_get_acpi_cpu_tag(struct acpi_table_header *table,
         if (cpu_node) {
                 cpu_node = acpi_find_processor_package_id(table, cpu_node,
                                                           level, flag);
-                /* Only the first level has a guaranteed id */
-                if (level == 0)
+                /*
+                 * As per specification if the processor structure represents
+                 * an actual processor, then ACPI processor ID must be valid.
+                 * For processor containers ACPI_PPTT_ACPI_PROCESSOR_ID_VALID
+                 * should be set if the UID is valid
+                 */
+                if (level == 0 ||
+                    cpu_node->flags & ACPI_PPTT_ACPI_PROCESSOR_ID_VALID)
                         return cpu_node->acpi_processor_id;
                 return ACPI_PTR_DIFF(cpu_node, table);
         }
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index ff81a576347e..82532c299bb5 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -1618,7 +1618,7 @@ static int rx_init(struct atm_dev *dev)
         skb_queue_head_init(&iadev->rx_dma_q);  
         iadev->rx_free_desc_qhead = NULL;   
 
-        iadev->rx_open = kcalloc(4, iadev->num_vc, GFP_KERNEL);
+        iadev->rx_open = kcalloc(iadev->num_vc, sizeof(void *), GFP_KERNEL);
         if (!iadev->rx_open) {
                 printk(KERN_ERR DEV_LABEL "itf %d couldn't get free page\n",
                 dev->number);  
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index a8d2eb0ceb8d..2c288d1f42bb 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -1483,6 +1483,8 @@ static int zatm_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
                                         return -EFAULT;
                                 if (pool < 0 || pool > ZATM_LAST_POOL)
                                         return -EINVAL;
+                                pool = array_index_nospec(pool,
+                                                          ZATM_LAST_POOL + 1);
                                 if (copy_from_user(&info,
                                     &((struct zatm_pool_req __user *) arg)->info,
                                     sizeof(info))) return -EFAULT;
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index c298de8a8308..9e8484189034 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2235,7 +2235,7 @@ static void genpd_dev_pm_sync(struct device *dev)
 }
 
 static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np,
-                                 unsigned int index)
+                                 unsigned int index, bool power_on)
 {
         struct of_phandle_args pd_args;
         struct generic_pm_domain *pd;
@@ -2271,9 +2271,11 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np,
         dev->pm_domain->detach = genpd_dev_pm_detach;
         dev->pm_domain->sync = genpd_dev_pm_sync;
 
-        genpd_lock(pd);
-        ret = genpd_power_on(pd, 0);
-        genpd_unlock(pd);
+        if (power_on) {
+                genpd_lock(pd);
+                ret = genpd_power_on(pd, 0);
+                genpd_unlock(pd);
+        }
 
         if (ret)
                 genpd_remove_device(pd, dev);
@@ -2307,7 +2309,7 @@ int genpd_dev_pm_attach(struct device *dev)
                                        "#power-domain-cells") != 1)
                 return 0;
 
-        return __genpd_dev_pm_attach(dev, dev->of_node, 0);
+        return __genpd_dev_pm_attach(dev, dev->of_node, 0, true);
 }
 EXPORT_SYMBOL_GPL(genpd_dev_pm_attach);
 
@@ -2359,14 +2361,14 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev,
         }
 
         /* Try to attach the device to the PM domain at the specified index. */
-        ret = __genpd_dev_pm_attach(genpd_dev, dev->of_node, index);
+        ret = __genpd_dev_pm_attach(genpd_dev, dev->of_node, index, false);
         if (ret < 1) {
                 device_unregister(genpd_dev);
                 return ret ? ERR_PTR(ret) : NULL;
         }
 
-        pm_runtime_set_active(genpd_dev);
         pm_runtime_enable(genpd_dev);
+        genpd_queue_power_off_work(dev_to_genpd(genpd_dev));
 
         return genpd_dev;
 }
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 1476cb3439f4..5e793dd7adfb 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -282,8 +282,8 @@ void drbd_request_endio(struct bio *bio)
                 what = COMPLETED_OK;
         }
 
-        bio_put(req->private_bio);
         req->private_bio = ERR_PTR(blk_status_to_errno(bio->bi_status));
+        bio_put(bio);
 
         /* not req_mod(), we need irqsave here! */
         spin_lock_irqsave(&device->resource->req_lock, flags);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index d6b6f434fd4b..4cb1d1be3cfb 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1613,6 +1613,7 @@ static int lo_compat_ioctl(struct block_device *bdev, fmode_t mode,
                 arg = (unsigned long) compat_ptr(arg);
         case LOOP_SET_FD:
         case LOOP_CHANGE_FD:
+        case LOOP_SET_BLOCK_SIZE:
                 err = lo_ioctl(bdev, mode, cmd, arg);
                 break;
         default:
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 1cc29629d238..80d60f43db56 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -169,9 +169,9 @@ static int sysc_get_clocks(struct sysc *ddata)
         const char *name;
         int nr_fck = 0, nr_ick = 0, i, error = 0;
 
-        ddata->clock_roles = devm_kzalloc(ddata->dev,
-                                          sizeof(*ddata->clock_roles) *
+        ddata->clock_roles = devm_kcalloc(ddata->dev,
                                           SYSC_MAX_CLOCKS,
+                                          sizeof(*ddata->clock_roles),
                                           GFP_KERNEL);
         if (!ddata->clock_roles)
                 return -ENOMEM;
@@ -200,8 +200,8 @@ static int sysc_get_clocks(struct sysc *ddata)
                 return -EINVAL;
         }
 
-        ddata->clocks = devm_kzalloc(ddata->dev,
-                                     sizeof(*ddata->clocks) * ddata->nr_clocks,
+        ddata->clocks = devm_kcalloc(ddata->dev,
+                                     ddata->nr_clocks, sizeof(*ddata->clocks),
                                      GFP_KERNEL);
         if (!ddata->clocks)
                 return -ENOMEM;
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index ad353be871bf..90ec010bffbd 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2088,8 +2088,10 @@ static int try_smi_init(struct smi_info *new_smi)
         return 0;
 
 out_err:
-        ipmi_unregister_smi(new_smi->intf);
-        new_smi->intf = NULL;
+        if (new_smi->intf) {
+                ipmi_unregister_smi(new_smi->intf);
+                new_smi->intf = NULL;
+        }
 
         kfree(init_name);
 
diff --git a/drivers/char/ipmi/kcs_bmc.c b/drivers/char/ipmi/kcs_bmc.c
index fbfc05e3f3d1..bb882ab161fe 100644
--- a/drivers/char/ipmi/kcs_bmc.c
+++ b/drivers/char/ipmi/kcs_bmc.c
@@ -210,34 +210,23 @@ static void kcs_bmc_handle_cmd(struct kcs_bmc *kcs_bmc)
 int kcs_bmc_handle_event(struct kcs_bmc *kcs_bmc)
 {
         unsigned long flags;
-        int ret = 0;
+        int ret = -ENODATA;
         u8 status;
 
         spin_lock_irqsave(&kcs_bmc->lock, flags);
 
-        if (!kcs_bmc->running) {
-                kcs_force_abort(kcs_bmc);
-                ret = -ENODEV;
-                goto out_unlock;
-        }
-
-        status = read_status(kcs_bmc) & (KCS_STATUS_IBF | KCS_STATUS_CMD_DAT);
-
-        switch (status) {
-        case KCS_STATUS_IBF | KCS_STATUS_CMD_DAT:
-                kcs_bmc_handle_cmd(kcs_bmc);
-                break;
-
-        case KCS_STATUS_IBF:
-                kcs_bmc_handle_data(kcs_bmc);
-                break;
+        status = read_status(kcs_bmc);
+        if (status & KCS_STATUS_IBF) {
+                if (!kcs_bmc->running)
+                        kcs_force_abort(kcs_bmc);
+                else if (status & KCS_STATUS_CMD_DAT)
+                        kcs_bmc_handle_cmd(kcs_bmc);
+                else
+                        kcs_bmc_handle_data(kcs_bmc);
 
-        default:
-                ret = -ENODATA;
-                break;
+                ret = 0;
         }
 
-out_unlock:
         spin_unlock_irqrestore(&kcs_bmc->lock, flags);
 
         return ret;
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index ae40cbe770f0..0bb25dd009d1 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -96,7 +96,7 @@ obj-$(CONFIG_ARCH_SPRD)			+= sprd/
 obj-$(CONFIG_ARCH_STI)                  += st/
 obj-$(CONFIG_ARCH_STRATIX10)            += socfpga/
 obj-$(CONFIG_ARCH_SUNXI)                += sunxi/
-obj-$(CONFIG_ARCH_SUNXI)                += sunxi-ng/
+obj-$(CONFIG_SUNXI_CCU)                 += sunxi-ng/
 obj-$(CONFIG_ARCH_TEGRA)                += tegra/
 obj-y                                   += ti/
 obj-$(CONFIG_CLK_UNIPHIER)              += uniphier/
diff --git a/drivers/clk/davinci/da8xx-cfgchip.c b/drivers/clk/davinci/da8xx-cfgchip.c
index aae62a5b8734..d1bbee19ed0f 100644
--- a/drivers/clk/davinci/da8xx-cfgchip.c
+++ b/drivers/clk/davinci/da8xx-cfgchip.c
@@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap)
 
         usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap);
         if (IS_ERR(usb1)) {
-                if (PTR_ERR(usb0) == -EPROBE_DEFER)
+                if (PTR_ERR(usb1) == -EPROBE_DEFER)
                         return -EPROBE_DEFER;
 
                 dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",
diff --git a/drivers/clk/davinci/psc.h b/drivers/clk/davinci/psc.h
index 6a42529d31a9..cc5614567a70 100644
--- a/drivers/clk/davinci/psc.h
+++ b/drivers/clk/davinci/psc.h
@@ -107,7 +107,7 @@ extern const struct davinci_psc_init_data of_da850_psc1_init_data;
 #ifdef CONFIG_ARCH_DAVINCI_DM355
 extern const struct davinci_psc_init_data dm355_psc_init_data;
 #endif
-#ifdef CONFIG_ARCH_DAVINCI_DM356
+#ifdef CONFIG_ARCH_DAVINCI_DM365
 extern const struct davinci_psc_init_data dm365_psc_init_data;
 #endif
 #ifdef CONFIG_ARCH_DAVINCI_DM644x
diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile
index acaa14cfa25c..49454700f2e5 100644
--- a/drivers/clk/sunxi-ng/Makefile
+++ b/drivers/clk/sunxi-ng/Makefile
@@ -1,24 +1,24 @@
 # SPDX-License-Identifier: GPL-2.0
 # Common objects
-lib-$(CONFIG_SUNXI_CCU)         += ccu_common.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_mmc_timing.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_reset.o
+obj-y                           += ccu_common.o
+obj-y                           += ccu_mmc_timing.o
+obj-y                           += ccu_reset.o
 
 # Base clock types
-lib-$(CONFIG_SUNXI_CCU)         += ccu_div.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_frac.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_gate.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_mux.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_mult.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_phase.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_sdm.o
+obj-y                           += ccu_div.o
+obj-y                           += ccu_frac.o
+obj-y                           += ccu_gate.o
+obj-y                           += ccu_mux.o
+obj-y                           += ccu_mult.o
+obj-y                           += ccu_phase.o
+obj-y                           += ccu_sdm.o
 
 # Multi-factor clocks
-lib-$(CONFIG_SUNXI_CCU)         += ccu_nk.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_nkm.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_nkmp.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_nm.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_mp.o
+obj-y                           += ccu_nk.o
+obj-y                           += ccu_nkm.o
+obj-y                           += ccu_nkmp.o
+obj-y                           += ccu_nm.o
+obj-y                           += ccu_mp.o
 
 # SoC support
 obj-$(CONFIG_SUN50I_A64_CCU)    += ccu-sun50i-a64.o
@@ -38,12 +38,3 @@ obj-$(CONFIG_SUN8I_R40_CCU)	+= ccu-sun8i-r40.o
 obj-$(CONFIG_SUN9I_A80_CCU)     += ccu-sun9i-a80.o
 obj-$(CONFIG_SUN9I_A80_CCU)     += ccu-sun9i-a80-de.o
 obj-$(CONFIG_SUN9I_A80_CCU)     += ccu-sun9i-a80-usb.o
-
-# The lib-y file goals is supposed to work only in arch/*/lib or lib/. In our
-# case, we want to use that goal, but even though lib.a will be properly
-# generated, it will not be linked in, eventually resulting in a linker error
-# for missing symbols.
-#
-# We can work around that by explicitly adding lib.a to the obj-y goal. This is
-# an undocumented behaviour, but works well for now.
-obj-$(CONFIG_SUNXI_CCU)         += lib.a
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index fa31cccbe04f..6bfa217ed6d0 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -794,7 +794,7 @@ static struct dma_chan *k3_of_dma_simple_xlate(struct of_phandle_args *dma_spec,
         struct k3_dma_dev *d = ofdma->of_dma_data;
         unsigned int request = dma_spec->args[0];
 
-        if (request > d->dma_requests)
+        if (request >= d->dma_requests)
                 return NULL;
 
         return dma_get_slave_channel(&(d->chans[request].vc.chan));
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index defcdde4d358..de0957fe9668 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -3033,7 +3033,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
         pd->src_addr_widths = PL330_DMA_BUSWIDTHS;
         pd->dst_addr_widths = PL330_DMA_BUSWIDTHS;
         pd->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
-        pd->residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT;
+        pd->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
         pd->max_burst = ((pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP) ?
                          1 : PL330_MAX_BURST);
 
diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
index 9b5ca8691f27..a4a931ddf6f6 100644
--- a/drivers/dma/ti/omap-dma.c
+++ b/drivers/dma/ti/omap-dma.c
@@ -1485,7 +1485,11 @@ static int omap_dma_probe(struct platform_device *pdev)
         od->ddev.src_addr_widths = OMAP_DMA_BUSWIDTHS;
         od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS;
         od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
-        od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
+        if (__dma_omap15xx(od->plat->dma_attr))
+                od->ddev.residue_granularity =
+                                DMA_RESIDUE_GRANULARITY_DESCRIPTOR;
+        else
+                od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
         od->ddev.max_burst = SZ_16M - 1; /* CCEN: 24bit unsigned */
         od->ddev.dev = &pdev->dev;
         INIT_LIST_HEAD(&od->ddev.channels);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index a59c07590cee..7dcbac8af9a7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -190,6 +190,7 @@ struct amdgpu_job;
 struct amdgpu_irq_src;
 struct amdgpu_fpriv;
 struct amdgpu_bo_va_mapping;
+struct amdgpu_atif;
 
 enum amdgpu_cp_irq {
         AMDGPU_CP_IRQ_GFX_EOP = 0,
@@ -1269,43 +1270,6 @@ struct amdgpu_vram_scratch {
 /*
  * ACPI
  */
-struct amdgpu_atif_notification_cfg {
-        bool enabled;
-        int command_code;
-};
-
-struct amdgpu_atif_notifications {
-        bool display_switch;
-        bool expansion_mode_change;
-        bool thermal_state;
-        bool forced_power_state;
-        bool system_power_state;
-        bool display_conf_change;
-        bool px_gfx_switch;
-        bool brightness_change;
-        bool dgpu_display_event;
-};
-
-struct amdgpu_atif_functions {
-        bool system_params;
-        bool sbios_requests;
-        bool select_active_disp;
-        bool lid_state;
-        bool get_tv_standard;
-        bool set_tv_standard;
-        bool get_panel_expansion_mode;
-        bool set_panel_expansion_mode;
-        bool temperature_change;
-        bool graphics_device_types;
-};
-
-struct amdgpu_atif {
-        struct amdgpu_atif_notifications notifications;
-        struct amdgpu_atif_functions functions;
-        struct amdgpu_atif_notification_cfg notification_cfg;
-        struct amdgpu_encoder *encoder_for_bl;
-};
-
 struct amdgpu_atcs_functions {
         bool get_ext_state;
         bool pcie_perf_req;
@@ -1466,7 +1430,7 @@ struct amdgpu_device {
 #if defined(CONFIG_DEBUG_FS)
         struct dentry                   *debugfs_regs[AMDGPU_DEBUGFS_MAX_COMPONENTS];
 #endif
-        struct amdgpu_atif              atif;
+        struct amdgpu_atif              *atif;
         struct amdgpu_atcs              atcs;
         struct mutex                    srbm_mutex;
         /* GRBM index mutex. Protects concurrent access to GRBM index */
@@ -1894,6 +1858,12 @@ static inline bool amdgpu_atpx_dgpu_req_power_for_displays(void) { return false;
 static inline bool amdgpu_has_atpx(void) { return false; }
 #endif
 
+#if defined(CONFIG_VGA_SWITCHEROO) && defined(CONFIG_ACPI)
+void *amdgpu_atpx_get_dhandle(void);
+#else
+static inline void *amdgpu_atpx_get_dhandle(void) { return NULL; }
+#endif
+
 /*
  * KMS
  */
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index 8fa850a070e0..0d8c3fc6eace 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -34,6 +34,45 @@
 #include "amd_acpi.h"
 #include "atom.h"
 
+struct amdgpu_atif_notification_cfg {
+        bool enabled;
+        int command_code;
+};
+
+struct amdgpu_atif_notifications {
+        bool display_switch;
+        bool expansion_mode_change;
+        bool thermal_state;
+        bool forced_power_state;
+        bool system_power_state;
+        bool display_conf_change;
+        bool px_gfx_switch;
+        bool brightness_change;
+        bool dgpu_display_event;
+};
+
+struct amdgpu_atif_functions {
+        bool system_params;
+        bool sbios_requests;
+        bool select_active_disp;
+        bool lid_state;
+        bool get_tv_standard;
+        bool set_tv_standard;
+        bool get_panel_expansion_mode;
+        bool set_panel_expansion_mode;
+        bool temperature_change;
+        bool graphics_device_types;
+};
+
+struct amdgpu_atif {
+        acpi_handle handle;
+
+        struct amdgpu_atif_notifications notifications;
+        struct amdgpu_atif_functions functions;
+        struct amdgpu_atif_notification_cfg notification_cfg;
+        struct amdgpu_encoder *encoder_for_bl;
+};
+
 /* Call the ATIF method
  */
 /**
@@ -46,8 +85,9 @@
  * Executes the requested ATIF function (all asics).
  * Returns a pointer to the acpi output buffer.
  */
-static union acpi_object *amdgpu_atif_call(acpi_handle handle, int function,
-                struct acpi_buffer *params)
+static union acpi_object *amdgpu_atif_call(struct amdgpu_atif *atif,
+                                           int function,
+                                           struct acpi_buffer *params)
 {
         acpi_status status;
         union acpi_object atif_arg_elements[2];
@@ -70,7 +110,8 @@ static union acpi_object *amdgpu_atif_call(acpi_handle handle, int function,
                 atif_arg_elements[1].integer.value = 0;
         }
 
-        status = acpi_evaluate_object(handle, "ATIF", &atif_arg, &buffer);
+        status = acpi_evaluate_object(atif->handle, NULL, &atif_arg,
+                                      &buffer);
 
         /* Fail only if calling the method fails and ATIF is supported */
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
@@ -141,15 +182,14 @@ static void amdgpu_atif_parse_functions(struct amdgpu_atif_functions *f, u32 mas
  * (all asics).
  * returns 0 on success, error on failure.
  */
-static int amdgpu_atif_verify_interface(acpi_handle handle,
-                struct amdgpu_atif *atif)
+static int amdgpu_atif_verify_interface(struct amdgpu_atif *atif)
 {
         union acpi_object *info;
         struct atif_verify_interface output;
         size_t size;
         int err = 0;
 
-        info = amdgpu_atif_call(handle, ATIF_FUNCTION_VERIFY_INTERFACE, NULL);
+        info = amdgpu_atif_call(atif, ATIF_FUNCTION_VERIFY_INTERFACE, NULL);
         if (!info)
                 return -EIO;
 
@@ -176,6 +216,35 @@ out:
         return err;
 }
 
+static acpi_handle amdgpu_atif_probe_handle(acpi_handle dhandle)
+{
+        acpi_handle handle = NULL;
+        char acpi_method_name[255] = { 0 };
+        struct acpi_buffer buffer = { sizeof(acpi_method_name), acpi_method_name };
+        acpi_status status;
+
+        /* For PX/HG systems, ATIF and ATPX are in the iGPU's namespace, on dGPU only
+         * systems, ATIF is in the dGPU's namespace.
+         */
+        status = acpi_get_handle(dhandle, "ATIF", &handle);
+        if (ACPI_SUCCESS(status))
+                goto out;
+
+        if (amdgpu_has_atpx()) {
+                status = acpi_get_handle(amdgpu_atpx_get_dhandle(), "ATIF",
+                                         &handle);
+                if (ACPI_SUCCESS(status))
+                        goto out;
+        }
+
+        DRM_DEBUG_DRIVER("No ATIF handle found\n");
+        return NULL;
+out:
+        acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
+        DRM_DEBUG_DRIVER("Found ATIF handle %s\n", acpi_method_name);
+        return handle;
+}
+
 /**
  * amdgpu_atif_get_notification_params - determine notify configuration
  *
@@ -188,15 +257,16 @@ out:
  * where n is specified in the result if a notifier is used.
  * Returns 0 on success, error on failure.
  */
-static int amdgpu_atif_get_notification_params(acpi_handle handle,
-                struct amdgpu_atif_notification_cfg *n)
+static int amdgpu_atif_get_notification_params(struct amdgpu_atif *atif)
 {
         union acpi_object *info;
+        struct amdgpu_atif_notification_cfg *n = &atif->notification_cfg;
         struct atif_system_params params;
         size_t size;
         int err = 0;
 
-        info = amdgpu_atif_call(handle, ATIF_FUNCTION_GET_SYSTEM_PARAMETERS, NULL);
+        info = amdgpu_atif_call(atif, ATIF_FUNCTION_GET_SYSTEM_PARAMETERS,
+                                NULL);
         if (!info) {
                 err = -EIO;
                 goto out;
@@ -250,14 +320,15 @@ out:
  * (all asics).
  * Returns 0 on success, error on failure.
  */
-static int amdgpu_atif_get_sbios_requests(acpi_handle handle,
-                struct atif_sbios_requests *req)
+static int amdgpu_atif_get_sbios_requests(struct amdgpu_atif *atif,
+                                          struct atif_sbios_requests *req)
 {
         union acpi_object *info;
         size_t size;
         int count = 0;
 
-        info = amdgpu_atif_call(handle, ATIF_FUNCTION_GET_SYSTEM_BIOS_REQUESTS, NULL);
+        info = amdgpu_atif_call(atif, ATIF_FUNCTION_GET_SYSTEM_BIOS_REQUESTS,
+                                NULL);
         if (!info)
                 return -EIO;
 
@@ -290,11 +361,10 @@ out:
  * Returns NOTIFY code
  */
 static int amdgpu_atif_handler(struct amdgpu_device *adev,
-                        struct acpi_bus_event *event)
+                               struct acpi_bus_event *event)
 {
-        struct amdgpu_atif *atif = &adev->atif;
+        struct amdgpu_atif *atif = adev->atif;
         struct atif_sbios_requests req;
-        acpi_handle handle;
         int count;
 
         DRM_DEBUG_DRIVER("event, device_class = %s, type = %#x\n",
@@ -303,14 +373,14 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev,
         if (strcmp(event->device_class, ACPI_VIDEO_CLASS) != 0)
                 return NOTIFY_DONE;
 
-        if (!atif->notification_cfg.enabled ||
+        if (!atif ||
+            !atif->notification_cfg.enabled ||
             event->type != atif->notification_cfg.command_code)
                 /* Not our event */
                 return NOTIFY_DONE;
 
         /* Check pending SBIOS requests */
-        handle = ACPI_HANDLE(&adev->pdev->dev);
-        count = amdgpu_atif_get_sbios_requests(handle, &req);
+        count = amdgpu_atif_get_sbios_requests(atif, &req);
 
         if (count <= 0)
                 return NOTIFY_DONE;
@@ -641,8 +711,8 @@ static int amdgpu_acpi_event(struct notifier_block *nb,
  */
 int amdgpu_acpi_init(struct amdgpu_device *adev)
 {
-        acpi_handle handle;
-        struct amdgpu_atif *atif = &adev->atif;
+        acpi_handle handle, atif_handle;
+        struct amdgpu_atif *atif;
         struct amdgpu_atcs *atcs = &adev->atcs;
         int ret;
 
@@ -658,12 +728,26 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)
                 DRM_DEBUG_DRIVER("Call to ATCS verify_interface failed: %d\n", ret);
         }
 
+        /* Probe for ATIF, and initialize it if found */
+        atif_handle = amdgpu_atif_probe_handle(handle);
+        if (!atif_handle)
+                goto out;
+
+        atif = kzalloc(sizeof(*atif), GFP_KERNEL);
+        if (!atif) {
+                DRM_WARN("Not enough memory to initialize ATIF\n");
+                goto out;
+        }
+        atif->handle = atif_handle;
+
         /* Call the ATIF method */
-        ret = amdgpu_atif_verify_interface(handle, atif);
+        ret = amdgpu_atif_verify_interface(atif);
         if (ret) {
                 DRM_DEBUG_DRIVER("Call to ATIF verify_interface failed: %d\n", ret);
+                kfree(atif);
                 goto out;
         }
+        adev->atif = atif;
 
         if (atif->notifications.brightness_change) {
                 struct drm_encoder *tmp;
@@ -693,8 +777,7 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)
         }
 
         if (atif->functions.system_params) {
-                ret = amdgpu_atif_get_notification_params(handle,
-                                &atif->notification_cfg);
+                ret = amdgpu_atif_get_notification_params(atif);
                 if (ret) {
                         DRM_DEBUG_DRIVER("Call to GET_SYSTEM_PARAMS failed: %d\n",
                                         ret);
@@ -720,4 +803,6 @@ out:
 void amdgpu_acpi_fini(struct amdgpu_device *adev)
 {
         unregister_acpi_notifier(&adev->acpi_nb);
+        if (adev->atif)
+                kfree(adev->atif);
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
index daa06e7c5bb7..9ab89371d9e8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
@@ -90,6 +90,12 @@ bool amdgpu_atpx_dgpu_req_power_for_displays(void) {
         return amdgpu_atpx_priv.atpx.dgpu_req_power_for_displays;
 }
 
+#if defined(CONFIG_ACPI)
+void *amdgpu_atpx_get_dhandle(void) {
+        return amdgpu_atpx_priv.dhandle;
+}
+#endif
+
 /**
  * amdgpu_atpx_call - call an ATPX method
  *
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index f70eeed9ed76..7aaa263ad8c7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -231,6 +231,12 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         if (ib->flags & AMDGPU_IB_FLAG_TC_WB_NOT_INVALIDATE)
                 fence_flags |= AMDGPU_FENCE_FLAG_TC_WB_ONLY;
 
+        /* wrap the last IB with fence */
+        if (job && job->uf_addr) {
+                amdgpu_ring_emit_fence(ring, job->uf_addr, job->uf_sequence,
+                                       fence_flags | AMDGPU_FENCE_FLAG_64BIT);
+        }
+
         r = amdgpu_fence_emit(ring, f, fence_flags);
         if (r) {
                 dev_err(adev->dev, "failed to emit fence (%d)\n", r);
@@ -243,12 +249,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         if (ring->funcs->insert_end)
                 ring->funcs->insert_end(ring);
 
-        /* wrap the last IB with fence */
-        if (job && job->uf_addr) {
-                amdgpu_ring_emit_fence(ring, job->uf_addr, job->uf_sequence,
-                                       fence_flags | AMDGPU_FENCE_FLAG_64BIT);
-        }
-
         if (patch_offset != ~0 && ring->funcs->patch_cond_exec)
                 amdgpu_ring_patch_cond_exec(ring, patch_offset);
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index b455da487782..fc818b4d849c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -1882,7 +1882,7 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)
                 if (!amdgpu_device_has_dc_support(adev)) {
                         mutex_lock(&adev->pm.mutex);
                         amdgpu_dpm_get_active_displays(adev);
-                        adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtcs;
+                        adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtc_count;
                         adev->pm.pm_display_cfg.vrefresh = amdgpu_dpm_get_vrefresh(adev);
                         adev->pm.pm_display_cfg.min_vblank_time = amdgpu_dpm_get_vblank_time(adev);
                         /* we have issues with mclk switching with refresh rates over 120 hz on the non-DC code. */
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
index 0999c843f623..a71b97519cc0 100644
--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
@@ -900,7 +900,7 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_phys_funcs = {
         .emit_frame_size =
                 4 + /* vce_v3_0_emit_pipeline_sync */
                 6, /* amdgpu_vce_ring_emit_fence x1 no user fence */
-        .emit_ib_size = 5, /* vce_v3_0_ring_emit_ib */
+        .emit_ib_size = 4, /* amdgpu_vce_ring_emit_ib */
         .emit_ib = amdgpu_vce_ring_emit_ib,
         .emit_fence = amdgpu_vce_ring_emit_fence,
         .test_ring = amdgpu_vce_ring_test_ring,
@@ -924,7 +924,7 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_vm_funcs = {
                 6 + /* vce_v3_0_emit_vm_flush */
                 4 + /* vce_v3_0_emit_pipeline_sync */
                 6 + 6, /* amdgpu_vce_ring_emit_fence x2 vm fence */
-        .emit_ib_size = 4, /* amdgpu_vce_ring_emit_ib */
+        .emit_ib_size = 5, /* vce_v3_0_ring_emit_ib */
         .emit_ib = vce_v3_0_ring_emit_ib,
         .emit_vm_flush = vce_v3_0_emit_vm_flush,
         .emit_pipeline_sync = vce_v3_0_emit_pipeline_sync,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 3a8d6356afc2..770c6b24be0b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2175,6 +2175,46 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing)
         return color_space;
 }
 
+static void reduce_mode_colour_depth(struct dc_crtc_timing *timing_out)
+{
+        if (timing_out->display_color_depth <= COLOR_DEPTH_888)
+                return;
+
+        timing_out->display_color_depth--;
+}
+
+static void adjust_colour_depth_from_display_info(struct dc_crtc_timing *timing_out,
+                                                const struct drm_display_info *info)
+{
+        int normalized_clk;
+        if (timing_out->display_color_depth <= COLOR_DEPTH_888)
+                return;
+        do {
+                normalized_clk = timing_out->pix_clk_khz;
+                /* YCbCr 4:2:0 requires additional adjustment of 1/2 */
+                if (timing_out->pixel_encoding == PIXEL_ENCODING_YCBCR420)
+                        normalized_clk /= 2;
+                /* Adjusting pix clock following on HDMI spec based on colour depth */
+                switch (timing_out->display_color_depth) {
+                case COLOR_DEPTH_101010:
+                        normalized_clk = (normalized_clk * 30) / 24;
+                        break;
+                case COLOR_DEPTH_121212:
+                        normalized_clk = (normalized_clk * 36) / 24;
+                        break;
+                case COLOR_DEPTH_161616:
+                        normalized_clk = (normalized_clk * 48) / 24;
+                        break;
+                default:
+                        return;
+                }
+                if (normalized_clk <= info->max_tmds_clock)
+                        return;
+                reduce_mode_colour_depth(timing_out);
+
+        } while (timing_out->display_color_depth > COLOR_DEPTH_888);
+
+}
 /*****************************************************************************/
 
 static void
@@ -2183,6 +2223,7 @@ fill_stream_properties_from_drm_display_mode(struct dc_stream_state *stream,
                                              const struct drm_connector *connector)
 {
         struct dc_crtc_timing *timing_out = &stream->timing;
+        const struct drm_display_info *info = &connector->display_info;
 
         memset(timing_out, 0, sizeof(struct dc_crtc_timing));
 
@@ -2191,8 +2232,10 @@ fill_stream_properties_from_drm_display_mode(struct dc_stream_state *stream,
         timing_out->v_border_top = 0;
         timing_out->v_border_bottom = 0;
         /* TODO: un-hardcode */
-
-        if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCRCB444)
+        if (drm_mode_is_420_only(info, mode_in)
+                        && stream->sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A)
+                timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420;
+        else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCRCB444)
                         && stream->sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A)
                 timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR444;
         else
@@ -2228,6 +2271,8 @@ fill_stream_properties_from_drm_display_mode(struct dc_stream_state *stream,
 
         stream->out_transfer_func->type = TF_TYPE_PREDEFINED;
         stream->out_transfer_func->tf = TRANSFER_FUNCTION_SRGB;
+        if (stream->sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A)
+                adjust_colour_depth_from_display_info(timing_out, info);
 }
 
 static void fill_audio_info(struct audio_info *audio_info,
diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h
index 092d800b703a..33b4de4ad66e 100644
--- a/drivers/gpu/drm/amd/include/atomfirmware.h
+++ b/drivers/gpu/drm/amd/include/atomfirmware.h
@@ -1433,7 +1433,10 @@ struct atom_smc_dpm_info_v4_1
         uint8_t  acggfxclkspreadpercent;
         uint16_t acggfxclkspreadfreq;
 
-        uint32_t boardreserved[10];
+        uint8_t Vr2_I2C_address;
+        uint8_t padding_vr2[3];
+
+        uint32_t boardreserved[9];
 };
 
 /* 
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c
index 5325661fedff..d27c1c9df286 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c
@@ -512,14 +512,82 @@ int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr, BIOS_CLKI
         return 0;
 }
 
+static void pp_atomfwctrl_copy_vbios_bootup_values_3_2(struct pp_hwmgr *hwmgr,
+                        struct pp_atomfwctrl_bios_boot_up_values *boot_values,
+                        struct atom_firmware_info_v3_2 *fw_info)
+{
+        uint32_t frequency = 0;
+
+        boot_values->ulRevision = fw_info->firmware_revision;
+        boot_values->ulGfxClk   = fw_info->bootup_sclk_in10khz;
+        boot_values->ulUClk     = fw_info->bootup_mclk_in10khz;
+        boot_values->usVddc     = fw_info->bootup_vddc_mv;
+        boot_values->usVddci    = fw_info->bootup_vddci_mv;
+        boot_values->usMvddc    = fw_info->bootup_mvddc_mv;
+        boot_values->usVddGfx   = fw_info->bootup_vddgfx_mv;
+        boot_values->ucCoolingID = fw_info->coolingsolution_id;
+        boot_values->ulSocClk   = 0;
+        boot_values->ulDCEFClk   = 0;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_SOCCLK_ID, &frequency))
+                boot_values->ulSocClk   = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_DCEFCLK_ID, &frequency))
+                boot_values->ulDCEFClk  = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_ECLK_ID, &frequency))
+                boot_values->ulEClk     = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_VCLK_ID, &frequency))
+                boot_values->ulVClk     = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_DCLK_ID, &frequency))
+                boot_values->ulDClk     = frequency;
+}
+
+static void pp_atomfwctrl_copy_vbios_bootup_values_3_1(struct pp_hwmgr *hwmgr,
+                        struct pp_atomfwctrl_bios_boot_up_values *boot_values,
+                        struct atom_firmware_info_v3_1 *fw_info)
+{
+        uint32_t frequency = 0;
+
+        boot_values->ulRevision = fw_info->firmware_revision;
+        boot_values->ulGfxClk   = fw_info->bootup_sclk_in10khz;
+        boot_values->ulUClk     = fw_info->bootup_mclk_in10khz;
+        boot_values->usVddc     = fw_info->bootup_vddc_mv;
+        boot_values->usVddci    = fw_info->bootup_vddci_mv;
+        boot_values->usMvddc    = fw_info->bootup_mvddc_mv;
+        boot_values->usVddGfx   = fw_info->bootup_vddgfx_mv;
+        boot_values->ucCoolingID = fw_info->coolingsolution_id;
+        boot_values->ulSocClk   = 0;
+        boot_values->ulDCEFClk   = 0;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_SOCCLK_ID, &frequency))
+                boot_values->ulSocClk   = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_DCEFCLK_ID, &frequency))
+                boot_values->ulDCEFClk  = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_ECLK_ID, &frequency))
+                boot_values->ulEClk     = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_VCLK_ID, &frequency))
+                boot_values->ulVClk     = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_DCLK_ID, &frequency))
+                boot_values->ulDClk     = frequency;
+}
+
 int pp_atomfwctrl_get_vbios_bootup_values(struct pp_hwmgr *hwmgr,
                         struct pp_atomfwctrl_bios_boot_up_values *boot_values)
 {
-        struct atom_firmware_info_v3_1 *info = NULL;
+        struct atom_firmware_info_v3_2 *fwinfo_3_2;
+        struct atom_firmware_info_v3_1 *fwinfo_3_1;
+        struct atom_common_table_header *info = NULL;
         uint16_t ix;
 
         ix = GetIndexIntoMasterDataTable(firmwareinfo);
-        info = (struct atom_firmware_info_v3_1 *)
+        info = (struct atom_common_table_header *)
                 smu_atom_get_data_table(hwmgr->adev,
                                 ix, NULL, NULL, NULL);
 
@@ -528,16 +596,18 @@ int pp_atomfwctrl_get_vbios_bootup_values(struct pp_hwmgr *hwmgr,
                 return -EINVAL;
         }
 
-        boot_values->ulRevision = info->firmware_revision;
-        boot_values->ulGfxClk   = info->bootup_sclk_in10khz;
-        boot_values->ulUClk     = info->bootup_mclk_in10khz;
-        boot_values->usVddc     = info->bootup_vddc_mv;
-        boot_values->usVddci    = info->bootup_vddci_mv;
-        boot_values->usMvddc    = info->bootup_mvddc_mv;
-        boot_values->usVddGfx   = info->bootup_vddgfx_mv;
-        boot_values->ucCoolingID = info->coolingsolution_id;
-        boot_values->ulSocClk   = 0;
-        boot_values->ulDCEFClk   = 0;
+        if ((info->format_revision == 3) && (info->content_revision == 2)) {
+                fwinfo_3_2 = (struct atom_firmware_info_v3_2 *)info;
+                pp_atomfwctrl_copy_vbios_bootup_values_3_2(hwmgr,
+                                boot_values, fwinfo_3_2);
+        } else if ((info->format_revision == 3) && (info->content_revision == 1)) {
+                fwinfo_3_1 = (struct atom_firmware_info_v3_1 *)info;
+                pp_atomfwctrl_copy_vbios_bootup_values_3_1(hwmgr,
+                                boot_values, fwinfo_3_1);
+        } else {
+                pr_info("Fw info table revision does not match!");
+                return -EINVAL;
+        }
 
         return 0;
 }
@@ -629,5 +699,7 @@ int pp_atomfwctrl_get_smc_dpm_information(struct pp_hwmgr *hwmgr,
         param->acggfxclkspreadpercent = info->acggfxclkspreadpercent;
         param->acggfxclkspreadfreq = info->acggfxclkspreadfreq;
 
+        param->Vr2_I2C_address = info->Vr2_I2C_address;
+
         return 0;
 }
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h
index fe10aa4db5e6..22e21668c93a 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h
@@ -136,6 +136,9 @@ struct pp_atomfwctrl_bios_boot_up_values {
         uint32_t   ulUClk;
         uint32_t   ulSocClk;
         uint32_t   ulDCEFClk;
+        uint32_t   ulEClk;
+        uint32_t   ulVClk;
+        uint32_t   ulDClk;
         uint16_t   usVddc;
         uint16_t   usVddci;
         uint16_t   usMvddc;
@@ -207,6 +210,8 @@ struct pp_atomfwctrl_smc_dpm_parameters
         uint8_t  acggfxclkspreadenabled;
         uint8_t  acggfxclkspreadpercent;
         uint16_t acggfxclkspreadfreq;
+
+        uint8_t Vr2_I2C_address;
 };
 
 int pp_atomfwctrl_get_gpu_pll_dividers_vega10(struct pp_hwmgr *hwmgr,
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
index 782e2098824d..c98e5de777cd 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
@@ -81,6 +81,7 @@ static void vega12_set_default_registry_data(struct pp_hwmgr *hwmgr)
 
         data->registry_data.disallowed_features = 0x0;
         data->registry_data.od_state_in_dc_support = 0;
+        data->registry_data.thermal_support = 1;
         data->registry_data.skip_baco_hardware = 0;
 
         data->registry_data.log_avfs_param = 0;
@@ -803,6 +804,9 @@ static int vega12_init_smc_table(struct pp_hwmgr *hwmgr)
                 data->vbios_boot_state.soc_clock = boot_up_values.ulSocClk;
                 data->vbios_boot_state.dcef_clock = boot_up_values.ulDCEFClk;
                 data->vbios_boot_state.uc_cooling_id = boot_up_values.ucCoolingID;
+                data->vbios_boot_state.eclock = boot_up_values.ulEClk;
+                data->vbios_boot_state.dclock = boot_up_values.ulDClk;
+                data->vbios_boot_state.vclock = boot_up_values.ulVClk;
                 smum_send_msg_to_smc_with_parameter(hwmgr,
                                 PPSMC_MSG_SetMinDeepSleepDcefclk,
                         (uint32_t)(data->vbios_boot_state.dcef_clock / 100));
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h
index e81ded1ec198..49b38df8c7f2 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h
@@ -167,6 +167,9 @@ struct vega12_vbios_boot_state {
         uint32_t    mem_clock;
         uint32_t    soc_clock;
         uint32_t    dcef_clock;
+        uint32_t    eclock;
+        uint32_t    dclock;
+        uint32_t    vclock;
 };
 
 #define DPMTABLE_OD_UPDATE_SCLK     0x00000001
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c
index 888ddca902d8..29914700ee82 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c
@@ -230,6 +230,8 @@ static int append_vbios_pptable(struct pp_hwmgr *hwmgr, PPTable_t *ppsmc_pptable
                 ppsmc_pptable->AcgThresholdFreqLow = 0xFFFF;
         }
 
+        ppsmc_pptable->Vr2_I2C_address = smc_dpm_table.Vr2_I2C_address;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h b/drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h
index 2f8a3b983cce..b08526fd1619 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h
@@ -499,7 +499,10 @@ typedef struct {
         uint8_t      AcgGfxclkSpreadPercent;
         uint16_t     AcgGfxclkSpreadFreq;
 
-        uint32_t     BoardReserved[10];
+  uint8_t      Vr2_I2C_address;
+  uint8_t      padding_vr2[3];
+
+  uint32_t     BoardReserved[9];
 
 
   uint32_t     MmHubPadding[7];
diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
index 250effa0e6b8..a6e8f4591e63 100644
--- a/drivers/gpu/drm/bridge/sil-sii8620.c
+++ b/drivers/gpu/drm/bridge/sil-sii8620.c
@@ -14,6 +14,7 @@
 #include <drm/bridge/mhl.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_encoder.h>
 
 #include <linux/clk.h>
 #include <linux/delay.h>
@@ -72,9 +73,7 @@ struct sii8620 {
         struct regulator_bulk_data supplies[2];
         struct mutex lock; /* context lock, protects fields below */
         int error;
-        int pixel_clock;
         unsigned int use_packed_pixel:1;
-        int video_code;
         enum sii8620_mode mode;
         enum sii8620_sink_type sink_type;
         u8 cbus_status;
@@ -82,7 +81,6 @@ struct sii8620 {
         u8 xstat[MHL_XDS_SIZE];
         u8 devcap[MHL_DCAP_SIZE];
         u8 xdevcap[MHL_XDC_SIZE];
-        u8 avif[HDMI_INFOFRAME_SIZE(AVI)];
         bool feature_complete;
         bool devcap_read;
         bool sink_detected;
@@ -1017,21 +1015,36 @@ static void sii8620_stop_video(struct sii8620 *ctx)
 
 static void sii8620_set_format(struct sii8620 *ctx)
 {
+        u8 out_fmt;
+
         if (sii8620_is_mhl3(ctx)) {
                 sii8620_setbits(ctx, REG_M3_P0CTRL,
                                 BIT_M3_P0CTRL_MHL3_P0_PIXEL_MODE_PACKED,
                                 ctx->use_packed_pixel ? ~0 : 0);
         } else {
+                if (ctx->use_packed_pixel) {
+                        sii8620_write_seq_static(ctx,
+                                REG_VID_MODE, BIT_VID_MODE_M1080P,
+                                REG_MHL_TOP_CTL, BIT_MHL_TOP_CTL_MHL_PP_SEL | 1,
+                                REG_MHLTX_CTL6, 0x60
+                        );
+                } else {
                         sii8620_write_seq_static(ctx,
                                 REG_VID_MODE, 0,
                                 REG_MHL_TOP_CTL, 1,
                                 REG_MHLTX_CTL6, 0xa0
                         );
+                }
         }
 
+        if (ctx->use_packed_pixel)
+                out_fmt = VAL_TPI_FORMAT(YCBCR422, FULL);
+        else
+                out_fmt = VAL_TPI_FORMAT(RGB, FULL);
+
         sii8620_write_seq(ctx,
                 REG_TPI_INPUT, VAL_TPI_FORMAT(RGB, FULL),
-                REG_TPI_OUTPUT, VAL_TPI_FORMAT(RGB, FULL),
+                REG_TPI_OUTPUT, out_fmt,
         );
 }
 
@@ -1082,18 +1095,28 @@ static ssize_t mhl3_infoframe_pack(struct mhl3_infoframe *frame,
         return frm_len;
 }
 
-static void sii8620_set_infoframes(struct sii8620 *ctx)
+static void sii8620_set_infoframes(struct sii8620 *ctx,
+                                   struct drm_display_mode *mode)
 {
         struct mhl3_infoframe mhl_frm;
         union hdmi_infoframe frm;
         u8 buf[31];
         int ret;
 
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&frm.avi,
+                                                       mode,
+                                                       true);
+        if (ctx->use_packed_pixel)
+                frm.avi.colorspace = HDMI_COLORSPACE_YUV422;
+
+        if (!ret)
+                ret = hdmi_avi_infoframe_pack(&frm.avi, buf, ARRAY_SIZE(buf));
+        if (ret > 0)
+                sii8620_write_buf(ctx, REG_TPI_AVI_CHSUM, buf + 3, ret - 3);
+
         if (!sii8620_is_mhl3(ctx) || !ctx->use_packed_pixel) {
                 sii8620_write(ctx, REG_TPI_SC,
                         BIT_TPI_SC_TPI_OUTPUT_MODE_0_HDMI);
-                sii8620_write_buf(ctx, REG_TPI_AVI_CHSUM, ctx->avif + 3,
-                        ARRAY_SIZE(ctx->avif) - 3);
                 sii8620_write(ctx, REG_PKT_FILTER_0,
                         BIT_PKT_FILTER_0_DROP_CEA_GAMUT_PKT |
                         BIT_PKT_FILTER_0_DROP_MPEG_PKT |
@@ -1102,16 +1125,6 @@ static void sii8620_set_infoframes(struct sii8620 *ctx)
                 return;
         }
 
-        ret = hdmi_avi_infoframe_init(&frm.avi);
-        frm.avi.colorspace = HDMI_COLORSPACE_YUV422;
-        frm.avi.active_aspect = HDMI_ACTIVE_ASPECT_PICTURE;
-        frm.avi.picture_aspect = HDMI_PICTURE_ASPECT_16_9;
-        frm.avi.colorimetry = HDMI_COLORIMETRY_ITU_709;
-        frm.avi.video_code = ctx->video_code;
-        if (!ret)
-                ret = hdmi_avi_infoframe_pack(&frm.avi, buf, ARRAY_SIZE(buf));
-        if (ret > 0)
-                sii8620_write_buf(ctx, REG_TPI_AVI_CHSUM, buf + 3, ret - 3);
         sii8620_write(ctx, REG_PKT_FILTER_0,
                 BIT_PKT_FILTER_0_DROP_CEA_GAMUT_PKT |
                 BIT_PKT_FILTER_0_DROP_MPEG_PKT |
@@ -1131,6 +1144,9 @@ static void sii8620_set_infoframes(struct sii8620 *ctx)
 
 static void sii8620_start_video(struct sii8620 *ctx)
 {
+        struct drm_display_mode *mode =
+                &ctx->bridge.encoder->crtc->state->adjusted_mode;
+
         if (!sii8620_is_mhl3(ctx))
                 sii8620_stop_video(ctx);
 
@@ -1149,8 +1165,14 @@ static void sii8620_start_video(struct sii8620 *ctx)
         sii8620_set_format(ctx);
 
         if (!sii8620_is_mhl3(ctx)) {
-                sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),
-                        MHL_DST_LM_CLK_MODE_NORMAL | MHL_DST_LM_PATH_ENABLED);
+                u8 link_mode = MHL_DST_LM_PATH_ENABLED;
+
+                if (ctx->use_packed_pixel)
+                        link_mode |= MHL_DST_LM_CLK_MODE_PACKED_PIXEL;
+                else
+                        link_mode |= MHL_DST_LM_CLK_MODE_NORMAL;
+
+                sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE), link_mode);
                 sii8620_set_auto_zone(ctx);
         } else {
                 static const struct {
@@ -1167,7 +1189,7 @@ static void sii8620_start_video(struct sii8620 *ctx)
                           MHL_XDS_LINK_RATE_6_0_GBPS, 0x40 },
                 };
                 u8 p0_ctrl = BIT_M3_P0CTRL_MHL3_P0_PORT_EN;
-                int clk = ctx->pixel_clock * (ctx->use_packed_pixel ? 2 : 3);
+                int clk = mode->clock * (ctx->use_packed_pixel ? 2 : 3);
                 int i;
 
                 for (i = 0; i < ARRAY_SIZE(clk_spec) - 1; ++i)
@@ -1196,7 +1218,7 @@ static void sii8620_start_video(struct sii8620 *ctx)
                         clk_spec[i].link_rate);
         }
 
-        sii8620_set_infoframes(ctx);
+        sii8620_set_infoframes(ctx, mode);
 }
 
 static void sii8620_disable_hpd(struct sii8620 *ctx)
@@ -1661,14 +1683,18 @@ static void sii8620_status_dcap_ready(struct sii8620 *ctx)
 
 static void sii8620_status_changed_path(struct sii8620 *ctx)
 {
-        if (ctx->stat[MHL_DST_LINK_MODE] & MHL_DST_LM_PATH_ENABLED) {
-                sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),
-                                      MHL_DST_LM_CLK_MODE_NORMAL
-                                      | MHL_DST_LM_PATH_ENABLED);
-        } else {
-                sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),
-                                      MHL_DST_LM_CLK_MODE_NORMAL);
-        }
+        u8 link_mode;
+
+        if (ctx->use_packed_pixel)
+                link_mode = MHL_DST_LM_CLK_MODE_PACKED_PIXEL;
+        else
+                link_mode = MHL_DST_LM_CLK_MODE_NORMAL;
+
+        if (ctx->stat[MHL_DST_LINK_MODE] & MHL_DST_LM_PATH_ENABLED)
+                link_mode |= MHL_DST_LM_PATH_ENABLED;
+
+        sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),
+                              link_mode);
 }
 
 static void sii8620_msc_mr_write_stat(struct sii8620 *ctx)
@@ -2242,8 +2268,6 @@ static bool sii8620_mode_fixup(struct drm_bridge *bridge,
         mutex_lock(&ctx->lock);
 
         ctx->use_packed_pixel = sii8620_is_packing_required(ctx, adjusted_mode);
-        ctx->video_code = drm_match_cea_mode(adjusted_mode);
-        ctx->pixel_clock = adjusted_mode->clock;
 
         mutex_unlock(&ctx->lock);
 
diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c
index 1f8031e30f53..cdb10f885a4f 100644
--- a/drivers/gpu/drm/drm_property.c
+++ b/drivers/gpu/drm/drm_property.c
@@ -532,7 +532,7 @@ static void drm_property_free_blob(struct kref *kref)
 
         drm_mode_object_unregister(blob->dev, &blob->base);
 
-        kfree(blob);
+        kvfree(blob);
 }
 
 /**
@@ -559,7 +559,7 @@ drm_property_create_blob(struct drm_device *dev, size_t length,
         if (!length || length > ULONG_MAX - sizeof(struct drm_property_blob))
                 return ERR_PTR(-EINVAL);
 
-        blob = kzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL);
+        blob = kvzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL);
         if (!blob)
                 return ERR_PTR(-ENOMEM);
 
@@ -576,7 +576,7 @@ drm_property_create_blob(struct drm_device *dev, size_t length,
         ret = __drm_mode_object_add(dev, &blob->base, DRM_MODE_OBJECT_BLOB,
                                     true, drm_property_free_blob);
         if (ret) {
-                kfree(blob);
+                kvfree(blob);
                 return ERR_PTR(-EINVAL);
         }
 
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index e5013a999147..540b59fb4103 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -631,8 +631,11 @@ static struct platform_driver etnaviv_platform_driver = {
         },
 };
 
+static struct platform_device *etnaviv_drm;
+
 static int __init etnaviv_init(void)
 {
+        struct platform_device *pdev;
         int ret;
         struct device_node *np;
 
@@ -644,7 +647,7 @@ static int __init etnaviv_init(void)
 
         ret = platform_driver_register(&etnaviv_platform_driver);
         if (ret != 0)
-                platform_driver_unregister(&etnaviv_gpu_driver);
+                goto unregister_gpu_driver;
 
         /*
          * If the DT contains at least one available GPU device, instantiate
@@ -653,20 +656,33 @@ static int __init etnaviv_init(void)
         for_each_compatible_node(np, NULL, "vivante,gc") {
                 if (!of_device_is_available(np))
                         continue;
-
-                platform_device_register_simple("etnaviv", -1, NULL, 0);
+                pdev = platform_device_register_simple("etnaviv", -1,
+                                                       NULL, 0);
+                if (IS_ERR(pdev)) {
+                        ret = PTR_ERR(pdev);
+                        of_node_put(np);
+                        goto unregister_platform_driver;
+                }
+                etnaviv_drm = pdev;
                 of_node_put(np);
                 break;
         }
 
+        return 0;
+
+unregister_platform_driver:
+        platform_driver_unregister(&etnaviv_platform_driver);
+unregister_gpu_driver:
+        platform_driver_unregister(&etnaviv_gpu_driver);
         return ret;
 }
 module_init(etnaviv_init);
 
 static void __exit etnaviv_exit(void)
 {
-        platform_driver_unregister(&etnaviv_gpu_driver);
+        platform_device_unregister(etnaviv_drm);
         platform_driver_unregister(&etnaviv_platform_driver);
+        platform_driver_unregister(&etnaviv_gpu_driver);
 }
 module_exit(etnaviv_exit);
 
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
index dd430f0f8ff5..90f17ff7888e 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
@@ -131,6 +131,9 @@ struct etnaviv_gpu {
         struct work_struct sync_point_work;
         int sync_point_event;
 
+        /* hang detection */
+        u32 hangcheck_dma_addr;
+
         void __iomem *mmio;
         int irq;
 
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
index a74eb57af15b..50d6b88cb7aa 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
@@ -10,6 +10,7 @@
 #include "etnaviv_gem.h"
 #include "etnaviv_gpu.h"
 #include "etnaviv_sched.h"
+#include "state.xml.h"
 
 static int etnaviv_job_hang_limit = 0;
 module_param_named(job_hang_limit, etnaviv_job_hang_limit, int , 0444);
@@ -85,6 +86,29 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job)
 {
         struct etnaviv_gem_submit *submit = to_etnaviv_submit(sched_job);
         struct etnaviv_gpu *gpu = submit->gpu;
+        u32 dma_addr;
+        int change;
+
+        /*
+         * If the GPU managed to complete this jobs fence, the timout is
+         * spurious. Bail out.
+         */
+        if (fence_completed(gpu, submit->out_fence->seqno))
+                return;
+
+        /*
+         * If the GPU is still making forward progress on the front-end (which
+         * should never loop) we shift out the timeout to give it a chance to
+         * finish the job.
+         */
+        dma_addr = gpu_read(gpu, VIVS_FE_DMA_ADDRESS);
+        change = dma_addr - gpu->hangcheck_dma_addr;
+        if (change < 0 || change > 16) {
+                gpu->hangcheck_dma_addr = dma_addr;
+                schedule_delayed_work(&sched_job->work_tdr,
+                                      sched_job->sched->timeout);
+                return;
+        }
 
         /* block scheduler */
         kthread_park(gpu->sched.thread);
diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 82c95c34447f..e868773ea509 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -265,7 +265,7 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,
         unsigned long val;
 
         val = readl(ctx->addr + DECON_WINCONx(win));
-        val &= ~WINCONx_BPPMODE_MASK;
+        val &= WINCONx_ENWIN_F;
 
         switch (fb->format->format) {
         case DRM_FORMAT_XRGB1555:
@@ -356,8 +356,8 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
                 writel(val, ctx->addr + DECON_VIDOSDxB(win));
         }
 
-        val = VIDOSD_Wx_ALPHA_R_F(0x0) | VIDOSD_Wx_ALPHA_G_F(0x0) |
-                VIDOSD_Wx_ALPHA_B_F(0x0);
+        val = VIDOSD_Wx_ALPHA_R_F(0xff) | VIDOSD_Wx_ALPHA_G_F(0xff) |
+                VIDOSD_Wx_ALPHA_B_F(0xff);
         writel(val, ctx->addr + DECON_VIDOSDxC(win));
 
         val = VIDOSD_Wx_ALPHA_R_F(0x0) | VIDOSD_Wx_ALPHA_G_F(0x0) |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index a81b4a5e24a7..ed3cc2989f93 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -420,7 +420,7 @@ err_mode_config_cleanup:
 err_free_private:
         kfree(private);
 err_free_drm:
-        drm_dev_unref(drm);
+        drm_dev_put(drm);
 
         return ret;
 }
@@ -444,7 +444,7 @@ static void exynos_drm_unbind(struct device *dev)
         drm->dev_private = NULL;
         dev_set_drvdata(dev, NULL);
 
-        drm_dev_unref(drm);
+        drm_dev_put(drm);
 }
 
 static const struct component_master_ops exynos_drm_ops = {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index 7fcc1a7ab1a0..27b7d34d776c 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -138,7 +138,7 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
 
 err:
         while (i--)
-                drm_gem_object_unreference_unlocked(&exynos_gem[i]->base);
+                drm_gem_object_put_unlocked(&exynos_gem[i]->base);
 
         return ERR_PTR(ret);
 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index 6127ef25acd6..e8d0670bb5f8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
@@ -470,17 +470,18 @@ static void fimc_src_set_transf(struct fimc_context *ctx, unsigned int rotation)
 static void fimc_set_window(struct fimc_context *ctx,
                             struct exynos_drm_ipp_buffer *buf)
 {
+        unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];
         u32 cfg, h1, h2, v1, v2;
 
         /* cropped image */
         h1 = buf->rect.x;
-        h2 = buf->buf.width - buf->rect.w - buf->rect.x;
+        h2 = real_width - buf->rect.w - buf->rect.x;
         v1 = buf->rect.y;
         v2 = buf->buf.height - buf->rect.h - buf->rect.y;
 
         DRM_DEBUG_KMS("x[%d]y[%d]w[%d]h[%d]hsize[%d]vsize[%d]\n",
                 buf->rect.x, buf->rect.y, buf->rect.w, buf->rect.h,
-                buf->buf.width, buf->buf.height);
+                real_width, buf->buf.height);
         DRM_DEBUG_KMS("h1[%d]h2[%d]v1[%d]v2[%d]\n", h1, h2, v1, v2);
 
         /*
@@ -503,12 +504,13 @@ static void fimc_set_window(struct fimc_context *ctx,
 static void fimc_src_set_size(struct fimc_context *ctx,
                               struct exynos_drm_ipp_buffer *buf)
 {
+        unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];
         u32 cfg;
 
-        DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", buf->buf.width, buf->buf.height);
+        DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", real_width, buf->buf.height);
 
         /* original size */
-        cfg = (EXYNOS_ORGISIZE_HORIZONTAL(buf->buf.width) |
+        cfg = (EXYNOS_ORGISIZE_HORIZONTAL(real_width) |
                 EXYNOS_ORGISIZE_VERTICAL(buf->buf.height));
 
         fimc_write(ctx, cfg, EXYNOS_ORGISIZE);
@@ -529,7 +531,7 @@ static void fimc_src_set_size(struct fimc_context *ctx,
          * for now, we support only ITU601 8 bit mode
          */
         cfg = (EXYNOS_CISRCFMT_ITU601_8BIT |
-                EXYNOS_CISRCFMT_SOURCEHSIZE(buf->buf.width) |
+                EXYNOS_CISRCFMT_SOURCEHSIZE(real_width) |
                 EXYNOS_CISRCFMT_SOURCEVSIZE(buf->buf.height));
         fimc_write(ctx, cfg, EXYNOS_CISRCFMT);
 
@@ -842,12 +844,13 @@ static void fimc_set_scaler(struct fimc_context *ctx, struct fimc_scaler *sc)
 static void fimc_dst_set_size(struct fimc_context *ctx,
                              struct exynos_drm_ipp_buffer *buf)
 {
+        unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];
         u32 cfg, cfg_ext;
 
-        DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", buf->buf.width, buf->buf.height);
+        DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", real_width, buf->buf.height);
 
         /* original size */
-        cfg = (EXYNOS_ORGOSIZE_HORIZONTAL(buf->buf.width) |
+        cfg = (EXYNOS_ORGOSIZE_HORIZONTAL(real_width) |
                 EXYNOS_ORGOSIZE_VERTICAL(buf->buf.height));
 
         fimc_write(ctx, cfg, EXYNOS_ORGOSIZE);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 6e1494fa71b4..bdf5a7655228 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -143,7 +143,7 @@ static int exynos_drm_gem_handle_create(struct drm_gem_object *obj,
         DRM_DEBUG_KMS("gem handle = 0x%x\n", *handle);
 
         /* drop reference from allocate - handle holds it now. */
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return 0;
 }
@@ -186,7 +186,7 @@ unsigned long exynos_drm_gem_get_size(struct drm_device *dev,
 
         exynos_gem = to_exynos_gem(obj);
 
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return exynos_gem->size;
 }
@@ -329,13 +329,13 @@ void exynos_drm_gem_put_dma_addr(struct drm_device *dev,
                 return;
         }
 
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         /*
          * decrease obj->refcount one more time because we has already
          * increased it at exynos_drm_gem_get_dma_addr().
          */
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 }
 
 static int exynos_drm_gem_mmap_buffer(struct exynos_drm_gem *exynos_gem,
@@ -383,7 +383,7 @@ int exynos_drm_gem_get_ioctl(struct drm_device *dev, void *data,
         args->flags = exynos_gem->flags;
         args->size = exynos_gem->size;
 
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index 35ac66730563..7ba414b52faa 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -492,21 +492,25 @@ static void gsc_src_set_fmt(struct gsc_context *ctx, u32 fmt)
                         GSC_IN_CHROMA_ORDER_CRCB);
                 break;
         case DRM_FORMAT_NV21:
+                cfg |= (GSC_IN_CHROMA_ORDER_CRCB | GSC_IN_YUV420_2P);
+                break;
         case DRM_FORMAT_NV61:
-                cfg |= (GSC_IN_CHROMA_ORDER_CRCB |
-                        GSC_IN_YUV420_2P);
+                cfg |= (GSC_IN_CHROMA_ORDER_CRCB | GSC_IN_YUV422_2P);
                 break;
         case DRM_FORMAT_YUV422:
                 cfg |= GSC_IN_YUV422_3P;
                 break;
         case DRM_FORMAT_YUV420:
+                cfg |= (GSC_IN_CHROMA_ORDER_CBCR | GSC_IN_YUV420_3P);
+                break;
         case DRM_FORMAT_YVU420:
-                cfg |= GSC_IN_YUV420_3P;
+                cfg |= (GSC_IN_CHROMA_ORDER_CRCB | GSC_IN_YUV420_3P);
                 break;
         case DRM_FORMAT_NV12:
+                cfg |= (GSC_IN_CHROMA_ORDER_CBCR | GSC_IN_YUV420_2P);
+                break;
         case DRM_FORMAT_NV16:
-                cfg |= (GSC_IN_CHROMA_ORDER_CBCR |
-                        GSC_IN_YUV420_2P);
+                cfg |= (GSC_IN_CHROMA_ORDER_CBCR | GSC_IN_YUV422_2P);
                 break;
         }
 
@@ -523,30 +527,30 @@ static void gsc_src_set_transf(struct gsc_context *ctx, unsigned int rotation)
 
         switch (degree) {
         case DRM_MODE_ROTATE_0:
-                if (rotation & DRM_MODE_REFLECT_Y)
-                        cfg |= GSC_IN_ROT_XFLIP;
                 if (rotation & DRM_MODE_REFLECT_X)
+                        cfg |= GSC_IN_ROT_XFLIP;
+                if (rotation & DRM_MODE_REFLECT_Y)
                         cfg |= GSC_IN_ROT_YFLIP;
                 break;
         case DRM_MODE_ROTATE_90:
                 cfg |= GSC_IN_ROT_90;
-                if (rotation & DRM_MODE_REFLECT_Y)
-                        cfg |= GSC_IN_ROT_XFLIP;
                 if (rotation & DRM_MODE_REFLECT_X)
+                        cfg |= GSC_IN_ROT_XFLIP;
+                if (rotation & DRM_MODE_REFLECT_Y)
                         cfg |= GSC_IN_ROT_YFLIP;
                 break;
         case DRM_MODE_ROTATE_180:
                 cfg |= GSC_IN_ROT_180;
-                if (rotation & DRM_MODE_REFLECT_Y)
-                        cfg &= ~GSC_IN_ROT_XFLIP;
                 if (rotation & DRM_MODE_REFLECT_X)
+                        cfg &= ~GSC_IN_ROT_XFLIP;
+                if (rotation & DRM_MODE_REFLECT_Y)
                         cfg &= ~GSC_IN_ROT_YFLIP;
                 break;
         case DRM_MODE_ROTATE_270:
                 cfg |= GSC_IN_ROT_270;
-                if (rotation & DRM_MODE_REFLECT_Y)
-                        cfg &= ~GSC_IN_ROT_XFLIP;
                 if (rotation & DRM_MODE_REFLECT_X)
+                        cfg &= ~GSC_IN_ROT_XFLIP;
+                if (rotation & DRM_MODE_REFLECT_Y)
                         cfg &= ~GSC_IN_ROT_YFLIP;
                 break;
         }
@@ -577,7 +581,7 @@ static void gsc_src_set_size(struct gsc_context *ctx,
         cfg &= ~(GSC_SRCIMG_HEIGHT_MASK |
                 GSC_SRCIMG_WIDTH_MASK);
 
-        cfg |= (GSC_SRCIMG_WIDTH(buf->buf.width) |
+        cfg |= (GSC_SRCIMG_WIDTH(buf->buf.pitch[0] / buf->format->cpp[0]) |
                 GSC_SRCIMG_HEIGHT(buf->buf.height));
 
         gsc_write(cfg, GSC_SRCIMG_SIZE);
@@ -672,18 +676,25 @@ static void gsc_dst_set_fmt(struct gsc_context *ctx, u32 fmt)
                         GSC_OUT_CHROMA_ORDER_CRCB);
                 break;
         case DRM_FORMAT_NV21:
-        case DRM_FORMAT_NV61:
                 cfg |= (GSC_OUT_CHROMA_ORDER_CRCB | GSC_OUT_YUV420_2P);
                 break;
+        case DRM_FORMAT_NV61:
+                cfg |= (GSC_OUT_CHROMA_ORDER_CRCB | GSC_OUT_YUV422_2P);
+                break;
         case DRM_FORMAT_YUV422:
+                cfg |= GSC_OUT_YUV422_3P;
+                break;
         case DRM_FORMAT_YUV420:
+                cfg |= (GSC_OUT_CHROMA_ORDER_CBCR | GSC_OUT_YUV420_3P);
+                break;
         case DRM_FORMAT_YVU420:
-                cfg |= GSC_OUT_YUV420_3P;
+                cfg |= (GSC_OUT_CHROMA_ORDER_CRCB | GSC_OUT_YUV420_3P);
                 break;
         case DRM_FORMAT_NV12:
+                cfg |= (GSC_OUT_CHROMA_ORDER_CBCR | GSC_OUT_YUV420_2P);
+                break;
         case DRM_FORMAT_NV16:
-                cfg |= (GSC_OUT_CHROMA_ORDER_CBCR |
-                        GSC_OUT_YUV420_2P);
+                cfg |= (GSC_OUT_CHROMA_ORDER_CBCR | GSC_OUT_YUV422_2P);
                 break;
         }
 
@@ -868,7 +879,7 @@ static void gsc_dst_set_size(struct gsc_context *ctx,
         /* original size */
         cfg = gsc_read(GSC_DSTIMG_SIZE);
         cfg &= ~(GSC_DSTIMG_HEIGHT_MASK | GSC_DSTIMG_WIDTH_MASK);
-        cfg |= GSC_DSTIMG_WIDTH(buf->buf.width) |
+        cfg |= GSC_DSTIMG_WIDTH(buf->buf.pitch[0] / buf->format->cpp[0]) |
                GSC_DSTIMG_HEIGHT(buf->buf.height);
         gsc_write(cfg, GSC_DSTIMG_SIZE);
 
@@ -1341,7 +1352,7 @@ static const struct drm_exynos_ipp_limit gsc_5420_limits[] = {
 };
 
 static const struct drm_exynos_ipp_limit gsc_5433_limits[] = {
-        { IPP_SIZE_LIMIT(BUFFER, .h = { 32, 8191, 2 }, .v = { 16, 8191, 2 }) },
+        { IPP_SIZE_LIMIT(BUFFER, .h = { 32, 8191, 16 }, .v = { 16, 8191, 2 }) },
         { IPP_SIZE_LIMIT(AREA, .h = { 16, 4800, 1 }, .v = { 8, 3344, 1 }) },
         { IPP_SIZE_LIMIT(ROTATED, .h = { 32, 2047 }, .v = { 8, 8191 }) },
         { IPP_SCALE_LIMIT(.h = { (1 << 16) / 16, (1 << 16) * 8 },
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 26374e58c557..b435db8fc916 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -345,27 +345,6 @@ static int exynos_drm_ipp_task_setup_buffer(struct exynos_drm_ipp_buffer *buf,
         int ret = 0;
         int i;
 
-        /* basic checks */
-        if (buf->buf.width == 0 || buf->buf.height == 0)
-                return -EINVAL;
-        buf->format = drm_format_info(buf->buf.fourcc);
-        for (i = 0; i < buf->format->num_planes; i++) {
-                unsigned int width = (i == 0) ? buf->buf.width :
-                             DIV_ROUND_UP(buf->buf.width, buf->format->hsub);
-
-                if (buf->buf.pitch[i] == 0)
-                        buf->buf.pitch[i] = width * buf->format->cpp[i];
-                if (buf->buf.pitch[i] < width * buf->format->cpp[i])
-                        return -EINVAL;
-                if (!buf->buf.gem_id[i])
-                        return -ENOENT;
-        }
-
-        /* pitch for additional planes must match */
-        if (buf->format->num_planes > 2 &&
-            buf->buf.pitch[1] != buf->buf.pitch[2])
-                return -EINVAL;
-
         /* get GEM buffers and check their size */
         for (i = 0; i < buf->format->num_planes; i++) {
                 unsigned int height = (i == 0) ? buf->buf.height :
@@ -428,7 +407,7 @@ enum drm_ipp_size_id {
         IPP_LIMIT_BUFFER, IPP_LIMIT_AREA, IPP_LIMIT_ROTATED, IPP_LIMIT_MAX
 };
 
-static const enum drm_ipp_size_id limit_id_fallback[IPP_LIMIT_MAX][4] = {
+static const enum drm_exynos_ipp_limit_type limit_id_fallback[IPP_LIMIT_MAX][4] = {
         [IPP_LIMIT_BUFFER]  = { DRM_EXYNOS_IPP_LIMIT_SIZE_BUFFER },
         [IPP_LIMIT_AREA]    = { DRM_EXYNOS_IPP_LIMIT_SIZE_AREA,
                                 DRM_EXYNOS_IPP_LIMIT_SIZE_BUFFER },
@@ -495,12 +474,13 @@ static int exynos_drm_ipp_check_size_limits(struct exynos_drm_ipp_buffer *buf,
         enum drm_ipp_size_id id = rotate ? IPP_LIMIT_ROTATED : IPP_LIMIT_AREA;
         struct drm_ipp_limit l;
         struct drm_exynos_ipp_limit_val *lh = &l.h, *lv = &l.v;
+        int real_width = buf->buf.pitch[0] / buf->format->cpp[0];
 
         if (!limits)
                 return 0;
 
         __get_size_limit(limits, num_limits, IPP_LIMIT_BUFFER, &l);
-        if (!__size_limit_check(buf->buf.width, &l.h) ||
+        if (!__size_limit_check(real_width, &l.h) ||
             !__size_limit_check(buf->buf.height, &l.v))
                 return -EINVAL;
 
@@ -560,10 +540,62 @@ static int exynos_drm_ipp_check_scale_limits(
         return 0;
 }
 
+static int exynos_drm_ipp_check_format(struct exynos_drm_ipp_task *task,
+                                       struct exynos_drm_ipp_buffer *buf,
+                                       struct exynos_drm_ipp_buffer *src,
+                                       struct exynos_drm_ipp_buffer *dst,
+                                       bool rotate, bool swap)
+{
+        const struct exynos_drm_ipp_formats *fmt;
+        int ret, i;
+
+        fmt = __ipp_format_get(task->ipp, buf->buf.fourcc, buf->buf.modifier,
+                               buf == src ? DRM_EXYNOS_IPP_FORMAT_SOURCE :
+                                            DRM_EXYNOS_IPP_FORMAT_DESTINATION);
+        if (!fmt) {
+                DRM_DEBUG_DRIVER("Task %pK: %s format not supported\n", task,
+                                 buf == src ? "src" : "dst");
+                return -EINVAL;
+        }
+
+        /* basic checks */
+        if (buf->buf.width == 0 || buf->buf.height == 0)
+                return -EINVAL;
+
+        buf->format = drm_format_info(buf->buf.fourcc);
+        for (i = 0; i < buf->format->num_planes; i++) {
+                unsigned int width = (i == 0) ? buf->buf.width :
+                             DIV_ROUND_UP(buf->buf.width, buf->format->hsub);
+
+                if (buf->buf.pitch[i] == 0)
+                        buf->buf.pitch[i] = width * buf->format->cpp[i];
+                if (buf->buf.pitch[i] < width * buf->format->cpp[i])
+                        return -EINVAL;
+                if (!buf->buf.gem_id[i])
+                        return -ENOENT;
+        }
+
+        /* pitch for additional planes must match */
+        if (buf->format->num_planes > 2 &&
+            buf->buf.pitch[1] != buf->buf.pitch[2])
+                return -EINVAL;
+
+        /* check driver limits */
+        ret = exynos_drm_ipp_check_size_limits(buf, fmt->limits,
+                                               fmt->num_limits,
+                                               rotate,
+                                               buf == dst ? swap : false);
+        if (ret)
+                return ret;
+        ret = exynos_drm_ipp_check_scale_limits(&src->rect, &dst->rect,
+                                                fmt->limits,
+                                                fmt->num_limits, swap);
+        return ret;
+}
+
 static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
 {
         struct exynos_drm_ipp *ipp = task->ipp;
-        const struct exynos_drm_ipp_formats *src_fmt, *dst_fmt;
         struct exynos_drm_ipp_buffer *src = &task->src, *dst = &task->dst;
         unsigned int rotation = task->transform.rotation;
         int ret = 0;
@@ -607,37 +639,11 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
                 return -EINVAL;
         }
 
-        src_fmt = __ipp_format_get(ipp, src->buf.fourcc, src->buf.modifier,
-                                   DRM_EXYNOS_IPP_FORMAT_SOURCE);
-        if (!src_fmt) {
-                DRM_DEBUG_DRIVER("Task %pK: src format not supported\n", task);
-                return -EINVAL;
-        }
-        ret = exynos_drm_ipp_check_size_limits(src, src_fmt->limits,
-                                               src_fmt->num_limits,
-                                               rotate, false);
-        if (ret)
-                return ret;
-        ret = exynos_drm_ipp_check_scale_limits(&src->rect, &dst->rect,
-                                                src_fmt->limits,
-                                                src_fmt->num_limits, swap);
+        ret = exynos_drm_ipp_check_format(task, src, src, dst, rotate, swap);
         if (ret)
                 return ret;
 
-        dst_fmt = __ipp_format_get(ipp, dst->buf.fourcc, dst->buf.modifier,
-                                   DRM_EXYNOS_IPP_FORMAT_DESTINATION);
-        if (!dst_fmt) {
-                DRM_DEBUG_DRIVER("Task %pK: dst format not supported\n", task);
-                return -EINVAL;
-        }
-        ret = exynos_drm_ipp_check_size_limits(dst, dst_fmt->limits,
-                                               dst_fmt->num_limits,
-                                               false, swap);
-        if (ret)
-                return ret;
-        ret = exynos_drm_ipp_check_scale_limits(&src->rect, &dst->rect,
-                                                dst_fmt->limits,
-                                                dst_fmt->num_limits, swap);
+        ret = exynos_drm_ipp_check_format(task, dst, src, dst, false, swap);
         if (ret)
                 return ret;
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 38a2a7f1204b..7098c6d35266 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -132,7 +132,7 @@ static void exynos_drm_plane_reset(struct drm_plane *plane)
         if (plane->state) {
                 exynos_state = to_exynos_plane_state(plane->state);
                 if (exynos_state->base.fb)
-                        drm_framebuffer_unreference(exynos_state->base.fb);
+                        drm_framebuffer_put(exynos_state->base.fb);
                 kfree(exynos_state);
                 plane->state = NULL;
         }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
index 1a76dd3d52e1..a820a68429b9 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
@@ -168,9 +168,9 @@ static void rotator_dst_set_transf(struct rot_context *rot,
         val &= ~ROT_CONTROL_FLIP_MASK;
 
         if (rotation & DRM_MODE_REFLECT_X)
-                val |= ROT_CONTROL_FLIP_HORIZONTAL;
-        if (rotation & DRM_MODE_REFLECT_Y)
                 val |= ROT_CONTROL_FLIP_VERTICAL;
+        if (rotation & DRM_MODE_REFLECT_Y)
+                val |= ROT_CONTROL_FLIP_HORIZONTAL;
 
         val &= ~ROT_CONTROL_ROT_MASK;
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_scaler.c b/drivers/gpu/drm/exynos/exynos_drm_scaler.c
index 91d4382343d0..0ddb6eec7b11 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_scaler.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_scaler.c
@@ -30,6 +30,7 @@
 #define scaler_write(cfg, offset)       writel(cfg, scaler->regs + (offset))
 #define SCALER_MAX_CLK                  4
 #define SCALER_AUTOSUSPEND_DELAY        2000
+#define SCALER_RESET_WAIT_RETRIES       100
 
 struct scaler_data {
         const char      *clk_name[SCALER_MAX_CLK];
@@ -51,9 +52,9 @@ struct scaler_context {
 static u32 scaler_get_format(u32 drm_fmt)
 {
         switch (drm_fmt) {
-        case DRM_FORMAT_NV21:
-                return SCALER_YUV420_2P_UV;
         case DRM_FORMAT_NV12:
+                return SCALER_YUV420_2P_UV;
+        case DRM_FORMAT_NV21:
                 return SCALER_YUV420_2P_VU;
         case DRM_FORMAT_YUV420:
                 return SCALER_YUV420_3P;
@@ -63,15 +64,15 @@ static u32 scaler_get_format(u32 drm_fmt)
                 return SCALER_YUV422_1P_UYVY;
         case DRM_FORMAT_YVYU:
                 return SCALER_YUV422_1P_YVYU;
-        case DRM_FORMAT_NV61:
-                return SCALER_YUV422_2P_UV;
         case DRM_FORMAT_NV16:
+                return SCALER_YUV422_2P_UV;
+        case DRM_FORMAT_NV61:
                 return SCALER_YUV422_2P_VU;
         case DRM_FORMAT_YUV422:
                 return SCALER_YUV422_3P;
-        case DRM_FORMAT_NV42:
-                return SCALER_YUV444_2P_UV;
         case DRM_FORMAT_NV24:
+                return SCALER_YUV444_2P_UV;
+        case DRM_FORMAT_NV42:
                 return SCALER_YUV444_2P_VU;
         case DRM_FORMAT_YUV444:
                 return SCALER_YUV444_3P;
@@ -100,6 +101,23 @@ static u32 scaler_get_format(u32 drm_fmt)
         return 0;
 }
 
+static inline int scaler_reset(struct scaler_context *scaler)
+{
+        int retry = SCALER_RESET_WAIT_RETRIES;
+
+        scaler_write(SCALER_CFG_SOFT_RESET, SCALER_CFG);
+        do {
+                cpu_relax();
+        } while (retry > 1 &&
+                 scaler_read(SCALER_CFG) & SCALER_CFG_SOFT_RESET);
+        do {
+                cpu_relax();
+                scaler_write(1, SCALER_INT_EN);
+        } while (retry > 0 && scaler_read(SCALER_INT_EN) != 1);
+
+        return retry ? 0 : -EIO;
+}
+
 static inline void scaler_enable_int(struct scaler_context *scaler)
 {
         u32 val;
@@ -354,9 +372,13 @@ static int scaler_commit(struct exynos_drm_ipp *ipp,
         u32 dst_fmt = scaler_get_format(task->dst.buf.fourcc);
         struct drm_exynos_ipp_task_rect *dst_pos = &task->dst.rect;
 
-        scaler->task = task;
-
         pm_runtime_get_sync(scaler->dev);
+        if (scaler_reset(scaler)) {
+                pm_runtime_put(scaler->dev);
+                return -EIO;
+        }
+
+        scaler->task = task;
 
         scaler_set_src_fmt(scaler, src_fmt);
         scaler_set_src_base(scaler, &task->src);
@@ -394,7 +416,11 @@ static inline void scaler_disable_int(struct scaler_context *scaler)
 
 static inline u32 scaler_get_int_status(struct scaler_context *scaler)
 {
-        return scaler_read(SCALER_INT_STATUS);
+        u32 val = scaler_read(SCALER_INT_STATUS);
+
+        scaler_write(val, SCALER_INT_STATUS);
+
+        return val;
 }
 
 static inline int scaler_task_done(u32 val)
diff --git a/drivers/gpu/drm/exynos/regs-gsc.h b/drivers/gpu/drm/exynos/regs-gsc.h
index 4704a993cbb7..16b39734115c 100644
--- a/drivers/gpu/drm/exynos/regs-gsc.h
+++ b/drivers/gpu/drm/exynos/regs-gsc.h
@@ -138,6 +138,7 @@
 #define GSC_OUT_YUV420_3P               (3 << 4)
 #define GSC_OUT_YUV422_1P               (4 << 4)
 #define GSC_OUT_YUV422_2P               (5 << 4)
+#define GSC_OUT_YUV422_3P               (6 << 4)
 #define GSC_OUT_YUV444                  (7 << 4)
 #define GSC_OUT_TILE_TYPE_MASK          (1 << 2)
 #define GSC_OUT_TILE_C_16x8             (0 << 2)
diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
index 6d8180e8d1e2..4b072ade8c38 100644
--- a/drivers/gpu/drm/i915/gvt/display.c
+++ b/drivers/gpu/drm/i915/gvt/display.c
@@ -196,7 +196,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
                         ~(TRANS_DDI_BPC_MASK | TRANS_DDI_MODE_SELECT_MASK |
                         TRANS_DDI_PORT_MASK);
                 vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) |=
-                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST |
+                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DVI |
                         (PORT_B << TRANS_DDI_PORT_SHIFT) |
                         TRANS_DDI_FUNC_ENABLE);
                 if (IS_BROADWELL(dev_priv)) {
@@ -216,7 +216,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
                         ~(TRANS_DDI_BPC_MASK | TRANS_DDI_MODE_SELECT_MASK |
                         TRANS_DDI_PORT_MASK);
                 vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) |=
-                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST |
+                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DVI |
                         (PORT_C << TRANS_DDI_PORT_SHIFT) |
                         TRANS_DDI_FUNC_ENABLE);
                 if (IS_BROADWELL(dev_priv)) {
@@ -236,7 +236,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
                         ~(TRANS_DDI_BPC_MASK | TRANS_DDI_MODE_SELECT_MASK |
                         TRANS_DDI_PORT_MASK);
                 vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) |=
-                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST |
+                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DVI |
                         (PORT_D << TRANS_DDI_PORT_SHIFT) |
                         TRANS_DDI_FUNC_ENABLE);
                 if (IS_BROADWELL(dev_priv)) {
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 23296547da95..4efec8fa6c1d 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -1592,6 +1592,7 @@ static struct intel_vgpu_mm *intel_vgpu_create_ggtt_mm(struct intel_vgpu *vgpu)
                 vgpu_free_mm(mm);
                 return ERR_PTR(-ENOMEM);
         }
+        mm->ggtt_mm.last_partial_off = -1UL;
 
         return mm;
 }
@@ -1616,6 +1617,7 @@ void _intel_vgpu_mm_release(struct kref *mm_ref)
                 invalidate_ppgtt_mm(mm);
         } else {
                 vfree(mm->ggtt_mm.virtual_ggtt);
+                mm->ggtt_mm.last_partial_off = -1UL;
         }
 
         vgpu_free_mm(mm);
@@ -1868,6 +1870,62 @@ static int emulate_ggtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off,
         memcpy((void *)&e.val64 + (off & (info->gtt_entry_size - 1)), p_data,
                         bytes);
 
+        /* If ggtt entry size is 8 bytes, and it's split into two 4 bytes
+         * write, we assume the two 4 bytes writes are consecutive.
+         * Otherwise, we abort and report error
+         */
+        if (bytes < info->gtt_entry_size) {
+                if (ggtt_mm->ggtt_mm.last_partial_off == -1UL) {
+                        /* the first partial part*/
+                        ggtt_mm->ggtt_mm.last_partial_off = off;
+                        ggtt_mm->ggtt_mm.last_partial_data = e.val64;
+                        return 0;
+                } else if ((g_gtt_index ==
+                                (ggtt_mm->ggtt_mm.last_partial_off >>
+                                info->gtt_entry_size_shift)) &&
+                        (off != ggtt_mm->ggtt_mm.last_partial_off)) {
+                        /* the second partial part */
+
+                        int last_off = ggtt_mm->ggtt_mm.last_partial_off &
+                                (info->gtt_entry_size - 1);
+
+                        memcpy((void *)&e.val64 + last_off,
+                                (void *)&ggtt_mm->ggtt_mm.last_partial_data +
+                                last_off, bytes);
+
+                        ggtt_mm->ggtt_mm.last_partial_off = -1UL;
+                } else {
+                        int last_offset;
+
+                        gvt_vgpu_err("failed to populate guest ggtt entry: abnormal ggtt entry write sequence, last_partial_off=%lx, offset=%x, bytes=%d, ggtt entry size=%d\n",
+                                        ggtt_mm->ggtt_mm.last_partial_off, off,
+                                        bytes, info->gtt_entry_size);
+
+                        /* set host ggtt entry to scratch page and clear
+                         * virtual ggtt entry as not present for last
+                         * partially write offset
+                         */
+                        last_offset = ggtt_mm->ggtt_mm.last_partial_off &
+                                        (~(info->gtt_entry_size - 1));
+
+                        ggtt_get_host_entry(ggtt_mm, &m, last_offset);
+                        ggtt_invalidate_pte(vgpu, &m);
+                        ops->set_pfn(&m, gvt->gtt.scratch_mfn);
+                        ops->clear_present(&m);
+                        ggtt_set_host_entry(ggtt_mm, &m, last_offset);
+                        ggtt_invalidate(gvt->dev_priv);
+
+                        ggtt_get_guest_entry(ggtt_mm, &e, last_offset);
+                        ops->clear_present(&e);
+                        ggtt_set_guest_entry(ggtt_mm, &e, last_offset);
+
+                        ggtt_mm->ggtt_mm.last_partial_off = off;
+                        ggtt_mm->ggtt_mm.last_partial_data = e.val64;
+
+                        return 0;
+                }
+        }
+
         if (ops->test_present(&e)) {
                 gfn = ops->get_pfn(&e);
                 m = e;
diff --git a/drivers/gpu/drm/i915/gvt/gtt.h b/drivers/gpu/drm/i915/gvt/gtt.h
index 3792f2b7f4ff..97e62647418a 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.h
+++ b/drivers/gpu/drm/i915/gvt/gtt.h
@@ -150,6 +150,8 @@ struct intel_vgpu_mm {
                 } ppgtt_mm;
                 struct {
                         void *virtual_ggtt;
+                        unsigned long last_partial_off;
+                        u64 last_partial_data;
                 } ggtt_mm;
         };
 };
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index d44ad7bc1e94..17c5097721e8 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2002,7 +2002,6 @@ int i915_gem_fault(struct vm_fault *vmf)
         bool write = !!(vmf->flags & FAULT_FLAG_WRITE);
         struct i915_vma *vma;
         pgoff_t page_offset;
-        unsigned int flags;
         int ret;
 
         /* We don't use vmf->pgoff since that has the fake offset */
@@ -2038,27 +2037,34 @@ int i915_gem_fault(struct vm_fault *vmf)
                 goto err_unlock;
         }
 
-        /* If the object is smaller than a couple of partial vma, it is
-         * not worth only creating a single partial vma - we may as well
-         * clear enough space for the full object.
-         */
-        flags = PIN_MAPPABLE;
-        if (obj->base.size > 2 * MIN_CHUNK_PAGES << PAGE_SHIFT)
-                flags |= PIN_NONBLOCK | PIN_NONFAULT;
 
         /* Now pin it into the GTT as needed */
-        vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, flags);
+        vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0,
+                                       PIN_MAPPABLE |
+                                       PIN_NONBLOCK |
+                                       PIN_NONFAULT);
         if (IS_ERR(vma)) {
                 /* Use a partial view if it is bigger than available space */
                 struct i915_ggtt_view view =
                         compute_partial_view(obj, page_offset, MIN_CHUNK_PAGES);
+                unsigned int flags;
 
-                /* Userspace is now writing through an untracked VMA, abandon
+                flags = PIN_MAPPABLE;
+                if (view.type == I915_GGTT_VIEW_NORMAL)
+                        flags |= PIN_NONBLOCK; /* avoid warnings for pinned */
+
+                /*
+                 * Userspace is now writing through an untracked VMA, abandon
                  * all hope that the hardware is able to track future writes.
                  */
                 obj->frontbuffer_ggtt_origin = ORIGIN_CPU;
 
-                vma = i915_gem_object_ggtt_pin(obj, &view, 0, 0, PIN_MAPPABLE);
+                vma = i915_gem_object_ggtt_pin(obj, &view, 0, 0, flags);
+                if (IS_ERR(vma) && !view.type) {
+                        flags = PIN_MAPPABLE;
+                        view.type = I915_GGTT_VIEW_PARTIAL;
+                        vma = i915_gem_object_ggtt_pin(obj, &view, 0, 0, flags);
+                }
         }
         if (IS_ERR(vma)) {
                 ret = PTR_ERR(vma);
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 9324d476e0a7..0531c01c3604 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -109,7 +109,7 @@ vma_create(struct drm_i915_gem_object *obj,
                                                      obj->base.size >> PAGE_SHIFT));
                         vma->size = view->partial.size;
                         vma->size <<= PAGE_SHIFT;
-                        GEM_BUG_ON(vma->size >= obj->base.size);
+                        GEM_BUG_ON(vma->size > obj->base.size);
                 } else if (view->type == I915_GGTT_VIEW_ROTATED) {
                         vma->size = intel_rotation_info_size(&view->rotated);
                         vma->size <<= PAGE_SHIFT;
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index 2ebdc6d5a76e..d5583190f3e4 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -137,7 +137,10 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
 
         if (cmd > (char *) urb->transfer_buffer) {
                 /* Send partial buffer remaining before exiting */
-                int len = cmd - (char *) urb->transfer_buffer;
+                int len;
+                if (cmd < (char *) urb->transfer_buffer + urb->transfer_buffer_length)
+                        *cmd++ = 0xAF;
+                len = cmd - (char *) urb->transfer_buffer;
                 ret = udl_submit_urb(dev, urb, len);
                 bytes_sent += len;
         } else
diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c
index 0c87b1ac6b68..b992644c17e6 100644
--- a/drivers/gpu/drm/udl/udl_transfer.c
+++ b/drivers/gpu/drm/udl/udl_transfer.c
@@ -153,11 +153,11 @@ static void udl_compress_hline16(
                 raw_pixels_count_byte = cmd++; /*  we'll know this later */
                 raw_pixel_start = pixel;
 
-                cmd_pixel_end = pixel + (min(MAX_CMD_PIXELS + 1,
-                        min((int)(pixel_end - pixel) / bpp,
-                            (int)(cmd_buffer_end - cmd) / 2))) * bpp;
+                cmd_pixel_end = pixel + min3(MAX_CMD_PIXELS + 1UL,
+                                        (unsigned long)(pixel_end - pixel) / bpp,
+                                        (unsigned long)(cmd_buffer_end - 1 - cmd) / 2) * bpp;
 
-                prefetch_range((void *) pixel, (cmd_pixel_end - pixel) * bpp);
+                prefetch_range((void *) pixel, cmd_pixel_end - pixel);
                 pixel_val16 = get_pixel_val16(pixel, bpp);
 
                 while (pixel < cmd_pixel_end) {
@@ -193,6 +193,9 @@ static void udl_compress_hline16(
                 if (pixel > raw_pixel_start) {
                         /* finalize last RAW span */
                         *raw_pixels_count_byte = ((pixel-raw_pixel_start) / bpp) & 0xFF;
+                } else {
+                        /* undo unused byte */
+                        cmd--;
                 }
 
                 *cmd_pixels_count_byte = ((pixel - cmd_pixel_start) / bpp) & 0xFF;
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index f858cc72011d..3942ee61bd1c 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1952,6 +1952,8 @@ static int hid_device_probe(struct device *dev)
         }
         hdev->io_started = false;
 
+        clear_bit(ffs(HID_STAT_REPROBED), &hdev->status);
+
         if (!hdev->driver) {
                 id = hid_match_device(hdev, hdrv);
                 if (id == NULL) {
@@ -2215,7 +2217,8 @@ static int __hid_bus_reprobe_drivers(struct device *dev, void *data)
         struct hid_device *hdev = to_hid_device(dev);
 
         if (hdev->driver == hdrv &&
-            !hdrv->match(hdev, hid_ignore_special_drivers))
+            !hdrv->match(hdev, hid_ignore_special_drivers) &&
+            !test_and_set_bit(ffs(HID_STAT_REPROBED), &hdev->status))
                 return device_reprobe(dev);
 
         return 0;
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 8469b6964ff6..b48100236df8 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -1154,6 +1154,8 @@ copy_rest:
                         goto out;
                 if (list->tail > list->head) {
                         len = list->tail - list->head;
+                        if (len > count)
+                                len = count;
 
                         if (copy_to_user(buffer + ret, &list->hid_debug_buf[list->head], len)) {
                                 ret = -EFAULT;
@@ -1163,6 +1165,8 @@ copy_rest:
                         list->head += len;
                 } else {
                         len = HID_DEBUG_BUFSIZE - list->head;
+                        if (len > count)
+                                len = count;
 
                         if (copy_to_user(buffer, &list->hid_debug_buf[list->head], len)) {
                                 ret = -EFAULT;
@@ -1170,7 +1174,9 @@ copy_rest:
                         }
                         list->head = 0;
                         ret += len;
-                        goto copy_rest;
+                        count -= len;
+                        if (count > 0)
+                                goto copy_rest;
                 }
 
         }
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index c1652bb7bd15..eae0cb3ddec6 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -484,7 +484,7 @@ static void i2c_hid_get_input(struct i2c_hid *ihid)
                 return;
         }
 
-        if ((ret_size > size) || (ret_size <= 2)) {
+        if ((ret_size > size) || (ret_size < 2)) {
                 dev_err(&ihid->client->dev, "%s: incomplete report (%d/%d)\n",
                         __func__, size, ret_size);
                 return;
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index e3ce233f8bdc..23872d08308c 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -36,6 +36,7 @@
 #include <linux/hiddev.h>
 #include <linux/compat.h>
 #include <linux/vmalloc.h>
+#include <linux/nospec.h>
 #include "usbhid.h"
 
 #ifdef CONFIG_USB_DYNAMIC_MINORS
@@ -469,10 +470,14 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
 
                 if (uref->field_index >= report->maxfield)
                         goto inval;
+                uref->field_index = array_index_nospec(uref->field_index,
+                                                       report->maxfield);
 
                 field = report->field[uref->field_index];
                 if (uref->usage_index >= field->maxusage)
                         goto inval;
+                uref->usage_index = array_index_nospec(uref->usage_index,
+                                                       field->maxusage);
 
                 uref->usage_code = field->usage[uref->usage_index].hid;
 
@@ -499,6 +504,8 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
 
                         if (uref->field_index >= report->maxfield)
                                 goto inval;
+                        uref->field_index = array_index_nospec(uref->field_index,
+                                                               report->maxfield);
 
                         field = report->field[uref->field_index];
 
@@ -753,6 +760,8 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
                 if (finfo.field_index >= report->maxfield)
                         break;
+                finfo.field_index = array_index_nospec(finfo.field_index,
+                                                       report->maxfield);
 
                 field = report->field[finfo.field_index];
                 memset(&finfo, 0, sizeof(finfo));
@@ -797,6 +806,8 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
                 if (cinfo.index >= hid->maxcollection)
                         break;
+                cinfo.index = array_index_nospec(cinfo.index,
+                                                 hid->maxcollection);
 
                 cinfo.type = hid->collection[cinfo.index].type;
                 cinfo.usage = hid->collection[cinfo.index].usage;
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 0bb44d0088ed..ad7afa74d365 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -3365,8 +3365,14 @@ void wacom_setup_device_quirks(struct wacom *wacom)
                         if (features->type >= INTUOSHT && features->type <= BAMBOO_PT)
                                 features->device_type |= WACOM_DEVICETYPE_PAD;
 
-                        features->x_max = 4096;
-                        features->y_max = 4096;
+                        if (features->type == INTUOSHT2) {
+                                features->x_max = features->x_max / 10;
+                                features->y_max = features->y_max / 10;
+                        }
+                        else {
+                                features->x_max = 4096;
+                                features->y_max = 4096;
+                        }
                 }
                 else if (features->pktlen == WACOM_PKGLEN_BBTOUCH) {
                         features->device_type |= WACOM_DEVICETYPE_PAD;
diff --git a/drivers/i2c/busses/i2c-cht-wc.c b/drivers/i2c/busses/i2c-cht-wc.c
index 44cffad43701..c4d176f5ed79 100644
--- a/drivers/i2c/busses/i2c-cht-wc.c
+++ b/drivers/i2c/busses/i2c-cht-wc.c
@@ -234,7 +234,8 @@ static const struct irq_chip cht_wc_i2c_irq_chip = {
         .name                   = "cht_wc_ext_chrg_irq_chip",
 };
 
-static const char * const bq24190_suppliers[] = { "fusb302-typec-source" };
+static const char * const bq24190_suppliers[] = {
+        "tcpm-source-psy-i2c-fusb302" };
 
 static const struct property_entry bq24190_props[] = {
         PROPERTY_ENTRY_STRING_ARRAY("supplied-from", bq24190_suppliers),
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index e3e330f59c2c..b3ba9a222550 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -6113,7 +6113,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
         dev->num_ports = max(MLX5_CAP_GEN(mdev, num_ports),
                              MLX5_CAP_GEN(mdev, num_vhca_ports));
 
-        if (MLX5_VPORT_MANAGER(mdev) &&
+        if (MLX5_ESWITCH_MANAGER(mdev) &&
             mlx5_ib_eswitch_mode(mdev->priv.eswitch) == SRIOV_OFFLOADS) {
                 dev->rep = mlx5_ib_vport_rep(mdev->priv.eswitch, 0);
 
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e055d228bfb9..689ffe538370 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -142,7 +142,6 @@ config DMAR_TABLE
 config INTEL_IOMMU
         bool "Support for Intel IOMMU using DMA Remapping Devices"
         depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC)
-        select DMA_DIRECT_OPS
         select IOMMU_API
         select IOMMU_IOVA
         select NEED_DMA_MAP_STATE
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 14e4b3722428..b344a883f116 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -31,7 +31,6 @@
 #include <linux/pci.h>
 #include <linux/dmar.h>
 #include <linux/dma-mapping.h>
-#include <linux/dma-direct.h>
 #include <linux/mempool.h>
 #include <linux/memory.h>
 #include <linux/cpu.h>
@@ -3713,30 +3712,61 @@ static void *intel_alloc_coherent(struct device *dev, size_t size,
                                   dma_addr_t *dma_handle, gfp_t flags,
                                   unsigned long attrs)
 {
-        void *vaddr;
+        struct page *page = NULL;
+        int order;
 
-        vaddr = dma_direct_alloc(dev, size, dma_handle, flags, attrs);
-        if (iommu_no_mapping(dev) || !vaddr)
-                return vaddr;
+        size = PAGE_ALIGN(size);
+        order = get_order(size);
 
-        *dma_handle = __intel_map_single(dev, virt_to_phys(vaddr),
-                        PAGE_ALIGN(size), DMA_BIDIRECTIONAL,
-                        dev->coherent_dma_mask);
-        if (!*dma_handle)
-                goto out_free_pages;
-        return vaddr;
+        if (!iommu_no_mapping(dev))
+                flags &= ~(GFP_DMA | GFP_DMA32);
+        else if (dev->coherent_dma_mask < dma_get_required_mask(dev)) {
+                if (dev->coherent_dma_mask < DMA_BIT_MASK(32))
+                        flags |= GFP_DMA;
+                else
+                        flags |= GFP_DMA32;
+        }
+
+        if (gfpflags_allow_blocking(flags)) {
+                unsigned int count = size >> PAGE_SHIFT;
+
+                page = dma_alloc_from_contiguous(dev, count, order, flags);
+                if (page && iommu_no_mapping(dev) &&
+                    page_to_phys(page) + size > dev->coherent_dma_mask) {
+                        dma_release_from_contiguous(dev, page, count);
+                        page = NULL;
+                }
+        }
+
+        if (!page)
+                page = alloc_pages(flags, order);
+        if (!page)
+                return NULL;
+        memset(page_address(page), 0, size);
+
+        *dma_handle = __intel_map_single(dev, page_to_phys(page), size,
+                                         DMA_BIDIRECTIONAL,
+                                         dev->coherent_dma_mask);
+        if (*dma_handle)
+                return page_address(page);
+        if (!dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT))
+                __free_pages(page, order);
 
-out_free_pages:
-        dma_direct_free(dev, size, vaddr, *dma_handle, attrs);
         return NULL;
 }
 
 static void intel_free_coherent(struct device *dev, size_t size, void *vaddr,
                                 dma_addr_t dma_handle, unsigned long attrs)
 {
-        if (!iommu_no_mapping(dev))
-                intel_unmap(dev, dma_handle, PAGE_ALIGN(size));
-        dma_direct_free(dev, size, vaddr, dma_handle, attrs);
+        int order;
+        struct page *page = virt_to_page(vaddr);
+
+        size = PAGE_ALIGN(size);
+        order = get_order(size);
+
+        intel_unmap(dev, dma_handle, size);
+        if (!dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT))
+                __free_pages(page, order);
 }
 
 static void intel_unmap_sg(struct device *dev, struct scatterlist *sglist,
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 29b0cd9ec951..994aed2f9dff 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5547,7 +5547,8 @@ int md_run(struct mddev *mddev)
                 else
                         pr_warn("md: personality for level %s is not loaded!\n",
                                 mddev->clevel);
-                return -EINVAL;
+                err = -EINVAL;
+                goto abort;
         }
         spin_unlock(&pers_lock);
         if (mddev->level != pers->level) {
@@ -5560,7 +5561,8 @@ int md_run(struct mddev *mddev)
             pers->start_reshape == NULL) {
                 /* This personality cannot handle reshaping... */
                 module_put(pers->owner);
-                return -EINVAL;
+                err = -EINVAL;
+                goto abort;
         }
 
         if (pers->sync_request) {
@@ -5629,7 +5631,7 @@ int md_run(struct mddev *mddev)
                 mddev->private = NULL;
                 module_put(pers->owner);
                 bitmap_destroy(mddev);
-                return err;
+                goto abort;
         }
         if (mddev->queue) {
                 bool nonrot = true;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 478cf446827f..35bd3a62451b 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3893,6 +3893,13 @@ static int raid10_run(struct mddev *mddev)
                             disk->rdev->saved_raid_disk < 0)
                                 conf->fullsync = 1;
                 }
+
+                if (disk->replacement &&
+                    !test_bit(In_sync, &disk->replacement->flags) &&
+                    disk->replacement->saved_raid_disk < 0) {
+                        conf->fullsync = 1;
+                }
+
                 disk->recovery_disabled = mddev->recovery_disabled - 1;
         }
 
diff --git a/drivers/media/rc/bpf-lirc.c b/drivers/media/rc/bpf-lirc.c
index 40826bba06b6..fcfab6635f9c 100644
--- a/drivers/media/rc/bpf-lirc.c
+++ b/drivers/media/rc/bpf-lirc.c
@@ -207,29 +207,19 @@ void lirc_bpf_free(struct rc_dev *rcdev)
         bpf_prog_array_free(rcdev->raw->progs);
 }
 
-int lirc_prog_attach(const union bpf_attr *attr)
+int lirc_prog_attach(const union bpf_attr *attr, struct bpf_prog *prog)
 {
-        struct bpf_prog *prog;
         struct rc_dev *rcdev;
         int ret;
 
         if (attr->attach_flags)
                 return -EINVAL;
 
-        prog = bpf_prog_get_type(attr->attach_bpf_fd,
-                                 BPF_PROG_TYPE_LIRC_MODE2);
-        if (IS_ERR(prog))
-                return PTR_ERR(prog);
-
         rcdev = rc_dev_get_from_fd(attr->target_fd);
-        if (IS_ERR(rcdev)) {
-                bpf_prog_put(prog);
+        if (IS_ERR(rcdev))
                 return PTR_ERR(rcdev);
-        }
 
         ret = lirc_bpf_attach(rcdev, prog);
-        if (ret)
-                bpf_prog_put(prog);
 
         put_device(&rcdev->dev);
 
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index ef05e0039378..2a833686784b 100644
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -27,8 +27,8 @@ struct mmc_gpio {
         bool override_cd_active_level;
         irqreturn_t (*cd_gpio_isr)(int irq, void *dev_id);
         char *ro_label;
-        char cd_label[0];
         u32 cd_debounce_delay_ms;
+        char cd_label[];
 };
 
 static irqreturn_t mmc_gpio_cd_irqt(int irq, void *dev_id)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 623f4d27fa01..80dc2fd6576c 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1065,8 +1065,8 @@ static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data)
          * It's used when HS400 mode is enabled.
          */
         if (data->flags & MMC_DATA_WRITE &&
-                !(host->timing != MMC_TIMING_MMC_HS400))
-                return;
+                host->timing != MMC_TIMING_MMC_HS400)
+                goto disable;
 
         if (data->flags & MMC_DATA_WRITE)
                 enable = SDMMC_CARD_WR_THR_EN;
@@ -1074,7 +1074,8 @@ static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data)
                 enable = SDMMC_CARD_RD_THR_EN;
 
         if (host->timing != MMC_TIMING_MMC_HS200 &&
-            host->timing != MMC_TIMING_UHS_SDR104)
+            host->timing != MMC_TIMING_UHS_SDR104 &&
+            host->timing != MMC_TIMING_MMC_HS400)
                 goto disable;
 
         blksz_depth = blksz / (1 << host->data_shift);
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index f7f9773d161f..d032bd63444d 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -139,8 +139,7 @@ renesas_sdhi_internal_dmac_abort_dma(struct tmio_mmc_host *host) {
         renesas_sdhi_internal_dmac_dm_write(host, DM_CM_RST,
                                             RST_RESERVED_BITS | val);
 
-        if (host->data && host->data->flags & MMC_DATA_READ)
-                clear_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags);
+        clear_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags);
 
         renesas_sdhi_internal_dmac_enable_dma(host, true);
 }
@@ -164,17 +163,14 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,
                 goto force_pio;
 
         /* This DMAC cannot handle if buffer is not 8-bytes alignment */
-        if (!IS_ALIGNED(sg_dma_address(sg), 8)) {
-                dma_unmap_sg(&host->pdev->dev, sg, host->sg_len,
-                             mmc_get_dma_dir(data));
-                goto force_pio;
-        }
+        if (!IS_ALIGNED(sg_dma_address(sg), 8))
+                goto force_pio_with_unmap;
 
         if (data->flags & MMC_DATA_READ) {
                 dtran_mode |= DTRAN_MODE_CH_NUM_CH1;
                 if (test_bit(SDHI_INTERNAL_DMAC_ONE_RX_ONLY, &global_flags) &&
                     test_and_set_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags))
-                        goto force_pio;
+                        goto force_pio_with_unmap;
         } else {
                 dtran_mode |= DTRAN_MODE_CH_NUM_CH0;
         }
@@ -189,6 +185,9 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,
 
         return;
 
+force_pio_with_unmap:
+        dma_unmap_sg(&host->pdev->dev, sg, host->sg_len, mmc_get_dma_dir(data));
+
 force_pio:
         host->force_pio = true;
         renesas_sdhi_internal_dmac_enable_dma(host, false);
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index d6aef70d34fa..4eb3d29ecde1 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -312,6 +312,15 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
 
                         if (imx_data->socdata->flags & ESDHC_FLAG_HS400)
                                 val |= SDHCI_SUPPORT_HS400;
+
+                        /*
+                         * Do not advertise faster UHS modes if there are no
+                         * pinctrl states for 100MHz/200MHz.
+                         */
+                        if (IS_ERR_OR_NULL(imx_data->pins_100mhz) ||
+                            IS_ERR_OR_NULL(imx_data->pins_200mhz))
+                                val &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_DDR50
+                                         | SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_HS400);
                 }
         }
 
@@ -1158,18 +1167,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
                                                 ESDHC_PINCTRL_STATE_100MHZ);
                 imx_data->pins_200mhz = pinctrl_lookup_state(imx_data->pinctrl,
                                                 ESDHC_PINCTRL_STATE_200MHZ);
-                if (IS_ERR(imx_data->pins_100mhz) ||
-                                IS_ERR(imx_data->pins_200mhz)) {
-                        dev_warn(mmc_dev(host->mmc),
-                                "could not get ultra high speed state, work on normal mode\n");
-                        /*
-                         * fall back to not supporting uhs by specifying no
-                         * 1.8v quirk
-                         */
-                        host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
-                }
-        } else {
-                host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
         }
 
         /* call to generic mmc_of_parse to support additional capabilities */
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index e7472590f2ed..8e7f3e35ee3d 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1446,6 +1446,7 @@ static int sunxi_mmc_runtime_resume(struct device *dev)
         sunxi_mmc_init_host(host);
         sunxi_mmc_set_bus_width(host, mmc->ios.bus_width);
         sunxi_mmc_set_clk(host, &mmc->ios);
+        enable_irq(host->irq);
 
         return 0;
 }
@@ -1455,6 +1456,12 @@ static int sunxi_mmc_runtime_suspend(struct device *dev)
         struct mmc_host *mmc = dev_get_drvdata(dev);
         struct sunxi_mmc_host *host = mmc_priv(mmc);
 
+        /*
+         * When clocks are off, it's possible receiving
+         * fake interrupts, which will stall the system.
+         * Disabling the irq  will prevent this.
+         */
+        disable_irq(host->irq);
         sunxi_mmc_reset_host(host);
         sunxi_mmc_disable(host);
 
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 567ee54504bc..5e5022fa1d04 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1897,13 +1897,19 @@ static int alx_resume(struct device *dev)
         struct pci_dev *pdev = to_pci_dev(dev);
         struct alx_priv *alx = pci_get_drvdata(pdev);
         struct alx_hw *hw = &alx->hw;
+        int err;
 
         alx_reset_phy(hw);
 
         if (!netif_running(alx->dev))
                 return 0;
         netif_device_attach(alx->dev);
-        return __alx_open(alx, true);
+
+        rtnl_lock();
+        err = __alx_open(alx, true);
+        rtnl_unlock();
+
+        return err;
 }
 
 static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index d847e1b9c37b..be1506169076 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1533,6 +1533,7 @@ struct bnx2x {
         struct link_vars        link_vars;
         u32                     link_cnt;
         struct bnx2x_link_report_data last_reported_link;
+        bool                    force_link_down;
 
         struct mdio_if_info     mdio;
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 8cd73ff5debc..af7b5a4d8ba0 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -1261,6 +1261,11 @@ void __bnx2x_link_report(struct bnx2x *bp)
 {
         struct bnx2x_link_report_data cur_data;
 
+        if (bp->force_link_down) {
+                bp->link_vars.link_up = 0;
+                return;
+        }
+
         /* reread mf_cfg */
         if (IS_PF(bp) && !CHIP_IS_E1(bp))
                 bnx2x_read_mf_cfg(bp);
@@ -2817,6 +2822,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 bp->pending_max = 0;
         }
 
+        bp->force_link_down = false;
         if (bp->port.pmf) {
                 rc = bnx2x_initial_phy_init(bp, load_mode);
                 if (rc)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 5b1ed240bf18..57348f2b49a3 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10279,6 +10279,12 @@ static void bnx2x_sp_rtnl_task(struct work_struct *work)
                 bp->sp_rtnl_state = 0;
                 smp_mb();
 
+                /* Immediately indicate link as down */
+                bp->link_vars.link_up = 0;
+                bp->force_link_down = true;
+                netif_carrier_off(bp->dev);
+                BNX2X_ERR("Indicating link is down due to Tx-timeout\n");
+
                 bnx2x_nic_unload(bp, UNLOAD_NORMAL, true);
                 /* When ret value shows failure of allocation failure,
                  * the nic is rebooted again. If open still fails, a error
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index 30273a7717e2..4fd829b5e65d 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -660,7 +660,7 @@ static int cnic_init_id_tbl(struct cnic_id_tbl *id_tbl, u32 size, u32 start_id,
         id_tbl->max = size;
         id_tbl->next = next;
         spin_lock_init(&id_tbl->lock);
-        id_tbl->table = kcalloc(DIV_ROUND_UP(size, 32), 4, GFP_KERNEL);
+        id_tbl->table = kcalloc(BITS_TO_LONGS(size), sizeof(long), GFP_KERNEL);
         if (!id_tbl->table)
                 return -ENOMEM;
 
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 3e93df5d4e3b..96cc03a6d942 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3726,6 +3726,8 @@ static int at91ether_init(struct platform_device *pdev)
         int err;
         u32 reg;
 
+        bp->queues[0].bp = bp;
+
         dev->netdev_ops = &at91ether_netdev_ops;
         dev->ethtool_ops = &macb_ethtool_ops;
 
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 5f4e1ffa7b95..ab02057ac730 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -125,6 +125,9 @@ MODULE_PARM_DESC(tx_timeout, "The Tx timeout in ms");
 /* Default alignment for start of data in an Rx FD */
 #define DPAA_FD_DATA_ALIGNMENT  16
 
+/* The DPAA requires 256 bytes reserved and mapped for the SGT */
+#define DPAA_SGT_SIZE 256
+
 /* Values for the L3R field of the FM Parse Results
  */
 /* L3 Type field: First IP Present IPv4 */
@@ -1617,8 +1620,8 @@ static struct sk_buff *dpaa_cleanup_tx_fd(const struct dpaa_priv *priv,
 
         if (unlikely(qm_fd_get_format(fd) == qm_fd_sg)) {
                 nr_frags = skb_shinfo(skb)->nr_frags;
-                dma_unmap_single(dev, addr, qm_fd_get_offset(fd) +
-                                 sizeof(struct qm_sg_entry) * (1 + nr_frags),
+                dma_unmap_single(dev, addr,
+                                 qm_fd_get_offset(fd) + DPAA_SGT_SIZE,
                                  dma_dir);
 
                 /* The sgt buffer has been allocated with netdev_alloc_frag(),
@@ -1903,8 +1906,7 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,
         void *sgt_buf;
 
         /* get a page frag to store the SGTable */
-        sz = SKB_DATA_ALIGN(priv->tx_headroom +
-                sizeof(struct qm_sg_entry) * (1 + nr_frags));
+        sz = SKB_DATA_ALIGN(priv->tx_headroom + DPAA_SGT_SIZE);
         sgt_buf = netdev_alloc_frag(sz);
         if (unlikely(!sgt_buf)) {
                 netdev_err(net_dev, "netdev_alloc_frag() failed for size %d\n",
@@ -1972,9 +1974,8 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,
         skbh = (struct sk_buff **)buffer_start;
         *skbh = skb;
 
-        addr = dma_map_single(dev, buffer_start, priv->tx_headroom +
-                              sizeof(struct qm_sg_entry) * (1 + nr_frags),
-                              dma_dir);
+        addr = dma_map_single(dev, buffer_start,
+                              priv->tx_headroom + DPAA_SGT_SIZE, dma_dir);
         if (unlikely(dma_mapping_error(dev, addr))) {
                 dev_err(dev, "DMA mapping failed");
                 err = -EINVAL;
diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c
index ce6e24c74978..ecbf6187e13a 100644
--- a/drivers/net/ethernet/freescale/fman/fman_port.c
+++ b/drivers/net/ethernet/freescale/fman/fman_port.c
@@ -324,6 +324,10 @@ struct fman_port_qmi_regs {
 #define HWP_HXS_PHE_REPORT 0x00000800
 #define HWP_HXS_PCAC_PSTAT 0x00000100
 #define HWP_HXS_PCAC_PSTOP 0x00000001
+#define HWP_HXS_TCP_OFFSET 0xA
+#define HWP_HXS_UDP_OFFSET 0xB
+#define HWP_HXS_SH_PAD_REM 0x80000000
+
 struct fman_port_hwp_regs {
         struct {
                 u32 ssa; /* Soft Sequence Attachment */
@@ -728,6 +732,10 @@ static void init_hwp(struct fman_port *port)
                 iowrite32be(0xffffffff, &regs->pmda[i].lcv);
         }
 
+        /* Short packet padding removal from checksum calculation */
+        iowrite32be(HWP_HXS_SH_PAD_REM, &regs->pmda[HWP_HXS_TCP_OFFSET].ssa);
+        iowrite32be(HWP_HXS_SH_PAD_REM, &regs->pmda[HWP_HXS_UDP_OFFSET].ssa);
+
         start_port_hwp(port);
 }
 
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_rx.c b/drivers/net/ethernet/huawei/hinic/hinic_rx.c
index e2e5cdc7119c..4c0f7eda1166 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_rx.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_rx.c
@@ -439,6 +439,7 @@ static void rx_free_irq(struct hinic_rxq *rxq)
 {
         struct hinic_rq *rq = rxq->rq;
 
+        irq_set_affinity_hint(rq->irq, NULL);
         free_irq(rq->irq, rxq);
         rx_del_napi(rxq);
 }
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index ed6dbcfd4e96..b151ae316546 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2199,9 +2199,10 @@ static bool i40e_is_non_eop(struct i40e_ring *rx_ring,
         return true;
 }
 
-#define I40E_XDP_PASS 0
-#define I40E_XDP_CONSUMED 1
-#define I40E_XDP_TX 2
+#define I40E_XDP_PASS           0
+#define I40E_XDP_CONSUMED       BIT(0)
+#define I40E_XDP_TX             BIT(1)
+#define I40E_XDP_REDIR          BIT(2)
 
 static int i40e_xmit_xdp_ring(struct xdp_frame *xdpf,
                               struct i40e_ring *xdp_ring);
@@ -2248,7 +2249,7 @@ static struct sk_buff *i40e_run_xdp(struct i40e_ring *rx_ring,
                 break;
         case XDP_REDIRECT:
                 err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
-                result = !err ? I40E_XDP_TX : I40E_XDP_CONSUMED;
+                result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;
                 break;
         default:
                 bpf_warn_invalid_xdp_action(act);
@@ -2311,7 +2312,8 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
         unsigned int total_rx_bytes = 0, total_rx_packets = 0;
         struct sk_buff *skb = rx_ring->skb;
         u16 cleaned_count = I40E_DESC_UNUSED(rx_ring);
-        bool failure = false, xdp_xmit = false;
+        unsigned int xdp_xmit = 0;
+        bool failure = false;
         struct xdp_buff xdp;
 
         xdp.rxq = &rx_ring->xdp_rxq;
@@ -2372,8 +2374,10 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
                 }
 
                 if (IS_ERR(skb)) {
-                        if (PTR_ERR(skb) == -I40E_XDP_TX) {
-                                xdp_xmit = true;
+                        unsigned int xdp_res = -PTR_ERR(skb);
+
+                        if (xdp_res & (I40E_XDP_TX | I40E_XDP_REDIR)) {
+                                xdp_xmit |= xdp_res;
                                 i40e_rx_buffer_flip(rx_ring, rx_buffer, size);
                         } else {
                                 rx_buffer->pagecnt_bias++;
@@ -2427,12 +2431,14 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
                 total_rx_packets++;
         }
 
-        if (xdp_xmit) {
+        if (xdp_xmit & I40E_XDP_REDIR)
+                xdp_do_flush_map();
+
+        if (xdp_xmit & I40E_XDP_TX) {
                 struct i40e_ring *xdp_ring =
                         rx_ring->vsi->xdp_rings[rx_ring->queue_index];
 
                 i40e_xdp_ring_update_tail(xdp_ring);
-                xdp_do_flush_map();
         }
 
         rx_ring->skb = skb;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 3e87dbbc9024..62e57b05a0ae 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2186,9 +2186,10 @@ static struct sk_buff *ixgbe_build_skb(struct ixgbe_ring *rx_ring,
         return skb;
 }
 
-#define IXGBE_XDP_PASS 0
-#define IXGBE_XDP_CONSUMED 1
-#define IXGBE_XDP_TX 2
+#define IXGBE_XDP_PASS          0
+#define IXGBE_XDP_CONSUMED      BIT(0)
+#define IXGBE_XDP_TX            BIT(1)
+#define IXGBE_XDP_REDIR         BIT(2)
 
 static int ixgbe_xmit_xdp_ring(struct ixgbe_adapter *adapter,
                                struct xdp_frame *xdpf);
@@ -2225,7 +2226,7 @@ static struct sk_buff *ixgbe_run_xdp(struct ixgbe_adapter *adapter,
         case XDP_REDIRECT:
                 err = xdp_do_redirect(adapter->netdev, xdp, xdp_prog);
                 if (!err)
-                        result = IXGBE_XDP_TX;
+                        result = IXGBE_XDP_REDIR;
                 else
                         result = IXGBE_XDP_CONSUMED;
                 break;
@@ -2285,7 +2286,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
         unsigned int mss = 0;
 #endif /* IXGBE_FCOE */
         u16 cleaned_count = ixgbe_desc_unused(rx_ring);
-        bool xdp_xmit = false;
+        unsigned int xdp_xmit = 0;
         struct xdp_buff xdp;
 
         xdp.rxq = &rx_ring->xdp_rxq;
@@ -2328,8 +2329,10 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
                 }
 
                 if (IS_ERR(skb)) {
-                        if (PTR_ERR(skb) == -IXGBE_XDP_TX) {
-                                xdp_xmit = true;
+                        unsigned int xdp_res = -PTR_ERR(skb);
+
+                        if (xdp_res & (IXGBE_XDP_TX | IXGBE_XDP_REDIR)) {
+                                xdp_xmit |= xdp_res;
                                 ixgbe_rx_buffer_flip(rx_ring, rx_buffer, size);
                         } else {
                                 rx_buffer->pagecnt_bias++;
@@ -2401,7 +2404,10 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
                 total_rx_packets++;
         }
 
-        if (xdp_xmit) {
+        if (xdp_xmit & IXGBE_XDP_REDIR)
+                xdp_do_flush_map();
+
+        if (xdp_xmit & IXGBE_XDP_TX) {
                 struct ixgbe_ring *ring = adapter->xdp_ring[smp_processor_id()];
 
                 /* Force memory writes to complete before letting h/w
@@ -2409,8 +2415,6 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
                  */
                 wmb();
                 writel(ring->next_to_use, ring->tail);
-
-                xdp_do_flush_map();
         }
 
         u64_stats_update_begin(&rx_ring->syncp);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 487388aed98f..384c1fa49081 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -807,6 +807,7 @@ static void cmd_work_handler(struct work_struct *work)
         unsigned long flags;
         bool poll_cmd = ent->polling;
         int alloc_ret;
+        int cmd_mode;
 
         sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;
         down(sem);
@@ -853,6 +854,7 @@ static void cmd_work_handler(struct work_struct *work)
         set_signature(ent, !cmd->checksum_disabled);
         dump_command(dev, ent, 1);
         ent->ts1 = ktime_get_ns();
+        cmd_mode = cmd->mode;
 
         if (ent->callback)
                 schedule_delayed_work(&ent->cb_timeout_work, cb_timeout);
@@ -877,7 +879,7 @@ static void cmd_work_handler(struct work_struct *work)
         iowrite32be(1 << ent->idx, &dev->iseg->cmd_dbell);
         mmiowb();
         /* if not in polling don't use ent after this point */
-        if (cmd->mode == CMD_MODE_POLLING || poll_cmd) {
+        if (cmd_mode == CMD_MODE_POLLING || poll_cmd) {
                 poll_timeout(ent);
                 /* make sure we read the descriptor after ownership is SW */
                 rmb();
@@ -1276,7 +1278,7 @@ static ssize_t outlen_write(struct file *filp, const char __user *buf,
 {
         struct mlx5_core_dev *dev = filp->private_data;
         struct mlx5_cmd_debug *dbg = &dev->cmd.dbg;
-        char outlen_str[8];
+        char outlen_str[8] = {0};
         int outlen;
         void *ptr;
         int err;
@@ -1291,8 +1293,6 @@ static ssize_t outlen_write(struct file *filp, const char __user *buf,
         if (copy_from_user(outlen_str, buf, count))
                 return -EFAULT;
 
-        outlen_str[7] = 0;
-
         err = sscanf(outlen_str, "%d", &outlen);
         if (err < 0)
                 return err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 56c1b6f5593e..dae4156a710d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2846,7 +2846,7 @@ void mlx5e_activate_priv_channels(struct mlx5e_priv *priv)
         mlx5e_activate_channels(&priv->channels);
         netif_tx_start_all_queues(priv->netdev);
 
-        if (MLX5_VPORT_MANAGER(priv->mdev))
+        if (MLX5_ESWITCH_MANAGER(priv->mdev))
                 mlx5e_add_sqs_fwd_rules(priv);
 
         mlx5e_wait_channels_min_rx_wqes(&priv->channels);
@@ -2857,7 +2857,7 @@ void mlx5e_deactivate_priv_channels(struct mlx5e_priv *priv)
 {
         mlx5e_redirect_rqts_to_drop(priv);
 
-        if (MLX5_VPORT_MANAGER(priv->mdev))
+        if (MLX5_ESWITCH_MANAGER(priv->mdev))
                 mlx5e_remove_sqs_fwd_rules(priv);
 
         /* FIXME: This is a W/A only for tx timeout watch dog false alarm when
@@ -4597,7 +4597,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)
         mlx5e_set_netdev_dev_addr(netdev);
 
 #if IS_ENABLED(CONFIG_MLX5_ESWITCH)
-        if (MLX5_VPORT_MANAGER(mdev))
+        if (MLX5_ESWITCH_MANAGER(mdev))
                 netdev->switchdev_ops = &mlx5e_switchdev_ops;
 #endif
 
@@ -4753,7 +4753,7 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)
 
         mlx5e_enable_async_events(priv);
 
-        if (MLX5_VPORT_MANAGER(priv->mdev))
+        if (MLX5_ESWITCH_MANAGER(priv->mdev))
                 mlx5e_register_vport_reps(priv);
 
         if (netdev->reg_state != NETREG_REGISTERED)
@@ -4788,7 +4788,7 @@ static void mlx5e_nic_disable(struct mlx5e_priv *priv)
 
         queue_work(priv->wq, &priv->set_rx_mode_work);
 
-        if (MLX5_VPORT_MANAGER(priv->mdev))
+        if (MLX5_ESWITCH_MANAGER(priv->mdev))
                 mlx5e_unregister_vport_reps(priv);
 
         mlx5e_disable_async_events(priv);
@@ -4972,7 +4972,7 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev)
                 return NULL;
 
 #ifdef CONFIG_MLX5_ESWITCH
-        if (MLX5_VPORT_MANAGER(mdev)) {
+        if (MLX5_ESWITCH_MANAGER(mdev)) {
                 rpriv = mlx5e_alloc_nic_rep_priv(mdev);
                 if (!rpriv) {
                         mlx5_core_warn(mdev, "Failed to alloc NIC rep priv data\n");
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 57987f6546e8..2b8040a3cdbd 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -823,7 +823,7 @@ bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv)
         struct mlx5e_rep_priv *rpriv = priv->ppriv;
         struct mlx5_eswitch_rep *rep;
 
-        if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager))
+        if (!MLX5_ESWITCH_MANAGER(priv->mdev))
                 return false;
 
         rep = rpriv->rep;
@@ -837,8 +837,12 @@ bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv)
 static bool mlx5e_is_vf_vport_rep(struct mlx5e_priv *priv)
 {
         struct mlx5e_rep_priv *rpriv = priv->ppriv;
-        struct mlx5_eswitch_rep *rep = rpriv->rep;
+        struct mlx5_eswitch_rep *rep;
 
+        if (!MLX5_ESWITCH_MANAGER(priv->mdev))
+                return false;
+
+        rep = rpriv->rep;
         if (rep && rep->vport != FDB_UPLINK_VPORT)
                 return true;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index f63dfbcd29fe..b79d74860a30 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1594,17 +1594,15 @@ static void esw_disable_vport(struct mlx5_eswitch *esw, int vport_num)
 }
 
 /* Public E-Switch API */
-#define ESW_ALLOWED(esw) ((esw) && MLX5_VPORT_MANAGER((esw)->dev))
+#define ESW_ALLOWED(esw) ((esw) && MLX5_ESWITCH_MANAGER((esw)->dev))
+
 
 int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode)
 {
         int err;
         int i, enabled_events;
 
-        if (!ESW_ALLOWED(esw))
-                return 0;
-
-        if (!MLX5_CAP_GEN(esw->dev, eswitch_flow_table) ||
+        if (!ESW_ALLOWED(esw) ||
             !MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ft_support)) {
                 esw_warn(esw->dev, "E-Switch FDB is not supported, aborting ...\n");
                 return -EOPNOTSUPP;
@@ -1806,7 +1804,7 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,
         u64 node_guid;
         int err = 0;
 
-        if (!ESW_ALLOWED(esw))
+        if (!MLX5_CAP_GEN(esw->dev, vport_group_manager))
                 return -EPERM;
         if (!LEGAL_VPORT(esw, vport) || is_multicast_ether_addr(mac))
                 return -EINVAL;
@@ -1883,7 +1881,7 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw,
 {
         struct mlx5_vport *evport;
 
-        if (!ESW_ALLOWED(esw))
+        if (!MLX5_CAP_GEN(esw->dev, vport_group_manager))
                 return -EPERM;
         if (!LEGAL_VPORT(esw, vport))
                 return -EINVAL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index cecd201f0b73..91f1209886ff 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -1079,8 +1079,8 @@ static int mlx5_devlink_eswitch_check(struct devlink *devlink)
         if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)
                 return -EOPNOTSUPP;
 
-        if (!MLX5_CAP_GEN(dev, vport_group_manager))
-                return -EOPNOTSUPP;
+        if(!MLX5_ESWITCH_MANAGER(dev))
+                return -EPERM;
 
         if (dev->priv.eswitch->mode == SRIOV_NONE)
                 return -EOPNOTSUPP;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 49a75d31185e..f1a86cea86a0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -32,6 +32,7 @@
 
 #include <linux/mutex.h>
 #include <linux/mlx5/driver.h>
+#include <linux/mlx5/eswitch.h>
 
 #include "mlx5_core.h"
 #include "fs_core.h"
@@ -2652,7 +2653,7 @@ int mlx5_init_fs(struct mlx5_core_dev *dev)
                         goto err;
         }
 
-        if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {
+        if (MLX5_ESWITCH_MANAGER(dev)) {
                 if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, ft_support)) {
                         err = init_fdb_root_ns(steering);
                         if (err)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw.c b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
index afd9f4fa22f4..41ad24f0de2c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
@@ -32,6 +32,7 @@
 
 #include <linux/mlx5/driver.h>
 #include <linux/mlx5/cmd.h>
+#include <linux/mlx5/eswitch.h>
 #include <linux/module.h>
 #include "mlx5_core.h"
 #include "../../mlxfw/mlxfw.h"
@@ -159,13 +160,13 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev)
         }
 
         if (MLX5_CAP_GEN(dev, vport_group_manager) &&
-            MLX5_CAP_GEN(dev, eswitch_flow_table)) {
+            MLX5_ESWITCH_MANAGER(dev)) {
                 err = mlx5_core_get_caps(dev, MLX5_CAP_ESWITCH_FLOW_TABLE);
                 if (err)
                         return err;
         }
 
-        if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {
+        if (MLX5_ESWITCH_MANAGER(dev)) {
                 err = mlx5_core_get_caps(dev, MLX5_CAP_ESWITCH);
                 if (err)
                         return err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
index 7cb67122e8b5..98359559c77e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
@@ -33,6 +33,7 @@
 #include <linux/etherdevice.h>
 #include <linux/mlx5/driver.h>
 #include <linux/mlx5/mlx5_ifc.h>
+#include <linux/mlx5/eswitch.h>
 #include "mlx5_core.h"
 #include "lib/mpfs.h"
 
@@ -98,7 +99,7 @@ int mlx5_mpfs_init(struct mlx5_core_dev *dev)
         int l2table_size = 1 << MLX5_CAP_GEN(dev, log_max_l2_table);
         struct mlx5_mpfs *mpfs;
 
-        if (!MLX5_VPORT_MANAGER(dev))
+        if (!MLX5_ESWITCH_MANAGER(dev))
                 return 0;
 
         mpfs = kzalloc(sizeof(*mpfs), GFP_KERNEL);
@@ -122,7 +123,7 @@ void mlx5_mpfs_cleanup(struct mlx5_core_dev *dev)
 {
         struct mlx5_mpfs *mpfs = dev->priv.mpfs;
 
-        if (!MLX5_VPORT_MANAGER(dev))
+        if (!MLX5_ESWITCH_MANAGER(dev))
                 return;
 
         WARN_ON(!hlist_empty(mpfs->hash));
@@ -137,7 +138,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac)
         u32 index;
         int err;
 
-        if (!MLX5_VPORT_MANAGER(dev))
+        if (!MLX5_ESWITCH_MANAGER(dev))
                 return 0;
 
         mutex_lock(&mpfs->lock);
@@ -179,7 +180,7 @@ int mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac)
         int err = 0;
         u32 index;
 
-        if (!MLX5_VPORT_MANAGER(dev))
+        if (!MLX5_ESWITCH_MANAGER(dev))
                 return 0;
 
         mutex_lock(&mpfs->lock);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/ethernet/mellanox/mlx5/core/port.c
index fa9d0760dd36..31a9cbd85689 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c
@@ -701,7 +701,7 @@ EXPORT_SYMBOL_GPL(mlx5_query_port_prio_tc);
 static int mlx5_set_port_qetcr_reg(struct mlx5_core_dev *mdev, u32 *in,
                                    int inlen)
 {
-        u32 out[MLX5_ST_SZ_DW(qtct_reg)];
+        u32 out[MLX5_ST_SZ_DW(qetc_reg)];
 
         if (!MLX5_CAP_GEN(mdev, ets))
                 return -EOPNOTSUPP;
@@ -713,7 +713,7 @@ static int mlx5_set_port_qetcr_reg(struct mlx5_core_dev *mdev, u32 *in,
 static int mlx5_query_port_qetcr_reg(struct mlx5_core_dev *mdev, u32 *out,
                                      int outlen)
 {
-        u32 in[MLX5_ST_SZ_DW(qtct_reg)];
+        u32 in[MLX5_ST_SZ_DW(qetc_reg)];
 
         if (!MLX5_CAP_GEN(mdev, ets))
                 return -EOPNOTSUPP;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sriov.c b/drivers/net/ethernet/mellanox/mlx5/core/sriov.c
index 2a8b529ce6dd..a0674962f02c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/sriov.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/sriov.c
@@ -88,6 +88,9 @@ static int mlx5_device_enable_sriov(struct mlx5_core_dev *dev, int num_vfs)
                 return -EBUSY;
         }
 
+        if (!MLX5_ESWITCH_MANAGER(dev))
+                goto enable_vfs_hca;
+
         err = mlx5_eswitch_enable_sriov(dev->priv.eswitch, num_vfs, SRIOV_LEGACY);
         if (err) {
                 mlx5_core_warn(dev,
@@ -95,6 +98,7 @@ static int mlx5_device_enable_sriov(struct mlx5_core_dev *dev, int num_vfs)
                 return err;
         }
 
+enable_vfs_hca:
         for (vf = 0; vf < num_vfs; vf++) {
                 err = mlx5_core_enable_hca(dev, vf + 1);
                 if (err) {
@@ -140,7 +144,8 @@ static void mlx5_device_disable_sriov(struct mlx5_core_dev *dev)
         }
 
 out:
-        mlx5_eswitch_disable_sriov(dev->priv.eswitch);
+        if (MLX5_ESWITCH_MANAGER(dev))
+                mlx5_eswitch_disable_sriov(dev->priv.eswitch);
 
         if (mlx5_wait_for_vf_pages(dev))
                 mlx5_core_warn(dev, "timeout reclaiming VFs pages\n");
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
index 719cecb182c6..7eecd5b07bb1 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -549,8 +549,6 @@ int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,
                 return -EINVAL;
         if (!MLX5_CAP_GEN(mdev, vport_group_manager))
                 return -EACCES;
-        if (!MLX5_CAP_ESW(mdev, nic_vport_node_guid_modify))
-                return -EOPNOTSUPP;
 
         in = kvzalloc(inlen, GFP_KERNEL);
         if (!in)
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c
index fcdfb8e7fdea..40216d56dddc 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c
@@ -81,10 +81,10 @@ nfp_bpf_xdp_offload(struct nfp_app *app, struct nfp_net *nn,
 
         ret = nfp_net_bpf_offload(nn, prog, running, extack);
         /* Stop offload if replace not possible */
-        if (ret && prog)
-                nfp_bpf_xdp_offload(app, nn, NULL, extack);
+        if (ret)
+                return ret;
 
-        nn->dp.bpf_offload_xdp = prog && !ret;
+        nn->dp.bpf_offload_xdp = !!prog;
         return ret;
 }
 
@@ -202,6 +202,9 @@ static int nfp_bpf_setup_tc_block(struct net_device *netdev,
         if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
                 return -EOPNOTSUPP;
 
+        if (tcf_block_shared(f->block))
+                return -EOPNOTSUPP;
+
         switch (f->command) {
         case TC_BLOCK_BIND:
                 return tcf_block_cb_register(f->block,
diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c
index 91935405f586..84f7a5dbea9d 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/match.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/match.c
@@ -123,6 +123,20 @@ nfp_flower_compile_mac(struct nfp_flower_mac_mpls *frame,
                          NFP_FLOWER_MASK_MPLS_Q;
 
                 frame->mpls_lse = cpu_to_be32(t_mpls);
+        } else if (dissector_uses_key(flow->dissector,
+                                      FLOW_DISSECTOR_KEY_BASIC)) {
+                /* Check for mpls ether type and set NFP_FLOWER_MASK_MPLS_Q
+                 * bit, which indicates an mpls ether type but without any
+                 * mpls fields.
+                 */
+                struct flow_dissector_key_basic *key_basic;
+
+                key_basic = skb_flow_dissector_target(flow->dissector,
+                                                      FLOW_DISSECTOR_KEY_BASIC,
+                                                      flow->key);
+                if (key_basic->n_proto == cpu_to_be16(ETH_P_MPLS_UC) ||
+                    key_basic->n_proto == cpu_to_be16(ETH_P_MPLS_MC))
+                        frame->mpls_lse = cpu_to_be32(NFP_FLOWER_MASK_MPLS_Q);
         }
 }
 
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index c42e64f32333..525057bee0ed 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -264,6 +264,14 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,
                 case cpu_to_be16(ETH_P_ARP):
                         return -EOPNOTSUPP;
 
+                case cpu_to_be16(ETH_P_MPLS_UC):
+                case cpu_to_be16(ETH_P_MPLS_MC):
+                        if (!(key_layer & NFP_FLOWER_LAYER_MAC)) {
+                                key_layer |= NFP_FLOWER_LAYER_MAC;
+                                key_size += sizeof(struct nfp_flower_mac_mpls);
+                        }
+                        break;
+
                 /* Will be included in layer 2. */
                 case cpu_to_be16(ETH_P_8021Q):
                         break;
@@ -623,6 +631,9 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev,
         if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
                 return -EOPNOTSUPP;
 
+        if (tcf_block_shared(f->block))
+                return -EOPNOTSUPP;
+
         switch (f->command) {
         case TC_BLOCK_BIND:
                 return tcf_block_cb_register(f->block,
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
index 46b76d5a726c..152283d7e59c 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
@@ -240,7 +240,6 @@ static int nfp_pcie_sriov_read_nfd_limit(struct nfp_pf *pf)
                 return pci_sriov_set_totalvfs(pf->pdev, pf->limit_vfs);
 
         pf->limit_vfs = ~0;
-        pci_sriov_set_totalvfs(pf->pdev, 0); /* 0 is unset */
         /* Allow any setting for backwards compatibility if symbol not found */
         if (err == -ENOENT)
                 return 0;
@@ -668,7 +667,7 @@ static int nfp_pci_probe(struct pci_dev *pdev,
 
         err = nfp_net_pci_probe(pf);
         if (err)
-                goto err_sriov_unlimit;
+                goto err_fw_unload;
 
         err = nfp_hwmon_register(pf);
         if (err) {
@@ -680,8 +679,6 @@ static int nfp_pci_probe(struct pci_dev *pdev,
 
 err_net_remove:
         nfp_net_pci_remove(pf);
-err_sriov_unlimit:
-        pci_sriov_set_totalvfs(pf->pdev, 0);
 err_fw_unload:
         kfree(pf->rtbl);
         nfp_mip_close(pf->mip);
@@ -715,7 +712,6 @@ static void nfp_pci_remove(struct pci_dev *pdev)
         nfp_hwmon_unregister(pf);
 
         nfp_pcie_sriov_disable(pdev);
-        pci_sriov_set_totalvfs(pf->pdev, 0);
 
         nfp_net_pci_remove(pf);
 
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c
index cd34097b79f1..37a6d7822a38 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c
@@ -232,7 +232,7 @@ struct nfp_nffw_info *nfp_nffw_info_open(struct nfp_cpp *cpp)
         err = nfp_cpp_read(cpp, nfp_resource_cpp_id(state->res),
                            nfp_resource_address(state->res),
                            fwinf, sizeof(*fwinf));
-        if (err < sizeof(*fwinf))
+        if (err < (int)sizeof(*fwinf))
                 goto err_release;
 
         if (!nffw_res_flg_init_get(fwinf))
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
index f0b01385d5cb..e0680ce91328 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
@@ -709,9 +709,9 @@ qed_dcbx_get_local_lldp_params(struct qed_hwfn *p_hwfn,
         p_local = &p_hwfn->p_dcbx_info->lldp_local[LLDP_NEAREST_BRIDGE];
 
         memcpy(params->lldp_local.local_chassis_id, p_local->local_chassis_id,
-               ARRAY_SIZE(p_local->local_chassis_id));
+               sizeof(p_local->local_chassis_id));
         memcpy(params->lldp_local.local_port_id, p_local->local_port_id,
-               ARRAY_SIZE(p_local->local_port_id));
+               sizeof(p_local->local_port_id));
 }
 
 static void
@@ -723,9 +723,9 @@ qed_dcbx_get_remote_lldp_params(struct qed_hwfn *p_hwfn,
         p_remote = &p_hwfn->p_dcbx_info->lldp_remote[LLDP_NEAREST_BRIDGE];
 
         memcpy(params->lldp_remote.peer_chassis_id, p_remote->peer_chassis_id,
-               ARRAY_SIZE(p_remote->peer_chassis_id));
+               sizeof(p_remote->peer_chassis_id));
         memcpy(params->lldp_remote.peer_port_id, p_remote->peer_port_id,
-               ARRAY_SIZE(p_remote->peer_port_id));
+               sizeof(p_remote->peer_port_id));
 }
 
 static int
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index 329781cda77f..e5249b4741d0 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -1804,7 +1804,7 @@ int qed_hw_init(struct qed_dev *cdev, struct qed_hw_init_params *p_params)
                         DP_INFO(p_hwfn, "Failed to update driver state\n");
 
                 rc = qed_mcp_ov_update_eswitch(p_hwfn, p_hwfn->p_main_ptt,
-                                               QED_OV_ESWITCH_VEB);
+                                               QED_OV_ESWITCH_NONE);
                 if (rc)
                         DP_INFO(p_hwfn, "Failed to update eswitch mode\n");
         }
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 5c10fd7210c3..0cbc74d6ca8b 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -789,6 +789,14 @@ static int qed_slowpath_setup_int(struct qed_dev *cdev,
         /* We want a minimum of one slowpath and one fastpath vector per hwfn */
         cdev->int_params.in.min_msix_cnt = cdev->num_hwfns * 2;
 
+        if (is_kdump_kernel()) {
+                DP_INFO(cdev,
+                        "Kdump kernel: Limit the max number of requested MSI-X vectors to %hd\n",
+                        cdev->int_params.in.min_msix_cnt);
+                cdev->int_params.in.num_vectors =
+                        cdev->int_params.in.min_msix_cnt;
+        }
+
         rc = qed_set_int_mode(cdev, false);
         if (rc)  {
                 DP_ERR(cdev, "qed_slowpath_setup_int ERR\n");
diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
index f01bf52bc381..fd59cf45f4be 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_sriov.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
@@ -4513,6 +4513,8 @@ static void qed_sriov_enable_qid_config(struct qed_hwfn *hwfn,
 static int qed_sriov_enable(struct qed_dev *cdev, int num)
 {
         struct qed_iov_vf_init_params params;
+        struct qed_hwfn *hwfn;
+        struct qed_ptt *ptt;
         int i, j, rc;
 
         if (num >= RESC_NUM(&cdev->hwfns[0], QED_VPORT)) {
@@ -4525,8 +4527,8 @@ static int qed_sriov_enable(struct qed_dev *cdev, int num)
 
         /* Initialize HW for VF access */
         for_each_hwfn(cdev, j) {
-                struct qed_hwfn *hwfn = &cdev->hwfns[j];
-                struct qed_ptt *ptt = qed_ptt_acquire(hwfn);
+                hwfn = &cdev->hwfns[j];
+                ptt = qed_ptt_acquire(hwfn);
 
                 /* Make sure not to use more than 16 queues per VF */
                 params.num_queues = min_t(int,
@@ -4562,6 +4564,19 @@ static int qed_sriov_enable(struct qed_dev *cdev, int num)
                 goto err;
         }
 
+        hwfn = QED_LEADING_HWFN(cdev);
+        ptt = qed_ptt_acquire(hwfn);
+        if (!ptt) {
+                DP_ERR(hwfn, "Failed to acquire ptt\n");
+                rc = -EBUSY;
+                goto err;
+        }
+
+        rc = qed_mcp_ov_update_eswitch(hwfn, ptt, QED_OV_ESWITCH_VEB);
+        if (rc)
+                DP_INFO(cdev, "Failed to update eswitch mode\n");
+        qed_ptt_release(hwfn, ptt);
+
         return num;
 
 err:
diff --git a/drivers/net/ethernet/qlogic/qede/qede_ptp.c b/drivers/net/ethernet/qlogic/qede/qede_ptp.c
index 02adb513f475..013ff567283c 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_ptp.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ptp.c
@@ -337,8 +337,14 @@ int qede_ptp_get_ts_info(struct qede_dev *edev, struct ethtool_ts_info *info)
 {
         struct qede_ptp *ptp = edev->ptp;
 
-        if (!ptp)
-                return -EIO;
+        if (!ptp) {
+                info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
+                                        SOF_TIMESTAMPING_RX_SOFTWARE |
+                                        SOF_TIMESTAMPING_SOFTWARE;
+                info->phc_index = -1;
+
+                return 0;
+        }
 
         info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
                                 SOF_TIMESTAMPING_RX_SOFTWARE |
diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index 8edf20967c82..e045a5d6b938 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c
@@ -2794,6 +2794,7 @@ int efx_farch_filter_table_probe(struct efx_nic *efx)
         if (!state)
                 return -ENOMEM;
         efx->filter_state = state;
+        init_rwsem(&state->lock);
 
         table = &state->table[EFX_FARCH_FILTER_TABLE_RX_IP];
         table->id = EFX_FARCH_FILTER_TABLE_RX_IP;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
index d37f17ca62fe..65bc3556bd8f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
@@ -407,6 +407,16 @@ static void dwmac4_enable_tso(void __iomem *ioaddr, bool en, u32 chan)
         }
 }
 
+static void dwmac4_set_bfsize(void __iomem *ioaddr, int bfsize, u32 chan)
+{
+        u32 value = readl(ioaddr + DMA_CHAN_RX_CONTROL(chan));
+
+        value &= ~DMA_RBSZ_MASK;
+        value |= (bfsize << DMA_RBSZ_SHIFT) & DMA_RBSZ_MASK;
+
+        writel(value, ioaddr + DMA_CHAN_RX_CONTROL(chan));
+}
+
 const struct stmmac_dma_ops dwmac4_dma_ops = {
         .reset = dwmac4_dma_reset,
         .init = dwmac4_dma_init,
@@ -431,6 +441,7 @@ const struct stmmac_dma_ops dwmac4_dma_ops = {
         .set_rx_tail_ptr = dwmac4_set_rx_tail_ptr,
         .set_tx_tail_ptr = dwmac4_set_tx_tail_ptr,
         .enable_tso = dwmac4_enable_tso,
+        .set_bfsize = dwmac4_set_bfsize,
 };
 
 const struct stmmac_dma_ops dwmac410_dma_ops = {
@@ -457,4 +468,5 @@ const struct stmmac_dma_ops dwmac410_dma_ops = {
         .set_rx_tail_ptr = dwmac4_set_rx_tail_ptr,
         .set_tx_tail_ptr = dwmac4_set_tx_tail_ptr,
         .enable_tso = dwmac4_enable_tso,
+        .set_bfsize = dwmac4_set_bfsize,
 };
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h
index c63c1fe3f26b..22a4a6dbb1a4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h
@@ -120,6 +120,8 @@
 
 /* DMA Rx Channel X Control register defines */
 #define DMA_CONTROL_SR                  BIT(0)
+#define DMA_RBSZ_MASK                   GENMASK(14, 1)
+#define DMA_RBSZ_SHIFT                  1
 
 /* Interrupt status per channel */
 #define DMA_CHAN_STATUS_REB             GENMASK(21, 19)
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index e44e7b26ce82..fe8b536b13f8 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -183,6 +183,7 @@ struct stmmac_dma_ops {
         void (*set_rx_tail_ptr)(void __iomem *ioaddr, u32 tail_ptr, u32 chan);
         void (*set_tx_tail_ptr)(void __iomem *ioaddr, u32 tail_ptr, u32 chan);
         void (*enable_tso)(void __iomem *ioaddr, bool en, u32 chan);
+        void (*set_bfsize)(void __iomem *ioaddr, int bfsize, u32 chan);
 };
 
 #define stmmac_reset(__priv, __args...) \
@@ -235,6 +236,8 @@ struct stmmac_dma_ops {
         stmmac_do_void_callback(__priv, dma, set_tx_tail_ptr, __args)
 #define stmmac_enable_tso(__priv, __args...) \
         stmmac_do_void_callback(__priv, dma, enable_tso, __args)
+#define stmmac_set_dma_bfsize(__priv, __args...) \
+        stmmac_do_void_callback(__priv, dma, set_bfsize, __args)
 
 struct mac_device_info;
 struct net_device;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index cba46b62a1cd..60f59abab009 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1804,6 +1804,8 @@ static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
 
                 stmmac_dma_rx_mode(priv, priv->ioaddr, rxmode, chan,
                                 rxfifosz, qmode);
+                stmmac_set_dma_bfsize(priv, priv->ioaddr, priv->dma_buf_sz,
+                                chan);
         }
 
         for (chan = 0; chan < tx_channels_count; chan++) {
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 750eaa53bf0c..ada33c2d9ac2 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -476,7 +476,7 @@ static struct sk_buff **geneve_gro_receive(struct sock *sk,
 out_unlock:
         rcu_read_unlock();
 out:
-        NAPI_GRO_CB(skb)->flush |= flush;
+        skb_gro_flush_final(skb, pp, flush);
 
         return pp;
 }
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 1a924b867b07..4b6e308199d2 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -210,7 +210,7 @@ int netvsc_recv_callback(struct net_device *net,
 void netvsc_channel_cb(void *context);
 int netvsc_poll(struct napi_struct *napi, int budget);
 
-void rndis_set_subchannel(struct work_struct *w);
+int rndis_set_subchannel(struct net_device *ndev, struct netvsc_device *nvdev);
 int rndis_filter_open(struct netvsc_device *nvdev);
 int rndis_filter_close(struct netvsc_device *nvdev);
 struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 5d5bd513847f..8e9d0ee1572b 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -65,6 +65,41 @@ void netvsc_switch_datapath(struct net_device *ndev, bool vf)
                                VM_PKT_DATA_INBAND, 0);
 }
 
+/* Worker to setup sub channels on initial setup
+ * Initial hotplug event occurs in softirq context
+ * and can't wait for channels.
+ */
+static void netvsc_subchan_work(struct work_struct *w)
+{
+        struct netvsc_device *nvdev =
+                container_of(w, struct netvsc_device, subchan_work);
+        struct rndis_device *rdev;
+        int i, ret;
+
+        /* Avoid deadlock with device removal already under RTNL */
+        if (!rtnl_trylock()) {
+                schedule_work(w);
+                return;
+        }
+
+        rdev = nvdev->extension;
+        if (rdev) {
+                ret = rndis_set_subchannel(rdev->ndev, nvdev);
+                if (ret == 0) {
+                        netif_device_attach(rdev->ndev);
+                } else {
+                        /* fallback to only primary channel */
+                        for (i = 1; i < nvdev->num_chn; i++)
+                                netif_napi_del(&nvdev->chan_table[i].napi);
+
+                        nvdev->max_chn = 1;
+                        nvdev->num_chn = 1;
+                }
+        }
+
+        rtnl_unlock();
+}
+
 static struct netvsc_device *alloc_net_device(void)
 {
         struct netvsc_device *net_device;
@@ -81,7 +116,7 @@ static struct netvsc_device *alloc_net_device(void)
 
         init_completion(&net_device->channel_init_wait);
         init_waitqueue_head(&net_device->subchan_open);
-        INIT_WORK(&net_device->subchan_work, rndis_set_subchannel);
+        INIT_WORK(&net_device->subchan_work, netvsc_subchan_work);
 
         return net_device;
 }
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index fe2256bf1d13..dd1d6e115145 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -905,8 +905,20 @@ static int netvsc_attach(struct net_device *ndev,
         if (IS_ERR(nvdev))
                 return PTR_ERR(nvdev);
 
-        /* Note: enable and attach happen when sub-channels setup */
+        if (nvdev->num_chn > 1) {
+                ret = rndis_set_subchannel(ndev, nvdev);
+
+                /* if unavailable, just proceed with one queue */
+                if (ret) {
+                        nvdev->max_chn = 1;
+                        nvdev->num_chn = 1;
+                }
+        }
+
+        /* In any case device is now ready */
+        netif_device_attach(ndev);
 
+        /* Note: enable and attach happen when sub-channels setup */
         netif_carrier_off(ndev);
 
         if (netif_running(ndev)) {
@@ -2089,6 +2101,9 @@ static int netvsc_probe(struct hv_device *dev,
 
         memcpy(net->dev_addr, device_info.mac_adr, ETH_ALEN);
 
+        if (nvdev->num_chn > 1)
+                schedule_work(&nvdev->subchan_work);
+
         /* hw_features computed in rndis_netdev_set_hwcaps() */
         net->features = net->hw_features |
                 NETIF_F_HIGHDMA | NETIF_F_SG |
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 5428bb261102..9b4e3c3787e5 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -1062,29 +1062,15 @@ static void netvsc_sc_open(struct vmbus_channel *new_sc)
  * This breaks overlap of processing the host message for the
  * new primary channel with the initialization of sub-channels.
  */
-void rndis_set_subchannel(struct work_struct *w)
+int rndis_set_subchannel(struct net_device *ndev, struct netvsc_device *nvdev)
 {
-        struct netvsc_device *nvdev
-                = container_of(w, struct netvsc_device, subchan_work);
         struct nvsp_message *init_packet = &nvdev->channel_init_pkt;
-        struct net_device_context *ndev_ctx;
-        struct rndis_device *rdev;
-        struct net_device *ndev;
-        struct hv_device *hv_dev;
+        struct net_device_context *ndev_ctx = netdev_priv(ndev);
+        struct hv_device *hv_dev = ndev_ctx->device_ctx;
+        struct rndis_device *rdev = nvdev->extension;
         int i, ret;
 
-        if (!rtnl_trylock()) {
-                schedule_work(w);
-                return;
-        }
-
-        rdev = nvdev->extension;
-        if (!rdev)
-                goto unlock;    /* device was removed */
-
-        ndev = rdev->ndev;
-        ndev_ctx = netdev_priv(ndev);
-        hv_dev = ndev_ctx->device_ctx;
+        ASSERT_RTNL();
 
         memset(init_packet, 0, sizeof(struct nvsp_message));
         init_packet->hdr.msg_type = NVSP_MSG5_TYPE_SUBCHANNEL;
@@ -1100,13 +1086,13 @@ void rndis_set_subchannel(struct work_struct *w)
                                VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
         if (ret) {
                 netdev_err(ndev, "sub channel allocate send failed: %d\n", ret);
-                goto failed;
+                return ret;
         }
 
         wait_for_completion(&nvdev->channel_init_wait);
         if (init_packet->msg.v5_msg.subchn_comp.status != NVSP_STAT_SUCCESS) {
                 netdev_err(ndev, "sub channel request failed\n");
-                goto failed;
+                return -EIO;
         }
 
         nvdev->num_chn = 1 +
@@ -1125,21 +1111,7 @@ void rndis_set_subchannel(struct work_struct *w)
         for (i = 0; i < VRSS_SEND_TAB_SIZE; i++)
                 ndev_ctx->tx_table[i] = i % nvdev->num_chn;
 
-        netif_device_attach(ndev);
-        rtnl_unlock();
-        return;
-
-failed:
-        /* fallback to only primary channel */
-        for (i = 1; i < nvdev->num_chn; i++)
-                netif_napi_del(&nvdev->chan_table[i].napi);
-
-        nvdev->max_chn = 1;
-        nvdev->num_chn = 1;
-
-        netif_device_attach(ndev);
-unlock:
-        rtnl_unlock();
+        return 0;
 }
 
 static int rndis_netdev_set_hwcaps(struct rndis_device *rndis_device,
@@ -1360,21 +1332,12 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
                 netif_napi_add(net, &net_device->chan_table[i].napi,
                                netvsc_poll, NAPI_POLL_WEIGHT);
 
-        if (net_device->num_chn > 1)
-                schedule_work(&net_device->subchan_work);
+        return net_device;
 
 out:
-        /* if unavailable, just proceed with one queue */
-        if (ret) {
-                net_device->max_chn = 1;
-                net_device->num_chn = 1;
-        }
-
-        /* No sub channels, device is ready */
-        if (net_device->num_chn == 1)
-                netif_device_attach(net);
-
-        return net_device;
+        /* setting up multiple channels failed */
+        net_device->max_chn = 1;
+        net_device->num_chn = 1;
 
 err_dev_remv:
         rndis_filter_device_remove(dev, net_device);
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 23c1d6600241..4a949569ec4c 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -75,10 +75,23 @@ static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval)
 {
         struct ipvl_dev *ipvlan;
         struct net_device *mdev = port->dev;
-        int err = 0;
+        unsigned int flags;
+        int err;
 
         ASSERT_RTNL();
         if (port->mode != nval) {
+                list_for_each_entry(ipvlan, &port->ipvlans, pnode) {
+                        flags = ipvlan->dev->flags;
+                        if (nval == IPVLAN_MODE_L3 || nval == IPVLAN_MODE_L3S) {
+                                err = dev_change_flags(ipvlan->dev,
+                                                       flags | IFF_NOARP);
+                        } else {
+                                err = dev_change_flags(ipvlan->dev,
+                                                       flags & ~IFF_NOARP);
+                        }
+                        if (unlikely(err))
+                                goto fail;
+                }
                 if (nval == IPVLAN_MODE_L3S) {
                         /* New mode is L3S */
                         err = ipvlan_register_nf_hook(read_pnet(&port->pnet));
@@ -86,21 +99,28 @@ static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval)
                                 mdev->l3mdev_ops = &ipvl_l3mdev_ops;
                                 mdev->priv_flags |= IFF_L3MDEV_MASTER;
                         } else
-                                return err;
+                                goto fail;
                 } else if (port->mode == IPVLAN_MODE_L3S) {
                         /* Old mode was L3S */
                         mdev->priv_flags &= ~IFF_L3MDEV_MASTER;
                         ipvlan_unregister_nf_hook(read_pnet(&port->pnet));
                         mdev->l3mdev_ops = NULL;
                 }
-                list_for_each_entry(ipvlan, &port->ipvlans, pnode) {
-                        if (nval == IPVLAN_MODE_L3 || nval == IPVLAN_MODE_L3S)
-                                ipvlan->dev->flags |= IFF_NOARP;
-                        else
-                                ipvlan->dev->flags &= ~IFF_NOARP;
-                }
                 port->mode = nval;
         }
+        return 0;
+
+fail:
+        /* Undo the flags changes that have been done so far. */
+        list_for_each_entry_continue_reverse(ipvlan, &port->ipvlans, pnode) {
+                flags = ipvlan->dev->flags;
+                if (port->mode == IPVLAN_MODE_L3 ||
+                    port->mode == IPVLAN_MODE_L3S)
+                        dev_change_flags(ipvlan->dev, flags | IFF_NOARP);
+                else
+                        dev_change_flags(ipvlan->dev, flags & ~IFF_NOARP);
+        }
+
         return err;
 }
 
diff --git a/drivers/net/phy/dp83tc811.c b/drivers/net/phy/dp83tc811.c
index 081d99aa3985..49ac678eb2dc 100644
--- a/drivers/net/phy/dp83tc811.c
+++ b/drivers/net/phy/dp83tc811.c
@@ -222,7 +222,7 @@ static int dp83811_config_intr(struct phy_device *phydev)
                 if (err < 0)
                         return err;
 
-                err = phy_write(phydev, MII_DP83811_INT_STAT1, 0);
+                err = phy_write(phydev, MII_DP83811_INT_STAT2, 0);
         }
 
         return err;
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 8dff87ec6d99..2e4130746c40 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -64,6 +64,7 @@
 #define DEFAULT_RX_CSUM_ENABLE          (true)
 #define DEFAULT_TSO_CSUM_ENABLE         (true)
 #define DEFAULT_VLAN_FILTER_ENABLE      (true)
+#define DEFAULT_VLAN_RX_OFFLOAD         (true)
 #define TX_OVERHEAD                     (8)
 #define RXW_PADDING                     2
 
@@ -2298,7 +2299,7 @@ static int lan78xx_change_mtu(struct net_device *netdev, int new_mtu)
         if ((ll_mtu % dev->maxpacket) == 0)
                 return -EDOM;
 
-        ret = lan78xx_set_rx_max_frame_length(dev, new_mtu + ETH_HLEN);
+        ret = lan78xx_set_rx_max_frame_length(dev, new_mtu + VLAN_ETH_HLEN);
 
         netdev->mtu = new_mtu;
 
@@ -2364,6 +2365,11 @@ static int lan78xx_set_features(struct net_device *netdev,
         }
 
         if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                pdata->rfe_ctl |= RFE_CTL_VLAN_STRIP_;
+        else
+                pdata->rfe_ctl &= ~RFE_CTL_VLAN_STRIP_;
+
+        if (features & NETIF_F_HW_VLAN_CTAG_FILTER)
                 pdata->rfe_ctl |= RFE_CTL_VLAN_FILTER_;
         else
                 pdata->rfe_ctl &= ~RFE_CTL_VLAN_FILTER_;
@@ -2587,7 +2593,8 @@ static int lan78xx_reset(struct lan78xx_net *dev)
         buf |= FCT_TX_CTL_EN_;
         ret = lan78xx_write_reg(dev, FCT_TX_CTL, buf);
 
-        ret = lan78xx_set_rx_max_frame_length(dev, dev->net->mtu + ETH_HLEN);
+        ret = lan78xx_set_rx_max_frame_length(dev,
+                                              dev->net->mtu + VLAN_ETH_HLEN);
 
         ret = lan78xx_read_reg(dev, MAC_RX, &buf);
         buf |= MAC_RX_RXEN_;
@@ -2975,6 +2982,12 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)
         if (DEFAULT_TSO_CSUM_ENABLE)
                 dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG;
 
+        if (DEFAULT_VLAN_RX_OFFLOAD)
+                dev->net->features |= NETIF_F_HW_VLAN_CTAG_RX;
+
+        if (DEFAULT_VLAN_FILTER_ENABLE)
+                dev->net->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
+
         dev->net->hw_features = dev->net->features;
 
         ret = lan78xx_setup_irq_domain(dev);
@@ -3039,8 +3052,13 @@ static void lan78xx_rx_csum_offload(struct lan78xx_net *dev,
                                     struct sk_buff *skb,
                                     u32 rx_cmd_a, u32 rx_cmd_b)
 {
+        /* HW Checksum offload appears to be flawed if used when not stripping
+         * VLAN headers. Drop back to S/W checksums under these conditions.
+         */
         if (!(dev->net->features & NETIF_F_RXCSUM) ||
-            unlikely(rx_cmd_a & RX_CMD_A_ICSM_)) {
+            unlikely(rx_cmd_a & RX_CMD_A_ICSM_) ||
+            ((rx_cmd_a & RX_CMD_A_FVTG_) &&
+             !(dev->net->features & NETIF_F_HW_VLAN_CTAG_RX))) {
                 skb->ip_summed = CHECKSUM_NONE;
         } else {
                 skb->csum = ntohs((u16)(rx_cmd_b >> RX_CMD_B_CSUM_SHIFT_));
@@ -3048,6 +3066,16 @@ static void lan78xx_rx_csum_offload(struct lan78xx_net *dev,
         }
 }
 
+static void lan78xx_rx_vlan_offload(struct lan78xx_net *dev,
+                                    struct sk_buff *skb,
+                                    u32 rx_cmd_a, u32 rx_cmd_b)
+{
+        if ((dev->net->features & NETIF_F_HW_VLAN_CTAG_RX) &&
+            (rx_cmd_a & RX_CMD_A_FVTG_))
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+                                       (rx_cmd_b & 0xffff));
+}
+
 static void lan78xx_skb_return(struct lan78xx_net *dev, struct sk_buff *skb)
 {
         int             status;
@@ -3112,6 +3140,8 @@ static int lan78xx_rx(struct lan78xx_net *dev, struct sk_buff *skb)
                         if (skb->len == size) {
                                 lan78xx_rx_csum_offload(dev, skb,
                                                         rx_cmd_a, rx_cmd_b);
+                                lan78xx_rx_vlan_offload(dev, skb,
+                                                        rx_cmd_a, rx_cmd_b);
 
                                 skb_trim(skb, skb->len - 4); /* remove fcs */
                                 skb->truesize = size + sizeof(struct sk_buff);
@@ -3130,6 +3160,7 @@ static int lan78xx_rx(struct lan78xx_net *dev, struct sk_buff *skb)
                         skb_set_tail_pointer(skb2, size);
 
                         lan78xx_rx_csum_offload(dev, skb2, rx_cmd_a, rx_cmd_b);
+                        lan78xx_rx_vlan_offload(dev, skb2, rx_cmd_a, rx_cmd_b);
 
                         skb_trim(skb2, skb2->len - 4); /* remove fcs */
                         skb2->truesize = size + sizeof(struct sk_buff);
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 86f7196f9d91..2a58607a6aea 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3962,7 +3962,8 @@ static int rtl8152_close(struct net_device *netdev)
 #ifdef CONFIG_PM_SLEEP
         unregister_pm_notifier(&tp->pm_notifier);
 #endif
-        napi_disable(&tp->napi);
+        if (!test_bit(RTL8152_UNPLUG, &tp->flags))
+                napi_disable(&tp->napi);
         clear_bit(WORK_ENABLE, &tp->flags);
         usb_kill_urb(tp->intr_urb);
         cancel_delayed_work_sync(&tp->schedule);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index b6c9a2af3732..53085c63277b 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -53,6 +53,10 @@ module_param(napi_tx, bool, 0644);
 /* Amount of XDP headroom to prepend to packets for use by xdp_adjust_head */
 #define VIRTIO_XDP_HEADROOM 256
 
+/* Separating two types of XDP xmit */
+#define VIRTIO_XDP_TX           BIT(0)
+#define VIRTIO_XDP_REDIR        BIT(1)
+
 /* RX packet size EWMA. The average packet size is used to determine the packet
  * buffer size when refilling RX rings. As the entire RX ring may be refilled
  * at once, the weight is chosen so that the EWMA will be insensitive to short-
@@ -582,7 +586,7 @@ static struct sk_buff *receive_small(struct net_device *dev,
                                      struct receive_queue *rq,
                                      void *buf, void *ctx,
                                      unsigned int len,
-                                     bool *xdp_xmit)
+                                     unsigned int *xdp_xmit)
 {
         struct sk_buff *skb;
         struct bpf_prog *xdp_prog;
@@ -654,14 +658,14 @@ static struct sk_buff *receive_small(struct net_device *dev,
                                 trace_xdp_exception(vi->dev, xdp_prog, act);
                                 goto err_xdp;
                         }
-                        *xdp_xmit = true;
+                        *xdp_xmit |= VIRTIO_XDP_TX;
                         rcu_read_unlock();
                         goto xdp_xmit;
                 case XDP_REDIRECT:
                         err = xdp_do_redirect(dev, &xdp, xdp_prog);
                         if (err)
                                 goto err_xdp;
-                        *xdp_xmit = true;
+                        *xdp_xmit |= VIRTIO_XDP_REDIR;
                         rcu_read_unlock();
                         goto xdp_xmit;
                 default:
@@ -723,7 +727,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                                          void *buf,
                                          void *ctx,
                                          unsigned int len,
-                                         bool *xdp_xmit)
+                                         unsigned int *xdp_xmit)
 {
         struct virtio_net_hdr_mrg_rxbuf *hdr = buf;
         u16 num_buf = virtio16_to_cpu(vi->vdev, hdr->num_buffers);
@@ -818,7 +822,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                                         put_page(xdp_page);
                                 goto err_xdp;
                         }
-                        *xdp_xmit = true;
+                        *xdp_xmit |= VIRTIO_XDP_TX;
                         if (unlikely(xdp_page != page))
                                 put_page(page);
                         rcu_read_unlock();
@@ -830,7 +834,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                                         put_page(xdp_page);
                                 goto err_xdp;
                         }
-                        *xdp_xmit = true;
+                        *xdp_xmit |= VIRTIO_XDP_REDIR;
                         if (unlikely(xdp_page != page))
                                 put_page(page);
                         rcu_read_unlock();
@@ -939,7 +943,8 @@ xdp_xmit:
 }
 
 static int receive_buf(struct virtnet_info *vi, struct receive_queue *rq,
-                       void *buf, unsigned int len, void **ctx, bool *xdp_xmit)
+                       void *buf, unsigned int len, void **ctx,
+                       unsigned int *xdp_xmit)
 {
         struct net_device *dev = vi->dev;
         struct sk_buff *skb;
@@ -1232,7 +1237,8 @@ static void refill_work(struct work_struct *work)
         }
 }
 
-static int virtnet_receive(struct receive_queue *rq, int budget, bool *xdp_xmit)
+static int virtnet_receive(struct receive_queue *rq, int budget,
+                           unsigned int *xdp_xmit)
 {
         struct virtnet_info *vi = rq->vq->vdev->priv;
         unsigned int len, received = 0, bytes = 0;
@@ -1321,7 +1327,7 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
         struct virtnet_info *vi = rq->vq->vdev->priv;
         struct send_queue *sq;
         unsigned int received, qp;
-        bool xdp_xmit = false;
+        unsigned int xdp_xmit = 0;
 
         virtnet_poll_cleantx(rq);
 
@@ -1331,12 +1337,14 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
         if (received < budget)
                 virtqueue_napi_complete(napi, rq->vq, received);
 
-        if (xdp_xmit) {
+        if (xdp_xmit & VIRTIO_XDP_REDIR)
+                xdp_do_flush_map();
+
+        if (xdp_xmit & VIRTIO_XDP_TX) {
                 qp = vi->curr_queue_pairs - vi->xdp_queue_pairs +
                      smp_processor_id();
                 sq = &vi->sq[qp];
                 virtqueue_kick(sq->vq);
-                xdp_do_flush_map();
         }
 
         return received;
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index aee0e60471f1..f6bb1d54d4bd 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -623,9 +623,7 @@ static struct sk_buff **vxlan_gro_receive(struct sock *sk,
         flush = 0;
 
 out:
-        skb_gro_remcsum_cleanup(skb, &grc);
-        skb->remcsum_offload = 0;
-        NAPI_GRO_CB(skb)->flush |= flush;
+        skb_gro_flush_final_remcsum(skb, pp, flush, &grc);
 
         return pp;
 }
diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
index 16f52c626b4b..91b0194240a5 100644
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@ -58,7 +58,6 @@ config PCIE_DW_PLAT_HOST
         depends on PCI && PCI_MSI_IRQ_DOMAIN
         select PCIE_DW_HOST
         select PCIE_DW_PLAT
-        default y
         help
           Enables support for the PCIe controller in the Designware IP to
           work in host mode. There are two instances of PCIe controller in
diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
index a1ebe9ed441f..20bb2564a6b3 100644
--- a/drivers/pci/controller/pci-ftpci100.c
+++ b/drivers/pci/controller/pci-ftpci100.c
@@ -355,11 +355,13 @@ static int faraday_pci_setup_cascaded_irq(struct faraday_pci *p)
         irq = of_irq_get(intc, 0);
         if (irq <= 0) {
                 dev_err(p->dev, "failed to get parent IRQ\n");
+                of_node_put(intc);
                 return irq ?: -EINVAL;
         }
 
         p->irqdomain = irq_domain_add_linear(intc, PCI_NUM_INTX,
                                              &faraday_pci_irqdomain_ops, p);
+        of_node_put(intc);
         if (!p->irqdomain) {
                 dev_err(p->dev, "failed to create Gemini PCI IRQ domain\n");
                 return -EINVAL;
diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
index 874d75c9ee4a..c8febb009454 100644
--- a/drivers/pci/controller/pcie-rcar.c
+++ b/drivers/pci/controller/pcie-rcar.c
@@ -680,7 +680,11 @@ static int rcar_pcie_phy_init_gen3(struct rcar_pcie *pcie)
         if (err)
                 return err;
 
-        return phy_power_on(pcie->phy);
+        err = phy_power_on(pcie->phy);
+        if (err)
+                phy_exit(pcie->phy);
+
+        return err;
 }
 
 static int rcar_msi_alloc(struct rcar_msi *chip)
@@ -1165,7 +1169,7 @@ static int rcar_pcie_probe(struct platform_device *pdev)
         if (rcar_pcie_hw_init(pcie)) {
                 dev_info(dev, "PCIe link down\n");
                 err = -ENODEV;
-                goto err_clk_disable;
+                goto err_phy_shutdown;
         }
 
         data = rcar_pci_read_reg(pcie, MACSR);
@@ -1177,7 +1181,7 @@ static int rcar_pcie_probe(struct platform_device *pdev)
                         dev_err(dev,
                                 "failed to enable MSI support: %d\n",
                                 err);
-                        goto err_clk_disable;
+                        goto err_phy_shutdown;
                 }
         }
 
@@ -1191,6 +1195,12 @@ err_msi_teardown:
         if (IS_ENABLED(CONFIG_PCI_MSI))
                 rcar_pcie_teardown_msi(pcie);
 
+err_phy_shutdown:
+        if (pcie->phy) {
+                phy_power_off(pcie->phy);
+                phy_exit(pcie->phy);
+        }
+
 err_clk_disable:
         clk_disable_unprepare(pcie->bus_clk);
 
diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c
index 6a4bbb5b3de0..fb32840ce8e6 100644
--- a/drivers/pci/controller/pcie-xilinx-nwl.c
+++ b/drivers/pci/controller/pcie-xilinx-nwl.c
@@ -559,7 +559,7 @@ static int nwl_pcie_init_irq_domain(struct nwl_pcie *pcie)
                                                         PCI_NUM_INTX,
                                                         &legacy_domain_ops,
                                                         pcie);
-
+        of_node_put(legacy_intc_node);
         if (!pcie->legacy_irq_domain) {
                 dev_err(dev, "failed to create IRQ domain\n");
                 return -ENOMEM;
diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c
index b110a3a814e3..7b1389d8e2a5 100644
--- a/drivers/pci/controller/pcie-xilinx.c
+++ b/drivers/pci/controller/pcie-xilinx.c
@@ -509,6 +509,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
         port->leg_domain = irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX,
                                                  &intx_domain_ops,
                                                  port);
+        of_node_put(pcie_intc_node);
         if (!port->leg_domain) {
                 dev_err(dev, "Failed to get a INTx IRQ domain\n");
                 return -ENODEV;
diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c
index 523a8cab3bfb..bf53fad636a5 100644
--- a/drivers/pci/endpoint/pci-epf-core.c
+++ b/drivers/pci/endpoint/pci-epf-core.c
@@ -145,10 +145,10 @@ EXPORT_SYMBOL_GPL(pci_epf_alloc_space);
  */
 void pci_epf_unregister_driver(struct pci_epf_driver *driver)
 {
-        struct config_group *group;
+        struct config_group *group, *tmp;
 
         mutex_lock(&pci_epf_mutex);
-        list_for_each_entry(group, &driver->epf_group, group_entry)
+        list_for_each_entry_safe(group, tmp, &driver->epf_group, group_entry)
                 pci_ep_cfs_remove_epf_group(group);
         list_del(&driver->epf_group);
         mutex_unlock(&pci_epf_mutex);
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index d0d73dbbd5ca..0f04ae648cf1 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -575,6 +575,22 @@ void pci_iov_release(struct pci_dev *dev)
 }
 
 /**
+ * pci_iov_remove - clean up SR-IOV state after PF driver is detached
+ * @dev: the PCI device
+ */
+void pci_iov_remove(struct pci_dev *dev)
+{
+        struct pci_sriov *iov = dev->sriov;
+
+        if (!dev->is_physfn)
+                return;
+
+        iov->driver_max_VFs = iov->total_VFs;
+        if (iov->num_VFs)
+                pci_warn(dev, "driver left SR-IOV enabled after remove\n");
+}
+
+/**
  * pci_iov_update_resource - update a VF BAR
  * @dev: the PCI device
  * @resno: the resource number
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 65113b6eed14..89ee6a2b6eb8 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -629,6 +629,18 @@ static bool acpi_pci_need_resume(struct pci_dev *dev)
 {
         struct acpi_device *adev = ACPI_COMPANION(&dev->dev);
 
+        /*
+         * In some cases (eg. Samsung 305V4A) leaving a bridge in suspend over
+         * system-wide suspend/resume confuses the platform firmware, so avoid
+         * doing that, unless the bridge has a driver that should take care of
+         * the PM handling.  According to Section 16.1.6 of ACPI 6.2, endpoint
+         * devices are expected to be in D3 before invoking the S3 entry path
+         * from the firmware, so they should not be affected by this issue.
+         */
+        if (pci_is_bridge(dev) && !dev->driver &&
+            acpi_target_system_state() != ACPI_STATE_S0)
+                return true;
+
         if (!adev || !acpi_device_power_manageable(adev))
                 return false;
 
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index c125d53033c6..6792292b5fc7 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -445,6 +445,7 @@ static int pci_device_remove(struct device *dev)
                 }
                 pcibios_free_irq(pci_dev);
                 pci_dev->driver = NULL;
+                pci_iov_remove(pci_dev);
         }
 
         /* Undo the runtime PM settings in local_pci_probe() */
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index c358e7a07f3f..882f1f9596df 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -311,6 +311,7 @@ static inline void pci_restore_ats_state(struct pci_dev *dev)
 #ifdef CONFIG_PCI_IOV
 int pci_iov_init(struct pci_dev *dev);
 void pci_iov_release(struct pci_dev *dev);
+void pci_iov_remove(struct pci_dev *dev);
 void pci_iov_update_resource(struct pci_dev *dev, int resno);
 resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno);
 void pci_restore_iov_state(struct pci_dev *dev);
@@ -325,6 +326,9 @@ static inline void pci_iov_release(struct pci_dev *dev)
 
 {
 }
+static inline void pci_iov_remove(struct pci_dev *dev)
+{
+}
 static inline void pci_restore_iov_state(struct pci_dev *dev)
 {
 }
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index d3a38c421503..a9f60d0ee02e 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -41,6 +41,15 @@
 
 #define DASD_DIAG_MOD           "dasd_diag_mod"
 
+static unsigned int queue_depth = 32;
+static unsigned int nr_hw_queues = 4;
+
+module_param(queue_depth, uint, 0444);
+MODULE_PARM_DESC(queue_depth, "Default queue depth for new DASD devices");
+
+module_param(nr_hw_queues, uint, 0444);
+MODULE_PARM_DESC(nr_hw_queues, "Default number of hardware queues for new DASD devices");
+
 /*
  * SECTION: exported variables of dasd.c
  */
@@ -3115,8 +3124,8 @@ static int dasd_alloc_queue(struct dasd_block *block)
 
         block->tag_set.ops = &dasd_mq_ops;
         block->tag_set.cmd_size = sizeof(struct dasd_ccw_req);
-        block->tag_set.nr_hw_queues = DASD_NR_HW_QUEUES;
-        block->tag_set.queue_depth = DASD_MAX_LCU_DEV * DASD_REQ_PER_DEV;
+        block->tag_set.nr_hw_queues = nr_hw_queues;
+        block->tag_set.queue_depth = queue_depth;
         block->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
 
         rc = blk_mq_alloc_tag_set(&block->tag_set);
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 976b6bd4fb05..de6b96036aa4 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -228,14 +228,6 @@ struct dasd_ccw_req {
 #define DASD_CQR_SUPPRESS_IL    6       /* Suppress 'Incorrect Length' error */
 #define DASD_CQR_SUPPRESS_CR    7       /* Suppress 'Command Reject' error */
 
-/*
- * There is no reliable way to determine the number of available CPUs on
- * LPAR but there is no big performance difference between 1 and the
- * maximum CPU number.
- * 64 is a good trade off performance wise.
- */
-#define DASD_NR_HW_QUEUES 64
-#define DASD_MAX_LCU_DEV 256
 #define DASD_REQ_PER_DEV 4
 
 /* Signature for error recovery functions. */
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 2a5fec55bf60..a246a618f9a4 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -829,6 +829,17 @@ struct qeth_trap_id {
 /*some helper functions*/
 #define QETH_CARD_IFNAME(card) (((card)->dev)? (card)->dev->name : "")
 
+static inline void qeth_scrub_qdio_buffer(struct qdio_buffer *buf,
+                                          unsigned int elements)
+{
+        unsigned int i;
+
+        for (i = 0; i < elements; i++)
+                memset(&buf->element[i], 0, sizeof(struct qdio_buffer_element));
+        buf->element[14].sflags = 0;
+        buf->element[15].sflags = 0;
+}
+
 /**
  * qeth_get_elements_for_range() -      find number of SBALEs to cover range.
  * @start:                              Start of the address range.
@@ -1029,7 +1040,7 @@ struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *,
                                                  __u16, __u16,
                                                  enum qeth_prot_versions);
 int qeth_set_features(struct net_device *, netdev_features_t);
-void qeth_recover_features(struct net_device *dev);
+void qeth_enable_hw_features(struct net_device *dev);
 netdev_features_t qeth_fix_features(struct net_device *, netdev_features_t);
 netdev_features_t qeth_features_check(struct sk_buff *skb,
                                       struct net_device *dev,
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 8e1474f1ffac..d01ac29fd986 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -73,9 +73,6 @@ static void qeth_notify_skbs(struct qeth_qdio_out_q *queue,
                 struct qeth_qdio_out_buffer *buf,
                 enum iucv_tx_notify notification);
 static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf);
-static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,
-                struct qeth_qdio_out_buffer *buf,
-                enum qeth_qdio_buffer_states newbufstate);
 static int qeth_init_qdio_out_buf(struct qeth_qdio_out_q *, int);
 
 struct workqueue_struct *qeth_wq;
@@ -489,6 +486,7 @@ static void qeth_qdio_handle_aob(struct qeth_card *card,
         struct qaob *aob;
         struct qeth_qdio_out_buffer *buffer;
         enum iucv_tx_notify notification;
+        unsigned int i;
 
         aob = (struct qaob *) phys_to_virt(phys_aob_addr);
         QETH_CARD_TEXT(card, 5, "haob");
@@ -513,10 +511,18 @@ static void qeth_qdio_handle_aob(struct qeth_card *card,
         qeth_notify_skbs(buffer->q, buffer, notification);
 
         buffer->aob = NULL;
-        qeth_clear_output_buffer(buffer->q, buffer,
-                                 QETH_QDIO_BUF_HANDLED_DELAYED);
+        /* Free dangling allocations. The attached skbs are handled by
+         * qeth_cleanup_handled_pending().
+         */
+        for (i = 0;
+             i < aob->sb_count && i < QETH_MAX_BUFFER_ELEMENTS(card);
+             i++) {
+                if (aob->sba[i] && buffer->is_header[i])
+                        kmem_cache_free(qeth_core_header_cache,
+                                        (void *) aob->sba[i]);
+        }
+        atomic_set(&buffer->state, QETH_QDIO_BUF_HANDLED_DELAYED);
 
-        /* from here on: do not touch buffer anymore */
         qdio_release_aob(aob);
 }
 
@@ -3759,6 +3765,10 @@ static void qeth_qdio_output_handler(struct ccw_device *ccwdev,
                         QETH_CARD_TEXT(queue->card, 5, "aob");
                         QETH_CARD_TEXT_(queue->card, 5, "%lx",
                                         virt_to_phys(buffer->aob));
+
+                        /* prepare the queue slot for re-use: */
+                        qeth_scrub_qdio_buffer(buffer->buffer,
+                                               QETH_MAX_BUFFER_ELEMENTS(card));
                         if (qeth_init_qdio_out_buf(queue, bidx)) {
                                 QETH_CARD_TEXT(card, 2, "outofbuf");
                                 qeth_schedule_recovery(card);
@@ -4834,7 +4844,7 @@ int qeth_vm_request_mac(struct qeth_card *card)
                 goto out;
         }
 
-        ccw_device_get_id(CARD_RDEV(card), &id);
+        ccw_device_get_id(CARD_DDEV(card), &id);
         request->resp_buf_len = sizeof(*response);
         request->resp_version = DIAG26C_VERSION2;
         request->op_code = DIAG26C_GET_MAC;
@@ -6459,28 +6469,27 @@ static int qeth_set_ipa_rx_csum(struct qeth_card *card, bool on)
 #define QETH_HW_FEATURES (NETIF_F_RXCSUM | NETIF_F_IP_CSUM | NETIF_F_TSO | \
                           NETIF_F_IPV6_CSUM)
 /**
- * qeth_recover_features() - Restore device features after recovery
- * @dev:        the recovering net_device
- *
- * Caller must hold rtnl lock.
+ * qeth_enable_hw_features() - (Re-)Enable HW functions for device features
+ * @dev:        a net_device
  */
-void qeth_recover_features(struct net_device *dev)
+void qeth_enable_hw_features(struct net_device *dev)
 {
-        netdev_features_t features = dev->features;
         struct qeth_card *card = dev->ml_priv;
+        netdev_features_t features;
 
+        rtnl_lock();
+        features = dev->features;
         /* force-off any feature that needs an IPA sequence.
          * netdev_update_features() will restart them.
          */
         dev->features &= ~QETH_HW_FEATURES;
         netdev_update_features(dev);
-
-        if (features == dev->features)
-                return;
-        dev_warn(&card->gdev->dev,
-                 "Device recovery failed to restore all offload features\n");
+        if (features != dev->features)
+                dev_warn(&card->gdev->dev,
+                         "Device recovery failed to restore all offload features\n");
+        rtnl_unlock();
 }
-EXPORT_SYMBOL_GPL(qeth_recover_features);
+EXPORT_SYMBOL_GPL(qeth_enable_hw_features);
 
 int qeth_set_features(struct net_device *dev, netdev_features_t features)
 {
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index a7cb37da6a21..2487f0aeb165 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -140,7 +140,7 @@ static int qeth_l2_send_setmac(struct qeth_card *card, __u8 *mac)
 
 static int qeth_l2_write_mac(struct qeth_card *card, u8 *mac)
 {
-        enum qeth_ipa_cmds cmd = is_multicast_ether_addr_64bits(mac) ?
+        enum qeth_ipa_cmds cmd = is_multicast_ether_addr(mac) ?
                                         IPA_CMD_SETGMAC : IPA_CMD_SETVMAC;
         int rc;
 
@@ -157,7 +157,7 @@ static int qeth_l2_write_mac(struct qeth_card *card, u8 *mac)
 
 static int qeth_l2_remove_mac(struct qeth_card *card, u8 *mac)
 {
-        enum qeth_ipa_cmds cmd = is_multicast_ether_addr_64bits(mac) ?
+        enum qeth_ipa_cmds cmd = is_multicast_ether_addr(mac) ?
                                         IPA_CMD_DELGMAC : IPA_CMD_DELVMAC;
         int rc;
 
@@ -501,27 +501,34 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p)
                 return -ERESTARTSYS;
         }
 
+        /* avoid racing against concurrent state change: */
+        if (!mutex_trylock(&card->conf_mutex))
+                return -EAGAIN;
+
         if (!qeth_card_hw_is_reachable(card)) {
                 ether_addr_copy(dev->dev_addr, addr->sa_data);
-                return 0;
+                goto out_unlock;
         }
 
         /* don't register the same address twice */
         if (ether_addr_equal_64bits(dev->dev_addr, addr->sa_data) &&
             (card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))
-                return 0;
+                goto out_unlock;
 
         /* add the new address, switch over, drop the old */
         rc = qeth_l2_send_setmac(card, addr->sa_data);
         if (rc)
-                return rc;
+                goto out_unlock;
         ether_addr_copy(old_addr, dev->dev_addr);
         ether_addr_copy(dev->dev_addr, addr->sa_data);
 
         if (card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED)
                 qeth_l2_remove_mac(card, old_addr);
         card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;
-        return 0;
+
+out_unlock:
+        mutex_unlock(&card->conf_mutex);
+        return rc;
 }
 
 static void qeth_promisc_to_bridge(struct qeth_card *card)
@@ -1112,6 +1119,8 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 netif_carrier_off(card->dev);
 
         qeth_set_allowed_threads(card, 0xffffffff, 0);
+
+        qeth_enable_hw_features(card->dev);
         if (recover_flag == CARD_STATE_RECOVER) {
                 if (recovery_mode &&
                     card->info.type != QETH_CARD_TYPE_OSN) {
@@ -1123,9 +1132,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 }
                 /* this also sets saved unicast addresses */
                 qeth_l2_set_rx_mode(card->dev);
-                rtnl_lock();
-                qeth_recover_features(card->dev);
-                rtnl_unlock();
         }
         /* let user_space know that device is online */
         kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE);
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index e7fa479adf47..5905dc63e256 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2662,6 +2662,8 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 netif_carrier_on(card->dev);
         else
                 netif_carrier_off(card->dev);
+
+        qeth_enable_hw_features(card->dev);
         if (recover_flag == CARD_STATE_RECOVER) {
                 rtnl_lock();
                 if (recovery_mode)
@@ -2669,7 +2671,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 else
                         dev_open(card->dev);
                 qeth_l3_set_rx_mode(card->dev);
-                qeth_recover_features(card->dev);
                 rtnl_unlock();
         }
         qeth_trace_features(card);
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index a9831bd37a73..a57f3a7d4748 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1974,7 +1974,6 @@ static void aac_set_safw_attr_all_targets(struct aac_dev *dev)
         u32 lun_count, nexus;
         u32 i, bus, target;
         u8 expose_flag, attribs;
-        u8 devtype;
 
         lun_count = aac_get_safw_phys_lun_count(dev);
 
@@ -1992,23 +1991,23 @@ static void aac_set_safw_attr_all_targets(struct aac_dev *dev)
                         continue;
 
                 if (expose_flag != 0) {
-                        devtype = AAC_DEVTYPE_RAID_MEMBER;
-                        goto update_devtype;
+                        dev->hba_map[bus][target].devtype =
+                                AAC_DEVTYPE_RAID_MEMBER;
+                        continue;
                 }
 
                 if (nexus != 0 && (attribs & 8)) {
-                        devtype = AAC_DEVTYPE_NATIVE_RAW;
+                        dev->hba_map[bus][target].devtype =
+                                AAC_DEVTYPE_NATIVE_RAW;
                         dev->hba_map[bus][target].rmw_nexus =
                                         nexus;
                 } else
-                        devtype = AAC_DEVTYPE_ARC_RAW;
+                        dev->hba_map[bus][target].devtype =
+                                AAC_DEVTYPE_ARC_RAW;
 
                 dev->hba_map[bus][target].scan_counter = dev->scan_counter;
 
                 aac_set_safw_target_qd(dev, bus, target);
-
-update_devtype:
-                dev->hba_map[bus][target].devtype = devtype;
         }
 }
 
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 53ae52dbff84..cd2fdac000c9 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -51,6 +51,7 @@ static int sg_version_num = 30536;	/* 2 digits for each component */
 #include <linux/atomic.h>
 #include <linux/ratelimit.h>
 #include <linux/uio.h>
+#include <linux/cred.h> /* for sg_check_file_access() */
 
 #include "scsi.h"
 #include <scsi/scsi_dbg.h>
@@ -209,6 +210,33 @@ static void sg_device_destroy(struct kref *kref);
         sdev_prefix_printk(prefix, (sdp)->device,               \
                            (sdp)->disk->disk_name, fmt, ##a)
 
+/*
+ * The SCSI interfaces that use read() and write() as an asynchronous variant of
+ * ioctl(..., SG_IO, ...) are fundamentally unsafe, since there are lots of ways
+ * to trigger read() and write() calls from various contexts with elevated
+ * privileges. This can lead to kernel memory corruption (e.g. if these
+ * interfaces are called through splice()) and privilege escalation inside
+ * userspace (e.g. if a process with access to such a device passes a file
+ * descriptor to a SUID binary as stdin/stdout/stderr).
+ *
+ * This function provides protection for the legacy API by restricting the
+ * calling context.
+ */
+static int sg_check_file_access(struct file *filp, const char *caller)
+{
+        if (filp->f_cred != current_real_cred()) {
+                pr_err_once("%s: process %d (%s) changed security contexts after opening file descriptor, this is not allowed.\n",
+                        caller, task_tgid_vnr(current), current->comm);
+                return -EPERM;
+        }
+        if (uaccess_kernel()) {
+                pr_err_once("%s: process %d (%s) called from kernel context, this is not allowed.\n",
+                        caller, task_tgid_vnr(current), current->comm);
+                return -EACCES;
+        }
+        return 0;
+}
+
 static int sg_allow_access(struct file *filp, unsigned char *cmd)
 {
         struct sg_fd *sfp = filp->private_data;
@@ -393,6 +421,14 @@ sg_read(struct file *filp, char __user *buf, size_t count, loff_t * ppos)
         struct sg_header *old_hdr = NULL;
         int retval = 0;
 
+        /*
+         * This could cause a response to be stranded. Close the associated
+         * file descriptor to free up any resources being held.
+         */
+        retval = sg_check_file_access(filp, __func__);
+        if (retval)
+                return retval;
+
         if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
                 return -ENXIO;
         SCSI_LOG_TIMEOUT(3, sg_printk(KERN_INFO, sdp,
@@ -580,9 +616,11 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
         struct sg_header old_hdr;
         sg_io_hdr_t *hp;
         unsigned char cmnd[SG_MAX_CDB_SIZE];
+        int retval;
 
-        if (unlikely(uaccess_kernel()))
-                return -EINVAL;
+        retval = sg_check_file_access(filp, __func__);
+        if (retval)
+                return retval;
 
         if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
                 return -ENXIO;
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 01ac306131c1..10db5656fd5d 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -3727,11 +3727,16 @@ core_scsi3_pri_read_keys(struct se_cmd *cmd)
                  * Check for overflow of 8byte PRI READ_KEYS payload and
                  * next reservation key list descriptor.
                  */
-                if ((add_len + 8) > (cmd->data_length - 8))
-                        break;
-
-                put_unaligned_be64(pr_reg->pr_res_key, &buf[off]);
-                off += 8;
+                if (off + 8 <= cmd->data_length) {
+                        put_unaligned_be64(pr_reg->pr_res_key, &buf[off]);
+                        off += 8;
+                }
+                /*
+                 * SPC5r17: 6.16.2 READ KEYS service action
+                 * The ADDITIONAL LENGTH field indicates the number of bytes in
+                 * the Reservation key list. The contents of the ADDITIONAL
+                 * LENGTH field are not altered based on the allocation length
+                 */
                 add_len += 8;
         }
         spin_unlock(&dev->t10_pr.registration_lock);
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index c55def2f1320..097057d2eacf 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -378,6 +378,10 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Corsair K70 RGB */
         { USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT },
 
+        /* Corsair Strafe */
+        { USB_DEVICE(0x1b1c, 0x1b15), .driver_info = USB_QUIRK_DELAY_INIT |
+          USB_QUIRK_DELAY_CTRL_MSG },
+
         /* Corsair Strafe RGB */
         { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT |
           USB_QUIRK_DELAY_CTRL_MSG },
diff --git a/drivers/usb/gadget/udc/aspeed-vhub/Kconfig b/drivers/usb/gadget/udc/aspeed-vhub/Kconfig
index f0cdf89b8503..83ba8a2eb6af 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/Kconfig
+++ b/drivers/usb/gadget/udc/aspeed-vhub/Kconfig
@@ -2,6 +2,7 @@
 config USB_ASPEED_VHUB
         tristate "Aspeed vHub UDC driver"
         depends on ARCH_ASPEED || COMPILE_TEST
+        depends on USB_LIBCOMPOSITE
         help
           USB peripheral controller for the Aspeed AST2500 family
           SoCs supporting the "vHub" functionality and USB2.0
diff --git a/drivers/usb/host/xhci-dbgcap.c b/drivers/usb/host/xhci-dbgcap.c
index 1fbfd89d0a0f..387f124a8334 100644
--- a/drivers/usb/host/xhci-dbgcap.c
+++ b/drivers/usb/host/xhci-dbgcap.c
@@ -508,16 +508,18 @@ static int xhci_do_dbc_start(struct xhci_hcd *xhci)
         return 0;
 }
 
-static void xhci_do_dbc_stop(struct xhci_hcd *xhci)
+static int xhci_do_dbc_stop(struct xhci_hcd *xhci)
 {
         struct xhci_dbc         *dbc = xhci->dbc;
 
         if (dbc->state == DS_DISABLED)
-                return;
+                return -1;
 
         writel(0, &dbc->regs->control);
         xhci_dbc_mem_cleanup(xhci);
         dbc->state = DS_DISABLED;
+
+        return 0;
 }
 
 static int xhci_dbc_start(struct xhci_hcd *xhci)
@@ -544,6 +546,7 @@ static int xhci_dbc_start(struct xhci_hcd *xhci)
 
 static void xhci_dbc_stop(struct xhci_hcd *xhci)
 {
+        int ret;
         unsigned long           flags;
         struct xhci_dbc         *dbc = xhci->dbc;
         struct dbc_port         *port = &dbc->port;
@@ -556,10 +559,11 @@ static void xhci_dbc_stop(struct xhci_hcd *xhci)
                 xhci_dbc_tty_unregister_device(xhci);
 
         spin_lock_irqsave(&dbc->lock, flags);
-        xhci_do_dbc_stop(xhci);
+        ret = xhci_do_dbc_stop(xhci);
         spin_unlock_irqrestore(&dbc->lock, flags);
 
-        pm_runtime_put_sync(xhci_to_hcd(xhci)->self.controller);
+        if (!ret)
+                pm_runtime_put_sync(xhci_to_hcd(xhci)->self.controller);
 }
 
 static void
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 8a62eee9eee1..ef350c33dc4a 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -595,7 +595,7 @@ struct xhci_ring *xhci_stream_id_to_ring(
         if (!ep->stream_info)
                 return NULL;
 
-        if (stream_id > ep->stream_info->num_streams)
+        if (stream_id >= ep->stream_info->num_streams)
                 return NULL;
         return ep->stream_info->stream_rings[stream_id];
 }
diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
index 8abb6cbbd98a..3be40eaa1ac9 100644
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
@@ -396,8 +396,7 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count,
                           loff_t *ppos)
 {
         struct usb_yurex *dev;
-        int retval = 0;
-        int bytes_read = 0;
+        int len = 0;
         char in_buffer[20];
         unsigned long flags;
 
@@ -405,26 +404,16 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count,
 
         mutex_lock(&dev->io_mutex);
         if (!dev->interface) {          /* already disconnected */
-                retval = -ENODEV;
-                goto exit;
+                mutex_unlock(&dev->io_mutex);
+                return -ENODEV;
         }
 
         spin_lock_irqsave(&dev->lock, flags);
-        bytes_read = snprintf(in_buffer, 20, "%lld\n", dev->bbu);
+        len = snprintf(in_buffer, 20, "%lld\n", dev->bbu);
         spin_unlock_irqrestore(&dev->lock, flags);
-
-        if (*ppos < bytes_read) {
-                if (copy_to_user(buffer, in_buffer + *ppos, bytes_read - *ppos))
-                        retval = -EFAULT;
-                else {
-                        retval = bytes_read - *ppos;
-                        *ppos += bytes_read;
-                }
-        }
-
-exit:
         mutex_unlock(&dev->io_mutex);
-        return retval;
+
+        return simple_read_from_buffer(buffer, count, ppos, in_buffer, len);
 }
 
 static ssize_t yurex_write(struct file *file, const char __user *user_buffer,
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index bdd7a5ad3bf1..3bb1fff02bed 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -128,7 +128,7 @@ static int ch341_control_in(struct usb_device *dev,
         r = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), request,
                             USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                             value, index, buf, bufsize, DEFAULT_TIMEOUT);
-        if (r < bufsize) {
+        if (r < (int)bufsize) {
                 if (r >= 0) {
                         dev_err(&dev->dev,
                                 "short control message received (%d < %u)\n",
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index ee0cc1d90b51..626a29d9aa58 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -149,6 +149,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x8977) }, /* CEL MeshWorks DevKit Device */
         { USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */
         { USB_DEVICE(0x10C4, 0x89A4) }, /* CESINEL FTBC Flexible Thyristor Bridge Controller */
+        { USB_DEVICE(0x10C4, 0x89FB) }, /* Qivicon ZigBee USB Radio Stick */
         { USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */
         { USB_DEVICE(0x10C4, 0x8A5E) }, /* CEL EM3588 ZigBee USB Stick Long Range */
         { USB_DEVICE(0x10C4, 0x8B34) }, /* Qivicon ZigBee USB Radio Stick */
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 5169624d8b11..38d43c4b7ce5 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -369,8 +369,10 @@ static int keyspan_pda_get_modem_info(struct usb_serial *serial,
                              3, /* get pins */
                              USB_TYPE_VENDOR|USB_RECIP_INTERFACE|USB_DIR_IN,
                              0, 0, data, 1, 2000);
-        if (rc >= 0)
+        if (rc == 1)
                 *value = *data;
+        else if (rc >= 0)
+                rc = -EIO;
 
         kfree(data);
         return rc;
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index fdceb46d9fc6..b580b4c7fa48 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -468,6 +468,9 @@ static void mos7840_control_callback(struct urb *urb)
         }
 
         dev_dbg(dev, "%s urb buffer size is %d\n", __func__, urb->actual_length);
+        if (urb->actual_length < 1)
+                goto out;
+
         dev_dbg(dev, "%s mos7840_port->MsrLsr is %d port %d\n", __func__,
                 mos7840_port->MsrLsr, mos7840_port->port_num);
         data = urb->transfer_buffer;
diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
index d961f1ec0e08..150f43668bec 100644
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -725,6 +725,9 @@ static int tcpm_set_current_limit(struct tcpm_port *port, u32 max_ma, u32 mv)
 
         tcpm_log(port, "Setting voltage/current limit %u mV %u mA", mv, max_ma);
 
+        port->supply_voltage = mv;
+        port->current_limit = max_ma;
+
         if (port->tcpc->set_current_limit)
                 ret = port->tcpc->set_current_limit(port->tcpc, max_ma, mv);
 
@@ -2595,8 +2598,6 @@ static void tcpm_reset_port(struct tcpm_port *port)
         tcpm_set_attached_state(port, false);
         port->try_src_count = 0;
         port->try_snk_count = 0;
-        port->supply_voltage = 0;
-        port->current_limit = 0;
         port->usb_type = POWER_SUPPLY_USB_TYPE_C;
 
         power_supply_changed(port->psy);
diff --git a/drivers/vfio/pci/Kconfig b/drivers/vfio/pci/Kconfig
index 24ee2605b9f0..42dc1d3d71cf 100644
--- a/drivers/vfio/pci/Kconfig
+++ b/drivers/vfio/pci/Kconfig
@@ -28,5 +28,13 @@ config VFIO_PCI_INTX
         def_bool y if !S390
 
 config VFIO_PCI_IGD
-        depends on VFIO_PCI
-        def_bool y if X86
+        bool "VFIO PCI extensions for Intel graphics (GVT-d)"
+        depends on VFIO_PCI && X86
+        default y
+        help
+          Support for Intel IGD specific extensions to enable direct
+          assignment to virtual machines.  This includes exposing an IGD
+          specific firmware table and read-only copies of the host bridge
+          and LPC bridge config space.
+
+          To enable Intel IGD assignment through vfio-pci, say Y.
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 2c75b33db4ac..3e5b17710a4f 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -343,18 +343,16 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
         struct page *page[1];
         struct vm_area_struct *vma;
         struct vm_area_struct *vmas[1];
+        unsigned int flags = 0;
         int ret;
 
+        if (prot & IOMMU_WRITE)
+                flags |= FOLL_WRITE;
+
+        down_read(&mm->mmap_sem);
         if (mm == current->mm) {
-                ret = get_user_pages_longterm(vaddr, 1, !!(prot & IOMMU_WRITE),
-                                              page, vmas);
+                ret = get_user_pages_longterm(vaddr, 1, flags, page, vmas);
         } else {
-                unsigned int flags = 0;
-
-                if (prot & IOMMU_WRITE)
-                        flags |= FOLL_WRITE;
-
-                down_read(&mm->mmap_sem);
                 ret = get_user_pages_remote(NULL, mm, vaddr, 1, flags, page,
                                             vmas, NULL);
                 /*
@@ -368,8 +366,8 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
                         ret = -EOPNOTSUPP;
                         put_page(page[0]);
                 }
-                up_read(&mm->mmap_sem);
         }
+        up_read(&mm->mmap_sem);
 
         if (ret == 1) {
                 *pfn = page_to_pfn(page[0]);
diff --git a/fs/autofs/Makefile b/fs/autofs/Makefile
index 43fedde15c26..1f85d35ec8b7 100644
--- a/fs/autofs/Makefile
+++ b/fs/autofs/Makefile
@@ -2,6 +2,6 @@
 # Makefile for the linux autofs-filesystem routines.
 #
 
-obj-$(CONFIG_AUTOFS_FS) += autofs.o
+obj-$(CONFIG_AUTOFS_FS) += autofs4.o
 
-autofs-objs := init.o inode.o root.o symlink.o waitq.o expire.o dev-ioctl.o
+autofs4-objs := init.o inode.o root.o symlink.o waitq.o expire.o dev-ioctl.o
diff --git a/fs/autofs/init.c b/fs/autofs/init.c
index cc9447e1903f..79ae07d9592f 100644
--- a/fs/autofs/init.c
+++ b/fs/autofs/init.c
@@ -23,7 +23,7 @@ static struct file_system_type autofs_fs_type = {
         .kill_sb        = autofs_kill_sb,
 };
 MODULE_ALIAS_FS("autofs");
-MODULE_ALIAS("autofs4");
+MODULE_ALIAS("autofs");
 
 static int __init init_autofs_fs(void)
 {
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index bd78da59a4fd..c923c7854027 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -423,7 +423,7 @@ struct smb_version_operations {
         void (*set_oplock_level)(struct cifsInodeInfo *, __u32, unsigned int,
                                  bool *);
         /* create lease context buffer for CREATE request */
-        char * (*create_lease_buf)(u8 *, u8);
+        char * (*create_lease_buf)(u8 *lease_key, u8 oplock);
         /* parse lease context buffer and return oplock/epoch info */
         __u8 (*parse_lease_buf)(void *buf, unsigned int *epoch, char *lkey);
         ssize_t (*copychunk_range)(const unsigned int,
@@ -1416,6 +1416,7 @@ typedef int (mid_handle_t)(struct TCP_Server_Info *server,
 /* one of these for every pending CIFS request to the server */
 struct mid_q_entry {
         struct list_head qhead; /* mids waiting on reply from this server */
+        struct kref refcount;
         struct TCP_Server_Info *server; /* server corresponding to this mid */
         __u64 mid;              /* multiplex id */
         __u32 pid;              /* process id */
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 03018be17283..1890f534c88b 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -82,6 +82,7 @@ extern struct mid_q_entry *AllocMidQEntry(const struct smb_hdr *smb_buffer,
                                         struct TCP_Server_Info *server);
 extern void DeleteMidQEntry(struct mid_q_entry *midEntry);
 extern void cifs_delete_mid(struct mid_q_entry *mid);
+extern void cifs_mid_q_entry_release(struct mid_q_entry *midEntry);
 extern void cifs_wake_up_task(struct mid_q_entry *mid);
 extern int cifs_handle_standard(struct TCP_Server_Info *server,
                                 struct mid_q_entry *mid);
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index d352da325de3..93408eab92e7 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -157,8 +157,14 @@ cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command)
          * greater than cifs socket timeout which is 7 seconds
          */
         while (server->tcpStatus == CifsNeedReconnect) {
-                wait_event_interruptible_timeout(server->response_q,
-                        (server->tcpStatus != CifsNeedReconnect), 10 * HZ);
+                rc = wait_event_interruptible_timeout(server->response_q,
+                                                      (server->tcpStatus != CifsNeedReconnect),
+                                                      10 * HZ);
+                if (rc < 0) {
+                        cifs_dbg(FYI, "%s: aborting reconnect due to a received"
+                                 " signal by the process\n", __func__);
+                        return -ERESTARTSYS;
+                }
 
                 /* are we still trying to reconnect? */
                 if (server->tcpStatus != CifsNeedReconnect)
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index a57da1b88bdf..5df2c0698cda 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -924,6 +924,7 @@ next_pdu:
                                 server->pdu_size = next_offset;
                 }
 
+                mid_entry = NULL;
                 if (server->ops->is_transform_hdr &&
                     server->ops->receive_transform &&
                     server->ops->is_transform_hdr(buf)) {
@@ -938,8 +939,11 @@ next_pdu:
                                 length = mid_entry->receive(server, mid_entry);
                 }
 
-                if (length < 0)
+                if (length < 0) {
+                        if (mid_entry)
+                                cifs_mid_q_entry_release(mid_entry);
                         continue;
+                }
 
                 if (server->large_buf)
                         buf = server->bigbuf;
@@ -956,6 +960,8 @@ next_pdu:
 
                         if (!mid_entry->multiRsp || mid_entry->multiEnd)
                                 mid_entry->callback(mid_entry);
+
+                        cifs_mid_q_entry_release(mid_entry);
                 } else if (server->ops->is_oplock_break &&
                            server->ops->is_oplock_break(buf, server)) {
                         cifs_dbg(FYI, "Received oplock break\n");
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index aff8ce8ba34d..646dcd149de1 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -107,6 +107,7 @@ cifs_find_mid(struct TCP_Server_Info *server, char *buffer)
                 if (compare_mid(mid->mid, buf) &&
                     mid->mid_state == MID_REQUEST_SUBMITTED &&
                     le16_to_cpu(mid->command) == buf->Command) {
+                        kref_get(&mid->refcount);
                         spin_unlock(&GlobalMid_Lock);
                         return mid;
                 }
diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c
index 788412675723..4ed10dd086e6 100644
--- a/fs/cifs/smb2file.c
+++ b/fs/cifs/smb2file.c
@@ -41,7 +41,7 @@ smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms,
         int rc;
         __le16 *smb2_path;
         struct smb2_file_all_info *smb2_data = NULL;
-        __u8 smb2_oplock[17];
+        __u8 smb2_oplock;
         struct cifs_fid *fid = oparms->fid;
         struct network_resiliency_req nr_ioctl_req;
 
@@ -59,12 +59,9 @@ smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms,
         }
 
         oparms->desired_access |= FILE_READ_ATTRIBUTES;
-        *smb2_oplock = SMB2_OPLOCK_LEVEL_BATCH;
+        smb2_oplock = SMB2_OPLOCK_LEVEL_BATCH;
 
-        if (oparms->tcon->ses->server->capabilities & SMB2_GLOBAL_CAP_LEASING)
-                memcpy(smb2_oplock + 1, fid->lease_key, SMB2_LEASE_KEY_SIZE);
-
-        rc = SMB2_open(xid, oparms, smb2_path, smb2_oplock, smb2_data, NULL,
+        rc = SMB2_open(xid, oparms, smb2_path, &smb2_oplock, smb2_data, NULL,
                        NULL);
         if (rc)
                 goto out;
@@ -101,7 +98,7 @@ smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms,
                 move_smb2_info_to_cifs(buf, smb2_data);
         }
 
-        *oplock = *smb2_oplock;
+        *oplock = smb2_oplock;
 out:
         kfree(smb2_data);
         kfree(smb2_path);
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 0356b5559c71..ea92a38b2f08 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -203,6 +203,7 @@ smb2_find_mid(struct TCP_Server_Info *server, char *buf)
                 if ((mid->mid == wire_mid) &&
                     (mid->mid_state == MID_REQUEST_SUBMITTED) &&
                     (mid->command == shdr->Command)) {
+                        kref_get(&mid->refcount);
                         spin_unlock(&GlobalMid_Lock);
                         return mid;
                 }
@@ -855,6 +856,8 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
 
         rc = SMB2_set_ea(xid, tcon, fid.persistent_fid, fid.volatile_fid, ea,
                          len);
+        kfree(ea);
+
         SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);
 
         return rc;
@@ -2219,8 +2222,7 @@ smb2_create_lease_buf(u8 *lease_key, u8 oplock)
         if (!buf)
                 return NULL;
 
-        buf->lcontext.LeaseKeyLow = cpu_to_le64(*((u64 *)lease_key));
-        buf->lcontext.LeaseKeyHigh = cpu_to_le64(*((u64 *)(lease_key + 8)));
+        memcpy(&buf->lcontext.LeaseKey, lease_key, SMB2_LEASE_KEY_SIZE);
         buf->lcontext.LeaseState = map_oplock_to_lease(oplock);
 
         buf->ccontext.DataOffset = cpu_to_le16(offsetof
@@ -2246,8 +2248,7 @@ smb3_create_lease_buf(u8 *lease_key, u8 oplock)
         if (!buf)
                 return NULL;
 
-        buf->lcontext.LeaseKeyLow = cpu_to_le64(*((u64 *)lease_key));
-        buf->lcontext.LeaseKeyHigh = cpu_to_le64(*((u64 *)(lease_key + 8)));
+        memcpy(&buf->lcontext.LeaseKey, lease_key, SMB2_LEASE_KEY_SIZE);
         buf->lcontext.LeaseState = map_oplock_to_lease(oplock);
 
         buf->ccontext.DataOffset = cpu_to_le16(offsetof
@@ -2284,8 +2285,7 @@ smb3_parse_lease_buf(void *buf, unsigned int *epoch, char *lease_key)
         if (lc->lcontext.LeaseFlags & SMB2_LEASE_FLAG_BREAK_IN_PROGRESS)
                 return SMB2_OPLOCK_LEVEL_NOCHANGE;
         if (lease_key)
-                memcpy(lease_key, &lc->lcontext.LeaseKeyLow,
-                       SMB2_LEASE_KEY_SIZE);
+                memcpy(lease_key, &lc->lcontext.LeaseKey, SMB2_LEASE_KEY_SIZE);
         return le32_to_cpu(lc->lcontext.LeaseState);
 }
 
@@ -2521,7 +2521,7 @@ smb3_init_transform_rq(struct TCP_Server_Info *server, struct smb_rqst *new_rq,
         if (!tr_hdr)
                 goto err_free_iov;
 
-        orig_len = smb2_rqst_len(old_rq, false);
+        orig_len = smb_rqst_len(server, old_rq);
 
         /* fill the 2nd iov with a transform header */
         fill_transform_hdr(tr_hdr, orig_len, old_rq);
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 810b85787c91..3c92678cb45b 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -155,7 +155,7 @@ out:
 static int
 smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)
 {
-        int rc = 0;
+        int rc;
         struct nls_table *nls_codepage;
         struct cifs_ses *ses;
         struct TCP_Server_Info *server;
@@ -166,10 +166,10 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)
          * for those three - in the calling routine.
          */
         if (tcon == NULL)
-                return rc;
+                return 0;
 
         if (smb2_command == SMB2_TREE_CONNECT)
-                return rc;
+                return 0;
 
         if (tcon->tidStatus == CifsExiting) {
                 /*
@@ -212,8 +212,14 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)
                         return -EAGAIN;
                 }
 
-                wait_event_interruptible_timeout(server->response_q,
-                        (server->tcpStatus != CifsNeedReconnect), 10 * HZ);
+                rc = wait_event_interruptible_timeout(server->response_q,
+                                                      (server->tcpStatus != CifsNeedReconnect),
+                                                      10 * HZ);
+                if (rc < 0) {
+                        cifs_dbg(FYI, "%s: aborting reconnect due to a received"
+                                 " signal by the process\n", __func__);
+                        return -ERESTARTSYS;
+                }
 
                 /* are we still trying to reconnect? */
                 if (server->tcpStatus != CifsNeedReconnect)
@@ -231,7 +237,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)
         }
 
         if (!tcon->ses->need_reconnect && !tcon->need_reconnect)
-                return rc;
+                return 0;
 
         nls_codepage = load_nls_default();
 
@@ -340,7 +346,10 @@ smb2_plain_req_init(__le16 smb2_command, struct cifs_tcon *tcon,
                 return rc;
 
         /* BB eventually switch this to SMB2 specific small buf size */
-        *request_buf = cifs_small_buf_get();
+        if (smb2_command == SMB2_SET_INFO)
+                *request_buf = cifs_buf_get();
+        else
+                *request_buf = cifs_small_buf_get();
         if (*request_buf == NULL) {
                 /* BB should we add a retry in here if not a writepage? */
                 return -ENOMEM;
@@ -1707,12 +1716,12 @@ parse_lease_state(struct TCP_Server_Info *server, struct smb2_create_rsp *rsp,
 
 static int
 add_lease_context(struct TCP_Server_Info *server, struct kvec *iov,
-                  unsigned int *num_iovec, __u8 *oplock)
+                  unsigned int *num_iovec, u8 *lease_key, __u8 *oplock)
 {
         struct smb2_create_req *req = iov[0].iov_base;
         unsigned int num = *num_iovec;
 
-        iov[num].iov_base = server->ops->create_lease_buf(oplock+1, *oplock);
+        iov[num].iov_base = server->ops->create_lease_buf(lease_key, *oplock);
         if (iov[num].iov_base == NULL)
                 return -ENOMEM;
         iov[num].iov_len = server->vals->create_lease_size;
@@ -2172,7 +2181,8 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,
             *oplock == SMB2_OPLOCK_LEVEL_NONE)
                 req->RequestedOplockLevel = *oplock;
         else {
-                rc = add_lease_context(server, iov, &n_iov, oplock);
+                rc = add_lease_context(server, iov, &n_iov,
+                                       oparms->fid->lease_key, oplock);
                 if (rc) {
                         cifs_small_buf_release(req);
                         kfree(copy_path);
@@ -3720,7 +3730,7 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon,
 
         rc = cifs_send_recv(xid, ses, &rqst, &resp_buftype, flags,
                             &rsp_iov);
-        cifs_small_buf_release(req);
+        cifs_buf_release(req);
         rsp = (struct smb2_set_info_rsp *)rsp_iov.iov_base;
 
         if (rc != 0) {
diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index 824dddeee3f2..a671adcc44a6 100644
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -678,16 +678,14 @@ struct create_context {
 #define SMB2_LEASE_KEY_SIZE 16
 
 struct lease_context {
-        __le64 LeaseKeyLow;
-        __le64 LeaseKeyHigh;
+        u8 LeaseKey[SMB2_LEASE_KEY_SIZE];
         __le32 LeaseState;
         __le32 LeaseFlags;
         __le64 LeaseDuration;
 } __packed;
 
 struct lease_context_v2 {
-        __le64 LeaseKeyLow;
-        __le64 LeaseKeyHigh;
+        u8 LeaseKey[SMB2_LEASE_KEY_SIZE];
         __le32 LeaseState;
         __le32 LeaseFlags;
         __le64 LeaseDuration;
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
index 3ae208ac2a77..6e6a4f2ec890 100644
--- a/fs/cifs/smb2proto.h
+++ b/fs/cifs/smb2proto.h
@@ -113,8 +113,8 @@ extern int smb2_unlock_range(struct cifsFileInfo *cfile,
 extern int smb2_push_mandatory_locks(struct cifsFileInfo *cfile);
 extern void smb2_reconnect_server(struct work_struct *work);
 extern int smb3_crypto_aead_allocate(struct TCP_Server_Info *server);
-extern unsigned long
-smb2_rqst_len(struct smb_rqst *rqst, bool skip_rfc1002_marker);
+extern unsigned long smb_rqst_len(struct TCP_Server_Info *server,
+                                  struct smb_rqst *rqst);
 
 /*
  * SMB2 Worker functions - most of protocol specific implementation details
diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c
index 51b9437c3c7b..719d55e63d88 100644
--- a/fs/cifs/smb2transport.c
+++ b/fs/cifs/smb2transport.c
@@ -173,6 +173,8 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
         struct kvec *iov = rqst->rq_iov;
         struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)iov[0].iov_base;
         struct cifs_ses *ses;
+        struct shash_desc *shash = &server->secmech.sdeschmacsha256->shash;
+        struct smb_rqst drqst;
 
         ses = smb2_find_smb_ses(server, shdr->SessionId);
         if (!ses) {
@@ -190,21 +192,39 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
         }
 
         rc = crypto_shash_setkey(server->secmech.hmacsha256,
-                ses->auth_key.response, SMB2_NTLMV2_SESSKEY_SIZE);
+                                 ses->auth_key.response, SMB2_NTLMV2_SESSKEY_SIZE);
         if (rc) {
                 cifs_dbg(VFS, "%s: Could not update with response\n", __func__);
                 return rc;
         }
 
-        rc = crypto_shash_init(&server->secmech.sdeschmacsha256->shash);
+        rc = crypto_shash_init(shash);
         if (rc) {
                 cifs_dbg(VFS, "%s: Could not init sha256", __func__);
                 return rc;
         }
 
-        rc = __cifs_calc_signature(rqst, server, sigptr,
-                &server->secmech.sdeschmacsha256->shash);
+        /*
+         * For SMB2+, __cifs_calc_signature() expects to sign only the actual
+         * data, that is, iov[0] should not contain a rfc1002 length.
+         *
+         * Sign the rfc1002 length prior to passing the data (iov[1-N]) down to
+         * __cifs_calc_signature().
+         */
+        drqst = *rqst;
+        if (drqst.rq_nvec >= 2 && iov[0].iov_len == 4) {
+                rc = crypto_shash_update(shash, iov[0].iov_base,
+                                         iov[0].iov_len);
+                if (rc) {
+                        cifs_dbg(VFS, "%s: Could not update with payload\n",
+                                 __func__);
+                        return rc;
+                }
+                drqst.rq_iov++;
+                drqst.rq_nvec--;
+        }
 
+        rc = __cifs_calc_signature(&drqst, server, sigptr, shash);
         if (!rc)
                 memcpy(shdr->Signature, sigptr, SMB2_SIGNATURE_SIZE);
 
@@ -408,12 +428,14 @@ generate_smb311signingkey(struct cifs_ses *ses)
 int
 smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
 {
-        int rc = 0;
+        int rc;
         unsigned char smb3_signature[SMB2_CMACAES_SIZE];
         unsigned char *sigptr = smb3_signature;
         struct kvec *iov = rqst->rq_iov;
         struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)iov[0].iov_base;
         struct cifs_ses *ses;
+        struct shash_desc *shash = &server->secmech.sdesccmacaes->shash;
+        struct smb_rqst drqst;
 
         ses = smb2_find_smb_ses(server, shdr->SessionId);
         if (!ses) {
@@ -425,8 +447,7 @@ smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
         memset(shdr->Signature, 0x0, SMB2_SIGNATURE_SIZE);
 
         rc = crypto_shash_setkey(server->secmech.cmacaes,
-                ses->smb3signingkey, SMB2_CMACAES_SIZE);
-
+                                 ses->smb3signingkey, SMB2_CMACAES_SIZE);
         if (rc) {
                 cifs_dbg(VFS, "%s: Could not set key for cmac aes\n", __func__);
                 return rc;
@@ -437,15 +458,33 @@ smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)
          * so unlike smb2 case we do not have to check here if secmech are
          * initialized
          */
-        rc = crypto_shash_init(&server->secmech.sdesccmacaes->shash);
+        rc = crypto_shash_init(shash);
         if (rc) {
                 cifs_dbg(VFS, "%s: Could not init cmac aes\n", __func__);
                 return rc;
         }
 
-        rc = __cifs_calc_signature(rqst, server, sigptr,
-                                   &server->secmech.sdesccmacaes->shash);
+        /*
+         * For SMB2+, __cifs_calc_signature() expects to sign only the actual
+         * data, that is, iov[0] should not contain a rfc1002 length.
+         *
+         * Sign the rfc1002 length prior to passing the data (iov[1-N]) down to
+         * __cifs_calc_signature().
+         */
+        drqst = *rqst;
+        if (drqst.rq_nvec >= 2 && iov[0].iov_len == 4) {
+                rc = crypto_shash_update(shash, iov[0].iov_base,
+                                         iov[0].iov_len);
+                if (rc) {
+                        cifs_dbg(VFS, "%s: Could not update with payload\n",
+                                 __func__);
+                        return rc;
+                }
+                drqst.rq_iov++;
+                drqst.rq_nvec--;
+        }
 
+        rc = __cifs_calc_signature(&drqst, server, sigptr, shash);
         if (!rc)
                 memcpy(shdr->Signature, sigptr, SMB2_SIGNATURE_SIZE);
 
@@ -548,6 +587,7 @@ smb2_mid_entry_alloc(const struct smb2_sync_hdr *shdr,
 
         temp = mempool_alloc(cifs_mid_poolp, GFP_NOFS);
         memset(temp, 0, sizeof(struct mid_q_entry));
+        kref_init(&temp->refcount);
         temp->mid = le64_to_cpu(shdr->MessageId);
         temp->pid = current->pid;
         temp->command = shdr->Command; /* Always LE */
diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
index 6fd94d9ffac2..c55ea4e6201b 100644
--- a/fs/cifs/smbdirect.c
+++ b/fs/cifs/smbdirect.c
@@ -2083,8 +2083,9 @@ int smbd_recv(struct smbd_connection *info, struct msghdr *msg)
  * rqst: the data to write
  * return value: 0 if successfully write, otherwise error code
  */
-int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst)
+int smbd_send(struct TCP_Server_Info *server, struct smb_rqst *rqst)
 {
+        struct smbd_connection *info = server->smbd_conn;
         struct kvec vec;
         int nvecs;
         int size;
@@ -2118,7 +2119,7 @@ int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst)
          * rq_tailsz to PAGE_SIZE when the buffer has multiple pages and
          * ends at page boundary
          */
-        buflen = smb2_rqst_len(rqst, true);
+        buflen = smb_rqst_len(server, rqst);
 
         if (buflen + sizeof(struct smbd_data_transfer) >
                 info->max_fragmented_send_size) {
diff --git a/fs/cifs/smbdirect.h b/fs/cifs/smbdirect.h
index 1e419c21dc60..a11096254f29 100644
--- a/fs/cifs/smbdirect.h
+++ b/fs/cifs/smbdirect.h
@@ -292,7 +292,7 @@ void smbd_destroy(struct smbd_connection *info);
 
 /* Interface for carrying upper layer I/O through send/recv */
 int smbd_recv(struct smbd_connection *info, struct msghdr *msg);
-int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst);
+int smbd_send(struct TCP_Server_Info *server, struct smb_rqst *rqst);
 
 enum mr_state {
         MR_READY,
@@ -332,7 +332,7 @@ static inline void *smbd_get_connection(
 static inline int smbd_reconnect(struct TCP_Server_Info *server) {return -1; }
 static inline void smbd_destroy(struct smbd_connection *info) {}
 static inline int smbd_recv(struct smbd_connection *info, struct msghdr *msg) {return -1; }
-static inline int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst) {return -1; }
+static inline int smbd_send(struct TCP_Server_Info *server, struct smb_rqst *rqst) {return -1; }
 #endif
 
 #endif
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index fb57dfbfb749..a341ec839c83 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -61,6 +61,7 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)
 
         temp = mempool_alloc(cifs_mid_poolp, GFP_NOFS);
         memset(temp, 0, sizeof(struct mid_q_entry));
+        kref_init(&temp->refcount);
         temp->mid = get_mid(smb_buffer);
         temp->pid = current->pid;
         temp->command = cpu_to_le16(smb_buffer->Command);
@@ -82,6 +83,21 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct TCP_Server_Info *server)
         return temp;
 }
 
+static void _cifs_mid_q_entry_release(struct kref *refcount)
+{
+        struct mid_q_entry *mid = container_of(refcount, struct mid_q_entry,
+                                               refcount);
+
+        mempool_free(mid, cifs_mid_poolp);
+}
+
+void cifs_mid_q_entry_release(struct mid_q_entry *midEntry)
+{
+        spin_lock(&GlobalMid_Lock);
+        kref_put(&midEntry->refcount, _cifs_mid_q_entry_release);
+        spin_unlock(&GlobalMid_Lock);
+}
+
 void
 DeleteMidQEntry(struct mid_q_entry *midEntry)
 {
@@ -110,7 +126,7 @@ DeleteMidQEntry(struct mid_q_entry *midEntry)
                 }
         }
 #endif
-        mempool_free(midEntry, cifs_mid_poolp);
+        cifs_mid_q_entry_release(midEntry);
 }
 
 void
@@ -202,14 +218,15 @@ smb_send_kvec(struct TCP_Server_Info *server, struct msghdr *smb_msg,
 }
 
 unsigned long
-smb2_rqst_len(struct smb_rqst *rqst, bool skip_rfc1002_marker)
+smb_rqst_len(struct TCP_Server_Info *server, struct smb_rqst *rqst)
 {
         unsigned int i;
         struct kvec *iov;
         int nvec;
         unsigned long buflen = 0;
 
-        if (skip_rfc1002_marker && rqst->rq_iov[0].iov_len == 4) {
+        if (server->vals->header_preamble_size == 0 &&
+            rqst->rq_nvec >= 2 && rqst->rq_iov[0].iov_len == 4) {
                 iov = &rqst->rq_iov[1];
                 nvec = rqst->rq_nvec - 1;
         } else {
@@ -260,7 +277,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
         __be32 rfc1002_marker;
 
         if (cifs_rdma_enabled(server) && server->smbd_conn) {
-                rc = smbd_send(server->smbd_conn, rqst);
+                rc = smbd_send(server, rqst);
                 goto smbd_done;
         }
         if (ssocket == NULL)
@@ -271,7 +288,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
                                 (char *)&val, sizeof(val));
 
         for (j = 0; j < num_rqst; j++)
-                send_length += smb2_rqst_len(&rqst[j], true);
+                send_length += smb_rqst_len(server, &rqst[j]);
         rfc1002_marker = cpu_to_be32(send_length);
 
         /* Generate a rfc1002 marker for SMB2+ */
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index b00481c475cb..e68cefe08261 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -184,7 +184,6 @@ static int ext4_init_block_bitmap(struct super_block *sb,
         unsigned int bit, bit_max;
         struct ext4_sb_info *sbi = EXT4_SB(sb);
         ext4_fsblk_t start, tmp;
-        int flex_bg = 0;
 
         J_ASSERT_BH(bh, buffer_locked(bh));
 
@@ -207,22 +206,19 @@ static int ext4_init_block_bitmap(struct super_block *sb,
 
         start = ext4_group_first_block_no(sb, block_group);
 
-        if (ext4_has_feature_flex_bg(sb))
-                flex_bg = 1;
-
         /* Set bits for block and inode bitmaps, and inode table */
         tmp = ext4_block_bitmap(sb, gdp);
-        if (!flex_bg || ext4_block_in_group(sb, tmp, block_group))
+        if (ext4_block_in_group(sb, tmp, block_group))
                 ext4_set_bit(EXT4_B2C(sbi, tmp - start), bh->b_data);
 
         tmp = ext4_inode_bitmap(sb, gdp);
-        if (!flex_bg || ext4_block_in_group(sb, tmp, block_group))
+        if (ext4_block_in_group(sb, tmp, block_group))
                 ext4_set_bit(EXT4_B2C(sbi, tmp - start), bh->b_data);
 
         tmp = ext4_inode_table(sb, gdp);
         for (; tmp < ext4_inode_table(sb, gdp) +
                      sbi->s_itb_per_group; tmp++) {
-                if (!flex_bg || ext4_block_in_group(sb, tmp, block_group))
+                if (ext4_block_in_group(sb, tmp, block_group))
                         ext4_set_bit(EXT4_B2C(sbi, tmp - start), bh->b_data);
         }
 
@@ -442,7 +438,16 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group)
                 goto verify;
         }
         ext4_lock_group(sb, block_group);
-        if (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
+        if (ext4_has_group_desc_csum(sb) &&
+            (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT))) {
+                if (block_group == 0) {
+                        ext4_unlock_group(sb, block_group);
+                        unlock_buffer(bh);
+                        ext4_error(sb, "Block bitmap for bg 0 marked "
+                                   "uninitialized");
+                        err = -EFSCORRUPTED;
+                        goto out;
+                }
                 err = ext4_init_block_bitmap(sb, bh, block_group, desc);
                 set_bitmap_uptodate(bh);
                 set_buffer_uptodate(bh);
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 0b127853c584..7c7123f265c2 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1114,6 +1114,7 @@ struct ext4_inode_info {
 #define EXT4_MOUNT_DIOREAD_NOLOCK       0x400000 /* Enable support for dio read nolocking */
 #define EXT4_MOUNT_JOURNAL_CHECKSUM     0x800000 /* Journal checksums */
 #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */
+#define EXT4_MOUNT_WARN_ON_ERROR        0x2000000 /* Trigger WARN_ON on error */
 #define EXT4_MOUNT_DELALLOC             0x8000000 /* Delalloc support */
 #define EXT4_MOUNT_DATA_ERR_ABORT       0x10000000 /* Abort on file data write */
 #define EXT4_MOUNT_BLOCK_VALIDITY       0x20000000 /* Block validity checking */
@@ -1507,11 +1508,6 @@ static inline struct ext4_inode_info *EXT4_I(struct inode *inode)
 static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
 {
         return ino == EXT4_ROOT_INO ||
-                ino == EXT4_USR_QUOTA_INO ||
-                ino == EXT4_GRP_QUOTA_INO ||
-                ino == EXT4_BOOT_LOADER_INO ||
-                ino == EXT4_JOURNAL_INO ||
-                ino == EXT4_RESIZE_INO ||
                 (ino >= EXT4_FIRST_INO(sb) &&
                  ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count));
 }
@@ -3018,9 +3014,6 @@ extern int ext4_inline_data_fiemap(struct inode *inode,
 struct iomap;
 extern int ext4_inline_data_iomap(struct inode *inode, struct iomap *iomap);
 
-extern int ext4_try_to_evict_inline_data(handle_t *handle,
-                                         struct inode *inode,
-                                         int needed);
 extern int ext4_inline_data_truncate(struct inode *inode, int *has_inline);
 
 extern int ext4_convert_inline_data(struct inode *inode);
diff --git a/fs/ext4/ext4_extents.h b/fs/ext4/ext4_extents.h
index 98fb0c119c68..adf6668b596f 100644
--- a/fs/ext4/ext4_extents.h
+++ b/fs/ext4/ext4_extents.h
@@ -91,6 +91,7 @@ struct ext4_extent_header {
 };
 
 #define EXT4_EXT_MAGIC          cpu_to_le16(0xf30a)
+#define EXT4_MAX_EXTENT_DEPTH 5
 
 #define EXT4_EXTENT_TAIL_OFFSET(hdr) \
         (sizeof(struct ext4_extent_header) + \
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 0057fe3f248d..8ce6fd5b10dd 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -869,6 +869,12 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
 
         eh = ext_inode_hdr(inode);
         depth = ext_depth(inode);
+        if (depth < 0 || depth > EXT4_MAX_EXTENT_DEPTH) {
+                EXT4_ERROR_INODE(inode, "inode has invalid extent depth: %d",
+                                 depth);
+                ret = -EFSCORRUPTED;
+                goto err;
+        }
 
         if (path) {
                 ext4_ext_drop_refs(path);
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index f525f909b559..fb83750c1a14 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -150,7 +150,16 @@ ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
         }
 
         ext4_lock_group(sb, block_group);
-        if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
+        if (ext4_has_group_desc_csum(sb) &&
+            (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT))) {
+                if (block_group == 0) {
+                        ext4_unlock_group(sb, block_group);
+                        unlock_buffer(bh);
+                        ext4_error(sb, "Inode bitmap for bg 0 marked "
+                                   "uninitialized");
+                        err = -EFSCORRUPTED;
+                        goto out;
+                }
                 memset(bh->b_data, 0, (EXT4_INODES_PER_GROUP(sb) + 7) / 8);
                 ext4_mark_bitmap_end(EXT4_INODES_PER_GROUP(sb),
                                      sb->s_blocksize * 8, bh->b_data);
@@ -994,7 +1003,8 @@ got:
 
                 /* recheck and clear flag under lock if we still need to */
                 ext4_lock_group(sb, group);
-                if (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
+                if (ext4_has_group_desc_csum(sb) &&
+                    (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT))) {
                         gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT);
                         ext4_free_group_clusters_set(sb, gdp,
                                 ext4_free_clusters_after_init(sb, group, gdp));
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 285ed1588730..e55a8bc870bd 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -437,6 +437,7 @@ static int ext4_destroy_inline_data_nolock(handle_t *handle,
 
         memset((void *)ext4_raw_inode(&is.iloc)->i_block,
                 0, EXT4_MIN_INLINE_DATA_SIZE);
+        memset(ei->i_data, 0, EXT4_MIN_INLINE_DATA_SIZE);
 
         if (ext4_has_feature_extents(inode->i_sb)) {
                 if (S_ISDIR(inode->i_mode) ||
@@ -886,11 +887,11 @@ retry_journal:
         flags |= AOP_FLAG_NOFS;
 
         if (ret == -ENOSPC) {
+                ext4_journal_stop(handle);
                 ret = ext4_da_convert_inline_data_to_extent(mapping,
                                                             inode,
                                                             flags,
                                                             fsdata);
-                ext4_journal_stop(handle);
                 if (ret == -ENOSPC &&
                     ext4_should_retry_alloc(inode->i_sb, &retries))
                         goto retry_journal;
@@ -1890,42 +1891,6 @@ out:
         return (error < 0 ? error : 0);
 }
 
-/*
- * Called during xattr set, and if we can sparse space 'needed',
- * just create the extent tree evict the data to the outer block.
- *
- * We use jbd2 instead of page cache to move data to the 1st block
- * so that the whole transaction can be committed as a whole and
- * the data isn't lost because of the delayed page cache write.
- */
-int ext4_try_to_evict_inline_data(handle_t *handle,
-                                  struct inode *inode,
-                                  int needed)
-{
-        int error;
-        struct ext4_xattr_entry *entry;
-        struct ext4_inode *raw_inode;
-        struct ext4_iloc iloc;
-
-        error = ext4_get_inode_loc(inode, &iloc);
-        if (error)
-                return error;
-
-        raw_inode = ext4_raw_inode(&iloc);
-        entry = (struct ext4_xattr_entry *)((void *)raw_inode +
-                                            EXT4_I(inode)->i_inline_off);
-        if (EXT4_XATTR_LEN(entry->e_name_len) +
-            EXT4_XATTR_SIZE(le32_to_cpu(entry->e_value_size)) < needed) {
-                error = -ENOSPC;
-                goto out;
-        }
-
-        error = ext4_convert_inline_data_nolock(handle, inode, &iloc);
-out:
-        brelse(iloc.bh);
-        return error;
-}
-
 int ext4_inline_data_truncate(struct inode *inode, int *has_inline)
 {
         handle_t *handle;
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 2ea07efbe016..7d6c10017bdf 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -402,9 +402,9 @@ static int __check_block_validity(struct inode *inode, const char *func,
         if (!ext4_data_block_valid(EXT4_SB(inode->i_sb), map->m_pblk,
                                    map->m_len)) {
                 ext4_error_inode(inode, func, line, map->m_pblk,
-                                 "lblock %lu mapped to illegal pblock "
+                                 "lblock %lu mapped to illegal pblock %llu "
                                  "(length %d)", (unsigned long) map->m_lblk,
-                                 map->m_len);
+                                 map->m_pblk, map->m_len);
                 return -EFSCORRUPTED;
         }
         return 0;
@@ -4506,7 +4506,8 @@ static int __ext4_get_inode_loc(struct inode *inode,
         int                     inodes_per_block, inode_offset;
 
         iloc->bh = NULL;
-        if (!ext4_valid_inum(sb, inode->i_ino))
+        if (inode->i_ino < EXT4_ROOT_INO ||
+            inode->i_ino > le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count))
                 return -EFSCORRUPTED;
 
         iloc->block_group = (inode->i_ino - 1) / EXT4_INODES_PER_GROUP(sb);
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 6eae2b91aafa..f7ab34088162 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2423,7 +2423,8 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,
          * initialize bb_free to be able to skip
          * empty groups without initialization
          */
-        if (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
+        if (ext4_has_group_desc_csum(sb) &&
+            (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT))) {
                 meta_group_info[i]->bb_free =
                         ext4_free_clusters_after_init(sb, group, desc);
         } else {
@@ -2989,7 +2990,8 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac,
 #endif
         ext4_set_bits(bitmap_bh->b_data, ac->ac_b_ex.fe_start,
                       ac->ac_b_ex.fe_len);
-        if (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
+        if (ext4_has_group_desc_csum(sb) &&
+            (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT))) {
                 gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT);
                 ext4_free_group_clusters_set(sb, gdp,
                                              ext4_free_clusters_after_init(sb,
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 0c4c2201b3aa..ba2396a7bd04 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -405,6 +405,9 @@ static void ext4_journal_commit_callback(journal_t *journal, transaction_t *txn)
 
 static void ext4_handle_error(struct super_block *sb)
 {
+        if (test_opt(sb, WARN_ON_ERROR))
+                WARN_ON_ONCE(1);
+
         if (sb_rdonly(sb))
                 return;
 
@@ -740,6 +743,9 @@ __acquires(bitlock)
                 va_end(args);
         }
 
+        if (test_opt(sb, WARN_ON_ERROR))
+                WARN_ON_ONCE(1);
+
         if (test_opt(sb, ERRORS_CONT)) {
                 ext4_commit_super(sb, 0);
                 return;
@@ -1371,7 +1377,8 @@ enum {
         Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
         Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
         Opt_usrquota, Opt_grpquota, Opt_prjquota, Opt_i_version, Opt_dax,
-        Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
+        Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_warn_on_error,
+        Opt_nowarn_on_error, Opt_mblk_io_submit,
         Opt_lazytime, Opt_nolazytime, Opt_debug_want_extra_isize,
         Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
         Opt_inode_readahead_blks, Opt_journal_ioprio,
@@ -1438,6 +1445,8 @@ static const match_table_t tokens = {
         {Opt_dax, "dax"},
         {Opt_stripe, "stripe=%u"},
         {Opt_delalloc, "delalloc"},
+        {Opt_warn_on_error, "warn_on_error"},
+        {Opt_nowarn_on_error, "nowarn_on_error"},
         {Opt_lazytime, "lazytime"},
         {Opt_nolazytime, "nolazytime"},
         {Opt_debug_want_extra_isize, "debug_want_extra_isize=%u"},
@@ -1602,6 +1611,8 @@ static const struct mount_opts {
          MOPT_EXT4_ONLY | MOPT_SET | MOPT_EXPLICIT},
         {Opt_nodelalloc, EXT4_MOUNT_DELALLOC,
          MOPT_EXT4_ONLY | MOPT_CLEAR},
+        {Opt_warn_on_error, EXT4_MOUNT_WARN_ON_ERROR, MOPT_SET},
+        {Opt_nowarn_on_error, EXT4_MOUNT_WARN_ON_ERROR, MOPT_CLEAR},
         {Opt_nojournal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,
          MOPT_EXT4_ONLY | MOPT_CLEAR},
         {Opt_journal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,
@@ -2331,6 +2342,7 @@ static int ext4_check_descriptors(struct super_block *sb,
         struct ext4_sb_info *sbi = EXT4_SB(sb);
         ext4_fsblk_t first_block = le32_to_cpu(sbi->s_es->s_first_data_block);
         ext4_fsblk_t last_block;
+        ext4_fsblk_t last_bg_block = sb_block + ext4_bg_num_gdb(sb, 0) + 1;
         ext4_fsblk_t block_bitmap;
         ext4_fsblk_t inode_bitmap;
         ext4_fsblk_t inode_table;
@@ -2363,6 +2375,14 @@ static int ext4_check_descriptors(struct super_block *sb,
                         if (!sb_rdonly(sb))
                                 return 0;
                 }
+                if (block_bitmap >= sb_block + 1 &&
+                    block_bitmap <= last_bg_block) {
+                        ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "
+                                 "Block bitmap for group %u overlaps "
+                                 "block group descriptors", i);
+                        if (!sb_rdonly(sb))
+                                return 0;
+                }
                 if (block_bitmap < first_block || block_bitmap > last_block) {
                         ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "
                                "Block bitmap for group %u not in group "
@@ -2377,6 +2397,14 @@ static int ext4_check_descriptors(struct super_block *sb,
                         if (!sb_rdonly(sb))
                                 return 0;
                 }
+                if (inode_bitmap >= sb_block + 1 &&
+                    inode_bitmap <= last_bg_block) {
+                        ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "
+                                 "Inode bitmap for group %u overlaps "
+                                 "block group descriptors", i);
+                        if (!sb_rdonly(sb))
+                                return 0;
+                }
                 if (inode_bitmap < first_block || inode_bitmap > last_block) {
                         ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "
                                "Inode bitmap for group %u not in group "
@@ -2391,6 +2419,14 @@ static int ext4_check_descriptors(struct super_block *sb,
                         if (!sb_rdonly(sb))
                                 return 0;
                 }
+                if (inode_table >= sb_block + 1 &&
+                    inode_table <= last_bg_block) {
+                        ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "
+                                 "Inode table for group %u overlaps "
+                                 "block group descriptors", i);
+                        if (!sb_rdonly(sb))
+                                return 0;
+                }
                 if (inode_table < first_block ||
                     inode_table + sbi->s_itb_per_group - 1 > last_block) {
                         ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "
@@ -3097,13 +3133,22 @@ static ext4_group_t ext4_has_uninit_itable(struct super_block *sb)
         ext4_group_t group, ngroups = EXT4_SB(sb)->s_groups_count;
         struct ext4_group_desc *gdp = NULL;
 
+        if (!ext4_has_group_desc_csum(sb))
+                return ngroups;
+
         for (group = 0; group < ngroups; group++) {
                 gdp = ext4_get_group_desc(sb, group, NULL);
                 if (!gdp)
                         continue;
 
-                if (!(gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED)))
+                if (gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED))
+                        continue;
+                if (group != 0)
                         break;
+                ext4_error(sb, "Inode table for bg 0 marked as "
+                           "needing zeroing");
+                if (sb_rdonly(sb))
+                        return ngroups;
         }
 
         return group;
@@ -3742,6 +3787,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                          le32_to_cpu(es->s_log_block_size));
                 goto failed_mount;
         }
+        if (le32_to_cpu(es->s_log_cluster_size) >
+            (EXT4_MAX_CLUSTER_LOG_SIZE - EXT4_MIN_BLOCK_LOG_SIZE)) {
+                ext4_msg(sb, KERN_ERR,
+                         "Invalid log cluster size: %u",
+                         le32_to_cpu(es->s_log_cluster_size));
+                goto failed_mount;
+        }
 
         if (le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks) > (blocksize / 4)) {
                 ext4_msg(sb, KERN_ERR,
@@ -3806,6 +3858,11 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         } else {
                 sbi->s_inode_size = le16_to_cpu(es->s_inode_size);
                 sbi->s_first_ino = le32_to_cpu(es->s_first_ino);
+                if (sbi->s_first_ino < EXT4_GOOD_OLD_FIRST_INO) {
+                        ext4_msg(sb, KERN_ERR, "invalid first ino: %u",
+                                 sbi->s_first_ino);
+                        goto failed_mount;
+                }
                 if ((sbi->s_inode_size < EXT4_GOOD_OLD_INODE_SIZE) ||
                     (!is_power_of_2(sbi->s_inode_size)) ||
                     (sbi->s_inode_size > blocksize)) {
@@ -3882,13 +3939,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                                  "block size (%d)", clustersize, blocksize);
                         goto failed_mount;
                 }
-                if (le32_to_cpu(es->s_log_cluster_size) >
-                    (EXT4_MAX_CLUSTER_LOG_SIZE - EXT4_MIN_BLOCK_LOG_SIZE)) {
-                        ext4_msg(sb, KERN_ERR,
-                                 "Invalid log cluster size: %u",
-                                 le32_to_cpu(es->s_log_cluster_size));
-                        goto failed_mount;
-                }
                 sbi->s_cluster_bits = le32_to_cpu(es->s_log_cluster_size) -
                         le32_to_cpu(es->s_log_block_size);
                 sbi->s_clusters_per_group =
@@ -3909,10 +3959,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                 }
         } else {
                 if (clustersize != blocksize) {
-                        ext4_warning(sb, "fragment/cluster size (%d) != "
-                                     "block size (%d)", clustersize,
-                                     blocksize);
-                        clustersize = blocksize;
+                        ext4_msg(sb, KERN_ERR,
+                                 "fragment/cluster size (%d) != "
+                                 "block size (%d)", clustersize, blocksize);
+                        goto failed_mount;
                 }
                 if (sbi->s_blocks_per_group > blocksize * 8) {
                         ext4_msg(sb, KERN_ERR,
@@ -3966,6 +4016,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                          ext4_blocks_count(es));
                 goto failed_mount;
         }
+        if ((es->s_first_data_block == 0) && (es->s_log_block_size == 0) &&
+            (sbi->s_cluster_ratio == 1)) {
+                ext4_msg(sb, KERN_WARNING, "bad geometry: first data "
+                         "block is 0 with a 1k block and cluster size");
+                goto failed_mount;
+        }
+
         blocks_count = (ext4_blocks_count(es) -
                         le32_to_cpu(es->s_first_data_block) +
                         EXT4_BLOCKS_PER_GROUP(sb) - 1);
@@ -4001,6 +4058,14 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                 ret = -ENOMEM;
                 goto failed_mount;
         }
+        if (((u64)sbi->s_groups_count * sbi->s_inodes_per_group) !=
+            le32_to_cpu(es->s_inodes_count)) {
+                ext4_msg(sb, KERN_ERR, "inodes count not valid: %u vs %llu",
+                         le32_to_cpu(es->s_inodes_count),
+                         ((u64)sbi->s_groups_count * sbi->s_inodes_per_group));
+                ret = -EINVAL;
+                goto failed_mount;
+        }
 
         bgl_lock_init(sbi->s_blockgroup_lock);
 
@@ -4736,6 +4801,14 @@ static int ext4_commit_super(struct super_block *sb, int sync)
 
         if (!sbh || block_device_ejected(sb))
                 return error;
+
+        /*
+         * The superblock bh should be mapped, but it might not be if the
+         * device was hot-removed. Not much we can do but fail the I/O.
+         */
+        if (!buffer_mapped(sbh))
+                return error;
+
         /*
          * If the file system is mounted read-only, don't update the
          * superblock write time.  This avoids updating the superblock
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index fc4ced59c565..723df14f4084 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -230,12 +230,12 @@ __ext4_xattr_check_block(struct inode *inode, struct buffer_head *bh,
 {
         int error = -EFSCORRUPTED;
 
-        if (buffer_verified(bh))
-                return 0;
-
         if (BHDR(bh)->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC) ||
             BHDR(bh)->h_blocks != cpu_to_le32(1))
                 goto errout;
+        if (buffer_verified(bh))
+                return 0;
+
         error = -EFSBADCRC;
         if (!ext4_xattr_block_csum_verify(inode, bh))
                 goto errout;
@@ -1560,7 +1560,7 @@ static int ext4_xattr_set_entry(struct ext4_xattr_info *i,
                                 handle_t *handle, struct inode *inode,
                                 bool is_block)
 {
-        struct ext4_xattr_entry *last;
+        struct ext4_xattr_entry *last, *next;
         struct ext4_xattr_entry *here = s->here;
         size_t min_offs = s->end - s->base, name_len = strlen(i->name);
         int in_inode = i->in_inode;
@@ -1595,7 +1595,13 @@ static int ext4_xattr_set_entry(struct ext4_xattr_info *i,
 
         /* Compute min_offs and last. */
         last = s->first;
-        for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
+        for (; !IS_LAST_ENTRY(last); last = next) {
+                next = EXT4_XATTR_NEXT(last);
+                if ((void *)next >= s->end) {
+                        EXT4_ERROR_INODE(inode, "corrupted xattr entries");
+                        ret = -EFSCORRUPTED;
+                        goto out;
+                }
                 if (!last->e_value_inum && last->e_value_size) {
                         size_t offs = le16_to_cpu(last->e_value_offs);
                         if (offs < min_offs)
@@ -2206,23 +2212,8 @@ int ext4_xattr_ibody_inline_set(handle_t *handle, struct inode *inode,
         if (EXT4_I(inode)->i_extra_isize == 0)
                 return -ENOSPC;
         error = ext4_xattr_set_entry(i, s, handle, inode, false /* is_block */);
-        if (error) {
-                if (error == -ENOSPC &&
-                    ext4_has_inline_data(inode)) {
-                        error = ext4_try_to_evict_inline_data(handle, inode,
-                                        EXT4_XATTR_LEN(strlen(i->name) +
-                                        EXT4_XATTR_SIZE(i->value_len)));
-                        if (error)
-                                return error;
-                        error = ext4_xattr_ibody_find(inode, i, is);
-                        if (error)
-                                return error;
-                        error = ext4_xattr_set_entry(i, s, handle, inode,
-                                                     false /* is_block */);
-                }
-                if (error)
-                        return error;
-        }
+        if (error)
+                return error;
         header = IHDR(inode, ext4_raw_inode(&is->iloc));
         if (!IS_LAST_ENTRY(s->first)) {
                 header->h_magic = cpu_to_le32(EXT4_XATTR_MAGIC);
@@ -2651,6 +2642,11 @@ static int ext4_xattr_make_inode_space(handle_t *handle, struct inode *inode,
                 last = IFIRST(header);
                 /* Find the entry best suited to be pushed into EA block */
                 for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
+                        /* never move system.data out of the inode */
+                        if ((last->e_name_len == 4) &&
+                            (last->e_name_index == EXT4_XATTR_INDEX_SYSTEM) &&
+                            !memcmp(last->e_name, "data", 4))
+                                continue;
                         total_size = EXT4_XATTR_LEN(last->e_name_len);
                         if (!last->e_value_inum)
                                 total_size += EXT4_XATTR_SIZE(
diff --git a/fs/inode.c b/fs/inode.c
index 2c300e981796..8c86c809ca17 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1999,8 +1999,14 @@ void inode_init_owner(struct inode *inode, const struct inode *dir,
         inode->i_uid = current_fsuid();
         if (dir && dir->i_mode & S_ISGID) {
                 inode->i_gid = dir->i_gid;
+
+                /* Directories are special, and always inherit S_ISGID */
                 if (S_ISDIR(mode))
                         mode |= S_ISGID;
+                else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) &&
+                         !in_group_p(inode->i_gid) &&
+                         !capable_wrt_inode_uidgid(dir, CAP_FSETID))
+                        mode &= ~S_ISGID;
         } else
                 inode->i_gid = current_fsgid();
         inode->i_mode = mode;
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 51dd68e67b0f..c0b66a7a795b 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -1361,6 +1361,13 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
                 if (jh->b_transaction == transaction &&
                     jh->b_jlist != BJ_Metadata) {
                         jbd_lock_bh_state(bh);
+                        if (jh->b_transaction == transaction &&
+                            jh->b_jlist != BJ_Metadata)
+                                pr_err("JBD2: assertion failure: h_type=%u "
+                                       "h_line_no=%u block_no=%llu jlist=%u\n",
+                                       handle->h_type, handle->h_line_no,
+                                       (unsigned long long) bh->b_blocknr,
+                                       jh->b_jlist);
                         J_ASSERT_JH(jh, jh->b_transaction != transaction ||
                                         jh->b_jlist == BJ_Metadata);
                         jbd_unlock_bh_state(bh);
@@ -1380,11 +1387,11 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
                  * of the transaction. This needs to be done
                  * once a transaction -bzzz
                  */
-                jh->b_modified = 1;
                 if (handle->h_buffer_credits <= 0) {
                         ret = -ENOSPC;
                         goto out_unlock_bh;
                 }
+                jh->b_modified = 1;
                 handle->h_buffer_credits--;
         }
 
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 123bf7d516fc..594d192b2331 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -222,24 +222,26 @@ static inline bool userfaultfd_huge_must_wait(struct userfaultfd_ctx *ctx,
                                          unsigned long reason)
 {
         struct mm_struct *mm = ctx->mm;
-        pte_t *pte;
+        pte_t *ptep, pte;
         bool ret = true;
 
         VM_BUG_ON(!rwsem_is_locked(&mm->mmap_sem));
 
-        pte = huge_pte_offset(mm, address, vma_mmu_pagesize(vma));
-        if (!pte)
+        ptep = huge_pte_offset(mm, address, vma_mmu_pagesize(vma));
+
+        if (!ptep)
                 goto out;
 
         ret = false;
+        pte = huge_ptep_get(ptep);
 
         /*
          * Lockless access: we're in a wait_event so it's ok if it
          * changes under us.
          */
-        if (huge_pte_none(*pte))
+        if (huge_pte_none(pte))
                 ret = true;
-        if (!huge_pte_write(*pte) && (reason & VM_UFFD_WP))
+        if (!huge_pte_write(pte) && (reason & VM_UFFD_WP))
                 ret = true;
 out:
         return ret;
diff --git a/include/dt-bindings/clock/imx6ul-clock.h b/include/dt-bindings/clock/imx6ul-clock.h
index 9564597cbfac..0aa1d9c3e0b9 100644
--- a/include/dt-bindings/clock/imx6ul-clock.h
+++ b/include/dt-bindings/clock/imx6ul-clock.h
@@ -235,27 +235,25 @@
 #define IMX6UL_CLK_CSI_PODF             222
 #define IMX6UL_CLK_PLL3_120M            223
 #define IMX6UL_CLK_KPP                  224
-#define IMX6UL_CLK_CKO1_SEL             225
-#define IMX6UL_CLK_CKO1_PODF            226
-#define IMX6UL_CLK_CKO1                 227
-#define IMX6UL_CLK_CKO2_SEL             228
-#define IMX6UL_CLK_CKO2_PODF            229
-#define IMX6UL_CLK_CKO2                 230
-#define IMX6UL_CLK_CKO                  231
-
-/* For i.MX6ULL */
-#define IMX6ULL_CLK_ESAI_PRED           232
-#define IMX6ULL_CLK_ESAI_PODF           233
-#define IMX6ULL_CLK_ESAI_EXTAL          234
-#define IMX6ULL_CLK_ESAI_MEM            235
-#define IMX6ULL_CLK_ESAI_IPG            236
-#define IMX6ULL_CLK_DCP_CLK             237
-#define IMX6ULL_CLK_EPDC_PRE_SEL        238
-#define IMX6ULL_CLK_EPDC_SEL            239
-#define IMX6ULL_CLK_EPDC_PODF           240
-#define IMX6ULL_CLK_EPDC_ACLK           241
-#define IMX6ULL_CLK_EPDC_PIX            242
-#define IMX6ULL_CLK_ESAI_SEL            243
+#define IMX6ULL_CLK_ESAI_PRED           225
+#define IMX6ULL_CLK_ESAI_PODF           226
+#define IMX6ULL_CLK_ESAI_EXTAL          227
+#define IMX6ULL_CLK_ESAI_MEM            228
+#define IMX6ULL_CLK_ESAI_IPG            229
+#define IMX6ULL_CLK_DCP_CLK             230
+#define IMX6ULL_CLK_EPDC_PRE_SEL        231
+#define IMX6ULL_CLK_EPDC_SEL            232
+#define IMX6ULL_CLK_EPDC_PODF           233
+#define IMX6ULL_CLK_EPDC_ACLK           234
+#define IMX6ULL_CLK_EPDC_PIX            235
+#define IMX6ULL_CLK_ESAI_SEL            236
+#define IMX6UL_CLK_CKO1_SEL             237
+#define IMX6UL_CLK_CKO1_PODF            238
+#define IMX6UL_CLK_CKO1                 239
+#define IMX6UL_CLK_CKO2_SEL             240
+#define IMX6UL_CLK_CKO2_PODF            241
+#define IMX6UL_CLK_CKO2                 242
+#define IMX6UL_CLK_CKO                  243
 #define IMX6UL_CLK_END                  244
 
 #endif /* __DT_BINDINGS_CLOCK_IMX6UL_H */
diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h
index 975fb4cf1bb7..79795c5fa7c3 100644
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
@@ -188,12 +188,38 @@ int __cgroup_bpf_check_dev_permission(short dev_type, u32 major, u32 minor,
                                                                               \
         __ret;                                                                \
 })
+int cgroup_bpf_prog_attach(const union bpf_attr *attr,
+                           enum bpf_prog_type ptype, struct bpf_prog *prog);
+int cgroup_bpf_prog_detach(const union bpf_attr *attr,
+                           enum bpf_prog_type ptype);
+int cgroup_bpf_prog_query(const union bpf_attr *attr,
+                          union bpf_attr __user *uattr);
 #else
 
+struct bpf_prog;
 struct cgroup_bpf {};
 static inline void cgroup_bpf_put(struct cgroup *cgrp) {}
 static inline int cgroup_bpf_inherit(struct cgroup *cgrp) { return 0; }
 
+static inline int cgroup_bpf_prog_attach(const union bpf_attr *attr,
+                                         enum bpf_prog_type ptype,
+                                         struct bpf_prog *prog)
+{
+        return -EINVAL;
+}
+
+static inline int cgroup_bpf_prog_detach(const union bpf_attr *attr,
+                                         enum bpf_prog_type ptype)
+{
+        return -EINVAL;
+}
+
+static inline int cgroup_bpf_prog_query(const union bpf_attr *attr,
+                                        union bpf_attr __user *uattr)
+{
+        return -EINVAL;
+}
+
 #define cgroup_bpf_enabled (0)
 #define BPF_CGROUP_PRE_CONNECT_ENABLED(sk) (0)
 #define BPF_CGROUP_RUN_PROG_INET_INGRESS(sk,skb) ({ 0; })
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 7df32a3200f7..8827e797ff97 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -696,6 +696,8 @@ static inline void bpf_map_offload_map_free(struct bpf_map *map)
 struct sock  *__sock_map_lookup_elem(struct bpf_map *map, u32 key);
 struct sock  *__sock_hash_lookup_elem(struct bpf_map *map, void *key);
 int sock_map_prog(struct bpf_map *map, struct bpf_prog *prog, u32 type);
+int sockmap_get_from_fd(const union bpf_attr *attr, int type,
+                        struct bpf_prog *prog);
 #else
 static inline struct sock  *__sock_map_lookup_elem(struct bpf_map *map, u32 key)
 {
@@ -714,6 +716,12 @@ static inline int sock_map_prog(struct bpf_map *map,
 {
         return -EOPNOTSUPP;
 }
+
+static inline int sockmap_get_from_fd(const union bpf_attr *attr, int type,
+                                      struct bpf_prog *prog)
+{
+        return -EINVAL;
+}
 #endif
 
 #if defined(CONFIG_XDP_SOCKETS)
diff --git a/include/linux/bpf_lirc.h b/include/linux/bpf_lirc.h
index 5f8a4283092d..9d9ff755ec29 100644
--- a/include/linux/bpf_lirc.h
+++ b/include/linux/bpf_lirc.h
@@ -5,11 +5,12 @@
 #include <uapi/linux/bpf.h>
 
 #ifdef CONFIG_BPF_LIRC_MODE2
-int lirc_prog_attach(const union bpf_attr *attr);
+int lirc_prog_attach(const union bpf_attr *attr, struct bpf_prog *prog);
 int lirc_prog_detach(const union bpf_attr *attr);
 int lirc_prog_query(const union bpf_attr *attr, union bpf_attr __user *uattr);
 #else
-static inline int lirc_prog_attach(const union bpf_attr *attr)
+static inline int lirc_prog_attach(const union bpf_attr *attr,
+                                   struct bpf_prog *prog)
 {
         return -EINVAL;
 }
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index fd282c7d3e5e..573f5a7d42d4 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -66,25 +66,40 @@
 #endif
 
 /*
+ * Feature detection for gnu_inline (gnu89 extern inline semantics). Either
+ * __GNUC_STDC_INLINE__ is defined (not using gnu89 extern inline semantics,
+ * and we opt in to the gnu89 semantics), or __GNUC_STDC_INLINE__ is not
+ * defined so the gnu89 semantics are the default.
+ */
+#ifdef __GNUC_STDC_INLINE__
+# define __gnu_inline   __attribute__((gnu_inline))
+#else
+# define __gnu_inline
+#endif
+
+/*
  * Force always-inline if the user requests it so via the .config,
  * or if gcc is too old.
  * GCC does not warn about unused static inline functions for
  * -Wunused-function.  This turns out to avoid the need for complex #ifdef
  * directives.  Suppress the warning in clang as well by using "unused"
  * function attribute, which is redundant but not harmful for gcc.
+ * Prefer gnu_inline, so that extern inline functions do not emit an
+ * externally visible function. This makes extern inline behave as per gnu89
+ * semantics rather than c99. This prevents multiple symbol definition errors
+ * of extern inline functions at link time.
+ * A lot of inline functions can cause havoc with function tracing.
  */
 #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) ||                \
     !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)
-#define inline inline           __attribute__((always_inline,unused)) notrace
-#define __inline__ __inline__   __attribute__((always_inline,unused)) notrace
-#define __inline __inline       __attribute__((always_inline,unused)) notrace
+#define inline \
+        inline __attribute__((always_inline, unused)) notrace __gnu_inline
 #else
-/* A lot of inline functions can cause havoc with function tracing */
-#define inline inline           __attribute__((unused)) notrace
-#define __inline__ __inline__   __attribute__((unused)) notrace
-#define __inline __inline       __attribute__((unused)) notrace
+#define inline inline           __attribute__((unused)) notrace __gnu_inline
 #endif
 
+#define __inline__ inline
+#define __inline inline
 #define __always_inline inline __attribute__((always_inline))
 #define  noinline       __attribute__((noinline))
 
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 20f2659dd829..300baad62c88 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -470,9 +470,7 @@ struct sock_fprog_kern {
 };
 
 struct bpf_binary_header {
-        u16 pages;
-        u16 locked:1;
-
+        u32 pages;
         /* Some arches need word alignment for their instructions */
         u8 image[] __aligned(4);
 };
@@ -481,7 +479,7 @@ struct bpf_prog {
         u16                     pages;          /* Number of allocated pages */
         u16                     jited:1,        /* Is our filter JIT'ed? */
                                 jit_requested:1,/* archs need to JIT the prog */
-                                locked:1,       /* Program image locked? */
+                                undo_set_mem:1, /* Passed set_memory_ro() checkpoint */
                                 gpl_compatible:1, /* Is filter GPL compatible? */
                                 cb_access:1,    /* Is control block accessed? */
                                 dst_needed:1,   /* Do we need dst entry? */
@@ -677,46 +675,24 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default)
 
 static inline void bpf_prog_lock_ro(struct bpf_prog *fp)
 {
-#ifdef CONFIG_ARCH_HAS_SET_MEMORY
-        fp->locked = 1;
-        if (set_memory_ro((unsigned long)fp, fp->pages))
-                fp->locked = 0;
-#endif
+        fp->undo_set_mem = 1;
+        set_memory_ro((unsigned long)fp, fp->pages);
 }
 
 static inline void bpf_prog_unlock_ro(struct bpf_prog *fp)
 {
-#ifdef CONFIG_ARCH_HAS_SET_MEMORY
-        if (fp->locked) {
-                WARN_ON_ONCE(set_memory_rw((unsigned long)fp, fp->pages));
-                /* In case set_memory_rw() fails, we want to be the first
-                 * to crash here instead of some random place later on.
-                 */
-                fp->locked = 0;
-        }
-#endif
+        if (fp->undo_set_mem)
+                set_memory_rw((unsigned long)fp, fp->pages);
 }
 
 static inline void bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr)
 {
-#ifdef CONFIG_ARCH_HAS_SET_MEMORY
-        hdr->locked = 1;
-        if (set_memory_ro((unsigned long)hdr, hdr->pages))
-                hdr->locked = 0;
-#endif
+        set_memory_ro((unsigned long)hdr, hdr->pages);
 }
 
 static inline void bpf_jit_binary_unlock_ro(struct bpf_binary_header *hdr)
 {
-#ifdef CONFIG_ARCH_HAS_SET_MEMORY
-        if (hdr->locked) {
-                WARN_ON_ONCE(set_memory_rw((unsigned long)hdr, hdr->pages));
-                /* In case set_memory_rw() fails, we want to be the first
-                 * to crash here instead of some random place later on.
-                 */
-                hdr->locked = 0;
-        }
-#endif
+        set_memory_rw((unsigned long)hdr, hdr->pages);
 }
 
 static inline struct bpf_binary_header *
@@ -728,22 +704,6 @@ bpf_jit_binary_hdr(const struct bpf_prog *fp)
         return (void *)addr;
 }
 
-#ifdef CONFIG_ARCH_HAS_SET_MEMORY
-static inline int bpf_prog_check_pages_ro_single(const struct bpf_prog *fp)
-{
-        if (!fp->locked)
-                return -ENOLCK;
-        if (fp->jited) {
-                const struct bpf_binary_header *hdr = bpf_jit_binary_hdr(fp);
-
-                if (!hdr->locked)
-                        return -ENOLCK;
-        }
-
-        return 0;
-}
-#endif
-
 int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap);
 static inline int sk_filter(struct sock *sk, struct sk_buff *skb)
 {
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 8154f4920fcb..ebb77674be90 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -223,7 +223,6 @@ extern enum ftrace_tracing_type_t ftrace_tracing_type;
  */
 int register_ftrace_function(struct ftrace_ops *ops);
 int unregister_ftrace_function(struct ftrace_ops *ops);
-void clear_ftrace_function(void);
 
 extern void ftrace_stub(unsigned long a0, unsigned long a1,
                         struct ftrace_ops *op, struct pt_regs *regs);
@@ -239,7 +238,6 @@ static inline int ftrace_nr_registered_ops(void)
 {
         return 0;
 }
-static inline void clear_ftrace_function(void) { }
 static inline void ftrace_kill(void) { }
 static inline void ftrace_free_init_mem(void) { }
 static inline void ftrace_free_mem(struct module *mod, void *start, void *end) { }
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 41a3d5775394..773bcb1d4044 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -511,6 +511,7 @@ struct hid_output_fifo {
 #define HID_STAT_ADDED          BIT(0)
 #define HID_STAT_PARSED         BIT(1)
 #define HID_STAT_DUP_DETECTED   BIT(2)
+#define HID_STAT_REPROBED       BIT(3)
 
 struct hid_input {
         struct list_head list;
@@ -579,7 +580,7 @@ struct hid_device {							/* device report descriptor */
         bool battery_avoid_query;
 #endif
 
-        unsigned int status;                                            /* see STAT flags above */
+        unsigned long status;                                           /* see STAT flags above */
         unsigned claimed;                                               /* Claimed by hidinput, hiddev? */
         unsigned quirks;                                                /* Various quirks the device can pull on us */
         bool io_started;                                                /* If IO has started */
diff --git a/include/linux/kthread.h b/include/linux/kthread.h
index 2803264c512f..c1961761311d 100644
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
@@ -62,7 +62,6 @@ void *kthread_probe_data(struct task_struct *k);
 int kthread_park(struct task_struct *k);
 void kthread_unpark(struct task_struct *k);
 void kthread_parkme(void);
-void kthread_park_complete(struct task_struct *k);
 
 int kthreadd(void *unused);
 extern struct task_struct *kthreadd_task;
diff --git a/include/linux/mlx5/eswitch.h b/include/linux/mlx5/eswitch.h
index d3c9db492b30..fab5121ffb8f 100644
--- a/include/linux/mlx5/eswitch.h
+++ b/include/linux/mlx5/eswitch.h
@@ -8,6 +8,8 @@
 
 #include <linux/mlx5/driver.h>
 
+#define MLX5_ESWITCH_MANAGER(mdev) MLX5_CAP_GEN(mdev, eswitch_manager)
+
 enum {
         SRIOV_NONE,
         SRIOV_LEGACY,
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 27134c4fcb76..ac281f5ec9b8 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -922,7 +922,7 @@ struct mlx5_ifc_cmd_hca_cap_bits {
         u8         vnic_env_queue_counters[0x1];
         u8         ets[0x1];
         u8         nic_flow_table[0x1];
-        u8         eswitch_flow_table[0x1];
+        u8         eswitch_manager[0x1];
         u8         device_memory[0x1];
         u8         mcam_reg[0x1];
         u8         pcam_reg[0x1];
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3ec9850c7936..3d0cc0b5cec2 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2789,11 +2789,31 @@ static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff **pp,
         if (PTR_ERR(pp) != -EINPROGRESS)
                 NAPI_GRO_CB(skb)->flush |= flush;
 }
+static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
+                                               struct sk_buff **pp,
+                                               int flush,
+                                               struct gro_remcsum *grc)
+{
+        if (PTR_ERR(pp) != -EINPROGRESS) {
+                NAPI_GRO_CB(skb)->flush |= flush;
+                skb_gro_remcsum_cleanup(skb, grc);
+                skb->remcsum_offload = 0;
+        }
+}
 #else
 static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff **pp, int flush)
 {
         NAPI_GRO_CB(skb)->flush |= flush;
 }
+static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
+                                               struct sk_buff **pp,
+                                               int flush,
+                                               struct gro_remcsum *grc)
+{
+        NAPI_GRO_CB(skb)->flush |= flush;
+        skb_gro_remcsum_cleanup(skb, grc);
+        skb->remcsum_offload = 0;
+}
 #endif
 
 static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9256118bd40c..43731fe51c97 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -118,7 +118,7 @@ struct task_group;
  * the comment with set_special_state().
  */
 #define is_special_task_state(state)                            \
-        ((state) & (__TASK_STOPPED | __TASK_TRACED | TASK_DEAD))
+        ((state) & (__TASK_STOPPED | __TASK_TRACED | TASK_PARKED | TASK_DEAD))
 
 #define __set_current_state(state_value)                        \
         do {                                                    \
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 47e35cce3b64..a71264d75d7f 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -128,6 +128,7 @@ struct net {
 #endif
 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
         struct netns_nf_frag    nf_frag;
+        struct ctl_table_header *nf_frag_frags_hdr;
 #endif
         struct sock             *nfnl;
         struct sock             *nfnl_stash;
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index c978a31b0f84..762ac9931b62 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -109,7 +109,6 @@ struct netns_ipv6 {
 
 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
 struct netns_nf_frag {
-        struct netns_sysctl_ipv6 sysctl;
         struct netns_frags      frags;
 };
 #endif
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index a3c1a2c47cd4..20b059574e60 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -111,6 +111,11 @@ void tcf_block_put_ext(struct tcf_block *block, struct Qdisc *q,
 {
 }
 
+static inline bool tcf_block_shared(struct tcf_block *block)
+{
+        return false;
+}
+
 static inline struct Qdisc *tcf_block_q(struct tcf_block *block)
 {
         return NULL;
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 59b19b6a40d7..b7db3261c62d 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1857,7 +1857,8 @@ union bpf_attr {
  *              is resolved), the nexthop address is returned in ipv4_dst
  *              or ipv6_dst based on family, smac is set to mac address of
  *              egress device, dmac is set to nexthop mac address, rt_metric
- *              is set to metric from route (IPv4/IPv6 only).
+ *              is set to metric from route (IPv4/IPv6 only), and ifindex
+ *              is set to the device index of the nexthop from the FIB lookup.
  *
  *             *plen* argument is the size of the passed in struct.
  *             *flags* argument can be a combination of one or more of the
@@ -1873,9 +1874,10 @@ union bpf_attr {
  *             *ctx* is either **struct xdp_md** for XDP programs or
  *             **struct sk_buff** tc cls_act programs.
  *     Return
- *             Egress device index on success, 0 if packet needs to continue
- *             up the stack for further processing or a negative error in case
- *             of failure.
+ *              * < 0 if any input argument is invalid
+ *              *   0 on success (packet is forwarded, nexthop neighbor exists)
+ *              * > 0 one of **BPF_FIB_LKUP_RET_** codes explaining why the
+ *              *     packet is not forwarded or needs assist from full stack
  *
  * int bpf_sock_hash_update(struct bpf_sock_ops_kern *skops, struct bpf_map *map, void *key, u64 flags)
  *      Description
@@ -2612,6 +2614,18 @@ struct bpf_raw_tracepoint_args {
 #define BPF_FIB_LOOKUP_DIRECT  BIT(0)
 #define BPF_FIB_LOOKUP_OUTPUT  BIT(1)
 
+enum {
+        BPF_FIB_LKUP_RET_SUCCESS,      /* lookup successful */
+        BPF_FIB_LKUP_RET_BLACKHOLE,    /* dest is blackholed; can be dropped */
+        BPF_FIB_LKUP_RET_UNREACHABLE,  /* dest is unreachable; can be dropped */
+        BPF_FIB_LKUP_RET_PROHIBIT,     /* dest not allowed; can be dropped */
+        BPF_FIB_LKUP_RET_NOT_FWDED,    /* packet is not forwarded */
+        BPF_FIB_LKUP_RET_FWD_DISABLED, /* fwding is not enabled on ingress */
+        BPF_FIB_LKUP_RET_UNSUPP_LWT,   /* fwd requires encapsulation */
+        BPF_FIB_LKUP_RET_NO_NEIGH,     /* no neighbor entry for nh */
+        BPF_FIB_LKUP_RET_FRAG_NEEDED,  /* fragmentation required to fwd */
+};
+
 struct bpf_fib_lookup {
         /* input:  network family for lookup (AF_INET, AF_INET6)
          * output: network family of egress nexthop
@@ -2625,7 +2639,11 @@ struct bpf_fib_lookup {
 
         /* total length of packet from network header - used for MTU check */
         __u16   tot_len;
-        __u32   ifindex;  /* L3 device index for lookup */
+
+        /* input: L3 device index for lookup
+         * output: device index from FIB lookup
+         */
+        __u32   ifindex;
 
         union {
                 /* inputs to lookup */
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
index f7c00bd6f8e4..3d83ee7df381 100644
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@ -428,6 +428,60 @@ int __cgroup_bpf_query(struct cgroup *cgrp, const union bpf_attr *attr,
         return ret;
 }
 
+int cgroup_bpf_prog_attach(const union bpf_attr *attr,
+                           enum bpf_prog_type ptype, struct bpf_prog *prog)
+{
+        struct cgroup *cgrp;
+        int ret;
+
+        cgrp = cgroup_get_from_fd(attr->target_fd);
+        if (IS_ERR(cgrp))
+                return PTR_ERR(cgrp);
+
+        ret = cgroup_bpf_attach(cgrp, prog, attr->attach_type,
+                                attr->attach_flags);
+        cgroup_put(cgrp);
+        return ret;
+}
+
+int cgroup_bpf_prog_detach(const union bpf_attr *attr, enum bpf_prog_type ptype)
+{
+        struct bpf_prog *prog;
+        struct cgroup *cgrp;
+        int ret;
+
+        cgrp = cgroup_get_from_fd(attr->target_fd);
+        if (IS_ERR(cgrp))
+                return PTR_ERR(cgrp);
+
+        prog = bpf_prog_get_type(attr->attach_bpf_fd, ptype);
+        if (IS_ERR(prog))
+                prog = NULL;
+
+        ret = cgroup_bpf_detach(cgrp, prog, attr->attach_type, 0);
+        if (prog)
+                bpf_prog_put(prog);
+
+        cgroup_put(cgrp);
+        return ret;
+}
+
+int cgroup_bpf_prog_query(const union bpf_attr *attr,
+                          union bpf_attr __user *uattr)
+{
+        struct cgroup *cgrp;
+        int ret;
+
+        cgrp = cgroup_get_from_fd(attr->query.target_fd);
+        if (IS_ERR(cgrp))
+                return PTR_ERR(cgrp);
+
+        ret = cgroup_bpf_query(cgrp, attr, uattr);
+
+        cgroup_put(cgrp);
+        return ret;
+}
+
 /**
  * __cgroup_bpf_run_filter_skb() - Run a program for packet filtering
  * @sk: The socket sending or receiving traffic
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index a9e6c04d0f4a..1e5625d46414 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -598,8 +598,6 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
         bpf_fill_ill_insns(hdr, size);
 
         hdr->pages = size / PAGE_SIZE;
-        hdr->locked = 0;
-
         hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
                      PAGE_SIZE - sizeof(*hdr));
         start = (get_random_int() % hole) & ~(alignment - 1);
@@ -1450,22 +1448,6 @@ static int bpf_check_tail_call(const struct bpf_prog *fp)
         return 0;
 }
 
-static int bpf_prog_check_pages_ro_locked(const struct bpf_prog *fp)
-{
-#ifdef CONFIG_ARCH_HAS_SET_MEMORY
-        int i, err;
-
-        for (i = 0; i < fp->aux->func_cnt; i++) {
-                err = bpf_prog_check_pages_ro_single(fp->aux->func[i]);
-                if (err)
-                        return err;
-        }
-
-        return bpf_prog_check_pages_ro_single(fp);
-#endif
-        return 0;
-}
-
 static void bpf_prog_select_func(struct bpf_prog *fp)
 {
 #ifndef CONFIG_BPF_JIT_ALWAYS_ON
@@ -1524,17 +1506,7 @@ finalize:
          * all eBPF JITs might immediately support all features.
          */
         *err = bpf_check_tail_call(fp);
-        if (*err)
-                return fp;
-
-        /* Checkpoint: at this point onwards any cBPF -> eBPF or
-         * native eBPF program is read-only. If we failed to change
-         * the page attributes (e.g. allocation failure from
-         * splitting large pages), then reject the whole program
-         * in order to guarantee not ending up with any W+X pages
-         * from BPF side in kernel.
-         */
-        *err = bpf_prog_check_pages_ro_locked(fp);
+
         return fp;
 }
 EXPORT_SYMBOL_GPL(bpf_prog_select_runtime);
diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c
index 52a91d816c0e..cf7b6a6dbd1f 100644
--- a/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c
@@ -72,6 +72,7 @@ struct bpf_htab {
         u32 n_buckets;
         u32 elem_size;
         struct bpf_sock_progs progs;
+        struct rcu_head rcu;
 };
 
 struct htab_elem {
@@ -89,8 +90,8 @@ enum smap_psock_state {
 struct smap_psock_map_entry {
         struct list_head list;
         struct sock **entry;
-        struct htab_elem *hash_link;
-        struct bpf_htab *htab;
+        struct htab_elem __rcu *hash_link;
+        struct bpf_htab __rcu *htab;
 };
 
 struct smap_psock {
@@ -120,6 +121,7 @@ struct smap_psock {
         struct bpf_prog *bpf_parse;
         struct bpf_prog *bpf_verdict;
         struct list_head maps;
+        spinlock_t maps_lock;
 
         /* Back reference used when sock callback trigger sockmap operations */
         struct sock *sock;
@@ -140,6 +142,7 @@ static int bpf_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
 static int bpf_tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);
 static int bpf_tcp_sendpage(struct sock *sk, struct page *page,
                             int offset, size_t size, int flags);
+static void bpf_tcp_close(struct sock *sk, long timeout);
 
 static inline struct smap_psock *smap_psock_sk(const struct sock *sk)
 {
@@ -161,7 +164,42 @@ out:
         return !empty;
 }
 
-static struct proto tcp_bpf_proto;
+enum {
+        SOCKMAP_IPV4,
+        SOCKMAP_IPV6,
+        SOCKMAP_NUM_PROTS,
+};
+
+enum {
+        SOCKMAP_BASE,
+        SOCKMAP_TX,
+        SOCKMAP_NUM_CONFIGS,
+};
+
+static struct proto *saved_tcpv6_prot __read_mostly;
+static DEFINE_SPINLOCK(tcpv6_prot_lock);
+static struct proto bpf_tcp_prots[SOCKMAP_NUM_PROTS][SOCKMAP_NUM_CONFIGS];
+static void build_protos(struct proto prot[SOCKMAP_NUM_CONFIGS],
+                         struct proto *base)
+{
+        prot[SOCKMAP_BASE]                      = *base;
+        prot[SOCKMAP_BASE].close                = bpf_tcp_close;
+        prot[SOCKMAP_BASE].recvmsg              = bpf_tcp_recvmsg;
+        prot[SOCKMAP_BASE].stream_memory_read   = bpf_tcp_stream_read;
+
+        prot[SOCKMAP_TX]                        = prot[SOCKMAP_BASE];
+        prot[SOCKMAP_TX].sendmsg                = bpf_tcp_sendmsg;
+        prot[SOCKMAP_TX].sendpage               = bpf_tcp_sendpage;
+}
+
+static void update_sk_prot(struct sock *sk, struct smap_psock *psock)
+{
+        int family = sk->sk_family == AF_INET6 ? SOCKMAP_IPV6 : SOCKMAP_IPV4;
+        int conf = psock->bpf_tx_msg ? SOCKMAP_TX : SOCKMAP_BASE;
+
+        sk->sk_prot = &bpf_tcp_prots[family][conf];
+}
+
 static int bpf_tcp_init(struct sock *sk)
 {
         struct smap_psock *psock;
@@ -181,14 +219,17 @@ static int bpf_tcp_init(struct sock *sk)
         psock->save_close = sk->sk_prot->close;
         psock->sk_proto = sk->sk_prot;
 
-        if (psock->bpf_tx_msg) {
-                tcp_bpf_proto.sendmsg = bpf_tcp_sendmsg;
-                tcp_bpf_proto.sendpage = bpf_tcp_sendpage;
-                tcp_bpf_proto.recvmsg = bpf_tcp_recvmsg;
-                tcp_bpf_proto.stream_memory_read = bpf_tcp_stream_read;
+        /* Build IPv6 sockmap whenever the address of tcpv6_prot changes */
+        if (sk->sk_family == AF_INET6 &&
+            unlikely(sk->sk_prot != smp_load_acquire(&saved_tcpv6_prot))) {
+                spin_lock_bh(&tcpv6_prot_lock);
+                if (likely(sk->sk_prot != saved_tcpv6_prot)) {
+                        build_protos(bpf_tcp_prots[SOCKMAP_IPV6], sk->sk_prot);
+                        smp_store_release(&saved_tcpv6_prot, sk->sk_prot);
+                }
+                spin_unlock_bh(&tcpv6_prot_lock);
         }
-
-        sk->sk_prot = &tcp_bpf_proto;
+        update_sk_prot(sk, psock);
         rcu_read_unlock();
         return 0;
 }
@@ -219,16 +260,54 @@ out:
         rcu_read_unlock();
 }
 
+static struct htab_elem *lookup_elem_raw(struct hlist_head *head,
+                                         u32 hash, void *key, u32 key_size)
+{
+        struct htab_elem *l;
+
+        hlist_for_each_entry_rcu(l, head, hash_node) {
+                if (l->hash == hash && !memcmp(&l->key, key, key_size))
+                        return l;
+        }
+
+        return NULL;
+}
+
+static inline struct bucket *__select_bucket(struct bpf_htab *htab, u32 hash)
+{
+        return &htab->buckets[hash & (htab->n_buckets - 1)];
+}
+
+static inline struct hlist_head *select_bucket(struct bpf_htab *htab, u32 hash)
+{
+        return &__select_bucket(htab, hash)->head;
+}
+
 static void free_htab_elem(struct bpf_htab *htab, struct htab_elem *l)
 {
         atomic_dec(&htab->count);
         kfree_rcu(l, rcu);
 }
 
+static struct smap_psock_map_entry *psock_map_pop(struct sock *sk,
+                                                  struct smap_psock *psock)
+{
+        struct smap_psock_map_entry *e;
+
+        spin_lock_bh(&psock->maps_lock);
+        e = list_first_entry_or_null(&psock->maps,
+                                     struct smap_psock_map_entry,
+                                     list);
+        if (e)
+                list_del(&e->list);
+        spin_unlock_bh(&psock->maps_lock);
+        return e;
+}
+
 static void bpf_tcp_close(struct sock *sk, long timeout)
 {
         void (*close_fun)(struct sock *sk, long timeout);
-        struct smap_psock_map_entry *e, *tmp;
+        struct smap_psock_map_entry *e;
         struct sk_msg_buff *md, *mtmp;
         struct smap_psock *psock;
         struct sock *osk;
@@ -247,7 +326,6 @@ static void bpf_tcp_close(struct sock *sk, long timeout)
          */
         close_fun = psock->save_close;
 
-        write_lock_bh(&sk->sk_callback_lock);
         if (psock->cork) {
                 free_start_sg(psock->sock, psock->cork);
                 kfree(psock->cork);
@@ -260,20 +338,38 @@ static void bpf_tcp_close(struct sock *sk, long timeout)
                 kfree(md);
         }
 
-        list_for_each_entry_safe(e, tmp, &psock->maps, list) {
+        e = psock_map_pop(sk, psock);
+        while (e) {
                 if (e->entry) {
                         osk = cmpxchg(e->entry, sk, NULL);
                         if (osk == sk) {
-                                list_del(&e->list);
                                 smap_release_sock(psock, sk);
                         }
                 } else {
-                        hlist_del_rcu(&e->hash_link->hash_node);
-                        smap_release_sock(psock, e->hash_link->sk);
-                        free_htab_elem(e->htab, e->hash_link);
+                        struct htab_elem *link = rcu_dereference(e->hash_link);
+                        struct bpf_htab *htab = rcu_dereference(e->htab);
+                        struct hlist_head *head;
+                        struct htab_elem *l;
+                        struct bucket *b;
+
+                        b = __select_bucket(htab, link->hash);
+                        head = &b->head;
+                        raw_spin_lock_bh(&b->lock);
+                        l = lookup_elem_raw(head,
+                                            link->hash, link->key,
+                                            htab->map.key_size);
+                        /* If another thread deleted this object skip deletion.
+                         * The refcnt on psock may or may not be zero.
+                         */
+                        if (l) {
+                                hlist_del_rcu(&link->hash_node);
+                                smap_release_sock(psock, link->sk);
+                                free_htab_elem(htab, link);
+                        }
+                        raw_spin_unlock_bh(&b->lock);
                 }
+                e = psock_map_pop(sk, psock);
         }
-        write_unlock_bh(&sk->sk_callback_lock);
         rcu_read_unlock();
         close_fun(sk, timeout);
 }
@@ -1111,8 +1207,7 @@ static void bpf_tcp_msg_add(struct smap_psock *psock,
 
 static int bpf_tcp_ulp_register(void)
 {
-        tcp_bpf_proto = tcp_prot;
-        tcp_bpf_proto.close = bpf_tcp_close;
+        build_protos(bpf_tcp_prots[SOCKMAP_IPV4], &tcp_prot);
         /* Once BPF TX ULP is registered it is never unregistered. It
          * will be in the ULP list for the lifetime of the system. Doing
          * duplicate registers is not a problem.
@@ -1357,7 +1452,9 @@ static void smap_release_sock(struct smap_psock *psock, struct sock *sock)
 {
         if (refcount_dec_and_test(&psock->refcnt)) {
                 tcp_cleanup_ulp(sock);
+                write_lock_bh(&sock->sk_callback_lock);
                 smap_stop_sock(psock, sock);
+                write_unlock_bh(&sock->sk_callback_lock);
                 clear_bit(SMAP_TX_RUNNING, &psock->state);
                 rcu_assign_sk_user_data(sock, NULL);
                 call_rcu_sched(&psock->rcu, smap_destroy_psock);
@@ -1508,6 +1605,7 @@ static struct smap_psock *smap_init_psock(struct sock *sock, int node)
         INIT_LIST_HEAD(&psock->maps);
         INIT_LIST_HEAD(&psock->ingress);
         refcount_set(&psock->refcnt, 1);
+        spin_lock_init(&psock->maps_lock);
 
         rcu_assign_sk_user_data(sock, psock);
         sock_hold(sock);
@@ -1564,18 +1662,32 @@ free_stab:
         return ERR_PTR(err);
 }
 
-static void smap_list_remove(struct smap_psock *psock,
-                             struct sock **entry,
-                             struct htab_elem *hash_link)
+static void smap_list_map_remove(struct smap_psock *psock,
+                                 struct sock **entry)
 {
         struct smap_psock_map_entry *e, *tmp;
 
+        spin_lock_bh(&psock->maps_lock);
         list_for_each_entry_safe(e, tmp, &psock->maps, list) {
-                if (e->entry == entry || e->hash_link == hash_link) {
+                if (e->entry == entry)
                         list_del(&e->list);
-                        break;
-                }
         }
+        spin_unlock_bh(&psock->maps_lock);
+}
+
+static void smap_list_hash_remove(struct smap_psock *psock,
+                                  struct htab_elem *hash_link)
+{
+        struct smap_psock_map_entry *e, *tmp;
+
+        spin_lock_bh(&psock->maps_lock);
+        list_for_each_entry_safe(e, tmp, &psock->maps, list) {
+                struct htab_elem *c = rcu_dereference(e->hash_link);
+
+                if (c == hash_link)
+                        list_del(&e->list);
+        }
+        spin_unlock_bh(&psock->maps_lock);
 }
 
 static void sock_map_free(struct bpf_map *map)
@@ -1601,7 +1713,6 @@ static void sock_map_free(struct bpf_map *map)
                 if (!sock)
                         continue;
 
-                write_lock_bh(&sock->sk_callback_lock);
                 psock = smap_psock_sk(sock);
                 /* This check handles a racing sock event that can get the
                  * sk_callback_lock before this case but after xchg happens
@@ -1609,10 +1720,9 @@ static void sock_map_free(struct bpf_map *map)
                  * to be null and queued for garbage collection.
                  */
                 if (likely(psock)) {
-                        smap_list_remove(psock, &stab->sock_map[i], NULL);
+                        smap_list_map_remove(psock, &stab->sock_map[i]);
                         smap_release_sock(psock, sock);
                 }
-                write_unlock_bh(&sock->sk_callback_lock);
         }
         rcu_read_unlock();
 
@@ -1661,17 +1771,15 @@ static int sock_map_delete_elem(struct bpf_map *map, void *key)
         if (!sock)
                 return -EINVAL;
 
-        write_lock_bh(&sock->sk_callback_lock);
         psock = smap_psock_sk(sock);
         if (!psock)
                 goto out;
 
         if (psock->bpf_parse)
                 smap_stop_sock(psock, sock);
-        smap_list_remove(psock, &stab->sock_map[k], NULL);
+        smap_list_map_remove(psock, &stab->sock_map[k]);
         smap_release_sock(psock, sock);
 out:
-        write_unlock_bh(&sock->sk_callback_lock);
         return 0;
 }
 
@@ -1752,7 +1860,6 @@ static int __sock_map_ctx_update_elem(struct bpf_map *map,
                 }
         }
 
-        write_lock_bh(&sock->sk_callback_lock);
         psock = smap_psock_sk(sock);
 
         /* 2. Do not allow inheriting programs if psock exists and has
@@ -1809,7 +1916,9 @@ static int __sock_map_ctx_update_elem(struct bpf_map *map,
                 if (err)
                         goto out_free;
                 smap_init_progs(psock, verdict, parse);
+                write_lock_bh(&sock->sk_callback_lock);
                 smap_start_sock(psock, sock);
+                write_unlock_bh(&sock->sk_callback_lock);
         }
 
         /* 4. Place psock in sockmap for use and stop any programs on
@@ -1819,9 +1928,10 @@ static int __sock_map_ctx_update_elem(struct bpf_map *map,
          */
         if (map_link) {
                 e->entry = map_link;
+                spin_lock_bh(&psock->maps_lock);
                 list_add_tail(&e->list, &psock->maps);
+                spin_unlock_bh(&psock->maps_lock);
         }
-        write_unlock_bh(&sock->sk_callback_lock);
         return err;
 out_free:
         smap_release_sock(psock, sock);
@@ -1832,7 +1942,6 @@ out_progs:
         }
         if (tx_msg)
                 bpf_prog_put(tx_msg);
-        write_unlock_bh(&sock->sk_callback_lock);
         kfree(e);
         return err;
 }
@@ -1869,10 +1978,8 @@ static int sock_map_ctx_update_elem(struct bpf_sock_ops_kern *skops,
         if (osock) {
                 struct smap_psock *opsock = smap_psock_sk(osock);
 
-                write_lock_bh(&osock->sk_callback_lock);
-                smap_list_remove(opsock, &stab->sock_map[i], NULL);
+                smap_list_map_remove(opsock, &stab->sock_map[i]);
                 smap_release_sock(opsock, osock);
-                write_unlock_bh(&osock->sk_callback_lock);
         }
 out:
         return err;
@@ -1915,6 +2022,24 @@ int sock_map_prog(struct bpf_map *map, struct bpf_prog *prog, u32 type)
         return 0;
 }
 
+int sockmap_get_from_fd(const union bpf_attr *attr, int type,
+                        struct bpf_prog *prog)
+{
+        int ufd = attr->target_fd;
+        struct bpf_map *map;
+        struct fd f;
+        int err;
+
+        f = fdget(ufd);
+        map = __bpf_map_get(f);
+        if (IS_ERR(map))
+                return PTR_ERR(map);
+
+        err = sock_map_prog(map, prog, attr->attach_type);
+        fdput(f);
+        return err;
+}
+
 static void *sock_map_lookup(struct bpf_map *map, void *key)
 {
         return NULL;
@@ -2043,14 +2168,13 @@ free_htab:
         return ERR_PTR(err);
 }
 
-static inline struct bucket *__select_bucket(struct bpf_htab *htab, u32 hash)
+static void __bpf_htab_free(struct rcu_head *rcu)
 {
-        return &htab->buckets[hash & (htab->n_buckets - 1)];
-}
+        struct bpf_htab *htab;
 
-static inline struct hlist_head *select_bucket(struct bpf_htab *htab, u32 hash)
-{
-        return &__select_bucket(htab, hash)->head;
+        htab = container_of(rcu, struct bpf_htab, rcu);
+        bpf_map_area_free(htab->buckets);
+        kfree(htab);
 }
 
 static void sock_hash_free(struct bpf_map *map)
@@ -2069,16 +2193,18 @@ static void sock_hash_free(struct bpf_map *map)
          */
         rcu_read_lock();
         for (i = 0; i < htab->n_buckets; i++) {
-                struct hlist_head *head = select_bucket(htab, i);
+                struct bucket *b = __select_bucket(htab, i);
+                struct hlist_head *head;
                 struct hlist_node *n;
                 struct htab_elem *l;
 
+                raw_spin_lock_bh(&b->lock);
+                head = &b->head;
                 hlist_for_each_entry_safe(l, n, head, hash_node) {
                         struct sock *sock = l->sk;
                         struct smap_psock *psock;
 
                         hlist_del_rcu(&l->hash_node);
-                        write_lock_bh(&sock->sk_callback_lock);
                         psock = smap_psock_sk(sock);
                         /* This check handles a racing sock event that can get
                          * the sk_callback_lock before this case but after xchg
@@ -2086,16 +2212,15 @@ static void sock_hash_free(struct bpf_map *map)
                          * (psock) to be null and queued for garbage collection.
                          */
                         if (likely(psock)) {
-                                smap_list_remove(psock, NULL, l);
+                                smap_list_hash_remove(psock, l);
                                 smap_release_sock(psock, sock);
                         }
-                        write_unlock_bh(&sock->sk_callback_lock);
-                        kfree(l);
+                        free_htab_elem(htab, l);
                 }
+                raw_spin_unlock_bh(&b->lock);
         }
         rcu_read_unlock();
-        bpf_map_area_free(htab->buckets);
-        kfree(htab);
+        call_rcu(&htab->rcu, __bpf_htab_free);
 }
 
 static struct htab_elem *alloc_sock_hash_elem(struct bpf_htab *htab,
@@ -2122,19 +2247,6 @@ static struct htab_elem *alloc_sock_hash_elem(struct bpf_htab *htab,
         return l_new;
 }
 
-static struct htab_elem *lookup_elem_raw(struct hlist_head *head,
-                                         u32 hash, void *key, u32 key_size)
-{
-        struct htab_elem *l;
-
-        hlist_for_each_entry_rcu(l, head, hash_node) {
-                if (l->hash == hash && !memcmp(&l->key, key, key_size))
-                        return l;
-        }
-
-        return NULL;
-}
-
 static inline u32 htab_map_hash(const void *key, u32 key_len)
 {
         return jhash(key, key_len, 0);
@@ -2254,9 +2366,12 @@ static int sock_hash_ctx_update_elem(struct bpf_sock_ops_kern *skops,
                 goto bucket_err;
         }
 
-        e->hash_link = l_new;
-        e->htab = container_of(map, struct bpf_htab, map);
+        rcu_assign_pointer(e->hash_link, l_new);
+        rcu_assign_pointer(e->htab,
+                           container_of(map, struct bpf_htab, map));
+        spin_lock_bh(&psock->maps_lock);
         list_add_tail(&e->list, &psock->maps);
+        spin_unlock_bh(&psock->maps_lock);
 
         /* add new element to the head of the list, so that
          * concurrent search will find it before old elem
@@ -2266,7 +2381,7 @@ static int sock_hash_ctx_update_elem(struct bpf_sock_ops_kern *skops,
                 psock = smap_psock_sk(l_old->sk);
 
                 hlist_del_rcu(&l_old->hash_node);
-                smap_list_remove(psock, NULL, l_old);
+                smap_list_hash_remove(psock, l_old);
                 smap_release_sock(psock, l_old->sk);
                 free_htab_elem(htab, l_old);
         }
@@ -2326,7 +2441,6 @@ static int sock_hash_delete_elem(struct bpf_map *map, void *key)
                 struct smap_psock *psock;
 
                 hlist_del_rcu(&l->hash_node);
-                write_lock_bh(&sock->sk_callback_lock);
                 psock = smap_psock_sk(sock);
                 /* This check handles a racing sock event that can get the
                  * sk_callback_lock before this case but after xchg happens
@@ -2334,10 +2448,9 @@ static int sock_hash_delete_elem(struct bpf_map *map, void *key)
                  * to be null and queued for garbage collection.
                  */
                 if (likely(psock)) {
-                        smap_list_remove(psock, NULL, l);
+                        smap_list_hash_remove(psock, l);
                         smap_release_sock(psock, sock);
                 }
-                write_unlock_bh(&sock->sk_callback_lock);
                 free_htab_elem(htab, l);
                 ret = 0;
         }
@@ -2383,6 +2496,7 @@ const struct bpf_map_ops sock_hash_ops = {
         .map_get_next_key = sock_hash_get_next_key,
         .map_update_elem = sock_hash_update_elem,
         .map_delete_elem = sock_hash_delete_elem,
+        .map_release_uref = sock_map_release,
 };
 
 BPF_CALL_4(bpf_sock_map_update, struct bpf_sock_ops_kern *, bpf_sock,
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 35dc466641f2..d10ecd78105f 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1483,8 +1483,6 @@ out_free_tp:
         return err;
 }
 
-#ifdef CONFIG_CGROUP_BPF
-
 static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog,
                                              enum bpf_attach_type attach_type)
 {
@@ -1499,40 +1497,6 @@ static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog,
 
 #define BPF_PROG_ATTACH_LAST_FIELD attach_flags
 
-static int sockmap_get_from_fd(const union bpf_attr *attr,
-                               int type, bool attach)
-{
-        struct bpf_prog *prog = NULL;
-        int ufd = attr->target_fd;
-        struct bpf_map *map;
-        struct fd f;
-        int err;
-
-        f = fdget(ufd);
-        map = __bpf_map_get(f);
-        if (IS_ERR(map))
-                return PTR_ERR(map);
-
-        if (attach) {
-                prog = bpf_prog_get_type(attr->attach_bpf_fd, type);
-                if (IS_ERR(prog)) {
-                        fdput(f);
-                        return PTR_ERR(prog);
-                }
-        }
-
-        err = sock_map_prog(map, prog, attr->attach_type);
-        if (err) {
-                fdput(f);
-                if (prog)
-                        bpf_prog_put(prog);
-                return err;
-        }
-
-        fdput(f);
-        return 0;
-}
-
 #define BPF_F_ATTACH_MASK \
         (BPF_F_ALLOW_OVERRIDE | BPF_F_ALLOW_MULTI)
 
@@ -1540,7 +1504,6 @@ static int bpf_prog_attach(const union bpf_attr *attr)
 {
         enum bpf_prog_type ptype;
         struct bpf_prog *prog;
-        struct cgroup *cgrp;
         int ret;
 
         if (!capable(CAP_NET_ADMIN))
@@ -1577,12 +1540,15 @@ static int bpf_prog_attach(const union bpf_attr *attr)
                 ptype = BPF_PROG_TYPE_CGROUP_DEVICE;
                 break;
         case BPF_SK_MSG_VERDICT:
-                return sockmap_get_from_fd(attr, BPF_PROG_TYPE_SK_MSG, true);
+                ptype = BPF_PROG_TYPE_SK_MSG;
+                break;
         case BPF_SK_SKB_STREAM_PARSER:
         case BPF_SK_SKB_STREAM_VERDICT:
-                return sockmap_get_from_fd(attr, BPF_PROG_TYPE_SK_SKB, true);
+                ptype = BPF_PROG_TYPE_SK_SKB;
+                break;
         case BPF_LIRC_MODE2:
-                return lirc_prog_attach(attr);
+                ptype = BPF_PROG_TYPE_LIRC_MODE2;
+                break;
         default:
                 return -EINVAL;
         }
@@ -1596,18 +1562,20 @@ static int bpf_prog_attach(const union bpf_attr *attr)
                 return -EINVAL;
         }
 
-        cgrp = cgroup_get_from_fd(attr->target_fd);
-        if (IS_ERR(cgrp)) {
-                bpf_prog_put(prog);
-                return PTR_ERR(cgrp);
+        switch (ptype) {
+        case BPF_PROG_TYPE_SK_SKB:
+        case BPF_PROG_TYPE_SK_MSG:
+                ret = sockmap_get_from_fd(attr, ptype, prog);
+                break;
+        case BPF_PROG_TYPE_LIRC_MODE2:
+                ret = lirc_prog_attach(attr, prog);
+                break;
+        default:
+                ret = cgroup_bpf_prog_attach(attr, ptype, prog);
         }
 
-        ret = cgroup_bpf_attach(cgrp, prog, attr->attach_type,
-                                attr->attach_flags);
         if (ret)
                 bpf_prog_put(prog);
-        cgroup_put(cgrp);
-
         return ret;
 }
 
@@ -1616,9 +1584,6 @@ static int bpf_prog_attach(const union bpf_attr *attr)
 static int bpf_prog_detach(const union bpf_attr *attr)
 {
         enum bpf_prog_type ptype;
-        struct bpf_prog *prog;
-        struct cgroup *cgrp;
-        int ret;
 
         if (!capable(CAP_NET_ADMIN))
                 return -EPERM;
@@ -1651,29 +1616,17 @@ static int bpf_prog_detach(const union bpf_attr *attr)
                 ptype = BPF_PROG_TYPE_CGROUP_DEVICE;
                 break;
         case BPF_SK_MSG_VERDICT:
-                return sockmap_get_from_fd(attr, BPF_PROG_TYPE_SK_MSG, false);
+                return sockmap_get_from_fd(attr, BPF_PROG_TYPE_SK_MSG, NULL);
         case BPF_SK_SKB_STREAM_PARSER:
         case BPF_SK_SKB_STREAM_VERDICT:
-                return sockmap_get_from_fd(attr, BPF_PROG_TYPE_SK_SKB, false);
+                return sockmap_get_from_fd(attr, BPF_PROG_TYPE_SK_SKB, NULL);
         case BPF_LIRC_MODE2:
                 return lirc_prog_detach(attr);
         default:
                 return -EINVAL;
         }
 
-        cgrp = cgroup_get_from_fd(attr->target_fd);
-        if (IS_ERR(cgrp))
-                return PTR_ERR(cgrp);
-
-        prog = bpf_prog_get_type(attr->attach_bpf_fd, ptype);
-        if (IS_ERR(prog))
-                prog = NULL;
-
-        ret = cgroup_bpf_detach(cgrp, prog, attr->attach_type, 0);
-        if (prog)
-                bpf_prog_put(prog);
-        cgroup_put(cgrp);
-        return ret;
+        return cgroup_bpf_prog_detach(attr, ptype);
 }
 
 #define BPF_PROG_QUERY_LAST_FIELD query.prog_cnt
@@ -1681,9 +1634,6 @@ static int bpf_prog_detach(const union bpf_attr *attr)
 static int bpf_prog_query(const union bpf_attr *attr,
                           union bpf_attr __user *uattr)
 {
-        struct cgroup *cgrp;
-        int ret;
-
         if (!capable(CAP_NET_ADMIN))
                 return -EPERM;
         if (CHECK_ATTR(BPF_PROG_QUERY))
@@ -1711,14 +1661,9 @@ static int bpf_prog_query(const union bpf_attr *attr,
         default:
                 return -EINVAL;
         }
-        cgrp = cgroup_get_from_fd(attr->query.target_fd);
-        if (IS_ERR(cgrp))
-                return PTR_ERR(cgrp);
-        ret = cgroup_bpf_query(cgrp, attr, uattr);
-        cgroup_put(cgrp);
-        return ret;
+
+        return cgroup_bpf_prog_query(attr, uattr);
 }
-#endif /* CONFIG_CGROUP_BPF */
 
 #define BPF_PROG_TEST_RUN_LAST_FIELD test.duration
 
@@ -2365,7 +2310,6 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
         case BPF_OBJ_GET:
                 err = bpf_obj_get(&attr);
                 break;
-#ifdef CONFIG_CGROUP_BPF
         case BPF_PROG_ATTACH:
                 err = bpf_prog_attach(&attr);
                 break;
@@ -2375,7 +2319,6 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
         case BPF_PROG_QUERY:
                 err = bpf_prog_query(&attr, uattr);
                 break;
-#endif
         case BPF_PROG_TEST_RUN:
                 err = bpf_prog_test_run(&attr, uattr);
                 break;
diff --git a/kernel/kthread.c b/kernel/kthread.c
index 481951bf091d..750cb8082694 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -177,9 +177,20 @@ void *kthread_probe_data(struct task_struct *task)
 static void __kthread_parkme(struct kthread *self)
 {
         for (;;) {
-                set_current_state(TASK_PARKED);
+                /*
+                 * TASK_PARKED is a special state; we must serialize against
+                 * possible pending wakeups to avoid store-store collisions on
+                 * task->state.
+                 *
+                 * Such a collision might possibly result in the task state
+                 * changin from TASK_PARKED and us failing the
+                 * wait_task_inactive() in kthread_park().
+                 */
+                set_special_state(TASK_PARKED);
                 if (!test_bit(KTHREAD_SHOULD_PARK, &self->flags))
                         break;
+
+                complete_all(&self->parked);
                 schedule();
         }
         __set_current_state(TASK_RUNNING);
@@ -191,11 +202,6 @@ void kthread_parkme(void)
 }
 EXPORT_SYMBOL_GPL(kthread_parkme);
 
-void kthread_park_complete(struct task_struct *k)
-{
-        complete_all(&to_kthread(k)->parked);
-}
-
 static int kthread(void *_create)
 {
         /* Copy data: it's on kthread's stack */
@@ -461,6 +467,9 @@ void kthread_unpark(struct task_struct *k)
 
         reinit_completion(&kthread->parked);
         clear_bit(KTHREAD_SHOULD_PARK, &kthread->flags);
+        /*
+         * __kthread_parkme() will either see !SHOULD_PARK or get the wakeup.
+         */
         wake_up_state(k, TASK_PARKED);
 }
 EXPORT_SYMBOL_GPL(kthread_unpark);
@@ -487,7 +496,16 @@ int kthread_park(struct task_struct *k)
         set_bit(KTHREAD_SHOULD_PARK, &kthread->flags);
         if (k != current) {
                 wake_up_process(k);
+                /*
+                 * Wait for __kthread_parkme() to complete(), this means we
+                 * _will_ have TASK_PARKED and are about to call schedule().
+                 */
                 wait_for_completion(&kthread->parked);
+                /*
+                 * Now wait for that schedule() to complete and the task to
+                 * get scheduled out.
+                 */
+                WARN_ON_ONCE(!wait_task_inactive(k, TASK_PARKED));
         }
 
         return 0;
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 78d8facba456..fe365c9a08e9 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7,7 +7,6 @@
  */
 #include "sched.h"
 
-#include <linux/kthread.h>
 #include <linux/nospec.h>
 
 #include <linux/kcov.h>
@@ -2724,28 +2723,20 @@ static struct rq *finish_task_switch(struct task_struct *prev)
                 membarrier_mm_sync_core_before_usermode(mm);
                 mmdrop(mm);
         }
-        if (unlikely(prev_state & (TASK_DEAD|TASK_PARKED))) {
-                switch (prev_state) {
-                case TASK_DEAD:
-                        if (prev->sched_class->task_dead)
-                                prev->sched_class->task_dead(prev);
+        if (unlikely(prev_state == TASK_DEAD)) {
+                if (prev->sched_class->task_dead)
+                        prev->sched_class->task_dead(prev);
 
-                        /*
-                         * Remove function-return probe instances associated with this
-                         * task and put them back on the free list.
-                         */
-                        kprobe_flush_task(prev);
-
-                        /* Task is done with its stack. */
-                        put_task_stack(prev);
+                /*
+                 * Remove function-return probe instances associated with this
+                 * task and put them back on the free list.
+                 */
+                kprobe_flush_task(prev);
 
-                        put_task_struct(prev);
-                        break;
+                /* Task is done with its stack. */
+                put_task_stack(prev);
 
-                case TASK_PARKED:
-                        kthread_park_complete(prev);
-                        break;
-                }
+                put_task_struct(prev);
         }
 
         tick_nohz_task_switch();
@@ -3113,7 +3104,9 @@ static void sched_tick_remote(struct work_struct *work)
         struct tick_work *twork = container_of(dwork, struct tick_work, work);
         int cpu = twork->cpu;
         struct rq *rq = cpu_rq(cpu);
+        struct task_struct *curr;
         struct rq_flags rf;
+        u64 delta;
 
         /*
          * Handle the tick only if it appears the remote CPU is running in full
@@ -3122,24 +3115,28 @@ static void sched_tick_remote(struct work_struct *work)
          * statistics and checks timeslices in a time-independent way, regardless
          * of when exactly it is running.
          */
-        if (!idle_cpu(cpu) && tick_nohz_tick_stopped_cpu(cpu)) {
-                struct task_struct *curr;
-                u64 delta;
+        if (idle_cpu(cpu) || !tick_nohz_tick_stopped_cpu(cpu))
+                goto out_requeue;
 
-                rq_lock_irq(rq, &rf);
-                update_rq_clock(rq);
-                curr = rq->curr;
-                delta = rq_clock_task(rq) - curr->se.exec_start;
+        rq_lock_irq(rq, &rf);
+        curr = rq->curr;
+        if (is_idle_task(curr))
+                goto out_unlock;
 
-                /*
-                 * Make sure the next tick runs within a reasonable
-                 * amount of time.
-                 */
-                WARN_ON_ONCE(delta > (u64)NSEC_PER_SEC * 3);
-                curr->sched_class->task_tick(rq, curr, 0);
-                rq_unlock_irq(rq, &rf);
-        }
+        update_rq_clock(rq);
+        delta = rq_clock_task(rq) - curr->se.exec_start;
+
+        /*
+         * Make sure the next tick runs within a reasonable
+         * amount of time.
+         */
+        WARN_ON_ONCE(delta > (u64)NSEC_PER_SEC * 3);
+        curr->sched_class->task_tick(rq, curr, 0);
+
+out_unlock:
+        rq_unlock_irq(rq, &rf);
 
+out_requeue:
         /*
          * Run the remote tick once per second (1Hz). This arbitrary
          * frequency is large enough to avoid overload but short enough
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index 3cde46483f0a..c907fde01eaa 100644
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -192,7 +192,7 @@ static unsigned long sugov_aggregate_util(struct sugov_cpu *sg_cpu)
 {
         struct rq *rq = cpu_rq(sg_cpu->cpu);
 
-        if (rq->rt.rt_nr_running)
+        if (rt_rq_is_runnable(&rq->rt))
                 return sg_cpu->max;
 
         /*
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 1866e64792a7..2f0a0be4d344 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3982,18 +3982,10 @@ util_est_dequeue(struct cfs_rq *cfs_rq, struct task_struct *p, bool task_sleep)
         if (!sched_feat(UTIL_EST))
                 return;
 
-        /*
-         * Update root cfs_rq's estimated utilization
-         *
-         * If *p is the last task then the root cfs_rq's estimated utilization
-         * of a CPU is 0 by definition.
-         */
-        ue.enqueued = 0;
-        if (cfs_rq->nr_running) {
-                ue.enqueued  = cfs_rq->avg.util_est.enqueued;
-                ue.enqueued -= min_t(unsigned int, ue.enqueued,
-                                     (_task_util_est(p) | UTIL_AVG_UNCHANGED));
-        }
+        /* Update root cfs_rq's estimated utilization */
+        ue.enqueued  = cfs_rq->avg.util_est.enqueued;
+        ue.enqueued -= min_t(unsigned int, ue.enqueued,
+                             (_task_util_est(p) | UTIL_AVG_UNCHANGED));
         WRITE_ONCE(cfs_rq->avg.util_est.enqueued, ue.enqueued);
 
         /*
@@ -4590,6 +4582,7 @@ void __refill_cfs_bandwidth_runtime(struct cfs_bandwidth *cfs_b)
         now = sched_clock_cpu(smp_processor_id());
         cfs_b->runtime = cfs_b->quota;
         cfs_b->runtime_expires = now + ktime_to_ns(cfs_b->period);
+        cfs_b->expires_seq++;
 }
 
 static inline struct cfs_bandwidth *tg_cfs_bandwidth(struct task_group *tg)
@@ -4612,6 +4605,7 @@ static int assign_cfs_rq_runtime(struct cfs_rq *cfs_rq)
         struct task_group *tg = cfs_rq->tg;
         struct cfs_bandwidth *cfs_b = tg_cfs_bandwidth(tg);
         u64 amount = 0, min_amount, expires;
+        int expires_seq;
 
         /* note: this is a positive sum as runtime_remaining <= 0 */
         min_amount = sched_cfs_bandwidth_slice() - cfs_rq->runtime_remaining;
@@ -4628,6 +4622,7 @@ static int assign_cfs_rq_runtime(struct cfs_rq *cfs_rq)
                         cfs_b->idle = 0;
                 }
         }
+        expires_seq = cfs_b->expires_seq;
         expires = cfs_b->runtime_expires;
         raw_spin_unlock(&cfs_b->lock);
 
@@ -4637,8 +4632,10 @@ static int assign_cfs_rq_runtime(struct cfs_rq *cfs_rq)
          * spread between our sched_clock and the one on which runtime was
          * issued.
          */
-        if ((s64)(expires - cfs_rq->runtime_expires) > 0)
+        if (cfs_rq->expires_seq != expires_seq) {
+                cfs_rq->expires_seq = expires_seq;
                 cfs_rq->runtime_expires = expires;
+        }
 
         return cfs_rq->runtime_remaining > 0;
 }
@@ -4664,12 +4661,9 @@ static void expire_cfs_rq_runtime(struct cfs_rq *cfs_rq)
          * has not truly expired.
          *
          * Fortunately we can check determine whether this the case by checking
-         * whether the global deadline has advanced. It is valid to compare
-         * cfs_b->runtime_expires without any locks since we only care about
-         * exact equality, so a partial write will still work.
+         * whether the global deadline(cfs_b->expires_seq) has advanced.
          */
-
-        if (cfs_rq->runtime_expires != cfs_b->runtime_expires) {
+        if (cfs_rq->expires_seq == cfs_b->expires_seq) {
                 /* extend local deadline, drift is bounded above by 2 ticks */
                 cfs_rq->runtime_expires += TICK_NSEC;
         } else {
@@ -5202,13 +5196,18 @@ static void init_cfs_rq_runtime(struct cfs_rq *cfs_rq)
 
 void start_cfs_bandwidth(struct cfs_bandwidth *cfs_b)
 {
+        u64 overrun;
+
         lockdep_assert_held(&cfs_b->lock);
 
-        if (!cfs_b->period_active) {
-                cfs_b->period_active = 1;
-                hrtimer_forward_now(&cfs_b->period_timer, cfs_b->period);
-                hrtimer_start_expires(&cfs_b->period_timer, HRTIMER_MODE_ABS_PINNED);
-        }
+        if (cfs_b->period_active)
+                return;
+
+        cfs_b->period_active = 1;
+        overrun = hrtimer_forward_now(&cfs_b->period_timer, cfs_b->period);
+        cfs_b->runtime_expires += (overrun + 1) * ktime_to_ns(cfs_b->period);
+        cfs_b->expires_seq++;
+        hrtimer_start_expires(&cfs_b->period_timer, HRTIMER_MODE_ABS_PINNED);
 }
 
 static void destroy_cfs_bandwidth(struct cfs_bandwidth *cfs_b)
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 47556b0c9a95..572567078b60 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -508,8 +508,11 @@ static void sched_rt_rq_dequeue(struct rt_rq *rt_rq)
 
         rt_se = rt_rq->tg->rt_se[cpu];
 
-        if (!rt_se)
+        if (!rt_se) {
                 dequeue_top_rt_rq(rt_rq);
+                /* Kick cpufreq (see the comment in kernel/sched/sched.h). */
+                cpufreq_update_util(rq_of_rt_rq(rt_rq), 0);
+        }
         else if (on_rt_rq(rt_se))
                 dequeue_rt_entity(rt_se, 0);
 }
@@ -1001,8 +1004,6 @@ dequeue_top_rt_rq(struct rt_rq *rt_rq)
         sub_nr_running(rq, rt_rq->rt_nr_running);
         rt_rq->rt_queued = 0;
 
-        /* Kick cpufreq (see the comment in kernel/sched/sched.h). */
-        cpufreq_update_util(rq, 0);
 }
 
 static void
@@ -1014,11 +1015,14 @@ enqueue_top_rt_rq(struct rt_rq *rt_rq)
 
         if (rt_rq->rt_queued)
                 return;
-        if (rt_rq_throttled(rt_rq) || !rt_rq->rt_nr_running)
+
+        if (rt_rq_throttled(rt_rq))
                 return;
 
-        add_nr_running(rq, rt_rq->rt_nr_running);
-        rt_rq->rt_queued = 1;
+        if (rt_rq->rt_nr_running) {
+                add_nr_running(rq, rt_rq->rt_nr_running);
+                rt_rq->rt_queued = 1;
+        }
 
         /* Kick cpufreq (see the comment in kernel/sched/sched.h). */
         cpufreq_update_util(rq, 0);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 6601baf2361c..c7742dcc136c 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -334,9 +334,10 @@ struct cfs_bandwidth {
         u64                     runtime;
         s64                     hierarchical_quota;
         u64                     runtime_expires;
+        int                     expires_seq;
 
-        int                     idle;
-        int                     period_active;
+        short                   idle;
+        short                   period_active;
         struct hrtimer          period_timer;
         struct hrtimer          slack_timer;
         struct list_head        throttled_cfs_rq;
@@ -551,6 +552,7 @@ struct cfs_rq {
 
 #ifdef CONFIG_CFS_BANDWIDTH
         int                     runtime_enabled;
+        int                     expires_seq;
         u64                     runtime_expires;
         s64                     runtime_remaining;
 
@@ -609,6 +611,11 @@ struct rt_rq {
 #endif
 };
 
+static inline bool rt_rq_is_runnable(struct rt_rq *rt_rq)
+{
+        return rt_rq->rt_queued && rt_rq->rt_nr_running;
+}
+
 /* Deadline class' related fields in a runqueue */
 struct dl_rq {
         /* runqueue is an rbtree, ordered by deadline */
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index efed9c1cfb7e..caf9cbf35816 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -192,17 +192,6 @@ static void ftrace_pid_func(unsigned long ip, unsigned long parent_ip,
         op->saved_func(ip, parent_ip, op, regs);
 }
 
-/**
- * clear_ftrace_function - reset the ftrace function
- *
- * This NULLs the ftrace function and in essence stops
- * tracing.  There may be lag
- */
-void clear_ftrace_function(void)
-{
-        ftrace_trace_function = ftrace_stub;
-}
-
 static void ftrace_sync(struct work_struct *work)
 {
         /*
@@ -6689,7 +6678,7 @@ void ftrace_kill(void)
 {
         ftrace_disabled = 1;
         ftrace_enabled = 0;
-        clear_ftrace_function();
+        ftrace_trace_function = ftrace_stub;
 }
 
 /**
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index a0079b4c7a49..f054bd6a1c66 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2953,6 +2953,7 @@ out_nobuffer:
 }
 EXPORT_SYMBOL_GPL(trace_vbprintk);
 
+__printf(3, 0)
 static int
 __trace_array_vprintk(struct ring_buffer *buffer,
                       unsigned long ip, const char *fmt, va_list args)
@@ -3007,12 +3008,14 @@ out_nobuffer:
         return len;
 }
 
+__printf(3, 0)
 int trace_array_vprintk(struct trace_array *tr,
                         unsigned long ip, const char *fmt, va_list args)
 {
         return __trace_array_vprintk(tr->trace_buffer.buffer, ip, fmt, args);
 }
 
+__printf(3, 0)
 int trace_array_printk(struct trace_array *tr,
                        unsigned long ip, const char *fmt, ...)
 {
@@ -3028,6 +3031,7 @@ int trace_array_printk(struct trace_array *tr,
         return ret;
 }
 
+__printf(3, 4)
 int trace_array_printk_buf(struct ring_buffer *buffer,
                            unsigned long ip, const char *fmt, ...)
 {
@@ -3043,6 +3047,7 @@ int trace_array_printk_buf(struct ring_buffer *buffer,
         return ret;
 }
 
+__printf(2, 0)
 int trace_vprintk(unsigned long ip, const char *fmt, va_list args)
 {
         return trace_array_vprintk(&global_trace, ip, fmt, args);
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 630c5a24b2b2..f8f86231ad90 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -583,9 +583,7 @@ static __always_inline void trace_clear_recursion(int bit)
 static inline struct ring_buffer_iter *
 trace_buffer_iter(struct trace_iterator *iter, int cpu)
 {
-        if (iter->buffer_iter && iter->buffer_iter[cpu])
-                return iter->buffer_iter[cpu];
-        return NULL;
+        return iter->buffer_iter ? iter->buffer_iter[cpu] : NULL;
 }
 
 int tracer_init(struct tracer *t, struct trace_array *tr);
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 0dceb77d1d42..893a206bcba4 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1701,6 +1701,7 @@ static void create_filter_finish(struct filter_parse_error *pe)
  * @filter_str: filter string
  * @set_str: remember @filter_str and enable detailed error in filter
  * @filterp: out param for created filter (always updated on return)
+ *           Must be a pointer that references a NULL pointer.
  *
  * Creates a filter for @call with @filter_str.  If @set_str is %true,
  * @filter_str is copied and recorded in the new filter.
@@ -1718,6 +1719,10 @@ static int create_filter(struct trace_event_call *call,
         struct filter_parse_error *pe = NULL;
         int err;
 
+        /* filterp must point to NULL */
+        if (WARN_ON(*filterp))
+                *filterp = NULL;
+
         err = create_filter_start(filter_string, set_str, &pe, filterp);
         if (err)
                 return err;
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 046c716a6536..aae18af94c94 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -393,7 +393,7 @@ static void hist_err_event(char *str, char *system, char *event, char *var)
         else if (system)
                 snprintf(err, MAX_FILTER_STR_VAL, "%s.%s", system, event);
         else
-                strncpy(err, var, MAX_FILTER_STR_VAL);
+                strscpy(err, var, MAX_FILTER_STR_VAL);
 
         hist_err(str, err);
 }
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 23c0b0cb5fb9..169b3c44ee97 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -831,6 +831,7 @@ print_graph_entry_leaf(struct trace_iterator *iter,
         struct ftrace_graph_ret *graph_ret;
         struct ftrace_graph_ent *call;
         unsigned long long duration;
+        int cpu = iter->cpu;
         int i;
 
         graph_ret = &ret_entry->ret;
@@ -839,7 +840,6 @@ print_graph_entry_leaf(struct trace_iterator *iter,
 
         if (data) {
                 struct fgraph_cpu_data *cpu_data;
-                int cpu = iter->cpu;
 
                 cpu_data = per_cpu_ptr(data->cpu_data, cpu);
 
@@ -869,6 +869,9 @@ print_graph_entry_leaf(struct trace_iterator *iter,
 
         trace_seq_printf(s, "%ps();\n", (void *)call->func);
 
+        print_graph_irq(iter, graph_ret->func, TRACE_GRAPH_RET,
+                        cpu, iter->ent->pid, flags);
+
         return trace_handle_return(s);
 }
 
diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index 60aedc879361..08d3d59dca17 100644
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -5282,21 +5282,31 @@ static struct bpf_test tests[] = {
         {       /* Mainly checking JIT here. */
                 "BPF_MAXINSNS: Ctx heavy transformations",
                 { },
+#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390)
+                CLASSIC | FLAG_EXPECTED_FAIL,
+#else
                 CLASSIC,
+#endif
                 { },
                 {
                         {  1, !!(SKB_VLAN_TCI & VLAN_TAG_PRESENT) },
                         { 10, !!(SKB_VLAN_TCI & VLAN_TAG_PRESENT) }
                 },
                 .fill_helper = bpf_fill_maxinsns6,
+                .expected_errcode = -ENOTSUPP,
         },
         {       /* Mainly checking JIT here. */
                 "BPF_MAXINSNS: Call heavy transformations",
                 { },
+#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390)
+                CLASSIC | FLAG_NO_DATA | FLAG_EXPECTED_FAIL,
+#else
                 CLASSIC | FLAG_NO_DATA,
+#endif
                 { },
                 { { 1, 0 }, { 10, 0 } },
                 .fill_helper = bpf_fill_maxinsns7,
+                .expected_errcode = -ENOTSUPP,
         },
         {       /* Mainly checking JIT here. */
                 "BPF_MAXINSNS: Jump heavy test",
@@ -5347,18 +5357,28 @@ static struct bpf_test tests[] = {
         {
                 "BPF_MAXINSNS: exec all MSH",
                 { },
+#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390)
+                CLASSIC | FLAG_EXPECTED_FAIL,
+#else
                 CLASSIC,
+#endif
                 { 0xfa, 0xfb, 0xfc, 0xfd, },
                 { { 4, 0xababab83 } },
                 .fill_helper = bpf_fill_maxinsns13,
+                .expected_errcode = -ENOTSUPP,
         },
         {
                 "BPF_MAXINSNS: ld_abs+get_processor_id",
                 { },
+#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390)
+                CLASSIC | FLAG_EXPECTED_FAIL,
+#else
                 CLASSIC,
+#endif
                 { },
                 { { 1, 0xbee } },
                 .fill_helper = bpf_fill_ld_abs_get_processor_id,
+                .expected_errcode = -ENOTSUPP,
         },
         /*
          * LD_IND / LD_ABS on fragmented SKBs
diff --git a/mm/debug.c b/mm/debug.c
index 56e2d9125ea5..38c926520c97 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -43,12 +43,25 @@ const struct trace_print_flags vmaflag_names[] = {
 
 void __dump_page(struct page *page, const char *reason)
 {
+        bool page_poisoned = PagePoisoned(page);
+        int mapcount;
+
+        /*
+         * If struct page is poisoned don't access Page*() functions as that
+         * leads to recursive loop. Page*() check for poisoned pages, and calls
+         * dump_page() when detected.
+         */
+        if (page_poisoned) {
+                pr_emerg("page:%px is uninitialized and poisoned", page);
+                goto hex_only;
+        }
+
         /*
          * Avoid VM_BUG_ON() in page_mapcount().
          * page->_mapcount space in struct page is used by sl[aou]b pages to
          * encode own info.
          */
-        int mapcount = PageSlab(page) ? 0 : page_mapcount(page);
+        mapcount = PageSlab(page) ? 0 : page_mapcount(page);
 
         pr_emerg("page:%px count:%d mapcount:%d mapping:%px index:%#lx",
                   page, page_ref_count(page), mapcount,
@@ -60,6 +73,7 @@ void __dump_page(struct page *page, const char *reason)
 
         pr_emerg("flags: %#lx(%pGp)\n", page->flags, &page->flags);
 
+hex_only:
         print_hex_dump(KERN_ALERT, "raw: ", DUMP_PREFIX_NONE, 32,
                         sizeof(unsigned long), page,
                         sizeof(struct page), false);
@@ -68,7 +82,7 @@ void __dump_page(struct page *page, const char *reason)
                 pr_alert("page dumped because: %s\n", reason);
 
 #ifdef CONFIG_MEMCG
-        if (page->mem_cgroup)
+        if (!page_poisoned && page->mem_cgroup)
                 pr_alert("page->mem_cgroup:%px\n", page->mem_cgroup);
 #endif
 }
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 3612fbb32e9d..039ddbc574e9 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2163,6 +2163,7 @@ static void __init gather_bootmem_prealloc(void)
                  */
                 if (hstate_is_gigantic(h))
                         adjust_managed_page_count(page, 1 << h->order);
+                cond_resched();
         }
 }
 
diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c
index f185455b3406..c3bd5209da38 100644
--- a/mm/kasan/kasan.c
+++ b/mm/kasan/kasan.c
@@ -619,12 +619,13 @@ void kasan_kfree_large(void *ptr, unsigned long ip)
 int kasan_module_alloc(void *addr, size_t size)
 {
         void *ret;
+        size_t scaled_size;
         size_t shadow_size;
         unsigned long shadow_start;
 
         shadow_start = (unsigned long)kasan_mem_to_shadow(addr);
-        shadow_size = round_up(size >> KASAN_SHADOW_SCALE_SHIFT,
-                        PAGE_SIZE);
+        scaled_size = (size + KASAN_SHADOW_MASK) >> KASAN_SHADOW_SCALE_SHIFT;
+        shadow_size = round_up(scaled_size, PAGE_SIZE);
 
         if (WARN_ON(!PAGE_ALIGNED(shadow_start)))
                 return -EINVAL;
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 73a65789271b..8ccee3d01822 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -693,7 +693,7 @@ static struct sk_buff **vlan_gro_receive(struct sk_buff **head,
 out_unlock:
         rcu_read_unlock();
 out:
-        NAPI_GRO_CB(skb)->flush |= flush;
+        skb_gro_flush_final(skb, pp, flush);
 
         return pp;
 }
diff --git a/net/Makefile b/net/Makefile
index 13ec0d5415c7..bdaf53925acd 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -20,11 +20,7 @@ obj-$(CONFIG_TLS)		+= tls/
 obj-$(CONFIG_XFRM)              += xfrm/
 obj-$(CONFIG_UNIX)              += unix/
 obj-$(CONFIG_NET)               += ipv6/
-ifneq ($(CC_CAN_LINK),y)
-$(warning CC cannot link executables. Skipping bpfilter.)
-else
 obj-$(CONFIG_BPFILTER)          += bpfilter/
-endif
 obj-$(CONFIG_PACKET)            += packet/
 obj-$(CONFIG_NET_KEY)           += key/
 obj-$(CONFIG_BRIDGE)            += bridge/
diff --git a/net/bpfilter/Kconfig b/net/bpfilter/Kconfig
index a948b072c28f..76deb6615883 100644
--- a/net/bpfilter/Kconfig
+++ b/net/bpfilter/Kconfig
@@ -1,6 +1,5 @@
 menuconfig BPFILTER
         bool "BPF based packet filtering framework (BPFILTER)"
-        default n
         depends on NET && BPF && INET
         help
           This builds experimental bpfilter framework that is aiming to
@@ -9,6 +8,7 @@ menuconfig BPFILTER
 if BPFILTER
 config BPFILTER_UMH
         tristate "bpfilter kernel module with user mode helper"
+        depends on $(success,$(srctree)/scripts/cc-can-link.sh $(CC))
         default m
         help
           This builds bpfilter kernel module with embedded user mode helper
diff --git a/net/bpfilter/Makefile b/net/bpfilter/Makefile
index 051dc18b8ccb..39c6980b5d99 100644
--- a/net/bpfilter/Makefile
+++ b/net/bpfilter/Makefile
@@ -15,20 +15,7 @@ ifeq ($(CONFIG_BPFILTER_UMH), y)
 HOSTLDFLAGS += -static
 endif
 
-# a bit of elf magic to convert bpfilter_umh binary into a binary blob
-# inside bpfilter_umh.o elf file referenced by
-# _binary_net_bpfilter_bpfilter_umh_start symbol
-# which bpfilter_kern.c passes further into umh blob loader at run-time
-quiet_cmd_copy_umh = GEN $@
-      cmd_copy_umh = echo ':' > $(obj)/.bpfilter_umh.o.cmd; \
-      $(OBJCOPY) -I binary \
-          `LC_ALL=C $(OBJDUMP) -f net/bpfilter/bpfilter_umh \
-          |awk -F' |,' '/file format/{print "-O",$$NF} \
-          /^architecture:/{print "-B",$$2}'` \
-      --rename-section .data=.init.rodata $< $@
-
-$(obj)/bpfilter_umh.o: $(obj)/bpfilter_umh
-        $(call cmd,copy_umh)
+$(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh
 
 obj-$(CONFIG_BPFILTER_UMH) += bpfilter.o
-bpfilter-objs += bpfilter_kern.o bpfilter_umh.o
+bpfilter-objs += bpfilter_kern.o bpfilter_umh_blob.o
diff --git a/net/bpfilter/bpfilter_kern.c b/net/bpfilter/bpfilter_kern.c
index 09522573f611..f0fc182d3db7 100644
--- a/net/bpfilter/bpfilter_kern.c
+++ b/net/bpfilter/bpfilter_kern.c
@@ -10,11 +10,8 @@
 #include <linux/file.h>
 #include "msgfmt.h"
 
-#define UMH_start _binary_net_bpfilter_bpfilter_umh_start
-#define UMH_end _binary_net_bpfilter_bpfilter_umh_end
-
-extern char UMH_start;
-extern char UMH_end;
+extern char bpfilter_umh_start;
+extern char bpfilter_umh_end;
 
 static struct umh_info info;
 /* since ip_getsockopt() can run in parallel, serialize access to umh */
@@ -93,7 +90,9 @@ static int __init load_umh(void)
         int err;
 
         /* fork usermode process */
-        err = fork_usermode_blob(&UMH_start, &UMH_end - &UMH_start, &info);
+        err = fork_usermode_blob(&bpfilter_umh_start,
+                                 &bpfilter_umh_end - &bpfilter_umh_start,
+                                 &info);
         if (err)
                 return err;
         pr_info("Loaded bpfilter_umh pid %d\n", info.pid);
diff --git a/net/bpfilter/bpfilter_umh_blob.S b/net/bpfilter/bpfilter_umh_blob.S
new file mode 100644
index 000000000000..40311d10d2f2
--- /dev/null
+++ b/net/bpfilter/bpfilter_umh_blob.S
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+        .section .init.rodata, "a"
+        .global bpfilter_umh_start
+bpfilter_umh_start:
+        .incbin "net/bpfilter/bpfilter_umh"
+        .global bpfilter_umh_end
+bpfilter_umh_end:
diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index a04e1e88bf3a..50537ff961a7 100644
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -285,16 +285,9 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)
                 if (ifr->ifr_qlen < 0)
                         return -EINVAL;
                 if (dev->tx_queue_len ^ ifr->ifr_qlen) {
-                        unsigned int orig_len = dev->tx_queue_len;
-
-                        dev->tx_queue_len = ifr->ifr_qlen;
-                        err = call_netdevice_notifiers(
-                                        NETDEV_CHANGE_TX_QUEUE_LEN, dev);
-                        err = notifier_to_errno(err);
-                        if (err) {
-                                dev->tx_queue_len = orig_len;
+                        err = dev_change_tx_queue_len(dev, ifr->ifr_qlen);
+                        if (err)
                                 return err;
-                        }
                 }
                 return 0;
 
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 126ffc5bc630..f64aa13811ea 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -416,6 +416,14 @@ static struct fib_rule *rule_find(struct fib_rules_ops *ops,
                 if (rule->mark && r->mark != rule->mark)
                         continue;
 
+                if (rule->suppress_ifgroup != -1 &&
+                    r->suppress_ifgroup != rule->suppress_ifgroup)
+                        continue;
+
+                if (rule->suppress_prefixlen != -1 &&
+                    r->suppress_prefixlen != rule->suppress_prefixlen)
+                        continue;
+
                 if (rule->mark_mask && r->mark_mask != rule->mark_mask)
                         continue;
 
@@ -436,6 +444,9 @@ static struct fib_rule *rule_find(struct fib_rules_ops *ops,
                 if (rule->ip_proto && r->ip_proto != rule->ip_proto)
                         continue;
 
+                if (rule->proto && r->proto != rule->proto)
+                        continue;
+
                 if (fib_rule_port_range_set(&rule->sport_range) &&
                     !fib_rule_port_range_compare(&r->sport_range,
                                                  &rule->sport_range))
@@ -645,6 +656,73 @@ errout:
         return err;
 }
 
+static int rule_exists(struct fib_rules_ops *ops, struct fib_rule_hdr *frh,
+                       struct nlattr **tb, struct fib_rule *rule)
+{
+        struct fib_rule *r;
+
+        list_for_each_entry(r, &ops->rules_list, list) {
+                if (r->action != rule->action)
+                        continue;
+
+                if (r->table != rule->table)
+                        continue;
+
+                if (r->pref != rule->pref)
+                        continue;
+
+                if (memcmp(r->iifname, rule->iifname, IFNAMSIZ))
+                        continue;
+
+                if (memcmp(r->oifname, rule->oifname, IFNAMSIZ))
+                        continue;
+
+                if (r->mark != rule->mark)
+                        continue;
+
+                if (r->suppress_ifgroup != rule->suppress_ifgroup)
+                        continue;
+
+                if (r->suppress_prefixlen != rule->suppress_prefixlen)
+                        continue;
+
+                if (r->mark_mask != rule->mark_mask)
+                        continue;
+
+                if (r->tun_id != rule->tun_id)
+                        continue;
+
+                if (r->fr_net != rule->fr_net)
+                        continue;
+
+                if (r->l3mdev != rule->l3mdev)
+                        continue;
+
+                if (!uid_eq(r->uid_range.start, rule->uid_range.start) ||
+                    !uid_eq(r->uid_range.end, rule->uid_range.end))
+                        continue;
+
+                if (r->ip_proto != rule->ip_proto)
+                        continue;
+
+                if (r->proto != rule->proto)
+                        continue;
+
+                if (!fib_rule_port_range_compare(&r->sport_range,
+                                                 &rule->sport_range))
+                        continue;
+
+                if (!fib_rule_port_range_compare(&r->dport_range,
+                                                 &rule->dport_range))
+                        continue;
+
+                if (!ops->compare(r, frh, tb))
+                        continue;
+                return 1;
+        }
+        return 0;
+}
+
 int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,
                    struct netlink_ext_ack *extack)
 {
@@ -679,7 +757,7 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,
                 goto errout;
 
         if ((nlh->nlmsg_flags & NLM_F_EXCL) &&
-            rule_find(ops, frh, tb, rule, user_priority)) {
+            rule_exists(ops, frh, tb, rule)) {
                 err = -EEXIST;
                 goto errout_free;
         }
diff --git a/net/core/filter.c b/net/core/filter.c
index e7f12e9f598c..0ca6907d7efe 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4073,8 +4073,9 @@ static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params,
         memcpy(params->smac, dev->dev_addr, ETH_ALEN);
         params->h_vlan_TCI = 0;
         params->h_vlan_proto = 0;
+        params->ifindex = dev->ifindex;
 
-        return dev->ifindex;
+        return 0;
 }
 #endif
 
@@ -4098,7 +4099,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
         /* verify forwarding is enabled on this interface */
         in_dev = __in_dev_get_rcu(dev);
         if (unlikely(!in_dev || !IN_DEV_FORWARD(in_dev)))
-                return 0;
+                return BPF_FIB_LKUP_RET_FWD_DISABLED;
 
         if (flags & BPF_FIB_LOOKUP_OUTPUT) {
                 fl4.flowi4_iif = 1;
@@ -4123,7 +4124,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
 
                 tb = fib_get_table(net, tbid);
                 if (unlikely(!tb))
-                        return 0;
+                        return BPF_FIB_LKUP_RET_NOT_FWDED;
 
                 err = fib_table_lookup(tb, &fl4, &res, FIB_LOOKUP_NOREF);
         } else {
@@ -4135,8 +4136,20 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
                 err = fib_lookup(net, &fl4, &res, FIB_LOOKUP_NOREF);
         }
 
-        if (err || res.type != RTN_UNICAST)
-                return 0;
+        if (err) {
+                /* map fib lookup errors to RTN_ type */
+                if (err == -EINVAL)
+                        return BPF_FIB_LKUP_RET_BLACKHOLE;
+                if (err == -EHOSTUNREACH)
+                        return BPF_FIB_LKUP_RET_UNREACHABLE;
+                if (err == -EACCES)
+                        return BPF_FIB_LKUP_RET_PROHIBIT;
+
+                return BPF_FIB_LKUP_RET_NOT_FWDED;
+        }
+
+        if (res.type != RTN_UNICAST)
+                return BPF_FIB_LKUP_RET_NOT_FWDED;
 
         if (res.fi->fib_nhs > 1)
                 fib_select_path(net, &res, &fl4, NULL);
@@ -4144,19 +4157,16 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
         if (check_mtu) {
                 mtu = ip_mtu_from_fib_result(&res, params->ipv4_dst);
                 if (params->tot_len > mtu)
-                        return 0;
+                        return BPF_FIB_LKUP_RET_FRAG_NEEDED;
         }
 
         nh = &res.fi->fib_nh[res.nh_sel];
 
         /* do not handle lwt encaps right now */
         if (nh->nh_lwtstate)
-                return 0;
+                return BPF_FIB_LKUP_RET_UNSUPP_LWT;
 
         dev = nh->nh_dev;
-        if (unlikely(!dev))
-                return 0;
-
         if (nh->nh_gw)
                 params->ipv4_dst = nh->nh_gw;
 
@@ -4166,10 +4176,10 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
          * rcu_read_lock_bh is not needed here
          */
         neigh = __ipv4_neigh_lookup_noref(dev, (__force u32)params->ipv4_dst);
-        if (neigh)
-                return bpf_fib_set_fwd_params(params, neigh, dev);
+        if (!neigh)
+                return BPF_FIB_LKUP_RET_NO_NEIGH;
 
-        return 0;
+        return bpf_fib_set_fwd_params(params, neigh, dev);
 }
 #endif
 
@@ -4190,7 +4200,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
 
         /* link local addresses are never forwarded */
         if (rt6_need_strict(dst) || rt6_need_strict(src))
-                return 0;
+                return BPF_FIB_LKUP_RET_NOT_FWDED;
 
         dev = dev_get_by_index_rcu(net, params->ifindex);
         if (unlikely(!dev))
@@ -4198,7 +4208,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
 
         idev = __in6_dev_get_safely(dev);
         if (unlikely(!idev || !net->ipv6.devconf_all->forwarding))
-                return 0;
+                return BPF_FIB_LKUP_RET_FWD_DISABLED;
 
         if (flags & BPF_FIB_LOOKUP_OUTPUT) {
                 fl6.flowi6_iif = 1;
@@ -4225,7 +4235,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
 
                 tb = ipv6_stub->fib6_get_table(net, tbid);
                 if (unlikely(!tb))
-                        return 0;
+                        return BPF_FIB_LKUP_RET_NOT_FWDED;
 
                 f6i = ipv6_stub->fib6_table_lookup(net, tb, oif, &fl6, strict);
         } else {
@@ -4238,11 +4248,23 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
         }
 
         if (unlikely(IS_ERR_OR_NULL(f6i) || f6i == net->ipv6.fib6_null_entry))
-                return 0;
+                return BPF_FIB_LKUP_RET_NOT_FWDED;
+
+        if (unlikely(f6i->fib6_flags & RTF_REJECT)) {
+                switch (f6i->fib6_type) {
+                case RTN_BLACKHOLE:
+                        return BPF_FIB_LKUP_RET_BLACKHOLE;
+                case RTN_UNREACHABLE:
+                        return BPF_FIB_LKUP_RET_UNREACHABLE;
+                case RTN_PROHIBIT:
+                        return BPF_FIB_LKUP_RET_PROHIBIT;
+                default:
+                        return BPF_FIB_LKUP_RET_NOT_FWDED;
+                }
+        }
 
-        if (unlikely(f6i->fib6_flags & RTF_REJECT ||
-            f6i->fib6_type != RTN_UNICAST))
-                return 0;
+        if (f6i->fib6_type != RTN_UNICAST)
+                return BPF_FIB_LKUP_RET_NOT_FWDED;
 
         if (f6i->fib6_nsiblings && fl6.flowi6_oif == 0)
                 f6i = ipv6_stub->fib6_multipath_select(net, f6i, &fl6,
@@ -4252,11 +4274,11 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
         if (check_mtu) {
                 mtu = ipv6_stub->ip6_mtu_from_fib6(f6i, dst, src);
                 if (params->tot_len > mtu)
-                        return 0;
+                        return BPF_FIB_LKUP_RET_FRAG_NEEDED;
         }
 
         if (f6i->fib6_nh.nh_lwtstate)
-                return 0;
+                return BPF_FIB_LKUP_RET_UNSUPP_LWT;
 
         if (f6i->fib6_flags & RTF_GATEWAY)
                 *dst = f6i->fib6_nh.nh_gw;
@@ -4270,10 +4292,10 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
          */
         neigh = ___neigh_lookup_noref(ipv6_stub->nd_tbl, neigh_key_eq128,
                                       ndisc_hashfn, dst, dev);
-        if (neigh)
-                return bpf_fib_set_fwd_params(params, neigh, dev);
+        if (!neigh)
+                return BPF_FIB_LKUP_RET_NO_NEIGH;
 
-        return 0;
+        return bpf_fib_set_fwd_params(params, neigh, dev);
 }
 #endif
 
@@ -4315,7 +4337,7 @@ BPF_CALL_4(bpf_skb_fib_lookup, struct sk_buff *, skb,
            struct bpf_fib_lookup *, params, int, plen, u32, flags)
 {
         struct net *net = dev_net(skb->dev);
-        int index = -EAFNOSUPPORT;
+        int rc = -EAFNOSUPPORT;
 
         if (plen < sizeof(*params))
                 return -EINVAL;
@@ -4326,25 +4348,25 @@ BPF_CALL_4(bpf_skb_fib_lookup, struct sk_buff *, skb,
         switch (params->family) {
 #if IS_ENABLED(CONFIG_INET)
         case AF_INET:
-                index = bpf_ipv4_fib_lookup(net, params, flags, false);
+                rc = bpf_ipv4_fib_lookup(net, params, flags, false);
                 break;
 #endif
 #if IS_ENABLED(CONFIG_IPV6)
         case AF_INET6:
-                index = bpf_ipv6_fib_lookup(net, params, flags, false);
+                rc = bpf_ipv6_fib_lookup(net, params, flags, false);
                 break;
 #endif
         }
 
-        if (index > 0) {
+        if (!rc) {
                 struct net_device *dev;
 
-                dev = dev_get_by_index_rcu(net, index);
+                dev = dev_get_by_index_rcu(net, params->ifindex);
                 if (!is_skb_forwardable(dev, skb))
-                        index = 0;
+                        rc = BPF_FIB_LKUP_RET_FRAG_NEEDED;
         }
 
-        return index;
+        return rc;
 }
 
 static const struct bpf_func_proto bpf_skb_fib_lookup_proto = {
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index c642304f178c..eba8dae22c25 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -5276,8 +5276,7 @@ struct sk_buff *alloc_skb_with_frags(unsigned long header_len,
                         if (npages >= 1 << order) {
                                 page = alloc_pages((gfp_mask & ~__GFP_DIRECT_RECLAIM) |
                                                    __GFP_COMP |
-                                                   __GFP_NOWARN |
-                                                   __GFP_NORETRY,
+                                                   __GFP_NOWARN,
                                                    order);
                                 if (page)
                                         goto fill_page;
diff --git a/net/core/sock.c b/net/core/sock.c
index bcc41829a16d..9e8f65585b81 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3243,7 +3243,8 @@ static int req_prot_init(const struct proto *prot)
 
         rsk_prot->slab = kmem_cache_create(rsk_prot->slab_name,
                                            rsk_prot->obj_size, 0,
-                                           prot->slab_flags, NULL);
+                                           SLAB_ACCOUNT | prot->slab_flags,
+                                           NULL);
 
         if (!rsk_prot->slab) {
                 pr_crit("%s: Can't create request sock SLAB cache!\n",
@@ -3258,7 +3259,8 @@ int proto_register(struct proto *prot, int alloc_slab)
         if (alloc_slab) {
                 prot->slab = kmem_cache_create_usercopy(prot->name,
                                         prot->obj_size, 0,
-                                        SLAB_HWCACHE_ALIGN | prot->slab_flags,
+                                        SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT |
+                                        prot->slab_flags,
                                         prot->useroffset, prot->usersize,
                                         NULL);
 
@@ -3281,6 +3283,7 @@ int proto_register(struct proto *prot, int alloc_slab)
                                 kmem_cache_create(prot->twsk_prot->twsk_slab_name,
                                                   prot->twsk_prot->twsk_obj_size,
                                                   0,
+                                                  SLAB_ACCOUNT |
                                                   prot->slab_flags,
                                                   NULL);
                         if (prot->twsk_prot->twsk_slab == NULL)
diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index 1540db65241a..c9ec1603666b 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -448,9 +448,7 @@ next_proto:
 out_unlock:
         rcu_read_unlock();
 out:
-        NAPI_GRO_CB(skb)->flush |= flush;
-        skb_gro_remcsum_cleanup(skb, &grc);
-        skb->remcsum_offload = 0;
+        skb_gro_flush_final_remcsum(skb, pp, flush, &grc);
 
         return pp;
 }
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
index 1859c473b21a..6a7d980105f6 100644
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -223,7 +223,7 @@ static struct sk_buff **gre_gro_receive(struct sk_buff **head,
 out_unlock:
         rcu_read_unlock();
 out:
-        NAPI_GRO_CB(skb)->flush |= flush;
+        skb_gro_flush_final(skb, pp, flush);
 
         return pp;
 }
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index d06247ba08b2..af0a857d8352 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -265,8 +265,9 @@ static int proc_tcp_fastopen_key(struct ctl_table *table, int write,
             ipv4.sysctl_tcp_fastopen);
         struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
         struct tcp_fastopen_context *ctxt;
-        int ret;
         u32  user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
+        __le32 key[4];
+        int ret, i;
 
         tbl.data = kmalloc(tbl.maxlen, GFP_KERNEL);
         if (!tbl.data)
@@ -275,11 +276,14 @@ static int proc_tcp_fastopen_key(struct ctl_table *table, int write,
         rcu_read_lock();
         ctxt = rcu_dereference(net->ipv4.tcp_fastopen_ctx);
         if (ctxt)
-                memcpy(user_key, ctxt->key, TCP_FASTOPEN_KEY_LENGTH);
+                memcpy(key, ctxt->key, TCP_FASTOPEN_KEY_LENGTH);
         else
-                memset(user_key, 0, sizeof(user_key));
+                memset(key, 0, sizeof(key));
         rcu_read_unlock();
 
+        for (i = 0; i < ARRAY_SIZE(key); i++)
+                user_key[i] = le32_to_cpu(key[i]);
+
         snprintf(tbl.data, tbl.maxlen, "%08x-%08x-%08x-%08x",
                 user_key[0], user_key[1], user_key[2], user_key[3]);
         ret = proc_dostring(&tbl, write, buffer, lenp, ppos);
@@ -290,13 +294,17 @@ static int proc_tcp_fastopen_key(struct ctl_table *table, int write,
                         ret = -EINVAL;
                         goto bad_key;
                 }
-                tcp_fastopen_reset_cipher(net, NULL, user_key,
+
+                for (i = 0; i < ARRAY_SIZE(user_key); i++)
+                        key[i] = cpu_to_le32(user_key[i]);
+
+                tcp_fastopen_reset_cipher(net, NULL, key,
                                           TCP_FASTOPEN_KEY_LENGTH);
         }
 
 bad_key:
         pr_debug("proc FO key set 0x%x-%x-%x-%x <- 0x%s: %u\n",
-               user_key[0], user_key[1], user_key[2], user_key[3],
+                user_key[0], user_key[1], user_key[2], user_key[3],
                (char *)tbl.data, ret);
         kfree(tbl.data);
         return ret;
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 355d3dffd021..8e5522c6833a 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -265,7 +265,7 @@ static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb)
                  * it is probably a retransmit.
                  */
                 if (tp->ecn_flags & TCP_ECN_SEEN)
-                        tcp_enter_quickack_mode(sk, 1);
+                        tcp_enter_quickack_mode(sk, 2);
                 break;
         case INET_ECN_CE:
                 if (tcp_ca_needs_ecn(sk))
@@ -273,7 +273,7 @@ static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb)
 
                 if (!(tp->ecn_flags & TCP_ECN_DEMAND_CWR)) {
                         /* Better not delay acks, sender can have a very low cwnd */
-                        tcp_enter_quickack_mode(sk, 1);
+                        tcp_enter_quickack_mode(sk, 2);
                         tp->ecn_flags |= TCP_ECN_DEMAND_CWR;
                 }
                 tp->ecn_flags |= TCP_ECN_SEEN;
@@ -3181,6 +3181,15 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,
 
                 if (tcp_is_reno(tp)) {
                         tcp_remove_reno_sacks(sk, pkts_acked);
+
+                        /* If any of the cumulatively ACKed segments was
+                         * retransmitted, non-SACK case cannot confirm that
+                         * progress was due to original transmission due to
+                         * lack of TCPCB_SACKED_ACKED bits even if some of
+                         * the packets may have been never retransmitted.
+                         */
+                        if (flag & FLAG_RETRANS_DATA_ACKED)
+                                flag &= ~FLAG_ORIG_SACK_ACKED;
                 } else {
                         int delta;
 
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 92dc9e5a7ff3..69c54540d5b4 100644
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -394,7 +394,7 @@ unflush:
 out_unlock:
         rcu_read_unlock();
 out:
-        NAPI_GRO_CB(skb)->flush |= flush;
+        skb_gro_flush_final(skb, pp, flush);
         return pp;
 }
 EXPORT_SYMBOL(udp_gro_receive);
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index c134286d6a41..91580c62bb86 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4528,6 +4528,7 @@ static int modify_prefix_route(struct inet6_ifaddr *ifp,
                                unsigned long expires, u32 flags)
 {
         struct fib6_info *f6i;
+        u32 prio;
 
         f6i = addrconf_get_prefix_route(&ifp->addr,
                                         ifp->prefix_len,
@@ -4536,13 +4537,15 @@ static int modify_prefix_route(struct inet6_ifaddr *ifp,
         if (!f6i)
                 return -ENOENT;
 
-        if (f6i->fib6_metric != ifp->rt_priority) {
+        prio = ifp->rt_priority ? : IP6_RT_PRIO_ADDRCONF;
+        if (f6i->fib6_metric != prio) {
+                /* delete old one */
+                ip6_del_rt(dev_net(ifp->idev->dev), f6i);
+
                 /* add new one */
                 addrconf_prefix_route(&ifp->addr, ifp->prefix_len,
                                       ifp->rt_priority, ifp->idev->dev,
                                       expires, flags, GFP_KERNEL);
-                /* delete old one */
-                ip6_del_rt(dev_net(ifp->idev->dev), f6i);
         } else {
                 if (!expires)
                         fib6_clean_expires(f6i);
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 5e0332014c17..a452d99c9f52 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -107,7 +107,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
         if (hdr == NULL)
                 goto err_reg;
 
-        net->nf_frag.sysctl.frags_hdr = hdr;
+        net->nf_frag_frags_hdr = hdr;
         return 0;
 
 err_reg:
@@ -121,8 +121,8 @@ static void __net_exit nf_ct_frags6_sysctl_unregister(struct net *net)
 {
         struct ctl_table *table;
 
-        table = net->nf_frag.sysctl.frags_hdr->ctl_table_arg;
-        unregister_net_sysctl_table(net->nf_frag.sysctl.frags_hdr);
+        table = net->nf_frag_frags_hdr->ctl_table_arg;
+        unregister_net_sysctl_table(net->nf_frag_frags_hdr);
         if (!net_eq(net, &init_net))
                 kfree(table);
 }
diff --git a/net/ipv6/seg6_hmac.c b/net/ipv6/seg6_hmac.c
index 33fb35cbfac1..558fe8cc6d43 100644
--- a/net/ipv6/seg6_hmac.c
+++ b/net/ipv6/seg6_hmac.c
@@ -373,7 +373,7 @@ static int seg6_hmac_init_algo(void)
                         return -ENOMEM;
 
                 for_each_possible_cpu(cpu) {
-                        tfm = crypto_alloc_shash(algo->name, 0, GFP_KERNEL);
+                        tfm = crypto_alloc_shash(algo->name, 0, 0);
                         if (IS_ERR(tfm))
                                 return PTR_ERR(tfm);
                         p_tfm = per_cpu_ptr(algo->tfms, cpu);
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 44b5dfe8727d..fa1f1e63a264 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -4845,7 +4845,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev,
         skb_reset_network_header(skb);
         skb_reset_mac_header(skb);
 
+        local_bh_disable();
         __ieee80211_subif_start_xmit(skb, skb->dev, flags);
+        local_bh_enable();
 
         return 0;
 }
diff --git a/net/netfilter/nf_conncount.c b/net/netfilter/nf_conncount.c
index d8383609fe28..510039862aa9 100644
--- a/net/netfilter/nf_conncount.c
+++ b/net/netfilter/nf_conncount.c
@@ -47,6 +47,8 @@ struct nf_conncount_tuple {
         struct hlist_node               node;
         struct nf_conntrack_tuple       tuple;
         struct nf_conntrack_zone        zone;
+        int                             cpu;
+        u32                             jiffies32;
 };
 
 struct nf_conncount_rb {
@@ -91,11 +93,42 @@ bool nf_conncount_add(struct hlist_head *head,
                 return false;
         conn->tuple = *tuple;
         conn->zone = *zone;
+        conn->cpu = raw_smp_processor_id();
+        conn->jiffies32 = (u32)jiffies;
         hlist_add_head(&conn->node, head);
         return true;
 }
 EXPORT_SYMBOL_GPL(nf_conncount_add);
 
+static const struct nf_conntrack_tuple_hash *
+find_or_evict(struct net *net, struct nf_conncount_tuple *conn)
+{
+        const struct nf_conntrack_tuple_hash *found;
+        unsigned long a, b;
+        int cpu = raw_smp_processor_id();
+        __s32 age;
+
+        found = nf_conntrack_find_get(net, &conn->zone, &conn->tuple);
+        if (found)
+                return found;
+        b = conn->jiffies32;
+        a = (u32)jiffies;
+
+        /* conn might have been added just before by another cpu and
+         * might still be unconfirmed.  In this case, nf_conntrack_find()
+         * returns no result.  Thus only evict if this cpu added the
+         * stale entry or if the entry is older than two jiffies.
+         */
+        age = a - b;
+        if (conn->cpu == cpu || age >= 2) {
+                hlist_del(&conn->node);
+                kmem_cache_free(conncount_conn_cachep, conn);
+                return ERR_PTR(-ENOENT);
+        }
+
+        return ERR_PTR(-EAGAIN);
+}
+
 unsigned int nf_conncount_lookup(struct net *net, struct hlist_head *head,
                                  const struct nf_conntrack_tuple *tuple,
                                  const struct nf_conntrack_zone *zone,
@@ -103,18 +136,27 @@ unsigned int nf_conncount_lookup(struct net *net, struct hlist_head *head,
 {
         const struct nf_conntrack_tuple_hash *found;
         struct nf_conncount_tuple *conn;
-        struct hlist_node *n;
         struct nf_conn *found_ct;
+        struct hlist_node *n;
         unsigned int length = 0;
 
         *addit = tuple ? true : false;
 
         /* check the saved connections */
         hlist_for_each_entry_safe(conn, n, head, node) {
-                found = nf_conntrack_find_get(net, &conn->zone, &conn->tuple);
-                if (found == NULL) {
-                        hlist_del(&conn->node);
-                        kmem_cache_free(conncount_conn_cachep, conn);
+                found = find_or_evict(net, conn);
+                if (IS_ERR(found)) {
+                        /* Not found, but might be about to be confirmed */
+                        if (PTR_ERR(found) == -EAGAIN) {
+                                length++;
+                                if (!tuple)
+                                        continue;
+
+                                if (nf_ct_tuple_equal(&conn->tuple, tuple) &&
+                                    nf_ct_zone_id(&conn->zone, conn->zone.dir) ==
+                                    nf_ct_zone_id(zone, zone->dir))
+                                        *addit = false;
+                        }
                         continue;
                 }
 
diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
index 551a1eddf0fa..a75b11c39312 100644
--- a/net/netfilter/nf_conntrack_helper.c
+++ b/net/netfilter/nf_conntrack_helper.c
@@ -465,6 +465,11 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)
 
         nf_ct_expect_iterate_destroy(expect_iter_me, NULL);
         nf_ct_iterate_destroy(unhelp, me);
+
+        /* Maybe someone has gotten the helper already when unhelp above.
+         * So need to wait it.
+         */
+        synchronize_rcu();
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_helper_unregister);
 
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index 426457047578..a61d6df6e5f6 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -424,6 +424,10 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
         if (write) {
                 struct ctl_table tmp = *table;
 
+                /* proc_dostring() can append to existing strings, so we need to
+                 * initialize it as an empty string.
+                 */
+                buf[0] = '\0';
                 tmp.data = buf;
                 r = proc_dostring(&tmp, write, buffer, lenp, ppos);
                 if (r)
@@ -442,14 +446,17 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
                 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
                 mutex_unlock(&nf_log_mutex);
         } else {
+                struct ctl_table tmp = *table;
+
+                tmp.data = buf;
                 mutex_lock(&nf_log_mutex);
                 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
                 if (!logger)
-                        table->data = "NONE";
+                        strlcpy(buf, "NONE", sizeof(buf));
                 else
-                        table->data = logger->name;
-                r = proc_dostring(table, write, buffer, lenp, ppos);
+                        strlcpy(buf, logger->name, sizeof(buf));
                 mutex_unlock(&nf_log_mutex);
+                r = proc_dostring(&tmp, write, buffer, lenp, ppos);
         }
 
         return r;
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 4ccd2988f9db..ea4ba551abb2 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -1243,6 +1243,9 @@ static int nfqnl_recv_unsupp(struct net *net, struct sock *ctnl,
 static const struct nla_policy nfqa_cfg_policy[NFQA_CFG_MAX+1] = {
         [NFQA_CFG_CMD]          = { .len = sizeof(struct nfqnl_msg_config_cmd) },
         [NFQA_CFG_PARAMS]       = { .len = sizeof(struct nfqnl_msg_config_params) },
+        [NFQA_CFG_QUEUE_MAXLEN] = { .type = NLA_U32 },
+        [NFQA_CFG_MASK]         = { .type = NLA_U32 },
+        [NFQA_CFG_FLAGS]        = { .type = NLA_U32 },
 };
 
 static const struct nf_queue_handler nfqh = {
diff --git a/net/rds/connection.c b/net/rds/connection.c
index abef75da89a7..cfb05953b0e5 100644
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -659,11 +659,19 @@ static void rds_conn_info(struct socket *sock, unsigned int len,
 
 int rds_conn_init(void)
 {
+        int ret;
+
+        ret = rds_loop_net_init(); /* register pernet callback */
+        if (ret)
+                return ret;
+
         rds_conn_slab = kmem_cache_create("rds_connection",
                                           sizeof(struct rds_connection),
                                           0, 0, NULL);
-        if (!rds_conn_slab)
+        if (!rds_conn_slab) {
+                rds_loop_net_exit();
                 return -ENOMEM;
+        }
 
         rds_info_register_func(RDS_INFO_CONNECTIONS, rds_conn_info);
         rds_info_register_func(RDS_INFO_SEND_MESSAGES,
@@ -676,6 +684,7 @@ int rds_conn_init(void)
 
 void rds_conn_exit(void)
 {
+        rds_loop_net_exit(); /* unregister pernet callback */
         rds_loop_exit();
 
         WARN_ON(!hlist_empty(rds_conn_hash));
diff --git a/net/rds/loop.c b/net/rds/loop.c
index dac6218a460e..feea1f96ee2a 100644
--- a/net/rds/loop.c
+++ b/net/rds/loop.c
@@ -33,6 +33,8 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/in.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
 
 #include "rds_single_path.h"
 #include "rds.h"
@@ -40,6 +42,17 @@
 
 static DEFINE_SPINLOCK(loop_conns_lock);
 static LIST_HEAD(loop_conns);
+static atomic_t rds_loop_unloading = ATOMIC_INIT(0);
+
+static void rds_loop_set_unloading(void)
+{
+        atomic_set(&rds_loop_unloading, 1);
+}
+
+static bool rds_loop_is_unloading(struct rds_connection *conn)
+{
+        return atomic_read(&rds_loop_unloading) != 0;
+}
 
 /*
  * This 'loopback' transport is a special case for flows that originate
@@ -165,6 +178,8 @@ void rds_loop_exit(void)
         struct rds_loop_connection *lc, *_lc;
         LIST_HEAD(tmp_list);
 
+        rds_loop_set_unloading();
+        synchronize_rcu();
         /* avoid calling conn_destroy with irqs off */
         spin_lock_irq(&loop_conns_lock);
         list_splice(&loop_conns, &tmp_list);
@@ -177,6 +192,46 @@ void rds_loop_exit(void)
         }
 }
 
+static void rds_loop_kill_conns(struct net *net)
+{
+        struct rds_loop_connection *lc, *_lc;
+        LIST_HEAD(tmp_list);
+
+        spin_lock_irq(&loop_conns_lock);
+        list_for_each_entry_safe(lc, _lc, &loop_conns, loop_node)  {
+                struct net *c_net = read_pnet(&lc->conn->c_net);
+
+                if (net != c_net)
+                        continue;
+                list_move_tail(&lc->loop_node, &tmp_list);
+        }
+        spin_unlock_irq(&loop_conns_lock);
+
+        list_for_each_entry_safe(lc, _lc, &tmp_list, loop_node) {
+                WARN_ON(lc->conn->c_passive);
+                rds_conn_destroy(lc->conn);
+        }
+}
+
+static void __net_exit rds_loop_exit_net(struct net *net)
+{
+        rds_loop_kill_conns(net);
+}
+
+static struct pernet_operations rds_loop_net_ops = {
+        .exit = rds_loop_exit_net,
+};
+
+int rds_loop_net_init(void)
+{
+        return register_pernet_device(&rds_loop_net_ops);
+}
+
+void rds_loop_net_exit(void)
+{
+        unregister_pernet_device(&rds_loop_net_ops);
+}
+
 /*
  * This is missing .xmit_* because loop doesn't go through generic
  * rds_send_xmit() and doesn't call rds_recv_incoming().  .listen_stop and
@@ -194,4 +249,5 @@ struct rds_transport rds_loop_transport = {
         .inc_free               = rds_loop_inc_free,
         .t_name                 = "loopback",
         .t_type                 = RDS_TRANS_LOOP,
+        .t_unloading            = rds_loop_is_unloading,
 };
diff --git a/net/rds/loop.h b/net/rds/loop.h
index 469fa4b2da4f..bbc8cdd030df 100644
--- a/net/rds/loop.h
+++ b/net/rds/loop.h
@@ -5,6 +5,8 @@
 /* loop.c */
 extern struct rds_transport rds_loop_transport;
 
+int rds_loop_net_init(void);
+void rds_loop_net_exit(void);
 void rds_loop_exit(void);
 
 #endif
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 973b4471b532..3c1405df936c 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -45,6 +45,7 @@ static DEFINE_MUTEX(smc_create_lgr_pending);	/* serialize link group
                                                  */
 
 static void smc_tcp_listen_work(struct work_struct *);
+static void smc_connect_work(struct work_struct *);
 
 static void smc_set_keepalive(struct sock *sk, int val)
 {
@@ -122,6 +123,12 @@ static int smc_release(struct socket *sock)
                 goto out;
 
         smc = smc_sk(sk);
+
+        /* cleanup for a dangling non-blocking connect */
+        flush_work(&smc->connect_work);
+        kfree(smc->connect_info);
+        smc->connect_info = NULL;
+
         if (sk->sk_state == SMC_LISTEN)
                 /* smc_close_non_accepted() is called and acquires
                  * sock lock for child sockets again
@@ -186,6 +193,7 @@ static struct sock *smc_sock_alloc(struct net *net, struct socket *sock,
         sk->sk_protocol = protocol;
         smc = smc_sk(sk);
         INIT_WORK(&smc->tcp_listen_work, smc_tcp_listen_work);
+        INIT_WORK(&smc->connect_work, smc_connect_work);
         INIT_DELAYED_WORK(&smc->conn.tx_work, smc_tx_work);
         INIT_LIST_HEAD(&smc->accept_q);
         spin_lock_init(&smc->accept_q_lock);
@@ -576,6 +584,35 @@ static int __smc_connect(struct smc_sock *smc)
         return 0;
 }
 
+static void smc_connect_work(struct work_struct *work)
+{
+        struct smc_sock *smc = container_of(work, struct smc_sock,
+                                            connect_work);
+        int rc;
+
+        lock_sock(&smc->sk);
+        rc = kernel_connect(smc->clcsock, &smc->connect_info->addr,
+                            smc->connect_info->alen, smc->connect_info->flags);
+        if (smc->clcsock->sk->sk_err) {
+                smc->sk.sk_err = smc->clcsock->sk->sk_err;
+                goto out;
+        }
+        if (rc < 0) {
+                smc->sk.sk_err = -rc;
+                goto out;
+        }
+
+        rc = __smc_connect(smc);
+        if (rc < 0)
+                smc->sk.sk_err = -rc;
+
+out:
+        smc->sk.sk_state_change(&smc->sk);
+        kfree(smc->connect_info);
+        smc->connect_info = NULL;
+        release_sock(&smc->sk);
+}
+
 static int smc_connect(struct socket *sock, struct sockaddr *addr,
                        int alen, int flags)
 {
@@ -605,15 +642,32 @@ static int smc_connect(struct socket *sock, struct sockaddr *addr,
 
         smc_copy_sock_settings_to_clc(smc);
         tcp_sk(smc->clcsock->sk)->syn_smc = 1;
-        rc = kernel_connect(smc->clcsock, addr, alen, flags);
-        if (rc)
-                goto out;
+        if (flags & O_NONBLOCK) {
+                if (smc->connect_info) {
+                        rc = -EALREADY;
+                        goto out;
+                }
+                smc->connect_info = kzalloc(alen + 2 * sizeof(int), GFP_KERNEL);
+                if (!smc->connect_info) {
+                        rc = -ENOMEM;
+                        goto out;
+                }
+                smc->connect_info->alen = alen;
+                smc->connect_info->flags = flags ^ O_NONBLOCK;
+                memcpy(&smc->connect_info->addr, addr, alen);
+                schedule_work(&smc->connect_work);
+                rc = -EINPROGRESS;
+        } else {
+                rc = kernel_connect(smc->clcsock, addr, alen, flags);
+                if (rc)
+                        goto out;
 
-        rc = __smc_connect(smc);
-        if (rc < 0)
-                goto out;
-        else
-                rc = 0; /* success cases including fallback */
+                rc = __smc_connect(smc);
+                if (rc < 0)
+                        goto out;
+                else
+                        rc = 0; /* success cases including fallback */
+        }
 
 out:
         release_sock(sk);
@@ -1279,40 +1333,20 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
         struct sock *sk = sock->sk;
         __poll_t mask = 0;
         struct smc_sock *smc;
-        int rc;
 
         if (!sk)
                 return EPOLLNVAL;
 
         smc = smc_sk(sock->sk);
-        sock_hold(sk);
-        lock_sock(sk);
         if ((sk->sk_state == SMC_INIT) || smc->use_fallback) {
                 /* delegate to CLC child sock */
-                release_sock(sk);
                 mask = smc->clcsock->ops->poll(file, smc->clcsock, wait);
-                lock_sock(sk);
                 sk->sk_err = smc->clcsock->sk->sk_err;
-                if (sk->sk_err) {
+                if (sk->sk_err)
                         mask |= EPOLLERR;
-                } else {
-                        /* if non-blocking connect finished ... */
-                        if (sk->sk_state == SMC_INIT &&
-                            mask & EPOLLOUT &&
-                            smc->clcsock->sk->sk_state != TCP_CLOSE) {
-                                rc = __smc_connect(smc);
-                                if (rc < 0)
-                                        mask |= EPOLLERR;
-                                /* success cases including fallback */
-                                mask |= EPOLLOUT | EPOLLWRNORM;
-                        }
-                }
         } else {
-                if (sk->sk_state != SMC_CLOSED) {
-                        release_sock(sk);
+                if (sk->sk_state != SMC_CLOSED)
                         sock_poll_wait(file, sk_sleep(sk), wait);
-                        lock_sock(sk);
-                }
                 if (sk->sk_err)
                         mask |= EPOLLERR;
                 if ((sk->sk_shutdown == SHUTDOWN_MASK) ||
@@ -1338,10 +1372,7 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
                 }
                 if (smc->conn.urg_state == SMC_URG_VALID)
                         mask |= EPOLLPRI;
-
         }
-        release_sock(sk);
-        sock_put(sk);
 
         return mask;
 }
diff --git a/net/smc/smc.h b/net/smc/smc.h
index 51ae1f10d81a..d7ca26570482 100644
--- a/net/smc/smc.h
+++ b/net/smc/smc.h
@@ -187,11 +187,19 @@ struct smc_connection {
         struct work_struct      close_work;     /* peer sent some closing */
 };
 
+struct smc_connect_info {
+        int                     flags;
+        int                     alen;
+        struct sockaddr         addr;
+};
+
 struct smc_sock {                               /* smc sock container */
         struct sock             sk;
         struct socket           *clcsock;       /* internal tcp socket */
         struct smc_connection   conn;           /* smc connection */
         struct smc_sock         *listen_smc;    /* listen parent */
+        struct smc_connect_info *connect_info;  /* connect address & flags */
+        struct work_struct      connect_work;   /* handle non-blocking connect*/
         struct work_struct      tcp_listen_work;/* handle tcp socket accepts */
         struct work_struct      smc_listen_work;/* prepare new accept socket */
         struct list_head        accept_q;       /* sockets to be accepted */
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c
index 373836615c57..625acb27efcc 100644
--- a/net/strparser/strparser.c
+++ b/net/strparser/strparser.c
@@ -35,7 +35,6 @@ struct _strp_msg {
          */
         struct strp_msg strp;
         int accum_len;
-        int early_eaten;
 };
 
 static inline struct _strp_msg *_strp_msg(struct sk_buff *skb)
@@ -115,20 +114,6 @@ static int __strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb,
         head = strp->skb_head;
         if (head) {
                 /* Message already in progress */
-
-                stm = _strp_msg(head);
-                if (unlikely(stm->early_eaten)) {
-                        /* Already some number of bytes on the receive sock
-                         * data saved in skb_head, just indicate they
-                         * are consumed.
-                         */
-                        eaten = orig_len <= stm->early_eaten ?
-                                orig_len : stm->early_eaten;
-                        stm->early_eaten -= eaten;
-
-                        return eaten;
-                }
-
                 if (unlikely(orig_offset)) {
                         /* Getting data with a non-zero offset when a message is
                          * in progress is not expected. If it does happen, we
@@ -297,9 +282,9 @@ static int __strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb,
                                 }
 
                                 stm->accum_len += cand_len;
+                                eaten += cand_len;
                                 strp->need_bytes = stm->strp.full_len -
                                                        stm->accum_len;
-                                stm->early_eaten = cand_len;
                                 STRP_STATS_ADD(strp->stats.bytes, cand_len);
                                 desc->count = 0; /* Stop reading socket */
                                 break;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index c7bbe5f0aae8..4eece06be1e7 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6231,7 +6231,7 @@ do {									    \
                                   nl80211_check_s32);
         /*
          * Check HT operation mode based on
-         * IEEE 802.11 2012 8.4.2.59 HT Operation element.
+         * IEEE 802.11-2016 9.4.2.57 HT Operation element.
          */
         if (tb[NL80211_MESHCONF_HT_OPMODE]) {
                 ht_opmode = nla_get_u16(tb[NL80211_MESHCONF_HT_OPMODE]);
@@ -6241,22 +6241,9 @@ do {									    \
                                   IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT))
                         return -EINVAL;
 
-                if ((ht_opmode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) &&
-                    (ht_opmode & IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT))
-                        return -EINVAL;
+                /* NON_HT_STA bit is reserved, but some programs set it */
+                ht_opmode &= ~IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT;
 
-                switch (ht_opmode & IEEE80211_HT_OP_MODE_PROTECTION) {
-                case IEEE80211_HT_OP_MODE_PROTECTION_NONE:
-                case IEEE80211_HT_OP_MODE_PROTECTION_20MHZ:
-                        if (ht_opmode & IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT)
-                                return -EINVAL;
-                        break;
-                case IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER:
-                case IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED:
-                        if (!(ht_opmode & IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT))
-                                return -EINVAL;
-                        break;
-                }
                 cfg->ht_opmode = ht_opmode;
                 mask |= (1 << (NL80211_MESHCONF_HT_OPMODE - 1));
         }
@@ -10962,9 +10949,12 @@ static int nl80211_set_wowlan(struct sk_buff *skb, struct genl_info *info)
                                     rem) {
                         u8 *mask_pat;
 
-                        nla_parse_nested(pat_tb, MAX_NL80211_PKTPAT, pat,
-                                         nl80211_packet_pattern_policy,
-                                         info->extack);
+                        err = nla_parse_nested(pat_tb, MAX_NL80211_PKTPAT, pat,
+                                               nl80211_packet_pattern_policy,
+                                               info->extack);
+                        if (err)
+                                goto error;
+
                         err = -EINVAL;
                         if (!pat_tb[NL80211_PKTPAT_MASK] ||
                             !pat_tb[NL80211_PKTPAT_PATTERN])
@@ -11213,8 +11203,11 @@ static int nl80211_parse_coalesce_rule(struct cfg80211_registered_device *rdev,
                             rem) {
                 u8 *mask_pat;
 
-                nla_parse_nested(pat_tb, MAX_NL80211_PKTPAT, pat,
-                                 nl80211_packet_pattern_policy, NULL);
+                err = nla_parse_nested(pat_tb, MAX_NL80211_PKTPAT, pat,
+                                       nl80211_packet_pattern_policy, NULL);
+                if (err)
+                        return err;
+
                 if (!pat_tb[NL80211_PKTPAT_MASK] ||
                     !pat_tb[NL80211_PKTPAT_PATTERN])
                         return -EINVAL;
diff --git a/samples/bpf/xdp_fwd_kern.c b/samples/bpf/xdp_fwd_kern.c
index 6673cdb9f55c..a7e94e7ff87d 100644
--- a/samples/bpf/xdp_fwd_kern.c
+++ b/samples/bpf/xdp_fwd_kern.c
@@ -48,9 +48,9 @@ static __always_inline int xdp_fwd_flags(struct xdp_md *ctx, u32 flags)
         struct ethhdr *eth = data;
         struct ipv6hdr *ip6h;
         struct iphdr *iph;
-        int out_index;
         u16 h_proto;
         u64 nh_off;
+        int rc;
 
         nh_off = sizeof(*eth);
         if (data + nh_off > data_end)
@@ -101,7 +101,7 @@ static __always_inline int xdp_fwd_flags(struct xdp_md *ctx, u32 flags)
 
         fib_params.ifindex = ctx->ingress_ifindex;
 
-        out_index = bpf_fib_lookup(ctx, &fib_params, sizeof(fib_params), flags);
+        rc = bpf_fib_lookup(ctx, &fib_params, sizeof(fib_params), flags);
 
         /* verify egress index has xdp support
          * TO-DO bpf_map_lookup_elem(&tx_port, &key) fails with
@@ -109,7 +109,7 @@ static __always_inline int xdp_fwd_flags(struct xdp_md *ctx, u32 flags)
          * NOTE: without verification that egress index supports XDP
          *       forwarding packets are dropped.
          */
-        if (out_index > 0) {
+        if (rc == 0) {
                 if (h_proto == htons(ETH_P_IP))
                         ip_decrease_ttl(iph);
                 else if (h_proto == htons(ETH_P_IPV6))
@@ -117,7 +117,7 @@ static __always_inline int xdp_fwd_flags(struct xdp_md *ctx, u32 flags)
 
                 memcpy(eth->h_dest, fib_params.dmac, ETH_ALEN);
                 memcpy(eth->h_source, fib_params.smac, ETH_ALEN);
-                return bpf_redirect_map(&tx_port, out_index, 0);
+                return bpf_redirect_map(&tx_port, fib_params.ifindex, 0);
         }
 
         return XDP_PASS;
diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c
index 2960e26c6ea4..d5d5a499160c 100644
--- a/samples/vfio-mdev/mbochs.c
+++ b/samples/vfio-mdev/mbochs.c
@@ -657,7 +657,7 @@ static void mbochs_put_pages(struct mdev_state *mdev_state)
         dev_dbg(dev, "%s: %d pages released\n", __func__, count);
 }
 
-static int mbochs_region_vm_fault(struct vm_fault *vmf)
+static vm_fault_t mbochs_region_vm_fault(struct vm_fault *vmf)
 {
         struct vm_area_struct *vma = vmf->vma;
         struct mdev_state *mdev_state = vma->vm_private_data;
@@ -695,7 +695,7 @@ static int mbochs_mmap(struct mdev_device *mdev, struct vm_area_struct *vma)
         return 0;
 }
 
-static int mbochs_dmabuf_vm_fault(struct vm_fault *vmf)
+static vm_fault_t mbochs_dmabuf_vm_fault(struct vm_fault *vmf)
 {
         struct vm_area_struct *vma = vmf->vma;
         struct mbochs_dmabuf *dmabuf = vma->vm_private_data;
@@ -803,29 +803,26 @@ static void mbochs_release_dmabuf(struct dma_buf *buf)
         mutex_unlock(&mdev_state->ops_lock);
 }
 
-static void *mbochs_kmap_atomic_dmabuf(struct dma_buf *buf,
-                                       unsigned long page_num)
+static void *mbochs_kmap_dmabuf(struct dma_buf *buf, unsigned long page_num)
 {
         struct mbochs_dmabuf *dmabuf = buf->priv;
         struct page *page = dmabuf->pages[page_num];
 
-        return kmap_atomic(page);
+        return kmap(page);
 }
 
-static void *mbochs_kmap_dmabuf(struct dma_buf *buf, unsigned long page_num)
+static void mbochs_kunmap_dmabuf(struct dma_buf *buf, unsigned long page_num,
+                                 void *vaddr)
 {
-        struct mbochs_dmabuf *dmabuf = buf->priv;
-        struct page *page = dmabuf->pages[page_num];
-
-        return kmap(page);
+        kunmap(vaddr);
 }
 
 static struct dma_buf_ops mbochs_dmabuf_ops = {
         .map_dma_buf      = mbochs_map_dmabuf,
         .unmap_dma_buf    = mbochs_unmap_dmabuf,
         .release          = mbochs_release_dmabuf,
-        .map_atomic       = mbochs_kmap_atomic_dmabuf,
         .map              = mbochs_kmap_dmabuf,
+        .unmap            = mbochs_kunmap_dmabuf,
         .mmap             = mbochs_mmap_dmabuf,
 };
 
diff --git a/scripts/cc-can-link.sh b/scripts/cc-can-link.sh
index 208eb2825dab..6efcead31989 100755
--- a/scripts/cc-can-link.sh
+++ b/scripts/cc-can-link.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 
-cat << "END" | $@ -x c - -o /dev/null >/dev/null 2>&1 && echo "y"
+cat << "END" | $@ -x c - -o /dev/null >/dev/null 2>&1
 #include <stdio.h>
 int main(void)
 {
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 05f42a46d6ed..959aa53ab678 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -694,15 +694,19 @@ static int do_load(int argc, char **argv)
                 return -1;
         }
 
-        if (do_pin_fd(prog_fd, argv[1])) {
-                p_err("failed to pin program");
-                return -1;
-        }
+        if (do_pin_fd(prog_fd, argv[1]))
+                goto err_close_obj;
 
         if (json_output)
                 jsonw_null(json_wtr);
 
+        bpf_object__close(obj);
+
         return 0;
+
+err_close_obj:
+        bpf_object__close(obj);
+        return -1;
 }
 
 static int do_help(int argc, char **argv)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 4e60e105583e..0d1acb704f64 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -302,19 +302,34 @@ static int read_symbols(struct elf *elf)
                                 continue;
                         sym->pfunc = sym->cfunc = sym;
                         coldstr = strstr(sym->name, ".cold.");
-                        if (coldstr) {
-                                coldstr[0] = '\0';
-                                pfunc = find_symbol_by_name(elf, sym->name);
-                                coldstr[0] = '.';
-
-                                if (!pfunc) {
-                                        WARN("%s(): can't find parent function",
-                                             sym->name);
-                                        goto err;
-                                }
-
-                                sym->pfunc = pfunc;
-                                pfunc->cfunc = sym;
+                        if (!coldstr)
+                                continue;
+
+                        coldstr[0] = '\0';
+                        pfunc = find_symbol_by_name(elf, sym->name);
+                        coldstr[0] = '.';
+
+                        if (!pfunc) {
+                                WARN("%s(): can't find parent function",
+                                     sym->name);
+                                goto err;
+                        }
+
+                        sym->pfunc = pfunc;
+                        pfunc->cfunc = sym;
+
+                        /*
+                         * Unfortunately, -fnoreorder-functions puts the child
+                         * inside the parent.  Remove the overlap so we can
+                         * have sane assumptions.
+                         *
+                         * Note that pfunc->len now no longer matches
+                         * pfunc->sym.st_size.
+                         */
+                        if (sym->sec == pfunc->sec &&
+                            sym->offset >= pfunc->offset &&
+                            sym->offset + sym->len == pfunc->offset + pfunc->len) {
+                                pfunc->len -= sym->len;
                         }
                 }
         }
diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
index 7eb613ffef55..b4994a94968b 100644
--- a/tools/testing/selftests/bpf/config
+++ b/tools/testing/selftests/bpf/config
@@ -6,6 +6,7 @@ CONFIG_TEST_BPF=m
 CONFIG_CGROUP_BPF=y
 CONFIG_NETDEVSIM=m
 CONFIG_NET_CLS_ACT=y
+CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_INGRESS=y
 CONFIG_NET_IPIP=y
 CONFIG_IPV6=y
diff --git a/tools/testing/selftests/bpf/test_kmod.sh b/tools/testing/selftests/bpf/test_kmod.sh
index 35669ccd4d23..9df0d2ac45f8 100755
--- a/tools/testing/selftests/bpf/test_kmod.sh
+++ b/tools/testing/selftests/bpf/test_kmod.sh
@@ -1,6 +1,15 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 
+# Kselftest framework requirement - SKIP code is 4.
+ksft_skip=4
+
+msg="skip all tests:"
+if [ "$(id -u)" != "0" ]; then
+        echo $msg please run this as root >&2
+        exit $ksft_skip
+fi
+
 SRC_TREE=../../../../
 
 test_run()
diff --git a/tools/testing/selftests/bpf/test_lirc_mode2.sh b/tools/testing/selftests/bpf/test_lirc_mode2.sh
index ce2e15e4f976..677686198df3 100755
--- a/tools/testing/selftests/bpf/test_lirc_mode2.sh
+++ b/tools/testing/selftests/bpf/test_lirc_mode2.sh
@@ -1,6 +1,15 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
 
+# Kselftest framework requirement - SKIP code is 4.
+ksft_skip=4
+
+msg="skip all tests:"
+if [ $UID != 0 ]; then
+        echo $msg please run this as root >&2
+        exit $ksft_skip
+fi
+
 GREEN='\033[0;92m'
 RED='\033[0;31m'
 NC='\033[0m' # No Color
diff --git a/tools/testing/selftests/bpf/test_lwt_seg6local.sh b/tools/testing/selftests/bpf/test_lwt_seg6local.sh
index 1c77994b5e71..270fa8f49573 100755
--- a/tools/testing/selftests/bpf/test_lwt_seg6local.sh
+++ b/tools/testing/selftests/bpf/test_lwt_seg6local.sh
@@ -21,6 +21,15 @@
 # An UDP datagram is sent from fb00::1 to fb00::6. The test succeeds if this
 # datagram can be read on NS6 when binding to fb00::6.
 
+# Kselftest framework requirement - SKIP code is 4.
+ksft_skip=4
+
+msg="skip all tests:"
+if [ $UID != 0 ]; then
+        echo $msg please run this as root >&2
+        exit $ksft_skip
+fi
+
 TMP_FILE="/tmp/selftest_lwt_seg6local.txt"
 
 cleanup()
diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c
index 05c8cb71724a..9e78df207919 100644
--- a/tools/testing/selftests/bpf/test_sockmap.c
+++ b/tools/testing/selftests/bpf/test_sockmap.c
@@ -1413,18 +1413,12 @@ out:
 
 int main(int argc, char **argv)
 {
-        struct rlimit r = {10 * 1024 * 1024, RLIM_INFINITY};
         int iov_count = 1, length = 1024, rate = 1;
         struct sockmap_options options = {0};
         int opt, longindex, err, cg_fd = 0;
         char *bpf_file = BPF_SOCKMAP_FILENAME;
         int test = PING_PONG;
 
-        if (setrlimit(RLIMIT_MEMLOCK, &r)) {
-                perror("setrlimit(RLIMIT_MEMLOCK)");
-                return 1;
-        }
-
         if (argc < 2)
                 return test_suite();
 
diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh
index 78245d60d8bc..78245d60d8bc 100644..100755
--- a/tools/testing/selftests/net/fib_tests.sh
+++ b/tools/testing/selftests/net/fib_tests.sh