From patchwork Fri Apr 4 07:46:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14038179 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 441F9C3601E for ; Fri, 4 Apr 2025 07:46:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5AE7280004; Fri, 4 Apr 2025 03:46:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB3BA280001; Fri, 4 Apr 2025 03:46:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DED2280004; Fri, 4 Apr 2025 03:46:38 -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 71105280001 for ; Fri, 4 Apr 2025 03:46:38 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4564AC24AA for ; Fri, 4 Apr 2025 07:46:39 +0000 (UTC) X-FDA: 83295579318.15.032994B Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf19.hostedemail.com (Postfix) with ESMTP id 474EE1A0003 for ; Fri, 4 Apr 2025 07:46:37 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.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=1743752797; 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=5W1GBOOfUtgXX2/F43cSKnAPzgNnJsmu+qpzKa2S1Is=; b=3ixuNhnO0gKTvS/Mx7ud+bdFQuNBBHTM5QxqgtfMArWfDiTFVlvsKK4IoklTE5Zjs11+84 dc2mkuvQlP4vQmLYYzmGObVv2VN2DOZ7CTVgpkU7NwGxeaAO4Oc42wQDthTrCKnpMTQEAw C1m+XAtXW9NCTiwR8UvIrlAnrOwbP5I= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.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=1743752797; a=rsa-sha256; cv=none; b=GTNdN2gYm8O1A6itb2rJVbZDPc7NDNZP2yIDL4Di+zBDpeLRSIpVdwXBFg2lM19mzhEFyU bc9eOgXRI+cwBPr+0gOXaI4/6oZOmSVr+Pa5EyLlfAepnyppetn9cbkQvjRl4A57j73n3w VQKnoenUAZMo72PDYNNXGjpkRZPDoWQ= X-AuditID: a67dfc5b-681ff7000002311f-ca-67ef8e5a4971 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 v6 1/3] mm/mempolicy: Fix memory leaks in weighted interleave sysfs Date: Fri, 4 Apr 2025 16:46:19 +0900 Message-ID: <20250404074623.1179-2-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250404074623.1179-1-rakie.kim@sk.com> References: <20250404074623.1179-1-rakie.kim@sk.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRmVeSWpSXmKPExsXC9ZZnoW5U3/t0gzeLJC3mrF/DZjF96gVG i6/rfzFb/Lx7nN1i1cJrbBbHt85jtzg/6xSLxeVdc9gs7q35z2pxZlqRxeo1GQ7cHjtn3WX3 6G67zO7RcuQtq8fiPS+ZPDZ9msTucWLGbxaPnQ8tPd7vu8rmsfl0tcfnTXIBXFFcNimpOZll qUX6dglcGWcfTmIvOCZX0bPqCnsD41uJLkYODgkBE4ltP2W7GDnBzCWP2llAwmwCShLH9saA hEUEZCWm/j0PFObiYBZ4zCTx6PkLRpCEsECwxMQzW9lBbBYBVYnlr9rAbF6gOQ1LnjBDzNSU aLh0jwnE5hQwlfj98CSYLQRUs/rpEah6QYmTM5+wgNjMAvISzVtnM4MskxD4zCbxavZMJohB khIHV9xgmcDIPwtJzywkPQsYmVYxCmXmleUmZuaY6GVU5mVW6CXn525iBIb/sto/0TsYP10I PsQowMGoxMNrUfguXYg1say4MvcQowQHs5II792c9+lCvCmJlVWpRfnxRaU5qcWHGKU5WJTE eY2+lacICaQnlqRmp6YWpBbBZJk4OKUaGJfFpzHrlL/5XPjLg2FBttdtj8+in854z9resq7u yfO+Eyl2YjLXVx1+EDo1M61A8N6l399D5iszThAUuLKT8W5tkUOU7VbWw/tNmMx3Jtg5fOfU dj8q/8a82jt53eYm7k2Te3bqHb6bsnfVk/qphiIBXw8ZnDDf/+mcX2zFzgP67Fey3sq0rFZi Kc5INNRiLipOBACIZu2NewIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsXCNUNNSzeq7326wdP3XBZz1q9hs5g+9QKj xdf1v5gtft49zm7x+dlrZotVC6+xWRzfOo/d4vDck6wW52edYrG4vGsOm8W9Nf9ZLc5MK7I4 dO05q8XqNRkWv7etYHPg99g56y67R3fbZXaPliNvWT0W73nJ5LHp0yR2jxMzfrN47Hxo6fF+ 31U2j2+3PTwWv/jA5LH5dLXH501yATxRXDYpqTmZZalF+nYJXBlnH05iLzgmV9Gz6gp7A+Nb iS5GTg4JAROJJY/aWboYOTjYBJQkju2NAQmLCMhKTP17HijMxcEs8JhJ4tHzF4wgCWGBYImJ Z7ayg9gsAqoSy1+1gdm8QHMaljxhhpipKdFw6R4TiM0pYCrx++FJMFsIqGb10yNQ9YISJ2c+ YQGxmQXkJZq3zmaewMgzC0lqFpLUAkamVYwimXlluYmZOaZ6xdkZlXmZFXrJ+bmbGIFBv6z2 z8QdjF8uux9iFOBgVOLhtSh8ly7EmlhWXJl7iFGCg1lJhPduzvt0Id6UxMqq1KL8+KLSnNTi Q4zSHCxK4rxe4akJQgLpiSWp2ampBalFMFkmDk6pBsYGz8fOkRFqhrbsZqyBjQHpwbcMOkMW fs+wM1iUfa7Wx/71+R92+8oKNq+dXvPEteHpkZZ9zxbsWRr9+I9FdaTBy6xfh/2PSkQd7W05 defM1Tn5+z5Lpv0tWOL6K63kl9CJafclU7q2acmdeTv/xQ89l7nv5Ri2eZSXTSw8ZGRzVVD6 cu7aKaFKLMUZiYZazEXFiQDHMuWxdgIAAA== X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 474EE1A0003 X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: jbx8apzc9yqfyhaw7h9qpxshzh1wzsg1 X-HE-Tag: 1743752797-444172 X-HE-Meta: U2FsdGVkX1/+3zzfpTZos0V33AL2Z+rA+Soq4XHUqhk5kcJBbATdi8dE5xaxqnascd6kA/Rp50JI1CWofWi8F/XD2zjbsdJBzpTLhA23/sFmZYkLQqDSXUMdllr90M9gqIKkCb/7na3Nt/M4eiqRlPMbVOC9vOv4TxRSqTMWwXFc8y0cYSN9t+xZaHu1FFA8bkOSkhcox7e4uq1fCYnuQnqDWYF4wb5QgUMQQhPqVku+tVRBIZzz+jZnqck3OIhmN3Y8DjGNvABFK2MBKu7X2h+Fs/dBkrsLR8Y7ydlazOTU/mGzEpdgVMubsoctaxY7Tiox+H6gDAxj1RUs4qLlopukyuhiUN4/ugvtr3mX1jyNE51T4N+yDCGiRpqNle+Upv/1XdIsCprAecPv8//Sr5glQeQ2YTm4Y2FRbCr1ephS7ohVaA5h13YCWR7SXsC0b5y4cYpxUQng6WElX598BbDAS9EcFPOvnFZy3TGNlY8vSLE1ucrop8eYTmS2HW3F0t1H9ooTCBQv5FOKyn2y+CKHielzLMsM/FfheD44Jw0IjOhKn6yMD5QMxi7AhJ5B78cwgK6dXMfkFbzvRQ/mV+d/fEE1yu4DjxNU1kgJ8yplCzcU+KpcYw0TcbXhMwMoHkwbyP/BSHmZypVs9ZEl4nhOOeB9sv+/2al93QNhfr83AWtq8Mwo0cnd0a+uaS1cVD5FTcCey8TUuRAxhqDWZ+yMicYYCgILlHkSH/FGvLwPwyAqD3aPNZ0OEZy6bBXv2fO59gYQlneaPzvT2V4pMyk+DH0LNBi8sF0kX/joCfncU64I3faIROfS5HcLyMS7/xwbgjnXIrJm26WjuS/dJzn8DyuXHG3+1YVdjmdBbQUCyTAuozw62f9yydcxief4+AUh1xw6/77D7Nl0mVX1S8zSZ9c5ji0h+K9pVo3NpaV0CaReZIKj5iETknTKdkKAQcnzYzaw+E3RZbS/WDc hntt+ugk g9m7kdAaIMvmx0nRF0umepVazi4FlQxXat+QmfV0Z7HNQxn00URJUUaVWEUNL/9UgXWYc3aQOVd4bhNI9nBKkB+SIyhg0WgtW4bFhpcrmjmDqrcPr8VI2VY/TsxRRSGhR2qFZPV3A4wTSv2G8Bm58BIh2YoE5mdBiG7XK 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 --- mm/mempolicy.c | 64 +++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index bbaadbeeb291..af3753925573 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -3448,7 +3448,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 = { @@ -3494,15 +3496,22 @@ static int add_weighted_interleave_group(struct kobject *root_kobj) struct kobject *wi_kobj; int nid, err; - wi_kobj = kzalloc(sizeof(struct kobject), GFP_KERNEL); - if (!wi_kobj) + 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) { + err = -ENOMEM; + goto node_out; + } + err = kobject_init_and_add(wi_kobj, &wi_ktype, root_kobj, "weighted_interleave"); if (err) { - kfree(wi_kobj); - return err; + kobject_put(wi_kobj); + goto err_out; } for_each_node_state(nid, N_POSSIBLE) { @@ -3512,9 +3521,18 @@ static int add_weighted_interleave_group(struct kobject *root_kobj) break; } } - if (err) + if (err) { + kobject_del(wi_kobj); kobject_put(wi_kobj); + goto err_out; + } + return 0; + +node_out: + kfree(node_attrs); +err_out: + return err; } static void mempolicy_kobj_release(struct kobject *kobj) @@ -3528,7 +3546,6 @@ static void mempolicy_kobj_release(struct kobject *kobj) mutex_unlock(&iw_table_lock); synchronize_rcu(); kfree(old); - kfree(node_attrs); kfree(kobj); } @@ -3542,37 +3559,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_out; 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; - return err; -node_out: - kfree(node_attrs); -mempol_out: - kfree(mempolicy_kobj); + return 0; + +err_del: + kobject_del(mempolicy_kobj); err_out: - pr_err("failed to add mempolicy kobject to the system\n"); + kobject_put(mempolicy_kobj); return err; } From patchwork Fri Apr 4 07:46:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14038180 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 00418C36010 for ; Fri, 4 Apr 2025 07:46:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 763DC280005; Fri, 4 Apr 2025 03:46:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 67605280001; Fri, 4 Apr 2025 03:46:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C8F5280005; Fri, 4 Apr 2025 03:46:41 -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 31356280001 for ; Fri, 4 Apr 2025 03:46:41 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B7760ADED9 for ; Fri, 4 Apr 2025 07:46:41 +0000 (UTC) X-FDA: 83295579402.29.09C0884 Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf19.hostedemail.com (Postfix) with ESMTP id CB3261A000E for ; Fri, 4 Apr 2025 07:46:39 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.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=1743752800; 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=ejezUsIK19i+6DJDkw722EMxwAbCiAXODvyrDity0y8=; b=NJsTqWhGOsB0c7X0HhmeD+od70SYPot54PQ9+Sfr4nD0lCDOgu9q11CEc8GpLmZhh48la8 wOkVeKzw1/j1GABe59QKZLQT5gAeRhAOu0QQip2EO0sbOd7opTcteZKu2GaOk7BdFUvI0I 9tnXaVcoLN8zLJYPkqazMGSUj5K/xwk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.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=1743752800; a=rsa-sha256; cv=none; b=IRQwdn2BOda1GZ5VTulCteRXGqVwMSIvjMDAPNUXGtAUF5h0piLGS/661rHcMMZ5IWynh1 sJR6lOolX1EcnkEeiLpMvl4JITjIeNhwilYz/sJM5eE4zhbMJzINwBV8fYSH8wOQ+iPZQT l7doQke2rsmIBBy1hIK18wIlqYzE6jM= X-AuditID: a67dfc5b-681ff7000002311f-d0-67ef8e5ceb36 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 v6 2/3] mm/mempolicy: Prepare weighted interleave sysfs for memory hotplug Date: Fri, 4 Apr 2025 16:46:20 +0900 Message-ID: <20250404074623.1179-3-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250404074623.1179-1-rakie.kim@sk.com> References: <20250404074623.1179-1-rakie.kim@sk.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRmVeSWpSXmKPExsXC9ZZnoW5M3/t0gzeXVS3mrF/DZjF96gVG i6/rfzFb/Lx7nN1i1cJrbBbHt85jtzg/6xSLxeVdc9gs7q35z2pxZlqRxeo1GQ7cHjtn3WX3 6G67zO7RcuQtq8fiPS+ZPDZ9msTucWLGbxaPnQ8tPd7vu8rmsfl0tcfnTXIBXFFcNimpOZll qUX6dglcGff2H2QqeKFWcejmG8YGxm/yXYycHBICJhJ7pt9jhLFbV50Fsjk42ASUJI7tjQEJ iwjISkz9e56li5GLg1ngMZPEo+cvwGqEBaIkni1WBalhEVCVOLr+GhuIzQs0ZtryOSwQIzUl Gi7dYwKxOQVMJX4/PAlmCwHVrH56hB2iXlDi5MwnYPXMAvISzVtnM4PskhD4zCYx/+5ZqEGS EgdX3GCZwMg/C0nPLCQ9CxiZVjEKZeaV5SZm5pjoZVTmZVboJefnbmIEhv+y2j/ROxg/XQg+ xCjAwajEw2tR+C5diDWxrLgy9xCjBAezkgjv3Zz36UK8KYmVValF+fFFpTmpxYcYpTlYlMR5 jb6VpwgJpCeWpGanphakFsFkmTg4pRoY2wLnmyZ+n28i/CLDI+72odeVqs9Zlizb4Wxtcmaz 2Mu1eT9PdpsGHb1RWjh17Up7F+6NTWkS3dvWzcku2C3wWTJ9+a9nAVNum25W+8W3ZVpUVprO reN1nnZXdFmljddVFLaf1Uh+PGl2Fadzd0GT6U63fUlT1l11PxYxjaF+SfEG24vHCj5/U2Ip zkg01GIuKk4EABrSeI57AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsXCNUNNSzem7326wa21UhZz1q9hs5g+9QKj xdf1v5gtft49zm7x+dlrZotVC6+xWRzfOo/d4vDck6wW52edYrG4vGsOm8W9Nf9ZLc5MK7I4 dO05q8XqNRkWv7etYHPg99g56y67R3fbZXaPliNvWT0W73nJ5LHp0yR2jxMzfrN47Hxo6fF+ 31U2j2+3PTwWv/jA5LH5dLXH501yATxRXDYpqTmZZalF+nYJXBn39h9kKnihVnHo5hvGBsZv 8l2MnBwSAiYSravOMnYxcnCwCShJHNsbAxIWEZCVmPr3PEsXIxcHs8BjJolHz1+A1QgLREk8 W6wKUsMioCpxdP01NhCbF2jMtOVzWCBGako0XLrHBGJzCphK/H54EswWAqpZ/fQIO0S9oMTJ mU/A6pkF5CWat85mnsDIMwtJahaS1AJGplWMIpl5ZbmJmTmmesXZGZV5mRV6yfm5mxiBIb+s 9s/EHYxfLrsfYhTgYFTi4bUofJcuxJpYVlyZe4hRgoNZSYT3bs77dCHelMTKqtSi/Pii0pzU 4kOM0hwsSuK8XuGpCUIC6YklqdmpqQWpRTBZJg5OqQbGjpDJARse9C59wZ8tkmQXtMORLeLu 9cieiW2LTWaaGFyZ4bUxm0n0o+aKY6KLn584apRuYhi6f9eCpaIVEfUxu4tntS2dHvBVSfQC Z2LcRv5s9b3pX0vmqE7oVva7GV95XHWis03oJeH0/iOiawokT63KXXpvEVeh0fptTwokHN7P Odxla2OpxFKckWioxVxUnAgAjwN6gnUCAAA= X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: CB3261A000E X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: urnykm8d1e6t5xon1g6yo53e3odywgny X-HE-Tag: 1743752799-169515 X-HE-Meta: U2FsdGVkX19JUCfykUEOtqF2gZRdwkJFlymYDOpQ6xkaGQhzx7BlAIYyRbEcKNnP652i9+B077jtVlsB+gaAV+pyGg6dSwrouHYFZK4NNcaJKT/03YZebN+PU6l1VkMk33EylggAt5UNTnrBD1UUyJFBXgPsXolyVFnOtSjnSRi+tJnrV0xE36Rg1NEoYdLy6L0l3Mtp9IhGTzRXmN6TNVEqIEnqztl1HiM2A/5Srrs784jboPVWICM3asjqg+zJ31AyK9eWKM9Rpk8k4yqCT+PdiL141DPlZnGHeyhREcq+L6x6H3o3rqmStxDWSZiVagSJiYyn2Ek4bI5wYSavrmvFwseHpQ2WNSNzTH+0UkZDtcIIiwKAjHW+hxw3CcqpK3tFg/fyKMea2AxGSQ0AL5CMzDsyaPeKb0U69LaUEuxWZuiQosiPIarmRrtusmib1kj2mgbjJHhpsj9ctRPA+P4TfC+pxQ6rxrurdmtfaOEC/vNC5L+iR9j/zX1M2g0NZNC74PA+eEFsLDSPCTtTmJvbasQo/qqpb/TyTjlUEJS9gwAk5GWar37cnP0mXd3Ec7IpJ5+vxIQYOa96cjGVvAT0jUtQWVY0cYLSlrCvjnsx025PGyo6dtXznLnpq9tNoTzZSP4UFMUQXF1/YZn+VFZUkQGiSbKQ+RSpxWnD+W33EyvOHUswP2rlYlRPL2RzvbCmJALh7eEZZ6jtGzLOWWSxZqcjwKOQnu1tXKHjstmJQOquz+ov5mr72aXZZYX0R5v/EDwUe7+zvypItNvvm+JsNYzLcdPU63mS1ORNBRTIIWYkQCenonaG+TIt5GO+iJceFTMyrOgxRR+sbbx1MGWcV+JMkt9zoi2aDYrJ0QDsgtjLaYwaQy/E0MrGBxfr2iz2MUj+5PqKwuzSCAPM52mnUZXddsoNKxbk3nwM0KmTIU0zYyX07jMw5e26heHJFjbzbSeupTzdhpc8b0R lAwkrqqH S8SknHzm08igKmPjSZ3z++/7A2Eu+g0LxNLwcARiPC6f/cAFsJ8B+07g02WCCioRWnNDzmN46u34LxOX2byWFJ2Cag8TU+SVVsFeEvlUqsQgBfsbkuXBtu7CmdP01GrHJoSWEIAGMpOa3+hMb6eT7ahbOc7XMSXhMPr3Z 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 --- mm/mempolicy.c | 73 ++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 41 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index af3753925573..73a9405ff352 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -3388,6 +3388,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) { @@ -3430,27 +3437,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 = { @@ -3458,7 +3462,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; @@ -3480,58 +3484,45 @@ 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 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) { - err = -ENOMEM; - goto node_out; - } - - 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) { - kobject_put(wi_kobj); + if (err) goto err_out; - } 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); - break; + goto err_del; } } - if (err) { - kobject_del(wi_kobj); - kobject_put(wi_kobj); - goto err_out; - } return 0; -node_out: - kfree(node_attrs); +err_del: + kobject_del(&wi_group->wi_kobj); err_out: + kobject_put(&wi_group->wi_kobj); return err; } From patchwork Fri Apr 4 07:46:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14038181 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 3A055C3601B for ; Fri, 4 Apr 2025 07:46:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FFFB280007; Fri, 4 Apr 2025 03:46:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9AFB8280001; Fri, 4 Apr 2025 03:46:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 73E72280007; Fri, 4 Apr 2025 03:46:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 5C1D1280001 for ; Fri, 4 Apr 2025 03:46:43 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 090F3C24CC for ; Fri, 4 Apr 2025 07:46:44 +0000 (UTC) X-FDA: 83295579528.04.7BFE71D Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf19.hostedemail.com (Postfix) with ESMTP id 163C11A0006 for ; Fri, 4 Apr 2025 07:46:41 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.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=1743752802; 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=T5szzg/qIXsHMbweI/jslB1sbCz5aBCFl+FBrGCs8Dw=; b=vhpSGfqZmIw79m9o/dYnnw71gZJSC0lAZz9HeRd5LwxomM0ez5c3NkC+cIwtDGEATaBvkQ fnLA97xjvs1BA917B+Veu8mkw6NN7o7/yIlN8ZlNLIZ4Q0H/OJJnDsZYBnKcWHsgMtWXrr uh8uWzAZ2C8E47otj2IXBBHzN9CWWh4= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.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=1743752802; a=rsa-sha256; cv=none; b=sJareOLsI9jKWEKJqAo1foSx2H1AIG/+Rk/A8RkwWlsRDh9Hdav0Lm1v8ODxbXHLAXHvog aUMrtY8aLvlGrOlAsZAtIH0TQE0Yt80khW3bwG+1JvDoKYOJr7wM+U1SQOcwHyS67fhHID aRXtmbY2L5mBaRpq9p8Th5l+am9dHuE= X-AuditID: a67dfc5b-681ff7000002311f-dc-67ef8e5e12db 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 v6 3/3] mm/mempolicy: Support memory hotplug in weighted interleave Date: Fri, 4 Apr 2025 16:46:21 +0900 Message-ID: <20250404074623.1179-4-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250404074623.1179-1-rakie.kim@sk.com> References: <20250404074623.1179-1-rakie.kim@sk.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRmVeSWpSXmKPExsXC9ZZnoW5c3/t0g99TjSzmrF/DZjF96gVG i6/rfzFb/Lx7nN1i1cJrbBbHt85jtzg/6xSLxeVdc9gs7q35z2pxZlqRxeo1GQ7cHjtn3WX3 6G67zO7RcuQtq8fiPS+ZPDZ9msTucWLGbxaPnQ8tPd7vu8rmsfl0tcfnTXIBXFFcNimpOZll qUX6dglcGSuW/GUruGpU8fzcKvYGxm+aXYycHBICJhKda5exwdhrGyYD2RwcbAJKEsf2xoCE RQRkJab+Pc/SxcjFwSzwmEni0fMXjCAJYYFgiZkHX7OD2CwCqhJPJp5jArF5gebcfnKIHWKm pkTDpXtgcU4BU4nfD0+C2UJANaufHmGHqBeUODnzCQuIzSwgL9G8dTYzyDIJge9sEn92rmKC GCQpcXDFDZYJjPyzkPTMQtKzgJFpFaNQZl5ZbmJmjoleRmVeZoVecn7uJkZgBCyr/RO9g/HT heBDjAIcjEo8vBaF79KFWBPLiitzDzFKcDArifDezXmfLsSbklhZlVqUH19UmpNafIhRmoNF SZzX6Ft5ipBAemJJanZqakFqEUyWiYNTqoFxzco/614ETW7TknFvXTW5eJ5WuFSt8/+/wpsX LTXbpPevgGsX2xbXtC2cxlGLNfy+3VW6cbhx7XrGZbeq58zMmPMkR9bFszi5YLOTCJfK08sx PrcXtTw6Nm0mzxG5FD/WKcvfpB4027zguMNiiawgyXtx72ZlTmneMc1k1n2JOekHeDZ1Z/cs V2Ipzkg01GIuKk4EACbiurV8AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsXCNUNNSzeu7326wZYnWhZz1q9hs5g+9QKj xdf1v5gtft49zm7x+dlrZotVC6+xWRzfOo/d4vDck6wW52edYrG4vGsOm8W9Nf9ZLc5MK7I4 dO05q8XqNRkWv7etYHPg99g56y67R3fbZXaPliNvWT0W73nJ5LHp0yR2jxMzfrN47Hxo6fF+ 31U2j2+3PTwWv/jA5LH5dLXH501yATxRXDYpqTmZZalF+nYJXBkrlvxlK7hqVPH83Cr2BsZv ml2MnBwSAiYSaxsms3UxcnCwCShJHNsbAxIWEZCVmPr3PEsXIxcHs8BjJolHz18wgiSEBYIl Zh58zQ5iswioSjyZeI4JxOYFmnP7ySF2iJmaEg2X7oHFOQVMJX4/PAlmCwHVrH56hB2iXlDi 5MwnLCA2s4C8RPPW2cwTGHlmIUnNQpJawMi0ilEkM68sNzEzx1SvODujMi+zQi85P3cTIzDo l9X+mbiD8ctl90OMAhyMSjy8FoXv0oVYE8uKK3MPMUpwMCuJ8N7NeZ8uxJuSWFmVWpQfX1Sa k1p8iFGag0VJnNcrPDVBSCA9sSQ1OzW1ILUIJsvEwSnVwLj9sOLJqaY5x54umx/58Ivbm6U/ p3mInFM4myGiMavO483KR8Evl0dNuVuUbFK7aaWpwLJ/izwnvrAzuzn/1rGsGZIb3jhELVvv lHCcWTsy5sHabYJfFNesm7rVesWGtUzLJQMaJVVcP/fHV+3S/i5hwtVnrhhe4qZafrx7ZW21 191/ndaBfyYqsRRnJBpqMRcVJwIA9wOrCnYCAAA= X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 163C11A0006 X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: b1k3mjmq95f97bqw3gkn1ycrqxn5cmje X-HE-Tag: 1743752801-333429 X-HE-Meta: U2FsdGVkX18B+O1K7KipU/RlnfosIkcwG0Ai9pVKv107AIyBxOPhnr1rKoD7FORaymhb8g+nf1rPdMPQG/8RfvB5f/sheG/iwd75sFcjYY8v+QDcaDvDRG7iG88dAdx37z0gLJqD7VPji9irwnrP5BSBge5abKQ5BxOANGcWZQ9/6jw9oMxi2Z1reWVKwwbsg3uwMbDDJ2BMCWcsWX/euc5iG2y0yvZmZ0VnlOrZhH8n73GeBcZL7J1BvKv5ZLXOiDfAWE1BV1XdWI5SyY13ZF9QkB0OawZ6eQ3ZQCmI0/gG3IZx6IL7nGnjZ7KSJlgsJpyz+/ftoax4BgHsjq0r1tjQQ7hN+Cewyh9ZUDYa8waigqhYws2EN/yk8GNPHAP1iAh4fHSbeRDyTOJBIOnJmCWx9j7mFVW0aFf20WNDeyo6s2tbHg5afzjNOXn5sv5OZnSGNDs5YPaQ18TCL6R2l85Ky4oevMzzcF0fBd3yLKLwVZGvTeWaI8PsUS4VQrJFaImxW9f6wYenGUS3DkmuQwmhSC2M7JkMpzWQ+LtzJ93xHRNKrh2LAPq+QEQRXf3FLk5U90J9xVLjxQaTYHxY7p0kTXwMsMO3682OPus5EzJd+dzOdaxzojt1mb/zsJ2lMhdpZWxWdM7oaGw0HIlr/Al/f/asRr8vKgelUkeIvk/hxAcWwybbk6QBBsOq/iY7vEKK/uRe3MyRQ/uVATKZr+D4ZABfEefetIDut34IAfxtZLqZtraBvEJsMsYROfULgjcmPnV002rMaJUou2VVD6XHk4YRC3sPrWjq66MKugNwrrrnQYBmQoVf5j8R99DcgqUr2JoBSd16ucPLudBaawl4TgD0mBCgju0913+o1JHnxVcl7Kw9Bj1lZpMvPm5/qk7nqzJxGAAHBqlTWHUGFU0km+ElKNQGdZKX/zmiovh/HpY6UkTshM/bADKdkPcFCB8fYe7XArKeSFgq9lL vlaH4dGt 3ZNl0qQroGY2GoliCUpyXuVg2PkvzbxcQXs1KNPhbsnoeidEZEencB/L7pES/unfhlR1FuVuGtFVBk91/UFqA9R4OwoWza/v9Ahlw 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 --- mm/mempolicy.c | 109 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 23 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 73a9405ff352..f25c2c7f8fcf 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -113,6 +113,7 @@ #include #include #include +#include #include "internal.h" @@ -3390,6 +3391,7 @@ struct iw_node_attr { struct sysfs_wi_group { struct kobject wi_kobj; + struct mutex kobj_lock; struct iw_node_attr *nattrs[]; }; @@ -3439,13 +3441,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) @@ -3464,35 +3477,80 @@ 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) + goto notifier_end; + + switch(action) { + case MEM_ONLINE: + err = sysfs_wi_node_add(nid); + if (err) { + pr_err("failed to add sysfs [node%d]\n", nid); + return NOTIFY_BAD; + } + break; + case MEM_OFFLINE: + sysfs_wi_node_delete(nid); + break; + } + +notifier_end: + return NOTIFY_OK; } static int add_weighted_interleave_group(struct kobject *mempolicy_kobj) @@ -3503,13 +3561,17 @@ static int 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_out; - 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); @@ -3517,6 +3579,7 @@ static int add_weighted_interleave_group(struct kobject *mempolicy_kobj) } } + hotplug_memory_notifier(wi_node_notifier, DEFAULT_CALLBACK_PRI); return 0; err_del: