From patchwork Thu Apr 17 07:28:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14055039 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 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; } From patchwork Thu Apr 17 07:28:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14055040 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 46325C369C7 for ; Thu, 17 Apr 2025 07:29:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24E966B0188; Thu, 17 Apr 2025 03:29:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FF446B018A; Thu, 17 Apr 2025 03:29:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A4586B018B; Thu, 17 Apr 2025 03:29:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DB1116B0188 for ; Thu, 17 Apr 2025 03:29:10 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0208181490 for ; Thu, 17 Apr 2025 07:29:10 +0000 (UTC) X-FDA: 83342709702.30.FC4A6AF Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf14.hostedemail.com (Postfix) with ESMTP id 0DF3C100002 for ; Thu, 17 Apr 2025 07:29:08 +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=1744874949; a=rsa-sha256; cv=none; b=BjVvw9NsFeZnoebXs8bCt8xq0sY398brtLQG4OzLrDGpDBqu0iDPQpUdjdeX+yQ8L3UByj gQHwI+KKBan6epr2AywmwdEbnxphMTActdH+I5tjauTEr6CZFHQKP+niBDB9HrVWVMtnYv HHGo7n/P53xAJqIt2JU9bk2/nNPXdvw= 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=1744874949; 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=TIqZbQgMMZ0PToNRmWBqR7+lhpm7zZ0h6k4459VBWe8=; b=zVH7dM2GT9shyhn2YG70uIlh+v0i4YyHpCbyVPPFSdl3mhHdT5HXGIBc9OSzdE34IRY9AL 7joM34jaVuwesjuALXzGikVofKcCxBDWuF4PucePMSROU1Pog/blPLHeIjlijirinUdNIh 924qDzWvKWH/wKRMkawY1pc96xVoNo0= X-AuditID: a67dfc5b-669ff7000002311f-0b-6800adc3d9e0 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 2/3] mm/mempolicy: Prepare weighted interleave sysfs for memory hotplug Date: Thu, 17 Apr 2025 16:28:36 +0900 Message-ID: <20250417072839.711-3-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 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRmVeSWpSXmKPExsXC9ZZnoe7htQwZBo+buSzmrF/DZjF96gVG i6/rfzFb/Lx7nN1i1cJrbBbHt85jtzg/6xSLxeVdc9gs7q35z2pxZlqRxeo1GQ7cHjtn3WX3 6G67zO7RcuQtq8fiPS+ZPDZ9msTucWLGbxaPnQ8tPd7vu8rmsfl0tcfnTXIBXFFcNimpOZll qUX6dglcGVd3/Gcs+KFZse/aSaYGxtdKXYycHBICJhKrrz5lg7GbehpZuxg5ONgElCSO7Y0B CYsIyEpM/XuepYuRi4NZ4DGTxKPnLxhBEsICURL/9rxhArFZBFQlLlzYDmbzChhLnNp+nxli pqZEw6V7YHFOoPnTdreAxYWAama+ms4GUS8ocXLmExYQm1lAXqJ562xmkGUSAp/ZJObuP8QK MUhS4uCKGywTGPlnIemZhaRnASPTKkahzLyy3MTMHBO9jMq8zAq95PzcTYzACFhW+yd6B+On C8GHGAU4GJV4eE8s+p8uxJpYVlyZe4hRgoNZSYT3nPm/dCHelMTKqtSi/Pii0pzU4kOM0hws SuK8Rt/KU4QE0hNLUrNTUwtSi2CyTBycUg2MS5Y0uB/Jn/HuNdsR10OVcR23WHTX/OSNYjSW e/Uzc7vOVs1X0yY5Supxtb7qiXm8/s20QL9mvZ33Ay/0fdU4PC/3arP8y5dfZwleUVTwlXil YPfyajNnh/2X+Dn3DONe2hdcPVigu+7KPgklh5xlduoP/y3Yx5F/SZrFon3ptoYHXuJf5Qrb lViKMxINtZiLihMBCzq7+HwCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsXCNUNNS/fQWoYMgw+nrS3mrF/DZjF96gVG i6/rfzFb/Lx7nN3i87PXzBarFl5jszi+dR67xeG5J1ktzs86xWJxedccNot7a/6zWpyZVmRx 6NpzVovVazIsfm9bwebA77Fz1l12j+62y+weLUfesnos3vOSyWPTp0nsHidm/Gbx2PnQ0uP9 vqtsHt9ue3gsfvGByWPz6WqPz5vkAniiuGxSUnMyy1KL9O0SuDKu7vjPWPBDs2LftZNMDYyv lboYOTkkBEwkmnoaWbsYOTjYBJQkju2NAQmLCMhKTP17nqWLkYuDWeAxk8Sj5y8YQRLCAlES //a8YQKxWQRUJS5c2A5m8woYS5zafp8ZYqamRMOle2BxTqD503a3gMWFgGpmvprOBlEvKHFy 5hMWEJtZQF6ieets5gmMPLOQpGYhSS1gZFrFKJKZV5abmJljqlecnVGZl1mhl5yfu4kRGPTL av9M3MH45bL7IUYBDkYlHt4Ti/6nC7EmlhVX5h5ilOBgVhLhPWf+L12INyWxsiq1KD++qDQn tfgQozQHi5I4r1d4aoKQQHpiSWp2ampBahFMlomDU6qB8Y5cyodVbCVdtgl1T/0iPjft1y2/ n8hVJeqQrNMqURE8STVDIVFe9rbu/PdzQmfsTKmyXRgb7Jax873K0rb/aZKea34E5d7SU564 e4vJXY2ceIXs0ucNKqZLtQvvxLjdvr2RZ63/f3Hf018O3bb7f6Do5GaPUyG/n+40O2iy0d2u PIJTsfKzEktxRqKhFnNRcSIAgF5fKXYCAAA= X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 0DF3C100002 X-Stat-Signature: 3tmmp9m8nyhtdif1eaxtmbzt53143gtq X-HE-Tag: 1744874948-754966 X-HE-Meta: U2FsdGVkX19H09pA50bKF3XzzS4WKQ/cuHKFS3YOaVdlerIXPcYqhU6YajPCrEGK4LAsamvtgNNdVe/hGLzG1gRWDxA6TFRHl30Z8ID99Q/lk4ANPaB+FLWu8kQ4JUbOWVCqHCyK2WCapsif+ZqFN29I/oXUZiGfrZzD3LY80N1CXDoqCi1uBC07E+8uO0/ox5peaqm/gG2STrYCXOdu9UNdEcc6AEFBTibJ3EcygX2dlVEe0NXJM1I+2meXJ7/AJVgz1anv+oPPa+ITyhnoNLWPsuZUGnc3DBIzLWkdQ40mslO6I4Az/ARiQd1p76syTAnafjIkOhiTVYXyBDLahmbwt+RyHsND4HqkBhzH23TZf4KOHw58WGwa7lUE/JHeeHP2IO9oaZscyC5u/yDas34tHDOIEt9nxwJ08Xcnhfzfgp0Gb66XrajcCUF5i1+6RUtvZXcMoDWNLDbpVZBPfnbFC+OtB5nvVJI9K8IVj635iNt21Op5xB4GTu+EFHXVACmMAGZih6hA8YLW1iSoPwnYbSPRFvJ+1y7qvPSH4idG3WQa/755PmcIuWmSf356mh00qrdi9zQoEvLkEwWyEf7NcPWxjIIa+oBn241tvDEp0qDjkIUhlOCLp8rnFw2WEArupWKHYI9DiyVY8+h90QaREoYTNKIlpucecdYE5K5neKmKVxY48LflnxChJ373NKCT669P0s7Ya17Fzo1+eWLH/MhxUp48VwcK3fLAzx0mdBLfo7ziLQ8M0lLzp+5qBk4U2Yu+zx3RbqXtEOW9EZ3HoQK2EofpEnnrXSUQ86NDn7weMbvfiuPerJIgRZrZfWC4f6gK2a9wHIcLmYF3wORKllChAel1UE7KHNoGTLhFuQdohNcUvFYB4si9ZHzbROy1taL1kqTk1XluqMae9Ab7zNHT3gRLrHSs/jOARDfU1EaczuvLme21rWexD9YA1F/yx5AX1ITYHGG4O1W TOebOa9n VQ7TN7iKxIN+wvOvBpqibRn7sDtilLdCFi186D1EOpH7JjsKAu6qy2gv9h7t35h0+f/OGitXO0A2ryavlUa32+q7gXEK5GjHJCJ96wG/Ac30idIM6ij7QY2udHI85KdjFWZiJ6b3erW7C2MolncfWewXC8mJCHkPkRUSS0zbdESrurXhYAQmQ5c+VzxLK5/wKXee0lEdA0jH1IC0bcPhtSnCGnw== 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: Previously, the weighted interleave sysfs structure was statically managed during initialization. This prevented new nodes from being recognized when memory hotplug events occurred, limiting the ability to update or extend sysfs entries dynamically at runtime. To address this, this patch refactors the sysfs infrastructure and encapsulates it within a new structure, `sysfs_wi_group`, which holds both the kobject and an array of node attribute pointers. By allocating this group structure globally, the per-node sysfs attributes can be managed beyond initialization time, enabling external modules to insert or remove node entries in response to events such as memory hotplug or node online/offline transitions. Instead of allocating all per-node sysfs attributes at once, the initialization path now uses the existing sysfs_wi_node_add() and sysfs_wi_node_delete() helpers. This refactoring makes it possible to modularly manage per-node sysfs entries and ensures the infrastructure is ready for runtime extension. Signed-off-by: Rakie Kim Reviewed-by: Gregory Price Reviewed-by: Joshua Hahn Reviewed-by: Dan Williams --- mm/mempolicy.c | 64 ++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 293b4b347975..97b52d65b3ba 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -3419,6 +3419,13 @@ struct iw_node_attr { int nid; }; +struct sysfs_wi_group { + struct kobject wi_kobj; + struct iw_node_attr *nattrs[]; +}; + +static struct sysfs_wi_group *wi_group; + static ssize_t node_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { @@ -3461,24 +3468,23 @@ static ssize_t node_store(struct kobject *kobj, struct kobj_attribute *attr, return count; } -static struct iw_node_attr **node_attrs; - -static void sysfs_wi_node_delete(struct iw_node_attr *node_attr, - struct kobject *parent) +static void sysfs_wi_node_delete(int nid) { - if (!node_attr) + if (!wi_group->nattrs[nid]) return; - sysfs_remove_file(parent, &node_attr->kobj_attr.attr); - kfree(node_attr->kobj_attr.attr.name); - kfree(node_attr); + + sysfs_remove_file(&wi_group->wi_kobj, + &wi_group->nattrs[nid]->kobj_attr.attr); + kfree(wi_group->nattrs[nid]->kobj_attr.attr.name); + kfree(wi_group->nattrs[nid]); } -static void sysfs_wi_node_delete_all(struct kobject *wi_kobj) +static void sysfs_wi_node_delete_all(void) { int nid; for (nid = 0; nid < nr_node_ids; nid++) - sysfs_wi_node_delete(node_attrs[nid], wi_kobj); + sysfs_wi_node_delete(nid); } static void iw_table_free(void) @@ -3495,15 +3501,14 @@ static void iw_table_free(void) kfree(old); } -static void wi_cleanup(struct kobject *wi_kobj) { - sysfs_wi_node_delete_all(wi_kobj); +static void wi_cleanup(void) { + sysfs_wi_node_delete_all(); iw_table_free(); - kfree(node_attrs); } static void wi_kobj_release(struct kobject *wi_kobj) { - kfree(wi_kobj); + kfree(wi_group); } static const struct kobj_type wi_ktype = { @@ -3511,7 +3516,7 @@ static const struct kobj_type wi_ktype = { .release = wi_kobj_release, }; -static int add_weight_node(int nid, struct kobject *wi_kobj) +static int sysfs_wi_node_add(int nid) { struct iw_node_attr *node_attr; char *name; @@ -3533,40 +3538,33 @@ static int add_weight_node(int nid, struct kobject *wi_kobj) node_attr->kobj_attr.store = node_store; node_attr->nid = nid; - if (sysfs_create_file(wi_kobj, &node_attr->kobj_attr.attr)) { + if (sysfs_create_file(&wi_group->wi_kobj, &node_attr->kobj_attr.attr)) { kfree(node_attr->kobj_attr.attr.name); kfree(node_attr); pr_err("failed to add attribute to weighted_interleave\n"); return -ENOMEM; } - node_attrs[nid] = node_attr; + wi_group->nattrs[nid] = node_attr; return 0; } -static int add_weighted_interleave_group(struct kobject *root_kobj) +static int __init add_weighted_interleave_group(struct kobject *mempolicy_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) { - kfree(node_attrs); + wi_group = kzalloc(struct_size(wi_group, nattrs, nr_node_ids), + GFP_KERNEL); + if (!wi_group) return -ENOMEM; - } - err = kobject_init_and_add(wi_kobj, &wi_ktype, root_kobj, + err = kobject_init_and_add(&wi_group->wi_kobj, &wi_ktype, mempolicy_kobj, "weighted_interleave"); if (err) goto err_put_kobj; for_each_node_state(nid, N_POSSIBLE) { - err = add_weight_node(nid, wi_kobj); + err = sysfs_wi_node_add(nid); if (err) { pr_err("failed to add sysfs [node%d]\n", nid); goto err_cleanup_kobj; @@ -3576,10 +3574,10 @@ static int add_weighted_interleave_group(struct kobject *root_kobj) return 0; err_cleanup_kobj: - wi_cleanup(wi_kobj); - kobject_del(wi_kobj); + wi_cleanup(); + kobject_del(&wi_group->wi_kobj); err_put_kobj: - kobject_put(wi_kobj); + kobject_put(&wi_group->wi_kobj); return err; } From patchwork Thu Apr 17 07:28:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14055041 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 46255C369B2 for ; Thu, 17 Apr 2025 07:29:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D1376B018C; Thu, 17 Apr 2025 03:29:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 07F236B018D; Thu, 17 Apr 2025 03:29:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E61626B018E; Thu, 17 Apr 2025 03:29:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C78646B018C for ; Thu, 17 Apr 2025 03:29:12 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4A7121213B7 for ; Thu, 17 Apr 2025 07:29:13 +0000 (UTC) X-FDA: 83342709786.22.C220A15 Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf14.hostedemail.com (Postfix) with ESMTP id 4CD0F100002 for ; Thu, 17 Apr 2025 07:29:11 +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=1744874951; a=rsa-sha256; cv=none; b=lZpwol6xSbqevamrWMN24g3Eluk3kXweXPvwYk6RgnouOZ8IaI0KdA35IOSXpsIZO9SIF8 oQXtP7kP6q81B9TBnpExD+/ixTT0/fjfPll12wlvV2GY3HLLLCCuI165cB0OrZ3HcAqLOS ejsjq9BcQsMm+6QZdPnr9EDoUegltkE= 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=1744874951; 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=NUWNPCA1ZhAryv3IekXhEACUMqR+NuKEtUdefv47rQw=; b=4Dv/e0/Um+x9o8sKdwZlfT+TX9q8S4JqBhm6KusL2cs1mFdHUTyIptTHN8OrSAOj/bI4Z4 cCW9jsv2dGAUZP5GIjGfmkQgXsvCtMUDcaZ8pyEIb8/Vpd/iFZ9mhkHJ31eSmI/5pd24kw zp4FlEZUZqygknC3sWgvYWygcAzZYS0= X-AuditID: a67dfc5b-669ff7000002311f-12-6800adc65bd6 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 3/3] mm/mempolicy: Support memory hotplug in weighted interleave Date: Thu, 17 Apr 2025 16:28:37 +0900 Message-ID: <20250417072839.711-4-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 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRmVeSWpSXmKPExsXC9ZZnoe6xtQwZBp8X81jMWb+GzWL61AuM Fl/X/2K2+Hn3OLvFqoXX2CyOb53HbnF+1ikWi8u75rBZ3Fvzn9XizLQii9VrMhy4PXbOusvu 0d12md2j5chbVo/Fe14yeWz6NInd48SM3yweOx9aerzfd5XNY/Ppao/Pm+QCuKK4bFJSczLL Uov07RK4Mtrab7AWfDCuuDZ5PnsD40utLkZODgkBE4nnq6YzwtgnDjQxdTFycLAJKEkc2xsD EhYRkJWY+vc8SxcjFwezwGMmiUfPX4DVCwsESxxbvYgNxGYRUJU4cG8GO4jNK2AscfpWFxPE TE2Jhkv3wGxOoPnTdrcwg9hCQDUzX01ng6gXlDg58wkLiM0sIC/RvHU2M8gyCYHvbBIfZmyF Ok5S4uCKGywTGPlnIemZhaRnASPTKkahzLyy3MTMHBO9jMq8zAq95PzcTYzACFhW+yd6B+On C8GHGAU4GJV4eE8s+p8uxJpYVlyZe4hRgoNZSYT3nPm/dCHelMTKqtSi/Pii0pzU4kOM0hws SuK8Rt/KU4QE0hNLUrNTUwtSi2CyTBycUg2MzPfuKj+bZR32bIltfPAaZwfl29765x6s5Wqb 9fTuksmt/wM6lz3+ulr/lmf/uzJm0Q79m4ymnifFGVQO8qx2Sl3xdPGNkOYtpm8k1PXjn9Rs 3prwrcHD/lL2181RH6dmRuyokZ26ZGnFBE+2VyZ/rEry5kZPKvjNMOdcyKUnIecXLzDNerzk gRJLcUaioRZzUXEiAAybUft8AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsXCNUNNS/fYWoYMgyPrWC3mrF/DZjF96gVG i6/rfzFb/Lx7nN3i87PXzBarFl5jszi+dR67xeG5J1ktzs86xWJxedccNot7a/6zWpyZVmRx 6NpzVovVazIsfm9bwebA77Fz1l12j+62y+weLUfesnos3vOSyWPTp0nsHidm/Gbx2PnQ0uP9 vqtsHt9ue3gsfvGByWPz6WqPz5vkAniiuGxSUnMyy1KL9O0SuDLa2m+wFnwwrrg2eT57A+NL rS5GTg4JAROJEweamLoYOTjYBJQkju2NAQmLCMhKTP17nqWLkYuDWeAxk8Sj5y8YQRLCAsES x1YvYgOxWQRUJQ7cm8EOYvMKGEucvtXFBDFTU6Lh0j0wmxNo/rTdLcwgthBQzcxX09kg6gUl Ts58wgJiMwvISzRvnc08gZFnFpLULCSpBYxMqxhFMvPKchMzc0z1irMzKvMyK/SS83M3MQKD flntn4k7GL9cdj/EKMDBqMTDe2LR/3Qh1sSy4srcQ4wSHMxKIrznzP+lC/GmJFZWpRblxxeV 5qQWH2KU5mBREuf1Ck9NEBJITyxJzU5NLUgtgskycXBKNTCahEkfvhp+farp7Cu7N6xOYLkX 57B6Q5OwYV9jeMD36P0HYhYe4w68YXqoo/F2mer29nn3g7+EZR70TNwitWvNd8Nt/hOFa+xe MXzVWKA75351G9/EKxODhRTlp85kO5eg4lIlHbDg5jvX2+G+D++oRMtyfbuzwkFhWeOUCgm5 ixNX1W1INXihxFKckWioxVxUnAgA8/fEZXYCAAA= X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 4CD0F100002 X-Stat-Signature: 96xn35gud1uceb7gbwnfskkxc5gbm81x X-HE-Tag: 1744874951-632253 X-HE-Meta: U2FsdGVkX18HGrUIN5AXSujQKpXqUmadyLC0Iptf88rPhk/hCh/CUiKUgieXC5ocxmXEyqdLU+xJVoyPGafAgan/0c48OcVaKoU1V5HIABmRmpzMJkbtSR6MaD9Nfv22dFfxyhABr/usGlsJr+Q467YuBn2HyAXppPU5r4QbqNzP46rA1kBvdVteXKnvMSuPcfNWxin2mURjubqYjAnf9+dA+CyDLcVOnGMLSIOhhH8jF7WB1wlMpRVdCcKfNgQhJPbZDwfAbL62clK6WefSgnvkfNlnxmDll7XoiRPRyBOZVNeTAA1+EOPt8lZ3S9Dc8OPhtVE/s52FboUYqA2QTty8g/0Z6z7dwvU+/it8F7HhnUDnBzqn3joizYqoi3fMAfKt3MVjkyduJQPpA4iWRdPZvMZXHXft6H2Z9hMVkYWiwoZ179QxlOgxDBv8j5Zu1X485pj32yRxeW2x1d0H7iM1xr9GdZiPZvWERUSZrFFUocnA1qbgfolUoMvwGDbvTYz5sMDwvE5epiyGpcXCKP2Ka7g3pCbcgFUajOz3MjWV+aKVjlWjdMbMNkE09Jm6iNbhePrLHw1nV5fOzQxA3Y4qkh0RwcbySSBkU8lmofyISNUXmFbvOsMpxuOOLgfENLtM5GoJrcpIPUE/2zRPoMrcC6wXOeyFz1hS/mq+cP5POEsHexk8U4FzZ0MxDH+IgeCmtBZEIR8b+HOfUEEiohvjKaZxiAWRdhlXUmFwsrFIiTWN6QwrUIgwU8VEzPmcX+Mmcwz0iIsECBwUgsi0Pe3eIVue+wW2feEfKg9snT8tZPwC6kJWCceoRnMQVetPGd2tKAefWW35qkqv31Tk+hBkAxqHtukidMFZDZMo5iuDy5ePEPXRdvfsTameBEU/h188T9SQVTLIsKQjpUfq9RkDnPPIRNk+vM9u1Jet/ul2gegyr4Oapz/+O1fHF5OpHeGAXZY1U0zkXd63CBX BjKeOChy GWUkYM0bsAVx9fYWFNA2G77M23DdThB9KArFlg0MjJbV2xSpXyGHqpR//LwHPBdGajjxlN9PeqSUFpkPKUKsEjNrwyxw76RnbsXHtXKIoZS0QUPNhGbbluXJxaBFELbdQ1KP0H0+hNf05qXMS0iDtkUd4jJfm/NCmMuUdcrKAPmTBdQjiurF34+950e3Pymp3vlPr1AjdykNiIsR6+QqZ40SdjK2O0hUfnve0zuzQEqTeOkc= 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: The weighted interleave policy distributes page allocations across multiple NUMA nodes based on their performance weight, thereby improving memory bandwidth utilization. The weight values for each node are configured through sysfs. Previously, sysfs entries for configuring weighted interleave were created for all possible nodes (N_POSSIBLE) at initialization, including nodes that might not have memory. However, not all nodes in N_POSSIBLE are usable at runtime, as some may remain memoryless or offline. This led to sysfs entries being created for unusable nodes, causing potential misconfiguration issues. To address this issue, this patch modifies the sysfs creation logic to: 1) Limit sysfs entries to nodes that are online and have memory, avoiding the creation of sysfs entries for nodes that cannot be used. 2) Support memory hotplug by dynamically adding and removing sysfs entries based on whether a node transitions into or out of the N_MEMORY state. Additionally, the patch ensures that sysfs attributes are properly managed when nodes go offline, preventing stale or redundant entries from persisting in the system. By making these changes, the weighted interleave policy now manages its sysfs entries more efficiently, ensuring that only relevant nodes are considered for interleaving, and dynamically adapting to memory hotplug events. Co-developed-by: Honggyu Kim Signed-off-by: Honggyu Kim Co-developed-by: Yunjeong Mun Signed-off-by: Yunjeong Mun Signed-off-by: Rakie Kim Reviewed-by: Oscar Salvador Reviewed-by: Joshua Hahn Reviewed-by: Gregory Price Reviewed-by: Dan Williams Acked-by: David Hildenbrand --- mm/mempolicy.c | 107 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 23 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 97b52d65b3ba..74b4e2a6c786 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -113,6 +113,7 @@ #include #include #include +#include #include "internal.h" @@ -3421,6 +3422,7 @@ struct iw_node_attr { struct sysfs_wi_group { struct kobject wi_kobj; + struct mutex kobj_lock; struct iw_node_attr *nattrs[]; }; @@ -3470,13 +3472,24 @@ static ssize_t node_store(struct kobject *kobj, struct kobj_attribute *attr, static void sysfs_wi_node_delete(int nid) { - if (!wi_group->nattrs[nid]) + struct iw_node_attr *attr; + + if (nid < 0 || nid >= nr_node_ids) + return; + + mutex_lock(&wi_group->kobj_lock); + attr = wi_group->nattrs[nid]; + if (!attr) { + mutex_unlock(&wi_group->kobj_lock); return; + } + + wi_group->nattrs[nid] = NULL; + mutex_unlock(&wi_group->kobj_lock); - sysfs_remove_file(&wi_group->wi_kobj, - &wi_group->nattrs[nid]->kobj_attr.attr); - kfree(wi_group->nattrs[nid]->kobj_attr.attr.name); - kfree(wi_group->nattrs[nid]); + sysfs_remove_file(&wi_group->wi_kobj, &attr->kobj_attr.attr); + kfree(attr->kobj_attr.attr.name); + kfree(attr); } static void sysfs_wi_node_delete_all(void) @@ -3518,35 +3531,77 @@ static const struct kobj_type wi_ktype = { static int sysfs_wi_node_add(int nid) { - struct iw_node_attr *node_attr; + int ret = 0; char *name; + struct iw_node_attr *new_attr; - node_attr = kzalloc(sizeof(*node_attr), GFP_KERNEL); - if (!node_attr) + if (nid < 0 || nid >= nr_node_ids) { + pr_err("invalid node id: %d\n", nid); + return -EINVAL; + } + + new_attr = kzalloc(sizeof(*new_attr), GFP_KERNEL); + if (!new_attr) return -ENOMEM; name = kasprintf(GFP_KERNEL, "node%d", nid); if (!name) { - kfree(node_attr); + kfree(new_attr); return -ENOMEM; } - sysfs_attr_init(&node_attr->kobj_attr.attr); - node_attr->kobj_attr.attr.name = name; - node_attr->kobj_attr.attr.mode = 0644; - node_attr->kobj_attr.show = node_show; - node_attr->kobj_attr.store = node_store; - node_attr->nid = nid; + sysfs_attr_init(&new_attr->kobj_attr.attr); + new_attr->kobj_attr.attr.name = name; + new_attr->kobj_attr.attr.mode = 0644; + new_attr->kobj_attr.show = node_show; + new_attr->kobj_attr.store = node_store; + new_attr->nid = nid; - if (sysfs_create_file(&wi_group->wi_kobj, &node_attr->kobj_attr.attr)) { - kfree(node_attr->kobj_attr.attr.name); - kfree(node_attr); - pr_err("failed to add attribute to weighted_interleave\n"); - return -ENOMEM; + mutex_lock(&wi_group->kobj_lock); + if (wi_group->nattrs[nid]) { + mutex_unlock(&wi_group->kobj_lock); + pr_info("node%d already exists\n", nid); + goto out; } - wi_group->nattrs[nid] = node_attr; + ret = sysfs_create_file(&wi_group->wi_kobj, &new_attr->kobj_attr.attr); + if (ret) { + mutex_unlock(&wi_group->kobj_lock); + goto out; + } + wi_group->nattrs[nid] = new_attr; + mutex_unlock(&wi_group->kobj_lock); return 0; + +out: + kfree(new_attr->kobj_attr.attr.name); + kfree(new_attr); + return ret; +} + +static int wi_node_notifier(struct notifier_block *nb, + unsigned long action, void *data) +{ + int err; + struct memory_notify *arg = data; + int nid = arg->status_change_nid; + + if (nid < 0) + return NOTIFY_OK; + + switch (action) { + case MEM_ONLINE: + err = sysfs_wi_node_add(nid); + if (err) + pr_err("failed to add sysfs for node%d during hotplug: %d\n", + nid, err); + break; + case MEM_OFFLINE: + sysfs_wi_node_delete(nid); + break; + } + + return NOTIFY_OK; } static int __init add_weighted_interleave_group(struct kobject *mempolicy_kobj) @@ -3557,20 +3612,26 @@ static int __init add_weighted_interleave_group(struct kobject *mempolicy_kobj) GFP_KERNEL); if (!wi_group) return -ENOMEM; + mutex_init(&wi_group->kobj_lock); err = kobject_init_and_add(&wi_group->wi_kobj, &wi_ktype, mempolicy_kobj, "weighted_interleave"); if (err) goto err_put_kobj; - for_each_node_state(nid, N_POSSIBLE) { + for_each_online_node(nid) { + if (!node_state(nid, N_MEMORY)) + continue; + err = sysfs_wi_node_add(nid); if (err) { - pr_err("failed to add sysfs [node%d]\n", nid); + pr_err("failed to add sysfs for node%d during init: %d\n", + nid, err); goto err_cleanup_kobj; } } + hotplug_memory_notifier(wi_node_notifier, DEFAULT_CALLBACK_PRI); return 0; err_cleanup_kobj: