From: Nikolay Borisov <nborisov@suse.com>
To: Andreas Schwab <schwab@suse.de>, linux-riscv@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] riscv: fix locking violation in page fault handler
Date: Tue, 7 May 2019 11:04:58 +0300 [thread overview]
Message-ID: <b2030f8c-010e-7088-271e-e2398f7d37db@suse.com> (raw)
In-Reply-To: <mvm5zqmu35d.fsf@suse.de>
On 7.05.19 г. 10:36 ч., Andreas Schwab wrote:
> When a user mode process accesses an address in the vmalloc area
> do_page_fault tries to unlock the mmap semaphore when it isn't locked.
>
> Signed-off-by: Andreas Schwab <schwab@suse.de>
> ---
> arch/riscv/mm/fault.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
> index 88401d5125bc..c51878e5a66a 100644
> --- a/arch/riscv/mm/fault.c
> +++ b/arch/riscv/mm/fault.c
> @@ -181,6 +181,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
> up_read(&mm->mmap_sem);
> /* User mode accesses just cause a SIGSEGV */
> if (user_mode(regs)) {
> +bad_area_do_trap:
> do_trap(regs, SIGSEGV, code, addr, tsk);
> return;
> }
> @@ -230,7 +231,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
> int index;
>
> if (user_mode(regs))
> - goto bad_area;
> + goto bad_area_do_trap;
>
> /*
> * Synchronize this task's top level page-table
>
In this case I think it will be a lot cleaner if you just duplicated the
do_trap call. On a slightly different note - is there any reason why
do_page_fault is such a spaghetti mess? At the very least the code under
no_context label could go into it's own function since it just kills the
process and never returns? Furthermore the whole vmalloc_fault just
cries for being factored out in a function, it's explicitly in it's own
block.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2019-05-07 8:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-07 7:36 [PATCH] riscv: fix locking violation in page fault handler Andreas Schwab
2019-05-07 8:04 ` Nikolay Borisov [this message]
2019-05-07 14:12 ` Andreas Schwab
2019-05-07 14:22 ` Nikolay Borisov
2019-05-07 14:36 ` Andreas Schwab
2019-05-07 23:48 ` Palmer Dabbelt
2019-05-16 7:42 ` Andreas Schwab
2019-05-29 16:41 ` Palmer Dabbelt
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=b2030f8c-010e-7088-271e-e2398f7d37db@suse.com \
--to=nborisov@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=schwab@suse.de \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).