From patchwork Wed Mar 18 15:08:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 11445591 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 8763A92A for ; Wed, 18 Mar 2020 15:08:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B37C20777 for ; Wed, 18 Mar 2020 15:08:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IVVtXik5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727177AbgCRPIr (ORCPT ); Wed, 18 Mar 2020 11:08:47 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:36023 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726979AbgCRPIq (ORCPT ); Wed, 18 Mar 2020 11:08:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584544125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DH76qKgpoQ+4SKQ/R4PU7Ho4XbaGU1JGpIlcrPsUIdQ=; b=IVVtXik5CRdIxfDSodqBCPWJ/h8WSWAMe1p13qbxzuOUB4uDzc8rX5DvIBPFYWm+kVXuMV nwfqv0hUbt0XWbS5L2xljpQbPTCLZypm7THR4tUJcVRI5rIrWG11KgIefW6dbbruD2LyOK /fzitC+g/iocKZOQc5++zAmmirmLGZk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-101-MRQxOT2nPWiGfiK-cW7fbQ-1; Wed, 18 Mar 2020 11:08:41 -0400 X-MC-Unique: MRQxOT2nPWiGfiK-cW7fbQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC152801E72; Wed, 18 Mar 2020 15:08:39 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-113-126.rdu2.redhat.com [10.10.113.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52C53BBBCD; Wed, 18 Mar 2020 15:08:37 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 03/13] fsinfo: Allow retrieval of superblock devname, options and stats [ver #19] From: David Howells To: torvalds@linux-foundation.org, viro@zeniv.linux.org.uk Cc: dhowells@redhat.com, raven@themaw.net, mszeredi@redhat.com, christian@brauner.io, jannh@google.com, darrick.wong@oracle.com, kzak@redhat.com, jlayton@redhat.com, linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 18 Mar 2020 15:08:36 +0000 Message-ID: <158454411654.2864823.12834246585480642909.stgit@warthog.procyon.org.uk> In-Reply-To: <158454408854.2864823.5910520544515668590.stgit@warthog.procyon.org.uk> References: <158454408854.2864823.5910520544515668590.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Provide fsinfo() attributes to retrieve superblock device name, options, and statistics in string form. The following attributes are defined: FSINFO_ATTR_SOURCE - Mount-specific device name FSINFO_ATTR_CONFIGURATION - Mount options FSINFO_ATTR_FS_STATISTICS - Filesystem statistics FSINFO_ATTR_SOURCE could be made indexable by params->Nth to handle the case where there is more than one source (e.g. the bcachefs filesystem). Signed-off-by: David Howells --- fs/fsinfo.c | 41 +++++++++++++++++++++++++++++++++++++++++ fs/internal.h | 2 ++ fs/namespace.c | 39 +++++++++++++++++++++++++++++++++++++++ include/uapi/linux/fsinfo.h | 3 +++ samples/vfs/test-fsinfo.c | 4 ++++ 5 files changed, 89 insertions(+) diff --git a/fs/fsinfo.c b/fs/fsinfo.c index 8aee78a6b584..7389095efd4f 100644 --- a/fs/fsinfo.c +++ b/fs/fsinfo.c @@ -217,6 +217,44 @@ static int fsinfo_generic_volume_id(struct path *path, struct fsinfo_context *ct return fsinfo_string(path->dentry->d_sb->s_id, ctx); } +/* + * Retrieve the superblock configuration (mount options) as a comma-separated + * string. The initial comma is stripped off. + */ +static int fsinfo_generic_seq_read(struct path *path, struct fsinfo_context *ctx) +{ + struct super_block *sb = path->dentry->d_sb; + struct seq_file m = { + .buf = ctx->buffer, + .size = ctx->buf_size, + }; + int ret = 0; + + switch (ctx->requested_attr) { + case FSINFO_ATTR_CONFIGURATION: + if (sb->s_op->show_options) + ret = sb->s_op->show_options(&m, path->mnt->mnt_root); + break; + + case FSINFO_ATTR_FS_STATISTICS: + if (sb->s_op->show_stats) + ret = sb->s_op->show_stats(&m, path->mnt->mnt_root); + break; + } + + if (ret < 0) + return ret; + if (seq_has_overflowed(&m)) + return ctx->buf_size + PAGE_SIZE; + if (ctx->requested_attr == FSINFO_ATTR_CONFIGURATION) { + if (m.count > 0 && ((char *)ctx->buffer)[0] == ',') { + m.count--; + ctx->skip = 1; + } + } + return m.count; +} + static const struct fsinfo_attribute fsinfo_common_attributes[] = { FSINFO_VSTRUCT (FSINFO_ATTR_STATFS, fsinfo_generic_statfs), FSINFO_VSTRUCT (FSINFO_ATTR_IDS, fsinfo_generic_ids), @@ -226,6 +264,9 @@ static const struct fsinfo_attribute fsinfo_common_attributes[] = { FSINFO_STRING (FSINFO_ATTR_VOLUME_ID, fsinfo_generic_volume_id), FSINFO_VSTRUCT (FSINFO_ATTR_VOLUME_UUID, fsinfo_generic_volume_uuid), FSINFO_VSTRUCT (FSINFO_ATTR_FEATURES, fsinfo_generic_features), + FSINFO_STRING (FSINFO_ATTR_SOURCE, fsinfo_generic_mount_source), + FSINFO_STRING (FSINFO_ATTR_CONFIGURATION, fsinfo_generic_seq_read), + FSINFO_STRING (FSINFO_ATTR_FS_STATISTICS, fsinfo_generic_seq_read), FSINFO_LIST (FSINFO_ATTR_FSINFO_ATTRIBUTES, (void *)123UL), FSINFO_VSTRUCT_N(FSINFO_ATTR_FSINFO_ATTRIBUTE_INFO, (void *)123UL), diff --git a/fs/internal.h b/fs/internal.h index a0d90f23593c..6f2cc77bf38d 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -91,6 +91,8 @@ extern int __mnt_want_write_file(struct file *); extern void __mnt_drop_write_file(struct file *); extern void dissolve_on_fput(struct vfsmount *); +extern int fsinfo_generic_mount_source(struct path *, struct fsinfo_context *); + /* * fs_struct.c */ diff --git a/fs/namespace.c b/fs/namespace.c index 54d237251941..e26e06447993 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "pnode.h" #include "internal.h" @@ -3997,3 +3998,41 @@ const struct proc_ns_operations mntns_operations = { .install = mntns_install, .owner = mntns_owner, }; + +#ifdef CONFIG_FSINFO +static inline void mangle(struct seq_file *m, const char *s) +{ + seq_escape(m, s, " \t\n\\"); +} + +/* + * Return the mount source/device name as seen from this mountpoint. Shared + * mounts may vary here and the filesystem is permitted to substitute its own + * rendering. + */ +int fsinfo_generic_mount_source(struct path *path, struct fsinfo_context *ctx) +{ + struct super_block *sb = path->mnt->mnt_sb; + struct mount *mnt = real_mount(path->mnt); + struct seq_file m = { + .buf = ctx->buffer, + .size = ctx->buf_size, + }; + int ret; + + if (sb->s_op->show_devname) { + ret = sb->s_op->show_devname(&m, mnt->mnt.mnt_root); + if (ret < 0) + return ret; + } else { + if (!mnt->mnt_devname) + return fsinfo_string("none", ctx); + mangle(&m, mnt->mnt_devname); + } + + if (seq_has_overflowed(&m)) + return ctx->buf_size + PAGE_SIZE; + return m.count; +} + +#endif /* CONFIG_FSINFO */ diff --git a/include/uapi/linux/fsinfo.h b/include/uapi/linux/fsinfo.h index 83c92e202f7b..3bb4fa67f8c8 100644 --- a/include/uapi/linux/fsinfo.h +++ b/include/uapi/linux/fsinfo.h @@ -24,6 +24,9 @@ #define FSINFO_ATTR_VOLUME_UUID 0x06 /* Volume UUID (LE uuid) */ #define FSINFO_ATTR_VOLUME_NAME 0x07 /* Volume name (string) */ #define FSINFO_ATTR_FEATURES 0x08 /* Filesystem features (bits) */ +#define FSINFO_ATTR_SOURCE 0x09 /* Superblock source/device name (string) */ +#define FSINFO_ATTR_CONFIGURATION 0x0a /* Superblock configuration/options (string) */ +#define FSINFO_ATTR_FS_STATISTICS 0x0b /* Superblock filesystem statistics (string) */ #define FSINFO_ATTR_FSINFO_ATTRIBUTE_INFO 0x100 /* Information about attr N (for path) */ #define FSINFO_ATTR_FSINFO_ATTRIBUTES 0x101 /* List of supported attrs (for path) */ diff --git a/samples/vfs/test-fsinfo.c b/samples/vfs/test-fsinfo.c index bae9e6a46e72..692639ae6d1c 100644 --- a/samples/vfs/test-fsinfo.c +++ b/samples/vfs/test-fsinfo.c @@ -358,6 +358,10 @@ static const struct fsinfo_attribute fsinfo_attributes[] = { FSINFO_STRING (FSINFO_ATTR_VOLUME_ID, string), FSINFO_VSTRUCT (FSINFO_ATTR_VOLUME_UUID, fsinfo_generic_volume_uuid), FSINFO_STRING (FSINFO_ATTR_VOLUME_NAME, string), + FSINFO_STRING (FSINFO_ATTR_SOURCE, string), + FSINFO_STRING (FSINFO_ATTR_CONFIGURATION, string), + FSINFO_STRING (FSINFO_ATTR_FS_STATISTICS, string), + FSINFO_VSTRUCT_N(FSINFO_ATTR_FSINFO_ATTRIBUTE_INFO, fsinfo_meta_attribute_info), FSINFO_LIST (FSINFO_ATTR_FSINFO_ATTRIBUTES, fsinfo_meta_attributes), {}