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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 02FC4C4360C for ; Thu, 26 Sep 2019 09:40:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C6280222BE for ; Thu, 26 Sep 2019 09:40:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6280222BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 79E8E6B0266; Thu, 26 Sep 2019 05:40:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74FF06B0269; Thu, 26 Sep 2019 05:40:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 63F176B026A; Thu, 26 Sep 2019 05:40:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0056.hostedemail.com [216.40.44.56]) by kanga.kvack.org (Postfix) with ESMTP id 4633E6B0266 for ; Thu, 26 Sep 2019 05:40:19 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 022052A4AE for ; Thu, 26 Sep 2019 09:40:19 +0000 (UTC) X-FDA: 75976576116.12.wound93_7718b520d0b21 X-HE-Tag: wound93_7718b520d0b21 X-Filterd-Recvd-Size: 4534 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by imf07.hostedemail.com (Postfix) with ESMTP for ; Thu, 26 Sep 2019 09:40:18 +0000 (UTC) Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6254388306 for ; Thu, 26 Sep 2019 09:40:17 +0000 (UTC) Received: by mail-pg1-f200.google.com with SMTP id w13so1069943pge.15 for ; Thu, 26 Sep 2019 02:40:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LpCSyY/6JZQuJ1z7pLkTHdeWJUVPhg/tAxJyi5b+KHU=; b=twSLJiVMh02O+HVHGOCXS0dt9GjZXfal3YzfEUbEULYKavNr/6ufDbs5c9d6atUI9z gka5kfVhymFudWL44v4BW7IkoatQ+GmvRIauuoBUfryOs8AURmu7svsXFTpXDe2x8A+6 CmU/TyQIJxWvbWEeaIR5p3mNii8tUptPpIXMWyjII3CGuedjl4POF4G5bxuTJW0b3Xps 9B9wwxD2tlu7G/a+GkHFms4V6/JRZ0kOCQe4qsEYBAy5x2OZAaWC97LZEVi+8GsXp2Y+ jPfoqaCCuAAk2cV57mwG1nYbk+Penao16ItIfV4Zh2PJlIDZL89krL6PIkMsWGb2mho7 QebA== X-Gm-Message-State: APjAAAUpmbfD9vU2apxYbYsD5DImsb1fhwTgBEweNT95Y0TW6v8vJXtc Plr8wvbkS6BjktKOAVtXXn7Pdy/JtFrrc1pKUIaLMaPXhB1Es1WSRI11pCFb7PQyk5ahSR4RAu/ 2xrWkQrbdCzQ= X-Received: by 2002:a63:a369:: with SMTP id v41mr2525765pgn.148.1569490816503; Thu, 26 Sep 2019 02:40:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKACEquhcLFybN2y5JPp/3ZKltqjkLTVK4ufHCX/1hwGKZNzOpTcD/V3ar6+4lQuJZ+kgFxw== X-Received: by 2002:a63:a369:: with SMTP id v41mr2525726pgn.148.1569490816214; Thu, 26 Sep 2019 02:40:16 -0700 (PDT) Received: from xz-x1.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id p68sm3224982pfp.9.2019.09.26.02.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2019 02:40:15 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Hugh Dickins , Maya Gokhale , Jerome Glisse , Pavel Emelyanov , Johannes Weiner , peterx@redhat.com, Martin Cracauer , Matthew Wilcox , Shaohua Li , Marty McFadden , Andrea Arcangeli , Mike Kravetz , Denis Plotnikov , Mike Rapoport , Linus Torvalds , Mel Gorman , "Kirill A . Shutemov" , "Dr . David Alan Gilbert" Subject: [PATCH v5 07/16] powerpc/mm: Use helper fault_signal_pending() Date: Thu, 26 Sep 2019 17:38:55 +0800 Message-Id: <20190926093904.5090-8-peterx@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190926093904.5090-1-peterx@redhat.com> References: <20190926093904.5090-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Let powerpc code to use the new helper, by moving the signal handling earlier before the retry logic. Signed-off-by: Peter Xu --- arch/powerpc/mm/fault.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 8432c281de92..7dabd1243f1b 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -583,6 +583,9 @@ static int __do_page_fault(struct pt_regs *regs, unsi= gned long address, =20 major |=3D fault & VM_FAULT_MAJOR; =20 + if (fault_signal_pending(fault, regs)) + return user_mode(regs) ? 0 : SIGBUS; + /* * Handle the retry right now, the mmap_sem has been released in that * case. @@ -596,15 +599,8 @@ static int __do_page_fault(struct pt_regs *regs, uns= igned long address, */ flags &=3D ~FAULT_FLAG_ALLOW_RETRY; flags |=3D FAULT_FLAG_TRIED; - if (!fatal_signal_pending(current)) - goto retry; + goto retry; } - - /* - * User mode? Just return to handle the fatal exception otherwise - * return to bad_page_fault - */ - return is_user ? 0 : SIGBUS; } =20 up_read(¤t->mm->mmap_sem); --=20 2.21.0