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 6C0A3C11D05 for ; Thu, 20 Feb 2020 15:04:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2CAA8206F4 for ; Thu, 20 Feb 2020 15:04:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Y9F3B8Wx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2CAA8206F4 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 C1E486B0003; Thu, 20 Feb 2020 10:04:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BA8686B0006; Thu, 20 Feb 2020 10:04:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A96986B0007; Thu, 20 Feb 2020 10:04:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0005.hostedemail.com [216.40.44.5]) by kanga.kvack.org (Postfix) with ESMTP id 8F8796B0003 for ; Thu, 20 Feb 2020 10:04:05 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 204EF8121 for ; Thu, 20 Feb 2020 15:04:05 +0000 (UTC) X-FDA: 76510825650.29.spark19_8832512dc421f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 81EBC180357EE for ; Thu, 20 Feb 2020 15:02:16 +0000 (UTC) X-HE-Tag: spark19_8832512dc421f X-Filterd-Recvd-Size: 5924 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 15:02:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582210935; 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=jA/g41ZdT9uQdQzbxcFcG7CIWGCxqz3RKQnx0Esp5/I=; b=Y9F3B8WxoHro3gkRVla0zs1Erh4Qsqu5jp9FQ8TQy1U/PEXc8EpDYUUNC6N2+4IEu8dWu5 f1Lc1YvMxIZSWrQ86CZn2/6sCYP6heAke+BaMhxblNUmL2YrneXdm36mSCw7FLEZjBQnQk vOn/z2MNHbUww/NNw1uePATPj0K3XvU= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-312-B4fQC9lHPRSvHW0SjVV6Uw-1; Thu, 20 Feb 2020 10:02:12 -0500 Received: by mail-qt1-f197.google.com with SMTP id c8so2728066qte.22 for ; Thu, 20 Feb 2020 07:02:12 -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=3cu+nCrF0vUC0DWPMISJ46Dyo+A/qgWPAj0jcXPlop0=; b=ciZ/k9fiyFzSOMruE0p+2ar/UCy7JwvzSCQIS4GgxviKYSmn/T+cM/AJdrXL7lK2cw Nqn9dBs15ftvEZ7gBPM4WfEjc+6UDQWBOx61+bn+O/9KMju9IWhMtsMW/s7r8s8pG/Cy z2Nga2bDZmrhnyNcQkDsDmVc4EDW1ECBWDGVHS3EjtM/q2gL3eqrGNW/isPocxV2dtCg 3lEd7PzFMdp46dzel51aPQBiXVHoQbMvj85NdpejUxMenkkUaxMgo9qadNoJnB9WlU42 fKbDjvADCC6MFxTPstgJISa6JXFO1q2rYSZuBpuJg88vKt54Z7Xel9oug8I9pAjiw4So 5okg== X-Gm-Message-State: APjAAAVR7FkR/pFoyTQCpi+RGQBVtGS5SIvPQkZq+1hK1Ou0WQiUqzN3 fs6AwFNK9DhR/QuQSrZEDkXdAzWqdtnbrmc3OY9PzLXi71WBcHDGPi4PuIP+17SR1mb/SVNFecO GGy+16c/+3Nw= X-Received: by 2002:aed:2266:: with SMTP id o35mr27095839qtc.392.1582210931636; Thu, 20 Feb 2020 07:02:11 -0800 (PST) X-Google-Smtp-Source: APXvYqwGhja4fszCZ8iNXLMYYaAL97h6qyMi5Falkk5Bxp02RABcQA3JMqlc0eVFMPDvI16Q+varXQ== X-Received: by 2002:aed:2266:: with SMTP id o35mr27095812qtc.392.1582210931370; Thu, 20 Feb 2020 07:02:11 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id g11sm1956437qtc.48.2020.02.20.07.02.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 07:02:10 -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 04/16] x86/mm: Use helper fault_signal_pending() Date: Thu, 20 Feb 2020 10:02:08 -0500 Message-Id: <20200220150208.5159-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: B4fQC9lHPRSvHW0SjVV6Uw-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's move the fatal signal check even earlier so that we can directly use the new fault_signal_pending() in x86 mm code. Signed-off-by: Peter Xu --- arch/x86/mm/fault.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index fa4ea09593ab..6a00bc8d047f 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1442,27 +1442,25 @@ void do_user_addr_fault(struct pt_regs *regs, =09fault =3D handle_mm_fault(vma, address, flags); =09major |=3D fault & VM_FAULT_MAJOR; =20 +=09/* Quick path to respond to signals */ +=09if (fault_signal_pending(fault, regs)) { +=09=09if (!user_mode(regs)) +=09=09=09no_context(regs, hw_error_code, address, SIGBUS, +=09=09=09=09 BUS_ADRERR); +=09=09return; +=09} + =09/* =09 * If we need to retry the mmap_sem has already been released, =09 * and if there is a fatal signal pending there is no guarantee =09 * that we made any progress. Handle this case first. =09 */ -=09if (unlikely(fault & VM_FAULT_RETRY)) { +=09if (unlikely((fault & VM_FAULT_RETRY) && +=09=09 (flags & FAULT_FLAG_ALLOW_RETRY))) { =09=09/* Retry at most once */ -=09=09if (flags & FAULT_FLAG_ALLOW_RETRY) { -=09=09=09flags &=3D ~FAULT_FLAG_ALLOW_RETRY; -=09=09=09flags |=3D FAULT_FLAG_TRIED; -=09=09=09if (!fatal_signal_pending(tsk)) -=09=09=09=09goto retry; -=09=09} - -=09=09/* User mode? Just return to handle the fatal exception */ -=09=09if (flags & FAULT_FLAG_USER) -=09=09=09return; - -=09=09/* Not returning to user mode? Handle exceptions or die: */ -=09=09no_context(regs, hw_error_code, address, SIGBUS, BUS_ADRERR); -=09=09return; +=09=09flags &=3D ~FAULT_FLAG_ALLOW_RETRY; +=09=09flags |=3D FAULT_FLAG_TRIED; +=09=09goto retry; =09} =20 =09up_read(&mm->mmap_sem); --=20 2.24.1