From patchwork Thu Feb 20 16:02:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11394373 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5A68C92A for ; Thu, 20 Feb 2020 16:06:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 271BC208C4 for ; Thu, 20 Feb 2020 16:06:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FM98rEKv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 271BC208C4 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 70E606B0008; Thu, 20 Feb 2020 11:06:25 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6E5EC6B000A; Thu, 20 Feb 2020 11:06:25 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FCEA6B000C; Thu, 20 Feb 2020 11:06:25 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0009.hostedemail.com [216.40.44.9]) by kanga.kvack.org (Postfix) with ESMTP id 492876B0008 for ; Thu, 20 Feb 2020 11:06:25 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id EA6751817C790 for ; Thu, 20 Feb 2020 16:06:24 +0000 (UTC) X-FDA: 76510982688.03.band22_4fd2bf6516c53 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id 2D1FA38EE7 for ; Thu, 20 Feb 2020 16:02:29 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,peterx@redhat.com,::linux-kernel@vger.kernel.org:peterx@redhat.com:cracauer@cons.org:rppt@linux.vnet.ibm.com:hughd@google.com:jglisse@redhat.com:kirill@shutemov.name:willy@infradead.org:xemul@virtuozzo.com:bgeffon@google.com:gokhale2@llnl.gov:dplotnikov@virtuozzo.com:aarcange@redhat.com:hannes@cmpxchg.org:dgilbert@redhat.com:torvalds@linux-foundation.org:mike.kravetz@oracle.com:mcfadden8@llnl.gov:david@redhat.com:bobbypowers@gmail.com:mgorman@suse.de,RULES_HIT:30003:30012:30051:30054,0,RBL:207.211.31.81:@redhat.com:.lbl8.mailshell.net-66.10.201.10 62.18.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: band22_4fd2bf6516c53 X-Filterd-Recvd-Size: 5358 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 16:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582214548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K6KHg9Q8gXuEcfH9sGGaIFMDVf1r4JXOUxbuabX3x7Y=; b=FM98rEKvxgNtKZ/mpZddZgnkP51JI7pnv5Gt1oBaexWHDL16qncj9PC+h4ThhJ71yg8Kd3 X6H2+4DwyQzqDurBX1m7aYpITJreCE3nkGErUy/BYAaC1jlxUKB52LmHeVqH7welLlU3vv b6ckQMPKSorZntDiRnFGhgYDqb43Y2A= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-339-oH3arNu-ObuNwN-ub6P-Hg-1; Thu, 20 Feb 2020 11:02:26 -0500 Received: by mail-qv1-f69.google.com with SMTP id v19so2838989qvk.16 for ; Thu, 20 Feb 2020 08:02:26 -0800 (PST) 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=hbwtB78+GrmjAgtuBkp/5M+dteqsFUb6HTGdpyT5C/M=; b=LLNzpPKy5oAIWNZc1Er9YWTO1R6ancMhJmt7yM5gwKB3hb5uHZ5JZtvBINCelkqnFG R6v2nzhTAfUOw+9MWnPj/ZJ60rOEQDKHhiKXsRil9TUmeu9ybV24YqSCzhm7Z5aDTq9o jZsGXALDNNbPzWJNe1S2JWkGeG/E77ySnnLzuGE32gXF0Ctj8SabNxFX129Qk/3Xs9YY HBrFlZFzMotYrmPGrj8FrTBR6+8qG7of2z5ZwxvDNBqH7h0RzsTOtUb30GOe6okxfXNw UxWCFzbRWN//vhiGZ1nDUBMk055z2+U8Wa76p4ylW2lcNbu0pVYC7I5Qlpw0dZM6O4kk AdWw== X-Gm-Message-State: APjAAAXhKAo7avAo+KIq4TCm4tNi3Um3oalJn88pFndXnYIr/gZhzJiE XBzPZGamQTFO0wgE45iZa4J6mUkV2G3TqFPdWzlkOX+WZT+TKtW6ePQFH4IzA6vxyOlFUjVEQwm lZa9ZY2y0x2Q= X-Received: by 2002:a05:620a:1656:: with SMTP id c22mr29866255qko.144.1582214545475; Thu, 20 Feb 2020 08:02:25 -0800 (PST) X-Google-Smtp-Source: APXvYqxAKv5wpNeJTADqrEPJkZSXqFJ+Srl5Hx+rjfv0aI9xLkhXUkuB0gk2HFLl4PavjsFYL99WWg== X-Received: by 2002:a05:620a:1656:: with SMTP id c22mr29866224qko.144.1582214545238; Thu, 20 Feb 2020 08:02:25 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id d206sm1816478qke.66.2020.02.20.08.02.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 08:02:24 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Peter Xu , Martin Cracauer , Mike Rapoport , Hugh Dickins , Jerome Glisse , "Kirill A . Shutemov" , Matthew Wilcox , Pavel Emelyanov , Brian Geffon , Maya Gokhale , Denis Plotnikov , Andrea Arcangeli , Johannes Weiner , "Dr . David Alan Gilbert" , Linus Torvalds , Mike Kravetz , Marty McFadden , David Hildenbrand , Bobby Powers , Mel Gorman Subject: [PATCH RESEND v6 07/16] powerpc/mm: Use helper fault_signal_pending() Date: Thu, 20 Feb 2020 11:02:22 -0500 Message-Id: <20200220160222.9422-1-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200220155353.8676-1-peterx@redhat.com> References: MIME-Version: 1.0 X-MC-Unique: oH3arNu-ObuNwN-ub6P-Hg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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 8db0507619e2..0868172ce4e3 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -582,6 +582,9 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, major |= fault & VM_FAULT_MAJOR; + 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. @@ -595,15 +598,8 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, */ flags &= ~FAULT_FLAG_ALLOW_RETRY; flags |= 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; } up_read(¤t->mm->mmap_sem);