From patchwork Thu Mar 28 01:28:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 10874375 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2556F186D for ; Thu, 28 Mar 2019 01:29:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 041D92891F for ; Thu, 28 Mar 2019 01:29:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EAB772890B; Thu, 28 Mar 2019 01:29:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D61BB2890B for ; Thu, 28 Mar 2019 01:29:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727246AbfC1B3N (ORCPT ); Wed, 27 Mar 2019 21:29:13 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:46551 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725601AbfC1B3N (ORCPT ); Wed, 27 Mar 2019 21:29:13 -0400 Received: by mail-pg1-f194.google.com with SMTP id q1so2622382pgv.13 for ; Wed, 27 Mar 2019 18:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=tukzt6J7pvSIamdlcOGL4QJw0RvQ0+ktzc5u8g+Iio4=; b=UmlbKR3ha5a9SPFPM2ymZEbccn+U+9o8qa6ecNpQexxHDQgP4UspVL1R/9M+D0wRvo LG8dM7A7bbLsedu7Pha9CL7nbQJMEkrVIriUM9AaLcYaSQbOQGuFZUJWKw8UY4siqu1/ UgWljKPfA+ucSw3gjgtjJwX2/7W6F8YTalS17nMDQm+9Z+ZnQGeb4N8R6PqwSRxYmTae KlM2M7270uw5QV1KkxyhfX5Y7AIwtYPRP98fdM+Cs6No5AxZ88Yzd5NTG51jorUDW+B3 Hdq74fUBw0Opkn7rKVKHRrUeIBDTBRIHaEG4/9YHy/cLyb+UET7kSrlBj0sF5XydJikb 8eqw== 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; bh=tukzt6J7pvSIamdlcOGL4QJw0RvQ0+ktzc5u8g+Iio4=; b=C2s9WE6X50DdbkSXRsLNUvwRkStgdJvzA2iFrhkCe9gVnMgwyhx840z/ifOLjleH6u DfqpCtmZnP3kUyw3SfGY1tA84SX77QE3UQB4pg1kvEwPaLdAYOG5Z0hv8FchEfZgrkOC C1lrceNipR74RjbCSUBVH3h1TbcgFhZ7/dWLZGdEFcatHXrlxnIrj9stOjq+Rofhm2pu 3J9UZHxd8jeIOVwZsX9bJkmxU4CkyPy/rCfi1zWc1etXEvzdTc+N2t13WPptAsmnzRNE zUQRTQT10yEltAE8cAM0RmOy9SauVqmDCoKLplsBg9SGa97h981MK5GJe5/yAkOkua36 ZRig== X-Gm-Message-State: APjAAAWJzMkRoUrxap6YN7nZNc8VI6E5TYJEhZyqBy3ffTUQsRpupVa9 fwvn2z/EOzokKfZQecJ+ixdVo6hk63WA9A== X-Google-Smtp-Source: APXvYqwZT5eOsIr+3qDarnLoNwRm9h5euyBSf5tZjvQYOT6jdZJHbGvmtwsylqu+pol7G+tDN2ndIQ== X-Received: by 2002:a65:4342:: with SMTP id k2mr38049128pgq.445.1553736552505; Wed, 27 Mar 2019 18:29:12 -0700 (PDT) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id t22sm30256629pgu.45.2019.03.27.18.29.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 18:29:11 -0700 (PDT) From: Yafang Shao To: viro@zeniv.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, jack@suse.cz, Yafang Shao Subject: [PATCH] fs/writeback: expose cgroup info in trace_writeback_pages_written() Date: Thu, 28 Mar 2019 09:28:59 +0800 Message-Id: <1553736539-32324-1-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With cgroup v2 writeback, we can know these pages are written from which cgroup. So expose the cgroup_ino for better tracking. Signed-off-by: Yafang Shao Acked-by: Jan Kara --- fs/fs-writeback.c | 4 ++-- include/trace/events/writeback.h | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 36855c1..e98a33e 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -1973,7 +1973,7 @@ void wb_workfn(struct work_struct *work) */ do { pages_written = wb_do_writeback(wb); - trace_writeback_pages_written(pages_written); + trace_writeback_pages_written(wb, pages_written); } while (!list_empty(&wb->work_list)); } else { /* @@ -1983,7 +1983,7 @@ void wb_workfn(struct work_struct *work) */ pages_written = writeback_inodes_wb(wb, 1024, WB_REASON_FORKER_THREAD); - trace_writeback_pages_written(pages_written); + trace_writeback_pages_written(wb, pages_written); } if (!list_empty(&wb->work_list)) diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h index 32db72c..a806713 100644 --- a/include/trace/events/writeback.h +++ b/include/trace/events/writeback.h @@ -255,15 +255,18 @@ static inline unsigned int __trace_wbc_assign_cgroup(struct writeback_control *w DEFINE_WRITEBACK_WORK_EVENT(writeback_wait); TRACE_EVENT(writeback_pages_written, - TP_PROTO(long pages_written), - TP_ARGS(pages_written), + TP_PROTO(struct bdi_writeback *wb, long pages_written), + TP_ARGS(wb, pages_written), TP_STRUCT__entry( __field(long, pages) + __field(unsigned int, cgroup_ino) ), TP_fast_assign( __entry->pages = pages_written; + __entry->cgroup_ino = __trace_wb_assign_cgroup(wb); ), - TP_printk("%ld", __entry->pages) + TP_printk("pages=%ld cgroup_ino=%u", + __entry->pages, __entry->cgroup_ino) ); DECLARE_EVENT_CLASS(writeback_class,