From patchwork Tue Apr 21 07:10:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 11500601 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 63463112C for ; Tue, 21 Apr 2020 07:10:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3A3182087E for ; Tue, 21 Apr 2020 07:10:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A3182087E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7F1A78E0005; Tue, 21 Apr 2020 03:10:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7C7AC8E0003; Tue, 21 Apr 2020 03:10:45 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68F688E0005; Tue, 21 Apr 2020 03:10:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0165.hostedemail.com [216.40.44.165]) by kanga.kvack.org (Postfix) with ESMTP id 51B7E8E0003 for ; Tue, 21 Apr 2020 03:10:45 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 10A6A4DA8 for ; Tue, 21 Apr 2020 07:10:45 +0000 (UTC) X-FDA: 76730989650.24.hat62_684779e3323d X-Spam-Summary: 2,0,0,afd85edd44668ab1,d41d8cd98f00b204,mstsxfx@gmail.com,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1437:1515:1534:1542:1711:1730:1747:1777:1792:2194:2199:2393:2553:2559:2562:2693:2901:2904:3138:3139:3140:3141:3142:3354:3865:3866:3867:3868:3870:3871:3872:3874:4321:4605:4641:5007:6261:7576:7903:10004:11026:11473:11658:11914:12043:12296:12297:12438:12517:12519:12555:12679:12895:12986:13153:13161:13228:13229:13894:14096:14181:14394:14721:21080:21324:21444:21451:21627:21990:30012:30034:30054:30070:30090,0,RBL:209.85.128.65:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.50.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: hat62_684779e3323d X-Filterd-Recvd-Size: 4696 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Tue, 21 Apr 2020 07:10:44 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id r26so2415934wmh.0 for ; Tue, 21 Apr 2020 00:10:44 -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=JMtPWfIs1hGyzMK76ejFzPGEE/vds8F5cuAAiHiSdag=; b=HbfophfuxByO9kNfkZ3csiD1aM5vtyktB46HwsvdrGwgG880nJjFZDL61TCmBjMRTh 3dqzA3f4giM/osBw4S3UMzcw7vFQcXAmMlW6ySP4PHvNwQDFIEKcYnQ5O61E+5Yk7CeV B2V4nBf8y7ErgUaTSCBAgvyIZfwljMCOBiK8H8LvPnKZSfTpHHYCNtDvQPSNwcK6cOJf hnHXEPN/Oz661wpaIt22kqYaXVW4z9b3jqKUPCXDK47kJQ1Fo1Sjnh6IfZCvXZvJcJIe fLH/4HG3Z/k88te+jDuNjeHf7axccxXG5bP4fTUc2ygFhv0aX9L8/Rf6vGZurCMRpM7y jqiQ== X-Gm-Message-State: AGi0PuYQgVATyQpE8gazXu6S8aFadGkIpc9CpZM1pkEB0HzS/OJm59F5 1btW9bbVINcOlKk98hd27MA= X-Google-Smtp-Source: APiQypJLm0lCOefiYtF3wJooPIWzeIUVrRfnHWpEfEj9o/WnolKahN/iVDZDXBMnKelXqqA2+imjKw== X-Received: by 2002:a05:600c:2314:: with SMTP id 20mr3261582wmo.35.1587453043618; Tue, 21 Apr 2020 00:10:43 -0700 (PDT) Received: from tiehlicka.suse.cz (ip-37-188-130-62.eurotel.cz. [37.188.130.62]) by smtp.gmail.com with ESMTPSA id h3sm2409899wrm.73.2020.04.21.00.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 00:10:42 -0700 (PDT) From: Michal Hocko To: Andrew Morton Cc: Linus Torvalds , Peter Xu , , LKML , Michal Hocko Subject: [PATCH] mm, mempolicy: fix up gup usage in lookup_node Date: Tue, 21 Apr 2020 09:10:26 +0200 Message-Id: <20200421071026.18394-1-mhocko@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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: From: Michal Hocko ba841078cd05 ("mm/mempolicy: Allow lookup_node() to handle fatal signal") has added a special casing for 0 return value because that was a possible gup return value when interrupted by fatal signal. This has been fixed by ae46d2aa6a7f ("mm/gup: Let __get_user_pages_locked() return -EINTR for fatal signal") in the mean time so ba841078cd05 can be reverted. This patch however doesn't go all the way to revert it because the check for 0 is wrong and confusing here. Firstly it is inherently unsafe to access the page when get_user_pages_locked returns 0 (aka no page returned). Fortunatelly this will not happen because get_user_pages_locked will not return 0 when nr_pages > 0 unless FOLL_NOWAIT is specified which is not the case here. Document this potential error code in gup code while we are at it. Signed-off-by: Michal Hocko --- mm/gup.c | 5 +++++ mm/mempolicy.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 50681f0286de..a8575b880baf 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -980,6 +980,7 @@ static int check_vma_flags(struct vm_area_struct *vma, unsigned long gup_flags) * -- If nr_pages is >0, but no pages were pinned, returns -errno. * -- If nr_pages is >0, and some pages were pinned, returns the number of * pages pinned. Again, this may be less than nr_pages. + * -- 0 return value is possible when the fault would need to be retried. * * The caller is responsible for releasing returned @pages, via put_page(). * @@ -1247,6 +1248,10 @@ int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm, } EXPORT_SYMBOL_GPL(fixup_user_fault); +/* + * Please note that this function, unlike __get_user_pages will not + * return 0 for nr_pages > 0 without FOLL_NOWAIT + */ static __always_inline long __get_user_pages_locked(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 48ba9729062e..1965e2681877 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -927,10 +927,7 @@ static int lookup_node(struct mm_struct *mm, unsigned long addr) int locked = 1; err = get_user_pages_locked(addr & PAGE_MASK, 1, 0, &p, &locked); - if (err == 0) { - /* E.g. GUP interrupted by fatal signal */ - err = -EFAULT; - } else if (err > 0) { + if (err > 0) { err = page_to_nid(p); put_page(p); }