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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 6CE93C2BB55 for ; Thu, 9 Apr 2020 07:11:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 491E720CC7 for ; Thu, 9 Apr 2020 07:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586416304; bh=wIzCP0gZc5gZ4iaUTsQ4CZPx42tB1XSkzmrE16eZ53o=; h=From:To:Cc:Subject:Date:List-ID:From; b=PKSJ50N6A2Z8FftKS2OUBA5+2zwG/i4R2Gghstqd/pqtLXFH4LASnVKWV2D+qjyfE SYhM7o30zb+Sc8+zfoEOk/tZcU50+5DdxYQ24H6wfZU8WExeDCZOzAs1cSOTkJ7tj8 C4TK5ZkPtUufCU6aBwxf2/C+4D1eV4nmfrWT3FUI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726470AbgDIHLm (ORCPT ); Thu, 9 Apr 2020 03:11:42 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53031 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725795AbgDIHLm (ORCPT ); Thu, 9 Apr 2020 03:11:42 -0400 Received: by mail-wm1-f65.google.com with SMTP id t203so2767015wmt.2 for ; Thu, 09 Apr 2020 00:11:41 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=5eSqljophK3J9QMb2IVJwDYwOtfnnEmsDgtCr/TVwbc=; b=g+VdDocBUMc7YkfrlGnOBmSeZKLad8EJkluGT+HvtTsBY9v9IAnZKIblY/097oINC9 rNn5X9eaApO/7mVS549G+9AITMdLt3Ew7DoL3kF3iYVQnaLR435jeL9iIXJ64jImPlfw MWj9JnS/tsD4Dl3/bgWvQHrh69WhL2jZCC5XpJscZM8HN6K4WwDtWfsIDkxcDzidO8/6 yGYdYP+hJErvKs90X7Zfvdf/os7ciUKLKiN1yJ9294yzH75j1pRmDekN+JdsJSwKMe0v 9jX7JMC6nu6nK1fwbvkIrzdTKdYYEq3jybVJvhvQZBVQIJx6F/J12cgzi1w95XB4JHYh evuw== X-Gm-Message-State: AGi0PubVL2cN8BJcCAVw06wF4NU5ihNqRT9G3NaJW6fubC/AoXhd+31f jjI12VZh3BW6o06WCrWfy0s18BkO X-Google-Smtp-Source: APiQypJ9YxTqJw7coXnf6Q2zGizMBjvKOUWP9ykWZFEHY+j0GH24P0x9faxr/NX2H95YcLo04gU1BA== X-Received: by 2002:a1c:1904:: with SMTP id 4mr8426305wmz.21.1586416300444; Thu, 09 Apr 2020 00:11:40 -0700 (PDT) Received: from tiehlicka.suse.cz (ip-37-188-180-223.eurotel.cz. [37.188.180.223]) by smtp.gmail.com with ESMTPSA id v186sm2570051wme.24.2020.04.09.00.11.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2020 00:11:39 -0700 (PDT) From: Michal Hocko To: Andrew Morton Cc: Linus Torvalds , Peter Xu , Hillf Danton , , LKML , Michal Hocko Subject: [PATCH] mm, gup: return EINTR when gup is interrupted by fatal signals Date: Thu, 9 Apr 2020 09:11:33 +0200 Message-Id: <20200409071133.31734-1-mhocko@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michal Hocko EINTR is the usual error code which other killable interfaces return. This is the case for the other fatal_signal_pending break out from the same function. Make the code consistent. ERESTARTSYS is also quite confusing because the signal is fatal and so no handling will happen before returning to the userspace. Signed-off-by: Michal Hocko --- mm/gup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/gup.c b/mm/gup.c index 6076df8e04a4..50681f0286de 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1088,7 +1088,7 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, * potentially allocating memory. */ if (fatal_signal_pending(current)) { - ret = -ERESTARTSYS; + ret = -EINTR; goto out; } cond_resched(); -- 2.25.1