From patchwork Mon Apr 22 16:05:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13637732 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 BF67AC04FF6 for ; Mon, 22 Apr 2024 07:10:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 103636B009E; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F33B96B00A0; Mon, 22 Apr 2024 03:10:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFA406B009E; Mon, 22 Apr 2024 03:10:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9DD766B009D for ; Mon, 22 Apr 2024 03:10:22 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 54C2A1A0AC8 for ; Mon, 22 Apr 2024 07:10:22 +0000 (UTC) X-FDA: 82036294284.15.D898577 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf05.hostedemail.com (Postfix) with ESMTP id 270DA100007 for ; Mon, 22 Apr 2024 07:10:18 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1713769820; 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=+CfwWr6c0peMCx7OD2HGSsGpRnFxzf4wkYBoyN5xUX4=; b=lWY5dhow6pG/tuPxxg2kVUbX3wt9SFsgBCN281RmWvGTOIrs2Ya4oIsJ0U9y15KbwWu1Jw 6l9kJ2D7u9AwlGa0ofDAZFhIL37zSTLALRbr22S/SHRcobZWr5ye/sFxB5/Toc8kJo62e+ a6OknzwBluyO+eVUU9P9k3bNAAKPN20= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1713769820; a=rsa-sha256; cv=none; b=0c7gPCBr0VdmnoQ2Y6djmRJ9PfL9FXnSB6NCnXFYQaML5WC2enmJdjXaJybcn8POsE6Nbh CAlCKdv1OO6prnCAjIHZVdUJxkbY3Pzp9h2WA3hWWqHS7avPcIPcXUwep7gqI8yDVHVcrz enuBLq6Y8rmawOp4MNr9cNQU5QdVhPM= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4VNGbc6vNsz4f3m7J for ; Mon, 22 Apr 2024 15:10:04 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 1855D1A148B for ; Mon, 22 Apr 2024 15:10:14 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgAHdwpTDSZmt5eIKw--.7343S3; Mon, 22 Apr 2024 15:10:13 +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: [ATCH v3 1/4] writeback: collect stats of all wb of bdi in bdi_debug_stats_show Date: Tue, 23 Apr 2024 00:05:36 +0800 Message-Id: <20240422160539.3340-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240422160539.3340-1-shikemeng@huaweicloud.com> References: <20240422160539.3340-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgAHdwpTDSZmt5eIKw--.7343S3 X-Coremail-Antispam: 1UD129KBjvJXoW3Jr4kKF15Jw13GF4rGF13twb_yoW7ArWxpF W3Gw1fJrWxZFyagasxZFWDXrW5tw40q342qF92k3y5G3WDAFy3KFyxua4jyr1UGrZ7AFy5 Jan5ArykC3yUKF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxV A2Y2ka0xkIwI1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r 43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU 3Xo2DUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 270DA100007 X-Stat-Signature: khy9943p1xabssqdbxk98w811jbxi4o5 X-HE-Tag: 1713769818-54077 X-HE-Meta: U2FsdGVkX18pGvDS24abXcziXnQuNM1A+2gYQMCD6x38GPyD8/RWi3xRKaIJWiKBjAmmFBnBtiAg+pL8tAyjOV0FD5qAYYsbfFz4fvtsUBSCsynimZ4D2iHdGnkAfEV2X+DixYHoLOcvXkQx4oIB/mKUmJl0j9VHCkHHxlANVwiWac6li3fyjjU39JsL39hERXL8FI//NEEobw/+hWjSFnFK9kaD2xuzoDzpiv0ps6uBKYcVsfMcoEfS2mU39Pkn5Pbh0SOSD0QGRNb39QQb///BgvdRdUqyDrJWWwgmIOfNMJhlvqiNIwG+c5DlBbyqm1vFrzZl0KHw7lXAFttRK8A2/H7W15yM+zEoV/SO0BxtGUzmn5mH8p+3bzV2o2gYKzyii2hO292DAQ4/I9zUARx0eqoKmMbnpidAMDzg6o2+q//dbD7FzhFQGjXtX90RQ3F/s+60QxUimC0tsictQdbHfrCCKXwNAEy9zrTaG37TEYfd1cbfgZbPRor74fIZoWrQMN8MlPQ/yJ5i97UUkhLHt7K+Qa1u84gX4kEMM8QVmk3jn20mBBgLH7a8E9mhk8OakfCXIhYhNcXZGbHU7HO1NpECgWBkvbo9Aokt7NNVoCpIc86GzF46Wd9lJd06Ad6rODvMrEj4qnSLBxlO6vaDehG1K912X/dPQJsdMJcpQ+PKh77TmU0xhV25IuJiYc8k9cNvLRT9ISoT4ilRYeNyKKzWM0cCIZ/dABMwab7eH7Zot/vSNc+QBTJrfwlYgALO/5qEmBg/1gEJ2YoJdLOiiyTEoGAdML2QhSF1Mmmn3KOO4oe0VqSIJ3xezJmYZk7QlDQ8yLgo8IN8HBi+19A+ZjAUwFUm6Am+IrGMu6GF4GQXr9KWGqKK+e9Il1dozxlmtA6frPSg/ExfOgCMK3naHkkOzm7AOgEYmNogBfcI3HRbazlaBEwi3OfeJj5zLf/NNM4/G8CQ+YsHkKq dOrYH4Ak I60TEwVAB6b4c7ogcCbgG2FGIIeGo5yk0JOEjbLladbS5DvfnKzgSCEmmsOh5tMejv1DPM7SmSOOfZ1jjSp69F05YolUZDOS/AWdlgh0ZFzVpie3tH7OliYYEdjeKotbKaSlNl5VXhIyZ3JxBZ3xa7Dx3eUJ3i309oJixcwsJvIRR5m9AVepBl1MbKWoQS3ZRpnSte+Z5s2I4sTJeskotPVUksl4kD3yz1ZISIDAPgpYaDH2YpgFRfrVBuFZrIG3fg/nlR8CDZ1pbCB09ogelcg+oPDh9nYqDDOep9T7GguY69h4= 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: /sys/kernel/debug/bdi/xxx/stats is supposed to show writeback information of whole bdi, but only writeback information of bdi in root cgroup is collected. So writeback information in non-root cgroup are missing now. To be more specific, considering following case: /* create writeback cgroup */ cd /sys/fs/cgroup echo "+memory +io" > cgroup.subtree_control mkdir group1 cd group1 echo $$ > cgroup.procs /* do writeback in cgroup */ fio -name test -filename=/dev/vdb ... /* get writeback info of bdi */ cat /sys/kernel/debug/bdi/xxx/stats The cat result unexpectedly implies that there is no writeback on target bdi. Fix this by collecting stats of all wb in bdi instead of only wb in root cgroup. Following domain hierarchy is tested: global domain (320G) / \ cgroup domain1(10G) cgroup domain2(10G) | | bdi wb1 wb2 /* all writeback info of bdi is successfully collected */ cat stats BdiWriteback: 4704 kB BdiReclaimable: 1294496 kB BdiDirtyThresh: 204208088 kB DirtyThresh: 195259944 kB BackgroundThresh: 32503588 kB BdiDirtied: 48519296 kB BdiWritten: 47225696 kB BdiWriteBandwidth: 1173892 kBps b_dirty: 1 b_io: 0 b_more_io: 1 b_dirty_time: 0 bdi_list: 1 state: 1 Signed-off-by: Kemeng Shi --- mm/backing-dev.c | 96 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 73 insertions(+), 23 deletions(-) diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 5fa3666356f9..089146feb830 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -39,6 +39,19 @@ struct workqueue_struct *bdi_wq; #include #include +struct wb_stats { + unsigned long nr_dirty; + unsigned long nr_io; + unsigned long nr_more_io; + unsigned long nr_dirty_time; + unsigned long nr_writeback; + unsigned long nr_reclaimable; + unsigned long nr_dirtied; + unsigned long nr_written; + unsigned long dirty_thresh; + unsigned long wb_thresh; +}; + static struct dentry *bdi_debug_root; static void bdi_debug_init(void) @@ -46,31 +59,68 @@ static void bdi_debug_init(void) bdi_debug_root = debugfs_create_dir("bdi", NULL); } -static int bdi_debug_stats_show(struct seq_file *m, void *v) +static void collect_wb_stats(struct wb_stats *stats, + struct bdi_writeback *wb) { - struct backing_dev_info *bdi = m->private; - struct bdi_writeback *wb = &bdi->wb; - unsigned long background_thresh; - unsigned long dirty_thresh; - unsigned long wb_thresh; - unsigned long nr_dirty, nr_io, nr_more_io, nr_dirty_time; struct inode *inode; - nr_dirty = nr_io = nr_more_io = nr_dirty_time = 0; spin_lock(&wb->list_lock); list_for_each_entry(inode, &wb->b_dirty, i_io_list) - nr_dirty++; + stats->nr_dirty++; list_for_each_entry(inode, &wb->b_io, i_io_list) - nr_io++; + stats->nr_io++; list_for_each_entry(inode, &wb->b_more_io, i_io_list) - nr_more_io++; + stats->nr_more_io++; list_for_each_entry(inode, &wb->b_dirty_time, i_io_list) if (inode->i_state & I_DIRTY_TIME) - nr_dirty_time++; + stats->nr_dirty_time++; spin_unlock(&wb->list_lock); + stats->nr_writeback += wb_stat(wb, WB_WRITEBACK); + stats->nr_reclaimable += wb_stat(wb, WB_RECLAIMABLE); + stats->nr_dirtied += wb_stat(wb, WB_DIRTIED); + stats->nr_written += wb_stat(wb, WB_WRITTEN); + stats->wb_thresh += wb_calc_thresh(wb, stats->dirty_thresh); +} + +#ifdef CONFIG_CGROUP_WRITEBACK +static void bdi_collect_stats(struct backing_dev_info *bdi, + struct wb_stats *stats) +{ + struct bdi_writeback *wb; + + rcu_read_lock(); + list_for_each_entry_rcu(wb, &bdi->wb_list, bdi_node) { + if (!wb_tryget(wb)) + continue; + + collect_wb_stats(stats, wb); + wb_put(wb); + } + rcu_read_unlock(); +} +#else +static void bdi_collect_stats(struct backing_dev_info *bdi, + struct wb_stats *stats) +{ + collect_wb_stats(stats, &bdi->wb); +} +#endif + +static int bdi_debug_stats_show(struct seq_file *m, void *v) +{ + struct backing_dev_info *bdi = m->private; + unsigned long background_thresh; + unsigned long dirty_thresh; + struct wb_stats stats; + unsigned long tot_bw; + global_dirty_limits(&background_thresh, &dirty_thresh); - wb_thresh = wb_calc_thresh(wb, dirty_thresh); + + memset(&stats, 0, sizeof(stats)); + stats.dirty_thresh = dirty_thresh; + bdi_collect_stats(bdi, &stats); + tot_bw = atomic_long_read(&bdi->tot_write_bandwidth); seq_printf(m, "BdiWriteback: %10lu kB\n" @@ -87,18 +137,18 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v) "b_dirty_time: %10lu\n" "bdi_list: %10u\n" "state: %10lx\n", - (unsigned long) K(wb_stat(wb, WB_WRITEBACK)), - (unsigned long) K(wb_stat(wb, WB_RECLAIMABLE)), - K(wb_thresh), + K(stats.nr_writeback), + K(stats.nr_reclaimable), + K(stats.wb_thresh), K(dirty_thresh), K(background_thresh), - (unsigned long) K(wb_stat(wb, WB_DIRTIED)), - (unsigned long) K(wb_stat(wb, WB_WRITTEN)), - (unsigned long) K(wb->write_bandwidth), - nr_dirty, - nr_io, - nr_more_io, - nr_dirty_time, + K(stats.nr_dirtied), + K(stats.nr_written), + K(tot_bw), + stats.nr_dirty, + stats.nr_io, + stats.nr_more_io, + stats.nr_dirty_time, !list_empty(&bdi->bdi_list), bdi->wb.state); return 0; From patchwork Mon Apr 22 16:05:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13637733 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 5F947C4345F for ; Mon, 22 Apr 2024 07:10:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 67DF16B009F; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 60C8A6B00A0; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 370476B00A2; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 0B7DB6B009D for ; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B809B120AA5 for ; Mon, 22 Apr 2024 07:10:22 +0000 (UTC) X-FDA: 82036294284.06.54A3D1A Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf22.hostedemail.com (Postfix) with ESMTP id 5CC0BC000D for ; Mon, 22 Apr 2024 07:10:19 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf22.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=1713769821; 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=bOh//sgCpYSr28Rcoozw7Lekt0H1gakRiJAubw5aex0=; b=LuBFr9VQYIZc0oM/AqIxTEqbDRMi7j4ehMUosFjbw3iEkDWChPThV0q/vdErVl5R9C8uZg M7tQsum+SOZur3So5ynmDAviHsF8jRSJ5KmbKaHBw1IgFaXqFfEbAuoxTaVxx975sQEqDj jFddnF1abC3JXuFS3MZbdTQR/5w6F00= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713769821; a=rsa-sha256; cv=none; b=YRUY2tjdIMdHlx5E8V2y2R5mVoCicckxAiDkUhj1BV2Q7bluN/7lZygSPcq9Ou4+lN911s kAt7E6yhC02gtyrnAN7uUfz0C90uIUL9YYvMzd9tAxYbk5YzeGVv3E8taM5YlBifhC8yTo 2XdtsbQZvELx17aRNW2BYJhSISHJSPk= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf22.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4VNGbj5Vgdz4f3kkK for ; Mon, 22 Apr 2024 15:10:09 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 8A02F1A0568 for ; Mon, 22 Apr 2024 15:10:14 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgAHdwpTDSZmt5eIKw--.7343S4; Mon, 22 Apr 2024 15:10:14 +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: [ATCH v3 2/4] writeback: support retrieving per group debug writeback stats of bdi Date: Tue, 23 Apr 2024 00:05:37 +0800 Message-Id: <20240422160539.3340-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240422160539.3340-1-shikemeng@huaweicloud.com> References: <20240422160539.3340-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgAHdwpTDSZmt5eIKw--.7343S4 X-Coremail-Antispam: 1UD129KBjvJXoW3Xw17JF1DJw1fGr1DGF45Wrg_yoW7uw1rpa 98Gw15Kr4UZr17WFZxCay2qry5tw4rtrW7Xa97Z3yftFnrtry3tFy8ury8Ar15AF93AFy3 Jan8Cry8GrW8KrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxV A2Y2ka0xkIwI1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r 43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU ImhFDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Stat-Signature: qtf8uzky4cz1xuzt3g5in8deignom4b3 X-Rspamd-Queue-Id: 5CC0BC000D X-Rspamd-Server: rspam06 X-Rspam-User: X-HE-Tag: 1713769819-335061 X-HE-Meta: U2FsdGVkX1/8IDLqRXz4y50Lk9RJTYzYBZnecCSrvvNg1Jhw9bHEACE6jA7tirf3KfYToHT7MIPpRL1IDpKsj/bIsw7Ua+AkNhB6xUo+TXTWXy1ALGjzxotbJgbt0MybpESnzu7M5FZZ71rLvhp/Hr18MtnyHasoI3g9XvgGzdbRWBMnLTz9Qy6Ff0UiDWudUi5oCAVcr9P3AHJJ27a/HyBDZdhWhy7ipiUhK+dMXNXkIZtmPVn6WB9sp6KSWa2cotGa7g4yixDixRw3uGBibSSv08DjpLI8r8vHrilbSuQdDCE9MnWUrdD4Q9G9YnDBhiKDeKO0SWrtTPgXDUOIWswsHG1kRexagT6GyD+ThbNU91ojqWxxWT7EVKR0F4PQ+ZSaR3ExCgHto2Y5BFYqn3m5pkboA+S+0Ius52ZXccdvM5y5HHTYOh/MeyA/sNo3+CC2oh6X2GBhpAOaxnhYPAl49luaS45S4mjMUsCt0ext4XDGu7Lr7NIUndFyeO651DDFF+uAfJknIzosoDNrMaW09zJytTftsf+xUZY43CH1/4AHAjTuttbpklS5edPs41nSr841tPhB2MlkVAOzF9xMVDh6NYywZ/yXIEdnSNfGVVGCBN2drKTN1RO8TK6X1wswXvvicvK7rGqm2swGHj88ZjsJk6HR2rKJmseOcpbSWu3k2rhYFHKK/mW84u42UElYHRTwfHB8h2ZZB6U9dQXAlBYrn4clmlZv/b3b5exT+U9BQcLa0O1BS4kY7+ZFiw2sCBvy26a7vF5QfWjEZDcXzq98thwdC8tfuQEnYyNIlCQ2ena/WOYl6zhIi+lR6MqVyRhb0RMb9e+IGAFjczhqFsJ6XvcUaZMTac3VEWElk7e1oOkMLldU6YgD0OvqK3Dr9rR7i/Xh19KrXodNoxNZ4aaQxpLOS4HKBUvnxDLQ7SC7t3F7v+gGYAXykJuDLvskabEmq4WsRRrK/Va onUXkAQp 99SGP52bdzwwj/x5a+9G77lX0kSqJqM2Qt8gT5l8ROYN817qG/9gJpuSIfDx8UQyf0/OUf/3nmxDJK7ETWUvhn3sbDdKEXXNHR2YrI0M0bW4yLgr7sqW7dfLHFV/4vrbWHXc3QFBZ6RfkFh0IkorCFXAN0Ux030zkmQq1NO5CpijkksSN4XnyJ6K1r3HAaru+pdGfyb3TS+CI3NRrkJZbYj1xlrT/gwBq5ngwuNsZaI1xsXJnksG8MQqYwNq8LCXcLreg 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: Add /sys/kernel/debug/bdi/xxx/wb_stats to show per group writeback stats of bdi. Following domain hierarchy is tested: global domain (320G) / \ cgroup domain1(10G) cgroup domain2(10G) | | bdi wb1 wb2 /* per wb writeback info of bdi is collected */ cat /sys/kernel/debug/bdi/252:16/wb_stats WbCgIno: 1 WbWriteback: 0 kB WbReclaimable: 0 kB WbDirtyThresh: 0 kB WbDirtied: 0 kB WbWritten: 0 kB WbWriteBandwidth: 102400 kBps b_dirty: 0 b_io: 0 b_more_io: 0 b_dirty_time: 0 state: 1 WbCgIno: 4208 WbWriteback: 59808 kB WbReclaimable: 676480 kB WbDirtyThresh: 6004624 kB WbDirtied: 23348192 kB WbWritten: 22614592 kB WbWriteBandwidth: 593204 kBps b_dirty: 1 b_io: 1 b_more_io: 0 b_dirty_time: 0 state: 7 WbCgIno: 4249 WbWriteback: 144256 kB WbReclaimable: 432096 kB WbDirtyThresh: 6004344 kB WbDirtied: 25727744 kB WbWritten: 25154752 kB WbWriteBandwidth: 577904 kBps b_dirty: 0 b_io: 1 b_more_io: 0 b_dirty_time: 0 state: 7 Signed-off-by: Kemeng Shi --- include/linux/writeback.h | 1 + mm/backing-dev.c | 78 ++++++++++++++++++++++++++++++++++++++- mm/page-writeback.c | 19 ++++++++++ 3 files changed, 96 insertions(+), 2 deletions(-) diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 9845cb62e40b..112d806ddbe4 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -355,6 +355,7 @@ int dirtytime_interval_handler(struct ctl_table *table, int write, void global_dirty_limits(unsigned long *pbackground, unsigned long *pdirty); unsigned long wb_calc_thresh(struct bdi_writeback *wb, unsigned long thresh); +unsigned long cgwb_calc_thresh(struct bdi_writeback *wb); void wb_update_bandwidth(struct bdi_writeback *wb); diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 089146feb830..6ecd11bdce6e 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -155,19 +155,93 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v) } DEFINE_SHOW_ATTRIBUTE(bdi_debug_stats); +static void wb_stats_show(struct seq_file *m, struct bdi_writeback *wb, + struct wb_stats *stats) +{ + + seq_printf(m, + "WbCgIno: %10lu\n" + "WbWriteback: %10lu kB\n" + "WbReclaimable: %10lu kB\n" + "WbDirtyThresh: %10lu kB\n" + "WbDirtied: %10lu kB\n" + "WbWritten: %10lu kB\n" + "WbWriteBandwidth: %10lu kBps\n" + "b_dirty: %10lu\n" + "b_io: %10lu\n" + "b_more_io: %10lu\n" + "b_dirty_time: %10lu\n" + "state: %10lx\n\n", + cgroup_ino(wb->memcg_css->cgroup), + K(stats->nr_writeback), + K(stats->nr_reclaimable), + K(stats->wb_thresh), + K(stats->nr_dirtied), + K(stats->nr_written), + K(wb->avg_write_bandwidth), + stats->nr_dirty, + stats->nr_io, + stats->nr_more_io, + stats->nr_dirty_time, + wb->state); +} + +static int cgwb_debug_stats_show(struct seq_file *m, void *v) +{ + struct backing_dev_info *bdi = m->private; + unsigned long background_thresh; + unsigned long dirty_thresh; + struct bdi_writeback *wb; + struct wb_stats stats; + + global_dirty_limits(&background_thresh, &dirty_thresh); + + rcu_read_lock(); + list_for_each_entry_rcu(wb, &bdi->wb_list, bdi_node) { + struct wb_stats stats = { .dirty_thresh = dirty_thresh }; + + if (!wb_tryget(wb)) + continue; + + collect_wb_stats(&stats, wb); + + /* + * Calculate thresh of wb in writeback cgroup which is min of + * thresh in global domain and thresh in cgroup domain. Drop + * rcu lock because cgwb_calc_thresh may sleep in + * cgroup_rstat_flush. We can do so here because we have a ref. + */ + if (mem_cgroup_wb_domain(wb)) { + rcu_read_unlock(); + stats.wb_thresh = min(stats.wb_thresh, cgwb_calc_thresh(wb)); + rcu_read_lock(); + } + + wb_stats_show(m, wb, &stats); + + wb_put(wb); + } + rcu_read_unlock(); + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(cgwb_debug_stats); + static void bdi_debug_register(struct backing_dev_info *bdi, const char *name) { bdi->debug_dir = debugfs_create_dir(name, bdi_debug_root); debugfs_create_file("stats", 0444, bdi->debug_dir, bdi, &bdi_debug_stats_fops); + debugfs_create_file("wb_stats", 0444, bdi->debug_dir, bdi, + &cgwb_debug_stats_fops); } static void bdi_debug_unregister(struct backing_dev_info *bdi) { debugfs_remove_recursive(bdi->debug_dir); } -#else +#else /* CONFIG_DEBUG_FS */ static inline void bdi_debug_init(void) { } @@ -178,7 +252,7 @@ static inline void bdi_debug_register(struct backing_dev_info *bdi, static inline void bdi_debug_unregister(struct backing_dev_info *bdi) { } -#endif +#endif /* CONFIG_DEBUG_FS */ static ssize_t read_ahead_kb_store(struct device *dev, struct device_attribute *attr, diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 3e19b87049db..38f143195bcb 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -892,6 +892,25 @@ unsigned long wb_calc_thresh(struct bdi_writeback *wb, unsigned long thresh) return __wb_calc_thresh(&gdtc); } +unsigned long cgwb_calc_thresh(struct bdi_writeback *wb) +{ + struct dirty_throttle_control gdtc = { GDTC_INIT_NO_WB }; + struct dirty_throttle_control mdtc = { MDTC_INIT(wb, &gdtc) }; + unsigned long filepages, headroom, writeback; + + gdtc.avail = global_dirtyable_memory(); + gdtc.dirty = global_node_page_state(NR_FILE_DIRTY) + + global_node_page_state(NR_WRITEBACK); + + mem_cgroup_wb_stats(wb, &filepages, &headroom, + &mdtc.dirty, &writeback); + mdtc.dirty += writeback; + mdtc_calc_avail(&mdtc, filepages, headroom); + domain_dirty_limits(&mdtc); + + return __wb_calc_thresh(&mdtc); +} + /* * setpoint - dirty 3 * f(dirty) := 1.0 + (----------------) From patchwork Mon Apr 22 16:05:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13637734 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 A3781C04FF6 for ; Mon, 22 Apr 2024 07:10:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 93DCD6B00A1; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8CF0F6B00A4; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 459E96B00A1; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1F6536B009F for ; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C95EF160AD8 for ; Mon, 22 Apr 2024 07:10:22 +0000 (UTC) X-FDA: 82036294284.30.E7D7CC3 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf06.hostedemail.com (Postfix) with ESMTP id 615D7180018 for ; Mon, 22 Apr 2024 07:10:19 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713769821; a=rsa-sha256; cv=none; b=AexqUW+93RMiLVV63RXf+12uaP0UDSB8rMgnFAlenDRLvrSPNDjeTjbvojmKhAKcR6vKw9 5Rk6erNSJ6NagI+us9qctWGbyvmWKV1aiI85rVohA51erbJBgJ8gWTKtD8gLfJs3cRt1zw 58gKdmhlI+cNYaPSCTMOBCbzlr8iXN0= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713769821; 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=1oNGHV3l3pEb2H6bSXX4d7sGy1z0hmhBCBFfC5+ZDzI=; b=igHRqhNUdQeScm2Ido2V/Tk2HeVFLRx769VvR17Vk0yOhnXqYicrIn6Xdpmui5THjzcI9N GkG1p+6WnP0tiRwBCVhGMvuF8p2v8gdWajbpOe7CxBwcwKubp/uEo/q3IvC7Sz5DylJLv/ TbobSpJArejKLGkHTRMlSsp4pyfukYo= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4VNGbd63lyz4f3mJH for ; Mon, 22 Apr 2024 15:10:05 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id EEEB71A058D for ; Mon, 22 Apr 2024 15:10:14 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgAHdwpTDSZmt5eIKw--.7343S5; Mon, 22 Apr 2024 15:10:14 +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: [ATCH v3 3/4] writeback: add wb_monitor.py script to monitor writeback info on bdi Date: Tue, 23 Apr 2024 00:05:38 +0800 Message-Id: <20240422160539.3340-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240422160539.3340-1-shikemeng@huaweicloud.com> References: <20240422160539.3340-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgAHdwpTDSZmt5eIKw--.7343S5 X-Coremail-Antispam: 1UD129KBjvJXoW3Xr1UCrWrWFWxXw1DJFy7Jrb_yoWxJr1fpF s8Aw13Ar1xZa4xJrnY9a40vry5Cws5Cr17XrW7ArWakan8Wa4FyryrCFyUAry3Cr9rJ39x X3ya93y8KFWjgFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxV A2Y2ka0xkIwI1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r 43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU Iq2MUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 615D7180018 X-Stat-Signature: yyk4cx5kwafgrsdo3f3ndut6h79ihjyd X-Rspam-User: X-HE-Tag: 1713769819-547714 X-HE-Meta: U2FsdGVkX1+DGQxAmDsaUfkCUDDaUlaAFocPa+Sdys6C2d0JUSTn5r0vf/EBKDd8KDYfuNVZG20foBMvNNZISOmNQ/lK7ID6y4eHpLP1AGMSbQNacp2/McC43m573REZAPX/O6A4mEI31WrmBS955mjaCnzX8I5Z7bRSzvt7ShDvVEIknZZZAVEHoryoR9SzQl5pzxEqTUXNmi136z0I6dS26T8LXmoyopDyNpsFSayinOnnf26GcWQ46+G+G0zYZEquvnRMZkJE7qfGsg9FmHXBgKArguPdDlBaKLU8m/hpQjK7oN+WrlxDeNB74bi+Bzm7x5HO2UTspLFs2fu6KAit+VU1tlf2maoWCMrOXpsU9QqXyTfVSKhSSJT2GMlqSdrnLzsBAI4KgWG90o6VkhKo2y9uRpmLjsh8b8gzJFYQLJ72BBTWZMeuXvf+pAh0fVIhjYErDBZvdUNsVuvbKwCZP5Xl9Pa1Y57ZVvdtQwCXC9+bU0uvbc04asU1QZE8dXG25nKNQu1XVmsSWioL8Rd2f7KdfiuO4BZ+nU5s9zKpSwoiTjfNwemMVMv36FbAs6JqhxGo3cNdlNBZwcLZvfYPccQiD2SyvP4jW62IkcnImxwBt66uAZj6ZQqsHmMJBy2df5GYpb4cC7aWYGCdA2Z4Tmd/idb2eYXZNI8ZHS53AMND2YkGhCLwCXh93zCkUQzm0rCiwloHkKD32WQq8RhjGGavRKqXrhQoRmKmlo19uNm5ZyrjKlUWnM0fkBwD2b7XqktJKzSb7JJxR7rSBTkSs5dkjC3wKDfE0LVa7l7rUYsBAZnMwa6aMH1JBADIGcwnNT/GlMPF58eJjxbVvfbi5GDlVK2nJs44Wj6lYyORBFNouILXoy+DSdRfgf8o5wNeXGs2v/Bs4e/sedLdlxgqk+OzbVsN/7iN4cgl7dEAnCZkjbbiGMSP5lfdLR3MMeLIgeUfXU6XP++19Hq xsCxGox5 KLaHKAQ1UUeaZBxLOXK9uSG19c4Kqzojab7eEj+vu7F3/ReuDXsrLREQV7UI8Tw578ltrJoKPEACZbUbSIBIBlrxKDTCTvWPadyd56Tl/wSmZ1WN4/SzsMhC0AibOtkzUu9L4co2Tu/oIcxaL8Y9497FDpUszOFov/nHWuPPQ2kc5aY5GeSK3QBGFxxm4uCPz+KZhdaZmoRc8aH50EXCXXJyXkP8roh1Bq57LTgIfkWHYJSVAHbCBP6A1wWwWG+UeJat+mgSmRaEWEaWoRbpZHLPmdkE2/DJnyeuZaGFJ4KGgPYJZlLXgLxLm7lWSYf0CnpvOad0wZr216ylfPIcOG7LzUZMjiqfIuDT8Nqjs3rLfcZAtrb+DYORt0C4KhoEHoZZ3 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000146, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add wb_monitor.py script to monitor writeback information on backing dev which makes it easier and more convenient to observe writeback behaviors of running system. The wb_monitor.py script is written based on wq_monitor.py. Following domain hierarchy is tested: global domain (320G) / \ cgroup domain1(10G) cgroup domain2(10G) | | bdi wb1 wb2 The wb_monitor.py script output is as following: ./wb_monitor.py 252:16 -c writeback reclaimable dirtied written avg_bw 252:16_1 0 0 0 0 102400 252:16_4284 672 820064 9230368 8410304 685612 252:16_4325 896 819840 10491264 9671648 652348 252:16 1568 1639904 19721632 18081952 1440360 writeback reclaimable dirtied written avg_bw 252:16_1 0 0 0 0 102400 252:16_4284 672 820064 9230368 8410304 685612 252:16_4325 896 819840 10491264 9671648 652348 252:16 1568 1639904 19721632 18081952 1440360 ... Signed-off-by: Kemeng Shi Suggested-by: Tejun Heo --- tools/writeback/wb_monitor.py | 172 ++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 tools/writeback/wb_monitor.py diff --git a/tools/writeback/wb_monitor.py b/tools/writeback/wb_monitor.py new file mode 100644 index 000000000000..5e3591f1f9a9 --- /dev/null +++ b/tools/writeback/wb_monitor.py @@ -0,0 +1,172 @@ +#!/usr/bin/env drgn +# +# Copyright (C) 2024 Kemeng Shi +# Copyright (C) 2024 Huawei Inc + +desc = """ +This is a drgn script based on wq_monitor.py to monitor writeback info on +backing dev. For more info on drgn, visit https://github.com/osandov/drgn. + + writeback(kB) Amount of dirty pages are currently being written back to + disk. + + reclaimable(kB) Amount of pages are currently reclaimable. + + dirtied(kB) Amount of pages have been dirtied. + + wrttien(kB) Amount of dirty pages have been written back to disk. + + avg_wb(kBps) Smoothly estimated write bandwidth of writing dirty pages + back to disk. +""" + +import signal +import re +import time +import json + +import drgn +from drgn.helpers.linux.list import list_for_each_entry + +import argparse +parser = argparse.ArgumentParser(description=desc, + formatter_class=argparse.RawTextHelpFormatter) +parser.add_argument('bdi', metavar='REGEX', nargs='*', + help='Target backing device name patterns (all if empty)') +parser.add_argument('-i', '--interval', metavar='SECS', type=float, default=1, + help='Monitoring interval (0 to print once and exit)') +parser.add_argument('-j', '--json', action='store_true', + help='Output in json') +parser.add_argument('-c', '--cgroup', action='store_true', + help='show writeback of bdi in cgroup') +args = parser.parse_args() + +bdi_list = prog['bdi_list'] + +WB_RECLAIMABLE = prog['WB_RECLAIMABLE'] +WB_WRITEBACK = prog['WB_WRITEBACK'] +WB_DIRTIED = prog['WB_DIRTIED'] +WB_WRITTEN = prog['WB_WRITTEN'] +NR_WB_STAT_ITEMS = prog['NR_WB_STAT_ITEMS'] + +PAGE_SHIFT = prog['PAGE_SHIFT'] + +def K(x): + return x << (PAGE_SHIFT - 10) + +class Stats: + def dict(self, now): + return { 'timestamp' : now, + 'name' : self.name, + 'writeback' : self.stats[WB_WRITEBACK], + 'reclaimable' : self.stats[WB_RECLAIMABLE], + 'dirtied' : self.stats[WB_DIRTIED], + 'written' : self.stats[WB_WRITTEN], + 'avg_wb' : self.avg_bw, } + + def table_header_str(): + return f'{"":>16} {"writeback":>10} {"reclaimable":>12} ' \ + f'{"dirtied":>9} {"written":>9} {"avg_bw":>9}' + + def table_row_str(self): + out = f'{self.name[-16:]:16} ' \ + f'{self.stats[WB_WRITEBACK]:10} ' \ + f'{self.stats[WB_RECLAIMABLE]:12} ' \ + f'{self.stats[WB_DIRTIED]:9} ' \ + f'{self.stats[WB_WRITTEN]:9} ' \ + f'{self.avg_bw:9} ' + return out + + def show_header(): + if Stats.table_fmt: + print() + print(Stats.table_header_str()) + + def show_stats(self): + if Stats.table_fmt: + print(self.table_row_str()) + else: + print(self.dict(Stats.now)) + +class WbStats(Stats): + def __init__(self, wb): + bdi_name = wb.bdi.dev_name.string_().decode() + # avoid to use bdi.wb.memcg_css which is only defined when + # CONFIG_CGROUP_WRITEBACK is enabled + if wb == wb.bdi.wb.address_of_(): + ino = "1" + else: + ino = str(wb.memcg_css.cgroup.kn.id.value_()) + self.name = bdi_name + '_' + ino + + self.stats = [0] * NR_WB_STAT_ITEMS + for i in range(NR_WB_STAT_ITEMS): + if wb.stat[i].count >= 0: + self.stats[i] = int(K(wb.stat[i].count)) + else: + self.stats[i] = 0 + + self.avg_bw = int(K(wb.avg_write_bandwidth)) + +class BdiStats(Stats): + def __init__(self, bdi): + self.name = bdi.dev_name.string_().decode() + self.stats = [0] * NR_WB_STAT_ITEMS + self.avg_bw = 0 + + def collectStats(self, wb_stats): + for i in range(NR_WB_STAT_ITEMS): + self.stats[i] += wb_stats.stats[i] + + self.avg_bw += wb_stats.avg_bw + +exit_req = False + +def sigint_handler(signr, frame): + global exit_req + exit_req = True + +def main(): + # handle args + Stats.table_fmt = not args.json + interval = args.interval + cgroup = args.cgroup + + re_str = None + if args.bdi: + for r in args.bdi: + if re_str is None: + re_str = r + else: + re_str += '|' + r + + filter_re = re.compile(re_str) if re_str else None + + # monitoring loop + signal.signal(signal.SIGINT, sigint_handler) + + while not exit_req: + Stats.now = time.time() + + Stats.show_header() + for bdi in list_for_each_entry('struct backing_dev_info', bdi_list.address_of_(), 'bdi_list'): + bdi_stats = BdiStats(bdi) + if filter_re and not filter_re.search(bdi_stats.name): + continue + + for wb in list_for_each_entry('struct bdi_writeback', bdi.wb_list.address_of_(), 'bdi_node'): + wb_stats = WbStats(wb) + bdi_stats.collectStats(wb_stats) + if cgroup: + wb_stats.show_stats() + + bdi_stats.show_stats() + if cgroup and Stats.table_fmt: + print() + + if interval == 0: + break + time.sleep(interval) + +if __name__ == "__main__": + main() From patchwork Mon Apr 22 16:05:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13637735 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 796BFC05023 for ; Mon, 22 Apr 2024 07:10:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D36776B009D; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CC1626B00A2; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93DBC6B00A0; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 5D3CA6B009D for ; Mon, 22 Apr 2024 03:10:23 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0DCB0140AF6 for ; Mon, 22 Apr 2024 07:10:23 +0000 (UTC) X-FDA: 82036294326.04.B549673 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by imf27.hostedemail.com (Postfix) with ESMTP id 6CEA640007 for ; Mon, 22 Apr 2024 07:10:20 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713769821; a=rsa-sha256; cv=none; b=aoLnoQIYHwmHHN0VCVmNLjbUJbDTEnQYYUhf2MMiBzHWk5uYVsmsJ4UrUdkf3V4Wshd77M ahpVpImuq6XwU5UCBMoJvcpFpNu2cdkpP+DMMm+72ewyDmxIeWyiAktWBsJTQ7F9HzO3tB DrUDX7nm6lpelKyviryk6Wv2YghVeCU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713769821; 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=Z3YxL2BgDSBDJvO5eIKnjaWuRfoH+ejDqyVLxZ4obDs=; b=T5OjW9Jf7VlI4qnM0rmZfosuMPB52FU9675FHOIOZws/v+r1Q1HDlibUzHjrEitm1mZzEi Z+Mac6XMfi6z0iRT4YkV79fpDu/fAK8d6I++ihZPf0euPHilxApjSA55pw0a02l2jZGE22 4a4hwCHGn3nzK9ZGc9bnL52mKrLcBE4= Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4VNGbg6pTjz4f3kp9 for ; Mon, 22 Apr 2024 15:10:07 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 61E701A0179 for ; Mon, 22 Apr 2024 15:10:15 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgAHdwpTDSZmt5eIKw--.7343S6; Mon, 22 Apr 2024 15:10:15 +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: [ATCH v3 4/4] writeback: rename nr_reclaimable to nr_dirty in balance_dirty_pages Date: Tue, 23 Apr 2024 00:05:39 +0800 Message-Id: <20240422160539.3340-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240422160539.3340-1-shikemeng@huaweicloud.com> References: <20240422160539.3340-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgAHdwpTDSZmt5eIKw--.7343S6 X-Coremail-Antispam: 1UD129KBjvJXoW7WFyxZr1fGF17CrW8WFWkXrb_yoW8Cr15pF ZrGw4jkF4Iyayavrn3CFWq9rZxtw4xtF4fJry7Cw4avanrWF1UKFyI9ry0vF1xAa4fJrWa qws0qrykXw4vkrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPmb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7 CjxVA2Y2ka0xkIwI1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2Iq xVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r 1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY 6xkF7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aV AFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZE Xa7IU0TqcUUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 6CEA640007 X-Stat-Signature: 89mwta5m5xob3eejs9ox7usaqxztx9zm X-Rspam-User: X-HE-Tag: 1713769820-733975 X-HE-Meta: U2FsdGVkX1+e9Wi5mJ7gP+2WvngBf8jurfGp4l7RhlIoBFqr6Z6Ee+6OUHpi+sfCDbMtcIXvap2FtP+SKr3fBhjOC6Jhx9RYxL0URCIpKSPiflop5MOcce9FakYDOTYvIH9L0kMbujYrk0e3Gt/CtVm3QNd/bgisgLvq8zwMdVWicwl2KzsDZDPl0bnN+U+92627wcOnS1i/RUTQC5Sjt3et0ws0OlGPmSOCoJK0u/kUs3Wy7/64D3xz4LZYq0PV+lp1O3sh7YnPh1V7sVGlMri28pRSL9nt3eoEPI3UETd/4ydlFs8lPldg7RRgyKRpxyKtdlb88F1PuooFR25APx3EmjHGGSoKM7SXRozO26g+saK6Z3IBg3hZm3AE7QoRA6Lwy6f63+086r1DSESh3ipOHZbGYXvlx882KJ5UApdVs0D2RB7IBN6AmYQwhTL3DpUGqbCUV8BNYna9GpUrCs7efct7dU/XgCUQzgwgIdvH5uuw1qGr/KPoZ0M3rVbq9csJ9kuIrVQW94JK4pqRuo2GasWT3Jq65j7I0zWcx6GgcV6dJs5wZ2GYECO0lEthSQnmopl7ShBg0e3esHVAsw3TDxdZHtEst1NzGzSITC5sWiqX5oBAE/oMJ7kMFgVt/Twwi0VPstsHI40xMCE3151Oog0kOMpS59q4bpAmV9dHka9pAtg3fssypmOO4f0DewOaIsC4pWzrFlvOzSz4QDifNvDhjmbEAT5tpOCu0tCNZui7waaqg2S/DCR6O5skvXSDYW8HB8xrrBdEIhMHOt9qbKvrsu/RgWHZEa70c9MFY6UMAwR/f2/RwfpJ9uqlerOz4yhDqY4ICBpNq/EcGkzXAjWg/RjF87iUCgcpEiZNlOCNjbXhE6h0eyV5Btc8wAYaZAvACgLdjhAAliLoaEXk94Wl2slxWNs5fR8bV3HTYhdJcE+D/LCLIA7EixsWDj/MspN9iJH4kX2zMOE IRBuvC1y AUV4Q3i/veGRXPKV7ZobMwO7PPrDyk5ZIbQm+hvGrUfJHsE5/t45iYjOrth9GQ5IsVvFkY+1R6PQhQWixtqxeBMf64Qm++S+2fK4mHpuQZ3dSXMhRY6RB1Gmik/0hvVC26HggLrQVstf+hEYdewyKJFO2J+Wx4dkP/xcPzNOx8YB57DW1Hk6UaV7Vb7eGufwtvU/oNVZE2KqDH6+nh0+i2TSH7Jna3vjEeMoCh29HuoVha6h9NiautdU8Jgi4UEWN31dsEGe2UqaYVUusAZVc4ParVENAGF8peKwo0g0518WkYpA= 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 38f143195bcb..f2c0237be602 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);