February 2020 - Linux-stable-mirror

[PATCH v5 1/3] drm/shmem: add support for per object caching flags.

by Gerd Hoffmann

Add map_cached bool to drm_gem_shmem_object, to request cached mappings on a per-object base. Check the flag before adding writecombine to pgprot bits. Cc: stable(a)vger.kernel.org Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- include/drm/drm_gem_shmem_helper.h | 5 +++++ drivers/gpu/drm/drm_gem_shmem_helper.c | 15 +++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h index e34a7b7f848a..294b2931c4cc 100644 --- a/include/drm/drm_gem_shmem_helper.h +++ b/include/drm/drm_gem_shmem_helper.h @@ -96,6 +96,11 @@ struct drm_gem_shmem_object { * The address are un-mapped when the count reaches zero. */ unsigned int vmap_use_count; + + /** + * @map_cached: map object cached (instead of using writecombine). + */ + bool map_cached; }; #define to_drm_gem_shmem_obj(obj) \ diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index a421a2eed48a..aad9324dcf4f 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -254,11 +254,16 @@ static void *drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem) if (ret) goto err_zero_use; - if (obj->import_attach) + if (obj->import_attach) { shmem->vaddr = dma_buf_vmap(obj->import_attach->dmabuf); - else + } else { + pgprot_t prot = PAGE_KERNEL; + + if (!shmem->map_cached) + prot = pgprot_writecombine(prot); shmem->vaddr = vmap(shmem->pages, obj->size >> PAGE_SHIFT, - VM_MAP, pgprot_writecombine(PAGE_KERNEL)); + VM_MAP, prot); + } if (!shmem->vaddr) { DRM_DEBUG_KMS("Failed to vmap pages\n"); @@ -540,7 +545,9 @@ int drm_gem_shmem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) } vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND; - vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); + if (!shmem->map_cached) + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot); vma->vm_ops = &drm_gem_shmem_vm_ops; -- 2.18.2

4 years, 10 months

4
8
0 0

