From: Davidlohr Bueso <davidlohr@hp.com> To: akpm@linux-foundation.org Cc: zeus@gnu.org, aswin@hp.com, davidlohr@hp.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dimitri@domain.invalid, "Sivanich <sivanich"@sgi.com Subject: [PATCH 5/6] drivers,sgi-gru/grufault.c: call find_vma with the mmap_sem held Date: Sat, 19 Apr 2014 19:26:30 -0700 [thread overview] Message-ID: <1397960791-16320-6-git-send-email-davidlohr@hp.com> (raw) In-Reply-To: <1397960791-16320-1-git-send-email-davidlohr@hp.com> From: Jonathan Gonzalez V <zeus@gnu.org> Performing vma lookups without taking the mm->mmap_sem is asking for trouble. While doing the search, the vma in question can be modified or even removed before returning to the caller. Take the lock in order to avoid races while iterating through the vmacache and/or rbtree. This patch is completely *untested*. Signed-off-by: Jonathan Gonzalez V <zeus@gnu.org> Signed-off-by: Davidlohr Bueso <davidlohr@hp.com> Cc: Dimitri Sivanich <sivanich@sgi.com --- drivers/misc/sgi-gru/grufault.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index f74fc0c..15adc84 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c @@ -266,6 +266,7 @@ static int gru_vtop(struct gru_thread_state *gts, unsigned long vaddr, unsigned long paddr; int ret, ps; + down_write(&mm->mmap_sem); vma = find_vma(mm, vaddr); if (!vma) goto inval; @@ -277,22 +278,26 @@ static int gru_vtop(struct gru_thread_state *gts, unsigned long vaddr, rmb(); /* Must/check ms_range_active before loading PTEs */ ret = atomic_pte_lookup(vma, vaddr, write, &paddr, &ps); if (ret) { - if (atomic) - goto upm; + if (atomic) { + up_write(&mm->mmap_sem); + return VTOP_RETRY; + } if (non_atomic_pte_lookup(vma, vaddr, write, &paddr, &ps)) goto inval; } if (is_gru_paddr(paddr)) goto inval; + + up_write(&mm->mmap_sem); + paddr = paddr & ~((1UL << ps) - 1); *gpa = uv_soc_phys_ram_to_gpa(paddr); *pageshift = ps; return VTOP_SUCCESS; inval: + up_write(&mm->mmap_sem); return VTOP_INVALID; -upm: - return VTOP_RETRY; } -- 1.8.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Davidlohr Bueso <davidlohr@hp.com> To: akpm@linux-foundation.org Cc: zeus@gnu.org, aswin@hp.com, davidlohr@hp.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dimitri@domain.invalid, "Sivanich <sivanich"@sgi.com Subject: [PATCH 5/6] drivers,sgi-gru/grufault.c: call find_vma with the mmap_sem held Date: Sat, 19 Apr 2014 19:26:30 -0700 [thread overview] Message-ID: <1397960791-16320-6-git-send-email-davidlohr@hp.com> (raw) In-Reply-To: <1397960791-16320-1-git-send-email-davidlohr@hp.com> From: Jonathan Gonzalez V <zeus@gnu.org> Performing vma lookups without taking the mm->mmap_sem is asking for trouble. While doing the search, the vma in question can be modified or even removed before returning to the caller. Take the lock in order to avoid races while iterating through the vmacache and/or rbtree. This patch is completely *untested*. Signed-off-by: Jonathan Gonzalez V <zeus@gnu.org> Signed-off-by: Davidlohr Bueso <davidlohr@hp.com> Cc: Dimitri Sivanich <sivanich@sgi.com --- drivers/misc/sgi-gru/grufault.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index f74fc0c..15adc84 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c @@ -266,6 +266,7 @@ static int gru_vtop(struct gru_thread_state *gts, unsigned long vaddr, unsigned long paddr; int ret, ps; + down_write(&mm->mmap_sem); vma = find_vma(mm, vaddr); if (!vma) goto inval; @@ -277,22 +278,26 @@ static int gru_vtop(struct gru_thread_state *gts, unsigned long vaddr, rmb(); /* Must/check ms_range_active before loading PTEs */ ret = atomic_pte_lookup(vma, vaddr, write, &paddr, &ps); if (ret) { - if (atomic) - goto upm; + if (atomic) { + up_write(&mm->mmap_sem); + return VTOP_RETRY; + } if (non_atomic_pte_lookup(vma, vaddr, write, &paddr, &ps)) goto inval; } if (is_gru_paddr(paddr)) goto inval; + + up_write(&mm->mmap_sem); + paddr = paddr & ~((1UL << ps) - 1); *gpa = uv_soc_phys_ram_to_gpa(paddr); *pageshift = ps; return VTOP_SUCCESS; inval: + up_write(&mm->mmap_sem); return VTOP_INVALID; -upm: - return VTOP_RETRY; } -- 1.8.1.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2014-04-20 2:28 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-04-20 2:26 [PATCH 0/6] mm: audit find_vma() callers Davidlohr Bueso 2014-04-20 2:26 ` Davidlohr Bueso 2014-04-20 2:26 ` [PATCH 1/6] blackfin/ptrace: call find_vma with the mmap_sem held Davidlohr Bueso 2014-04-20 2:26 ` Davidlohr Bueso 2014-04-22 3:07 ` Steven Miao 2014-04-22 3:07 ` Steven Miao 2014-04-20 2:26 ` [PATCH 2/6] m68k: call find_vma with the mmap_sem held in sys_cacheflush() Davidlohr Bueso 2014-04-20 2:26 ` Davidlohr Bueso 2014-04-20 8:04 ` Geert Uytterhoeven 2014-04-20 8:04 ` Geert Uytterhoeven 2014-04-20 8:04 ` Geert Uytterhoeven 2014-04-20 22:28 ` Davidlohr Bueso 2014-04-20 22:28 ` Davidlohr Bueso 2014-04-20 22:28 ` Davidlohr Bueso 2014-04-21 7:52 ` Geert Uytterhoeven 2014-04-21 7:52 ` Geert Uytterhoeven 2014-04-21 7:52 ` Geert Uytterhoeven [not found] ` <OF5CEC4294.867C780E-ONCA257CCB.00315352-CA257CCB.003674E6@csc.com> 2014-05-01 14:05 ` Linux-3.15-rcX - PowerPC Serial Console woes Geert Uytterhoeven 2014-08-07 22:44 ` [PATCH 2/6] m68k: call find_vma with the mmap_sem held in sys_cacheflush() Davidlohr Bueso 2014-08-07 22:44 ` Davidlohr Bueso 2014-08-07 22:44 ` Davidlohr Bueso 2014-04-20 2:26 ` Davidlohr Bueso 2014-04-20 2:26 ` [PATCH 3/6] mips: call find_vma with the mmap_sem held Davidlohr Bueso 2014-04-20 2:26 ` Davidlohr Bueso 2014-04-22 13:25 ` Andreas Herrmann 2014-04-22 13:25 ` Andreas Herrmann 2014-04-20 2:26 ` [PATCH 4/6] arc: " Davidlohr Bueso 2014-04-20 2:26 ` Davidlohr Bueso 2014-04-22 6:02 ` Vineet Gupta 2014-04-22 6:02 ` Vineet Gupta 2014-04-20 2:26 ` Davidlohr Bueso [this message] 2014-04-20 2:26 ` [PATCH 5/6] drivers,sgi-gru/grufault.c: " Davidlohr Bueso 2014-04-21 13:36 ` Dimitri Sivanich 2014-04-21 13:36 ` Dimitri Sivanich 2014-04-20 2:26 ` [PATCH 6/6] drm/exynos: " Davidlohr Bueso 2014-04-20 2:26 ` Davidlohr Bueso 2014-04-28 18:09 ` [PATCH 7/6] media: videobuf2-dma-sg: " Davidlohr Bueso 2014-04-28 18:09 ` Davidlohr Bueso 2014-04-29 8:35 ` Marek Szyprowski 2014-04-29 8:35 ` Marek Szyprowski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1397960791-16320-6-git-send-email-davidlohr@hp.com \ --to=davidlohr@hp.com \ --cc="Sivanich <sivanich"@sgi.com \ --cc=Dimitri@domain.invalid \ --cc=akpm@linux-foundation.org \ --cc=aswin@hp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=zeus@gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.