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=1795028722; b=RDsL+n1deC6GCKalyDMETc39L2uw5Q8mdd59o05cF6YggL9Tz6X2eS5bE7l1na05/6l1 oZj6kysg7u9Zz/Srn1Eo1NmoT5vBflB17xPGyfDIXKpr/mfmuhPjuwLUXVM6zIeD9lnJx 9c+r6+Io+mATXT8z0gZPtZAO4t2QrfT9JqhEBdhUx7TFcifqVPNmynTsgVTfBcxosaFSH HuHdZPZriCt3WvwblHXbG64cdSap/WmsTsrGx64iXR08KapXdSMtoPAPWW21uRODx3nxn iFZPYj1F4/1wiuqUzS8n0ok7UHkzeTGdunPl20Cvg8htS8kd3LFAeqpZbL7IoQYhzPA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795028722; 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=EQ6uA3gi9qYclfWS4ryrs3es9AjMdY3es/wS9XHL1cI=; b=U9WhdIrSq9b9hZCwtC5OEXa/pgAYPLmgF4oJDk0Gr5hrQzRza611kFCf1eq1rmGMB4Tl NHWO8mCkNE0yIcfbxDELS0ygfvxwPPYvaEUO0aFJNBwxjoYQmePMV9US+8OdX7cSghn+0 M4xb+Q/iyjgPIIBEr3ajTN2PwA0VfA7/dlJyktSE3J2mx86tsTPw+rqmxk8Pscljaa3Qc kXMuIhRP6Mir9W6foxjrg3DuPO+T/Qb78+g5YToWAnegeP9T3woj1g7hxXr9yUHcuAw6p SEZE1TKMmjuh48n5KvA8TeyHVhA2pf2AF6vP4E15TWiwznyrDjRK32id3d/Q0lmoY9Q== 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=ewciUPVz; 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 E94F4606A337; Wed, 18 Nov 2026 19:05:21 +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=ewciUPVz Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05D811F000C5; Wed, 18 Nov 2026 19:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795028721; bh=EQ6uA3gi9qYclfWS4ryrs3es9AjMdY3es/wS9XHL1cI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ewciUPVz490mIYwzvP/x3EPl6bWOO6XFapDq4BbZ9lL10A6rx22am1Fsjb1qnU+yt iUz3+jjv2DtTdZ1g6gg0a0R91iWhNIiXQSZgf+tiRVlUDZxUkDf3AkrE7MCzUiOPjn vBuU7ubJ8PKg80sQlw5K60HMjSnRmYJxGwLNWxmc= 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.12 0095/1756] quota: initialize dquot cache before mounting rootfs Date: Wed, 18 Nov 2026 15:37:02 +0100 Message-ID: <20261118150012.027464428@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@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.12-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 context to match existing quota initialization declarations and surrounding includes ] 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 ff9d401e18539..55270ad327b48 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "internal.h" #include "mount.h" @@ -3204,6 +3205,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 7c3095622872f..1912ebf2bafdb 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -3020,7 +3020,7 @@ static 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; @@ -3028,8 +3028,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| @@ -3071,7 +3069,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 2334a02c30149..06563b0baccfd 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