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 C61FBC11D0C for ; Thu, 20 Feb 2020 15:54:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8CD9424656 for ; Thu, 20 Feb 2020 15:54:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I0HtYh8M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8CD9424656 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 78DE76B000A; Thu, 20 Feb 2020 10:54:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 73E1E6B000C; Thu, 20 Feb 2020 10:54:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6543E6B000D; Thu, 20 Feb 2020 10:54:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0149.hostedemail.com [216.40.44.149]) by kanga.kvack.org (Postfix) with ESMTP id 4F2716B000A for ; Thu, 20 Feb 2020 10:54:10 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 01DBD33C4 for ; Thu, 20 Feb 2020 15:54:09 +0000 (UTC) X-FDA: 76510951860.24.roll57_735fb61eab33 X-HE-Tag: roll57_735fb61eab33 X-Filterd-Recvd-Size: 5958 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 15:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582214049; 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=I0HtYh8MXpajDacOYwEuGdLFK7ktsUurBZa7ShTG3wxg2ttkgH9BoVAOy1Lm04oM3GXqby fRmIaW96JtQT1q2NazY/HhRem5zY5Qj3r5Ylee86vjrohNdSSLvNj8T1So4fWTNbJqRbBD w9C7Z84uYRl3OT2cPsXmb/W0ZB7vMLk= 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-418-FjXll0rtMnqam1SB1Pr1Rw-1; Thu, 20 Feb 2020 10:54:07 -0500 Received: by mail-qt1-f197.google.com with SMTP id g26so2856482qts.16 for ; Thu, 20 Feb 2020 07:54: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=3cu+nCrF0vUC0DWPMISJ46Dyo+A/qgWPAj0jcXPlop0=; b=bK8AZ9y4nqJSOfpyYzydhtMD0nyVbMosNHtxcVk1S/S++MxIyjmRS8n3UUOJgetApY TZF7uTVU2dyTVGvVfNxy5E0axFZWY0u6CPJp1bcrQuOW6LKOm0j02Hx4XlrOd+C7I19M meFMS/hGKY2qevEweDPKe4nn9xfYgyNj2CC6EnYGtHm6DljLlPFYVdLgXB0DLoJJcOcl VZRBsK+gARD1PQOLtXv+QKueqRBGqPRY7EM+Gmw62NF2Ekgz5ymV0OL8oSgOgb6fcduY lTE8BCMKl+0KLmJIvnZ1VIHyCZRUwMtOLUsBercDOtCvOsfE/i+IUe1EFoBk2s6LnfYP Epnw== X-Gm-Message-State: APjAAAU19ZMgA5HyZBsV5aQVuoVmtS+1fW6qLFBQyPG6dEGCG1LMsFOy AWq4huHKU4IjINbHdpbzWT8dwg/CyWNHW+uHTROawlqkzX3Fkz6+8DROBtHv2oQdnObo26t8zML B5pntFLM4tl0= X-Received: by 2002:ae9:e003:: with SMTP id m3mr8332096qkk.250.1582214044029; Thu, 20 Feb 2020 07:54:04 -0800 (PST) X-Google-Smtp-Source: APXvYqzqBbfVrw6oW5Uq7giseK/Asl8XiArti83tm8uh5tXmEmh2Vf3Qyj45T3Pp+ZWIGYPfmKisVw== X-Received: by 2002:ae9:e003:: with SMTP id m3mr8332062qkk.250.1582214043787; Thu, 20 Feb 2020 07:54:03 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id h20sm1807430qkk.64.2020.02.20.07.54.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 07:54:03 -0800 (PST) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrea Arcangeli , Martin Cracauer , Linus Torvalds , Mike Rapoport , "Kirill A . Shutemov" , Johannes Weiner , "Dr . David Alan Gilbert" , David Hildenbrand , Bobby Powers , Maya Gokhale , Jerome Glisse , Mike Kravetz , Matthew Wilcox , Marty McFadden , Mel Gorman , peterx@redhat.com, Hugh Dickins , Brian Geffon , Denis Plotnikov , Pavel Emelyanov Subject: [PATCH RESEND v6 04/16] x86/mm: Use helper fault_signal_pending() Date: Thu, 20 Feb 2020 10:53:41 -0500 Message-Id: <20200220155353.8676-5-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200220155353.8676-1-peterx@redhat.com> References: <20200220155353.8676-1-peterx@redhat.com> MIME-Version: 1.0 X-MC-Unique: FjXll0rtMnqam1SB1Pr1Rw-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