From patchwork Tue Apr 23 03:46:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13639285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF2F9C4345F for ; Tue, 23 Apr 2024 03:46:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D22C36B009F; Mon, 22 Apr 2024 23:46:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 894D86B009B; Mon, 22 Apr 2024 23:46:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D4646B009E; Mon, 22 Apr 2024 23:46:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 27CED6B009A for ; Mon, 22 Apr 2024 23:46:55 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CE2ED40D5C for ; Tue, 23 Apr 2024 03:46:54 +0000 (UTC) X-FDA: 82039410348.02.4BB7CD3 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf26.hostedemail.com (Postfix) with ESMTP id 68DBC14000F for ; Tue, 23 Apr 2024 03:46:52 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf26.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713844013; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hxpn8Mrd+KJNjH+UucynyAuAo7UnmAP0GuxvYjOVFqo=; b=nc4d/zEPc3ya9eMNNpg/oPkeVVblDfkKK8iHAYKXcfo7iIsF/GCrxvHw/Cf0ymhTwrofPy DQKVuF5MCj8amWAVAteyaZwem05rLPpi2pwgBeTTa1LbsfGn2KBOWi0GzUMRQ1ylZiuUM6 HRrUKrWSKG7k4WqM9Sexw+ew8d4aw/Q= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf26.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713844013; a=rsa-sha256; cv=none; b=8SG3CsGy4Zsoh7PGky9FdycWHkZDgq/j4rFtNySpbEGNF8UO7nWt/CN9qp44jL4YHTll+5 XlhwnqETkf0XtIGQXWKm48g0azWLUvIHW5BbEGeBWt9ur7JPVtL/m5Cd73CJpUcZ9aZwLq DtcUMxsEPRiod8Zs/tuqqZRZg9rBktM= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4VNp2W0dggz4f3jkB for ; Tue, 23 Apr 2024 11:46:43 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id DFA0D1A0572 for ; Tue, 23 Apr 2024 11:46:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgA3Ww4kLydmKkDYKw--.11241S7; Tue, 23 Apr 2024 11:46:47 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, willy@infradead.org, jack@suse.cz, bfoster@redhat.com, tj@kernel.org Cc: dsterba@suse.com, mjguzik@gmail.com, dhowells@redhat.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v5 5/5] writeback: rename nr_reclaimable to nr_dirty in balance_dirty_pages Date: Tue, 23 Apr 2024 11:46:43 +0800 Message-Id: <20240423034643.141219-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240423034643.141219-1-shikemeng@huaweicloud.com> References: <20240423034643.141219-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgA3Ww4kLydmKkDYKw--.11241S7 X-Coremail-Antispam: 1UD129KBjvJXoW7WFyxZr1fGF17CrW8WFWkXrb_yoW8Cr15pF ZrGw1jkr4xtayavrn3CFWq9rZxtw48tF43JryUCw4SvwsrWF1UKFyI9ry0vF1xAa4fJrWa vws0qrykJw1vkrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBIb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aV CY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU13l1DUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 68DBC14000F X-Stat-Signature: usbyfgcyegqyqh8h43uh4dm6q9nfafoq X-HE-Tag: 1713844012-453501 X-HE-Meta: U2FsdGVkX19B/pgmv4ezHotPwypXSmhdUAHzCvRHRPhI+ycSqRBu8n+awVe991vF8m4/jx1nKLATjjB8ByKDsUs0gLkmHcldx9N1DmuhX2GkOYMt1TA7/vSeuWzxBmEyXreaAXD5zlKZ/eS0rfT5FiZr/g0E3BdwwbMekry60X8QjVX79P2T8C1V1LS+HZSFb1h6KpbCgmifmg2qzbYtqm+LWlnBqlxiIPR29prycv2UmbgLQawIbAgrkIhHjxWfQXwZS7gxaYUXI6E9v8S1pzyisA3bK80/ifh6wApNn77ZqSE5Hr+je5R0BkZ+1cE18bdY7pMuCFJDLdWRGXsVeFwbh3K9vUcfS2UBpITeEQLfE88lFkco4KRF8lWe7BnE0n7a4FQujgatpbVfiEXB8L9t1/tJKy0jZwAuO/OlNpvMCWZQ9eC4lnUqFJSTQE9yjXo0AedTTg6kP/RXcl3PquJ7sneBWmIVtkFTg47ROLuMbr/ydf2k8cDj5VvFdjyQvk+bo7A/Jj7+Ioged+gNjcsChOryUiesYskYLD9paAp8SRGkIYIFH2qavcqtDbF/xnUL5eLLIXW9xt3J7+KaLVdn/K/THUGehSUDdWeZoeOEvHsu2+jlbjQ8FSip/g0R+/hCJMHWq/+/J2fscdv64TfdtrtzFjCQrANJKnyz1i5+hMHL0S99G8nGGVEhyTy85cjwFayLjXMITHvBOgrUueTT+OkJSh02jTqVn2CfnvXgVQM88OUaHKTy4UfhsRZNya28PjRkJfOSbhx4Er8uVZQw0MYQycTnIO/+PNgD3CqiAO+jqk/zpt2YXvY1g4ipT9QH1edJHjcxgjnulpzRUJQw4C0gwyO/d74FvhPY6xljJXfCAWYnoURoT/FlyKhFXcSqNUW9eOSRGDnkRx41AAfpy/WTCRMCT9sBt3EDQuIqRJYnf+CxO2K1XgV2UUP8sqw3nl4bZs1LHVFW1D6 C3qElJoD eaHmoVNYytdIRv+D4jQitKl7/PCuE1ZT0CcTRL8H8rLhXzkj0fMMCu8f7hFZyJM4JtYXmniV58AjzsKHR8ZfHuO9+/A== 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: List-Subscribe: List-Unsubscribe: Commit 8d92890bd6b85 ("mm/writeback: discard NR_UNSTABLE_NFS, use NR_WRITEBACK instead") removed NR_UNSTABLE_NFS and nr_reclaimable only contains dirty page now. Rename nr_reclaimable to nr_dirty properly. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- mm/page-writeback.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 3bb3bed102ef..44df5c899a33 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -1694,7 +1694,7 @@ static int balance_dirty_pages(struct bdi_writeback *wb, struct dirty_throttle_control * const mdtc = mdtc_valid(&mdtc_stor) ? &mdtc_stor : NULL; struct dirty_throttle_control *sdtc; - unsigned long nr_reclaimable; /* = file_dirty */ + unsigned long nr_dirty; long period; long pause; long max_pause; @@ -1715,9 +1715,9 @@ static int balance_dirty_pages(struct bdi_writeback *wb, unsigned long m_thresh = 0; unsigned long m_bg_thresh = 0; - nr_reclaimable = global_node_page_state(NR_FILE_DIRTY); + nr_dirty = global_node_page_state(NR_FILE_DIRTY); gdtc->avail = global_dirtyable_memory(); - gdtc->dirty = nr_reclaimable + global_node_page_state(NR_WRITEBACK); + gdtc->dirty = nr_dirty + global_node_page_state(NR_WRITEBACK); domain_dirty_limits(gdtc); @@ -1768,7 +1768,7 @@ static int balance_dirty_pages(struct bdi_writeback *wb, * In normal mode, we start background writeout at the lower * background_thresh, to keep the amount of dirty memory low. */ - if (!laptop_mode && nr_reclaimable > gdtc->bg_thresh && + if (!laptop_mode && nr_dirty > gdtc->bg_thresh && !writeback_in_progress(wb)) wb_start_background_writeback(wb);