From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3C94C00454 for ; Mon, 9 Dec 2019 19:46:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71DB7206E0 for ; Mon, 9 Dec 2019 19:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575920783; bh=K5gJvupEzEmzpBDmNw+kwD0PQ1i0emmwZPs4lmqbkXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:List-ID:From; b=ZkpRzEBXythu+yyIDdAgp2ojsP+bfwH5BvV+WybQP07ZoNSSI6CDBek6jfcoekYIZ 65C4MwcdAEiipjkWdvNM+T2MHhIOAERALArg2B2ydLALVKhtmdrr1FfL1XLZmQNWHu JUfgJeIi+ATPyhrTlYYfrR2PvB08Akm30uHKPw+U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726777AbfLITqX (ORCPT ); Mon, 9 Dec 2019 14:46:23 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:34471 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726720AbfLITqW (ORCPT ); Mon, 9 Dec 2019 14:46:22 -0500 Received: by mail-pg1-f194.google.com with SMTP id r11so7635398pgf.1 for ; Mon, 09 Dec 2019 11:46:21 -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=MzyxE2WAAhGZKg0eCVFRcnL7x3mLBj90V046YTNiI5A=; b=Qr3UiHgwlzyfsfLPQGG8z9zyDqhQMfXYav9kYvFdpa8K7hcmOXS6+Ghcig8NhGYG9T uS1huj+nAunA3aT2ZUUwYEtqqWrt4plNAfk9ZAkXMOCWiG6XMnEN9bmOQUlC2JG46auK HOiOD7ttB1tojmlCDX0XF6rbs9FNMkmce1uteoG4m1gutWfg0OEDz7FJWL99FsyjOSq1 fUTYDjNl/4lDInjb0YsT2YEmJAdTye/CElXli7FILxTMH3nw8YKjZZ+JvYt1B1+3ZtAz QkG57I/054ckX2lSOya7OBAy4354z0/Q+omRKSU76IyeziKSU80/FXJHV4dlQweYGOtn DROQ== X-Gm-Message-State: APjAAAVIz79vn3NiS0szyYBvF0d3+CNHI9IHMZTpjVOLEZxkY1q10GEe STDM7VTR51OCfWyChGpqRqs= X-Google-Smtp-Source: APXvYqyANrFbsuQb4gMNx3AIYt3p/8BDYKyRQ8Lz5WXNS5Lg3zjy3e0nKxc4dxfJSC63l/aCR6LOeQ== X-Received: by 2002:a63:496:: with SMTP id 144mr21106727pge.207.1575920781470; Mon, 09 Dec 2019 11:46:21 -0800 (PST) Received: from dennisz-mbp.thefacebook.com ([199.201.64.138]) by smtp.gmail.com with ESMTPSA id b190sm282956pfg.66.2019.12.09.11.46.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Dec 2019 11:46:20 -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: Mon, 9 Dec 2019 11:45:55 -0800 Message-Id: <36d628cc354e33708556b8ff3fa9b47be30c3385.1575919745.git.dennis@kernel.org> 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 86addfc7bcbf..40d6545337ff 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 3a56e0cdd673..bc5415f67987 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); @@ -1127,6 +1140,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); -- 2.17.1