From patchwork Tue Apr 8 07:32:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14042318 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 EE0EFC369A4 for ; Tue, 8 Apr 2025 07:33:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD98D6B000E; Tue, 8 Apr 2025 03:33:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B0D0F6B0012; Tue, 8 Apr 2025 03:33:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 95CFA6B0022; Tue, 8 Apr 2025 03:33:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 78FD16B000E for ; Tue, 8 Apr 2025 03:33:54 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C095F80723 for ; Tue, 8 Apr 2025 07:33:55 +0000 (UTC) X-FDA: 83310062430.11.3B820A8 Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by imf05.hostedemail.com (Postfix) with ESMTP id CFE73100009 for ; Tue, 8 Apr 2025 07:33:53 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1744097634; 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=ZfHw8ibluN4knRSruEFgPtEGzBCta2F09ljYy2qmp1A=; b=eW3DJLpQJpKpf+o/QcDye7g+NiU81/GezOuP3ZiZK0CA0Z+3LQphzCApGJfVIrs2XnzEeG zCdRgn8s6p6SccqODydfuA7sAuH6EU6FuMY4SfDyPC2sDFAY5VALCchFczdhvOIJ9MbPbf 6gANcZEZ7cHzg+jXlHz5UA46rMiU/j8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1744097634; a=rsa-sha256; cv=none; b=Mln4GppDBLUbhinKWbM6JZzRVrbi+rYrTYppeM6Wepx8l3iYPgo88/1DzWgBzZsh/pD8qD JDPcdVt0noTdexSzN0t4+gA6XgPmgFw3KrCTGUgIahaDvEME/WDF/yP64CMKMraVtxwkXt QGpe++47Xrj457oGhAMzlH7rsnqET0k= X-AuditID: a67dfc5b-681ff7000002311f-f7-67f4d160c5cb 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 v7 1/3] mm/mempolicy: Fix memory leaks in weighted interleave sysfs Date: Tue, 8 Apr 2025 16:32:40 +0900 Message-ID: <20250408073243.488-2-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250408073243.488-1-rakie.kim@sk.com> References: <20250408073243.488-1-rakie.kim@sk.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRmVeSWpSXmKPExsXC9ZZnkW7CxS/pBhuPWVrMWb+GzWL61AuM Fl/X/2K2+Hn3OLvFqoXX2CyOb53HbnF+1ikWi8u75rBZ3Fvzn9XizLQii9VrMhy4PXbOusvu 0d12md2j5chbVo/Fe14yeWz6NInd48SM3yweOx9aerzfd5XNY/Ppao/Pm+QCuKK4bFJSczLL Uov07RK4Ms6/3MZUsFWu4u+RtcwNjPcluhg5OSQETCQ+Lj3OAmO/WrqPsYuRg4NNQEni2N4Y kLCIgKzE1L/ngUq4OJgFHjNJPHr+ghEkISwQLPHg2m82EJtFQFVi4apF7CA2r4CxxI0dyxgh ZmpKNFy6xwRicwLN/396NwvIfCGgmt7piRDlghInZz4BO4FZQF6ieetsZpBdEgLf2SQ6971g hpgjKXFwxQ2WCYz8s5D0zELSs4CRaRWjUGZeWW5iZo6JXkZlXmaFXnJ+7iZGYPgvq/0TvYPx 04XgQ4wCHIxKPLweRz+nC7EmlhVX5h5ilOBgVhLhfTvxS7oQb0piZVVqUX58UWlOavEhRmkO FiVxXqNv5SlCAumJJanZqakFqUUwWSYOTqkGxpj0PZadc5b/b7oT2Hf3t+hhtZI59z9vy8yQ rTLYblpzota5L0ruxuQAi/nZGUU2c2/yBa+2UhLMels2sTp7X2rD+f9GF7uOmK1SmZheph5n o9zZHOl64wLzp3cGgZXhCwxWi5z943mjW1plksdLBnth47W3IkIPTzXu5H13Zv/TbBaXyxnX lFiKMxINtZiLihMBHMqARXsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsXCNUNNSzfh4pd0g7sLdCzmrF/DZjF96gVG i6/rfzFb/Lx7nN3i87PXzBarFl5jszi+dR67xeG5J1ktzs86xWJxedccNot7a/6zWpyZVmRx 6NpzVovVazIsfm9bwebA77Fz1l12j+62y+weLUfesnos3vOSyWPTp0nsHidm/Gbx2PnQ0uP9 vqtsHt9ue3gsfvGByWPz6WqPz5vkAniiuGxSUnMyy1KL9O0SuDLOv9zGVLBVruLvkbXMDYz3 JboYOTkkBEwkXi3dx9jFyMHBJqAkcWxvDEhYREBWYurf8yxdjFwczAKPmSQePX/BCJIQFgiW eHDtNxuIzSKgKrFw1SJ2EJtXwFjixo5ljBAzNSUaLt1jArE5geb/P72bBWS+EFBN7/REiHJB iZMzn7CA2MwC8hLNW2czT2DkmYUkNQtJagEj0ypGkcy8stzEzBxTveLsjMq8zAq95PzcTYzA kF9W+2fiDsYvl90PMQpwMCrx8Hoc/ZwuxJpYVlyZe4hRgoNZSYT37cQv6UK8KYmVValF+fFF pTmpxYcYpTlYlMR5vcJTE4QE0hNLUrNTUwtSi2CyTBycUg2MzfXLj3v/Tjp06bDTK51tfEZe erfOTol+s7ho49UHcy6UPC6R987V2xl4WKnR6v6DvZVSCxLrOndsW2LVvuxQklXsseMK062u XLzQz+aez3buqOtV53SmmzPFA7R5vb1ijvgfdF7j13355rYTjMd0d8h45sS+1Li469buHRw2 fM5mc4/e3iY0VYmlOCPRUIu5qDgRAIKE/dZ1AgAA X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: CFE73100009 X-Stat-Signature: mj68kfmuis3d19rkr9rpx9wduegskajh X-HE-Tag: 1744097633-337186 X-HE-Meta: U2FsdGVkX19F8pq973YwDSQumwbSwDnzfmiptxvmuVpz74GH0UhWtK1iY7PsCPka+fQeku26guuV/bIprR4sozJ0nV4jwzq4DSRls3oAx0zlX/gZh2+YzCTBTKknlWFWEx0gYAAJj1pPNi0QiuuK4UPwNTzeRrVuws6W4REv1AXmp4Bgka9HXOjq2E69+Lk6yZMIw/F1ND6894I9i4qxLMIeTG7UcOUv5mA2/ineooA28UUKNcQ5uorZlwYdTwXhBLDypLCzIorsCTyJxErswNTVsOopwcrtqa5Wn4JOY0KpjPOsYpNO6zRdL66bRjrXALuJIPAPFrlYNylbjbyema+6/krLmWtX2P7xDZeWEWpIsD0KbY8WBsMXmr6DOtnTKCuuSQ8yu/LuMmDPwZsd6A/Zg0jGmJWKbhmcMUPHfKFNln7ZI6N2wknSOzuFWV9KlPo5jxgewwfS7991TIOJSW9ZBsgwNwDA7k9M4L3WWH/yrpc8JWtAGffJhFYUGSqCMlRwci+YG839LBwNAm/fUMe8oewE4GFy7tCrwAH/UpTk4c/CBLbPBJTs52F09gwnoVQGVo2HMDh3UBAV51W7BKlapZv4H6EtRKHzgwIcv3MxTkq6wLNTYfLMqm1lP9a2v6Jcb+YQQ7SnZ9thWvzZtOZ04VJz35APBkg+AQMQzl5CutFHiqxsmDCbeaqOBQbCfqESWkOw03TRdL3DIZzm4pmwV4V3zJPiEBfhv4m74bKv2xPYjnM+waNps6TJHGOWxpNZsW7e614rqiDukFMzvQ5fi/RJWwjhaZVPFvI2s3jUqPLmARpPwmFQUVTF3iPwNnw8aPemG87CcuR6cMhh3QdFmCy31mBS5ygGMgOxZxt2MQZhsfFt1v7ZoR3RdssaGBBtrga3ixv1BF6kApLw3gIDJENolihXIrRXeduMn2fH3K4ioLtIrNCSzDppzPxdiJLWQ88vM7zhsig/0mL 7crBEjg5 Y8u/IJiO6hv437cG2RGf66JRZdFAiEVQ04M5YsfcSLQ5KT9ly4ed1J2XuE3OijB/x0FD0xISI5WS9v9EtJPi7xJCCt/w0FI1ilS04vlLsU8rSIiSnAiREBBtMUPH5zR5wWtLNLZILct40yiAkkexeD5oZxh9kH82FibNk 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. Fixes: dce41f5ae253 ("mm/mempolicy: implement the sysfs-based weighted_interleave interface") Signed-off-by: Rakie Kim Signed-off-by: Honggyu Kim Signed-off-by: Yunjeong Mun Reviewed-by: Gregory Price Reviewed-by: Joshua Hahn Reviewed-by: Jonathan Cameron --- mm/mempolicy.c | 66 ++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index b28a1e6ae096..0da102aa1cfc 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -3479,7 +3479,9 @@ static void sysfs_wi_release(struct kobject *wi_kobj) for (i = 0; i < nr_node_ids; i++) sysfs_wi_node_release(node_attrs[i], wi_kobj); - kobject_put(wi_kobj); + + kfree(node_attrs); + kfree(wi_kobj); } static const struct kobj_type wi_ktype = { @@ -3525,27 +3527,37 @@ 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_del_kobj; } } - if (err) - kobject_put(wi_kobj); + return 0; + +err_del_kobj: + kobject_del(wi_kobj); +err_put_kobj: + kobject_put(wi_kobj); + return err; } static void mempolicy_kobj_release(struct kobject *kobj) @@ -3559,7 +3571,6 @@ static void mempolicy_kobj_release(struct kobject *kobj) mutex_unlock(&iw_table_lock); synchronize_rcu(); kfree(old); - kfree(node_attrs); kfree(kobj); } @@ -3573,37 +3584,24 @@ static int __init mempolicy_sysfs_init(void) 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; - } + if (!mempolicy_kobj) + return -ENOMEM; err = kobject_init_and_add(mempolicy_kobj, &mempolicy_ktype, mm_kobj, "mempolicy"); if (err) - goto node_out; + goto err_put_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; - } + if (err) + goto err_del_kobj; - 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"); + return 0; + +err_del_kobj: + kobject_del(mempolicy_kobj); +err_put_kobj: + kobject_put(mempolicy_kobj); return err; } From patchwork Tue Apr 8 07:32:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14042319 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 39A68C3600C for ; Tue, 8 Apr 2025 07:33:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F095A6B0012; Tue, 8 Apr 2025 03:33:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EBB586B0022; Tue, 8 Apr 2025 03:33:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE3E86B0023; Tue, 8 Apr 2025 03:33:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B18C96B0012 for ; Tue, 8 Apr 2025 03:33:56 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 1C20FAAE9E for ; Tue, 8 Apr 2025 07:33:58 +0000 (UTC) X-FDA: 83310062556.28.7096990 Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by imf05.hostedemail.com (Postfix) with ESMTP id 19E40100005 for ; Tue, 8 Apr 2025 07:33:55 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1744097636; 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=gZZrmhzctf0dAGux3cahTQv89xksv55u1eB2fJFVdXg=; b=yoxMYDme4plmkiFDgpEhrLjf23Xm4e5W4y7HVVZsH2EbZk7CV1ncZ6g7FXHRFKMzDxXHGO /58DCNhqZnAulxvX4wYTTp1zj1956h9DiRIwu75CGlgIR2s/HMigQL4OeDx8zvmSu2Men7 dlKb3r0cf+NgxjsOiPWwkU39+RS30Sk= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1744097636; a=rsa-sha256; cv=none; b=JAwO8Lp/JkSGUqU9vQOlwjL/R1OrsWIIp/2wmggVj8oFP8WKFbXhhBhOBKC89eB7F84Opk VW0pQ6LWK8afN4Qb08SlgFQW/3op5QiijUfgUv9APQLAvVs0LxESeqHllxPlhcZvG6/x1/ UEaqR4TwRWYWb95+BzL/OeekYfTsq1g= X-AuditID: a67dfc5b-681ff7000002311f-02-67f4d1633aca 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 v7 2/3] mm/mempolicy: Prepare weighted interleave sysfs for memory hotplug Date: Tue, 8 Apr 2025 16:32:41 +0900 Message-ID: <20250408073243.488-3-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250408073243.488-1-rakie.kim@sk.com> References: <20250408073243.488-1-rakie.kim@sk.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRmVeSWpSXmKPExsXC9ZZnkW7yxS/pBg+aJS3mrF/DZjF96gVG i6/rfzFb/Lx7nN1i1cJrbBbHt85jtzg/6xSLxeVdc9gs7q35z2pxZlqRxeo1GQ7cHjtn3WX3 6G67zO7RcuQtq8fiPS+ZPDZ9msTucWLGbxaPnQ8tPd7vu8rmsfl0tcfnTXIBXFFcNimpOZll qUX6dglcGfcWTmcruKZW8f/bBKYGxjaFLkZODgkBE4llTxcwwthrDm5k7WLk4GATUJI4tjcG JCwiICsx9e95li5GLg5mgcdMEo+evwCrFxaIkvjw4hUriM0ioCox48s9dhCbV8BY4uaaE0wQ MzUlGi7dA7M5geb/P72bBWS+EFBN7/REiHJBiZMzn7CA2MwC8hLNW2czg+ySEPjOJtF/4Cgr xBxJiYMrbrBMYOSfhaRnFpKeBYxMqxiFMvPKchMzc0z0MirzMiv0kvNzNzECw39Z7Z/oHYyf LgQfYhTgYFTi4fU4+jldiDWxrLgy9xCjBAezkgjv24lf0oV4UxIrq1KL8uOLSnNSiw8xSnOw KInzGn0rTxESSE8sSc1OTS1ILYLJMnFwSjUwStZyJp/wERVjY/7+8OU9UTbbz/O/HFLqWaUQ efn6nkmmi47mxqlLlf1aGB2w+ci7K/0XkifvWH/hVK/UD7ljhf5KzSqrF7c8YpI5FFv2+aDJ h8v1+cfNb/wPVGgvkZzG93blsj8LE4Ku7Pm8lX2Ks+5V7/ysur2FJtE7fd+lHX98iE9D/G26 gRJLcUaioRZzUXEiAGUxcXZ7AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsXCNUNNSzf54pd0g5M9vBZz1q9hs5g+9QKj xdf1v5gtft49zm7x+dlrZotVC6+xWRzfOo/d4vDck6wW52edYrG4vGsOm8W9Nf9ZLc5MK7I4 dO05q8XqNRkWv7etYHPg99g56y67R3fbZXaPliNvWT0W73nJ5LHp0yR2jxMzfrN47Hxo6fF+ 31U2j2+3PTwWv/jA5LH5dLXH501yATxRXDYpqTmZZalF+nYJXBn3Fk5nK7imVvH/2wSmBsY2 hS5GTg4JAROJNQc3snYxcnCwCShJHNsbAxIWEZCVmPr3PEsXIxcHs8BjJolHz18wgiSEBaIk Prx4xQpiswioSsz4co8dxOYVMJa4ueYEE8RMTYmGS/fAbE6g+f9P72YBmS8EVNM7PRGiXFDi 5MwnLCA2s4C8RPPW2cwTGHlmIUnNQpJawMi0ilEkM68sNzEzx1SvODujMi+zQi85P3cTIzDk l9X+mbiD8ctl90OMAhyMSjy8Hkc/pwuxJpYVV+YeYpTgYFYS4X078Uu6EG9KYmVValF+fFFp TmrxIUZpDhYlcV6v8NQEIYH0xJLU7NTUgtQimCwTB6dUA+Ncx7mfisR2GoZdDDi58Gj3iaZL TO8ZvLZu1tw3YRHzufwbiSecd9ps/3lm2bTYmBPi/Yt1nmh5WAWu/X8nT/VBgSjnnt7OFvUN M5m2qhzXvPBsp/ovp7Vil8z2XRcq+7jnZcjF6Zq3OsSl7Kf3N600iFmwKfXK6uLTt69O1zt5 xdXjSujxr7/YlFiKMxINtZiLihMBNsmrXHUCAAA= X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 19E40100005 X-Stat-Signature: 35f6sifb4w6s136j9fbrgdhkqinefkky X-HE-Tag: 1744097635-8515 X-HE-Meta: U2FsdGVkX19v5ZyzDDhY+h55g7DKtrCx4DjclUhCp6ZipI1rZwNodmUt1XBK8J5MnFvggzNKnn/bAAKHoBaom2gbVcklrV2SNzgVi0Dfsz4ItAElNg3qKEUFkLOxkYc5lMNmx+tpJ5FOblBpt1BUbzUmPg77BNEKPkvwzj3yPWCmvS2vbjaZybFjcxSuScGG64I1hceh4KCU52dDjkfRqcwTgHThfEgMBuLrLl+wuKUPIXk67nBN0K7ATZIIwoseeRsIxbeObFmG/S+O/CBFPe8EYQk4MWg1w327+U2KGEXhNh35zR6jhhhqGjZc4jODrJ9NZtEd9lX74mJKvYH0uKTaXAVPr7XWCY41C7ulLego6pi2bPGpP3wyO/LzlfBtXkWRfmeiqTVos0WoyCNDP4TLvm4lhBu92hJOskKoK6x+KKwUjrjfbWcGOmN+y0oX2lGTzUUF6M4TGPx23PiWpQ6iDMQmNQ6rbbHv/vjWYZgQVUBK97DpYWVc9RTYectFK9p2+MavpfG0svwRYRMh5l8YJmYavHCyBNzxv/4/FFx48hgCmV+OCGT18TlHALlzR+hUdM2COwFbwO+DfEO2YsR63Ue9PeF9FiL3j1qO+/uKU5vcGK2DXwtxM9JWAk4ZPLsJirkPgn64agtEMG+t2y/jhQ+NIKoCE24Y8XMpuL7j3yFZ/N0mIQSgAzN8DPuVQpyBuR735hGG+KE3Vnv2AVCavHdri/I7zyG2rhQ317W06cFBQcf7tnKAXypQ2s512gs8UA+St6oAbv0p1rdvABkH7/BrBv9r8jpx1bTA90jBZv3OukZh26mJQ3jsRQC7IxejzjnbK8rNPi59PS7MDc/ko9fLe5x2nA1CfJILGH973uHbZRsFjYOhAqBxooHy303bCEzGrzX7wBArV7Ozu+mlkJcpGqmnCYGPTFGQH2wzWxEnKUlaiqPxWmTScRuWX6gdgEIJ/fz2MzU7827 LmN3Ytsq WGGC6cF9+UmbPbnLy1oHhueMD1adMdHMtZnugOFdRLx7BYTjQu7RVSEQikNyVpac11k7m55mZy54JARiKWmX8Y6cJ0sOu4007nHyZEMoEosaubmk1WMhuwlvZkQumJ7u4/MvUxAnEeuHOSrFdwQxqgZr0bYXd2x3hW9i8 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 Signed-off-by: Honggyu Kim Signed-off-by: Yunjeong Mun Reviewed-by: Gregory Price Reviewed-by: Joshua Hahn --- mm/mempolicy.c | 61 ++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 0da102aa1cfc..988575f29c53 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,27 +3468,24 @@ 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_release(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_release(struct kobject *wi_kobj) { - int i; - - for (i = 0; i < nr_node_ids; i++) - sysfs_wi_node_release(node_attrs[i], wi_kobj); + int nid; - kfree(node_attrs); - kfree(wi_kobj); + for (nid = 0; nid < nr_node_ids; nid++) + sysfs_wi_node_delete(nid); + kfree(wi_group); } static const struct kobj_type wi_ktype = { @@ -3489,7 +3493,7 @@ static const struct kobj_type wi_ktype = { .release = sysfs_wi_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; @@ -3511,40 +3515,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) + wi_group = kzalloc(struct_size(wi_group, nattrs, nr_node_ids), + GFP_KERNEL); + if (!wi_group) return -ENOMEM; - wi_kobj = kzalloc(sizeof(struct kobject), GFP_KERNEL); - if (!wi_kobj) { - kfree(node_attrs); - 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_del_kobj; @@ -3554,9 +3551,9 @@ static int add_weighted_interleave_group(struct kobject *root_kobj) return 0; err_del_kobj: - kobject_del(wi_kobj); + kobject_del(&wi_group->wi_kobj); err_put_kobj: - kobject_put(wi_kobj); + kobject_put(&wi_group->wi_kobj); return err; } From patchwork Tue Apr 8 07:32:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14042320 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 84C59C369A1 for ; Tue, 8 Apr 2025 07:34:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C57C6B0022; Tue, 8 Apr 2025 03:33:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4AEA46B0023; Tue, 8 Apr 2025 03:33:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 263286B0025; Tue, 8 Apr 2025 03:33:59 -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 080306B0022 for ; Tue, 8 Apr 2025 03:33:59 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 500B11406B8 for ; Tue, 8 Apr 2025 07:34:00 +0000 (UTC) X-FDA: 83310062640.19.F251FB4 Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by imf05.hostedemail.com (Postfix) with ESMTP id 5C598100005 for ; Tue, 8 Apr 2025 07:33:58 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1744097638; 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=0GOnxShJk1OnY/CIIlhDCTjOMYwqIauDvGURFsyUCuI=; b=WmPtthmRLAJbVUh8vqvJeNLOC0X6hFSZXY1V5VwUwTL/TN6zMqnW1DdHsT4qRdl9MWL2YC gau6PRrBgkuHc5PjTWkQAJvnpjseJVXss57Si4mBI5C4kJ/nXBPS4kESELtwWNOoIgMqgt dehtIqSCtXXPb+d4zHX5C0VJzobP3YY= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.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=1744097638; a=rsa-sha256; cv=none; b=SSE6bFoHcT0CrPbypJZvn1AmIx1ymXv4f4DTUgxBxGZCGaDE+cqT5jsvGw2EQrJGKGtWY1 aeohQik+5hrSUy0A/DhJOg+pjqHW8Mr0mD0gRXSR5RdIJfAMLFZAdnywzKfJmXJ7cEpL4/ YDRKxeE2GoRY7Cfv097+ht+2ife3IQI= X-AuditID: a67dfc5b-681ff7000002311f-08-67f4d165d318 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 v7 3/3] mm/mempolicy: Support memory hotplug in weighted interleave Date: Tue, 8 Apr 2025 16:32:42 +0900 Message-ID: <20250408073243.488-4-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250408073243.488-1-rakie.kim@sk.com> References: <20250408073243.488-1-rakie.kim@sk.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKLMWRmVeSWpSXmKPExsXC9ZZnkW7qxS/pBjcvyFvMWb+GzWL61AuM Fl/X/2K2+Hn3OLvFqoXX2CyOb53HbnF+1ikWi8u75rBZ3Fvzn9XizLQii9VrMhy4PXbOusvu 0d12md2j5chbVo/Fe14yeWz6NInd48SM3yweOx9aerzfd5XNY/Ppao/Pm+QCuKK4bFJSczLL Uov07RK4Mhq3rmAt+G5UcfX+Y7YGxllaXYycHBICJhLzllxn6mLkALMvnfYEMdkElCSO7Y0B qRARkJWY+vc8SxcjFwezwGMmiUfPXzCC1AgLBEvM/+UKUsMioCoxddV8NhCbV8BY4uHrP2wQ 0zUlGi7dYwKxOYGm/z+9mwWkVQiopnd6IkS5oMTJmU9YQGxmAXmJ5q2zmSFav7NJ7LiuDmFL ShxccYNlAiP/LCQts5C0LGBkWsUolJlXlpuYmWOil1GZl1mhl5yfu4kRGPjLav9E72D8dCH4 EKMAB6MSD6/H0c/pQqyJZcWVuYcYJTiYlUR43078ki7Em5JYWZValB9fVJqTWnyIUZqDRUmc 1+hbeYqQQHpiSWp2ampBahFMlomDU6qBsY7jyivzvy8lrx/svOF9wsxGcEPGofaQLWzslpPb J9Qa55q8rkq4J7DlwoLyA3Z7V0oWBLo+d7Sb+bqbcdvU9MBNzwwD+e/UTvodmDN9TUgn05Yl 2b8Pfqm8Z//iecCV9XzXHj+WzV/8/OCt3mW8ExfOLMowmSit8ZT//iGLtqZQFZN9mfqs8kos xRmJhlrMRcWJALQg/uN4AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRmVeSWpSXmKPExsXCNUNNSzf14pd0gwc7hS3mrF/DZjF96gVG i6/rfzFb/Lx7nN3i87PXzBarFl5jszi+dR67xeG5J1ktzs86xWJxedccNot7a/6zWpyZVmRx 6NpzVovVazIsfm9bwebA77Fz1l12j+62y+weLUfesnos3vOSyWPTp0nsHidm/Gbx2PnQ0uP9 vqtsHt9ue3gsfvGByWPz6WqPz5vkAniiuGxSUnMyy1KL9O0SuDIat65gLfhuVHH1/mO2BsZZ Wl2MHBwSAiYSl057gphsAkoSx/bGdDFycogIyEpM/XuepYuRi4NZ4DGTxKPnLxhBaoQFgiXm /3IFqWERUJWYumo+G4jNK2As8fD1HzBbQkBTouHSPSYQmxNo+v/Tu1lAWoWAanqnJ0KUC0qc nPmEBcRmFpCXaN46m3kCI88sJKlZSFILGJlWMYpk5pXlJmbmmOoVZ2dU5mVW6CXn525iBIb7 sto/E3cwfrnsfohRgINRiYfX4+jndCHWxLLiytxDjBIczEoivG8nfkkX4k1JrKxKLcqPLyrN SS0+xCjNwaIkzusVnpogJJCeWJKanZpakFoEk2Xi4JRqYLxq+ypBVy08yWV/tCHjhLnPjRPi v5la+yev8Ledvip0pmzgnoDzgXsOS0iZKd7+vHLO2X+iXgseXC3PdthV+L0lvWh35faUg3qS PWvDNyxfd/z65dZPFYuUHT7Z+84+6tm+5Unql5z4eMu4+08Vdld+mrDE6YWs4wvX+3Wtj+6U T2UIjY7I+qPEUpyRaKjFXFScCACg8k82cwIAAA== X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 5C598100005 X-Stat-Signature: kpzeb8339ms1q1rowduchyr9ixtpprm6 X-HE-Tag: 1744097638-434265 X-HE-Meta: U2FsdGVkX1+KpQDS7WVaUoFzqeqYovXPxNDUN2e16Vu29yFyZwfKtIV+SkCV73GKMD0gkbaR11jUrsr9/TKJRXrPJRKgP6SFchkPuddxiYYHmx9Wy84s279Jn0En/GponftKrGO3Srg+z3j07+hZqj8F7NwNcn7cHZtq9J8EPZiVvjw+j4p/tZQOPk+th91lS2X8KJY4thd+PSo5E0tA3Xd6l4P/xRmmeA9Ci/GYwt3G4nPrOv2tou40qSBC5fnymrQAMPyI+T10rlhO5+4DFooToAM4XJX8Z+hsrJN40G1+/aBPVdFnRIBF45T5kST8eAXWC6TZpJ+HsrwfbRNY5Rc4QH5PhQGyy6zYoz7g0mV9ylMUyXogE3Dev7RpjJtv9O9WbWFZn6zQeaUvVAtdwvbtuHrO01gzYOu5GynH1gRUfzlgiRoMHvr6dRKckA4+dpbj8d1RrVogcrFag9lHzuTkQE4iOxgwQqp7O+WrVDeWmTg2qvxZREOcp28FLRHer10q89xYxzoFov5Xc8cchGfQcu3D9hf4hg6Kzp8AcoxPyAc6+x9lYOUAoKQNWsN/yfUkOI8+nOWUXIhCbQZJsvZ2GylROwwWCJ6G8bTVsk4goN/JKeJHGN1tRvHMhypwzojYxPogwh5y2YKMV8Ri5s+83lRQ+uxTvlOz1Fr3wYcg+QYLnqaYwUKm84J+BifEE2kBdmaCiKqOqBl27/e7QyBoA8ul/ylYl0Y43dG3z4G/dtYwdwBm81JPMmZkNi/NDkw2hZ582fOCgy5aBuZiqoABk3u+QXtho3T5adqgUX6ZEX8Aq1GLNikuvallE9MAlp8lQL/od5W8MU+ljal7WnrEYQ4xgQ6SVsGLkPlVZUaIcr5Mhnuoho3m3qUrr6dI760QnJzQQAcraYpBXRh4+vyOYK7nLynjCTLsUKigk3gRt/zjXGcCHzVeFOzUXJoRVox41KNtV5t1YkQg7V0 MfXFXe3O eMNu3nmW4YZ2NqUcpmbU77c0+cozYOwcK5mDueDWgSfH0oolwXr6Q/UD5wr9oss4CO26AINewa9WZIwugFfUHS0Rd9oupUlwdjmMd 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. Signed-off-by: Rakie Kim Signed-off-by: Honggyu Kim Signed-off-by: Yunjeong Mun Reviewed-by: Oscar Salvador Reviewed-by: Joshua Hahn Reviewed-by: Gregory Price Acked-by: David Hildenbrand Signed-off-by: must always be that of the developer submitting the patch. --- mm/mempolicy.c | 106 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 83 insertions(+), 23 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 988575f29c53..9aa884107f4c 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_release(struct kobject *wi_kobj) @@ -3495,35 +3508,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 = NULL; - 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(struct iw_node_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; + 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); + kfree(new_attr); + kfree(name); + return 0; + } + wi_group->nattrs[nid] = new_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; + sysfs_attr_init(&wi_group->nattrs[nid]->kobj_attr.attr); + wi_group->nattrs[nid]->kobj_attr.attr.name = name; + wi_group->nattrs[nid]->kobj_attr.attr.mode = 0644; + wi_group->nattrs[nid]->kobj_attr.show = node_show; + wi_group->nattrs[nid]->kobj_attr.store = node_store; + wi_group->nattrs[nid]->nid = nid; + + ret = sysfs_create_file(&wi_group->wi_kobj, + &wi_group->nattrs[nid]->kobj_attr.attr); + if (ret) { + kfree(wi_group->nattrs[nid]->kobj_attr.attr.name); + kfree(wi_group->nattrs[nid]); + wi_group->nattrs[nid] = NULL; + pr_err("Failed to add attribute to weighted_interleave: %d\n", ret); } + mutex_unlock(&wi_group->kobj_lock); - wi_group->nattrs[nid] = node_attr; - return 0; + 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 [node%d]\n", nid); + break; + case MEM_OFFLINE: + sysfs_wi_node_delete(nid); + break; + } + + return NOTIFY_OK; } static int __init add_weighted_interleave_group(struct kobject *mempolicy_kobj) @@ -3534,13 +3589,17 @@ 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); @@ -3548,6 +3607,7 @@ static int __init add_weighted_interleave_group(struct kobject *mempolicy_kobj) } } + hotplug_memory_notifier(wi_node_notifier, DEFAULT_CALLBACK_PRI); return 0; err_del_kobj: