From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795022710; b=PyKhh1xlRnYS/VgVT4p98WcRyjTFwjicRPljp1tZVVXzWoX+1yQtF7wI8Mc02zKy4NZh FpkFQqnX+mK4KVkV1RKBdJe7s0cAmfPrBBciXLXpfb0nwhyWGm1qexo47nPAhLEhc93pL GM/gUkQQ42m8rJUnUesK+cQR7yXezAcCDZQWspir3pYp/94RIPxV75UNdQmpxHA0dbW8c xW45tzcdBH/SVzivRmh67JEYnk+OdBFDZV53dr9QBXXkVKWM/u3j8Fs0evq9j4ID2PamN w6cX0FQCyCnZq+QHJJx9HlbG6r5MNqLJT8cA3GJ2+bepMFyx9bE90XeSpZ8weflVeFQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795022710; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=D/9jBdodiKm4DE40ZeiWkD5VlEGkXUg3xJIT0Z7SGlI=; b=2ny/ow2mZVnYxmskIgDhMhG/JayAEfqI2hcm7dpKkYe1AdTfhSSHDcHfCvtqkHZliqZF dI+ixJo4+BKbVVikH7Tx+BEGlx0glH4TMqBwi8WRf395OrUdKvvb2f65WPSguuTvT8f6Y tTUW4lWhqA3OOuR81tu9t4yKsnxgO02cp86tlYJum7OQ4ulX3em54nCol0JvNuak6k9zi iLbUuuRaCgnF90uVOKJ7psmsQ5rVr2k/7DhZkAjt/1WVSrjBxYDzaZMLYuhZ1ufj7yKbt eWOi1RcCCtaLqExnv+7gdhMAy7brgC7OnxUo9iu0jeOl0EDm8nh1SWwj+t+nhPVbu4w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=RnsNb3JZ; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6976606A325; Wed, 18 Nov 2026 17:25:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=RnsNb3JZ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04BE01F000C4; Wed, 18 Nov 2026 17:25:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795022710; bh=D/9jBdodiKm4DE40ZeiWkD5VlEGkXUg3xJIT0Z7SGlI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RnsNb3JZOreviEDcw+pLRQEGw5NpFojm248izYIz3SZjNZOzmK8A2r4Iy9Z280Kl7 EaljcbeFn2FxarEE0hPI4T6XgO5ACxTTQYz6inKw0siYs5ihP0215lAJJU6q2S7B4f VdmO2Nyg7byT9rK4RsGH7IsWP1kEVK8pYb3gA+IQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dylan Johnson , YouYou Yu , Gunnar Kudrjavets , Jan Kara , Sasha Levin Subject: [PATCH 6.18 0093/2151] quota: initialize dquot cache before mounting rootfs Date: Wed, 18 Nov 2026 15:30:28 +0100 Message-ID: <20261118150125.189141682@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: YouYou Yu [ Upstream commit e21a6f39aa6d0336ffbf5f34e5fa20ff8de36773 ] On some systems, a tmpfs backed rootfs is extensively used throughout system's lifecycle. tmpfs quotas are needed to limit per user rootfs usage. However, booting with CONFIG_TMPFS_QUOTA=y, an initramfs, no root= and "initramfs_options=usrquota" panics at boot: BUG: kernel NULL pointer dereference, address: 0000000000000000 RIP: 0010:dqget+0x1ac/0x490 Call Trace: __dquot_initialize dquot_initialize shmem_get_inode shmem_fill_super ... mnt_init vfs_caches_init start_kernel The rootfs is mounted from mnt_init(), but the dquot hash table and cache are only set up later by dquot_init(), an fs_initcall. Creating the root inode of a quota enabled rootfs thus dereferences the NULL dquot_hash in dqget(). Rename dquot_init() to dquot_cache_init() and call it from vfs_caches_init() before mnt_init(). The slab, percpu and early workqueue code it relies on is available there, and the workqueue rescuer and shrinker debugfs entries are set up later by their own subsystems. Keep the sysctl registration in an fs_initcall, as done for the dcache, inode and mount sysctls. This only moves existing allocations earlier in boot. Fixes: 278033a225e1 ("fs: Add 'initramfs_options' to set initramfs mount options") Cc: stable@vger.kernel.org Assisted-by: LLM Co-developed-by: Dylan Johnson Signed-off-by: Dylan Johnson Signed-off-by: YouYou Yu Reviewed-by: Gunnar Kudrjavets Link: https://patch.msgid.link/20261021181217.20171-1-youyouyu@amazon.com Signed-off-by: Jan Kara [ sashal: adjusted patch context to match the existing quota initialization code ] Signed-off-by: Sasha Levin --- fs/dcache.c | 2 ++ fs/quota/dquot.c | 10 ++++++---- include/linux/quotaops.h | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index 84952f6bbf406..77792a9e86737 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "internal.h" #include "mount.h" @@ -3288,6 +3289,7 @@ void __init vfs_caches_init(void) inode_init(); files_init(); files_maxfiles_init(); + dquot_cache_init(); mnt_init(); bdev_cache_init(); chrdev_init(); diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 45a46dc4de4ef..c91076c3f05e7 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -3019,7 +3019,7 @@ static const struct ctl_table fs_dqstats_table[] = { #endif }; -static int __init dquot_init(void) +void __init dquot_cache_init(void) { int i, ret; unsigned long nr_hash, order; @@ -3027,8 +3027,6 @@ static int __init dquot_init(void) printk(KERN_NOTICE "VFS: Disk quotas %s\n", __DQUOT_VERSION__); - register_sysctl_init("fs/quota", fs_dqstats_table); - dquot_cachep = kmem_cache_create("dquot", sizeof(struct dquot), sizeof(unsigned long) * 4, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| @@ -3070,7 +3068,11 @@ static int __init dquot_init(void) WQ_UNBOUND | WQ_MEM_RECLAIM, WQ_MAX_ACTIVE); if (!quota_unbound_wq) panic("Cannot create quota_unbound_wq\n"); +} +static int __init init_fs_dquot_sysctls(void) +{ + register_sysctl_init("fs/quota", fs_dqstats_table); return 0; } -fs_initcall(dquot_init); +fs_initcall(init_fs_dquot_sysctls); diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h index f9c0f9d7c9d93..bbe22c22439ed 100644 --- a/include/linux/quotaops.h +++ b/include/linux/quotaops.h @@ -40,6 +40,7 @@ void __quota_error(struct super_block *sb, const char *func, /* * declaration of quota_function calls in kernel. */ +void dquot_cache_init(void); int dquot_initialize(struct inode *inode); bool dquot_initialize_needed(struct inode *inode); void dquot_drop(struct inode *inode); @@ -206,6 +207,10 @@ static inline int sb_has_quota_active(struct super_block *sb, int type) return 0; } +static inline void dquot_cache_init(void) +{ +} + static inline int dquot_initialize(struct inode *inode) { return 0; -- 2.53.0