From mboxrd@z Thu Jan 1 00:00:00 1970 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 71ED5C7EE29 for ; Fri, 21 Apr 2023 21:44:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 84D306B0074; Fri, 21 Apr 2023 17:44:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 75F196B0081; Fri, 21 Apr 2023 17:44:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B1BD6B0082; Fri, 21 Apr 2023 17:44:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 166F66B0072 for ; Fri, 21 Apr 2023 17:44:21 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E44F6AC9D9 for ; Fri, 21 Apr 2023 21:44:20 +0000 (UTC) X-FDA: 80706727080.19.F5C1E82 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf07.hostedemail.com (Postfix) with ESMTP id F031740006 for ; Fri, 21 Apr 2023 21:44:17 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=4faVVxfy; spf=none (imf07.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682113458; h=from:from:sender: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=ZUAOcNqD6LayzeKVCuQ/BLskBnjlrIyvlaP+338TFj0=; b=UXrE7Z+wAhoUOzrLwEk02pmYMm/eUPZPB1g07AwQxeuEK/9kEBOjkWyrfmrzBi3BZd23Gk H1vgquAjLzM3GncqwUt5O4TuUOLrs+fBwyO9zzguvtuNPDhEpzS3iSSja0ARV7BUBq/qkJ 4oMpexa5mOIKczGrB8jy+QLKAFYPXx8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=4faVVxfy; spf=none (imf07.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682113458; a=rsa-sha256; cv=none; b=p/sMwq3ymH9rg277ua2xj/+heZ3lN+MdJOi0I0QOU3wwAYow+/ii4dhT1N3fYnAnlliFZz u1asFcJVLNpnYADxEAdRyVsFgPhYHpwy+Aym4jSk6VGMNOKLhhm8A2CsuvMDsAaR10qKXU k1SQnNrqriDqyR7rHipeETqb/scK4Ww= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=ZUAOcNqD6LayzeKVCuQ/BLskBnjlrIyvlaP+338TFj0=; b=4faVVxfybgSKlFUw4CjuG22i97 71PGGt9QIrJ/HwbknwCDE//N0MK6Lp3ra+wQrXZsk0eWG60sRW0X5RUf4Kenfek+eG2paFJP/MaZa 0pWwiy4StWWh+SSoxTEvENx27Ue1WY0nZEQ5jvksW4DR5M1zwWo9akRwduyxRxOL7u3B+Vg/sEuOs 8Ct23zxr9jtxEu1k9C79r6F1cOvTy0vfzN2gpw8diBX/Hb0y0aSu/dsvGfqVJ/FI8leP+YAgddYgn hK5IlPwLjcORNIqVDFOLTCGjGCfsFF6VGnKA9PA/rSAOR6sQOrz+AG5XTaTPZkVnxF4ht9+1OwIlY CcAZD47g==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1ppyY1-00Btos-2R; Fri, 21 Apr 2023 21:44:05 +0000 From: Luis Chamberlain To: hughd@google.com, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org, djwong@kernel.org Cc: p.raghav@samsung.com, da.gomez@samsung.com, a.manzanares@samsung.com, dave@stgolabs.net, yosryahmed@google.com, keescook@chromium.org, hare@suse.de, kbusch@kernel.org, mcgrof@kernel.org, patches@lists.linux.dev, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC 6/8] shmem: consider block size in shmem_default_max_inodes() Date: Fri, 21 Apr 2023 14:43:58 -0700 Message-Id: <20230421214400.2836131-7-mcgrof@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230421214400.2836131-1-mcgrof@kernel.org> References: <20230421214400.2836131-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: F031740006 X-Rspam-User: X-Stat-Signature: 4ogt7bxos5864xdsc6as6ciqbpyqkprr X-HE-Tag: 1682113457-329381 X-HE-Meta: U2FsdGVkX18HQn5WpeG4Gz6ohMp7Ija6pJ8wJtYd4OXvGZg7e7iE8dAc7ihA9Yf7oCDnVl4SLrCKeMQ+b5Ay1+eFfkAsROPkMdE4fgJCSfPisJruY76a/H4XZXCj9UmHZ/tTfx5xMHRCjg7KZkvncIAFPnQ39KEjz9hPNxEQ+U3oWFMk5RMOkMc+3wp0QGkQ+JOitWmy8nhUxixLXLZf3pN4UHVdMzbYlKmvQeADdXUeuX/pw/4qEvyJnv+CL6wXgXpwezmdSKYBsZ6j7bG2x8wzlnC81rbWGWbqJ+C37qfLFmRk3XnIGd//SuXmIo2x9ZH1L8B001RDYC3+Yt/ypHiFrIXhFd6daINSQNdOFDGLNDsTtu3rhRzbdxH5rmCxAi1QSgeo6RvlQ+SageLQCjQbRB2GXdceC6VAlIw9HKhGT7LozxdEk0L6nc/pCk6e4vbh4FJ8RtM6uUY5eUdWYiwAr0pxOXUVrqmmvRpVvWmTS1yl3OTfl+FkyFUTmx+MY9oZh8uiwZvs7/q1hQKIcxwRyHkJjyy4p5OqbDYVFE+yjNvxSglTA+Sm3XT+mK4jcFHmxlvWNc1EGoZ9AHZrbRmqA+nRd6t39S/ahgs8PQ9SMwx4FvesvLnwo38a/wYBrN4t5QKGPD/fI5YM+ket0vxRFpP33aT63eUmiNyrAy8ohNvs16bznY+nal8Ys9TAUm4xbg/HbcG3ZPUoAdyJdwE29M7II+ZVUy793XfXxBRjT06wf5a6X4zlHo+XsuG3O5nhlcsK/8ArfsmV/jsp8CrlPjImmSjNV7YIinaCDKOjxMf/s1C2kRwXLyohjiij62d8luWHOJTWUmadFUhkWrxSRlIqKgUS/HPymiZtv/8j+pPKPvhVBiGdqF5U4aO8xE6HtrYL7hhpjr9kqHEA39oCRTOcmrUF5g2I8TjtdcDkrz9s/lzti2JTT3/ivnIe3oMIg6eg+18fUsYRbyD znx+hTLM t2zvbvMg/8u4ibyjahlmb9joPvSPnVEwvX2+sTjid6ZFCD/f8MTPJGDSmBlmkvSTYBnY4pswUpx91UBF/xqJ8cmo53vhl1vlVKzHb4/zvcw5ZU7gYAyQTp5KfT6SaEy3wFGzdyiQptBXXx/itA1qWOAzqkKt+FeqeTjEUA99oTqhp6gGw6uDIZ2TEriTzhtku2R4k6F/Io9PuTqJDeTr4mCl/iTl9yU+YL44yPCsQULAi6ijbMpECv1b5r/7hrPvyaF0+Biqkj0twvgsKY97ntKAkyggkyHUmIkf7cc7J1aa0Vt3HTzLYXYBfKssjS0GlZfCQePH8LPb0JRBY1usCerQymsRixLM37R8kW/HHqeTuweQWNpzYxijA1VpbgNMgDERcXTKwowr+v9kV32ZzPKeXfdJGJsJPahNKq/MvkNwbCjYMjs8Lzi6GoM2k/bhqrPku 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: Today we allow for a max number of inodes in consideration for the smallest possible inodes with just one block of size PAGE_SIZE. The max number of inodes depend on the size of the block size then, and if we want to support higher block sizes we end up with less number of inodes. Account for this in the computation for the max number of inodes. If the blocksize is greater than the PAGE_SIZE, we simply divide the number of pages usable, multiply by the page size and divide by the blocksize. This produces no functional changes right now as we don't support larger block sizes yet. Signed-off-by: Luis Chamberlain --- mm/shmem.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index b83596467706..5a64efd1f3c2 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -143,11 +143,14 @@ static unsigned long shmem_default_max_blocks(u64 blocksize) return totalram_pages() >> (__ffs(blocksize) - PAGE_SHIFT + 1); } -static unsigned long shmem_default_max_inodes(void) +static unsigned long shmem_default_max_inodes(u64 blocksize) { unsigned long nr_pages = totalram_pages(); + unsigned long pages_for_inodes = min(nr_pages - totalhigh_pages(), nr_pages / 2); - return min(nr_pages - totalhigh_pages(), nr_pages / 2); + if (blocksize == shmem_default_bsize()) + return pages_for_inodes; + return pages_for_inodes >> (__ffs(blocksize) - PAGE_SHIFT); } #else static u64 shmem_sb_blocksize(struct shmem_sb_info *sbinfo) @@ -4028,7 +4031,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) if (sbinfo->max_blocks != shmem_default_max_blocks(shmem_default_bsize())) seq_printf(seq, ",size=%luk", sbinfo->max_blocks << (PAGE_SHIFT - 10)); - if (sbinfo->max_inodes != shmem_default_max_inodes()) + if (sbinfo->max_inodes != shmem_default_max_inodes(shmem_default_bsize())) seq_printf(seq, ",nr_inodes=%lu", sbinfo->max_inodes); if (sbinfo->mode != (0777 | S_ISVTX)) seq_printf(seq, ",mode=%03ho", sbinfo->mode); @@ -4109,7 +4112,7 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) if (!(ctx->seen & SHMEM_SEEN_BLOCKS)) ctx->blocks = shmem_default_max_blocks(shmem_default_bsize()); if (!(ctx->seen & SHMEM_SEEN_INODES)) - ctx->inodes = shmem_default_max_inodes(); + ctx->inodes = shmem_default_max_inodes(shmem_default_bsize()); if (!(ctx->seen & SHMEM_SEEN_INUMS)) ctx->full_inums = IS_ENABLED(CONFIG_TMPFS_INODE64); sbinfo->noswap = ctx->noswap; -- 2.39.2