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 715F2C11D0B for ; Thu, 20 Feb 2020 15:11:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 310D924672 for ; Thu, 20 Feb 2020 15:11:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bxXYXBoT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 310D924672 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 D038C6B0006; Thu, 20 Feb 2020 10:11:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CB40D6B0007; Thu, 20 Feb 2020 10:11:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA31D6B0008; Thu, 20 Feb 2020 10:11:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0191.hostedemail.com [216.40.44.191]) by kanga.kvack.org (Postfix) with ESMTP id 9E8DA6B0006 for ; Thu, 20 Feb 2020 10:11:11 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 506891803814A for ; Thu, 20 Feb 2020 15:11:11 +0000 (UTC) X-FDA: 76510843542.23.frogs30_447770cfe4653 X-HE-Tag: frogs30_447770cfe4653 X-Filterd-Recvd-Size: 5826 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 15:11:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582211470; 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=bxXYXBoTZkb5RAYMFSciWRXOQQWS2isHrZrEMgL3fzj0iAEiLwI+bO+uMcKymLtuISvciJ LzTvy9F27/O+bldZZs8kiDwwruLJJhTUEXnFhSq8BeK28suJ3ntPGrGRzCAhhAvuwhbCa7 G1EYezELEwKV00EuqlOA7bfyr9yYY94= 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-475-tlAmPqicMQGS7U-F30FZdg-1; Thu, 20 Feb 2020 10:11:07 -0500 Received: by mail-qt1-f198.google.com with SMTP id t4so2780661qtd.3 for ; Thu, 20 Feb 2020 07:11:07 -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=QU9FfmiFfexjK3G35Y8/SItJRfvL5z9E2A46OEKwaxxwk6CSxI2qrtpiBknZakYldP k9sIWoDZV8eCslBNDYtz3t2u+UZpCEKzYB6vrV1Vgwgw6zIo9RTrJMH2f6vjUWopVbv/ pvWkoJsZkI2a8pQ5kdbnb30yAIAJqmR6x2MSTjRg4Dz3H5ekw+AiEF07jFisv7FrLXsQ 1cVMWr506CExYhR1clxLy57t6p3I2AZq+jI/waXY0aOlm5MO3jgr46huq71vDWVBrT63 I1A7lt8HWR14uWre9gLeEvpQT9f4AulOxkiaPizYyL/bhxwJdgF5l4i1/CPuKeONQNhJ pzeQ== X-Gm-Message-State: APjAAAUYHKuQwj5H5hiuMYLbOjYPjyElLlcUvJ/dNm+kzvE60NSuyLlS lyuL7M+rD6zo3KmRXa+E2oiLI2M67sUnb9TMjBcPuzmLtFLoP/jADbxTfy1MZ9UEy9w5dLbX96c r3VGswYlsOfc= X-Received: by 2002:a05:620a:a46:: with SMTP id j6mr8265974qka.109.1582211466812; Thu, 20 Feb 2020 07:11:06 -0800 (PST) X-Google-Smtp-Source: APXvYqwR7hidHlSuEeLLLMqn+MwWLL469eKR6zA2KtaXbpUkzYziS8akYXrX2mtQwFOIflqeB0axFA== X-Received: by 2002:a05:620a:a46:: with SMTP id j6mr8265940qka.109.1582211466592; Thu, 20 Feb 2020 07:11:06 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id u12sm1756003qke.67.2020.02.20.07.11.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 07:11:05 -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 v6 05/16] arc/mm: Use helper fault_signal_pending() Date: Thu, 20 Feb 2020 10:11:04 -0500 Message-Id: <20200220151104.6183-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: tlAmPqicMQGS7U-F30FZdg-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