From patchwork Mon Apr 4 13:41:35 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: 12800235 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 C487AC433EF for ; Mon, 4 Apr 2022 13:42:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 21FC36B0073; Mon, 4 Apr 2022 09:42:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D01F6B0074; Mon, 4 Apr 2022 09:42:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 070396B0075; Mon, 4 Apr 2022 09:42:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.28]) by kanga.kvack.org (Postfix) with ESMTP id EC1B06B0073 for ; Mon, 4 Apr 2022 09:42:01 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CD2296102D for ; Mon, 4 Apr 2022 13:41:51 +0000 (UTC) X-FDA: 79319309622.07.8FC3AA1 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by imf22.hostedemail.com (Postfix) with ESMTP id 3F519C0031 for ; Mon, 4 Apr 2022 13:41:51 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id 139EE1F44928 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1649079710; bh=zfBsf2RUnAkmYRtu6lmk/b8dTq1cQYpREmaCwhUzUEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AnT/UR63cC5l6sLe3j41I1/03cTiqLpPv7znsIhGOe3hKFamGkleq6DNScyLfjqvf SyKdvOC82qGsZcSQ2BibFMuSzE8RavVYPz+B8VhcunTKJxz9r642l4IElNR3h83I3Z f3L8O+hwmVdgzuEbYGlUmPY1CjOwIk0Byap/OWuBSzB5val0kPi2pTQ9SJsoSG4Ciw oLmShkblV58QDu5s3ahSNCPjhViEXGLZN8SsRgLpcOTqbOWHOLRaY1m3nmsljzb6/F IROTEnz06yLmIuVGDVoQnAXZtg0JlEPID8QyoQSB9FoQwRJ/w2Z8H2aInLrskXhrDW XTvPBLzHEt3TA== From: Gabriel Krisman Bertazi To: Hugh Dickins , Andrew Morton , Amir Goldstein Cc: Gabriel Krisman Bertazi , kernel@collabora.com, Khazhismel Kumykov , Linux MM , linux-fsdevel Subject: [PATCH RESEND 1/3] shmem: Keep track of out-of-memory and out-of-space errors Date: Mon, 4 Apr 2022 09:41:35 -0400 Message-Id: <20220404134137.26284-2-krisman@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220404134137.26284-1-krisman@collabora.com> References: <20220404134137.26284-1-krisman@collabora.com> MIME-Version: 1.0 Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b="AnT/UR63"; spf=pass (imf22.hostedemail.com: domain of krisman@collabora.com designates 46.235.227.227 as permitted sender) smtp.mailfrom=krisman@collabora.com; dmarc=pass (policy=none) header.from=collabora.com X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 3F519C0031 X-Stat-Signature: 71qj3izxrz34myx19imm4j8xt17iwxw3 X-HE-Tag: 1649079711-21786 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: Keep a per-sb counter of failed shmem allocations for ENOMEM/ENOSPC to be reported on sysfs. The sysfs support is done separately on a later patch. Signed-off-by: Gabriel Krisman Bertazi --- include/linux/shmem_fs.h | 3 +++ mm/shmem.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index e65b80ed09e7..1a7cd9ea9107 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -44,6 +44,9 @@ struct shmem_sb_info { spinlock_t shrinklist_lock; /* Protects shrinklist */ struct list_head shrinklist; /* List of shinkable inodes */ unsigned long shrinklist_len; /* Length of shrinklist */ + + unsigned long acct_errors; + unsigned long space_errors; }; static inline struct shmem_inode_info *SHMEM_I(struct inode *inode) diff --git a/mm/shmem.c b/mm/shmem.c index a09b29ec2b45..c350fa0a0fff 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -212,8 +212,10 @@ static inline bool shmem_inode_acct_block(struct inode *inode, long pages) struct shmem_inode_info *info = SHMEM_I(inode); struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb); - if (shmem_acct_block(info->flags, pages)) + if (shmem_acct_block(info->flags, pages)) { + sbinfo->acct_errors += 1; return false; + } if (sbinfo->max_blocks) { if (percpu_counter_compare(&sbinfo->used_blocks, @@ -225,6 +227,7 @@ static inline bool shmem_inode_acct_block(struct inode *inode, long pages) return true; unacct: + sbinfo->space_errors += 1; shmem_unacct_blocks(info->flags, pages); return false; }