From patchwork Wed Nov 20 21:51:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dennis Zhou X-Patchwork-Id: 11254873 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 559586C1 for ; Wed, 20 Nov 2019 21:51:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 361E520709 for ; Wed, 20 Nov 2019 21:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574286702; bh=h6Vv/bZsh5+4kB+hJZfPq5LmhISUqbIg9sn2t8rGfpo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:List-ID:From; b=TfcKWi5voTA9R694ovLoriMAwh9hrydq3ofea4Mojmtrw0Qldaj3VB0XBKeXSUjFh ebFyB9ijqfzweCetFuuAY/RNgvW+BQFY+nZOQrqQHKckUNvS/CdTYhp9PKmCYb1qea nHmp/LrQ2F6Siqe7WWq3Aqj8wzAPVVniVXL7HQmw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726920AbfKTVvl (ORCPT ); Wed, 20 Nov 2019 16:51:41 -0500 Received: from mail-qk1-f195.google.com ([209.85.222.195]:44194 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726822AbfKTVvk (ORCPT ); Wed, 20 Nov 2019 16:51:40 -0500 Received: by mail-qk1-f195.google.com with SMTP id m16so1221066qki.11 for ; Wed, 20 Nov 2019 13:51:39 -0800 (PST) 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:in-reply-to :references:in-reply-to:references; bh=/uSEcZmYQD26T6L5eL2QFlCiJ6inR86K4hroBrXIOK8=; b=fXDKi4O7dxmLT/7gOytxN5QDHpmksNVs122UY4Ij2MS0Kmy8jyXgWDe5stRnBvM4oP iVg8xh2mAODXPbpSUgthrnk6sfdPsZzZ/JcHbenW3MTY7eLbgpx+8ZMEkq1DdXy2SWOk z2AOhpGugzEupYZXGFCZcyEyM8hbqgorMGYGOyOIwNnXqcQE49578fzHTcctDmp3dvti ceCM/U3FgohtWUmsWX96pM4P0Ob6rACE64Sy8S/dFeZn/ufnwHs/UlBlAlngXqWRpxMc X6YOSg+CN1AGDPsLmGBUGYJbCpeu27GlbtyBQnNo3eA7FxiYGIZY0DmBzVO2kVFfNxoB Upmw== X-Gm-Message-State: APjAAAW9IFgjBFBzcPSU10rIH22OoiZ/s5z/aP3XVZ8B/yxcDhXi4rv3 75cvaKQK2K3xKtAOZwh/+Ds= X-Google-Smtp-Source: APXvYqw2tlriwxc0zC4sKhzcaOrtlA7FmqmL1QCJPrqp8N0LFgSeKE/5H0biS1vaAZd7e65HiACq6A== X-Received: by 2002:a37:dc03:: with SMTP id v3mr4733522qki.309.1574286699367; Wed, 20 Nov 2019 13:51:39 -0800 (PST) Received: from dennisz-mbp.thefacebook.com ([163.114.130.128]) by smtp.gmail.com with ESMTPSA id t16sm303820qkm.73.2019.11.20.13.51.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Nov 2019 13:51:38 -0800 (PST) From: Dennis Zhou To: David Sterba , Chris Mason , Josef Bacik , Omar Sandoval Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org, Dennis Zhou Subject: [PATCH 10/22] btrfs: add discard sysfs directory Date: Wed, 20 Nov 2019 16:51:09 -0500 Message-Id: X-Mailer: git-send-email 2.13.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Setup sysfs directory for discard stats + tunables. Signed-off-by: Dennis Zhou Reviewed-by: Josef Bacik --- fs/btrfs/ctree.h | 1 + fs/btrfs/sysfs.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 0c5cd5e6c2c5..6a547317d26f 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -930,6 +930,7 @@ struct btrfs_fs_info { #ifdef CONFIG_BTRFS_DEBUG struct kobject *debug_kobj; + struct kobject *discard_debug_kobj; #endif }; diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index beae5c8146fb..e877e4b3c631 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -338,6 +338,13 @@ static const struct attribute_group btrfs_static_feature_attr_group = { #ifdef CONFIG_BTRFS_DEBUG +/* + * Discard statistics and tunables. + */ +static const struct attribute *discard_debug_attrs[] = { + NULL, +}; + /* * Runtime debugging exported via sysfs * @@ -776,6 +783,12 @@ void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info) kobject_put(fs_info->space_info_kobj); } #ifdef CONFIG_BTRFS_DEBUG + if (fs_info->discard_debug_kobj) { + sysfs_remove_files(fs_info->discard_debug_kobj, + discard_debug_attrs); + kobject_del(fs_info->discard_debug_kobj); + kobject_put(fs_info->discard_debug_kobj); + } if (fs_info->debug_kobj) { sysfs_remove_files(fs_info->debug_kobj, btrfs_debug_mount_attrs); @@ -1131,6 +1144,19 @@ int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info) btrfs_debug_mount_attrs); if (error) goto failure; + + /* Discard directory. */ + fs_info->discard_debug_kobj = kobject_create_and_add("discard", + fs_info->debug_kobj); + if (!fs_info->discard_debug_kobj) { + error = -ENOMEM; + goto failure; + } + + error = sysfs_create_files(fs_info->discard_debug_kobj, + discard_debug_attrs); + if (error) + goto failure; #endif error = addrm_unknown_feature_attrs(fs_info, true);