From patchwork Tue Jul 25 14:45:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 13326566 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 E64ACC001DF for ; Tue, 25 Jul 2023 14:45:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6BBA86B0074; Tue, 25 Jul 2023 10:45:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 661C88D0001; Tue, 25 Jul 2023 10:45:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 550366B0078; Tue, 25 Jul 2023 10:45:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 482AA6B0074 for ; Tue, 25 Jul 2023 10:45:25 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id F23B01C9E9E for ; Tue, 25 Jul 2023 14:45:24 +0000 (UTC) X-FDA: 81050407368.21.C645D32 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf08.hostedemail.com (Postfix) with ESMTP id 45A8C160017 for ; Tue, 25 Jul 2023 14:45:20 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=G3YDe+oV; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf08.hostedemail.com: domain of cem@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cem@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690296321; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=XNS0pZWYtiz3eLlRvQaHMyf1ULXVatSDvn1Y8OwTP3s=; b=Vm5p3bg9hOtJtn2zCNSDuZDZaIs0QsV6dIW3/DKwKt1fFw8UggkwZ86EqHt+3KqvGRUZVp hr7hWCEI3+jMmgoOhiWWQgiSjcETCIVyPRuCtJvIAghTB5vtcDhAVtRsY6JnPV6aYrYJYJ obnhLm4OnBc/yxSOA3qR4xuS+KbjR6Y= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=G3YDe+oV; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf08.hostedemail.com: domain of cem@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cem@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690296321; a=rsa-sha256; cv=none; b=Eu/kn9CisPiXB+yqXdyGykriWuiQndPjpbuh8pfIwZNJFJa1QYYqS5C4GtsBM0nRhNA9jc t/vIGjYMUBHZXaGY9xi2V3npQu3D7uMP2Xa/01e+vKjq/2OnPMjEtiY1J5sOTmx89gN+zj 4BOtCrWf1VvRlzZIe7Al0xYXt69QhYI= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1C55E61781; Tue, 25 Jul 2023 14:45:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5012FC433CC; Tue, 25 Jul 2023 14:45:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690296319; bh=yJe4lhnTjof59vWoLkGO8Qqi3dVE6gVAeA03pQuGI1M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G3YDe+oVtR6apUJALc4YfNYQt6z1JLVgTxnAGrkRupm3216gQlY++Ks/hY92BqjJx lK1+JyCzNMPvrZv76bA0BOJfX5Y4OV4IKCqseaLL7xJRulSmctBr/Ak6wLo8puTr8q UcZrMxhvyfyAq3hmwP78ssi5mVKCizMSls8JW9BE2CJLC2bVTY97xRF4x3dnRhhKi0 AHrQApjyWCSeoI0Ew0yMmw8VsRpDHfEpudr6/JmcPTeIetxs34ZBBYydUANv8tGepi dtu5/QbhOqS1Xjd0JZkUbL2whpdy3yTii6kDWpiS0MiFapduQszQQZwHMmMcp1yaDO QF+OoP6vQFd1g== From: cem@kernel.org To: linux-fsdevel@vger.kernel.org Cc: jack@suse.cz, akpm@linux-foundation.org, viro@zeniv.linux.org.uk, linux-mm@kvack.org, djwong@kernel.org, hughd@google.com, brauner@kernel.org, mcgrof@kernel.org Subject: [PATCH 1/7] shmem: make shmem_inode_acct_block() return error Date: Tue, 25 Jul 2023 16:45:04 +0200 Message-Id: <20230725144510.253763-2-cem@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230725144510.253763-1-cem@kernel.org> References: <20230725144510.253763-1-cem@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 45A8C160017 X-Stat-Signature: qs89ozzfd9s8mr4og4g4tbrdcf63td5s X-Rspam-User: X-HE-Tag: 1690296320-591940 X-HE-Meta: U2FsdGVkX1+f5u/xos7v7Ed9gxGwmCvVVZF+fnkS2xYK6HY5fLljSY5z7WE5zRBenzc3FfoOLsxLsytlvEMzc69WXMb+V7h7Jm+cCWKmVlh967eOlx8RYk+7RFrXvVChIex7jXI/nOCeNRzs6V+b7GYr9qHGBeT99CsP39QlIW9r/7SS28KE7+RjnkYBkMnleRMvebxvYrxe/MYEwsQA1/JU8xIxUzOh5gD+lq+KKhGdci01CViHeCL2qdxp31MrJmrblRvkEK7LKr/2sx5TSRo/KsdtKS6Fk71iI2A1xl+K5Ss7HKfzXiXZY1pn6TkDwoSgeCtdsWRJQEDUB42KCyno0T6VYmggXoWkzvXQN/jj3BmJEqVZUDLqZg3L5xFkNF29SA+TY2vCbxdG262xiyKHuL5VD6KuPg1pqrITtqCTquwoeKi7CCQIU2fUzf6QV0xNyjOmw24C6qYMcdpZL5z6IGoB9GicfsLveEq1q/BE1Y6nZCG97GY1tzLXcHTsO2RCKvtC5bae0Uur+KiMaAvAwUHBxKNdQwVzImwa9ybsDjVwlSkr/IVSROb7wtlYIhGOflL6fgG+YaoZqDiGExrzgZ9ro529l/dl88pI/78Nn8ZGbJ8NBUmvBYUlY1GNLpWStGzTfiHGnWjljr9aDOIgkV4ZMHHkBPKwENwufTZ2l9a3+NCb0be035h5gRedOxF3I5tQ+vI3L1Zvc28EamYJap+/TbwPmFTR1eZQAugYUksp44BTIOLxpjapoYkLyfAtx40+WD1QSdlZzz6BjvxCf8jhV913ltfwC3G5/gtM3Mcd8GxlDmHaLEUvFQfFlI/oISoN5yyzYfG8CEOjxM4qUSuI7vmmzsXL1R+rUqcjmXiiQ1/0byULGoUIcEn/vRMIwkl69nu1iIGcw4F6xNY8GykPDTrFoYtBtcG4MIKGqvtXulQg9B73jv/BY9AUx+nKUFD+y+wEcMdb2VS QP4pAXeO jcnRw8EDaKzocHIiNLwNlc5BNREP6FaSnkQBh1d7XXNIZIu9kgBK8yc2Kcl/9TG1kBEXaSrPIGIhdMM+OJr34hfYr3hpomvU6/KIReadfi9KbEDjLL+9d3G1RbZ/LDDrxBZbu+fmgjoAHES0WLcj4TKRNvPwpamA90eBJ1GhyPCyYAz3KAPVldlNctOTg8kWhfUDfc8Kta6MJpCfxlDl1Cqlsih9UodJkkgAa8Rr3qgXdrVIsq6HcA5pWtQBOLOC+VyuChgYTv+94PGprE+9RhRrJFpRGID9B/e3lhShyh/FvyUAZq6i0zzM0AMZwyugchXPigz9ykbCXSZUHXYH3yzJl7tcPJkuYKmLH9hDYdZ855HRSlSop0rPUHSOxNNRbl+Ji 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: From: Lukas Czerner Make shmem_inode_acct_block() return proper error code instead of bool. This will be useful later when we introduce quota support. There should be no functional change. Signed-off-by: Lukas Czerner Signed-off-by: Carlos Maiolino Reviewed-by: Jan Kara --- mm/shmem.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 2f2e0e618072..51d17655a6e1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -199,13 +199,14 @@ static inline void shmem_unacct_blocks(unsigned long flags, long pages) vm_unacct_memory(pages * VM_ACCT(PAGE_SIZE)); } -static inline bool shmem_inode_acct_block(struct inode *inode, long pages) +static inline int 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); + int err = -ENOSPC; if (shmem_acct_block(info->flags, pages)) - return false; + return err; if (sbinfo->max_blocks) { if (percpu_counter_compare(&sbinfo->used_blocks, @@ -214,11 +215,11 @@ static inline bool shmem_inode_acct_block(struct inode *inode, long pages) percpu_counter_add(&sbinfo->used_blocks, pages); } - return true; + return 0; unacct: shmem_unacct_blocks(info->flags, pages); - return false; + return err; } static inline void shmem_inode_unacct_blocks(struct inode *inode, long pages) @@ -370,7 +371,7 @@ bool shmem_charge(struct inode *inode, long pages) struct shmem_inode_info *info = SHMEM_I(inode); unsigned long flags; - if (!shmem_inode_acct_block(inode, pages)) + if (shmem_inode_acct_block(inode, pages)) return false; /* nrpages adjustment first, then shmem_recalc_inode() when balanced */ @@ -1588,13 +1589,14 @@ static struct folio *shmem_alloc_and_acct_folio(gfp_t gfp, struct inode *inode, struct shmem_inode_info *info = SHMEM_I(inode); struct folio *folio; int nr; - int err = -ENOSPC; + int err; if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) huge = false; nr = huge ? HPAGE_PMD_NR : 1; - if (!shmem_inode_acct_block(inode, nr)) + err = shmem_inode_acct_block(inode, nr); + if (err) goto failed; if (huge) @@ -2445,7 +2447,7 @@ int shmem_mfill_atomic_pte(pmd_t *dst_pmd, int ret; pgoff_t max_off; - if (!shmem_inode_acct_block(inode, 1)) { + if (shmem_inode_acct_block(inode, 1)) { /* * We may have got a page, returned -ENOENT triggering a retry, * and now we find ourselves with -ENOMEM. Release the page, to