From patchwork Mon Apr 18 21:37:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Krisman Bertazi X-Patchwork-Id: 12817131 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 D17AFC433EF for ; Mon, 18 Apr 2022 21:37:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C0FB8D0024; Mon, 18 Apr 2022 17:37:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 547748D001A; Mon, 18 Apr 2022 17:37:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E8058D0024; Mon, 18 Apr 2022 17:37:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.26]) by kanga.kvack.org (Postfix) with ESMTP id 2DEB98D001A for ; Mon, 18 Apr 2022 17:37:31 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id F30B5246D9 for ; Mon, 18 Apr 2022 21:37:30 +0000 (UTC) X-FDA: 79371311460.05.EA13F2F Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by imf02.hostedemail.com (Postfix) with ESMTP id 80EC18000C for ; Mon, 18 Apr 2022 21:37:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id 50DD11F41A0C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650317849; bh=GYECkxCByzaOM41HzDyvIHL8brH7A+F886nTQDaIBIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bP+AZTJ2AO1MTsrZvoI7YCLQR55xXNgN/onPzok9ZwDu3pRPGvKiTAVExakDe/H/1 s9bHl/qImPN12s+ovALL0e5KBxnKMx0sv2ElEMxL1ICOVPicOsYqo7YVLV9hnGWf+e Kbr7D1JwzaKr6KTl38sJ75FLDMH0m9D1ZBo4rY0jWwiNo5MHoRDNvaEqVaaUhaW/mg mQUUn6Lu6tyCGEn+e6HgEyTASMHNTnu0JfeQgwqtMyybQSK4gPQmHyb3QH3j/8pmaQ nGdo5b943LsozlDXjsA+ugy9jf6MZv78fW8V4iQqR27B4rFG1ReyEZdUiI7KnXWGOH DnvGr7u2klyyg== From: Gabriel Krisman Bertazi To: hughd@google.com, akpm@linux-foundation.org, amir73il@gmail.com Cc: viro@zeniv.linux.org.uk, Gabriel Krisman Bertazi , kernel@collabora.com, Khazhismel Kumykov , Linux MM , linux-fsdevel Subject: [PATCH v3 3/3] shmem: Expose space and accounting error count Date: Mon, 18 Apr 2022 17:37:13 -0400 Message-Id: <20220418213713.273050-4-krisman@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220418213713.273050-1-krisman@collabora.com> References: <20220418213713.273050-1-krisman@collabora.com> MIME-Version: 1.0 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=bP+AZTJ2; dmarc=pass (policy=none) header.from=collabora.com; spf=pass (imf02.hostedemail.com: domain of krisman@collabora.com designates 46.235.227.227 as permitted sender) smtp.mailfrom=krisman@collabora.com X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 80EC18000C X-Stat-Signature: p4o5bjne5q836qkjntjtoh5grmuooh63 X-HE-Tag: 1650317850-504043 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: Exposing these shmem counters through sysfs is particularly useful for container provisioning, to allow administrators to differentiate between insufficiently provisioned fs size vs. running out of memory. Suggested-by: Amir Goldstein Suggested-by: Khazhy Kumykov Signed-off-by: Gabriel Krisman Bertazi --- Documentation/ABI/testing/sysfs-fs-tmpfs | 13 ++++++++++++ mm/shmem.c | 25 ++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-fs-tmpfs diff --git a/Documentation/ABI/testing/sysfs-fs-tmpfs b/Documentation/ABI/testing/sysfs-fs-tmpfs new file mode 100644 index 000000000000..d32b90949710 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-fs-tmpfs @@ -0,0 +1,13 @@ +What: /sys/fs/tmpfs//acct_errors +Date: March 2022 +Contact: "Gabriel Krisman Bertazi" +Description: + Track the number of IO errors caused by lack of memory to + perform the allocation of a tmpfs block. + +What: /sys/fs/tmpfs//space_errors +Date: March 2022 +Contact: "Gabriel Krisman Bertazi" +Description: + Track the number of IO errors caused by lack of space + in the filesystem to perform the allocation of a tmpfs block. diff --git a/mm/shmem.c b/mm/shmem.c index 8fe4a22e83a6..5c665b955ceb 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -214,6 +214,7 @@ static inline bool shmem_inode_acct_block(struct inode *inode, long pages) if (shmem_acct_block(info->flags, pages)) { sbinfo->acct_errors += 1; + sysfs_notify(&sbinfo->kobj, NULL, "acct_errors"); return false; } @@ -228,6 +229,7 @@ static inline bool shmem_inode_acct_block(struct inode *inode, long pages) unacct: sbinfo->space_errors += 1; + sysfs_notify(&sbinfo->kobj, NULL, "space_errors"); shmem_unacct_blocks(info->flags, pages); return false; } @@ -3584,10 +3586,33 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) } #if defined(CONFIG_SYSFS) +static ssize_t acct_errors_show(struct kobject *kobj, + struct kobj_attribute *attr, char *page) +{ + struct shmem_sb_info *sbinfo = + container_of(kobj, struct shmem_sb_info, kobj); + + return sysfs_emit(page, "%lu\n", sbinfo->acct_errors); +} + +static ssize_t space_errors_show(struct kobject *kobj, + struct kobj_attribute *attr, char *page) +{ + struct shmem_sb_info *sbinfo = + container_of(kobj, struct shmem_sb_info, kobj); + + return sysfs_emit(page, "%lu\n", sbinfo->space_errors); +} + #define TMPFS_SB_ATTR_RO(name) \ static struct kobj_attribute tmpfs_sb_attr_##name = __ATTR_RO(name) +TMPFS_SB_ATTR_RO(acct_errors); +TMPFS_SB_ATTR_RO(space_errors); + static struct attribute *tmpfs_attrs[] = { + &tmpfs_sb_attr_acct_errors.attr, + &tmpfs_sb_attr_space_errors.attr, NULL }; ATTRIBUTE_GROUPS(tmpfs);