FAILED: patch "[PATCH] io_uring: prevent sq_thread from spinning when it should stop" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 7143b5ac5750f404ff3a594b34fdf3fc2f99f828 Mon Sep 17 00:00:00 2001 From: Stefano Garzarella <sgarzare(a)redhat.com> Date: Fri, 21 Feb 2020 16:42:16 +0100 Subject: [PATCH] io_uring: prevent sq_thread from spinning when it should stop This patch drops 'cur_mm' before calling cond_resched(), to prevent the sq_thread from spinning even when the user process is finished. Before this patch, if the user process ended without closing the io_uring fd, the sq_thread continues to spin until the 'sq_thread_idle' timeout ends. In the worst case where the 'sq_thread_idle' parameter is bigger than INT_MAX, the sq_thread will spin forever. Fixes: 6c271ce2f1d5 ("io_uring: add submission polling") Signed-off-by: Stefano Garzarella <sgarzare(a)redhat.com> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> diff --git a/fs/io_uring.c b/fs/io_uring.c index 6e249aa97ba3..b43467b3a8dc 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5142,6 +5142,18 @@ static int io_sq_thread(void *data) * to enter the kernel to reap and flush events. */ if (!to_submit || ret == -EBUSY) { + /* + * Drop cur_mm before scheduling, we can't hold it for + * long periods (or over schedule()). Do this before + * adding ourselves to the waitqueue, as the unuse/drop + * may sleep. + */ + if (cur_mm) { + unuse_mm(cur_mm); + mmput(cur_mm); + cur_mm = NULL; + } + /* * We're polling. If we're within the defined idle * period, then let us spin without work before going @@ -5156,18 +5168,6 @@ static int io_sq_thread(void *data) continue; } - /* - * Drop cur_mm before scheduling, we can't hold it for - * long periods (or over schedule()). Do this before - * adding ourselves to the waitqueue, as the unuse/drop - * may sleep. - */ - if (cur_mm) { - unuse_mm(cur_mm); - mmput(cur_mm); - cur_mm = NULL; - } - prepare_to_wait(&ctx->sqo_wait, &wait, TASK_INTERRUPTIBLE);

4 years, 10 months

2
1
0 0

FAILED: patch "[PATCH] lib/stackdepot.c: fix global out-of-bounds in stack_slabs" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 305e519ce48e935702c32241f07d393c3c8fed3e Mon Sep 17 00:00:00 2001 From: Alexander Potapenko <glider(a)google.com> Date: Thu, 20 Feb 2020 20:04:30 -0800 Subject: [PATCH] lib/stackdepot.c: fix global out-of-bounds in stack_slabs Walter Wu has reported a potential case in which init_stack_slab() is called after stack_slabs[STACK_ALLOC_MAX_SLABS - 1] has already been initialized. In that case init_stack_slab() will overwrite stack_slabs[STACK_ALLOC_MAX_SLABS], which may result in a memory corruption. Link: http://lkml.kernel.org/r/20200218102950.260263-1-glider@google.com Fixes: cd11016e5f521 ("mm, kasan: stackdepot implementation. Enable stackdepot for SLAB") Signed-off-by: Alexander Potapenko <glider(a)google.com> Reported-by: Walter Wu <walter-zh.wu(a)mediatek.com> Cc: Dmitry Vyukov <dvyukov(a)google.com> Cc: Matthias Brugger <matthias.bgg(a)gmail.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Josh Poimboeuf <jpoimboe(a)redhat.com> Cc: Kate Stewart <kstewart(a)linuxfoundation.org> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/lib/stackdepot.c b/lib/stackdepot.c index ed717dd08ff3..81c69c08d1d1 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -83,15 +83,19 @@ static bool init_stack_slab(void **prealloc) return true; if (stack_slabs[depot_index] == NULL) { stack_slabs[depot_index] = *prealloc; + *prealloc = NULL; } else { - stack_slabs[depot_index + 1] = *prealloc; + /* If this is the last depot slab, do not touch the next one. */ + if (depot_index + 1 < STACK_ALLOC_MAX_SLABS) { + stack_slabs[depot_index + 1] = *prealloc; + *prealloc = NULL; + } /* * This smp_store_release pairs with smp_load_acquire() from * |next_slab_inited| above and in stack_depot_save(). */ smp_store_release(&next_slab_inited, 1); } - *prealloc = NULL; return true; }

4 years, 10 months

3
2
0 0

FAILED: patch "[PATCH] usb: dwc2: Fix in ISOC request length checking" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 860ef6cd3f90b84a1832f8a6485c90c34d3b588b Mon Sep 17 00:00:00 2001 From: Minas Harutyunyan <Minas.Harutyunyan(a)synopsys.com> Date: Tue, 21 Jan 2020 14:24:04 +0400 Subject: [PATCH] usb: dwc2: Fix in ISOC request length checking Moved ISOC request length checking from dwc2_hsotg_start_req() function to dwc2_hsotg_ep_queue(). Fixes: 4fca54aa58293 ("usb: gadget: s3c-hsotg: add multi count support") Signed-off-by: Minas Harutyunyan <hminas(a)synopsys.com> Signed-off-by: Felipe Balbi <balbi(a)kernel.org> diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 88f7d6d4ff2d..7b40cf5bdc2f 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -1083,11 +1083,6 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg, else packets = 1; /* send one packet if length is zero. */ - if (hs_ep->isochronous && length > (hs_ep->mc * hs_ep->ep.maxpacket)) { - dev_err(hsotg->dev, "req length > maxpacket*mc\n"); - return; - } - if (dir_in && index != 0) if (hs_ep->isochronous) epsize = DXEPTSIZ_MC(packets); @@ -1391,6 +1386,13 @@ static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, req->actual = 0; req->status = -EINPROGRESS; + /* Don't queue ISOC request if length greater than mps*mc */ + if (hs_ep->isochronous && + req->length > (hs_ep->mc * hs_ep->ep.maxpacket)) { + dev_err(hs->dev, "req length > maxpacket*mc\n"); + return -EINVAL; + } + /* In DDMA mode for ISOC's don't queue request if length greater * than descriptor limits. */

4 years, 10 months

1
0
0 0

FAILED: patch "[PATCH] usb: dwc2: Fix in ISOC request length checking" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 860ef6cd3f90b84a1832f8a6485c90c34d3b588b Mon Sep 17 00:00:00 2001 From: Minas Harutyunyan <Minas.Harutyunyan(a)synopsys.com> Date: Tue, 21 Jan 2020 14:24:04 +0400 Subject: [PATCH] usb: dwc2: Fix in ISOC request length checking Moved ISOC request length checking from dwc2_hsotg_start_req() function to dwc2_hsotg_ep_queue(). Fixes: 4fca54aa58293 ("usb: gadget: s3c-hsotg: add multi count support") Signed-off-by: Minas Harutyunyan <hminas(a)synopsys.com> Signed-off-by: Felipe Balbi <balbi(a)kernel.org> diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 88f7d6d4ff2d..7b40cf5bdc2f 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -1083,11 +1083,6 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg, else packets = 1; /* send one packet if length is zero. */ - if (hs_ep->isochronous && length > (hs_ep->mc * hs_ep->ep.maxpacket)) { - dev_err(hsotg->dev, "req length > maxpacket*mc\n"); - return; - } - if (dir_in && index != 0) if (hs_ep->isochronous) epsize = DXEPTSIZ_MC(packets); @@ -1391,6 +1386,13 @@ static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, req->actual = 0; req->status = -EINPROGRESS; + /* Don't queue ISOC request if length greater than mps*mc */ + if (hs_ep->isochronous && + req->length > (hs_ep->mc * hs_ep->ep.maxpacket)) { + dev_err(hs->dev, "req length > maxpacket*mc\n"); + return -EINVAL; + } + /* In DDMA mode for ISOC's don't queue request if length greater * than descriptor limits. */

4 years, 10 months

1
0
0 0

FAILED: patch "[PATCH] usb: dwc2: Fix in ISOC request length checking" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 860ef6cd3f90b84a1832f8a6485c90c34d3b588b Mon Sep 17 00:00:00 2001 From: Minas Harutyunyan <Minas.Harutyunyan(a)synopsys.com> Date: Tue, 21 Jan 2020 14:24:04 +0400 Subject: [PATCH] usb: dwc2: Fix in ISOC request length checking Moved ISOC request length checking from dwc2_hsotg_start_req() function to dwc2_hsotg_ep_queue(). Fixes: 4fca54aa58293 ("usb: gadget: s3c-hsotg: add multi count support") Signed-off-by: Minas Harutyunyan <hminas(a)synopsys.com> Signed-off-by: Felipe Balbi <balbi(a)kernel.org> diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 88f7d6d4ff2d..7b40cf5bdc2f 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -1083,11 +1083,6 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg, else packets = 1; /* send one packet if length is zero. */ - if (hs_ep->isochronous && length > (hs_ep->mc * hs_ep->ep.maxpacket)) { - dev_err(hsotg->dev, "req length > maxpacket*mc\n"); - return; - } - if (dir_in && index != 0) if (hs_ep->isochronous) epsize = DXEPTSIZ_MC(packets); @@ -1391,6 +1386,13 @@ static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, req->actual = 0; req->status = -EINPROGRESS; + /* Don't queue ISOC request if length greater than mps*mc */ + if (hs_ep->isochronous && + req->length > (hs_ep->mc * hs_ep->ep.maxpacket)) { + dev_err(hs->dev, "req length > maxpacket*mc\n"); + return -EINVAL; + } + /* In DDMA mode for ISOC's don't queue request if length greater * than descriptor limits. */

4 years, 10 months

1
0
0 0

[PATCH 1/2] drm/i915/gt: Detect if we miss WaIdleLiteRestore

by Chris Wilson

Upstream: 82c69bf58650 ("drm/i915/gt: Detect if we miss WaIdleLiteRestore") In order to avoid confusing the HW, we must never submit an empty ring during lite-restore, that is we should always advance the RING_TAIL before submitting to stay ahead of the RING_HEAD. Normally this is prevented by keeping a couple of spare NOPs in the request->wa_tail so that on resubmission we can advance the tail. This relies on the request only being resubmitted once, which is the normal condition as it is seen once for ELSP[1] and then later in ELSP[0]. On preemption, the requests are unwound and the tail reset back to the normal end point (as we know the request is incomplete and therefore its RING_HEAD is even earlier). However, if this w/a should fail we would try and resubmit the request with the RING_TAIL already set to the location of this request's wa_tail potentially causing a GPU hang. We can spot when we do try and incorrectly resubmit without advancing the RING_TAIL and spare any embarrassment by forcing the context restore. In the case of preempt-to-busy, we leave the requests running on the HW while we unwind. As the ring is still live, we cannot rewind our rq->tail without forcing a reload so leave it set to rq->wa_tail and only force a reload if we resubmit after a lite-restore. (Normally, the forced reload will be a part of the preemption event.) Fixes: 22b7a426bbe1 ("drm/i915/execlists: Preempt-to-busy") Closes: https://gitlab.freedesktop.org/drm/intel/issues/673 Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala(a)linux.intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> Cc: stable(a)kernel.vger.org #5.3+ Link: https://patchwork.freedesktop.org/patch/msgid/20191209023215.3519970-1-chri… --- drivers/gpu/drm/i915/gt/intel_lrc.c | 42 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index 4949b5ad860f..e0e4f3deb2da 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -471,12 +471,6 @@ lrc_descriptor(struct intel_context *ce, struct intel_engine_cs *engine) return desc; } -static void unwind_wa_tail(struct i915_request *rq) -{ - rq->tail = intel_ring_wrap(rq->ring, rq->wa_tail - WA_TAIL_BYTES); - assert_ring_tail_valid(rq->ring, rq->tail); -} - static struct i915_request * __unwind_incomplete_requests(struct intel_engine_cs *engine) { @@ -495,7 +489,6 @@ __unwind_incomplete_requests(struct intel_engine_cs *engine) continue; /* XXX */ __i915_request_unsubmit(rq); - unwind_wa_tail(rq); /* * Push the request back into the queue for later resubmission. @@ -650,13 +643,29 @@ execlists_schedule_out(struct i915_request *rq) i915_request_put(rq); } -static u64 execlists_update_context(const struct i915_request *rq) +static u64 execlists_update_context(struct i915_request *rq) { struct intel_context *ce = rq->hw_context; - u64 desc; + u64 desc = ce->lrc_desc; + u32 tail; - ce->lrc_reg_state[CTX_RING_TAIL + 1] = - intel_ring_set_tail(rq->ring, rq->tail); + /* + * WaIdleLiteRestore:bdw,skl + * + * We should never submit the context with the same RING_TAIL twice + * just in case we submit an empty ring, which confuses the HW. + * + * We append a couple of NOOPs (gen8_emit_wa_tail) after the end of + * the normal request to be able to always advance the RING_TAIL on + * subsequent resubmissions (for lite restore). Should that fail us, + * and we try and submit the same tail again, force the context + * reload. + */ + tail = intel_ring_set_tail(rq->ring, rq->tail); + if (unlikely(ce->lrc_reg_state[CTX_RING_TAIL + 1] == tail)) + desc |= CTX_DESC_FORCE_RESTORE; + ce->lrc_reg_state[CTX_RING_TAIL + 1] = tail; + rq->tail = rq->wa_tail; /* * Make sure the context image is complete before we submit it to HW. @@ -675,7 +684,6 @@ static u64 execlists_update_context(const struct i915_request *rq) */ mb(); - desc = ce->lrc_desc; ce->lrc_desc &= ~CTX_DESC_FORCE_RESTORE; return desc; @@ -1150,16 +1158,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine) if (!list_is_last(&last->sched.link, &engine->active.requests)) return; - - /* - * WaIdleLiteRestore:bdw,skl - * Apply the wa NOOPs to prevent - * ring:HEAD == rq:TAIL as we resubmit the - * request. See gen8_emit_fini_breadcrumb() for - * where we prepare the padding after the - * end of the request. - */ - last->tail = last->wa_tail; } } -- 2.25.1

4 years, 10 months

2
2
0 0

[PATCH 5.4 000/344] 5.4.22-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.22 release. There are 344 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun, 23 Feb 2020 07:19:49 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.22-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.22-rc1 Coly Li <colyli(a)suse.de> bcache: properly initialize 'path' and 'err' in register_bcache() Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/display: handle multiple numbers of fclks in dcn_calcs.c (v2) Niklas Schnelle <schnelle(a)linux.ibm.com> s390/pci: Recover handle in clp_set_pci_fn() Ido Schimmel <idosch(a)mellanox.com> mlxsw: spectrum_dpipe: Add missing error path Miklos Szeredi <mszeredi(a)redhat.com> fuse: don't overflow LLONG_MAX with end offset Michael S. Tsirkin <mst(a)redhat.com> virtio_balloon: prevent pfn array overflow Steve French <stfrench(a)microsoft.com> cifs: log warning message (once) if out of disk space Maciej Fijalkowski <maciej.fijalkowski(a)intel.com> i40e: Relax i40e_xsk_wakeup's return value when PF is busy Vasily Averin <vvs(a)virtuozzo.com> help_next should increase position index Wenwen Wang <wenwen(a)cs.uga.edu> NFS: Fix memory leaks Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency Zhiqiang Liu <liuzhiqiang26(a)huawei.com> brd: check and limit max_part par Shubhrajyoti Datta <shubhrajyoti.datta(a)xilinx.com> microblaze: Prevent the overflow of the start Peter Zijlstra <peterz(a)infradead.org> asm-generic/tlb: add missing CONFIG symbol Andrei Otcheretianski <andrei.otcheretianski(a)intel.com> iwlwifi: mvm: Check the sta is not NULL in iwl_mvm_cfg_he_sta() Andrei Otcheretianski <andrei.otcheretianski(a)intel.com> iwlwifi: mvm: Fix thermal zone registration Christoph Hellwig <hch(a)lst.de> nvme-pci: remove nvmeq->tags Amol Grover <frextrite(a)gmail.com> nvmet: Pass lockdep expression to RCU lists Zenghui Yu <yuzenghui(a)huawei.com> irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL Coly Li <colyli(a)suse.de> bcache: fix incorrect data type usage in btree_flush_write() Coly Li <colyli(a)suse.de> bcache: explicity type cast in bset_bkey_last() Coly Li <colyli(a)suse.de> bcache: fix memory corruption in bch_cache_accounting_clear() Yunfeng Ye <yeyunfeng(a)huawei.com> reiserfs: prevent NULL pointer dereference in reiserfs_insert_item() Nathan Chancellor <natechancellor(a)gmail.com> lib/scatterlist.c: adjust indentation in __sg_alloc_table wangyan <wangyan122(a)huawei.com> ocfs2: fix a NULL pointer dereference when call ocfs2_update_inode_fsync_trans() Masahiro Yamada <masahiroy(a)kernel.org> ocfs2: make local header paths relative to C files Josef Bacik <josef(a)toxicpanda.com> btrfs: do not do delalloc reservation under page lock Alexandre Ghiti <alex(a)ghiti.fr> powerpc: Do not consider weak unresolved symbol relocations as bad Daniel Vetter <daniel.vetter(a)ffwll.ch> radeon: insert 10ms sleep in dce5_crtc_load_lut Vasily Averin <vvs(a)virtuozzo.com> trigger_next should increase position index Vasily Averin <vvs(a)virtuozzo.com> ftrace: fpid_next() should increase position index Gustavo A. R. Silva <gustavo(a)embeddedor.com> char: hpet: Fix out-of-bounds read bug Ben Skeggs <bskeggs(a)redhat.com> drm/nouveau/disp/nv50-: prevent oops when no channel method map provided Marc Zyngier <maz(a)kernel.org> irqchip/gic-v3: Only provision redistributors that are enabled in ACPI Dor Askayo <dor.askayo(a)gmail.com> drm/amd/display: do not allocate display_mode_lib unnecessarily Arnd Bergmann <arnd(a)arndb.de> rbd: work around -Wuninitialized warning Xiubo Li <xiubli(a)redhat.com> ceph: check availability of mds cluster on mount after wait timeout Christophe Leroy <christophe.leroy(a)c-s.fr> powerpc/mm: Don't log user reads to 0xffffffff Vasily Averin <vvs(a)virtuozzo.com> bpf: map_seq_next should always increase position index Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: fix NULL dereference in match_prepath Paulo Alcantara (SUSE) <pc(a)cjr.nz> cifs: Fix mount options set in automount Steve French <stfrench(a)microsoft.com> cifs: fix unitialized variable poential problem with network I/O cache lock patch Colin Ian King <colin.king(a)canonical.com> iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop Yan-Hsuan Chuang <yhchuang(a)realtek.com> rtw88: fix potential NULL skb access in TX ISR Nathan Chancellor <natechancellor(a)gmail.com> hostap: Adjust indentation in prism2_hostapd_add_sta Nicola Lunghi <nick83ola(a)gmail.com> ALSA: usb-audio: add quirks for Line6 Helix devices fw>=2.82 Vincenzo Frascino <vincenzo.frascino(a)arm.com> ARM: 8951/1: Fix Kexec compilation issue. Oliver O'Halloran <oohall(a)gmail.com> selftests/eeh: Bump EEH wait time to 60s Michael Bringmann <mwb(a)linux.ibm.com> powerpc/pseries/lparcfg: Fix display of Maximum Memory zhangyi (F) <yi.zhang(a)huawei.com> jbd2: make sure ESHUTDOWN to be recorded in the journal superblock zhangyi (F) <yi.zhang(a)huawei.com> jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record Lorenz Bauer <lmb(a)cloudflare.com> selftests: bpf: Reset global state between reuseport test runs Stephen Boyd <swboyd(a)chromium.org> alarmtimer: Make alarmtimer platform device child of RTC device Lu Baolu <baolu.lu(a)linux.intel.com> iommu/vt-d: Remove unnecessary WARN_ON_ONCE() Coly Li <colyli(a)suse.de> bcache: fix use-after-free in register_bcache() Christoph Hellwig <hch(a)lst.de> bcache: rework error unwinding in register_bcache Liang Chen <liangchen.linux(a)gmail.com> bcache: cached_dev_free needs to put the sb page Nikolay Borisov <nborisov(a)suse.com> btrfs: Fix split-brain handling when changing FSID to metadata uuid David Sterba <dsterba(a)suse.com> btrfs: separate definition of assertion failure handlers Sergey Zakharchenko <szakharchenko(a)digital-loggers.com> media: uvcvideo: Add a quirk to force GEO GC6500 Camera bits-per-pixel value Oliver O'Halloran <oohall(a)gmail.com> powerpc/sriov: Remove VF eeh_dev state when disabling SR-IOV Ben Skeggs <bskeggs(a)redhat.com> drm/nouveau/mmu: fix comptag memory leak Trond Myklebust <trondmy(a)gmail.com> sunrpc: Fix potential leaks in sunrpc_cache_unhash() Peter Große <pegro(a)friiks.de> ALSA: hda - Add docking station support for Lenovo Thinkpad T420s Chris Down <chris(a)chrisdown.name> bpf, btf: Always output invariant hit in pahole DWARF to BTF transform Colin Ian King <colin.king(a)canonical.com> driver core: platform: fix u32 greater or equal to zero comparison Vasily Gorbik <gor(a)linux.ibm.com> s390/ftrace: generate traced function stack frame Vasily Gorbik <gor(a)linux.ibm.com> s390: adjust -mpacked-stack support check for clang 10 Masami Hiramatsu <mhiramat(a)kernel.org> x86/decoder: Add TEST opcode to Group3-2 Shile Zhang <shile.zhang(a)linux.alibaba.com> objtool: Fix ARCH=x86_64 build error Masahiro Yamada <masahiroy(a)kernel.org> kbuild: use -S instead of -E for precise cc-option test in Kconfig Michael Walle <michael(a)walle.cc> spi: spi-fsl-qspi: Ensure width is respected in spi-mem operations Kai Vehmanen <kai.vehmanen(a)linux.intel.com> ALSA: hda/hdmi - add retry logic to parse_intel_hdmi() John Garry <john.garry(a)huawei.com> irqchip/mbigen: Set driver .suppress_bind_attrs to avoid remove problems Enric Balletbo i Serra <enric.balletbo(a)collabora.com> regulator: core: Fix exported symbols to the exported GPL version Brandon Maier <brandon.maier(a)rockwellcollins.com> remoteproc: Initialize rproc_class before use Jessica Yu <jeyu(a)kernel.org> module: avoid setting info->name early in case we can fall back to info->mod->name Anand Jain <anand.jain(a)oracle.com> btrfs: device stats, log when stats are zeroed David Sterba <dsterba(a)suse.com> btrfs: safely advance counter when looking up bio csums Johannes Thumshirn <jth(a)kernel.org> btrfs: fix possible NULL-pointer dereference in integrity checks yu kuai <yukuai3(a)huawei.com> pwm: Remove set but not set variable 'pwm' Dan Carpenter <dan.carpenter(a)oracle.com> ide: serverworks: potential overflow in svwks_set_pio_mode() Dan Carpenter <dan.carpenter(a)oracle.com> cmd64x: potential buffer overflow in cmd64x_program_timings() Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional Ard Biesheuvel <ardb(a)kernel.org> x86/mm: Fix NX bit clearing issue in kernel_map_pages_in_pgd Chao Yu <chao(a)kernel.org> f2fs: fix memleak of kobject Enric Balletbo i Serra <enric.balletbo(a)collabora.com> regulator: vctrl-regulator: Avoid deadlock getting and setting the voltage Cezary Rojewski <cezary.rojewski(a)intel.com> ASoC: SOF: Intel: hda: Fix SKL dai count Marco Elver <elver(a)google.com> debugobjects: Fix various data races Hanjun Guo <guohanjun(a)huawei.com> ACPI/IORT: Fix 'Number of IDs' handling in iort_id_map() Thomas Gleixner <tglx(a)linutronix.de> watchdog/softlockup: Enforce that timestamp is valid on boot Kim Phillips <kim.phillips(a)amd.com> perf/x86/amd: Constrain Large Increment per Cycle events Valentin Schneider <valentin.schneider(a)arm.com> sched/topology: Assert non-NUMA topology masks don't (partially) overlap Li Guanglei <guanglei.li(a)unisoc.com> sched/core: Fix size of rq::uclamp initialization Lokesh Vutla <lokeshvutla(a)ti.com> arm64: dts: ti: k3-j721e-main: Add missing power-domains for smmu zhengbin <zhengbin13(a)huawei.com> KVM: PPC: Remove set but not used variable 'ra', 'rs', 'rt' Wei Yongjun <weiyongjun1(a)huawei.com> EDAC/sifive: Fix return value check in ecc_register() Jun Lei <Jun.Lei(a)amd.com> drm/amd/display: fixup DML dependencies Sami Tolvanen <samitolvanen(a)google.com> arm64: fix alternatives with LLVM's integrated assembler Sami Tolvanen <samitolvanen(a)google.com> arm64: lse: fix LSE atomics with LLVM's integrated assembler Leon Romanovsky <leon(a)kernel.org> RDMA/mlx5: Don't fake udata for kernel path Alexander Tsoy <alexander(a)tsoy.me> ALSA: usb-audio: add implicit fb quirk for MOTU M Series Geert Uytterhoeven <geert(a)linux-m68k.org> crypto: essiv - fix AEAD capitalization and preposition use in help text Nick Black <nlb(a)google.com> scsi: iscsi: Don't destroy session if there are outstanding connections Stanley Chu <stanley.chu(a)mediatek.com> scsi: ufs-mediatek: add apply_dev_quirks variant operation Stanley Chu <stanley.chu(a)mediatek.com> scsi: ufs: pass device information to apply_dev_quirks Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: free sysfs kobject Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: set I_LINKABLE early to avoid wrong access by vfs Dan Carpenter <dan.carpenter(a)oracle.com> ALSA: usb-audio: unlock on error in probe Will Deacon <will(a)kernel.org> iommu/arm-smmu-v3: Use WRITE_ONCE() when changing validity of an STE Masahiro Yamada <masahiroy(a)kernel.org> kbuild: remove *.tmp file when filechk fails Tony Lindgren <tony(a)atomide.com> usb: musb: omap2430: Get rid of musb .set_vbus for omap2430 glue Leonard Crestez <leonard.crestez(a)nxp.com> perf/imx_ddr: Fix cpu hotplug state cleanup Navid Emamdoost <navid.emamdoost(a)gmail.com> drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add Stephen Boyd <swboyd(a)chromium.org> gpiolib: Set lockdep class for hierarchical irq domains Mikulas Patocka <mpatocka(a)redhat.com> dm thin: don't allow changing data device during thin-pool reload Ben Skeggs <bskeggs(a)redhat.com> drm/nouveau/fault/gv100-: fix memory leak on module unload YueHaibing <yuehaibing(a)huawei.com> drm/nouveau/drm/ttm: Remove set but not used variable 'mem' YueHaibing <yuehaibing(a)huawei.com> drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler Ben Skeggs <bskeggs(a)redhat.com> drm/nouveau/gr/gk20a,gm200-: add terminators to method lists read from fw Dan Carpenter <dan.carpenter(a)oracle.com> drm/nouveau/secboot/gm20b: initialize pointer in gm20b_secboot_new() Arnd Bergmann <arnd(a)arndb.de> vme: bridges: reduce stack usage Li RongQing <lirongqing(a)baidu.com> bpf: Return -EBADRQC for invalid map type in __bpf_tx_xdp_map Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: SOF: Intel: hda-dai: fix compilation warning in pcm_prepare Geert Uytterhoeven <geert+renesas(a)glider.be> driver core: Print device when resources present in really_probe() Simon Schwartz <kern.simon(a)theschwartz.xyz> driver core: platform: Prevent resouce overflow from causing infinite loops Arnd Bergmann <arnd(a)arndb.de> visorbus: fix uninitialized variable access Luc Van Oostenryck <luc.vanoostenryck(a)gmail.com> misc: xilinx_sdfec: fix xsdfec_poll()'s return type Nathan Chancellor <natechancellor(a)gmail.com> tty: synclink_gt: Adjust indentation in several functions Nathan Chancellor <natechancellor(a)gmail.com> tty: synclinkmp: Adjust indentation in several functions Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/uverbs: Remove needs_kfree_rcu from uverbs_obj_type_class Zhengyuan Liu <liuzhengyuan(a)kylinos.cn> raid6/test: fix a compilation warning Chen Zhou <chenzhou10(a)huawei.com> ASoC: atmel: fix build error with CONFIG_SND_ATMEL_SOC_DMA=m Alexander Tsoy <alexander(a)tsoy.me> ALSA: usb-audio: Add boot quirk for MOTU M Series Johan Jonker <jbx6244(a)gmail.com> ARM: dts: rockchip: add reg property to brcmf sub node for rk3188-bqedison2qc Johan Jonker <jbx6244(a)gmail.com> arm64: dts: rockchip: add reg property to brcmf sub-nodes Johan Jonker <jbx6244(a)gmail.com> arm64: dts: rockchip: fix dwmmc clock name for px30 Bartosz Golaszewski <bgolaszewski(a)baylibre.com> clocksource: davinci: only enable clockevents once tim34 is initialized Arnd Bergmann <arnd(a)arndb.de> wan: ixp4xx_hss: fix compile-testing on 64-bit Changbin Du <changbin.du(a)intel.com> x86/nmi: Remove irq_work from the long duration NMI handler Jonathan Lemon <jonathan.lemon(a)gmail.com> bnxt: Detach page from page pool before sending up the stack Philipp Zabel <p.zabel(a)pengutronix.de> Input: edt-ft5x06 - work around first register access error Paul E. McKenney <paulmck(a)kernel.org> rcu: Use WRITE_ONCE() for assignments to ->pprev for hlist_nulls Ard Biesheuvel <ardb(a)kernel.org> efi/x86: Don't panic or BUG() on non-critical error conditions Dmitry Osipenko <digetx(a)gmail.com> soc/tegra: fuse: Correct straps' address for older Tegra124 device trees Mike Marciniszyn <mike.marciniszyn(a)intel.com> IB/hfi1: Add RcvShortLengthErrCnt to hfi1stats Mike Marciniszyn <mike.marciniszyn(a)intel.com> IB/hfi1: Add software counter for ctxt0 seq drop Arnd Bergmann <arnd(a)arndb.de> staging: rtl8188: avoid excessive stack usage Yongqiang Niu <yongqiang.niu(a)mediatek.com> drm/mediatek: Add gamma property according to hardware capability Jan Kara <jack(a)suse.cz> udf: Fix free space reporting for metadata and virtual partitions Shuah Khan <skhan(a)linuxfoundation.org> usbip: Fix unsafe unaligned pointer usage Benjamin Gaignard <benjamin.gaignard(a)st.com> ARM: dts: stm32: Add power-supply for DSI panel on stm32f469-disco Dmitry Torokhov <dmitry.torokhov(a)gmail.com> usb: dwc3: use proper initializers for property entries Dingchen Zhang <dingchen.zhang(a)amd.com> drm: remove the newline for CRC source name. Wenpeng Liang <liangwenpeng(a)huawei.com> RDMA/hns: Avoid printing address of mtt page Arnd Bergmann <arnd(a)arndb.de> mlx5: work around high stack usage with gcc Felix Kuehling <Felix.Kuehling(a)amd.com> drm/amdkfd: Fix permissions of hang_hws Jacob Pan <jacob.jun.pan(a)linux.intel.com> iommu/vt-d: Avoid sending invalid page response Jacob Pan <jacob.jun.pan(a)linux.intel.com> iommu/vt-d: Match CPU and IOMMU paging mode Jason Ekstrand <jason(a)jlekstrand.net> ACPI: button: Add DMI quirk for Razer Blade Stealth 13 late 2019 lid switch Shile Zhang <shile.zhang(a)linux.alibaba.com> x86/unwind/orc: Fix !CONFIG_MODULES build warning Sam McNally <sammc(a)chromium.org> ASoC: Intel: sof_rt5682: Ignore the speaker amp when there isn't one. Alexey Kardashevskiy <aik(a)ozlabs.ru> vfio/spapr/nvlink2: Skip unpinning pages on error exit Andrey Zhizhikin <andrey.z(a)gmail.com> tools lib api fs: Fix gcc9 stringop-truncation compilation error Dmitry Torokhov <dmitry.torokhov(a)gmail.com> net: phy: fixed_phy: fix use-after-free when checking link GPIO Takashi Iwai <tiwai(a)suse.de> ALSA: sh: Fix compile warning wrt const Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek - Apply mic mute LED quirk for Dell E7xx laptops, too Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> clk: uniphier: Add SCSSI clock gate for each channel Stephen Boyd <sboyd(a)kernel.org> clk: Use parent node pointer during registration if necessary Takashi Iwai <tiwai(a)suse.de> ALSA: sh: Fix unused variable warnings Icenowy Zheng <icenowy(a)aosc.io> clk: sunxi-ng: add mux and pll notifiers for A64 CPU clock Jiewei Ke <kejiewei.cn(a)gmail.com> RDMA/rxe: Fix error type of mmap_offset Peter Rosin <peda(a)axentia.se> fbdev: fix numbering of fbcon options Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: soc-topology: fix endianness issues Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> reset: uniphier: Add SCSSI reset control for each channel Geert Uytterhoeven <geert+renesas(a)glider.be> pinctrl: sh-pfc: sh7269: Fix CAN function GPIOs Manasi Navare <manasi.d.navare(a)intel.com> drm/fbdev: Fallback to non tiled mode if all tiles not present Chanwoo Choi <cw00.choi(a)samsung.com> PM / devfreq: rk3399_dmc: Add COMPILE_TEST and HAVE_ARM_SMCCC dependency Arnd Bergmann <arnd(a)arndb.de> PM / devfreq: exynos-ppmu: Fix excessive stack usage Valdis Kletnieks <valdis.kletnieks(a)vt.edu> x86/vdso: Provide missing include file Vinay Kumar Yadav <vinay.yadav(a)chelsio.com> crypto: chtls - Fixed memory leak Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: phy: realtek: add logging for the RGMII TX delay configuration Hechao Li <hechaol(a)fb.com> bpf: Print error message for bpftool cgroup show Sascha Hauer <s.hauer(a)pengutronix.de> dmaengine: imx-sdma: Fix memory leak Logan Gunthorpe <logang(a)deltatee.com> dmaengine: Store module owner in dma_device struct Jerome Brunet <jbrunet(a)baylibre.com> clk: actually call the clock init before any other callback of the clock Qian Cai <cai(a)lca.pw> iommu/iova: Silence warnings under memory pressure Suravee Suthikulpanit <suravee.suthikulpanit(a)amd.com> iommu/amd: Only support x2APIC with IVHD type 11h/40h Suravee Suthikulpanit <suravee.suthikulpanit(a)amd.com> iommu/amd: Check feature support bit before accessing MSI capability registers Bjorn Andersson <bjorn.andersson(a)linaro.org> arm64: dts: qcom: db845c: Enable ath10k 8bit host-cap quirk James Smart <jsmart2021(a)gmail.com> scsi: lpfc: Fix: Rework setting of fdmi symbolic node name registration Jaihind Yadav <jaihindyadav(a)codeaurora.org> selinux: ensure we cleanup the internal AVC counters on error in avc_update() Geert Uytterhoeven <geert+renesas(a)glider.be> ARM: dts: r8a7779: Add device node for ARM global timer Sergei Shtylyov <sergei.shtylyov(a)cogentembedded.com> clk: renesas: rcar-gen3: Allow changing the RPC[D2] clocks Bibby Hsieh <bibby.hsieh(a)mediatek.com> drm/mediatek: handle events when enabling/disabling crtc Brendan Higgins <brendanhiggins(a)google.com> crypto: inside-secure - add unspecified HAS_IOMEM dependency Nathan Chancellor <natechancellor(a)gmail.com> scsi: aic7xxx: Adjust indentation in ahc_find_syncrate Can Guo <cang(a)codeaurora.org> scsi: ufs: Complete pending requests in host reset and restore path Trond Myklebust <trondmy(a)gmail.com> nfsd: Clone should commit src file metadata too Erik Kaneda <erik.kaneda(a)intel.com> ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1 Jeffrey Hugo <jeffrey.l.hugo(a)gmail.com> clk: qcom: smd: Add missing bimc clock Monk Liu <Monk.Liu(a)amd.com> drm/amdgpu: fix KIQ ring test fail in TDR of SRIOV Aditya Pakki <pakki001(a)umn.edu> orinoco: avoid assertion in case of NULL pointer Phong Tran <tranmanphong(a)gmail.com> rtlwifi: rtl_pci: Fix -Wcast-function-type Phong Tran <tranmanphong(a)gmail.com> iwlegacy: Fix -Wcast-function-type Phong Tran <tranmanphong(a)gmail.com> ipw2x00: Fix -Wcast-function-type Phong Tran <tranmanphong(a)gmail.com> b43legacy: Fix -Wcast-function-type James Sewart <jamessewart(a)arista.com> PCI: Add DMA alias quirk for PLX PEX NTB James Sewart <jamessewart(a)arista.com> PCI: Add nr_devfns parameter to pci_add_dma_alias() Nathan Chancellor <natechancellor(a)gmail.com> ALSA: usx2y: Adjust indentation in snd_usX2Y_hwdep_dsp_status Xin Long <lucien.xin(a)gmail.com> netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policy Tero Kristo <t-kristo(a)ti.com> ARM: OMAP2+: pdata-quirks: add PRM data for reset support Arnd Bergmann <arnd(a)arndb.de> isdn: don't mark kcapi_proc_exit as __exit Aditya Pakki <pakki001(a)umn.edu> fore200e: Fix incorrect checks of NULL pointer dereference Heiner Kallweit <hkallweit1(a)gmail.com> r8169: check that Realtek PHY driver module is loaded Toke Høiland-Jørgensen <toke(a)redhat.com> samples/bpf: Set -fno-stack-protector when building BPF programs Jan Kara <jack(a)suse.cz> reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling Nathan Chancellor <natechancellor(a)gmail.com> media: v4l2-device.h: Explicitly compare grp{id,mask} to zero in v4l2_device macros Willem de Bruijn <willemb(a)google.com> selftests/net: make so_txtime more robust to timer variance Paul Cercueil <paul(a)crapouillou.net> gpu/drm: ingenic: Avoid null pointer deference in plane atomic update Jakub Kicinski <jakub.kicinski(a)netronome.com> Revert "nfp: abm: fix memory leak in nfp_abm_u32_knode_replace" Daniel Drake <drake(a)endlessm.com> PCI: Increase D3 delay for AMD Ryzen5/7 XHCI controllers Daniel Drake <drake(a)endlessm.com> PCI: Add generic quirk for increasing D3hot delay Forest Crossman <cyrozap(a)gmail.com> media: cx23885: Add support for AVerMedia CE310B Wei Liu <wei.liu(a)kernel.org> PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Implement quirk handling for CLKDM_NOAUTO Andrey Smirnov <andrew.smirnov(a)gmail.com> ARM: dts: imx6: rdu2: Limit USBH1 to Full Speed Andrey Smirnov <andrew.smirnov(a)gmail.com> ARM: dts: imx6: rdu2: Disable WP for USDHC2 and USDHC3 Krzysztof Kozlowski <krzk(a)kernel.org> ARM: exynos_defconfig: Bring back explicitly wanted options Abel Vesa <abel.vesa(a)nxp.com> clk: imx: Add correct failure handling for clk based helpers Daniel Jordan <daniel.m.jordan(a)oracle.com> padata: always acquire cpu_hotplug_lock before pinst->lock Daniel Jordan <daniel.m.jordan(a)oracle.com> padata: validate cpumask without removed CPU during offline Manu Gautam <mgautam(a)codeaurora.org> arm64: dts: qcom: msm8996: Disable USB2 PHY suspend by core Paul Moore <paul(a)paul-moore.com> selinux: ensure we cleanup the internal AVC counters on error in avc_insert() Viresh Kumar <viresh.kumar(a)linaro.org> opp: Free static OPPs on errors while adding them Andre Przywara <andre.przywara(a)arm.com> arm: dts: allwinner: H3: Add PMU node Andre Przywara <andre.przywara(a)arm.com> arm64: dts: allwinner: H5: Add PMU node Andre Przywara <andre.przywara(a)arm.com> arm64: dts: allwinner: H6: Add PMU mode Mao Wenan <maowenan(a)huawei.com> NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu(). Rasmus Villemoes <linux(a)rasmusvillemoes.dk> net/wan/fsl_ucc_hdlc: reject muram offsets above 64K Miquel Raynal <miquel.raynal(a)bootlin.com> regulator: rk808: Lower log level on optional GPIOs being not available Sathyanarayana Nujella <sathyanarayana.nujella(a)intel.com> ASoC: intel: sof_rt5682: Add support for tgl-max98357a-rt5682 Sathyanarayana Nujella <sathyanarayana.nujella(a)intel.com> ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAI's Masami Hiramatsu <mhiramat(a)kernel.org> modules: lockdep: Suppress suspicious RCU usage warning Robin Murphy <robin.murphy(a)arm.com> arm64: dts: rockchip: Fix NanoPC-T4 cooling maps Adam Ford <aford173(a)gmail.com> drm/panel: simple: Add Logic PD Type 28 display support Nathan Chancellor <natechancellor(a)gmail.com> drm/amdgpu: Ensure ret is always initialized when using SOC15_WAIT_ON_RREG Wen Gong <wgong(a)codeaurora.org> ath10k: correct the tlv len of ath10k_wmi_tlv_op_gen_config_pno_start yu kuai <yukuai3(a)huawei.com> drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_info_from_object_table Jakub Sitnicki <jakub(a)cloudflare.com> bpf, sockhash: Synchronize_rcu before free'ing map Yong Zhao <Yong.Zhao(a)amd.com> drm/amdkfd: Fix a bug in SDMA RLC queue counting under HWS mode Douglas Anderson <dianders(a)chromium.org> clk: qcom: rcg2: Don't crash if our parent can't be found; return an error Stephen Boyd <sboyd(a)kernel.org> clk: qcom: Don't overwrite 'cfg' in clk_rcg2_dfs_populate_freq() Masahiro Yamada <masahiroy(a)kernel.org> kconfig: fix broken dependency in randconfig-generated .config Paolo Valente <paolo.valente(a)linaro.org> block, bfq: do not plug I/O for bfq_queues with no proc refs Colin Ian King <colin.king(a)canonical.com> drivers/block/zram/zram_drv.c: fix error return codes not being returned in writeback_store Chris Mason <clm(a)fb.com> Btrfs: keep pages dirty when using btrfs_writepage_fixup_worker Christian Borntraeger <borntraeger(a)de.ibm.com> KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups Sun Ke <sunke32(a)huawei.com> nbd: add a flush_workqueue in nbd_start_device Tom Zanussi <zanussi(a)kernel.org> tracing: Simplify assignment parsing for hist triggers Harry Wentland <harry.wentland(a)amd.com> drm/amd/display: Retrain dongles when SINK_COUNT becomes non-zero Geert Uytterhoeven <geert(a)linux-m68k.org> rtc: i2c/spi: Avoid inclusion of REGMAP support when not needed Matthieu Baerts <matthieu.baerts(a)tessares.net> selftests: settings: tests can be in subsubdirs Jean-Philippe Brucker <jean-philippe(a)linaro.org> brcmfmac: sdio: Fix OOB interrupt initialization on brcm43362 Ping-Ke Shih <pkshih(a)realtek.com> rtw88: fix rate mask for 1SS chip Rakesh Pillai <pillair(a)codeaurora.org> ath10k: Correct the DMA direction for management tx buffers zhangyi (F) <yi.zhang(a)huawei.com> ext4, jbd2: ensure panic when aborting with zero errno Vincenzo Frascino <vincenzo.frascino(a)arm.com> ARM: 8952/1: Disable kmemleak on XIP kernels Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing: Fix very unlikely race of registering two stat tracers Luis Henriques <luis.henriques(a)canonical.com> tracing: Fix tracing_stat return values in error handling paths Oliver O'Halloran <oohall(a)gmail.com> powerpc/iov: Move VF pdev fixup into pcibios_fixup_iov() Niklas Schnelle <schnelle(a)linux.ibm.com> s390/pci: Fix possible deadlock in recover_store() Martin Schiller <ms(a)dev.tdt.de> wan/hdlc_x25: fix skb handling Chen Zhou <chenzhou10(a)huawei.com> dmaengine: fsl-qdma: fix duplicated argument to && Jan Kara <jack(a)suse.cz> udf: Allow writing to 'Rewritable' partitions Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: omap-dmtimer: Simplify error handling Arvind Sankar <nivedita(a)alum.mit.edu> x86/sysfb: Fix check for bad VRAM size Grygorii Strashko <grygorii.strashko(a)ti.com> clk: ti: dra7: fix parent for gmac_clkctrl Eric Biggers <ebiggers(a)google.com> ext4: fix deadlock allocating bio_post_read_ctx from mempool Kai Li <li.kai4(a)h3c.com> jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load journal Siddhesh Poyarekar <siddhesh(a)gotplt.org> kselftest: Minimise dependency of get_size on C library interfaces Amanda Liu <amanda.liu(a)amd.com> drm/amd/display: Clear state after exiting fixed active VRR state Colin Ian King <colin.king(a)canonical.com> clocksource/drivers/bcm2835_timer: Fix memory leak of timer John Keeping <john(a)metanate.com> usb: dwc2: Fix IN FIFO allocation Jia-Ju Bai <baijiaju1990(a)gmail.com> usb: gadget: udc: fix possible sleep-in-atomic-context bugs in gr_probe() Colin Ian King <colin.king(a)canonical.com> drm/nouveau/nouveau: fix incorrect sizeof on args.src an args.dst Philippe Schenker <philippe.schenker(a)toradex.com> spi: fsl-lpspi: fix only one cs-gpio working Tiecheng Zhou <Tiecheng.Zhou(a)amd.com> drm/amdgpu/sriov: workaround on rev_id for Navi12 under sriov Jia-Ju Bai <baijiaju1990(a)gmail.com> uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol() Zhengyuan Liu <liuzhengyuan(a)kylinos.cn> raid6/test: fix a compilation error Linus Walleij <linus.walleij(a)linaro.org> net: ethernet: ixp4xx: Standard module init David S. Miller <davem(a)davemloft.net> sparc: Add .exit.data section. Tiezhu Yang <yangtiezhu(a)loongson.cn> MIPS: Loongson: Fix potential NULL dereference in loongson3_platform_init() Ard Biesheuvel <ardb(a)kernel.org> efi/x86: Map the entire EFI vendor string before copying it Hans de Goede <hdegoede(a)redhat.com> pinctrl: baytrail: Do not clear IRQ flags on direct-irq enabled pins Parav Pandit <parav(a)mellanox.com> IB/core: Let IB core distribute cache update events YueHaibing <yuehaibing(a)huawei.com> kernel/module: Fix memleak in module_add_modinfo_attrs() Jia-Ju Bai <baijiaju1990(a)gmail.com> media: sti: bdisp: fix a possible sleep-in-atomic-context bug in bdisp_device_run() Sergey Senozhatsky <sergey.senozhatsky.work(a)gmail.com> char/random: silence a lockdep splat with printk() Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> x86/fpu: Deactivate FPU state after failure during state load Jacob Pan <jacob.jun.pan(a)linux.intel.com> iommu/vt-d: Fix off-by-one in PASID allocation Jia-Ju Bai <baijiaju1990(a)gmail.com> gpio: gpio-grgpio: fix possible sleep-in-atomic-context bugs in grgpio_irq_map/unmap() Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> clk: meson: meson8b: make the CCF use the glitch-free mali mux Oliver O'Halloran <oohall(a)gmail.com> powerpc/powernv/iov: Ensure the pdn for VFs always contains a valid PE number Eugen Hristev <eugen.hristev(a)microchip.com> clk: at91: sam9x60: fix programmable clock prescaler Chen-Yu Tsai <wens(a)csie.org> media: sun4i-csi: Fix [HV]sync polarity handling Chen-Yu Tsai <wens(a)csie.org> media: sun4i-csi: Fix data sampling polarity handling Chen-Yu Tsai <wens(a)csie.org> media: sun4i-csi: Deal with DRAM offset Eugen Hristev <eugen.hristev(a)microchip.com> media: i2c: mt9v032: fix enum mbus codes and frame sizes Adam Ford <aford173(a)gmail.com> media: ov5640: Fix check for PLL1 exceeding max allowed rate Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> pxa168fb: Fix the function used to release some memory in an error handling path Rob Clark <robdclark(a)chromium.org> drm/msm/adreno: fix zap vs no-zap handling Geert Uytterhoeven <geert+renesas(a)glider.be> drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank() John Ogness <john.ogness(a)linutronix.de> printk: fix exclusive_console replaying Geert Uytterhoeven <geert+renesas(a)glider.be> pinctrl: sh-pfc: sh7264: Fix CAN function GPIOs Vladimir Oltean <olteanv(a)gmail.com> gianfar: Fix TX timestamping with a stacked DSA driver Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: ctl: allow TLV read operation for callback type of element in locked case Ritesh Harjani <riteshh(a)linux.ibm.com> ext4: fix ext4_dax_read/write inode locking sequence for IOCB_NOWAIT Zahari Petkov <zahari(a)balena.io> leds: pca963x: Fix open-drain initialization Nikola Cornij <nikola.cornij(a)amd.com> drm/amd/display: Map ODM memory correctly when doing ODM combine James Sewart <jamessewart(a)arista.com> PCI: Fix pci_add_dma_alias() bitmask size Dan Carpenter <dan.carpenter(a)oracle.com> brcmfmac: Fix use after free in brcmf_sdio_readframes() Navid Emamdoost <navid.emamdoost(a)gmail.com> brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev() Peter Zijlstra <peterz(a)infradead.org> cpu/hotplug, stop_machine: Fix stop_machine vs hotplug order Remi Pommarel <repk(a)triplefau.lt> clk: meson: pll: Fix by 0 division in __pll_params_to_rate() Colin Ian King <colin.king(a)canonical.com> media: meson: add missing allocation failure check on new_buf Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: call f2fs_balance_fs outside of locked page Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: preallocate DIO blocks when forcing buffered_io Marco Elver <elver(a)google.com> rcu: Fix data-race due to atomic_t copy-by-value Rasmus Villemoes <linux(a)rasmusvillemoes.dk> soc: fsl: qe: change return type of cpm_muram_alloc() to s32 Neeraj Upadhyay <neeraju(a)codeaurora.org> rcu: Fix missed wakeup of exp_wq waiters Stefan Reiter <stefan(a)pimaker.at> rcu/nocb: Fix dump_tree hierarchy print always active J. Bruce Fields <bfields(a)redhat.com> nfsd4: avoid NULL deference on strange COPY compounds Markus Elfring <elfring(a)users.sourceforge.net> drm/qxl: Complete exception handling in qxl_device_init() Colin Ian King <colin.king(a)canonical.com> wil6210: fix break that is never reached because of zero'ing of a retry counter Jeffrey Hugo <jeffrey.l.hugo(a)gmail.com> ath10k: Fix qmi init error handling Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> drm/gma500: Fixup fbdev stolen size usage evaluation Davide Caratti <dcaratti(a)redhat.com> net/sched: flower: add missing validation of TCA_FLOWER_FLAGS Davide Caratti <dcaratti(a)redhat.com> net/sched: matchall: add missing validation of TCA_MATCHALL_FLAGS Per Forlin <per.forlin(a)axis.com> net: dsa: tag_qca: Make sure there is headroom for tag Eric Dumazet <edumazet(a)google.com> net/smc: fix leak of kernel memory to user space Firo Yang <firo.yang(a)suse.com> enic: prevent waking up stopped tx queues over watchdog reset Toke Høiland-Jørgensen <toke(a)redhat.com> core: Don't skip generic XDP program execution for cloned SKBs ------------- Diffstat: Documentation/fb/fbcon.rst | 8 +- Makefile | 4 +- arch/Kconfig | 3 + arch/arm/Kconfig | 4 +- arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 7 +- arch/arm/boot/dts/r8a7779.dtsi | 8 ++ arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 + arch/arm/boot/dts/stm32f469-disco.dts | 8 ++ arch/arm/boot/dts/sun8i-h3.dtsi | 15 ++- arch/arm/configs/exynos_defconfig | 6 + arch/arm/mach-omap2/pdata-quirks.c | 8 ++ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 16 ++- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 10 ++ arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 + arch/arm64/boot/dts/rockchip/px30.dtsi | 6 +- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 3 + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 3 + arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 27 ----- arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 3 + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 1 + arch/arm64/include/asm/alternative.h | 32 ++++-- arch/arm64/include/asm/atomic_lse.h | 19 ++++ arch/arm64/include/asm/lse.h | 6 +- arch/microblaze/kernel/cpu/cache.c | 3 +- arch/mips/loongson64/loongson-3/platform.c | 3 + arch/powerpc/Makefile.postlink | 4 +- arch/powerpc/kernel/eeh_driver.c | 6 - arch/powerpc/kernel/pci_dn.c | 15 ++- arch/powerpc/kvm/emulate_loadstore.c | 5 - arch/powerpc/mm/fault.c | 3 + arch/powerpc/platforms/powernv/pci-ioda.c | 48 ++++++-- arch/powerpc/platforms/powernv/pci.c | 18 --- arch/powerpc/platforms/pseries/lparcfg.c | 4 +- arch/powerpc/tools/relocs_check.sh | 20 ++-- arch/s390/Makefile | 2 +- arch/s390/include/asm/pci.h | 2 +- arch/s390/kernel/mcount.S | 15 ++- arch/s390/kvm/interrupt.c | 6 +- arch/s390/pci/pci.c | 2 +- arch/s390/pci/pci_clp.c | 48 ++++---- arch/s390/pci/pci_sysfs.c | 63 +++++++---- arch/sh/include/cpu-sh2a/cpu/sh7269.h | 11 +- arch/sparc/kernel/vmlinux.lds.S | 6 +- arch/x86/entry/vdso/vdso32-setup.c | 1 + arch/x86/events/amd/core.c | 91 +++++++++++----- arch/x86/events/perf_event.h | 2 + arch/x86/include/asm/nmi.h | 1 - arch/x86/kernel/fpu/signal.c | 3 + arch/x86/kernel/nmi.c | 20 ++-- arch/x86/kernel/sysfb_simplefb.c | 2 +- arch/x86/kernel/unwind_orc.c | 3 +- arch/x86/lib/x86-opcode-map.txt | 2 +- arch/x86/mm/pageattr.c | 8 +- arch/x86/platform/efi/efi.c | 41 +++---- arch/x86/platform/efi/efi_64.c | 9 +- block/bfq-iosched.c | 12 ++ crypto/Kconfig | 4 +- drivers/acpi/acpica/dsfield.c | 2 +- drivers/acpi/acpica/dswload.c | 21 ++++ drivers/acpi/arm64/iort.c | 57 +++++++++- drivers/acpi/button.c | 11 ++ drivers/atm/fore200e.c | 25 +++-- drivers/base/dd.c | 5 +- drivers/base/platform.c | 12 +- drivers/block/brd.c | 22 +++- drivers/block/nbd.c | 10 ++ drivers/block/rbd.c | 2 +- drivers/block/zram/zram_drv.c | 3 +- drivers/bus/ti-sysc.c | 10 +- drivers/char/hpet.c | 2 +- drivers/char/random.c | 5 +- drivers/clk/at91/sam9x60.c | 1 + drivers/clk/clk.c | 53 ++++++--- drivers/clk/imx/clk.h | 37 ++++--- drivers/clk/meson/clk-pll.c | 9 ++ drivers/clk/meson/meson8b.c | 11 +- drivers/clk/qcom/clk-rcg2.c | 11 +- drivers/clk/qcom/clk-smd-rpm.c | 3 + drivers/clk/renesas/rcar-gen3-cpg.c | 6 +- drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 28 ++++- drivers/clk/ti/clk-7xx.c | 2 +- drivers/clk/uniphier/clk-uniphier-peri.c | 13 ++- drivers/clocksource/bcm2835_timer.c | 5 +- drivers/clocksource/timer-davinci.c | 8 +- drivers/crypto/Kconfig | 2 +- drivers/crypto/chelsio/chtls/chtls_cm.c | 27 ++--- drivers/crypto/chelsio/chtls/chtls_cm.h | 21 ++++ drivers/crypto/chelsio/chtls/chtls_hw.c | 3 + drivers/devfreq/Kconfig | 3 +- drivers/devfreq/event/Kconfig | 2 +- drivers/devfreq/event/exynos-ppmu.c | 13 ++- drivers/dma/dmaengine.c | 4 +- drivers/dma/fsl-qdma.c | 2 +- drivers/dma/imx-sdma.c | 19 ++-- drivers/edac/sifive_edac.c | 4 +- drivers/gpio/gpio-grgpio.c | 10 +- drivers/gpio/gpiolib.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 19 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 - drivers/gpu/drm/amd/amdgpu/nv.c | 6 + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 1 + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 2 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 +- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 34 ++++-- drivers/gpu/drm/amd/display/dc/core/dc.c | 17 +-- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 16 ++- .../gpu/drm/amd/display/dc/dml/dml_common_defs.c | 2 +- .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 2 +- .../amd/display/dc/{calcs => inc}/dcn_calc_math.h | 0 .../drm/amd/display/modules/freesync/freesync.c | 2 + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 23 ++-- drivers/gpu/drm/drm_client_modeset.c | 72 ++++++++++++ drivers/gpu/drm/drm_debugfs_crc.c | 4 +- drivers/gpu/drm/drm_mipi_dbi.c | 4 +- drivers/gpu/drm/gma500/framebuffer.c | 8 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 16 ++- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 ++- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 11 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 11 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 4 +- drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 4 - drivers/gpu/drm/nouveau/nvkm/core/memory.c | 2 +- .../gpu/drm/nouveau/nvkm/engine/disp/channv50.c | 2 + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 21 ++-- drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c | 1 + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c | 5 +- drivers/gpu/drm/panel/panel-simple.c | 37 +++++++ drivers/gpu/drm/qxl/qxl_kms.c | 2 +- drivers/gpu/drm/radeon/radeon_display.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +- drivers/ide/cmd64x.c | 3 + drivers/ide/serverworks.c | 6 + drivers/infiniband/core/cache.c | 121 +++++++++++++-------- drivers/infiniband/core/core_priv.h | 1 + drivers/infiniband/core/device.c | 33 ++---- drivers/infiniband/core/rdma_core.c | 23 +--- drivers/infiniband/hw/hfi1/chip.c | 11 ++ drivers/infiniband/hw/hfi1/chip.h | 2 + drivers/infiniband/hw/hfi1/chip_registers.h | 1 + drivers/infiniband/hw/hfi1/driver.c | 1 + drivers/infiniband/hw/hfi1/hfi.h | 2 + drivers/infiniband/hw/hns/hns_roce_mr.c | 4 +- drivers/infiniband/hw/mlx5/main.c | 34 +++--- drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +- drivers/input/touchscreen/edt-ft5x06.c | 7 ++ drivers/iommu/amd_iommu.c | 7 +- drivers/iommu/amd_iommu_init.c | 19 ++-- drivers/iommu/amd_iommu_types.h | 2 +- drivers/iommu/arm-smmu-v3.c | 3 +- drivers/iommu/dmar.c | 1 - drivers/iommu/intel-iommu.c | 3 +- drivers/iommu/intel-pasid.c | 12 +- drivers/iommu/intel-svm.c | 9 +- drivers/iommu/iova.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 2 +- drivers/irqchip/irq-gic-v3.c | 9 +- drivers/irqchip/irq-mbigen.c | 1 + drivers/isdn/capi/kcapi_proc.c | 2 +- drivers/leds/leds-pca963x.c | 8 +- drivers/md/bcache/bset.h | 3 +- drivers/md/bcache/journal.c | 3 +- drivers/md/bcache/stats.c | 10 +- drivers/md/bcache/super.c | 79 +++++++++----- drivers/md/dm-thin.c | 18 ++- drivers/media/i2c/mt9v032.c | 10 +- drivers/media/i2c/ov5640.c | 2 +- drivers/media/pci/cx23885/cx23885-cards.c | 24 ++++ drivers/media/pci/cx23885/cx23885-video.c | 3 +- drivers/media/pci/cx23885/cx23885.h | 1 + drivers/media/platform/sti/bdisp/bdisp-hw.c | 6 +- drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 22 ++++ drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h | 4 +- drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 20 +++- drivers/media/usb/uvc/uvc_driver.c | 25 +++++ drivers/media/usb/uvc/uvcvideo.h | 1 + drivers/misc/xilinx_sdfec.c | 10 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 + drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 10 +- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 3 + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 3 +- drivers/net/ethernet/netronome/nfp/abm/cls.c | 14 +-- drivers/net/ethernet/realtek/r8169_main.c | 9 ++ drivers/net/ethernet/xscale/ixp4xx_eth.c | 96 ++++++++-------- drivers/net/phy/fixed_phy.c | 7 +- drivers/net/phy/realtek.c | 19 +++- drivers/net/wan/fsl_ucc_hdlc.c | 5 + drivers/net/wan/hdlc_x25.c | 13 ++- drivers/net/wan/ixp4xx_hss.c | 4 +- drivers/net/wireless/ath/ath10k/snoc.c | 5 +- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 5 +- drivers/net/wireless/ath/ath10k/wmi.c | 2 +- drivers/net/wireless/ath/wil6210/txrx_edma.c | 3 +- drivers/net/wireless/broadcom/b43legacy/main.c | 5 +- .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 +- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 13 ++- drivers/net/wireless/intel/ipw2x00/ipw2100.c | 7 +- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 5 +- drivers/net/wireless/intel/iwlegacy/3945-mac.c | 5 +- drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 +- drivers/net/wireless/intel/iwlegacy/common.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 8 +- drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +- drivers/net/wireless/intersil/hostap/hostap_ap.c | 2 +- .../net/wireless/intersil/orinoco/orinoco_usb.c | 3 +- drivers/net/wireless/realtek/rtlwifi/pci.c | 10 +- drivers/net/wireless/realtek/rtw88/main.c | 12 +- drivers/net/wireless/realtek/rtw88/pci.c | 5 + drivers/nfc/port100.c | 2 +- drivers/nvme/host/pci.c | 23 ++-- drivers/nvme/target/core.c | 6 +- drivers/opp/of.c | 17 ++- drivers/pci/controller/pcie-iproc.c | 24 ++++ drivers/pci/pci.c | 24 +++- drivers/pci/pci.h | 3 + drivers/pci/quirks.c | 99 +++++++++-------- drivers/pci/search.c | 4 +- drivers/perf/fsl_imx8_ddr_perf.c | 16 ++- drivers/pinctrl/intel/pinctrl-baytrail.c | 8 +- drivers/pinctrl/sh-pfc/pfc-sh7264.c | 9 +- drivers/pinctrl/sh-pfc/pfc-sh7269.c | 39 +++++-- drivers/pwm/pwm-omap-dmtimer.c | 35 ++++-- drivers/pwm/pwm-pca9685.c | 4 - drivers/regulator/core.c | 2 + drivers/regulator/rk808-regulator.c | 2 +- drivers/regulator/vctrl-regulator.c | 38 ++++--- drivers/remoteproc/remoteproc_core.c | 2 +- drivers/reset/reset-uniphier.c | 13 ++- drivers/rtc/Kconfig | 8 +- drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- drivers/scsi/iscsi_tcp.c | 4 + drivers/scsi/lpfc/lpfc_ct.c | 42 +++---- drivers/scsi/scsi_transport_iscsi.c | 26 ++++- drivers/scsi/ufs/ufs-mediatek.c | 11 ++ drivers/scsi/ufs/ufs-qcom.c | 3 +- drivers/scsi/ufs/ufshcd.c | 32 +++--- drivers/scsi/ufs/ufshcd.h | 9 +- drivers/soc/fsl/qe/qe_common.c | 29 ++--- drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 +- drivers/spi/spi-fsl-lpspi.c | 32 +++--- drivers/spi/spi-fsl-qspi.c | 2 +- drivers/staging/media/meson/vdec/vdec.c | 2 + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 9 +- drivers/tty/synclink_gt.c | 18 +-- drivers/tty/synclinkmp.c | 24 ++-- drivers/uio/uio_dmem_genirq.c | 6 +- drivers/usb/dwc2/gadget.c | 3 +- drivers/usb/dwc3/host.c | 6 +- drivers/usb/gadget/udc/gr_udc.c | 16 +-- drivers/usb/musb/omap2430.c | 2 - drivers/vfio/pci/vfio_pci_nvlink2.c | 6 +- drivers/video/fbdev/pxa168fb.c | 6 +- drivers/virtio/virtio_balloon.c | 2 + drivers/visorbus/visorchipset.c | 11 +- drivers/vme/bridges/vme_fake.c | 30 +++-- fs/btrfs/check-integrity.c | 3 +- fs/btrfs/ctree.h | 20 ++-- fs/btrfs/file-item.c | 3 +- fs/btrfs/inode.c | 121 ++++++++++++++++----- fs/btrfs/volumes.c | 44 +++++++- fs/ceph/mds_client.c | 3 +- fs/ceph/super.c | 5 + fs/cifs/cifs_dfs_ref.c | 97 ++++++++--------- fs/cifs/connect.c | 6 +- fs/cifs/dfs_cache.c | 2 +- fs/cifs/smb2pdu.c | 3 + fs/ext4/file.c | 10 +- fs/ext4/readpage.c | 17 ++- fs/f2fs/data.c | 13 --- fs/f2fs/file.c | 50 ++++++--- fs/f2fs/namei.c | 27 +++-- fs/f2fs/sysfs.c | 12 +- fs/fuse/file.c | 12 ++ fs/jbd2/checkpoint.c | 2 +- fs/jbd2/commit.c | 4 +- fs/jbd2/journal.c | 24 ++-- fs/nfs/nfs42proc.c | 4 +- fs/nfsd/nfs4proc.c | 3 +- fs/nfsd/vfs.c | 19 +++- fs/ocfs2/dlm/Makefile | 2 - fs/ocfs2/dlm/dlmast.c | 8 +- fs/ocfs2/dlm/dlmconvert.c | 8 +- fs/ocfs2/dlm/dlmdebug.c | 8 +- fs/ocfs2/dlm/dlmdomain.c | 8 +- fs/ocfs2/dlm/dlmlock.c | 8 +- fs/ocfs2/dlm/dlmmaster.c | 8 +- fs/ocfs2/dlm/dlmrecovery.c | 8 +- fs/ocfs2/dlm/dlmthread.c | 8 +- fs/ocfs2/dlm/dlmunlock.c | 8 +- fs/ocfs2/dlmfs/Makefile | 2 - fs/ocfs2/dlmfs/dlmfs.c | 4 +- fs/ocfs2/dlmfs/userdlm.c | 6 +- fs/ocfs2/journal.h | 8 +- fs/orangefs/orangefs-debugfs.c | 1 + fs/reiserfs/stree.c | 3 +- fs/reiserfs/super.c | 2 +- fs/udf/super.c | 23 +++- include/linux/cpuhotplug.h | 1 + include/linux/dmaengine.h | 2 + include/linux/list_nulls.h | 8 +- include/linux/pci.h | 2 +- include/linux/platform_data/ti-sysc.h | 1 + include/linux/raid/pq.h | 3 +- include/linux/rculist_nulls.h | 8 +- include/media/v4l2-device.h | 12 +- include/rdma/ib_verbs.h | 9 +- include/rdma/uverbs_types.h | 1 - include/soc/fsl/qe/qe.h | 16 +-- include/trace/events/rcu.h | 4 +- kernel/bpf/inode.c | 3 +- kernel/cpu.c | 13 ++- kernel/module.c | 20 ++-- kernel/padata.c | 34 +++--- kernel/printk/printk.c | 4 +- kernel/rcu/tree.c | 11 +- kernel/rcu/tree_exp.h | 2 +- kernel/rcu/tree_plugin.h | 22 +++- kernel/sched/core.c | 3 +- kernel/sched/topology.c | 39 +++++++ kernel/time/alarmtimer.c | 20 ++-- kernel/trace/ftrace.c | 5 +- kernel/trace/trace_events_hist.c | 70 +++++------- kernel/trace/trace_events_trigger.c | 5 +- kernel/trace/trace_stat.c | 31 +++--- kernel/watchdog.c | 10 +- lib/debugobjects.c | 46 ++++---- lib/raid6/mktables.c | 2 +- lib/scatterlist.c | 2 +- net/core/dev.c | 4 +- net/core/filter.c | 2 +- net/core/sock_map.c | 3 + net/dsa/tag_qca.c | 2 +- net/netfilter/nft_tunnel.c | 3 +- net/sched/cls_flower.c | 1 + net/sched/cls_matchall.c | 1 + net/smc/smc_diag.c | 5 +- net/sunrpc/cache.c | 2 + samples/bpf/Makefile | 1 + scripts/Kbuild.include | 15 ++- scripts/Kconfig.include | 2 +- scripts/kconfig/confdata.c | 2 +- scripts/link-vmlinux.sh | 4 +- security/selinux/avc.c | 53 +++++---- sound/core/control.c | 5 +- sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_hdmi.c | 7 +- sound/pci/hda/patch_realtek.c | 10 +- sound/sh/aica.c | 4 +- sound/sh/sh_dac_audio.c | 3 - sound/soc/atmel/Kconfig | 2 + sound/soc/intel/boards/sof_rt5682.c | 43 +++++++- sound/soc/soc-topology.c | 42 +++---- sound/soc/sof/intel/hda-dai.c | 3 - sound/soc/sof/intel/hda.h | 2 +- sound/usb/card.c | 4 + sound/usb/format.c | 3 + sound/usb/pcm.c | 4 + sound/usb/quirks.c | 38 +++++++ sound/usb/quirks.h | 5 + sound/usb/usx2y/usX2Yhwdep.c | 2 +- tools/arch/x86/lib/x86-opcode-map.txt | 2 +- tools/bpf/bpftool/cgroup.c | 56 +++++++--- tools/lib/api/fs/fs.c | 4 +- tools/objtool/Makefile | 6 +- .../testing/selftests/bpf/test_select_reuseport.c | 16 ++- tools/testing/selftests/kselftest/runner.sh | 2 +- tools/testing/selftests/net/so_txtime.c | 84 +++++++++++++- tools/testing/selftests/net/so_txtime.sh | 9 +- .../testing/selftests/powerpc/eeh/eeh-functions.sh | 10 +- tools/testing/selftests/size/get_size.c | 24 +++- tools/usb/usbip/src/usbip_network.c | 40 ++++--- tools/usb/usbip/src/usbip_network.h | 12 +- 376 files changed, 3093 insertions(+), 1606 deletions(-)

4 years, 10 months

12
367
0 0

5.4-stable request: 52e29e331070cd ('btrfs: don't set path->leave_spinning for truncate')

by Holger Hoffstätte

Hi, I was just looking throught the current 5.4-stable queue and saw that 28553fa992cb28 ('Btrfs: fix race between shrinking truncate and fiemap') is queued. Upstream has a follow-up fix for this: 52e29e331070cd aka 'btrfs: don't set path->leave_spinning for truncate'. Would be nice to get those in together. I only looked at 5.4, don't know about other queues. thanks, Holger

4 years, 10 months

3
3
0 0

FAILED: patch "[PATCH] Btrfs: fix deadlock during fast fsync when logging prealloc" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a5ae50dea9111db63d30d700766dd5509602f7ad Mon Sep 17 00:00:00 2001 From: Filipe Manana <fdmanana(a)suse.com> Date: Thu, 20 Feb 2020 13:29:49 +0000 Subject: [PATCH] Btrfs: fix deadlock during fast fsync when logging prealloc extents beyond eof While logging the prealloc extents of an inode during a fast fsync we call btrfs_truncate_inode_items(), through btrfs_log_prealloc_extents(), while holding a read lock on a leaf of the inode's root (not the log root, the fs/subvol root), and then that function locks the file range in the inode's iotree. This can lead to a deadlock when: * the fsync is ranged * the file has prealloc extents beyond eof * writeback for a range different from the fsync range starts during the fsync * the size of the file is not sector size aligned Because when finishing an ordered extent we lock first a file range and then try to COW the fs/subvol tree to insert an extent item. The following diagram shows how the deadlock can happen. CPU 1 CPU 2 btrfs_sync_file() --> for range [0, 1MiB) --> inode has a size of 1MiB and has 1 prealloc extent beyond the i_size, starting at offset 4MiB flushes all delalloc for the range [0MiB, 1MiB) and waits for the respective ordered extents to complete --> before task at CPU 1 locks the inode, a write into file range [1MiB, 2MiB + 1KiB) is made --> i_size is updated to 2MiB + 1KiB --> writeback is started for that range, [1MiB, 2MiB + 4KiB) --> end offset rounded up to be sector size aligned btrfs_log_dentry_safe() btrfs_log_inode_parent() btrfs_log_inode() btrfs_log_changed_extents() btrfs_log_prealloc_extents() --> does a search on the inode's root --> holds a read lock on leaf X btrfs_finish_ordered_io() --> locks range [1MiB, 2MiB + 4KiB) --> end offset rounded up to be sector size aligned --> tries to cow leaf X, through insert_reserved_file_extent() --> already locked by the task at CPU 1 btrfs_truncate_inode_items() --> gets an i_size of 2MiB + 1KiB, which is not sector size aligned --> tries to lock file range [2MiB, (u64)-1) --> the start range is rounded down from 2MiB + 1K to 2MiB to be sector size aligned --> but the subrange [2MiB, 2MiB + 4KiB) is already locked by task at CPU 2 which is waiting to get a write lock on leaf X for which we are holding a read lock *** deadlock *** This results in a stack trace like the following, triggered by test case generic/561 from fstests: [ 2779.973608] INFO: task kworker/u8:6:247 blocked for more than 120 seconds. [ 2779.979536] Not tainted 5.6.0-rc2-btrfs-next-53 #1 [ 2779.984503] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 2779.990136] kworker/u8:6 D 0 247 2 0x80004000 [ 2779.990457] Workqueue: btrfs-endio-write btrfs_work_helper [btrfs] [ 2779.990466] Call Trace: [ 2779.990491] ? __schedule+0x384/0xa30 [ 2779.990521] schedule+0x33/0xe0 [ 2779.990616] btrfs_tree_read_lock+0x19e/0x2e0 [btrfs] [ 2779.990632] ? remove_wait_queue+0x60/0x60 [ 2779.990730] btrfs_read_lock_root_node+0x2f/0x40 [btrfs] [ 2779.990782] btrfs_search_slot+0x510/0x1000 [btrfs] [ 2779.990869] btrfs_lookup_file_extent+0x4a/0x70 [btrfs] [ 2779.990944] __btrfs_drop_extents+0x161/0x1060 [btrfs] [ 2779.990987] ? mark_held_locks+0x6d/0xc0 [ 2779.990994] ? __slab_alloc.isra.49+0x99/0x100 [ 2779.991060] ? insert_reserved_file_extent.constprop.19+0x64/0x300 [btrfs] [ 2779.991145] insert_reserved_file_extent.constprop.19+0x97/0x300 [btrfs] [ 2779.991222] ? start_transaction+0xdd/0x5c0 [btrfs] [ 2779.991291] btrfs_finish_ordered_io+0x4f4/0x840 [btrfs] [ 2779.991405] btrfs_work_helper+0xaa/0x720 [btrfs] [ 2779.991432] process_one_work+0x26d/0x6a0 [ 2779.991460] worker_thread+0x4f/0x3e0 [ 2779.991481] ? process_one_work+0x6a0/0x6a0 [ 2779.991489] kthread+0x103/0x140 [ 2779.991499] ? kthread_create_worker_on_cpu+0x70/0x70 [ 2779.991515] ret_from_fork+0x3a/0x50 (...) [ 2780.026211] INFO: task fsstress:17375 blocked for more than 120 seconds. [ 2780.027480] Not tainted 5.6.0-rc2-btrfs-next-53 #1 [ 2780.028482] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 2780.030035] fsstress D 0 17375 17373 0x00004000 [ 2780.030038] Call Trace: [ 2780.030044] ? __schedule+0x384/0xa30 [ 2780.030052] schedule+0x33/0xe0 [ 2780.030075] lock_extent_bits+0x20c/0x320 [btrfs] [ 2780.030094] ? btrfs_truncate_inode_items+0xf4/0x1150 [btrfs] [ 2780.030098] ? rcu_read_lock_sched_held+0x59/0xa0 [ 2780.030102] ? remove_wait_queue+0x60/0x60 [ 2780.030122] btrfs_truncate_inode_items+0x133/0x1150 [btrfs] [ 2780.030151] ? btrfs_set_path_blocking+0xb2/0x160 [btrfs] [ 2780.030165] ? btrfs_search_slot+0x379/0x1000 [btrfs] [ 2780.030195] btrfs_log_changed_extents.isra.8+0x841/0x93e [btrfs] [ 2780.030202] ? do_raw_spin_unlock+0x49/0xc0 [ 2780.030215] ? btrfs_get_num_csums+0x10/0x10 [btrfs] [ 2780.030239] btrfs_log_inode+0xf83/0x1124 [btrfs] [ 2780.030251] ? __mutex_unlock_slowpath+0x45/0x2a0 [ 2780.030275] btrfs_log_inode_parent+0x2a0/0xe40 [btrfs] [ 2780.030282] ? dget_parent+0xa1/0x370 [ 2780.030309] btrfs_log_dentry_safe+0x4a/0x70 [btrfs] [ 2780.030329] btrfs_sync_file+0x3f3/0x490 [btrfs] [ 2780.030339] do_fsync+0x38/0x60 [ 2780.030343] __x64_sys_fdatasync+0x13/0x20 [ 2780.030345] do_syscall_64+0x5c/0x280 [ 2780.030348] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 2780.030356] RIP: 0033:0x7f2d80f6d5f0 [ 2780.030361] Code: Bad RIP value. [ 2780.030362] RSP: 002b:00007ffdba3c8548 EFLAGS: 00000246 ORIG_RAX: 000000000000004b [ 2780.030364] RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007f2d80f6d5f0 [ 2780.030365] RDX: 00007ffdba3c84b0 RSI: 00007ffdba3c84b0 RDI: 0000000000000003 [ 2780.030367] RBP: 000000000000004a R08: 0000000000000001 R09: 00007ffdba3c855c [ 2780.030368] R10: 0000000000000078 R11: 0000000000000246 R12: 00000000000001f4 [ 2780.030369] R13: 0000000051eb851f R14: 00007ffdba3c85f0 R15: 0000557a49220d90 So fix this by making btrfs_truncate_inode_items() not lock the range in the inode's iotree when the target root is a log root, since it's not needed to lock the range for log roots as the protection from the inode's lock and log_mutex are all that's needed. Fixes: 28553fa992cb28 ("Btrfs: fix race between shrinking truncate and fiemap") CC: stable(a)vger.kernel.org # 4.4+ Reviewed-by: Josef Bacik <josef(a)toxicpanda.com> Signed-off-by: Filipe Manana <fdmanana(a)suse.com> Signed-off-by: David Sterba <dsterba(a)suse.com> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 4f47ba652b31..1ccb3f8d528d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4103,8 +4103,9 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, return -ENOMEM; path->reada = READA_BACK; - lock_extent_bits(&BTRFS_I(inode)->io_tree, lock_start, (u64)-1, - &cached_state); + if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) + lock_extent_bits(&BTRFS_I(inode)->io_tree, lock_start, (u64)-1, + &cached_state); /* * We want to drop from the next block forward in case this new size is @@ -4368,11 +4369,10 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, if (!ret && last_size > new_size) last_size = new_size; btrfs_ordered_update_i_size(inode, last_size, NULL); + unlock_extent_cached(&BTRFS_I(inode)->io_tree, lock_start, + (u64)-1, &cached_state); } - unlock_extent_cached(&BTRFS_I(inode)->io_tree, lock_start, (u64)-1, - &cached_state); - btrfs_free_path(path); return ret; }

4 years, 10 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror February 2020