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 E958BC11D0C for ; Thu, 20 Feb 2020 15:14:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AF4F6208CD for ; Thu, 20 Feb 2020 15:14:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BfHVbkqr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF4F6208CD 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 5AFD96B0003; Thu, 20 Feb 2020 10:14:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 560216B0006; Thu, 20 Feb 2020 10:14:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 44EB16B0007; Thu, 20 Feb 2020 10:14:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0090.hostedemail.com [216.40.44.90]) by kanga.kvack.org (Postfix) with ESMTP id 290766B0003 for ; Thu, 20 Feb 2020 10:14:40 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id D16031EF2 for ; Thu, 20 Feb 2020 15:14:39 +0000 (UTC) X-FDA: 76510852278.22.ship51_2fc7364f72862 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id 018BD18039626 for ; Thu, 20 Feb 2020 15:08:48 +0000 (UTC) X-HE-Tag: ship51_2fc7364f72862 X-Filterd-Recvd-Size: 5808 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 15:08:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582211327; 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=BfHVbkqrl8hR2oAWDU56o0DXSn9tGIqrPhAVmARjUsnUdzMP+1ecxrdy4J0FOVg7/TZrw+ X2d/nwo4NR8AA6drdSReUggwNo6GP6cNITNfsKP4DhY8syspdXampwGGLZZJjWk4rf1KPW yMTmY3UiF5Kjul9W7JXoSyeKfYYqmms= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-407-hutBJAODMpuiWR9yz_Z9yg-1; Thu, 20 Feb 2020 10:08:43 -0500 Received: by mail-qv1-f72.google.com with SMTP id k2so2716447qvu.22 for ; Thu, 20 Feb 2020 07:08:43 -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=O4jw0h3DZq7+9DSFDEayToXAWOZIA+iydHfQlX+X191lIfkrOknytq5d2ccylVRcPO rbcI7U8LDu07HyNiQyEP7MdmABEYvx6iXI7I7gHNd/nlnRJA5mwemm+NjVW7KbOPAopm jX5B4gLmYo0W2PCixXZixmA5Q2RuJtqEa+NtAJPdpE/hi6rxdnVf/EneFBvIDzCQE1Zs vVyRlEHbnVWlYG7g30LjCEULqYNjG6Y08f14+Q2uZmLOt5pYDrpAaAoA0skERegfnU+l pfbsdnCD8lm1VO7zSZxWFiPTK3ZS+82grk0408tcZCXh4C0AsGlA+DYDBJp6Lbhpfvx8 fGRQ== X-Gm-Message-State: APjAAAWjxzNtxjiVkRv3AWbjQpK8q4aVkhS3EaDTXwov9WFMxqNCXXxw ju/YtUoah3V5rTOv9/opOvbiZ0rKUtiyI8Ft7tzY3X6/oW+sLJXahk+w+fPnjdqmocaLu4BRI/K IajFpBiyEFj8= X-Received: by 2002:ad4:446b:: with SMTP id s11mr25652893qvt.148.1582211323384; Thu, 20 Feb 2020 07:08:43 -0800 (PST) X-Google-Smtp-Source: APXvYqxugRDscVk/FXRr8dZM9uPwzbNZ2wMdRN4ctRZZIDdXWnit5dMgCM4q9KKtRycvuX+yljAtAA== X-Received: by 2002:ad4:446b:: with SMTP id s11mr25652871qvt.148.1582211323163; Thu, 20 Feb 2020 07:08:43 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id i28sm2038234qtc.57.2020.02.20.07.08.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 07:08:42 -0800 (PST) From: Peter Xu To: peterx@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: 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 v6 05/16] arc/mm: Use helper fault_signal_pending() Date: Thu, 20 Feb 2020 10:08:40 -0500 Message-Id: <20200220150840.6023-1-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200220145432.4561-1-peterx@redhat.com> References: MIME-Version: 1.0 X-MC-Unique: hutBJAODMpuiWR9yz_Z9yg-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 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_r= egs *regs) =20 =09fault =3D handle_mm_fault(vma, address, flags); =20 +=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; +=09} + =09/* -=09 * Fault retry nuances +=09 * Fault retry nuances, mmap_sem already relinquished by core mm =09 */ -=09if (unlikely(fault & VM_FAULT_RETRY)) { - -=09=09/* -=09=09 * If fault needs to be retried, handle any pending signals -=09=09 * first (by returning to user mode). -=09=09 * mmap_sem already relinquished by core mm for RETRY case -=09=09 */ -=09=09if (fatal_signal_pending(current)) { -=09=09=09if (!user_mode(regs)) -=09=09=09=09goto no_context; -=09=09=09return; -=09=09} -=09=09/* -=09=09 * retry state machine -=09=09 */ -=09=09if (flags & FAULT_FLAG_ALLOW_RETRY) { -=09=09=09flags &=3D ~FAULT_FLAG_ALLOW_RETRY; -=09=09=09flags |=3D FAULT_FLAG_TRIED; -=09=09=09goto retry; -=09=09} +=09if (unlikely((fault & VM_FAULT_RETRY) && +=09=09 (flags & FAULT_FLAG_ALLOW_RETRY))) { +=09=09flags &=3D ~FAULT_FLAG_ALLOW_RETRY; +=09=09flags |=3D FAULT_FLAG_TRIED; +=09=09goto retry; =09} =20 bad_area: --=20 2.24.1