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 A4262C369B2 for ; Thu, 17 Apr 2025 07:29:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 864366B0184; Thu, 17 Apr 2025 03:29:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7C4F56B0188; Thu, 17 Apr 2025 03:29:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68C8A6B018A; Thu, 17 Apr 2025 03:29:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3114C6B0184 for ; Thu, 17 Apr 2025 03:29:08 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 84B375D535 for ; Thu, 17 Apr 2025 07:29:08 +0000 (UTC) X-FDA: 83342709576.04.D6B5C38 Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf14.hostedemail.com (Postfix) with ESMTP id 958F9100005 for ; Thu, 17 Apr 2025 07:29:06 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of rakie.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=rakie.kim@sk.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744874947; a=rsa-sha256; cv=none; b=qny5mXwnBaXYkSTINNwJVVjz5hSu9/644OgVrH/gVqRu3/ylTvycT/3XJh1iPjSQuIFB3V tszmy/lvR31aDGY/E+DIS6pe00mENg9nKpKHjp839h4ouP4LSt1+ly4b2nM9VN5L36uF+V f3qETcUSGqBNoBr8uRuyrX1aNCIY1g8= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of rakie.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=rakie.kim@sk.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744874946; 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; bh=lQ4RiDlEKe9FvgY964QmCcCvA2yNvhvPxJHE6cBage0=; b=k+DNZlkMGmpWuZ8409nopXH4Tqe2w+z4BokbY/hI+JeciFLp+vsCQaSIXhmV6lvDae46IQ jezXo70bAxR69Bz3BCtC5uRNbe4RZz73vkYe6ZvQ5HvK09Ry3OQJIZKCHK5WzgP0u/ofLH fsEdMyZZVu2+fL+6yszVD0/x6O4Jmfo= X-AuditID: a67dfc5b-669ff7000002311f-03-6800adc07388 From: Rakie Kim To: akpm@linux-foundation.org Cc: gourry@gourry.net, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-cxl@vger.kernel.org, joshua.hahnjy@gmail.com, dan.j.williams@intel.com, ying.huang@linux.alibaba.com, david@redhat.com, Jonathan.Cameron@huawei.com, osalvador@suse.de, kernel_team@skhynix.com, honggyu.kim@sk.com, yunjeong.mun@sk.com, rakie.kim@sk.com Subject: [PATCH v9 1/3] mm/mempolicy: Fix memory leaks in weighted interleave sysfs Date: Thu, 17 Apr 2025 16:28:35 +0900 Message-ID: <20250417072839.711-2-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250417072839.711-1-rakie.kim@sk.com> References: <20250417072839.711-1-rakie.kim@sk.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRmVeSWpSXmKPExsXC9ZZnoe6BtQwZBh93KFnMWb+GzWL61AuM Fl/X/2K2+Hn3OLvFqoXX2CyOb53HbnF+1ikWi8u75rBZ3Fvzn9XizLQii9VrMhy4PXbOusvu 0d12md2j5chbVo/Fe14yeWz6NInd48SM3yweOx9aerzfd5XNY/Ppao/Pm+QCuKK4bFJSczLL Uov07RK4Ml58OMBWcEG34uK8T8wNjOdUuxg5OSQETCR+z5/ECGNPWTKDrYuRg4NNQEni2N4Y kLCIgKzE1L/nWboYuTiYBR4zSTx6/gKsXlggWOLr2mWsIDaLgKrEzCf/wGxeAWOJFfd2MkPM 1JRouHSPCcTmBJo/bXcLWFwIqGbmq+lsEPWCEidnPmEBsZkF5CWat85mBlkmIfCdTeLD24NQ x0lKHFxxg2UCI/8sJD2zkPQsYGRaxSiUmVeWm5iZY6KXUZmXWaGXnJ+7iREYActq/0TvYPx0 IfgQowAHoxIP74lF/9OFWBPLiitzDzFKcDArifCeM/+XLsSbklhZlVqUH19UmpNafIhRmoNF SZzX6Ft5ipBAemJJanZqakFqEUyWiYNTqoHRl52p4grT4201GTn74s7EMvG6/3vOqivyScr8 vdz10Bna8TZ7w34f/MJv11dv9KwqO/aEmIzZ4ZRSjr53osvOzi83usCa8U9hKtOr3K6JW+d4 NCxkWbQyKX7pHaP83rpe1qXRTUEL89dn/44KinMQEnZcdlXxb3mqQ5LiDa5XvI8P22d47FBi Kc5INNRiLipOBABs+6ZOfAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsXCNUNNS/fAWoYMg7crRCzmrF/DZjF96gVG i6/rfzFb/Lx7nN3i87PXzBarFl5jszi+dR67xeG5J1ktzs86xWJxedccNot7a/6zWpyZVmRx 6NpzVovVazIsfm9bwebA77Fz1l12j+62y+weLUfesnos3vOSyWPTp0nsHidm/Gbx2PnQ0uP9 vqtsHt9ue3gsfvGByWPz6WqPz5vkAniiuGxSUnMyy1KL9O0SuDJefDjAVnBBt+LivE/MDYzn VLsYOTkkBEwkpiyZwdbFyMHBJqAkcWxvDEhYREBWYurf8yxdjFwczAKPmSQePX/BCJIQFgiW +Lp2GSuIzSKgKjHzyT8wm1fAWGLFvZ3MEDM1JRou3WMCsTmB5k/b3QIWFwKqmflqOhtEvaDE yZlPWEBsZgF5ieats5knMPLMQpKahSS1gJFpFaNIZl5ZbmJmjqlecXZGZV5mhV5yfu4mRmDQ L6v9M3EH45fL7ocYBTgYlXh4Tyz6ny7EmlhWXJl7iFGCg1lJhPec+b90Id6UxMqq1KL8+KLS nNTiQ4zSHCxK4rxe4akJQgLpiSWp2ampBalFMFkmDk6pBsaioHVpG8M7Ni1NO/Vx91eZdcV1 zD6hB/pnvj4nnq1hdHda2bSPkUZMb89JnDJv+eEbbVqh8971nUvYyTdXDaQiBf/5fGhQ4/wb FyXuPXfJCTWl2f1P6kVySv6cPZMgcG6FiET/hGUvP/jcjwmquvyv2f76gdeG/1wL7EX7Zp5j iZxZ8PRV/xklluKMREMt5qLiRADp7s5sdgIAAA== X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 958F9100005 X-Stat-Signature: qhryq1xuucsabxncu5t6r6qb8f3wpmiu X-HE-Tag: 1744874946-994735 X-HE-Meta: U2FsdGVkX1+QrhDVzE2e+7u9M8LAEeVW35FYhlx3uc2DKQPY5nbvRc1kI1eujselZV7ChTSZRvzK4vC8w6vbFJ00TFnfpkbdIS1G8gZlX37wTyp494QVCrjtpalei/sLqiYCYY8MxrFypKu8oV6ec1lNeIfBFi0VtSr0A6QmpgWF7WgkWzapnuakIlpd8LzZtPqAFAEOximMrbn4eBqxNJefNbZtuuNGrYZ2ZwRP9PX6b3GALDQdmKZSFxUDX16KBhdgy5njBsO3DmfZkRZvAEMswofYJ7KZ7rOUo3x84y0nom83U1XiyoFxQrAJfEdt9Y6apzkZmth3el/hfEZT+bOLbTCaYMXDI1+hlXZdUnhIzXy3bXVo6Lo6UORenME4DooVNj7zFMoWD6B/0YtEcEfa5vfHXeR8lPdrHnGx8rLF9xFnjMraJz0ZoMP3eWundvc62LitFdPJDcTPXQBUFVpi/T1XfQMGrLryK1WtMQt/jvIPt5w38ffCw4MLzC/Go7Q3P42gywSQI8bT1YRGzToHW+gIeOyEZ1iE0WFDh4axUQFC+L1HRdYsnnFVZaFdmYw4nVJOFFdhxB+Anf2zi9McINDgWBi+iHynG9DOfaJMPAQUhypCW8IIjAb/tGJSqaWv8dzUvNcqgNvZM8Ntwl94zRRLCcBLuweWs7QRgwpp8I9h5yCNT2GcjLIeu32aVAuGCKL3lMblr8MNNr4qebNVxQnGeN5tFPxOcJBXFvntLggAuoXyxSNsPX53DVIP3MM83Lc7grTiGKdXLFdVwFmKCbnYYQL6wVXk9+V+uT1LxM11aRLCU1+/5w2sAOV3gB5jl5f9fRx2qC/GcTWe1WaiU8EVzJKwtT+jnUukAKlre8OxcEKwD6c+HqjRR/mgsnoHYNeG0e17/9mUQjvOA4Y4SAlLTELSYMHr7L/eRF8Nz1mABR0eol984ZrLaIqgqIxV1sDlBBlcC704M2h 4KM2Z82F NfoDCH0X3U/sOPDQdbpMk5YHrPtcQxNKSwaMEyJqZo0YdJHNHUMcFGuGimzai+b0TMhmx7byys8yOO2sJBvHTisaRMGbcrFGdxc6Kn2ma8xhSQkwBK1VyqqDDYhwGI7sz5tvIakAFDk14BBOviFn+7alHvM7FF/8KinlayoERhv/fOjl/8CF9/F55VZjmvOo5qxkCsy/+MdN+fYHMWpeig+46JKkyTI0ryE9/ziotSwr4By0= 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: List-Subscribe: List-Unsubscribe: Memory leaks occurred when removing sysfs attributes for weighted interleave. Improper kobject deallocation led to unreleased memory when initialization failed or when nodes were removed. This patch resolves the issue by replacing unnecessary `kfree()` calls with proper `kobject_del()` and `kobject_put()` sequences, ensuring correct teardown and preventing memory leaks. By explicitly calling `kobject_del()` before `kobject_put()`, the release function is now invoked safely, and internal sysfs state is correctly cleaned up. This guarantees that the memory associated with the kobject is fully released and avoids resource leaks, thereby improving system stability. Additionally, sysfs_remove_file() is no longer called from the release function to avoid accessing invalid sysfs state after kobject_del(). All attribute removals are now done before kobject_del(), preventing WARN_ON() in kernfs and ensuring safe and consistent cleanup of sysfs entries. Fixes: dce41f5ae253 ("mm/mempolicy: implement the sysfs-based weighted_interleave interface") Signed-off-by: Rakie Kim Reviewed-by: Gregory Price Reviewed-by: Joshua Hahn Reviewed-by: Jonathan Cameron Reviewed-by: Dan Williams --- mm/mempolicy.c | 121 ++++++++++++++++++++++++------------------------- 1 file changed, 59 insertions(+), 62 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index b28a1e6ae096..293b4b347975 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -3463,8 +3463,8 @@ static ssize_t node_store(struct kobject *kobj, struct kobj_attribute *attr, static struct iw_node_attr **node_attrs; -static void sysfs_wi_node_release(struct iw_node_attr *node_attr, - struct kobject *parent) +static void sysfs_wi_node_delete(struct iw_node_attr *node_attr, + struct kobject *parent) { if (!node_attr) return; @@ -3473,18 +3473,42 @@ static void sysfs_wi_node_release(struct iw_node_attr *node_attr, kfree(node_attr); } -static void sysfs_wi_release(struct kobject *wi_kobj) +static void sysfs_wi_node_delete_all(struct kobject *wi_kobj) { - int i; + int nid; - for (i = 0; i < nr_node_ids; i++) - sysfs_wi_node_release(node_attrs[i], wi_kobj); - kobject_put(wi_kobj); + for (nid = 0; nid < nr_node_ids; nid++) + sysfs_wi_node_delete(node_attrs[nid], wi_kobj); +} + +static void iw_table_free(void) +{ + u8 *old; + + mutex_lock(&iw_table_lock); + old = rcu_dereference_protected(iw_table, + lockdep_is_held(&iw_table_lock)); + rcu_assign_pointer(iw_table, NULL); + mutex_unlock(&iw_table_lock); + + synchronize_rcu(); + kfree(old); +} + +static void wi_cleanup(struct kobject *wi_kobj) { + sysfs_wi_node_delete_all(wi_kobj); + iw_table_free(); + kfree(node_attrs); +} + +static void wi_kobj_release(struct kobject *wi_kobj) +{ + kfree(wi_kobj); } static const struct kobj_type wi_ktype = { .sysfs_ops = &kobj_sysfs_ops, - .release = sysfs_wi_release, + .release = wi_kobj_release, }; static int add_weight_node(int nid, struct kobject *wi_kobj) @@ -3525,85 +3549,58 @@ static int add_weighted_interleave_group(struct kobject *root_kobj) struct kobject *wi_kobj; int nid, err; + node_attrs = kcalloc(nr_node_ids, sizeof(struct iw_node_attr *), + GFP_KERNEL); + if (!node_attrs) + return -ENOMEM; + wi_kobj = kzalloc(sizeof(struct kobject), GFP_KERNEL); - if (!wi_kobj) + if (!wi_kobj) { + kfree(node_attrs); return -ENOMEM; + } err = kobject_init_and_add(wi_kobj, &wi_ktype, root_kobj, "weighted_interleave"); - if (err) { - kfree(wi_kobj); - return err; - } + if (err) + goto err_put_kobj; for_each_node_state(nid, N_POSSIBLE) { err = add_weight_node(nid, wi_kobj); if (err) { pr_err("failed to add sysfs [node%d]\n", nid); - break; + goto err_cleanup_kobj; } } - if (err) - kobject_put(wi_kobj); - return 0; -} -static void mempolicy_kobj_release(struct kobject *kobj) -{ - u8 *old; + return 0; - mutex_lock(&iw_table_lock); - old = rcu_dereference_protected(iw_table, - lockdep_is_held(&iw_table_lock)); - rcu_assign_pointer(iw_table, NULL); - mutex_unlock(&iw_table_lock); - synchronize_rcu(); - kfree(old); - kfree(node_attrs); - kfree(kobj); +err_cleanup_kobj: + wi_cleanup(wi_kobj); + kobject_del(wi_kobj); +err_put_kobj: + kobject_put(wi_kobj); + return err; } -static const struct kobj_type mempolicy_ktype = { - .release = mempolicy_kobj_release -}; - static int __init mempolicy_sysfs_init(void) { int err; static struct kobject *mempolicy_kobj; - mempolicy_kobj = kzalloc(sizeof(*mempolicy_kobj), GFP_KERNEL); - if (!mempolicy_kobj) { - err = -ENOMEM; - goto err_out; - } - - node_attrs = kcalloc(nr_node_ids, sizeof(struct iw_node_attr *), - GFP_KERNEL); - if (!node_attrs) { - err = -ENOMEM; - goto mempol_out; - } + mempolicy_kobj = kobject_create_and_add("mempolicy", mm_kobj); + if (!mempolicy_kobj) + return -ENOMEM; - err = kobject_init_and_add(mempolicy_kobj, &mempolicy_ktype, mm_kobj, - "mempolicy"); + err = add_weighted_interleave_group(mempolicy_kobj); if (err) - goto node_out; + goto err_kobj; - err = add_weighted_interleave_group(mempolicy_kobj); - if (err) { - pr_err("mempolicy sysfs structure failed to initialize\n"); - kobject_put(mempolicy_kobj); - return err; - } + return 0; - return err; -node_out: - kfree(node_attrs); -mempol_out: - kfree(mempolicy_kobj); -err_out: - pr_err("failed to add mempolicy kobject to the system\n"); +err_kobj: + kobject_del(mempolicy_kobj); + kobject_put(mempolicy_kobj); return err; } -- 2.34.1