January 2021 - Kernel - mailweb.openeuler.org

[PATCH openEuler-1.0-LTS 1/2] tty: Fix ->pgrp locking in tiocspgrp()
by Yang Yingliang 08 Jan '21

08 Jan '21

From: Jann Horn <jannh(a)google.com> mainline inclusion from mainline-v5.10-rc7 commit 54ffccbf053b5b6ca4f6e45094b942fab92a25fc category: bugfix bugzilla: NA CVE: CVE-2020-29661 -------------------------------- tiocspgrp() takes two tty_struct pointers: One to the tty that userspace passed to ioctl() (`tty`) and one to the TTY being changed (`real_tty`). These pointers are different when ioctl() is called with a master fd. To properly lock real_tty->pgrp, we must take real_tty->ctrl_lock. This bug makes it possible for racing ioctl(TIOCSPGRP, ...) calls on both sides of a PTY pair to corrupt the refcount of `struct pid`, leading to use-after-free errors. Fixes: 47f86834bbd4 ("redo locking of tty->pgrp") CC: stable(a)kernel.org Signed-off-by: Jann Horn <jannh(a)google.com> Reviewed-by: Jiri Slaby <jirislaby(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/tty/tty_jobctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/tty_jobctrl.c b/drivers/tty/tty_jobctrl.c index c4ecd66fafef..a42dec3c95d0 100644 --- a/drivers/tty/tty_jobctrl.c +++ b/drivers/tty/tty_jobctrl.c @@ -494,10 +494,10 @@ static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t if (session_of_pgrp(pgrp) != task_session(current)) goto out_unlock; retval = 0; - spin_lock_irq(&tty->ctrl_lock); + spin_lock_irq(&real_tty->ctrl_lock); put_pid(real_tty->pgrp); real_tty->pgrp = get_pid(pgrp); - spin_unlock_irq(&tty->ctrl_lock); + spin_unlock_irq(&real_tty->ctrl_lock); out_unlock: rcu_read_unlock(); return retval; -- 2.25.1

1 1

[PATCH openEuler-1.0-LTS] ALSA: rawmidi: Fix racy buffer resize under concurrent accesses
by Yang Yingliang 08 Jan '21

08 Jan '21

From: Takashi Iwai <tiwai(a)suse.de> stable inclusion from linux-4.19.124 commit a507658fdb2ad8ca282b0eb42f2a40b805deb1e6 CVE: CVE-2020-27786 -------------------------------- commit c1f6e3c818dd734c30f6a7eeebf232ba2cf3181d upstream. The rawmidi core allows user to resize the runtime buffer via ioctl, and this may lead to UAF when performed during concurrent reads or writes: the read/write functions unlock the runtime lock temporarily during copying form/to user-space, and that's the race window. This patch fixes the hole by introducing a reference counter for the runtime buffer read/write access and returns -EBUSY error when the resize is performed concurrently against read/write. Note that the ref count field is a simple integer instead of refcount_t here, since the all contexts accessing the buffer is basically protected with a spinlock, hence we need no expensive atomic ops. Also, note that this busy check is needed only against read / write functions, and not in receive/transmit callbacks; the race can happen only at the spinlock hole mentioned in the above, while the whole function is protected for receive / transmit callbacks. Reported-by: butt3rflyh4ck <butterflyhuangxx(a)gmail.com> Cc: <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/CAFcO6XMWpUVK_yzzCpp8_XP7+=oUpQvuBeCbMffEDkpe8jWr… Link: https://lore.kernel.org/r/s5heerw3r5z.wl-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- include/sound/rawmidi.h | 1 + sound/core/rawmidi.c | 31 +++++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h index 6665cb29e1a2..7a908a81cef4 100644 --- a/include/sound/rawmidi.h +++ b/include/sound/rawmidi.h @@ -76,6 +76,7 @@ struct snd_rawmidi_runtime { size_t avail_min; /* min avail for wakeup */ size_t avail; /* max used buffer for wakeup */ size_t xruns; /* over/underruns counter */ + int buffer_ref; /* buffer reference count */ /* misc */ spinlock_t lock; wait_queue_head_t sleep; diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index a52d6d16efc4..9b26973fe697 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -112,6 +112,17 @@ static void snd_rawmidi_input_event_work(struct work_struct *work) runtime->event(runtime->substream); } +/* buffer refcount management: call with runtime->lock held */ +static inline void snd_rawmidi_buffer_ref(struct snd_rawmidi_runtime *runtime) +{ + runtime->buffer_ref++; +} + +static inline void snd_rawmidi_buffer_unref(struct snd_rawmidi_runtime *runtime) +{ + runtime->buffer_ref--; +} + static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream) { struct snd_rawmidi_runtime *runtime; @@ -661,6 +672,11 @@ static int resize_runtime_buffer(struct snd_rawmidi_runtime *runtime, if (!newbuf) return -ENOMEM; spin_lock_irq(&runtime->lock); + if (runtime->buffer_ref) { + spin_unlock_irq(&runtime->lock); + kvfree(newbuf); + return -EBUSY; + } oldbuf = runtime->buffer; runtime->buffer = newbuf; runtime->buffer_size = params->buffer_size; @@ -960,8 +976,10 @@ static long snd_rawmidi_kernel_read1(struct snd_rawmidi_substream *substream, long result = 0, count1; struct snd_rawmidi_runtime *runtime = substream->runtime; unsigned long appl_ptr; + int err = 0; spin_lock_irqsave(&runtime->lock, flags); + snd_rawmidi_buffer_ref(runtime); while (count > 0 && runtime->avail) { count1 = runtime->buffer_size - runtime->appl_ptr; if (count1 > count) @@ -980,16 +998,19 @@ static long snd_rawmidi_kernel_read1(struct snd_rawmidi_substream *substream, if (userbuf) { spin_unlock_irqrestore(&runtime->lock, flags); if (copy_to_user(userbuf + result, - runtime->buffer + appl_ptr, count1)) { - return result > 0 ? result : -EFAULT; - } + runtime->buffer + appl_ptr, count1)) + err = -EFAULT; spin_lock_irqsave(&runtime->lock, flags); + if (err) + goto out; } result += count1; count -= count1; } + out: + snd_rawmidi_buffer_unref(runtime); spin_unlock_irqrestore(&runtime->lock, flags); - return result; + return result > 0 ? result : err; } long snd_rawmidi_kernel_read(struct snd_rawmidi_substream *substream, @@ -1261,6 +1282,7 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream, return -EAGAIN; } } + snd_rawmidi_buffer_ref(runtime); while (count > 0 && runtime->avail > 0) { count1 = runtime->buffer_size - runtime->appl_ptr; if (count1 > count) @@ -1292,6 +1314,7 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream, } __end: count1 = runtime->avail < runtime->buffer_size; + snd_rawmidi_buffer_unref(runtime); spin_unlock_irqrestore(&runtime->lock, flags); if (count1) snd_rawmidi_output_trigger(substream, 1); -- 2.25.1

1 0

[PATCH kernel-4.19 1/5] Kconfig: disable KTASK by default
by Yang Yingliang 08 Jan '21

08 Jan '21

hulk inclusion category: bugfix bugzilla: 46923 CVE: NA ---------------------------------------------- Enable KTASK in vfio, if the BAR size of some straight through equipment device is too large, it will cause guest crash on booting. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index 6880b55901bb..71b09d998413 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -352,7 +352,7 @@ config AUDIT_TREE config KTASK bool "Multithread CPU-intensive kernel work" depends on SMP - default y + default n help Parallelize CPU-intensive kernel work. This feature is designed for big machines that can take advantage of their extra CPUs to speed up -- 2.25.1

1 4

[PATCH kernel-4.19 01/33] irqchip/gic-v3: Fix compiling error on ARM32 with GICv3
by Yang Yingliang 08 Jan '21

08 Jan '21

From: Wei Li <liwei391(a)huawei.com> hulk inclusion category: bugfix bugzilla: NA CVE: NA ---------------------------------------------- /builds/1mHAjaH6WFVPAq6OVOJsJsJKHA2/drivers/irqchip/irq-gic-v3.c: In function 'gic_cpu_init': /builds/1mHAjaH6WFVPAq6OVOJsJsJKHA2/drivers/irqchip/irq-gic-v3.c:888:3: error: implicit declaration of function 'ipi_set_nmi_prio' [-Werror=implicit-function-declaration] 888 | ipi_set_nmi_prio(rbase, GICD_INT_NMI_PRI); | ^~~~~~~~~~~~~~~~ On ARM32, ipi_set_nmi_prio() is not implmented as CONFIG_ARM64_PSEUDO_NMI is not supported. Skip setting the NMI priority of SGIs when initializing. Signed-off-by: Wei Li <liwei391(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/irqchip/irq-gic-v3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 6bb787ba1764..14e9c1a5627b 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -884,8 +884,10 @@ static void gic_cpu_init(void) gic_cpu_config(rbase, gic_redist_wait_for_rwp); +#ifdef CONFIG_ARM64_PSEUDO_NMI if (gic_supports_nmi()) ipi_set_nmi_prio(rbase, GICD_INT_NMI_PRI); +#endif /* initialise system registers */ gic_cpu_sys_reg_init(); -- 2.25.1

1 32

[PATCH kernel-4.19 00/30] backport stable-4.19.165
by Yang Yingliang 08 Jan '21

08 Jan '21

Anant Thazhemadam (2): Bluetooth: hci_h5: close serdev device and free hu in h5_close misc: vmw_vmci: fix kernel info-leak by initializing dbells in vmci_ctx_get_chkpt_doorbells() Boqun Feng (1): fcntl: Fix potential deadlock in send_sig{io, urg}() Christophe Leroy (1): powerpc/bitops: Fix possible undefined behaviour with fls() and fls64() Damien Le Moal (1): null_blk: Fix zone size initialization Dinghao Liu (1): rtc: sun6i: Fix memleak in sun6i_rtc_clk_init Eric Auger (1): vfio/pci: Move dummy_resources_list init in vfio_pci_probe() Eric Biggers (4): fscrypt: add fscrypt_is_nokey_name() ext4: prevent creating duplicate encrypted filenames f2fs: prevent creating duplicate encrypted filenames ubifs: prevent creating duplicate encrypted filenames Greg Kroah-Hartman (1): Linux 4.19.165 Hyeongseok Kim (1): dm verity: skip verity work if I/O error when system is shutting down Jan Kara (2): ext4: don't remount read-only with errors=continue on reboot quota: Don't overflow quota file offsets Jessica Yu (1): module: delay kobject uevent until after module init call Johan Hovold (1): of: fix linker-section match-table corruption Kevin Vigor (1): md/raid10: initialize r10_bio->read_slot before use. Mauro Carvalho Chehab (1): media: gp8psk: initialize stats at power control logic Miroslav Benes (1): module: set MODULE_STATE_GOING state when a module fails to load Paolo Bonzini (2): KVM: SVM: relax conditions for allowing MSR_IA32_SPEC_CTRL accesses KVM: x86: reinstate vendor-agnostic check on SPEC_CTRL cpuid bits Petr Vorel (1): uapi: move constants from <linux/kernel.h> to <linux/const.h> Qinglang Miao (1): powerpc: sysdev: add missing iounmap() on error in mpic_msgr_probe() Rustam Kovhaev (1): reiserfs: add check for an invalid ih_entry_count Souptick Joarder (1): xen/gntdev.c: Mark pages as dirty Takashi Iwai (3): ALSA: seq: Use bool for snd_seq_queue internal flags ALSA: rawmidi: Access runtime->avail always in spinlock ALSA: pcm: Clear the full allocated memory at hw_params Trond Myklebust (1): NFSv4: Fix a pNFS layout related use-after-free race when freeing the inode Makefile | 2 +- arch/powerpc/include/asm/bitops.h | 23 +++++++++++- arch/powerpc/sysdev/mpic_msgr.c | 2 +- arch/x86/kvm/cpuid.h | 14 +++++++ arch/x86/kvm/svm.c | 9 ++--- arch/x86/kvm/vmx.c | 6 +-- drivers/block/null_blk_zoned.c | 20 ++++++---- drivers/bluetooth/hci_h5.c | 8 +++- drivers/md/dm-verity-target.c | 12 +++++- drivers/md/raid10.c | 3 +- drivers/media/usb/dvb-usb/gp8psk.c | 2 +- drivers/misc/vmw_vmci/vmci_context.c | 2 +- drivers/rtc/rtc-sun6i.c | 8 ++-- drivers/vfio/pci/vfio_pci.c | 3 +- drivers/xen/gntdev.c | 17 ++++++--- fs/crypto/hooks.c | 10 ++--- fs/ext4/namei.c | 3 ++ fs/ext4/super.c | 15 +++----- fs/f2fs/f2fs.h | 2 + fs/fcntl.c | 10 +++-- fs/nfs/nfs4super.c | 2 +- fs/nfs/pnfs.c | 33 ++++++++++++++++- fs/nfs/pnfs.h | 5 +++ fs/quota/quota_tree.c | 8 ++-- fs/reiserfs/stree.c | 6 +++ fs/ubifs/dir.c | 17 +++++++-- include/linux/fscrypt_notsupp.h | 5 +++ include/linux/fscrypt_supp.h | 29 +++++++++++++++ include/linux/of.h | 1 + include/uapi/linux/const.h | 5 +++ include/uapi/linux/ethtool.h | 2 +- include/uapi/linux/kernel.h | 9 +---- include/uapi/linux/lightnvm.h | 2 +- include/uapi/linux/mroute6.h | 2 +- include/uapi/linux/netfilter/x_tables.h | 2 +- include/uapi/linux/netlink.h | 2 +- include/uapi/linux/sysctl.h | 2 +- kernel/module.c | 6 ++- sound/core/pcm_native.c | 9 ++++- sound/core/rawmidi.c | 49 ++++++++++++++++++------- sound/core/seq/seq_queue.h | 8 ++-- 41 files changed, 274 insertions(+), 101 deletions(-) -- 2.25.1

1 30

[PATCH] hifc: remove unnecessary __init specifier
by Zhengyuan Liu 04 Jan '21

04 Jan '21

hulk inclusion category: bugfix bugzilla: NA CVE: NA The specifier of __init added to hrd_flashProbe() isn't appropriate. It can cause following building warning: WARNING: drivers/mtd/hisilicon/sfc/hi-sfc.o(.text.unlikely+0x38c): Section mismatch in reference from the \ function flash_map_init() to the function .init.text:hrd_flashProbe() The function flash_map_init() references the function __init hrd_flashProbe(). This is often because flash_map_init lacks a __init annotation or the annotation of hrd_flashProbe is wrong. Fixes: 25d711e7ffb7 ("drivers: add sfc driver to hulk") Signed-off-by: Zhengyuan Liu <liuzhengyuan(a)tj.kylinos.cn> --- drivers/mtd/hisilicon/sfc/hrd_sfc_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/hisilicon/sfc/hrd_sfc_driver.c b/drivers/mtd/hisilicon/sfc/hrd_sfc_driver.c index 23254e325a85..69fb1b306f0d 100644 --- a/drivers/mtd/hisilicon/sfc/hrd_sfc_driver.c +++ b/drivers/mtd/hisilicon/sfc/hrd_sfc_driver.c @@ -87,8 +87,8 @@ static int _hrd_flashProbe(const char **mtdDrv, struct map_info *map, return HRD_ERR; } -static int __init hrd_flashProbe(const char **mtdDrv, struct map_info *map, - struct resource *sfc_regres, struct mtd_info **mtd) +static int hrd_flashProbe(const char **mtdDrv, struct map_info *map, + struct resource *sfc_regres, struct mtd_info **mtd) { int ret; -- 2.20.1

3 2

[PATCH kernel-4.19 v2] mmap: fix a compiling error for 'MAP_PA32BIT'
by Bixuan Cui 04 Jan '21

04 Jan '21

From: Zhengyuan Liu <liuzhengyuan(a)tj.kylinos.cn> hulk inclusion category: bugfix bugzilla: NA CVE: NA MAP_PA32BIT was defined in uapi/asm-generic/mman.h, that was not automatically included by mm/mmap.c when building on platforms such as mips, and result in following compiling error: mm/mmap.c: In function ‘do_mmap’: mm/mmap.c:1450:14: error: ‘MAP_PA32BIT’ undeclared (first use in this function); did you mean ‘MAP_32BIT’? if (flags & MAP_PA32BIT) ^~~~~~~~~~~ MAP_32BIT mm/mmap.c:1450:14: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [scripts/Makefile.build:303: mm/mmap.o] Error 1 Fixes: e138253f2b82 ("svm: add support for allocing memory which is within 4G physical address in svm_mmap") Signed-off-by: Zhengyuan Liu <liuzhengyuan(a)tj.kylinos.cn> Signed-off-by: Bixuan Cui <cuibixuan(a)huawei.com> --- arch/alpha/include/uapi/asm/mman.h | 1 + arch/mips/include/uapi/asm/mman.h | 1 + arch/parisc/include/uapi/asm/mman.h | 1 + arch/powerpc/include/uapi/asm/mman.h | 1 + arch/sparc/include/uapi/asm/mman.h | 1 + arch/xtensa/include/uapi/asm/mman.h | 1 + 6 files changed, 6 insertions(+) diff --git a/arch/alpha/include/uapi/asm/mman.h b/arch/alpha/include/uapi/asm/mman.h index f9d4e6b6d4bd..b3acfc00c8ec 100644 --- a/arch/alpha/include/uapi/asm/mman.h +++ b/arch/alpha/include/uapi/asm/mman.h @@ -33,6 +33,7 @@ #define MAP_STACK 0x80000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x100000 /* create a huge page mapping */ #define MAP_FIXED_NOREPLACE 0x200000/* MAP_FIXED which doesn't unmap underlying mapping */ +#define MAP_PA32BIT 0x400000 /* physical address is within 4G */ #define MS_ASYNC 1 /* sync memory asynchronously */ #define MS_SYNC 2 /* synchronous memory sync */ diff --git a/arch/mips/include/uapi/asm/mman.h b/arch/mips/include/uapi/asm/mman.h index 3035ca499cd8..72a00c746e78 100644 --- a/arch/mips/include/uapi/asm/mman.h +++ b/arch/mips/include/uapi/asm/mman.h @@ -51,6 +51,7 @@ #define MAP_STACK 0x40000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x80000 /* create a huge page mapping */ #define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */ +#define MAP_PA32BIT 0x400000 /* physical address is within 4G */ /* * Flags for msync diff --git a/arch/parisc/include/uapi/asm/mman.h b/arch/parisc/include/uapi/asm/mman.h index 870fbf8c7088..9e989d649e85 100644 --- a/arch/parisc/include/uapi/asm/mman.h +++ b/arch/parisc/include/uapi/asm/mman.h @@ -27,6 +27,7 @@ #define MAP_STACK 0x40000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x80000 /* create a huge page mapping */ #define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */ +#define MAP_PA32BIT 0x400000 /* physical address is within 4G */ #define MS_SYNC 1 /* synchronous memory sync */ #define MS_ASYNC 2 /* sync memory asynchronously */ diff --git a/arch/powerpc/include/uapi/asm/mman.h b/arch/powerpc/include/uapi/asm/mman.h index 65065ce32814..95f884ada96f 100644 --- a/arch/powerpc/include/uapi/asm/mman.h +++ b/arch/powerpc/include/uapi/asm/mman.h @@ -29,6 +29,7 @@ #define MAP_NONBLOCK 0x10000 /* do not block on IO */ #define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x40000 /* create a huge page mapping */ +#define MAP_PA32BIT 0x400000 /* physical address is within 4G */ /* Override any generic PKEY permission defines */ #define PKEY_DISABLE_EXECUTE 0x4 diff --git a/arch/sparc/include/uapi/asm/mman.h b/arch/sparc/include/uapi/asm/mman.h index f6f99ec65bb3..0d1881b8f30d 100644 --- a/arch/sparc/include/uapi/asm/mman.h +++ b/arch/sparc/include/uapi/asm/mman.h @@ -26,6 +26,7 @@ #define MAP_NONBLOCK 0x10000 /* do not block on IO */ #define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x40000 /* create a huge page mapping */ +#define MAP_PA32BIT 0x400000 /* physical address is within 4G */ #endif /* _UAPI__SPARC_MMAN_H__ */ diff --git a/arch/xtensa/include/uapi/asm/mman.h b/arch/xtensa/include/uapi/asm/mman.h index 58f29a9d895d..f584a590bb00 100644 --- a/arch/xtensa/include/uapi/asm/mman.h +++ b/arch/xtensa/include/uapi/asm/mman.h @@ -58,6 +58,7 @@ #define MAP_STACK 0x40000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x80000 /* create a huge page mapping */ #define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */ +#define MAP_PA32BIT 0x400000 /* physical address is within 4G */ #ifdef CONFIG_MMAP_ALLOW_UNINITIALIZED # define MAP_UNINITIALIZED 0x4000000 /* For anonymous mmap, memory could be * uninitialized */ -- 2.17.1

3 2

[PATCH kernel-4.19 01/12] memcg/ascend: Check sysctl oom config for memcg oom
by Yang Yingliang 04 Jan '21

04 Jan '21

From: Zhou Guanghui <zhouguanghui1(a)huawei.com> ascend inclusion category: feature bugzilla: NA CVE: NA -------------------------------------------------- If memcg oom_kill_disable is false(enable oom killer), and sysctl enable_oom_killer is also false(disable oom killer), the memory allocated for this memcg will exceed the limit. This means that the memcg cannot limit the memory usage. Therefore, ensure that sysctl enable_oom_killer is not false. Otherwise, wait for memory resources. Signed-off-by: Zhou Guanghui <zhouguanghui1(a)huawei.com> Reviewed-by: Ding Tianhong <dingtianhong(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- mm/memcontrol.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 6ad8fafcdf87..aa8f6f75eea1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1942,7 +1942,11 @@ bool mem_cgroup_oom_synchronize(bool handle) if (locked) mem_cgroup_oom_notify(memcg); - if (locked && !memcg->oom_kill_disable) { + if (locked && +#ifdef CONFIG_ASCEND_OOM + sysctl_enable_oom_killer != 0 && +#endif + !memcg->oom_kill_disable) { mem_cgroup_unmark_under_oom(memcg); finish_wait(&memcg_oom_waitq, &owait.wait); mem_cgroup_out_of_memory(memcg, current->memcg_oom_gfp_mask, -- 2.25.1

1 11

[PATCH kernel-4.19 00/59] MPAM series
by Yang Yingliang 04 Jan '21

04 Jan '21

本次MPAM特性合入59个补丁，主要包括： 1）MPAM 对外sysfs功能增强； 2）适配后续社区版本，适配兼容MPAM协议； 3）代码框架整体重构，拓展对SMMU io的支持； 4）支持鲲鹏930全套MPAM能力； James Morse (10): arm64/mpam: Add mpam driver discovery phase and kbuild boiler plate cacheinfo: Provide a helper to find a cacheinfo leaf arm64/mpam: Probe supported partid/pmg ranges from devices arm64/mpam: Supplement MPAM MSC register layout definitions arm64/mpam: Probe the features resctrl supports arm64/mpam: Reset controls when CPUs come online arm64/mpam: Summarize feature support during mpam_enable() arm64/mpam: resctrl: Re-synchronise resctrl's view of online CPUs drivers: base: cacheinfo: Add helper to search cacheinfo by of_node arm64/mpam: Enabling registering and logging error interrupts Wang ShaoBo (49): arm64/mpam: Preparing for MPAM refactoring arm64/mpam: Add helper for getting mpam sysprops arm64/mpam: Allocate mpam component configuration arrays arm64/mpam: Pick MPAM resources and events for resctrl_res exported arm64/mpam: Init resctrl resources' info from resctrl_res selected arm64/mpam: resctrl: Handle cpuhp and resctrl_dom allocation arm64/mpam: Implement helpers for handling configuration and monitoring arm64/mpam: Migrate old MSCs' discovery process to new branch arm64/mpam: Add helper for getting MSCs' configuration arm64/mpam: Probe partid,pmg and feature capabilities' ranges from classes arm64/mpam: resctrl: Rebuild configuration and monitoring pipeline arm64/mpam: resctrl: Append schemata CDP definitions arm64/mpam: resctrl: Supplement cdpl2,cdpl3 for mount options arm64/mpam: resctrl: Add helpers for init and destroy schemata list arm64/mpam: resctrl: Use resctrl_group_init_alloc() to init schema list arm64/mpam: resctrl: Write and read schemata by schema_list arm64/mpam: Support cdp in mpam_sched_in() arm64/mpam: resctrl: Update resources reset process arm64/mpam: resctrl: Update closid alloc and free process with bitmap arm64/mpam: resctrl: Move ctrlmon sysfile write/read function to mpam_ctrlmon.c arm64/mpam: Support cdp on allocating monitors arm64/mpam: resctrl: Support cdp on monitoring data arm64/mpam: Clean up header files and rearrange declarations arm64/mpam: resctrl: Remove ctrlmon sysfile arm64/mpam: resctrl: Remove unnecessary CONFIG_ARM64 arm64/mpam: Implement intpartid narrowing process arm64/mpam: Using software-defined id for rdtgroup instead of 32-bit integer arm64/mpam: resctrl: collect child mon group's monitor data arm64/mpam: resctrl: Support cpus' monitoring for mon group arm64/mpam: resctrl: Support priority and hardlimit(Memory bandwidth) configuration arm64/mpam: Store intpri and dspri for mpam device reset arm64/mpam: Squash default priority from mpam device to class arm64/mpam: Restore extend ctrls' max width for checking schemata input arm64/mpam: Re-plan intpartid narrowing process arm64/mpam: Add hook-events id for ctrl features arm64/mpam: Integrate monitor data for Memory Bandwidth if cdp enabled arm64/mpam: Fix MPAM_ESR intPARTID_range error arm64/mpam: Separate internal and downstream priority event arm64/mpam: Remap reqpartid,pmg to rmid and intpartid to closid arm64/mpam: Add wait queue for monitor alloc and free arm64/mpam: Add resctrl_ctrl_feature structure to manage ctrl features arm64/mpam: resctrl: Export resource's properties to info directory arm64/mpam: Split header files into suitable location arm64/mpam: resctrl: Add rmid file in resctrl sysfs arm64/mpam: Filter schema control type with ctrl features arm64/mpam: Simplify mpamid cdp mapping process arm64/mpam: Set per-cpu's closid to none zero for cdp ACPI/MPAM: Use acpi_map_pxm_to_node() to get node id for memory node arm64/mpam: Supplement additional useful ctrl features for mount options arch/arm64/include/asm/mpam.h | 324 +--- arch/arm64/include/asm/mpam_resource.h | 129 -- arch/arm64/include/asm/mpam_sched.h | 8 - arch/arm64/include/asm/resctrl.h | 489 +++++- arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/mpam.c | 1494 ---------------- arch/arm64/kernel/mpam/Makefile | 3 + arch/arm64/kernel/mpam/mpam_ctrlmon.c | 957 ++++++++++ arch/arm64/kernel/mpam/mpam_device.c | 1706 ++++++++++++++++++ arch/arm64/kernel/mpam/mpam_device.h | 140 ++ arch/arm64/kernel/mpam/mpam_internal.h | 345 ++++ arch/arm64/kernel/mpam/mpam_mon.c | 331 ++++ arch/arm64/kernel/mpam/mpam_resctrl.c | 2221 ++++++++++++++++++++++++ arch/arm64/kernel/mpam/mpam_resource.h | 228 +++ arch/arm64/kernel/mpam/mpam_setup.c | 597 +++++++ arch/arm64/kernel/mpam_ctrlmon.c | 619 ------- arch/arm64/kernel/mpam_mon.c | 121 -- drivers/acpi/arm64/mpam.c | 87 +- drivers/base/cacheinfo.c | 38 + fs/resctrlfs.c | 410 +++-- include/linux/arm_mpam.h | 118 ++ include/linux/cacheinfo.h | 36 + include/linux/resctrlfs.h | 30 - 23 files changed, 7473 insertions(+), 2960 deletions(-) delete mode 100644 arch/arm64/include/asm/mpam_resource.h delete mode 100644 arch/arm64/kernel/mpam.c create mode 100644 arch/arm64/kernel/mpam/Makefile create mode 100644 arch/arm64/kernel/mpam/mpam_ctrlmon.c create mode 100644 arch/arm64/kernel/mpam/mpam_device.c create mode 100644 arch/arm64/kernel/mpam/mpam_device.h create mode 100644 arch/arm64/kernel/mpam/mpam_internal.h create mode 100644 arch/arm64/kernel/mpam/mpam_mon.c create mode 100644 arch/arm64/kernel/mpam/mpam_resctrl.c create mode 100644 arch/arm64/kernel/mpam/mpam_resource.h create mode 100644 arch/arm64/kernel/mpam/mpam_setup.c delete mode 100644 arch/arm64/kernel/mpam_ctrlmon.c delete mode 100644 arch/arm64/kernel/mpam_mon.c create mode 100644 include/linux/arm_mpam.h -- 2.25.1

1 59

[PATCH 01/10] vfio: allow external user to get vfio group from device
by Yang Yingliang 04 Jan '21

04 Jan '21

From: Yan Zhao <yan.y.zhao(a)intel.com> mainline inclusion from mainline-v5.6-rc7 commit c0560f51cf77472f4ed113539b0a02ca6cda7961 category: Common features bugzilla: 46841 CVE: NA ------------------------------------------------- external user calls vfio_group_get_external_user_from_dev() with a device pointer to get the VFIO group associated with this device. The VFIO group is checked to be vialbe and have IOMMU set. Then container user counter is increased and VFIO group reference is hold to prevent the VFIO group from disposal before external user exits. when the external user finishes using of the VFIO group, it calls vfio_group_put_external_user() to dereference the VFIO group and the container user counter. Suggested-by: Alex Williamson <alex.williamson(a)redhat.com> Signed-off-by: Yan Zhao <yan.y.zhao(a)intel.com> Signed-off-by: Alex Williamson <alex.williamson(a)redhat.com> Signed-off-by: Xiaoyang Xu <xuxiaoyang2(a)huawei.com> Reviewed-by: Xiangyou Xie <xiexiangyou(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/vfio/vfio.c | 38 ++++++++++++++++++++++++++++++++++++++ include/linux/vfio.h | 2 ++ 2 files changed, 40 insertions(+) diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index 7a386fb30bf1..34a293318a39 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -1759,6 +1759,44 @@ struct vfio_group *vfio_group_get_external_user(struct file *filep) } EXPORT_SYMBOL_GPL(vfio_group_get_external_user); +/** + * External user API, exported by symbols to be linked dynamically. + * The external user passes in a device pointer + * to verify that: + * - A VFIO group is assiciated with the device; + * - IOMMU is set for the group. + * If both checks passed, vfio_group_get_external_user_from_dev() + * increments the container user counter to prevent the VFIO group + * from disposal before external user exits and returns the pointer + * to the VFIO group. + * + * When the external user finishes using the VFIO group, it calls + * vfio_group_put_external_user() to release the VFIO group and + * decrement the container user counter. + * + * @dev [in] : device + * Return error PTR or pointer to VFIO group. + */ + +struct vfio_group *vfio_group_get_external_user_from_dev(struct device *dev) +{ + struct vfio_group *group; + int ret; + + group = vfio_group_get_from_dev(dev); + if (!group) + return ERR_PTR(-ENODEV); + + ret = vfio_group_add_container_user(group); + if (ret) { + vfio_group_put(group); + return ERR_PTR(ret); + } + + return group; +} +EXPORT_SYMBOL_GPL(vfio_group_get_external_user_from_dev); + void vfio_group_put_external_user(struct vfio_group *group) { vfio_group_try_dissolve_container(group); diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 66741ab087c1..a1e8943b7be3 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -97,6 +97,8 @@ extern void vfio_unregister_iommu_driver( */ extern struct vfio_group *vfio_group_get_external_user(struct file *filep); extern void vfio_group_put_external_user(struct vfio_group *group); +extern struct vfio_group *vfio_group_get_external_user_from_dev(struct device + *dev); extern bool vfio_external_group_match_file(struct vfio_group *group, struct file *filep); extern int vfio_external_user_iommu_id(struct vfio_group *group); -- 2.25.1

1 9

[PATCH kernel-4.19 000/337] backport stable-4.19.164
by Yang Yingliang 04 Jan '21

04 Jan '21

Alan Stern (1): media: gspca: Fix memory leak in probe Alexander Sverdlin (1): serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access Alexandre Belloni (1): ARM: dts: at91: at91sam9rl: fix ADC triggers Alexey Kardashevskiy (1): serial_core: Check for port state when tty is in error state Amadej Kastelic (1): ALSA: usb-audio: Add VID to support native DSD reproduction on FiiO devices Anant Thazhemadam (1): Bluetooth: hci_h5: fix memory leak in h5_close Andy Lutomirski (1): x86/membarrier: Get rid of a dubious optimization Andy Shevchenko (2): pinctrl: merrifield: Set default bias in case no particular value given pinctrl: baytrail: Avoid clearing debounce value when turning it off Anmol Karn (1): Bluetooth: Fix null pointer dereference in hci_event_packet() Ansuel Smith (1): PCI: qcom: Add missing reset for ipq806x Anton Ivanov (3): um: Monitor error events in IRQ controller um: tty: Fix handling of close in tty lines um: chan_xterm: Fix fd leak Antti Palosaari (1): media: msi2500: assign SPI bus number dynamically Ard Biesheuvel (2): ARM: p2v: fix handling of LPAE translation in BE mode crypto: ecdh - avoid unaligned accesses in ecdh_set_secret() Arnd Bergmann (7): kbuild: avoid static_assert for genksyms scsi: megaraid_sas: Check user-provided offsets RDMa/mthca: Work around -Wenum-conversion warning seq_buf: Avoid type mismatch for seq_buf_init watchdog: coh901327: add COMMON_CLK dependency Input: cyapa_gen6 - fix out-of-bounds stack access platform/x86: mlx-platform: remove an unused variable Artem Lapkin (1): arm64: dts: meson: fix spi-max-frequency on Khadas VIM2 Arvind Sankar (3): x86/mm/mem_encrypt: Fix definition of PMD_FLAGS_DEC_WP compiler.h: fix barrier_data() on clang x86/mm/ident_map: Check for errors from ident_pud_init() Athira Rajeev (1): powerpc/perf: Exclude kernel samples while counting events in user space. Baruch Siach (1): gpio: mvebu: fix potential user-after-free on probe Bean Huo (1): mmc: block: Fixup condition for CMD13 polling for RPMB requests Bharat Gooty (1): PCI: iproc: Fix out-of-bound array accesses Bjorn Andersson (1): slimbus: qcom-ngd-ctrl: Avoid sending power requests without QMI Bjorn Helgaas (1): PCI: Bounds-check command-line resource alignment requests Björn Töpel (1): ixgbe: avoid premature Rx buffer reuse Bob Pearson (1): RDMA/rxe: Compute PSN windows correctly Bongsu Jeon (1): nfc: s3fwrn5: Release the nfc firmware Borislav Petkov (1): EDAC/amd64: Fix PCI component registration Bui Quang Minh (1): USB: dummy-hcd: Fix uninitialized array use in init() Calum Mackay (1): lockd: don't use interval-based rebinding over TCP Can Guo (1): scsi: ufs: Make sure clk scaling happens only when HBA is runtime ACTIVE Carlos Garnacho (1): platform/x86: intel-vbtn: Allow switch events on Acer Switch Alpha 12 Cezary Rojewski (1): ASoC: pcm: DRAIN support reactivation Chen-Yu Tsai (2): arm64: dts: rockchip: Set dr_mode to "host" for OTG on rk3328-roc-cc arm64: dts: rockchip: Fix UART pull-ups on rk3328 Cheng Lin (1): nfs_common: need lock during iterate through the list Chris Chiu (4): Input: i8042 - add Acer laptops to the i8042 reset list ALSA: hda/realtek - Enable headset mic of ASUS X430UN with ALC256 ALSA: hda/realtek - Enable headset mic of ASUS Q524UQK with ALC255 ALSA: hda/realtek: Apply jack fixup for Quanta NL3 Chris Packham (1): ARM: dts: Remove non-existent i2c1 from 98dx3236 Christophe JAILLET (5): ath10k: Fix an error handling path ath10k: Release some resources in an error handling path net: bcmgenet: Fix a resource leak in an error handling path in the probe functin net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function clk: s2mps11: Fix a resource leak in error handling paths in the probe function Christophe Leroy (4): crypto: talitos - Endianess in current_desc_hdr() crypto: talitos - Fix return type of current_desc_hdr() powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 powerpc/xmon: Change printk() to pr_cont() Chuhong Yuan (1): ASoC: jz4740-i2s: add missed checks for clk_get() Chunguang Xu (1): ext4: fix a memory leak of ext4_free_data Chunyan Zhang (1): gpio: eic-sprd: break loop when getting NULL device resource Claudiu Beznea (1): ARM: dts: at91: sama5d2: map securam as device Coiby Xu (1): pinctrl: amd: remove debounce filter setting in IRQ type setting Colin Ian King (3): crypto: inside-secure - Fix sizeof() mismatch media: tm6000: Fix sizeof() mismatches PCI: Fix overflow in command-line resource alignment requests Connor McAdams (1): ALSA: hda/ca0132 - Change Input Source enum strings. Cristian Birsan (2): ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host Dae R. Jeong (1): md: fix a warning caused by a race between concurrent md_ioctl()s Dan Carpenter (6): scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" soc: renesas: rmobile-sysc: Fix some leaks in rmobile_init_pm_domains() media: max2175: fix max2175_set_csm_mode() error code media: saa7146: fix array overflow in vidioc_s_audio() ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() qlcnic: Fix error code in probe Dan Williams (1): libnvdimm/namespace: Fix reaping of invalidated block-window-namespace labels Daniel Scally (1): Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" Daniel T. Lee (1): samples: bpf: Fix lwt_len_hist reusing previous BPF map David Hildenbrand (2): powerpc/powernv/memtrace: Don't leak kernel memory to user space powerpc/powernv/memtrace: Fix crashing the kernel when enabling concurrently David Jander (1): Input: ads7846 - fix race that causes missing releases David Woodhouse (1): x86/apic: Fix x2apic enablement without interrupt remapping Deepak R Varma (1): drm/tegra: replace idr_init() by idr_init_base() Dmitry Baryshkov (1): drm/msm/dsi_pll_10nm: restore VCO rate during restore_state Dmitry Osipenko (1): clk: tegra: Fix duplicated SE clock entry Dmitry Torokhov (3): Input: cm109 - do not stomp on control URB Input: ads7846 - fix unaligned access on 7845 Input: cros_ec_keyb - send 'scancodes' in addition to key events Dongdong Wang (1): lwt: Disable BH too in run_lwt_bpf() Douglas Anderson (1): soc: qcom: geni: More properly switch to DMA mode Dwaipayan Ray (1): checkpatch: fix unescaped left brace Eric Biggers (1): crypto: af_alg - avoid undefined behavior accessing salg_name Eric Dumazet (2): mac80211: mesh: fix mesh_pathtbl_init() error path tcp: select sane initial rcvq_space.space for big MSS Evan Green (1): soc: qcom: smp2p: Safely acquire spinlock without IRQs Fabio Estevam (1): usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul Fangrui Song (2): x86/lib: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S arm64: Change .weak to SYM_FUNC_START_WEAK_PI for arch/arm64/lib/mem*.S Fugang Duan (2): net: stmmac: free tx skb buffer in stmmac_resume() net: stmmac: delete the eee_ctrl_timer after napi disabled Geert Uytterhoeven (1): clk: renesas: r9a06g032: Drop __packed for portability Greg Kroah-Hartman (1): Linux 4.19.164 Guenter Roeck (1): watchdog: sirfsoc: Add missing dependency on HAS_IOMEM H. Nikolaus Schaller (1): ARM: dts: pandaboard: fix pinmux for gpio user button of Pandaboard ES Hans de Goede (3): platform/x86: thinkpad_acpi: Do not report SW_TABLET_MODE on Yoga 11e platform/x86: thinkpad_acpi: Add BAT1 is primary battery quirk for Thinkpad Yoga 11e 4th gen power: supply: axp288_charger: Fix HP Pavilion x2 10 DMI matching Hao Si (1): soc: fsl: dpio: Get the cpumask through cpumask_of(cpu) Hui Wang (1): ACPI: PNP: compare the string length in the matching_id() Ian Abbott (1): staging: comedi: mf6x4: Fix AI end-of-conversion detection Icenowy Zheng (1): ARM: dts: sun8i: v3s: fix GIC node memory range Jack Pham (1): usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus Jack Xu (1): crypto: qat - fix status check in qat_hal_put_rel_rd_xfer() James Morse (1): x86/resctrl: Remove unused struct mbm_state::chunks_bw James Smart (2): scsi: lpfc: Fix invalid sleeping context in lpfc_sli4_nvmet_alloc() scsi: lpfc: Re-fix use after free in lpfc_rq_buf_free() Jan Kara (2): quota: Sanity-check quota file headers on load ext4: fix deadlock with fs freezing and EA inodes Jason Gunthorpe (1): vfio-pci: Use io_remap_pfn_range() for PCI IO memory Jernej Skrabec (1): clk: sunxi-ng: Make sure divider tables have sentinel Jerome Brunet (1): ASoC: meson: fix COMPILE_TEST error Jing Xiangfeng (3): staging: gasket: interrupt: fix the missed eventfd_ctx_put() in gasket_interrupt.c HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() memstick: r592: Fix error return in r592_probe() Joel Stanley (1): ARM: dts: aspeed: s2600wf: Fix VGA memory region location Johan Hovold (9): USB: serial: option: add interface-number sanity check to flag handling USB: serial: mos7720: fix parallel-port state restore USB: serial: digi_acceleport: fix write-wakeup deadlocks USB: serial: keyspan_pda: fix dropped unthrottle interrupts USB: serial: keyspan_pda: fix write deadlock USB: serial: keyspan_pda: fix stalled writes USB: serial: keyspan_pda: fix write-wakeup use-after-free USB: serial: keyspan_pda: fix tx-unthrottle use-after-free USB: serial: keyspan_pda: fix write unthrottling Johannes Berg (2): iwlwifi: pcie: limit memory read spin time mac80211: don't set set TDLS STA bandwidth wider than possible Johannes Thumshirn (1): block: factor out requeue handling from dispatch code Jonathan Cameron (4): iio:light:rpr0521: Fix timestamp alignment and prevent data leak. iio:light:st_uvis25: Fix timestamp alignment and prevent data leak. iio:pressure:mpl3115: Force alignment of buffer iio:imu:bmi160: Fix too large a buffer. Jordan Niethe (1): powerpc/64: Set up a kernel stack for secondaries before cpu_restore() Jubin Zhong (1): PCI: Fix pci_slot_release() NULL pointer dereference Julian Sax (1): HID: i2c-hid: add Vero K147 to descriptor override Kamal Heib (2): RDMA/bnxt_re: Set queue pair state when being queried RDMA/cxgb4: Validate the number of CQEs Keita Suzuki (1): media: siano: fix memory leak of debugfs members in smsdvb_hotplug Keqian Zhu (1): clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI Krzysztof Kozlowski (4): ARM: dts: exynos: fix roles of USB 3.0 ports on Odroid XU ARM: dts: exynos: fix USB 3.0 VBUS control and over-current pins on Exynos5410 ARM: dts: exynos: fix USB 3.0 pins supply being turned off on Odroid XU drm/tve200: Fix handling of platform_get_irq() error Leo Yan (2): perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata perf cs-etm: Move definition of 'traceid_list' global variable from header file Leon Romanovsky (2): RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait net/mlx5: Properly convey driver version to firmware Li Jun (1): xhci: Give USB2 ports time to enter U3 in bus suspend Lingling Xu (2): watchdog: sprd: remove watchdog disable from resume fail path watchdog: sprd: check busy bit before new loading rather than after that Lokesh Vutla (1): pwm: lp3943: Dynamically allocate PWM chip base Luc Van Oostenryck (1): xsk: Fix xsk_poll()'s return type Luis Henriques (1): ceph: fix race in concurrent __ceph_remove_cap invocations Lukas Wunner (8): spi: bcm2835aux: Fix use-after-free on unbind media: netup_unidvb: Don't leak SPI master in probe error path spi: spi-sh: Fix use-after-free on unbind spi: davinci: Fix use-after-free on unbind spi: pic32: Don't leak DMA channels in probe error path spi: rb4xx: Don't leak SPI master in probe error path spi: sc18is602: Don't leak SPI master in probe error path spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path Manivannan Sadhasivam (1): watchdog: qcom: Avoid context switch in restart handler Mao Jinlong (1): coresight: tmc-etr: Check if page is valid before dma_map_page() Marc Zyngier (3): genirq/irqdomain: Don't try to free an interrupt that has no mapping irqchip/alpine-msi: Fix freeing of interrupts on allocation error path KVM: arm64: Introduce handling of AArch32 TTBCR2 traps Marek Szyprowski (1): extcon: max77693: Fix modalias string Mark Rutland (1): arm64: syscall: exit userspace before unmasking exceptions Markus Reichl (1): arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. Martin Blumenstingl (1): net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux Martin Wilck (1): scsi: core: Fix VPD LUN ID designator priorities Masahiro Yamada (1): kconfig: fix return value of do_error_if() Masami Hiramatsu (1): x86/kprobes: Restore BTF if the single-stepping is cancelled Mathieu Desnoyers (1): powerpc: Fix incorrect stw{, ux, u, x} instructions in __set_pte_at Max Verevkin (1): platform/x86: intel-vbtn: Support for tablet mode on HP Pavilion 13 x360 PC Michael Ellerman (1): powerpc: Drop -me200 addition to build flags Miquel Raynal (1): mtd: spinand: Fix OOB read Moshe Shemesh (2): net/mlx4_en: Avoid scheduling restart task if it is already running net/mlx4_en: Handle TX error CQE Nathan Chancellor (2): spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe crypto: crypto4xx - Replace bitwise OR with logical OR in crypto4xx_build_pd Nathan Lynch (2): powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops powerpc/pseries/hibernation: remove redundant cacheinfo update Neal Cardwell (1): tcp: fix cwnd-limited bug for TSO deferral where we send nothing Necip Fazil Yildiran (1): MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA NeilBrown (1): NFS: switch nfsiod to be an UNBOUND workqueue. Nicholas Piggin (1): kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling Nick Desaulniers (1): Kbuild: do not emit debug info for assembly with LLVM_IAS=1 Nicolas Boichat (1): soc: mediatek: Check if power domains can be powered on at boot time Nicolas Ferre (1): ARM: dts: at91: sama5d2: fix CAN message ram offset and size Nicolin Chen (1): soc/tegra: fuse: Fix index bug in get_process_id Nuno Sá (1): iio: buffer: Fix demux update Oleksandr Andrushchenko (1): drm/xen-front: Fix misused IS_ERR_OR_NULL checks Oleksij Rempel (1): Input: ads7846 - fix integer overflow on Rt calculation Olga Kornievskaia (1): NFSv4.2: condition READDIR's mask for security label based on LSM state Oliver Neukum (2): USB: add RESET_RESUME quirk for Snapscan 1212 USB: UAS: introduce a quirk to set no_write_same Pali Rohár (5): cpufreq: highbank: Add missing MODULE_DEVICE_TABLE cpufreq: mediatek: Add missing MODULE_DEVICE_TABLE cpufreq: st: Add missing MODULE_DEVICE_TABLE cpufreq: loongson1: Add missing MODULE_ALIAS cpufreq: scpi: Add missing MODULE_ALIAS Paul Kocialkowski (1): ARM: sunxi: Add machine match for the Allwinner V3 SoC Paul Moore (1): selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling Paweł Chmiel (2): arm64: dts: exynos: Include common syscon restart/poweroff for Exynos7 arm64: dts: exynos: Correct psci compatible used on Exynos7 Peilin Ye (1): Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() Peng Liu (1): sched/deadline: Fix sched_dl_global_validate() Philipp Rudo (1): s390/kexec_file: fix diag308 subcode when loading crash kernel Praveenkumar I (1): mtd: rawnand: qcom: Fix DMA sync on FLASH_STATUS register read Qinglang Miao (11): drm/tegra: sor: Disable clocks on error in tegra_sor_init() spi: bcm63xx-hsspi: fix missing clk_disable_unprepare() on error in bcm63xx_hsspi_resume media: solo6x10: fix missing snd_card_free in error handling case memstick: fix a double-free bug in memstick_check cw1200: fix missing destroy_workqueue() on error in cw1200_init_common mips: cdmm: fix use-after-free in mips_cdmm_bus_discover platform/x86: dell-smbios-base: Fix error return code in dell_smbios_init dm ioctl: fix error return code in target_message scsi: qedi: Fix missing destroy_workqueue() on error in __qedi_probe spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume Rafael J. Wysocki (1): PM: ACPI: PCI: Drop acpi_pm_set_bridge_wakeup() Rakesh Pillai (1): ath10k: Fix the parsing error in service available event Randy Dunlap (1): scsi: bnx2i: Requires MMU Richard Weinberger (1): ubifs: wbuf: Don't leak kernel memory to flash Roberto Sassu (1): ima: Don't modify file descriptor mode on the fly Sakari Ailus (5): media: ipu3-cio2: Remove traces of returned buffers media: ipu3-cio2: Return actual subdev format media: ipu3-cio2: Serialise access to pad format media: ipu3-cio2: Validate mbus format in setting subdev format media: ipu3-cio2: Make the field on subdev format V4L2_FIELD_NONE Sami Tolvanen (1): arm64: lse: fix LSE atomics with LLVM's integrated assembler Sara Sharon (2): iwlwifi: mvm: fix kernel panic in case of assert during CSA cfg80211: initialize rekey_data Sean Young (1): media: sunxi-cir: ensure IR is handled when it is continuous Sebastian Andrzej Siewior (1): orinoco: Move context allocation after processing the skb Serge Hallyn (1): fix namespaced fscaps when !CONFIG_SECURITY Sergej Bauer (1): lan743x: fix for potential NULL pointer dereference with bare card Simon Beginn (1): Input: goodix - add upside-down quirk for Teclast X98 Pro tablet Sreekanth Reddy (1): scsi: mpt3sas: Increase IOCInit request timeout to 30s Stefan Haberland (4): s390/dasd: fix hanging device offline processing s390/dasd: prevent inconsistent LCU device data s390/dasd: fix list corruption of pavgroup group list s390/dasd: fix list corruption of lcu list Steve French (2): SMB3: avoid confusing warning message on mount to Azure SMB3.1.1: do not log warning message if server doesn't populate salt Steven Rostedt (VMware) (1): ktest.pl: If size of log is too big to email, email error message Subash Abhinov Kasiviswanathan (1): netfilter: x_tables: Switch synchronization to RCU Sven Eckelmann (3): vxlan: Add needed_headroom for lower device vxlan: Copy needed_tailroom from lowerdev mtd: parser: cmdline: Fix parsing of part-names with colons Sven Schnelle (1): s390/smp: perform initial CPU reset also for SMT siblings Takashi Iwai (7): ALSA: usb-audio: Fix potential out-of-bounds shift ALSA: usb-audio: Fix control 'access overflow' errors from chmap ALSA: pcm: oss: Fix potential out-of-bounds shift ALSA: hda: Fix regressions on clear and reconfig sysfs ALSA: pcm: oss: Fix a few more UBSAN fixes ALSA: hda/realtek: Add quirk for MSI-GP73 ALSA: usb-audio: Disable sample read check if firmware doesn't give back Terry Zhou (1): clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 Thomas Gleixner (4): x86/apic/vector: Fix ordering in vector assignment USB: sisusbvga: Make console support depend on BROKEN dm table: Remove BUG_ON(in_interrupt()) sched: Reenable interrupts in do_sched_yield() Tianyue Ren (1): selinux: fix error initialization in inode_doinit_with_dentry() Timo Witte (1): platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Toke Høiland-Jørgensen (1): selftests/bpf/test_offload.py: Reset ethtool features after failed setting Tom Rix (1): drm/gma500: fix double free of gma_connector Trond Myklebust (1): SUNRPC: xprt_load_transport() needs to support the netid "rdma6" Tsuchiya Yuto (1): mwifiex: fix mwifiex_shutdown_sw() causing sw reset failure Tyrel Datwyler (1): powerpc/rtas: Fix typo of ibm,open-errinjct in RTAS filter Uwe Kleine-König (2): spi: fix resource leak for drivers without .remove callback pwm: zx: Add missing cleanup in error path Vadim Pasternak (3): platform/x86: mlx-platform: Remove PSU EEPROM from default platform configuration platform/x86: mlx-platform: Remove PSU EEPROM from MSN274x platform configuration platform/x86: mlx-platform: Fix item counter assignment for MSN2700, MSN24xx systems Vincent Stehlé (2): powerpc/ps3: use dma_mapping_error() net: korina: fix return value Vincenzo Frascino (1): arm64: lse: Fix LSE atomics with LLVM Vineet Gupta (1): ARC: stack unwinding: don't assume non-current task is sleeping Wang Wensheng (1): watchdog: Fix potential dereferencing of null pointer Will McVicker (2): USB: gadget: f_midi: setup SuperSpeed Plus descriptors USB: gadget: f_rndis: fix bitrate for SuperSpeed and above Xiaochen Shen (1): x86/resctrl: Fix incorrect local bandwidth when mba_sc is enabled Xin Xiong (1): drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi Yang Yingliang (4): video: fbdev: atmel_lcdfb: fix return error code in atmel_lcdfb_of_init() drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() usb/max3421: fix return error code in max3421_probe() speakup: fix uninitialized flush_lock Yangtao Li (1): pinctrl: sunxi: Always call chained_irq_{enter, exit} in sunxi_pinctrl_irq_handler Yu Kuai (3): media: mtk-vcodec: add missing put_device() call in mtk_vcodec_release_dec_pm() clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() Zhang Changzhong (3): net: bridge: vlan: fix error return code in __vlan_add() scsi: fnic: Fix error return code in fnic_probe() bus: fsl-mc: fix error return code in fsl_mc_object_allocate() Zhang Qilong (20): can: softing: softing_netdev_open(): fix error handling spi: img-spfi: fix reference leak in img_spfi_resume spi: spi-ti-qspi: fix reference leak in ti_qspi_setup spi: tegra20-slink: fix reference leak in slink ops of tegra20 spi: tegra20-sflash: fix reference leak in tegra_sflash_resume spi: tegra114: fix reference leak in tegra spi ops ASoC: wm8998: Fix PM disable depth imbalance on error ASoC: arizona: Fix a wrong free in wm8997_probe staging: greybus: codecs: Fix reference counter leak in error handling spi: mxs: fix reference leak in mxs_spi_probe crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe soc: ti: knav_qmss: fix reference leak in knav_queue_probe soc: ti: Fix reference imbalance in knav_dma_probe Input: omap4-keypad - fix runtime PM error handling power: supply: bq24190_charger: fix reference leak scsi: pm80xx: Fix error return in pm8001_pci_probe() usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe usb: oxu210hp-hcd: Fix memory leak in oxu_create libnvdimm/label: Return -ENXIO for no slot in __blk_label_update clk: ti: Fix memleak in ti_fapll_synth_setup Zhao Heming (2): md/cluster: block reshape with remote resync job md/cluster: fix deadlock when node is doing resync job Zhe Li (1): jffs2: Fix GC exit abnormally Zheng Zengkai (1): perf record: Fix memory leak when using '--user-regs=?' to list registers Zhihao Cheng (2): drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe dmaengine: mv_xor_v2: Fix error return code in mv_xor_v2_probe() Zwane Mwaikambo (1): drm/dp_aux_dev: check aux_dev before use in drm_dp_aux_dev_get_by_minor() kazuo ito (1): nfsd: Fix message level for normal termination taehyun.cho (1): USB: gadget: f_acm: add support for SuperSpeed Plus .../admin-guide/kernel-parameters.txt | 1 + Makefile | 5 +- arch/arc/kernel/stacktrace.c | 23 ++-- arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 5 - .../arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +- arch/arm/boot/dts/at91-sama5d3_xplained.dts | 7 + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 7 + arch/arm/boot/dts/at91sam9rl.dtsi | 19 +-- arch/arm/boot/dts/exynos5410-odroidxu.dts | 6 +- arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 28 ++++ arch/arm/boot/dts/exynos5410.dtsi | 4 + arch/arm/boot/dts/omap4-panda-es.dts | 2 +- arch/arm/boot/dts/sama5d2.dtsi | 7 +- arch/arm/boot/dts/sun8i-v3s.dtsi | 2 +- arch/arm/kernel/head.S | 6 +- arch/arm/mach-shmobile/pm-rmobile.c | 1 + arch/arm/mach-sunxi/sunxi.c | 1 + .../dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +- arch/arm64/boot/dts/exynos/exynos7.dtsi | 12 +- .../arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 1 + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 16 +-- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 + arch/arm64/include/asm/atomic_lse.h | 76 ++++++++--- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/lse.h | 6 +- arch/arm64/kernel/syscall.c | 2 +- arch/arm64/kvm/sys_regs.c | 1 + arch/arm64/lib/memcpy.S | 3 +- arch/arm64/lib/memmove.S | 3 +- arch/arm64/lib/memset.S | 3 +- arch/mips/bcm47xx/Kconfig | 1 + arch/powerpc/Makefile | 1 - arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +- arch/powerpc/include/asm/cputable.h | 5 - arch/powerpc/include/asm/nohash/pgtable.h | 4 +- arch/powerpc/kernel/head_64.S | 8 +- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 4 +- arch/powerpc/perf/core-book3s.c | 10 ++ arch/powerpc/platforms/powernv/memtrace.c | 44 +++++- arch/powerpc/platforms/pseries/suspend.c | 4 - arch/powerpc/xmon/nonstdio.c | 2 +- arch/s390/kernel/smp.c | 18 +-- arch/s390/purgatory/head.S | 9 +- arch/um/drivers/chan_user.c | 4 +- arch/um/drivers/xterm.c | 5 + arch/um/os-Linux/irq.c | 2 +- arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/include/asm/sync_core.h | 9 +- arch/x86/kernel/apic/apic.c | 14 +- arch/x86/kernel/apic/vector.c | 24 ++-- arch/x86/kernel/apic/x2apic_phys.c | 9 ++ arch/x86/kernel/cpu/intel_rdt.h | 2 - arch/x86/kernel/cpu/intel_rdt_monitor.c | 7 +- arch/x86/kernel/kprobes/core.c | 5 + arch/x86/lib/memcpy_64.S | 6 +- arch/x86/lib/memmove_64.S | 4 +- arch/x86/lib/memset_64.S | 6 +- arch/x86/mm/ident_map.c | 12 +- arch/x86/mm/mem_encrypt_identity.c | 4 +- arch/x86/mm/tlb.c | 10 +- block/blk-mq.c | 29 ++-- crypto/af_alg.c | 10 +- crypto/ecdh.c | 9 +- drivers/acpi/acpi_pnp.c | 3 + drivers/acpi/device_pm.c | 41 ++---- drivers/acpi/resource.c | 2 +- drivers/bluetooth/hci_h5.c | 3 + drivers/bus/fsl-mc/fsl-mc-allocator.c | 4 +- drivers/bus/mips_cdmm.c | 4 +- drivers/clk/clk-s2mps11.c | 1 + drivers/clk/mvebu/armada-37xx-xtal.c | 4 +- drivers/clk/renesas/r9a06g032-clocks.c | 2 +- drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 1 + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 1 + drivers/clk/tegra/clk-id.h | 1 + drivers/clk/tegra/clk-tegra-periph.c | 2 +- drivers/clk/ti/fapll.c | 11 +- drivers/clocksource/arm_arch_timer.c | 23 +++- drivers/clocksource/cadence_ttc_timer.c | 18 +-- drivers/cpufreq/highbank-cpufreq.c | 7 + drivers/cpufreq/loongson1-cpufreq.c | 1 + drivers/cpufreq/mediatek-cpufreq.c | 1 + drivers/cpufreq/scpi-cpufreq.c | 1 + drivers/cpufreq/sti-cpufreq.c | 7 + drivers/crypto/amcc/crypto4xx_core.c | 2 +- drivers/crypto/inside-secure/safexcel.c | 2 +- drivers/crypto/omap-aes.c | 3 +- drivers/crypto/qat/qat_common/qat_hal.c | 2 +- drivers/crypto/talitos.c | 10 +- drivers/dma/mv_xor_v2.c | 4 +- drivers/edac/amd64_edac.c | 26 ++-- drivers/extcon/extcon-max77693.c | 2 +- drivers/gpio/gpio-eic-sprd.c | 2 +- drivers/gpio/gpio-mvebu.c | 16 ++- drivers/gpu/drm/drm_dp_aux_dev.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 7 +- drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 8 ++ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 + drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tegra/sor.c | 10 +- drivers/gpu/drm/tve200/tve200_drv.c | 4 +- drivers/gpu/drm/xen/xen_drm_front.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 8 +- drivers/gpu/drm/xen/xen_drm_front_kms.c | 2 +- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++ drivers/hsi/controllers/omap_ssi_core.c | 2 +- .../hwtracing/coresight/coresight-tmc-etr.c | 2 + drivers/iio/adc/rockchip_saradc.c | 2 +- drivers/iio/imu/bmi160/bmi160_core.c | 4 +- drivers/iio/industrialio-buffer.c | 6 +- drivers/iio/light/rpr0521.c | 17 ++- drivers/iio/light/st_uvis25.h | 5 + drivers/iio/light/st_uvis25_core.c | 8 +- drivers/iio/pressure/mpl3115.c | 9 +- drivers/infiniband/core/cm.c | 2 + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 1 + drivers/infiniband/hw/cxgb4/cq.c | 3 + drivers/infiniband/hw/mthca/mthca_cq.c | 2 +- drivers/infiniband/hw/mthca/mthca_dev.h | 1 - drivers/infiniband/sw/rxe/rxe_req.c | 3 +- drivers/input/keyboard/cros_ec_keyb.c | 1 + drivers/input/keyboard/omap4-keypad.c | 89 ++++++++----- drivers/input/misc/cm109.c | 7 +- drivers/input/mouse/cyapa_gen6.c | 2 +- drivers/input/serio/i8042-x86ia64io.h | 42 ++++++ drivers/input/touchscreen/ads7846.c | 52 +++++--- drivers/input/touchscreen/goodix.c | 12 ++ drivers/irqchip/irq-alpine-msi.c | 3 +- drivers/md/dm-ioctl.c | 1 + drivers/md/dm-table.c | 6 - drivers/md/md-cluster.c | 67 ++++++---- drivers/md/md.c | 21 ++- drivers/media/common/siano/smsdvb-main.c | 5 +- drivers/media/i2c/max2175.c | 2 +- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 62 +++++---- drivers/media/pci/intel/ipu3/ipu3-cio2.h | 1 + .../media/pci/netup_unidvb/netup_unidvb_spi.c | 5 +- drivers/media/pci/saa7146/mxb.c | 19 +-- drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +- .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 1 + drivers/media/rc/sunxi-cir.c | 2 + drivers/media/usb/gspca/gspca.c | 1 + drivers/media/usb/msi2500/msi2500.c | 2 +- drivers/media/usb/tm6000/tm6000-video.c | 5 +- drivers/memstick/core/memstick.c | 1 - drivers/memstick/host/r592.c | 12 +- drivers/mmc/core/block.c | 2 +- drivers/mtd/cmdlinepart.c | 14 +- drivers/mtd/nand/raw/qcom_nandc.c | 2 + drivers/mtd/nand/spi/core.c | 4 + drivers/net/can/softing/softing_main.c | 9 +- drivers/net/ethernet/allwinner/sun4i-emac.c | 7 +- .../net/ethernet/broadcom/genet/bcmgenet.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 24 +++- drivers/net/ethernet/korina.c | 2 +- .../net/ethernet/mellanox/mlx4/en_netdev.c | 21 ++- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 40 +++++- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 12 +- .../net/ethernet/mellanox/mlx5/core/main.c | 6 +- .../net/ethernet/microchip/lan743x_ethtool.c | 9 +- .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + .../ethernet/stmicro/stmmac/dwmac-meson8b.c | 6 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 27 +++- drivers/net/vxlan.c | 3 + drivers/net/wireless/ath/ath10k/usb.c | 7 +- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 4 +- drivers/net/wireless/ath/ath10k/wmi.c | 9 +- drivers/net/wireless/ath/ath10k/wmi.h | 1 + .../net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- .../net/wireless/intel/iwlwifi/pcie/trans.c | 36 +++-- .../wireless/intersil/orinoco/orinoco_usb.c | 14 +- drivers/net/wireless/marvell/mwifiex/main.c | 2 + drivers/net/wireless/st/cw1200/main.c | 2 + drivers/nfc/s3fwrn5/firmware.c | 4 +- drivers/nvdimm/label.c | 13 +- drivers/pci/controller/dwc/pcie-qcom.c | 12 ++ drivers/pci/controller/pcie-iproc.c | 10 +- drivers/pci/pci-acpi.c | 4 +- drivers/pci/pci.c | 14 +- drivers/pci/slot.c | 6 +- drivers/pinctrl/intel/pinctrl-baytrail.c | 8 +- drivers/pinctrl/intel/pinctrl-merrifield.c | 8 ++ drivers/pinctrl/pinctrl-amd.c | 7 - drivers/pinctrl/pinctrl-falcon.c | 14 +- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 6 +- drivers/platform/x86/acer-wmi.c | 1 + drivers/platform/x86/dell-smbios-base.c | 1 + drivers/platform/x86/intel-vbtn.c | 12 ++ drivers/platform/x86/mlx-platform.c | 27 +--- drivers/platform/x86/thinkpad_acpi.c | 10 +- drivers/power/supply/axp288_charger.c | 28 ++-- drivers/power/supply/bq24190_charger.c | 20 ++- drivers/ps3/ps3stor_lib.c | 2 +- drivers/pwm/pwm-lp3943.c | 1 + drivers/pwm/pwm-zx.c | 1 + drivers/s390/block/dasd_alias.c | 22 ++- drivers/scsi/be2iscsi/be_main.c | 4 +- drivers/scsi/bnx2i/Kconfig | 1 + drivers/scsi/fnic/fnic_main.c | 1 + drivers/scsi/lpfc/lpfc_mem.c | 6 +- drivers/scsi/lpfc/lpfc_sli.c | 10 +- drivers/scsi/megaraid/megaraid_sas_base.c | 16 ++- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 3 +- drivers/scsi/qedi/qedi_main.c | 4 +- drivers/scsi/scsi_lib.c | 126 ++++++++++++------ drivers/scsi/ufs/ufshcd.c | 7 + drivers/slimbus/qcom-ngd-ctrl.c | 6 + drivers/soc/fsl/dpio/dpio-driver.c | 5 +- drivers/soc/mediatek/mtk-scpsys.c | 5 +- drivers/soc/qcom/qcom-geni-se.c | 17 ++- drivers/soc/qcom/smp2p.c | 5 +- drivers/soc/tegra/fuse/speedo-tegra210.c | 2 +- drivers/soc/ti/knav_dma.c | 13 +- drivers/soc/ti/knav_qmss_queue.c | 4 +- drivers/spi/spi-bcm2835aux.c | 17 +-- drivers/spi/spi-bcm63xx-hsspi.c | 4 +- drivers/spi/spi-davinci.c | 2 +- drivers/spi/spi-img-spfi.c | 4 +- drivers/spi/spi-mxs.c | 1 + drivers/spi/spi-pic32.c | 1 + drivers/spi/spi-rb4xx.c | 2 +- drivers/spi/spi-sc18is602.c | 13 +- drivers/spi/spi-sh.c | 13 +- drivers/spi/spi-st-ssc4.c | 5 +- drivers/spi/spi-tegra114.c | 2 + drivers/spi/spi-tegra20-sflash.c | 1 + drivers/spi/spi-tegra20-slink.c | 2 + drivers/spi/spi-ti-qspi.c | 1 + drivers/spi/spi.c | 19 +-- drivers/staging/comedi/drivers/mf6x4.c | 3 +- drivers/staging/gasket/gasket_interrupt.c | 15 ++- drivers/staging/greybus/audio_codec.c | 2 + drivers/staging/mt7621-spi/spi-mt7621.c | 2 + drivers/staging/speakup/speakup_dectlk.c | 2 +- drivers/tty/serial/8250/8250_omap.c | 5 - drivers/tty/serial/serial_core.c | 4 + drivers/usb/chipidea/ci_hdrc_imx.c | 3 +- drivers/usb/core/quirks.c | 3 + drivers/usb/gadget/function/f_acm.c | 2 +- drivers/usb/gadget/function/f_fs.c | 5 +- drivers/usb/gadget/function/f_midi.c | 6 + drivers/usb/gadget/function/f_rndis.c | 4 +- drivers/usb/gadget/udc/dummy_hcd.c | 2 +- drivers/usb/host/ehci-omap.c | 1 + drivers/usb/host/max3421-hcd.c | 3 +- drivers/usb/host/oxu210hp-hcd.c | 4 +- drivers/usb/host/xhci-hub.c | 4 + drivers/usb/misc/sisusbvga/Kconfig | 2 +- drivers/usb/serial/digi_acceleport.c | 45 ++----- drivers/usb/serial/keyspan_pda.c | 63 +++++---- drivers/usb/serial/mos7720.c | 2 + drivers/usb/serial/option.c | 23 +++- drivers/usb/storage/uas.c | 3 + drivers/usb/storage/unusual_uas.h | 7 +- drivers/usb/storage/usb.c | 3 + drivers/vfio/pci/vfio_pci.c | 4 +- drivers/video/fbdev/atmel_lcdfb.c | 2 +- drivers/watchdog/Kconfig | 3 +- drivers/watchdog/qcom-wdt.c | 2 +- drivers/watchdog/sprd_wdt.c | 34 +++-- drivers/watchdog/watchdog_core.c | 22 +-- fs/ceph/caps.c | 11 +- fs/cifs/smb2ops.c | 3 +- fs/cifs/smb2pdu.c | 7 +- fs/cifs/smb2pdu.h | 14 +- fs/ext4/inode.c | 19 ++- fs/ext4/mballoc.c | 1 + fs/jffs2/readinode.c | 16 +++ fs/lockd/host.c | 20 +-- fs/nfs/inode.c | 2 +- fs/nfs/nfs4proc.c | 10 +- fs/nfs_common/grace.c | 6 +- fs/nfsd/nfssvc.c | 3 +- fs/quota/quota_v2.c | 19 +++ fs/ubifs/io.c | 13 +- include/acpi/acpi_bus.h | 5 - include/linux/build_bug.h | 5 + include/linux/compiler-clang.h | 1 - include/linux/compiler-gcc.h | 19 --- include/linux/compiler.h | 18 ++- include/linux/netfilter/x_tables.h | 5 +- include/linux/security.h | 2 +- include/linux/seq_buf.h | 2 +- include/linux/sunrpc/xprt.h | 1 + include/linux/trace_seq.h | 4 +- include/linux/usb_usual.h | 2 + include/uapi/linux/if_alg.h | 16 +++ kernel/cpu.c | 6 +- kernel/irq/irqdomain.c | 11 +- kernel/sched/core.c | 6 +- kernel/sched/deadline.c | 5 +- kernel/sched/sched.h | 42 +++--- net/bluetooth/hci_event.c | 17 ++- net/bridge/br_vlan.c | 4 +- net/core/lwt_bpf.c | 8 +- net/ipv4/netfilter/arp_tables.c | 14 +- net/ipv4/netfilter/ip_tables.c | 14 +- net/ipv4/tcp_input.c | 3 +- net/ipv4/tcp_output.c | 9 +- net/ipv6/netfilter/ip6_tables.c | 14 +- net/mac80211/mesh_pathtbl.c | 4 +- net/mac80211/vht.c | 14 +- net/netfilter/x_tables.c | 49 +++---- net/sunrpc/xprt.c | 65 ++++++--- net/sunrpc/xprtrdma/module.c | 1 + net/sunrpc/xprtrdma/transport.c | 1 + net/sunrpc/xprtsock.c | 4 + net/wireless/nl80211.c | 2 +- net/xdp/xsk.c | 8 +- samples/bpf/lwt_len_hist.sh | 2 + samples/bpf/test_lwt_bpf.sh | 0 scripts/checkpatch.pl | 2 +- scripts/kconfig/preprocess.c | 2 +- security/integrity/ima/ima_crypto.c | 20 +-- security/selinux/hooks.c | 16 ++- sound/core/oss/pcm_oss.c | 28 ++-- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_sysfs.c | 2 +- sound/pci/hda/patch_ca0132.c | 2 +- sound/pci/hda/patch_realtek.c | 4 + sound/soc/codecs/wm8997.c | 2 + sound/soc/codecs/wm8998.c | 4 +- sound/soc/codecs/wm_adsp.c | 5 +- sound/soc/jz4740/jz4740-i2s.c | 4 + sound/soc/meson/Kconfig | 2 +- sound/soc/soc-pcm.c | 2 + sound/usb/clock.c | 6 + sound/usb/format.c | 2 + sound/usb/quirks.c | 1 + sound/usb/stream.c | 6 +- .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 8 +- tools/perf/util/cs-etm.c | 29 +++- tools/perf/util/cs-etm.h | 10 +- tools/perf/util/parse-regs-options.c | 2 +- tools/testing/ktest/ktest.pl | 7 +- tools/testing/selftests/bpf/test_offload.py | 1 + 340 files changed, 2021 insertions(+), 1084 deletions(-) mode change 100644 => 100755 samples/bpf/lwt_len_hist.sh mode change 100644 => 100755 samples/bpf/test_lwt_bpf.sh -- 2.25.1

1 337