epoll: do not insert into poll queues until all sanity checks are done
Subsystems (2)
Sasha Levin
maintainerPATCH 2/4 drm/amdgpu: prevent double kfree ttm->sg
In reply to Sasha LevinFrom: Philip Yang <[email protected]>
[ Upstream commit 1d0e16ac1a9e800598dcfa5b6bc53b704a103390 ]
Set ttm->sg to NULL after kfree, to avoid memory corruption backtrace:
[ 420.932812] kernel BUG at /build/linux-do9eLF/linux-4.15.0/mm/slub.c:295! [ 420.934182] invalid opcode: 0000 [#1] SMP NOPTI [ 420.935445] Modules linked in: xt_conntrack ipt_MASQUERADE [ 420.951332] Hardware name: Dell Inc. PowerEdge R7525/0PYVT1, BIOS 1.5.4 07/09/2020 [ 420.952887] RIP: 0010:__slab_free+0x180/0x2d0 [ 420.954419] RSP: 0018:ffffbe426291fa60 EFLAGS: 00010246 [ 420.955963] RAX: ffff9e29263e9c30 RBX: ffff9e29263e9c30 RCX: 000000018100004b [ 420.957512] RDX: ffff9e29263e9c30 RSI: fffff3d33e98fa40 RDI: ffff9e297e407a80 [ 420.959055] RBP: ffffbe426291fb00 R08: 0000000000000001 R09: ffffffffc0d39ade [ 420.960587] R10: ffffbe426291fb20 R11: ffff9e49ffdd4000 R12: ffff9e297e407a80 [ 420.962105] R13: fffff3d33e98fa40 R14: ffff9e29263e9c30 R15: ffff9e2954464fd8 [ 420.963611] FS: 00007fa2ea097780(0000) GS:ffff9e297e840000(0000) knlGS:0000000000000000 [ 420.965144] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 420.966663] CR2: 00007f16bfffefb8 CR3: 0000001ff0c62000 CR4: 0000000000340ee0 [ 420.968193] Call Trace: [ 420.969703] ? __page_cache_release+0x3c/0x220 [ 420.971294] ? amdgpu_ttm_tt_unpopulate+0x5e/0x80 [amdgpu] [ 420.972789] kfree+0x168/0x180 [ 420.974353] ? amdgpu_ttm_tt_set_user_pages+0x64/0xc0 [amdgpu] [ 420.975850] ? kfree+0x168/0x180 [ 420.977403] amdgpu_ttm_tt_unpopulate+0x5e/0x80 [amdgpu] [ 420.978888] ttm_tt_unpopulate.part.10+0x53/0x60 [amdttm] [ 420.980357] ttm_tt_destroy.part.11+0x4f/0x60 [amdttm] [ 420.981814] ttm_tt_destroy+0x13/0x20 [amdttm] [ 420.983273] ttm_bo_cleanup_memtype_use+0x36/0x80 [amdttm] [ 420.984725] ttm_bo_release+0x1c9/0x360 [amdttm] [ 420.986167] amdttm_bo_put+0x24/0x30 [amdttm] [ 420.987663] amdgpu_bo_unref+0x1e/0x30 [amdgpu] [ 420.989165] amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu+0x9ca/0xb10 [amdgpu] [ 420.990666] kfd_ioctl_alloc_memory_of_gpu+0xef/0x2c0 [amdgpu]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -0
@@ -967,6 +967,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_tt *ttm) release_sg:kfree (ttm->sg); + ttm->sg =NULL ;return r; }
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 4/4 iommu/vt-d: Fix lockdep splat in iommu_flush_dev_iotlb()
In reply to Sasha LevinFrom: Lu Baolu <[email protected]>
[ Upstream commit 1a3f2fd7fc4e8f24510830e265de2ffb8e3300d2 ]
Lock(&iommu->lock) without disabling irq causes lockdep warnings.
[ 12.703950] ========================================================
[ 12.703962] WARNING: possible irq lock inversion dependency detected
[ 12.703975] 5.9.0-rc6+ #659 Not tainted
[ 12.703983] --------------------------------------------------------
[ 12.703995] systemd-udevd/284 just changed the state of lock:
[ 12.704007] ffffffffbd6ff4d8 (device_domain_lock){..-.}-{2:2}, at:
iommu_flush_dev_iotlb.part.57+0x2e/0x90
[ 12.704031] but this lock took another, SOFTIRQ-unsafe lock in the past:
[ 12.704043] (&iommu->lock){+.+.}-{2:2}
[ 12.704045]and interrupts could create inverse lock ordering between them.
[ 12.704073]
other info that might help us debug this:
[ 12.704085] Possible interrupt unsafe locking scenario:[ 12.704097] CPU0 CPU1
[ 12.704106] ---- ----
[ 12.704115] lock(&iommu->lock);
[ 12.704123] local_irq_disable();
[ 12.704134] lock(device_domain_lock);
[ 12.704146] lock(&iommu->lock);
[ 12.704158] <Interrupt>
[ 12.704164] lock(device_domain_lock);
[ 12.704174]
*** DEADLOCK ***--- drivers/iommu/intel-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/intel-iommu.c +2 -2
@@ -2560,14 +2560,14 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, }/* Setup the PASID entry for requests without PASID: */ -spin_lock (&iommu->lock); +spin_lock_irqsave (&iommu->lock, flags);if (hw_pass_through &&domain_type_is_si (domain)) ret =intel_pasid_setup_pass_through (iommu, domain, dev,PASID_RID2PASID );else ret =intel_pasid_setup_second_level (iommu, domain, dev,PASID_RID2PASID ); -spin_unlock (&iommu->lock); +spin_unlock_irqrestore (&iommu->lock, flags);if (ret) {dev_err (dev,"Setup RID2PASID failed\n" );dmar_remove_one_dev_info (dev);
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 1/4 epoll: do not insert into poll queues until all sanity checks are done
From: Al Viro <[email protected]>
[ Upstream commit f8d4f44df056c5b504b0d49683fb7279218fd207 ]
--- fs/eventpoll.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-)
fs/eventpoll.c +18 -19
@@ -1527,6 +1527,22 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,RCU_INIT_POINTER (epi->ws,NULL ); } +/* Add the current item to the list of active epoll hook for this file */ +spin_lock (&tfile->f_lock); +list_add_tail_rcu (&epi->fllink, &tfile->f_ep_links); +spin_unlock (&tfile->f_lock); + +/* +* Add the current item to the RB tree. All RB tree operations are +* protected by "mtx", and ep_insert() is called with "mtx" held. +*/ +ep_rbtree_insert (ep, epi); + +/* now check if we've created too many backpaths */ + error = -EINVAL ; +if (full_check &&reverse_path_check ()) + goto error_remove_epi; +/* Initialize the poll table using the queue callback */ epq.epi = epi;init_poll_funcptr (&epq.pt, ep_ptable_queue_proc);
@@ -1549,22 +1565,6 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,if (epi->nwait <0 ) goto error_unregister; -/* Add the current item to the list of active epoll hook for this file */ -spin_lock (&tfile->f_lock); -list_add_tail_rcu (&epi->fllink, &tfile->f_ep_links); -spin_unlock (&tfile->f_lock); - -/* -* Add the current item to the RB tree. All RB tree operations are -* protected by "mtx", and ep_insert() is called with "mtx" held. -*/ -ep_rbtree_insert (ep, epi); - -/* now check if we've created too many backpaths */ - error = -EINVAL ; -if (full_check &&reverse_path_check ()) - goto error_remove_epi; -/* We have to drop the new item inside our item list to keep track of it */ write_lock_irq (&ep->lock);
@@ -1593,6 +1593,8 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,return 0 ; +error_unregister: +ep_unregister_pollwait (ep, epi); error_remove_epi:spin_lock (&tfile->f_lock);list_del_rcu (&epi->fllink);
@@ -1600,9 +1602,6 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,rb_erase_cached (&epi->rbn, &ep->rbr); -error_unregister: -ep_unregister_pollwait (ep, epi); -/* * We need to do this because an event could have been arrived on some * allocated wait queue. Note that we don't care about the ep->ovflist
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 3/4 ep_create_wakeup_source(): dentry name can change under you...
From: Al Viro <[email protected]>
[ Upstream commit 3701cb59d892b88d569427586f01491552f377b1 ]
or get freed, for that matter, if it's a long (separately stored) name.
--- fs/eventpoll.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/eventpoll.c +4 -3
@@ -1455,7 +1455,7 @@ static int reverse_path_check(void)static int ep_create_wakeup_source (struct epitem *epi) { -const char *name; +struct name_snapshot n;struct wakeup_source *ws;if (!epi->ep->ws) {
@@ -1464,8 +1464,9 @@ static int ep_create_wakeup_source(struct epitem *epi)return -ENOMEM ; } - name = epi->ffd.file->f_path.dentry->d_name.name; - ws =wakeup_source_register (NULL , name); +take_dentry_name_snapshot (&n, epi->ffd.file->f_path.dentry); + ws =wakeup_source_register (NULL , n.name.name); +release_dentry_name_snapshot (&n);if (!ws)return -ENOMEM ;
Signature · 1 line
2.25.1