Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp3447905yba; Tue, 7 May 2019 01:06:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqxm/hFaHUtrKSclEDiDj9Ev9WRSy7XY3l9gUGVKjfVP5h0P6tSkCMwtvTmFd/bPwB3JNkpV X-Received: by 2002:a62:4183:: with SMTP id g3mr40557722pfd.229.1557216387042; Tue, 07 May 2019 01:06:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557216387; cv=none; d=google.com; s=arc-20160816; b=q0fK81tjrJfdCj9PgNEB9DaJNkOt//SvqQgepfVSVOOKPodskRGLTibYjLx8zmcx9/ NUuz2Sbu3aw5rmtmIJ3RWR4D6UD/TDrZ5JXwc+fYvET1j5MziJuKY1Ar4QPlZtzn1W6F blXnuczVrEDe2ThnMr8JKal7l5YsLtyiG4HEh7iAFPcy/74TjTK3M1fwhIlm4SKmIN6g zKMmuNM8p81SkCg7nJKWOa0I40fAKvmFmtiGPZOtS7N77goNW9Jzn2713wt7qqpSe6Qg R6mPyqt8LAxM9W9z7YMLMMyGmSE10Qqm+mvJDnlks7HQy5Qhz+4ExF4mM/P83jFoxG8a puaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:autocrypt:openpgp:from:references:cc:to:subject; bh=Mv710qlDmfl/O0jbxfA1OS745BKco/xaJndcrhhCLa0=; b=IpfPgIh5LiktNOGE19JDJPLnDpaUTHP4U4gDRS8TRFTLVYIW3TXogvoD+0uj80R9WC ziPG6KsaDB1remwgXkCKm0riMLAFTPnOKz9YW5jtTRXsKe0+oEUMhLO4t3DtG85vQLbc PrP9LTIEKSbTq8OENMMHMZKkjMJddY38xc7RQ2OX8FO/XqBH80E2L+2QLvJGB6tt6WpW oX56ATy8u0A2qQLWifMIq44xn3T6At3yQmjy6DvJd/NXcZbLRipj/0SzA3mgZHB+F3Ft 6/8dCQP5Z2kMPGjLvWnalr0aP28Ds00EcvJm7qWuQen/TEWy8/Xe+IUr9AViOEWh2/vL a39Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b1si18696401pgb.51.2019.05.07.01.06.10; Tue, 07 May 2019 01:06:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727049AbfEGIFB (ORCPT + 99 others); Tue, 7 May 2019 04:05:01 -0400 Received: from mx2.suse.de ([195.135.220.15]:34108 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726085AbfEGIFB (ORCPT ); Tue, 7 May 2019 04:05:01 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 67009AE52; Tue, 7 May 2019 08:04:59 +0000 (UTC) Subject: Re: [PATCH] riscv: fix locking violation in page fault handler To: Andreas Schwab , linux-riscv@lists.infradead.org Cc: linux-kernel@vger.kernel.org References: From: Nikolay Borisov Openpgp: preference=signencrypt Autocrypt: addr=nborisov@suse.com; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Tue, 7 May 2019 11:04:58 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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.