From patchwork Thu Mar 20 04:17:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14023425 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 851FBC36002 for ; Thu, 20 Mar 2025 04:18:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B4CE2280003; Thu, 20 Mar 2025 00:18:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AD693280001; Thu, 20 Mar 2025 00:18:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92C84280003; Thu, 20 Mar 2025 00:18:24 -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 72277280001 for ; Thu, 20 Mar 2025 00:18:24 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 28536C0B0D for ; Thu, 20 Mar 2025 04:18:24 +0000 (UTC) X-FDA: 83240622528.13.6ECC85C Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by imf09.hostedemail.com (Postfix) with ESMTP id 35495140003 for ; Thu, 20 Mar 2025 04:18:21 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of rakie.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=rakie.kim@sk.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742444302; 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=zT4W5Dbd2RWm0kBcC7+bBifHXePmvOmjGZkTn0uTGzs=; b=Cgyprej5qvDbFBSGL59ixXVGqYIDAEZ7QidsO0owNekvpeR3MNPNiLAk8L8QlE2GIQK3/U ns3qYTEbGr7Qf6zp5ac8f7ityZXJfhw6JGD0oq8MJAZuMdwLahr3sjeKmz7BsjUlWo/CXp uug80Dd7SX7+LT81/d4alSFfrSut29A= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742444302; a=rsa-sha256; cv=none; b=fHFodU3P03q2S1FxHktptbq3syGoZ6kutIzbRByG6QIiWmpH8BOFphsomjeVrlEQRV3RZX z6dIhy2zk2IVYSpqkv2Orvyt0GvkqRTfyt66KVvCwyNrtgrsIcDwAokXOLqfy2yAzkF67x 6JhvWlUaacs3ltdqNP1oYi5QfF4hx0Q= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of rakie.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=rakie.kim@sk.com; dmarc=none X-AuditID: a67dfc5b-681ff7000002311f-3c-67db9707c9b5 From: Rakie Kim To: gourry@gourry.net Cc: akpm@linux-foundation.org, 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, kernel_team@skhynix.com, honggyu.kim@sk.com, yunjeong.mun@sk.com, rakie.kim@sk.com Subject: [PATCH v3 1/3] mm/mempolicy: Fix memory leaks in weighted interleave sysfs Date: Thu, 20 Mar 2025 13:17:46 +0900 Message-ID: <20250320041749.881-2-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250320041749.881-1-rakie.kim@sk.com> References: <20250320041749.881-1-rakie.kim@sk.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRmVeSWpSXmKPExsXC9ZZnoS779NvpBi9PWlnMWb+GzWL61AuM Fl/X/2K2+Hn3OLvFqoXX2CyOb53HbnF+1ikWi8u75rBZ3Fvzn9Vi9ZoMBy6PnbPusnt0t11m 92g58pbVY/Gel0wemz5NYvc4MeM3i8fOh5Ye7/ddZfP4vEkugDOKyyYlNSezLLVI3y6BK2Pb 4wbGgo/SFb27WpkaGI+LdTFyckgImEhMWHWQEcZ+u28iexcjBwebgJLEsb0xIGERAVGJeUdn s3QxcnEwC1xjkjjw+SYLSEJYIFjix8LjbCA2i4CqxOyXp8DivALGEuvm3GeGmKkp0XDpHhOI zQk0f8rV+Wwg84WAat6e44UoF5Q4OfMJWCuzgLxE89bZzCC7JARes0nsfnSKFWKOpMTBFTdY JjDyz0LSMwtJzwJGplWMQpl5ZbmJmTkmehmVeZkVesn5uZsYgeG+rPZP9A7GTxeCDzEKcDAq 8fC+uHIrXYg1say4MvcQowQHs5IIr0jH7XQh3pTEyqrUovz4otKc1OJDjNIcLErivEbfylOE BNITS1KzU1MLUotgskwcnFINjDMZd32LztdzXGq/evN//bCULVuiv24tivkTLHinKO/wud9L WnJfiedcXX2Rs25bXx/Db78b1r8eLV5iEpRpacx51lFL9rt91zxDl01rIi+3qm96pn3xfVhm 2osTfBs/tOQ43nvgYyTBmrFEwc+7a+Ylbjf2TZIrXDxrWu+u3HGnrfynusixJUosxRmJhlrM RcWJAAhuJmRzAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsXCNUNNS5d9+u10gx1v9SzmrF/DZjF96gVG i6/rfzFb/Lx7nN3i87PXzBarFl5jszi+dR67xeG5J1ktzs86xWJxedccNot7a/6zWhy69pzV YvWaDIvf21awOfB57Jx1l92ju+0yu0fLkbesHov3vGTy2PRpErvHiRm/WTx2PrT0eL/vKpvH t9seHotffGDy+LxJLoA7issmJTUnsyy1SN8ugStj2+MGxoKP0hW9u1qZGhiPi3UxcnJICJhI vN03kb2LkYODTUBJ4tjeGJCwiICoxLyjs1m6GLk4mAWuMUkc+HyTBSQhLBAs8WPhcTYQm0VA VWL2y1NgcV4BY4l1c+4zQ8zUlGi4dI8JxOYEmj/l6nw2kPlCQDVvz/FClAtKnJz5BKyVWUBe onnrbOYJjDyzkKRmIUktYGRaxSiSmVeWm5iZY6pXnJ1RmZdZoZecn7uJERjiy2r/TNzB+OWy +yFGAQ5GJR7eF1dupQuxJpYVV+YeYpTgYFYS4RXpuJ0uxJuSWFmVWpQfX1Sak1p8iFGag0VJ nNcrPDVBSCA9sSQ1OzW1ILUIJsvEwSnVwLjHLqztw+xfDgo/PkWITHu4b8XHgseZyovv26S/ qXm2RI67xeG27jObZaL+nRWPLujmb3X/nmi+rWvXy2SjR7KpfZ5Pnpq8PiC80/z3kSetPDcd lk51nTwvySGlfOlR1dtT3E32dH+4MmVZ3LRKs1M7Yie8u2dd6rokb8/co6Hp9X/m3zB+x9uj xFKckWioxVxUnAgARxErfG0CAAA= X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 35495140003 X-Stat-Signature: 8u6c5qd3skz5f3s1tirt3fy9zfd4irma X-HE-Tag: 1742444301-243447 X-HE-Meta: U2FsdGVkX1/n8263vtQpebiw+1/+5kGlHkI9Arjuf8QWd1LQBnsVqK7PXm1MJTLA3/f4hNVq6Nk1+5Nu5Z9ZuuVhMtxwe+BA+titYdMp+fwoYHtPqMk238hMLB1Pb0lKE+JHTKPQt5qfOuW+kQexKBppiBOjhSsXxEnORVnup+vtaE724vik13A2nu7ONjK5wPmx46AITWod2dWCUBvYoMb8Fz8nzh4XBZg3VSD3i/hpRVKyC8dDhJDzF+zw/aoceCWRah//HzTLT94VNg6Vy/Urxl+z1yxNZzoEUp6VCvZTaUoplbKyDkLO+N9xV+ugDDNL/8mvnYXNLx3Dv1GtI3sQbDBFNflFQEyGeoHT211Zqp/uS2MBplpCiHkuzMRVOdyiXEzWpt6CDSp01yrPfC4WeUn/bVIhEfCgX6ox7EGNfFeVfOUkziof2Prrq15gpNsc2qn927Hx9WSMfPr2gv5V/bUgsyblf6wEotzMQDO3+rI4UjW885YHMN2NbTsgJu1DHRZunzeNuonLNHuh2vdPX1zEiC5fM6+3putL5WjIuYV0/K47jcfjQbYGRYTg5xRbt8YpD/cxzr6YEIlymwSeMUF6Sv324pQsS+t1aGloRBCVe5r8KczoW4NxviABg7uSXsyovJ0AHD8v/A9tYeuspB3hDLFxt8QqDbgSBsNT4tbbfF26sctBZm8WLni+zfL8XbhvJO5uKsXdm/ttLCSe3cV4r7sMRjMNZpfU7mBVih/BUYC0sSHisP6j4Azh7E4R8Ed3ICCBmWRPoaFrCsim429FP3c/IFe9UEeZtjA+3nOVtrDxSBEojF9m4GM1lbTmLbz3PlRjGnXuiuv6lblJyPuEa98x80wYZPD11RZ8Dz5/vZz3MFZY+DiqDoZG2uMNTSUOG3TPJyqrhtv/B9TB/itHucobzYbKl/Zt7JFMM0ogkNYNhN8w8UCFmOdlqLUPDZLQWHZtgE4+xzp hmGArgwT Rz4Va75vNMm72waIt9dBZ+vDta7RvCT8B8003THHmCqkIg73ix9NS9IIhRZAj6PYsGZv5Cq/llsv3nCRaKjqueMD47dJkBags2SV7 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 `kobject_put()`, ensuring proper cleanup and preventing memory leaks. By correctly using `kobject_put()`, the release function now properly deallocates memory without causing resource leaks, thereby improving system stability. Fixes: dce41f5ae253 ("mm/mempolicy: implement the sysfs-based weighted_interleave interface") Signed-off-by: Rakie Kim --- mm/mempolicy.c | 61 +++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) base-commit: 4701f33a10702d5fc577c32434eb62adde0a1ae1 diff --git a/mm/mempolicy.c b/mm/mempolicy.c index bbaadbeeb291..5950d5d5b85e 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,17 @@ static int add_weighted_interleave_group(struct kobject *root_kobj) break; } } - if (err) + if (err) { 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 +3545,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 +3558,22 @@ 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_out; + + 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"); + kobject_put(mempolicy_kobj); return err; } From patchwork Thu Mar 20 04:17:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14023426 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 B062EC35FFF for ; Thu, 20 Mar 2025 04:18:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 214A8280005; Thu, 20 Mar 2025 00:18:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A022280001; Thu, 20 Mar 2025 00:18:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE719280005; Thu, 20 Mar 2025 00:18:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id CC1F8280001 for ; Thu, 20 Mar 2025 00:18:26 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A4C04AA6FF for ; Thu, 20 Mar 2025 04:18:26 +0000 (UTC) X-FDA: 83240622612.26.45C237A Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by imf09.hostedemail.com (Postfix) with ESMTP id AE5E3140003 for ; Thu, 20 Mar 2025 04:18:24 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of rakie.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=rakie.kim@sk.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742444305; 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=0yZ6zUR1si55OkrVK0kqns6YfXQrRjP9untEWK8vrmY=; b=p/Yp42drMEmQ8grv9F/GmSXfosITgnuLj/nZm+ztUq/dsvbreEZwgw89ubOilk0hNuSYbJ rd/rZLa4HRVDP81EsrDQKEyeWIlnIqswO677YS0ezg8psdSEPu7dRnfuCfbhUp4DcmDolq MRReGxMav/KU+azQ0Vpe+HuZLfIX740= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742444305; a=rsa-sha256; cv=none; b=YMONLW6zyE4JtpPNBsf0iSzlhGDT5p9w7JgiKzOOWtRZ8l9E8vuu9MGRGhgaNskPsFsxwR ET2fv9LbNNkcBtIcS0J26KLeFotjN60ucJMR24sKu8Z+x6BxVlMH+wkYlKV5oPVaLovZ61 4Up/UugrKsHf5GKaeeHwsY7SBMzg09U= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of rakie.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=rakie.kim@sk.com; dmarc=none X-AuditID: a67dfc5b-681ff7000002311f-41-67db970a4ef9 From: Rakie Kim To: gourry@gourry.net Cc: akpm@linux-foundation.org, 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, kernel_team@skhynix.com, honggyu.kim@sk.com, yunjeong.mun@sk.com, rakie.kim@sk.com Subject: [PATCH v3 2/3] mm/mempolicy: Support dynamic sysfs updates for weighted interleave Date: Thu, 20 Mar 2025 13:17:47 +0900 Message-ID: <20250320041749.881-3-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250320041749.881-1-rakie.kim@sk.com> References: <20250320041749.881-1-rakie.kim@sk.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRmVeSWpSXmKPExsXC9ZZnoS7X9NvpBudncFnMWb+GzWL61AuM Fl/X/2K2+Hn3OLvFqoXX2CyOb53HbnF+1ikWi8u75rBZ3Fvzn9Vi9ZoMBy6PnbPusnt0t11m 92g58pbVY/Gel0wemz5NYvc4MeM3i8fOh5Ye7/ddZfP4vEkugDOKyyYlNSezLLVI3y6BK2P+ 1XnsBf8UKrZMPc3SwPhIqouRk0NCwETi8JRb7DD2yeM9jF2MHBxsAkoSx/bGgIRFBEQl5h2d zdLFyMXBLHCNSeLA55ssIAlhgWiJPW/2g9ksAqoSk3/eZQaxeQWMJda/OsYMMVNTouHSPSYQ mxNo/pSr89lA5gsB1bw9xwtRLihxcuYTsDHMAvISzVtnM4PskhB4zSbRfXouG8QcSYmDK26w TGDkn4WkZxaSngWMTKsYhTLzynITM3NM9DIq8zIr9JLzczcxAsN9We2f6B2Mny4EH2IU4GBU 4uF9ceVWuhBrYllxZe4hRgkOZiURXpGO2+lCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeY2+lacI CaQnlqRmp6YWpBbBZJk4OKUaGN2eiqgLWJ0/t2T5iUZ7//uWmYUm4TMUeWLja6oDFQp5Yyx3 Pr44XYDxcNBf3XvPAss//Ppo+m31pmf57t7l3PKdtwPCb0QuVl+6Z1tRQ11qMNeJ/Ze4f19K 66o4+m6Ts82CzzxPJ7lc/fLU7C1DS7L3K+OJd724zDoOmc+4xK/NbSKec3JWlxJLcUaioRZz UXEiAJziUDpzAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsXCNUNNS5dr+u10g91nGS3mrF/DZjF96gVG i6/rfzFb/Lx7nN3i87PXzBarFl5jszi+dR67xeG5J1ktzs86xWJxedccNot7a/6zWhy69pzV YvWaDIvf21awOfB57Jx1l92ju+0yu0fLkbesHov3vGTy2PRpErvHiRm/WTx2PrT0eL/vKpvH t9seHotffGDy+LxJLoA7issmJTUnsyy1SN8ugStj/tV57AX/FCq2TD3N0sD4SKqLkZNDQsBE 4uTxHsYuRg4ONgEliWN7Y0DCIgKiEvOOzmbpYuTiYBa4xiRx4PNNFpCEsEC0xJ43+8FsFgFV ick/7zKD2LwCxhLrXx1jhpipKdFw6R4TiM0JNH/K1flsIPOFgGrenuOFKBeUODnzCdgYZgF5 ieats5knMPLMQpKahSS1gJFpFaNIZl5ZbmJmjqlecXZGZV5mhV5yfu4mRmCIL6v9M3EH45fL 7ocYBTgYlXh4X1y5lS7EmlhWXJl7iFGCg1lJhFek43a6EG9KYmVValF+fFFpTmrxIUZpDhYl cV6v8NQEIYH0xJLU7NTUgtQimCwTB6dUA+M10V1rc5dJW8UqlemXuE/jT3BacOIsS+DWxLBt kTba9zY2m3h4rU/hL5l3jfdc9FQN5V/3mnbclr/CLXCulHXVzeJbkyduTHYvWJSy9kPPl5tR Qc/XpFxYv2nmN+GSQ88VZlevl3+9dXdbl77UXLkpZuWx+mWLQh7vPnfIird8W8m38pcxBvJK LMUZiYZazEXFiQCZ0tl5bQIAAA== X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: AE5E3140003 X-Stat-Signature: dq97cfpjbxgipba5suw9qg846tdkzc1h X-HE-Tag: 1742444304-395372 X-HE-Meta: U2FsdGVkX18RCJtKuQrTHtIuwMgVpGm/xOE3oHQWuqdfIhj/SS/oXNyEMV+4qGTxv0Or33ScxvsTE9w51n7T+7lL/Cek4NUYeO+YOXZNRsBxXk3t5LVji3m2gP0oEe5odQESjUfBXqHftfBF3KOQLvHraDgmsaJoQtiJD4/6XARhn0HSwyoKDsv3FYViOa+SlBv5tSbCB+oycnqfLsni3/nQRLT0lRvoRt+uWfucMArrtDRaBBhwCi0d32ih487H+LDjENaJKeUDrOAwi07mckWWZ4UpQ/3C0+9z5n6lIcTDigT/gqgQyUpE3QIAKVO1I/Q2hMUDKNYyVXJRwEvImM9HtWg5RnMkP8AtFUJOhzlq3CmiLrWOjt0zkUlz+Vo4M3BypXMjtMh/pQ6syFMmCdui+P0M04+i01b6cRDBi4cFO5mtWPkYQsXx0AJ9+kMtXFVImpw/UWTSQzob0zX3Zk2omIsmBn1ae+azonskNTPfW2HBRRm609BkJhcGT1K3WbztJHWj1Luj277FRnekrPAGFKTRPkNzEBByOYr7hPUmo3Jj2n/xiM+iiVcdy3xIplE4iZUpt6K9Vc0QbLN09nh6uhZP7x9ZOqzQGsPIlwPRMrNXIdGj46nYBV4aujfOIwWLgzxiiMB0Yh73F8Lm6W8Gaj3u8GbgSElE+goDUGluRXnTxUc2yjVmLWzqG5x9EkSCyaSRYjQZuL29tnZBxgFSqfwFNafFnjj64prAX8n5e+juFwaP0vz5fuOcOCCuvBGJPnM+6j1NX850vhG6ZG3Dgasv/G5fIuKslJaLDqLzt+hOtl/21Ugob1WJkZxzvBeIHeVM7fpdNmZxH0Tuy/eF9hD/iJUOhWUfV30w0PdGg7q+rq8BSqD0KVADRX2qNAGbmVkxpAnXl5uAdcF3AqHJEJV8UkC8grXADo24a52qX8w6YLfCfiEarXEZWMP94j/kpJAyo7mYr1RyvXf /fu2zjsJ ju4ffZCL5JvmCGXALNUrIZgZrI2IdV3E6hrwfnFTR2T4/PrNe7Pqb9heH1f7Sa2SkgRoWAjT6/9rixO9Z5vUkAfkJu80tTVXtxCkx 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, preventing dynamic updates when nodes were added or removed. This patch restructures the weighted interleave sysfs to support dynamic insertion and deletion. The sysfs that was part of the 'weighted_interleave_group' is now globally accessible, allowing external access to that sysfs. With this change, sysfs management for weighted interleave is more flexible, supporting hotplug events and runtime updates more effectively. Signed-off-by: Rakie Kim --- mm/mempolicy.c | 70 ++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 5950d5d5b85e..6c8843114afd 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 *sgrp; + static ssize_t node_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { @@ -3430,27 +3437,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_release(struct iw_node_attr *node_attr, - struct kobject *parent) +static void sysfs_wi_node_release(int nid) { - if (!node_attr) + if (!sgrp->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(&sgrp->wi_kobj, &sgrp->nattrs[nid]->kobj_attr.attr); + kfree(sgrp->nattrs[nid]->kobj_attr.attr.name); + kfree(sgrp->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_release(nid); + kfree(sgrp); } static const struct kobj_type wi_ktype = { @@ -3458,7 +3461,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,57 +3483,44 @@ 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(&sgrp->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; + sgrp->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) + sgrp = kzalloc(sizeof(struct sysfs_wi_group) + \ + nr_node_ids * sizeof(struct iw_node_attr *), \ + GFP_KERNEL); + if (!sgrp) 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(&sgrp->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_out; } } - if (err) { - kobject_put(wi_kobj); - goto err_out; - } return 0; -node_out: - kfree(node_attrs); err_out: + kobject_put(&sgrp->wi_kobj); return err; } From patchwork Thu Mar 20 04:17:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakie Kim X-Patchwork-Id: 14023427 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 E9BF9C28B30 for ; Thu, 20 Mar 2025 04:18:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5377A280006; Thu, 20 Mar 2025 00:18:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 51341280001; Thu, 20 Mar 2025 00:18:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 36858280006; Thu, 20 Mar 2025 00:18:29 -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 12344280001 for ; Thu, 20 Mar 2025 00:18:29 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id ED02E120B3D for ; Thu, 20 Mar 2025 04:18:28 +0000 (UTC) X-FDA: 83240622696.07.71BF092 Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by imf09.hostedemail.com (Postfix) with ESMTP id 0A2EB140003 for ; Thu, 20 Mar 2025 04:18:26 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of rakie.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=rakie.kim@sk.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742444307; 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=vUZAcACa3x+Ps7gbBT32GM7aRawhSj0DP+aGMPiJu9M=; b=f6jDa+maSgzjixbooWAJCMnBsXD1quSH0uFGtP5KL+tDgtLWnB0fv4/peYfu8HqYGLIVcW E7OpRYRVJo0DJb1BNLo3d87Di1xWxdaAyOApKBGjSZVNyX0K83UikHhbdY7dWokuWWacNZ CxQHVgfClzkCmLkpPOCWJ55okpjoNCc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742444307; a=rsa-sha256; cv=none; b=QcNreIfxdLk6D18rvOo/85hIOoPgGOiGT65J7Uti4fx3IJQEN95tIRBmaZtGBz8yMG3WkD UfM1cOof/qWwJJYDK58RvCpc74Nk/PZiUKYBnyVfBb4ZV6bhXRh5Byr7kJpTt4wdmtilmB WT9zMxWM5bPwTVzHbzP4JKpu/pVzb/Y= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of rakie.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=rakie.kim@sk.com; dmarc=none X-AuditID: a67dfc5b-681ff7000002311f-46-67db970c9614 From: Rakie Kim To: gourry@gourry.net Cc: akpm@linux-foundation.org, 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, kernel_team@skhynix.com, honggyu.kim@sk.com, yunjeong.mun@sk.com, rakie.kim@sk.com Subject: [PATCH v3 3/3] mm/mempolicy: Support memory hotplug in weighted interleave Date: Thu, 20 Mar 2025 13:17:48 +0900 Message-ID: <20250320041749.881-4-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250320041749.881-1-rakie.kim@sk.com> References: <20250320041749.881-1-rakie.kim@sk.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRmVeSWpSXmKPExsXC9ZZnoS7P9NvpBt3TBC3mrF/DZjF96gVG i6/rfzFb/Lx7nN1i1cJrbBbHt85jtzg/6xSLxeVdc9gs7q35z2qxek2GA5fHzll32T262y6z e7QcecvqsXjPSyaPTZ8msXucmPGbxWPnQ0uP9/uusnl83iQXwBnFZZOSmpNZllqkb5fAlbG2 9wFTwXODigt3VzM1MM7Q6GLk5JAQMJE4uvEIG4x9cNYmpi5GDg42ASWJY3tjQMIiAqIS847O Zuli5OJgFrjGJHHg800WkISwQLDEo+aTTCA2i4CqxNHlvcwgNq+AsUTL/jOMEDM1JRou3QOr 4QSaP+XqfDaQ+UJANW/P8UKUC0qcnPkEbCSzgLxE89bZzCC7JASes0lcffYU6jZJiYMrbrBM YOSfhaRnFpKeBYxMqxiFMvPKchMzc0z0MirzMiv0kvNzNzECw31Z7Z/oHYyfLgQfYhTgYFTi 4X1x5Va6EGtiWXFl7iFGCQ5mJRFekY7b6UK8KYmVValF+fFFpTmpxYcYpTlYlMR5jb6VpwgJ pCeWpGanphakFsFkmTg4pRoYS5dNOlymeTGj7MR6YZ0N+1SqRYPE59/cr/ZM0v64m722sttu h58ighs9pxs9aVgllT73UkL+P783u2e8Y+C1vHR4RfM5iXXd1876/NyQ+/HlLZ1TKxKtW3+9 12SbUF2sKHrPSe3r9deL2Pce//tYSj7vvMm2t3434/7HnzN8vCIrdN6+dS82VyqxFGckGmox FxUnAgAEo+wMcwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsXCNUNNS5dn+u10g3tdbBZz1q9hs5g+9QKj xdf1v5gtft49zm7x+dlrZotVC6+xWRzfOo/d4vDck6wW52edYrG4vGsOm8W9Nf9ZLQ5de85q sXpNhsXvbSvYHPg8ds66y+7R3XaZ3aPlyFtWj8V7XjJ5bPo0id3jxIzfLB47H1p6vN93lc3j 220Pj8UvPjB5fN4kF8AdxWWTkpqTWZZapG+XwJWxtvcBU8Fzg4oLd1czNTDO0Ohi5OSQEDCR ODhrE1MXIwcHm4CSxLG9MSBhEQFRiXlHZ7N0MXJxMAtcY5I48PkmC0hCWCBY4lHzSSYQm0VA VeLo8l5mEJtXwFiiZf8ZRoiZmhINl+6B1XACzZ9ydT4byHwhoJq353ghygUlTs58AjaSWUBe onnrbOYJjDyzkKRmIUktYGRaxSiSmVeWm5iZY6pXnJ1RmZdZoZecn7uJERjiy2r/TNzB+OWy +yFGAQ5GJR7eF1dupQuxJpYVV+YeYpTgYFYS4RXpuJ0uxJuSWFmVWpQfX1Sak1p8iFGag0VJ nNcrPDVBSCA9sSQ1OzW1ILUIJsvEwSnVwLjIqcjtnZqO+HZmLRHtjItJW07HGT8vXqz4+9pu s7wlxyIP+3XdurK1kmWfXNkSfS/mtbwBMj73prrPdzHy25KkWcJn8Ng28/+ypyXTxGoKtonW vvgfF5p0ep/Rtb+67D+2cjz6p1u6QFspS8iSLymUf1Hogf+7GzXctkhuOlL/7Jlhe2V/qRJL cUaioRZzUXEiAKUUvvJtAgAA X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 0A2EB140003 X-Stat-Signature: j9au7ksbfs5hxd76bh3xzqqdbzz6xw39 X-HE-Tag: 1742444306-585261 X-HE-Meta: U2FsdGVkX19K4+xgHmWbUHEo49IMsNRTU4me8/yOdCfbXNExUoOIUI4QItSldHGEsrvlI46dTkmQdnzZbMsvEAYarOKXfu34YEjxyUHsW/qAG4vOl7pkP08be7BkTplAyd+5BiyIm0pwlPY9lnLEZMFpVbdPoyoE7MFbUGlRmSgZnHZmSpae0Ahw8cMSt3xecBRyXBRt2+LB1AETJlei853KklujCRBxi0J0wyDg76COJ0G/4fSxR68nXyIvQiiqfqMDM26cvMUTGAqBaGira12XrLD70I1cM1E7b21CG+D8K8lo3cThdmj429h9bayFj7Q6W/4aXzs3WnfW014aGolysBaF/cadnAiyKqFGwRJk8Xm9azgaT6gvQegtndsex7CbVpCyzK6nNqzXMU0SdXMzBMdy7Rzw+2fLUuxU7oQJW48v7aAHcSzdPKMevvdidzgiusCf7D4Felmun1DhfYvoksjDgJ7NJiz3yOWWJjVipucd2ksGGbY7x7Jvxx5wwVswddqYUoxI8lBE1qUjoYk1cHH1VjUy/M3PBoI2Q/lMPF0CY0O1itbQSpF4bQGt24vG/FwlAPuRTbdN+m5DCc9gcM3tORjVG/2PtqmS1MFI4V9d/YynP4ibcRCNYxXxiryOGZKPFlfVJHNd4ewNzPLvnKPWKOx5REAC3Xc+dvaKdg1HonISzJis9m/cv1mhhxlqQu8H7s8UKNmKZXyEUbUbNVB65k8J+VyP3MdemFFoCalYJoxoAMrRVFhhTXdT46xKZYc+6KuhrHS8g/sLuzOWh2bPFffJ/KSK5XqPerFQX2g24Nc07B/mJJur9wTFHo55M/EmEl31WP33uQMHGLrF+VfnbWiTmWXCD1dVveJlE0J9Iue3pEm7pgAbubqppNwNDZu1vkPhQblcm1XB//pxAtLB2nA+1QUq/F7yvZqAAgvQHJotm5e+4S4tTdI8J3h75D/uayGV7kpvmik VHQM0TtS 42wWYW8z6cdB3BEv+nFvjWNQtCToXv8Jo+R6x7bsD5yQ0QKMWobEic6Eapj18IJXTTqv2Prh8wO/xu6QEJ04zAjUsKpJPurfKTomM 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, reducing the creation of sysfs attributes for unusable nodes. 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 --- mm/mempolicy.c | 108 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 86 insertions(+), 22 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 6c8843114afd..91cdc1d9d43e 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,12 +3441,24 @@ static ssize_t node_store(struct kobject *kobj, struct kobj_attribute *attr, static void sysfs_wi_node_release(int nid) { - if (!sgrp->nattrs[nid]) + struct iw_node_attr *attr; + + if (nid < 0 || nid >= nr_node_ids) + return; + + mutex_lock(&sgrp->kobj_lock); + attr = sgrp->nattrs[nid]; + if (!attr) { + mutex_unlock(&sgrp->kobj_lock); return; + } + + sgrp->nattrs[nid] = NULL; + mutex_unlock(&sgrp->kobj_lock); - sysfs_remove_file(&sgrp->wi_kobj, &sgrp->nattrs[nid]->kobj_attr.attr); - kfree(sgrp->nattrs[nid]->kobj_attr.attr.name); - kfree(sgrp->nattrs[nid]); + sysfs_remove_file(&sgrp->wi_kobj, &attr->kobj_attr.attr); + kfree(attr->kobj_attr.attr.name); + kfree(attr); } static void sysfs_wi_release(struct kobject *wi_kobj) @@ -3463,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; + + if (nid < 0 || nid >= nr_node_ids) { + pr_err("Invalid node id: %d\n", nid); + return -EINVAL; + } - node_attr = kzalloc(sizeof(*node_attr), GFP_KERNEL); - if (!node_attr) + 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(&sgrp->kobj_lock); + if (sgrp->nattrs[nid]) { + mutex_unlock(&sgrp->kobj_lock); + pr_info("Node [%d] already exists\n", nid); + kfree(new_attr); + kfree(name); + return 0; + } - if (sysfs_create_file(&sgrp->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; + sgrp->nattrs[nid] = new_attr; + mutex_unlock(&sgrp->kobj_lock); + + sysfs_attr_init(&sgrp->nattrs[nid]->kobj_attr.attr); + sgrp->nattrs[nid]->kobj_attr.attr.name = name; + sgrp->nattrs[nid]->kobj_attr.attr.mode = 0644; + sgrp->nattrs[nid]->kobj_attr.show = node_show; + sgrp->nattrs[nid]->kobj_attr.store = node_store; + sgrp->nattrs[nid]->nid = nid; + + ret = sysfs_create_file(&sgrp->wi_kobj, &sgrp->nattrs[nid]->kobj_attr.attr); + if (ret) { + kfree(sgrp->nattrs[nid]->kobj_attr.attr.name); + kfree(sgrp->nattrs[nid]); + sgrp->nattrs[nid] = NULL; + pr_err("Failed to add attribute to weighted_interleave: %d\n", ret); } - sgrp->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_release(nid); + break; + } + +notifier_end: + return NOTIFY_OK; } static int add_weighted_interleave_group(struct kobject *mempolicy_kobj) @@ -3503,13 +3562,17 @@ static int add_weighted_interleave_group(struct kobject *mempolicy_kobj) GFP_KERNEL); if (!sgrp) return -ENOMEM; + mutex_init(&sgrp->kobj_lock); err = kobject_init_and_add(&sgrp->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 +3580,7 @@ static int add_weighted_interleave_group(struct kobject *mempolicy_kobj) } } + hotplug_memory_notifier(wi_node_notifier, DEFAULT_CALLBACK_PRI); return 0; err_out: