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.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 7F666C11D0B for ; Thu, 20 Feb 2020 15:59:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3D5A320659 for ; Thu, 20 Feb 2020 15:59:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TyP2grp2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D5A320659 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 E3F8D6B0006; Thu, 20 Feb 2020 10:59:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DEF066B0007; Thu, 20 Feb 2020 10:59:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDE8A6B0008; Thu, 20 Feb 2020 10:59:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0093.hostedemail.com [216.40.44.93]) by kanga.kvack.org (Postfix) with ESMTP id B39086B0006 for ; Thu, 20 Feb 2020 10:59:34 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 58690824805A for ; Thu, 20 Feb 2020 15:59:34 +0000 (UTC) X-FDA: 76510965468.17.wax55_3668a55623025 X-HE-Tag: wax55_3668a55623025 X-Filterd-Recvd-Size: 5460 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf05.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 15:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582214373; 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=9Mae8/Wn0E6LvxLbMQSvVyx6LK9e0YqEaWW7XGCBXFY=; b=TyP2grp2g5frwEFx9KaD+nnqoAg6f0xMqPCn9+45nUE+Cv4hWR4Ro70ZTvL2tVae3URcPc DfQk+CzPPmOko/q4etW8P88ayPqYq3c66x7egv0jL2YAbKzL9V0VrsOnI74XFuq7dF50FL +lrhhqO3wuzIIIxIZTOLK8BlC+4ZvMM= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-dFgRnTj_O1qQHe58Jvrq8A-1; Thu, 20 Feb 2020 10:59:31 -0500 Received: by mail-qt1-f198.google.com with SMTP id p12so2881848qtu.6 for ; Thu, 20 Feb 2020 07:59:31 -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=clSHatG5ia5Xw2+IhpCP8KXnor3d1UGZTno0w+4svMM=; b=oHaxDQynuqMTSdmJy2ISkwf1vKJgIqy3Mx7VvAy0OSKcgsBzu2GEPdMxxjE/6QoDIj /eAPpQEMu6TNyD7XUiptS59YWLJHLPPENoNmb7FNJAnso09dGu3F7OxqzNkP7Uz3/Ctv DWv9xho/bJmGrr69bIVz4MiTMHhj0s1IPLPg2bgES8H/fO+w/CS8fi4eqUSm8+D6POdn fyvLy5so52M6omQWFEdM+BwCmevGIBjueYPEvhVBy6tkJ2zddRrF9ndqBxjQcYf5aLDQ gl+YC8+AqxHmahQUTSu5niFaPU2Dkt/KzYMyOpKLyo4jAIMqeGTZYnxnoD8K6M2jLaBc hWjQ== X-Gm-Message-State: APjAAAXzWrqPHTkE4vLaXZwEUbUhxzG14VrR5p/qZuQ2qB1NNL8QKwMh 7pA8hlEH0giYF5ue8GhT85ZyxaOP1rw7DKdLERsMHGvTY5prI5m2tXr4f/STq92fDwv5Jg3gluF xuSjI4Ko8u8U= X-Received: by 2002:ac8:498f:: with SMTP id f15mr27215528qtq.123.1582214370321; Thu, 20 Feb 2020 07:59:30 -0800 (PST) X-Google-Smtp-Source: APXvYqyd0Ii6YqQTuro4Ca0AkNt1/BWMO+NYngxZwnnSIE26fYpZaltQKEapAWU5vn2SxzQrYlBfBg== X-Received: by 2002:ac8:498f:: with SMTP id f15mr27215485qtq.123.1582214370052; Thu, 20 Feb 2020 07:59:30 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id f2sm1705818qkm.81.2020.02.20.07.59.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 07:59:29 -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 06/16] arm64/mm: Use helper fault_signal_pending() Date: Thu, 20 Feb 2020 10:59:27 -0500 Message-Id: <20200220155927.9264-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: dFgRnTj_O1qQHe58Jvrq8A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII 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 the arm64 fault handling to use the new fault_signal_pending() helper, by moving the signal handling out of the retry logic. Signed-off-by: Peter Xu --- arch/arm64/mm/fault.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 85566d32958f..6f4b69d712b1 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -513,19 +513,14 @@ static int __kprobes do_page_fault(unsigned long addr= , unsigned int esr, =09fault =3D __do_page_fault(mm, addr, mm_flags, vm_flags); =09major |=3D fault & VM_FAULT_MAJOR; =20 -=09if (fault & VM_FAULT_RETRY) { -=09=09/* -=09=09 * If we need to retry but a fatal signal is pending, -=09=09 * handle the signal first. We do not need to release -=09=09 * the mmap_sem because it would already be released -=09=09 * in __lock_page_or_retry in mm/filemap.c. -=09=09 */ -=09=09if (fatal_signal_pending(current)) { -=09=09=09if (!user_mode(regs)) -=09=09=09=09goto no_context; -=09=09=09return 0; -=09=09} +=09/* Quick path to respond to signals */ +=09if (fault_signal_pending(fault, regs)) { +=09=09if (!user_mode(regs)) +=09=09=09goto no_context; +=09=09return 0; +=09} =20 +=09if (fault & VM_FAULT_RETRY) { =09=09/* =09=09 * Clear FAULT_FLAG_ALLOW_RETRY to avoid any risk of =09=09 * starvation. --=20 2.24.1