From patchwork Mon Jul 17 11:52:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 13315513 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 E5C8DC001DC for ; Mon, 17 Jul 2023 11:52:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 73A7B6B0074; Mon, 17 Jul 2023 07:52:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E9C26B0075; Mon, 17 Jul 2023 07:52:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B1C86B0078; Mon, 17 Jul 2023 07:52:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4D3DF6B0074 for ; Mon, 17 Jul 2023 07:52:53 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 162A5A0581 for ; Mon, 17 Jul 2023 11:52:53 +0000 (UTC) X-FDA: 81020942226.28.A316C7C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf21.hostedemail.com (Postfix) with ESMTP id 5637F1C000F for ; Mon, 17 Jul 2023 11:52:51 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=TsAOPnJH; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf21.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=1689594771; 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=vj45JCWMHg5Ejny8N+744g/KEk4dZ9LMTrO0FTT3QLxSLfmV+ypMA5Jbdz5U8431fXEHtq dyPlCaHH9G3hZf8X84UBRaTYccnKvSweXf5jJsxxQ3H13fSktFrejI567PzvIVl40elaxz XVNVeDWmUYu+ecJm/ynCKAkXqCHfVgM= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=TsAOPnJH; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf21.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=1689594771; a=rsa-sha256; cv=none; b=N10f/ueZau7DH/bEjjdh48u6FMcBCNUyUBbZ3SA7yGFX5Vj320Fr/mRDOKvUiC31JOxY+B sw9xoMHgrLpyMjWsHtReM86c+m+Lgc74HorcOCfxTdQR6uN2VGNnB8l+djnv2rrnj4NyJK 09nD73XJb3lGydGW9dhU0x7eeQjkSQU= 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 88A7061032; Mon, 17 Jul 2023 11:52:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA9C5C433C7; Mon, 17 Jul 2023 11:52:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689594770; bh=yJe4lhnTjof59vWoLkGO8Qqi3dVE6gVAeA03pQuGI1M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TsAOPnJHZZziesEOWz5VjEy8MCrEPeRToXZg81RrcDiX4eTX8wKnwVA1IvSoWWjDK ZFOjQLFhI0yMHYwpvjwXyc148sefMxnkr08GFVzg9MwGO+/XBCD2y9XBnXftrJkwrh HB9Dvrkp6ZbxNXtBqU8/Y+4D0KkhuZLe+JJpj1wpK1CBgeXAj5H+NuKkWtrxZLRhQm JniNqefLEsuP1YmQveKKRzvIIgpC/4E16yDBDyBZIY8cZFKMG8rSio3SpPS5GeKmCa P74KgqiHZ5Jx+YT4Cr93du0B9oS7ef1uwCmSnEQouQSI1nBBrcqPvv0yx/rIBfM4gB dAZJ+9TpkAgrw== 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/6] shmem: make shmem_inode_acct_block() return error Date: Mon, 17 Jul 2023 13:52:09 +0200 Message-Id: <20230717115212.208651-2-cem@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230717115212.208651-1-cem@kernel.org> References: <20230717115212.208651-1-cem@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 5637F1C000F X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: rwikss5z7ikexatot9bt8duz7ebsqciq X-HE-Tag: 1689594771-515621 X-HE-Meta: U2FsdGVkX19kp/UG3O32PP9f5y78qFvxaihASueuxt7P24hOz+KT2rVm7/IAL+RclzPtzW7dtqZ92n9UFZGxlzcza+un0nFDs1MApCmsYk7aqb4IQ1NQSlcWngUOx9K8rSI0rXvdlv41RvbQOzgV0YcUUuxDjDDC/iaGQfNbyrBI/dRQtD4iRVxqSaPIDZRt7p+U6G0dvzrauvf+r1YE/Mql0k+n40jDbXZZt224an9HopEDIwHAeHexF3cgVEHztyhzzNd7t58fHqVS6T5MqBsGa0OGdWi4rxAZi0mb8747YX7bkrwKkoOFUby1vl0aBe55FUVRN5ry6CNPG4ehc8oJG+mqu7e0eyJhOZvVHVnVaXx31PJnU1/9nbtm25/HGJq7DRfubD2R+eglPdsAC6BOgIEZQZo5Ms8ukDPBM18A/3z6KnWav1lvv07ueO9dYnUv3qBf3YIZfhqr8Wgx5RWcaSGw0+/qdfVkAXmEOq7UJTkqXx1Bobyq7ymgdcNz5JNc6fDrcR3NEn+cSFN/xwAI1VVLZRqJmbuh7t+tuv/iZ0aMPW8gnbBy2PEo0ECbBA9oU3ym9+uV8th4hdcBmAskNYSX73MzeHFs0XUD+994r6TqIUCEjr9d9pbM3hNrU8w4LzS2N6PS3/zlRUP0XvEscq5JNMltThwT+VGVJ3qB0CoqyKObY+aNTLYHXEkaI//J5VUX7ihHI7soHN4h8swA7Yixvs3KAUJe6YbPJkozZB0hn++3dc4Iv/JqLxpTfXcMntbvVCewIADYA9gtF2Mk0liRnnAev9M3/gc/UqKVairx4ji54p8j34dMm5WN/CQntN9KsPB2AYU77AB0BxDhVeqBOXhsCuFcZxyLbc5Pn6wPkFQOx2SdZU6RwFdr0/vvEXnlYB/GuOPSVdO11CQulO/ubRucpICX1bcN6siWn+a+jg1MF2tzbwAXkIk6fnxqsJv8dC89W8MjVTG k9z+YbgA ydJxwaFq4hgD2vxQnLJaUENXvnKp2seO6ru1ZTiSu4EzIkrALZ/NRkGWfbf7MmYMqZaJMlYRc6KjXChRG8zgMY5ZA0Hbafm8b3TzPcROKTCVl56geg1fBCw9gmJ/JMeaJ8M1oeCDliGk4eCCFaLSC0dI21ivYe/eGuv8Ri/UeOSzyDotmPNyAauKZaguc815o9gSS1KsuLh6OwoIFYUNyu7Ut3/VkkGZlSqROHiTcM8TesHCJLA13p+0v+Xc4XchFgTpNveZau8vNBmqke+5hh8ub+zoI95psHe9I4OpiMXTaXvEH1aCJBfkdVHutX+kGPSP17FEB+V6dzoliEkDgASZeYMtEvrC7R3kKNbU2eVFeuKy8KbpzwHiDgHsUgZ1jNbnG 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