From patchwork Tue Feb 14 03:18:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 56652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2746191wrn; Mon, 13 Feb 2023 20:04:05 -0800 (PST) X-Google-Smtp-Source: AK7set8HaBkoYqCyykracs6bXsQXpl12gGAsJq262DSPLES+HwSamN9bjymR/WFnLzdDVwgkLw3G X-Received: by 2002:a17:90b:1e0b:b0:230:c96e:fc4a with SMTP id pg11-20020a17090b1e0b00b00230c96efc4amr609693pjb.1.1676347445619; Mon, 13 Feb 2023 20:04:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676347445; cv=none; d=google.com; s=arc-20160816; b=Pccs6v4/jYdGObRD0sCAX4fo0QgH4U/0NK8Se88Vg2HhDj3dkEv/TH7DJmadIV4RNK HJfNgMaJ4jyfHu8YNFsTLAg+8SaKbsTandsTdtbv8DYvFXBnaslpbnHjPSUxnmKbE2/Y lz7iYafrC980O8meN+wgU7S/nSbJBBcBTa91N0a8u0mQFRjEliF08fGXkpTXdqWdB85n xBm6UXcFPwty2MUxbVxV0hy0uniD7gNFV/Gd6AgjlsSAd/dtb3/MQghK8icnKD9qJb0/ WXutChg+9R6tqJNagMpzjniCSZlUuk896zYpz0hbyJ/to8bFuuZHEs69lLilXhnMGU0P /UbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Sjacq73LysBunDj3uA7blBQG5dY12pCqzz30TKH/Lho=; b=w/CfF3IDLQYAaFTtrQZIzcZr8m6H8rViwebp8Uw8fdLNL+sUo7OnW3pj1eXYWLVjOG C4Pw2Bf5QHHXRuTgjCO/fRNseuC/rNEROSe3TOcc/qRccYuPHxcdWWFq6O6m+phCKWVG NGVQYX1BDriO3JopHm0w/XkQpsFA2+THnAW1046/+03oHK5IJ/NAtAZIR/zGJz62NfjO jisayZNUYqlleAYj6Fh147k0W5LS3oFhs1/d0ac3Yxlb8xlxC0CmIHKD6Q0PUguObR8f mdyb9SI82sOuO4lyIhNIMOeSb05JkL6gclM3FCu+M4rg/P1ERpMTNaXNy0LR8Vc2A2o7 GqLA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cm17-20020a17090afa1100b002332c17dbfbsi11505521pjb.70.2023.02.13.20.03.52; Mon, 13 Feb 2023 20:04:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231409AbjBNDSe (ORCPT + 99 others); Mon, 13 Feb 2023 22:18:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230055AbjBNDSb (ORCPT ); Mon, 13 Feb 2023 22:18:31 -0500 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D261A869C; Mon, 13 Feb 2023 19:18:29 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R331e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=13;SR=0;TI=SMTPD_---0Vbe-fy8_1676344706; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Vbe-fy8_1676344706) by smtp.aliyun-inc.com; Tue, 14 Feb 2023 11:18:27 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: torvalds@linux-foundation.org, sj@kernel.org, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, baolin.wang@linux.alibaba.com, damon@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] mm: check negative error of folio_isolate_lru() when failed to isolate a folio Date: Tue, 14 Feb 2023 11:18:06 +0800 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757777699149801925?= X-GMAIL-MSGID: =?utf-8?q?1757777699149801925?= The folio_isolate_lru() will return a negative error if failed to isolate a folio from its LRU list, thus better to check the negative error to make the code more clear per Linus's suggestion[1]. No functional changes. [1] https://lore.kernel.org/all/CAHk-=wiBrY+O-4=2mrbVyxR+hOqfdJ=Do6xoucfJ9_5az01L4Q@mail.gmail.com/ Signed-off-by: Baolin Wang --- mm/damon/paddr.c | 2 +- mm/gup.c | 2 +- mm/khugepaged.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index b4df9b9bcc0a..ebf3dd084af2 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -246,7 +246,7 @@ static unsigned long damon_pa_pageout(struct damon_region *r, struct damos *s) folio_clear_referenced(folio); folio_test_clear_young(folio); - if (folio_isolate_lru(folio)) { + if (folio_isolate_lru(folio) < 0) { folio_put(folio); continue; } diff --git a/mm/gup.c b/mm/gup.c index b0885f70579c..7fdddd43663c 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1939,7 +1939,7 @@ static unsigned long collect_longterm_unpinnable_pages( drain_allow = false; } - if (folio_isolate_lru(folio)) + if (folio_isolate_lru(folio) < 0) continue; list_add_tail(&folio->lru, movable_page_list); diff --git a/mm/khugepaged.c b/mm/khugepaged.c index a5d32231bfad..463dfca4b841 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2047,7 +2047,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, goto out_unlock; } - if (folio_isolate_lru(folio)) { + if (folio_isolate_lru(folio) < 0) { result = SCAN_DEL_PAGE_LRU; goto out_unlock; }