From nobody Sat Jul 25 03:03:37 2026 Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51F6C3B52E7 for ; Mon, 20 Jul 2026 07:39:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.207.22.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784533198; cv=none; b=Jh6uEsWbN3SyCRku51NR0Ql6r1jvyY+oDot3ybjch1+cWtq0wGRshhLMrFZ8Vwi61EIva88N+rnbj0H3UaOMiARabyGO+S8lxnAXtLXBBvWBqBY49246KNnWnO/Hec4qFH4G15rlsD7RBi2e+w9NO7hPP9HgsSQY+iiEeudcAF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784533198; c=relaxed/simple; bh=Q8TpRg2ssEhGly01+8mGLumxzwDm/ASjXu9bEbqHUw8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=USpLg4QAX5lmKSraNdbV5ZyBRb6tkTZeMiS0EohSg/ltnFE8D8RqKpOPflwVHANDp4ybp3WZfyABH6uris/2+CFtYt6HC/V8/DB9yHZZdZtxWr0yEDHJdASCqHKU6UQ4dGL5r6iw+HgcpsBjJTStGBicbEfD3OrbyvskCnh/PTY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=uniontech.com; spf=pass smtp.mailfrom=uniontech.com; dkim=pass (1024-bit key) header.d=uniontech.com header.i=@uniontech.com header.b=j20OVOzK; arc=none smtp.client-ip=54.207.22.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=uniontech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=uniontech.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=uniontech.com header.i=@uniontech.com header.b="j20OVOzK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uniontech.com; s=onoh2408; t=1784533145; bh=HX+1LzALF9JDw6Lg2W617wZtK8rihwWmPIi4u6C6yLc=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=j20OVOzKINOeIqfQQZMYdV//YR8cJKMi2FdN463wfgbqOPQxWcQv77d25ANpCGmuv 2CHX30wzchHUVDTLktxpHaV6IWp5jl9jD+Fbgw1psFoqxM2OQFdCPVdavPPdvWYfNq KKA/qRV+7f9y6zJhvlqpZHJUuExoYyxnugFxlPJM= X-QQ-mid: zesmtpgz7t1784533125t3e58a78d X-QQ-Originating-IP: Au69oLU4S+S+Cvy3Hhcx2QhwdTZInFFRPyJNpbAU/iI= Received: from uniontech.com ( [113.57.152.160]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 20 Jul 2026 15:38:43 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 1 X-BIZMAIL-ID: 14676711400642031056 EX-QQ-RecipientCnt: 8 From: Yichong Chen To: akpm@linux-foundation.org Cc: muchun.song@linux.dev, osalvador@suse.de, david@kernel.org, mike.kravetz@oracle.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yichong Chen Subject: [PATCH] hugetlb: make hugepage_put_subpool() tolerate NULL Date: Mon, 20 Jul 2026 15:38:41 +0800 Message-Id: <20260720073841.1389354-1-chenyichong@uniontech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20260719225438.041287a56c87effe61796483@linux-foundation.org> References: <20260719225438.041287a56c87effe61796483@linux-foundation.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QQ-SENDSIZE: 520 Feedback-ID: zesmtpgz:uniontech.com:qybglogicsvrgz:qybglogicsvrgz3a-0 X-QQ-XMAILINFO: MQPu5pFEJFN4dTELa9FQfZZyOmGYeTwYFrc8VIn63QCd+HrvrbWvI8jG xNe8S9L4x8VuLcjqfCu+dcDdMz3CfyZNru6UQurPZBbaHiOlGMShEqdIzxTfvuIaVU4QkNp SsIjptYpNgdeSSl8hTIfkWCT2M58o+HJ6fl6/6XKeQmvcBFHye2zW4snPtUK0IrnZFrZrON IK/Bw8YhYXy1AjvPuvuCDU+w7jn6Bo2TE+blxr2KRNbJ1JZpFJoMvpMH7eoTLYGXeWlq4F/ CBod23GDGPQ191Jh2Vc9gFEBpPkgxvKuv+nlU+1MO+TyxeI/ID/OuWrlvfNgNIlIsC5/f6I P2+z6h5ljoe1opvfJZuMNlxtTwxsbc/NZVROd8j8DDNAvGvGIaLAMEoJvXTiy0zRY1BSKij ahnZLDqFTKc9ORZj0m0eRHcDPs8EhXobXnzGe0kwQIVChqClC6M5E55PV+fURUwEctFq+ei 025lvVcYwD2t1k+kPX+hjI9FesIA8cYsfr49x+F1+f68n/iKw2WiritvPdOpLfM3i4Gv8To QHtYnhkK4VeDsq2EZNl/5arwBFl5Wkipv9M54btKU2G9IY2BkV2ndm0/dAxgJEWp/Ppcbd0 swPOGhzEZHbkyZ2BwlUsD4K68Ju5xYCm93WcHXxEc20oAHUChgeWmqSiKNq/+0K78YsUDj6 b1LzNsMSiAdnGgDXitQSWj4hlReTdoMYF4A+tOUTiSCZEFsBwbGTHTJjzh/bNPbCich6enX zNr80CPr44eW4R/cIkHMLbBuwRdKptyKwok0rm3iFzaKBB1zBfdBuYiA5BlnXS956FFe+Vs Zzx2yGap2XUSlHNwiRSaBqQUEzOoVbDEYHp7XloRg6S4f102iIuMd2uuJ+Uv5fGQ8Z17Pwf 2Tkr5Qz+fegXzmw6mqxVdzLTBs4h2LMSJnvxDdwYLuIB9I7SqyT/JHpdSgYXuvwjIctOfvI F4RpK8lBi2n4xD+xgjDNhyunc9BU10+8HS3CTkFIMKyDJSTyTDgzgi/SmFF2RQouBTt+Vyp eWp/arUYV2hBKLvG0ZHy3FdiJZiE0KylhfBKt/ApEQnL23oSZkLR5Wx2LMHbs= X-QQ-XMRINFO: M/715EihBoGS47X28/vv4NpnfpeBLnr4Qg== X-QQ-RECHKSPAM: 0 Content-Type: text/plain; charset="utf-8" Both callers of hugepage_put_subpool() check whether the subpool pointer is NULL before calling it. Move the NULL check into hugepage_put_subpool() so callers can use the helper unconditionally. This is a follow-up cleanup after using hugepage_put_subpool() from the hugetlbfs_fill_super() failure path. Signed-off-by: Yichong Chen Reviewed-by: Muchun Song --- fs/hugetlbfs/inode.c | 6 ++---- mm/hugetlb.c | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 6a1d7e778cb0..0c125eda16fd 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -1129,8 +1129,7 @@ static void hugetlbfs_put_super(struct super_block *s= b) if (sbi) { sb->s_fs_info =3D NULL; =20 - if (sbi->spool) - hugepage_put_subpool(sbi->spool); + hugepage_put_subpool(sbi->spool); =20 kfree(sbi); } @@ -1419,8 +1418,7 @@ hugetlbfs_fill_super(struct super_block *sb, struct f= s_context *fc) goto out_free; return 0; out_free: - if (sbinfo->spool) - hugepage_put_subpool(sbinfo->spool); + hugepage_put_subpool(sbinfo->spool); kfree(sbinfo); return -ENOMEM; } diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 571212b80835..e319c6a00555 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -181,6 +181,9 @@ void hugepage_put_subpool(struct hugepage_subpool *spoo= l) { unsigned long flags; =20 + if (!spool) + return; + spin_lock_irqsave(&spool->lock, flags); BUG_ON(!spool->count); spool->count--; --=20 2.51.0