From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56C2BC4CEC7 for ; Sun, 15 Sep 2019 18:35:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2D2CC214D8 for ; Sun, 15 Sep 2019 18:35:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="k8v1dEkr"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="xA4HUn2S" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D2CC214D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HtpimQT0Mn5UocDPkUnvIol63GZLQMrhFLIzAUaPfCA=; b=k8v1dEkr7h30r8 5DxA9ed14e+eFxgCS/Ioh+0WPv5sNrlzOA913NgxZl7OibvG0mKsIzhmVUud9mSe5aDktw04VP4f0 UPnyt7n7q//anrkoTsh4D7HoF++RbfHISBk8iqJbkrVobktIv7NV9ohVajFXxSNVlCmr7SzGWlJKT 5QKTMOikgL4RCda4mntqEbDQeAJew3/Lg0zpT3wh187rmI+udYqFFs3fd43VKX/SSKiQVfPZx/ODY YxqQitmqvNrN0Mkrf/ivAtcvhUeghpHSxqfNJ8tf6Bl0q8XvcNiM1Ztim/ytd4QZjo3juDUWeGx7z MCRlDWof8vZc3qFs9Y9A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1i9ZMk-0003iq-PG; Sun, 15 Sep 2019 18:35:18 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1i9ZMd-0002UT-Sy for linux-arm-kernel@lists.infradead.org; Sun, 15 Sep 2019 18:35:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jsDc63G0j/DkI+K6Lr0zDi+b74Pxegfq3m7vm6p44LA=; b=xA4HUn2SQlkYKILPTZtzL/ftU rvURYZewVLDafUKNvmdl3dqENKfLhvyt8Jn9ZivvyZeYd97KlrD0f7+BsDzoQpltyv7kPx7wH1skW 8XXj7NxRGa/lfH1P5wEL+Zsm5Tynd44hWyEMaL6zkGGPwIItBNi7S3AZRFTs1exQ/KZ8C3nSr9d6g FQI1bybExS4bl3IB1i3Go91FxQhKvcK8eSTZ3QiIl4q394PI8Bex+Be2iR9Yu6IdHpcG+5AuaThs3 Y/1mtNvEsMZfOcmZ0zhwHdLvtUzp61iZ6Yb8Gl7PRszGbH9muB3gGr+cq8K/D+UQV5S9fb1W8RjWM npVhifUEg==; Received: from shell.armlinux.org.uk ([2001:4d48:ad52:3201:5054:ff:fe00:4ec]:60632) by pandora.armlinux.org.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1i9ZLv-0007hn-AA; Sun, 15 Sep 2019 19:34:27 +0100 Received: from linux by shell.armlinux.org.uk with local (Exim 4.92) (envelope-from ) id 1i9ZLl-0007zu-3k; Sun, 15 Sep 2019 19:34:17 +0100 Date: Sun, 15 Sep 2019 19:34:17 +0100 From: Russell King - ARM Linux admin To: "Eric W. Biederman" Subject: Re: [PATCH] arm: fix page faults in do_alignment Message-ID: <20190915183416.GF25745@shell.armlinux.org.uk> References: <1567171877-101949-1-git-send-email-jingxiangfeng@huawei.com> <20190830133522.GZ13294@shell.armlinux.org.uk> <87d0gmwi73.fsf@x220.int.ebiederm.org> <20190830203052.GG13294@shell.armlinux.org.uk> <87y2zav01z.fsf@x220.int.ebiederm.org> <20190830222906.GH13294@shell.armlinux.org.uk> <87mufmioqv.fsf@x220.int.ebiederm.org> <20190906151759.GM13294@shell.armlinux.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190906151759.GM13294@shell.armlinux.org.uk> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190915_113512_215743_0D5D1F92 X-CRM114-Status: GOOD ( 39.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kstewart@linuxfoundation.org, gustavo@embeddedor.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Jing Xiangfeng , linux-mm@kvack.org, sakari.ailus@linux.intel.com, bhelgaas@google.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Sep 06, 2019 at 04:17:59PM +0100, Russell King - ARM Linux admin wrote: > On Mon, Sep 02, 2019 at 12:36:56PM -0500, Eric W. Biederman wrote: > > Russell King - ARM Linux admin writes: > > > > > On Fri, Aug 30, 2019 at 04:02:48PM -0500, Eric W. Biederman wrote: > > >> Russell King - ARM Linux admin writes: > > >> > > >> > On Fri, Aug 30, 2019 at 02:45:36PM -0500, Eric W. Biederman wrote: > > >> >> Russell King - ARM Linux admin writes: > > >> >> > > >> >> > On Fri, Aug 30, 2019 at 09:31:17PM +0800, Jing Xiangfeng wrote: > > >> >> >> The function do_alignment can handle misaligned address for user and > > >> >> >> kernel space. If it is a userspace access, do_alignment may fail on > > >> >> >> a low-memory situation, because page faults are disabled in > > >> >> >> probe_kernel_address. > > >> >> >> > > >> >> >> Fix this by using __copy_from_user stead of probe_kernel_address. > > >> >> >> > > >> >> >> Fixes: b255188 ("ARM: fix scheduling while atomic warning in alignment handling code") > > >> >> >> Signed-off-by: Jing Xiangfeng > > >> >> > > > >> >> > NAK. > > >> >> > > > >> >> > The "scheduling while atomic warning in alignment handling code" is > > >> >> > caused by fixing up the page fault while trying to handle the > > >> >> > mis-alignment fault generated from an instruction in atomic context. > > >> >> > > > >> >> > Your patch re-introduces that bug. > > >> >> > > >> >> And the patch that fixed scheduling while atomic apparently introduced a > > >> >> regression. Admittedly a regression that took 6 years to track down but > > >> >> still. > > >> > > > >> > Right, and given the number of years, we are trading one regression for > > >> > a different regression. If we revert to the original code where we > > >> > fix up, we will end up with people complaining about a "new" regression > > >> > caused by reverting the previous fix. Follow this policy and we just > > >> > end up constantly reverting the previous revert. > > >> > > > >> > The window is very small - the page in question will have had to have > > >> > instructions read from it immediately prior to the handler being entered, > > >> > and would have had to be made "old" before subsequently being unmapped. > > >> > > >> > Rather than excessively complicating the code and making it even more > > >> > inefficient (as in your patch), we could instead retry executing the > > >> > instruction when we discover that the page is unavailable, which should > > >> > cause the page to be paged back in. > > >> > > >> My patch does not introduce any inefficiencies. It onlys moves the > > >> check for user_mode up a bit. My patch did duplicate the code. > > >> > > >> > If the page really is unavailable, the prefetch abort should cause a > > >> > SEGV to be raised, otherwise the re-execution should replace the page. > > >> > > > >> > The danger to that approach is we page it back in, and it gets paged > > >> > back out before we're able to read the instruction indefinitely. > > >> > > >> I would think either a little code duplication or a function that looks > > >> at user_mode(regs) and picks the appropriate kind of copy to do would be > > >> the best way to go. Because what needs to happen in the two cases for > > >> reading the instruction are almost completely different. > > > > > > That is what I mean. I'd prefer to avoid that with the large chunk of > > > code. How about instead adding a local replacement for > > > probe_kernel_address() that just sorts out the reading, rather than > > > duplicating all the code to deal with thumb fixup. > > > > So something like this should be fine? > > > > Jing Xiangfeng can you test this please? I think this fixes your issue > > but I don't currently have an arm development box where I could test this. > > Sorry, only just got around to this again. What I came up with is this: I've heard nothing, so I've done nothing... > 8<=== > From: Russell King > Subject: [PATCH] ARM: mm: fix alignment > > Signed-off-by: Russell King > --- > arch/arm/mm/alignment.c | 44 ++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 36 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c > index 6067fa4de22b..529f54d94709 100644 > --- a/arch/arm/mm/alignment.c > +++ b/arch/arm/mm/alignment.c > @@ -765,6 +765,36 @@ do_alignment_t32_to_handler(unsigned long *pinstr, struct pt_regs *regs, > return NULL; > } > > +static int alignment_get_arm(struct pt_regs *regs, u32 *ip, unsigned long *inst) > +{ > + u32 instr = 0; > + int fault; > + > + if (user_mode(regs)) > + fault = get_user(instr, ip); > + else > + fault = probe_kernel_address(ip, instr); > + > + *inst = __mem_to_opcode_arm(instr); > + > + return fault; > +} > + > +static int alignment_get_thumb(struct pt_regs *regs, u16 *ip, u16 *inst) > +{ > + u16 instr = 0; > + int fault; > + > + if (user_mode(regs)) > + fault = get_user(instr, ip); > + else > + fault = probe_kernel_address(ip, instr); > + > + *inst = __mem_to_opcode_thumb16(instr); > + > + return fault; > +} > + > static int > do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) > { > @@ -772,10 +802,10 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) > unsigned long instr = 0, instrptr; > int (*handler)(unsigned long addr, unsigned long instr, struct pt_regs *regs); > unsigned int type; > - unsigned int fault; > u16 tinstr = 0; > int isize = 4; > int thumb2_32b = 0; > + int fault; > > if (interrupts_enabled(regs)) > local_irq_enable(); > @@ -784,15 +814,14 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) > > if (thumb_mode(regs)) { > u16 *ptr = (u16 *)(instrptr & ~1); > - fault = probe_kernel_address(ptr, tinstr); > - tinstr = __mem_to_opcode_thumb16(tinstr); > + > + fault = alignment_get_thumb(regs, ptr, &tinstr); > if (!fault) { > if (cpu_architecture() >= CPU_ARCH_ARMv7 && > IS_T32(tinstr)) { > /* Thumb-2 32-bit */ > - u16 tinst2 = 0; > - fault = probe_kernel_address(ptr + 1, tinst2); > - tinst2 = __mem_to_opcode_thumb16(tinst2); > + u16 tinst2; > + fault = alignment_get_thumb(regs, ptr + 1, &tinst2); > instr = __opcode_thumb32_compose(tinstr, tinst2); > thumb2_32b = 1; > } else { > @@ -801,8 +830,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) > } > } > } else { > - fault = probe_kernel_address((void *)instrptr, instr); > - instr = __mem_to_opcode_arm(instr); > + fault = alignment_get_arm(regs, (void *)instrptr, &instr); > } > > if (fault) { > -- > 2.7.4 > > -- > RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ > FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up > According to speedtest.net: 11.9Mbps down 500kbps up > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel