From patchwork Thu Feb 20 15:58:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11394353 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 C784714E3 for ; Thu, 20 Feb 2020 15:58:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 941E620659 for ; Thu, 20 Feb 2020 15:58:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IW+xe/wO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 941E620659 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 DA4186B0003; Thu, 20 Feb 2020 10:58:49 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D7B256B0006; Thu, 20 Feb 2020 10:58:49 -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 C919D6B0007; Thu, 20 Feb 2020 10:58:49 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0124.hostedemail.com [216.40.44.124]) by kanga.kvack.org (Postfix) with ESMTP id B22576B0003 for ; Thu, 20 Feb 2020 10:58:49 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 59118441E for ; Thu, 20 Feb 2020 15:58:49 +0000 (UTC) X-FDA: 76510963578.21.fact59_2fdcae2ea3d10 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:30045:30051:30054:30070,0,RBL:207.211.31.120:@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:23,LUA_SUMMARY:none X-HE-Tag: fact59_2fdcae2ea3d10 X-Filterd-Recvd-Size: 5831 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 15:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582214328; 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=ix0dPZjJVB76rbM1PCFd6bGZOtx3n55LnHCJE/Jpzeo=; b=IW+xe/wOZ6b69W0hWImvlXgld7GFfjMCzv8ZI3o4ui+h4rDTrCU+u2n7fcSwPD+m9DKxmV 2hwcIt8AnlejqKZAgmo+W8jbjGchVRw3qfS4JYZUE5UBc0+ocrbjX3NH1uDBe31nOcHn+B 5cp7YD+2TAyEYqu3eTu9oVNaIBvRQX0= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-455-IT-jwOw1NR2UFi0ZV6V5dw-1; Thu, 20 Feb 2020 10:58:46 -0500 Received: by mail-qk1-f198.google.com with SMTP id h6so3023200qkj.14 for ; Thu, 20 Feb 2020 07:58:46 -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=/w+hkaHbcwTCv2DnISajtPMXZj1KshVLgpzoXr7emTA=; b=GT56pug1wvkfUjqAhlYdKk54pvjrK/4y9e/IG7vI65MVT1HcgueJ3c3/1wFPAFQ+am 7llEzYyUllrPliVQgPLfIeVRAleHpVe+kcr4g2mi8BuG0/oFoaEcHd4wMbSta0Heh2rh UGl0KfsBm7WVfAKN+ZJCvEtXRwEMkqIqfNox5QdznAEEqJ+wUyDIKlbclRsH8e+R9pIG EaOUAV/u3fUXM9EOmEzhVlYPUHJ3r5i5pNt0XV9oseNILQGVRb7ve07Jy3dMUGWVvGT4 5qYmpw0pZGnBDheH3KcsqQ/2DEBmAtrn1pzO7075f6f40Ezc2Ni/vwL27JWXLZA25guN PwvA== X-Gm-Message-State: APjAAAXK+HaSuR9bdccB9dlnNeBTyA8DogBcQhkS646GD41wkrRAsZnT ZTONhKuIHgnLCtwHRg3GrujRgTu7UihA/N8emupXq0c+1bK2noaJp/oC378EYGPDDFoQyBi9T7f xcaVQOFeXSF4= X-Received: by 2002:a37:6393:: with SMTP id x141mr25710872qkb.134.1582214326020; Thu, 20 Feb 2020 07:58:46 -0800 (PST) X-Google-Smtp-Source: APXvYqwyG1X8cdmqasz0CGKVZZ1M2qefquTjA2lb+tjrK7SYG+1zTn4dHbhNdwOWnjgE3sv3Ui8bww== X-Received: by 2002:a37:6393:: with SMTP id x141mr25710854qkb.134.1582214325797; Thu, 20 Feb 2020 07:58:45 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id e3sm1965255qtb.65.2020.02.20.07.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 07:58:45 -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 05/16] arc/mm: Use helper fault_signal_pending() Date: Thu, 20 Feb 2020 10:58:43 -0500 Message-Id: <20200220155843.9172-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: IT-jwOw1NR2UFi0ZV6V5dw-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 ARC to use the new helper fault_signal_pending() by moving the signal check out of the retry logic as standalone. This should also helps to simplify the code a bit. Signed-off-by: Peter Xu --- arch/arc/mm/fault.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c index fb86bc3e9b35..6eb821a59b49 100644 --- a/arch/arc/mm/fault.c +++ b/arch/arc/mm/fault.c @@ -133,29 +133,21 @@ void do_page_fault(unsigned long address, struct pt_regs *regs) fault = handle_mm_fault(vma, address, flags); + /* Quick path to respond to signals */ + if (fault_signal_pending(fault, regs)) { + if (!user_mode(regs)) + goto no_context; + return; + } + /* - * Fault retry nuances + * Fault retry nuances, mmap_sem already relinquished by core mm */ - if (unlikely(fault & VM_FAULT_RETRY)) { - - /* - * If fault needs to be retried, handle any pending signals - * first (by returning to user mode). - * mmap_sem already relinquished by core mm for RETRY case - */ - if (fatal_signal_pending(current)) { - if (!user_mode(regs)) - goto no_context; - return; - } - /* - * retry state machine - */ - if (flags & FAULT_FLAG_ALLOW_RETRY) { - flags &= ~FAULT_FLAG_ALLOW_RETRY; - flags |= FAULT_FLAG_TRIED; - goto retry; - } + if (unlikely((fault & VM_FAULT_RETRY) && + (flags & FAULT_FLAG_ALLOW_RETRY))) { + flags &= ~FAULT_FLAG_ALLOW_RETRY; + flags |= FAULT_FLAG_TRIED; + goto retry; } bad_area: