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 9E840C11D05 for ; Thu, 20 Feb 2020 16:09:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 552E7207FD for ; Thu, 20 Feb 2020 16:09:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="J5I37z9y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 552E7207FD 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 02EDE6B000A; Thu, 20 Feb 2020 11:09:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F21F36B000C; Thu, 20 Feb 2020 11:09:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E37B16B000D; Thu, 20 Feb 2020 11:09:40 -0500 (EST) 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 CC23F6B000A for ; Thu, 20 Feb 2020 11:09:40 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 5035B8248D52 for ; Thu, 20 Feb 2020 16:09:40 +0000 (UTC) X-FDA: 76510990920.28.woman40_5087d6d906c29 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id D2984EFFA for ; Thu, 20 Feb 2020 16:02:33 +0000 (UTC) X-HE-Tag: woman40_5087d6d906c29 X-Filterd-Recvd-Size: 5628 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Thu, 20 Feb 2020 16:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582214552; 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=tdCfp5hN9Tk1o8n2YEwsnPGRE8h9WOXCXi5/jH5tncw=; b=J5I37z9yf8idrSqnpxcmvLOJ8jlcCewjZRoZuZvmyQd/dW9y2qA/tsIFragVLkDvYx6in2 6FKfqHOy1R2hvxgztSScrf6LmdiAZrdNUL5/XjRDlZrL2hrAyecqG8mw7pj27KOKXKzny9 6XM1oV1PkbfhIP9xRgXlQzfXw67kaTY= 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-389-HwqE1AW7OrG0G6OUTl3X1Q-1; Thu, 20 Feb 2020 11:02:31 -0500 Received: by mail-qt1-f197.google.com with SMTP id e8so2894746qtg.9 for ; Thu, 20 Feb 2020 08:02:30 -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=Gswwep3mXTBLLb6Vi32okBT2PfDu/kHkaO+Nde6OuPk=; b=UFZhsPVIQVfEbxZsJTISnrgs9BKoRlp/RMnjGV0E0Ye/VFUqREVWAA6umyIyqJZ6yE UdMHFFUYw07+pVeQa7TlgdS68Rq5N2kO0/4z7LnrAqasFa79Ap6lPek9GFqPbq4N/lKu DYJsH1eLkV9nMHqkrorJjzoWt+W1ebWhkbh0WLzVa3jTeg7r18lUWiQ5KSzqrbNyFYrN SyY4v+BreBQFO8XB80Ib36nO9+H6CLnGC9FIIPHIahQMG2Ap8vmg4WO01wpp9KnXHub5 xB5Pyk3EQY/a8H7z4etNJ/WbeXg6o2Uq11fflY/AWMfaWnNGMFIDcEqrGoBsNdc/J0VT qfxQ== X-Gm-Message-State: APjAAAVmJ3Wrga91c0rlg7sJJXRhnLxbG4/bsFMr11UnUj9JTgTflLvX zw3eS7BetaJPQSBQ53BKr4CQGryetbNlsmZM80yzYkyzDzc0E5W5nuuM0BnDaV1bCuYQeMDp25+ 4+t5jmNyGi88= X-Received: by 2002:a05:620a:20c1:: with SMTP id f1mr8514896qka.229.1582214549959; Thu, 20 Feb 2020 08:02:29 -0800 (PST) X-Google-Smtp-Source: APXvYqz7hBw2gg2WOpOLEqAOvRZ+ql2BYdirmepbIVkV4khoEHxFeBq3KgVo+cKJ5pK2t7V8VjEMIw== X-Received: by 2002:a05:620a:20c1:: with SMTP id f1mr8514853qka.229.1582214549733; Thu, 20 Feb 2020 08:02:29 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.75]) by smtp.gmail.com with ESMTPSA id 89sm1957073qth.3.2020.02.20.08.02.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 08:02:28 -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 08/16] sh/mm: Use helper fault_signal_pending() Date: Thu, 20 Feb 2020 11:02:26 -0500 Message-Id: <20200220160226.9550-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: HwqE1AW7OrG0G6OUTl3X1Q-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 SH to use the new fault_signal_pending() helper. Here we'll need to move the up_read() out because that's actually needed as long as !RETRY cases. At the meantime we can drop all the rest of up_read()s now (which seems to be cleaner). Signed-off-by: Peter Xu --- arch/sh/mm/fault.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c index 5f51456f4fc7..eb4048ad0b38 100644 --- a/arch/sh/mm/fault.c +++ b/arch/sh/mm/fault.c @@ -302,25 +302,25 @@ mm_fault_error(struct pt_regs *regs, unsigned long er= ror_code, =09 * Pagefault was interrupted by SIGKILL. We have no reason to =09 * continue pagefault. =09 */ -=09if (fatal_signal_pending(current)) { -=09=09if (!(fault & VM_FAULT_RETRY)) -=09=09=09up_read(¤t->mm->mmap_sem); +=09if (fault_signal_pending(fault, regs)) { =09=09if (!user_mode(regs)) =09=09=09no_context(regs, error_code, address); =09=09return 1; =09} =20 +=09/* Release mmap_sem first if necessary */ +=09if (!(fault & VM_FAULT_RETRY)) +=09=09up_read(¤t->mm->mmap_sem); + =09if (!(fault & VM_FAULT_ERROR)) =09=09return 0; =20 =09if (fault & VM_FAULT_OOM) { =09=09/* Kernel mode? Handle exceptions or die: */ =09=09if (!user_mode(regs)) { -=09=09=09up_read(¤t->mm->mmap_sem); =09=09=09no_context(regs, error_code, address); =09=09=09return 1; =09=09} -=09=09up_read(¤t->mm->mmap_sem); =20 =09=09/* =09=09 * We ran out of memory, call the OOM killer, and return the --=20 2.24.1