From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A31EC83030 for ; Thu, 3 Jul 2025 13:02:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A863F6B0171; Thu, 3 Jul 2025 09:02:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A356A6B0172; Thu, 3 Jul 2025 09:02:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 972806B0173; Thu, 3 Jul 2025 09:02:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 87CF16B0171 for ; Thu, 3 Jul 2025 09:02:09 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E7F1D5728B for ; Thu, 3 Jul 2025 13:02:08 +0000 (UTC) X-FDA: 83622966336.14.D49F809 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf19.hostedemail.com (Postfix) with ESMTP id 33AA71A0013 for ; Thu, 3 Jul 2025 13:02:07 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="P8J/LZBP"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of aha310510@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=aha310510@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751547727; a=rsa-sha256; cv=none; b=A6jkDZjjToitrPLfMiNP2jukETfYGiac/uDy4OBm30DRNbp43MZC9rHYA68Qnku9VexydD 6+AGnMT6Wza560W7lBuvcJAe7FO9UwQ+uhyG/0OQ33ShyU5LkD4KbLDHyFfdHP9dKXvIQe ZJimS7WktBUwE5466fG4nq7as4jVzOc= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="P8J/LZBP"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of aha310510@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=aha310510@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751547727; 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:references:dkim-signature; bh=suqxcEDNBCLHVH6MEYrG4k9pSxU63uJSQ0xDlxOIj8M=; b=5AwRDUGjoScGzvtcc6iRe+kqvRvw8r0HAopWQRbCoJtY09P0IR2mpanNuYRe8S1zf4u1T5 fcPJcskeneFBIzgTxqqsZvPpuvwpq4Av/OUzNqMIL9zWZDGLtlprVHHuzTSvTG//t59UDs HlhY1edhI1agMOp25i0tQt8d1fohKEk= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-235d6de331fso72179885ad.3 for ; Thu, 03 Jul 2025 06:02:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751547726; x=1752152526; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=suqxcEDNBCLHVH6MEYrG4k9pSxU63uJSQ0xDlxOIj8M=; b=P8J/LZBPMdMbpOH0i/18Bypo0InA2+INMGKA1nVhTASpmWRhSoCOdAHSI5OuOTOEdj hhGdJTRBy1Br8amoZMV3Wq2d3gwmswuxUjnlTMj67AYJkIVsmrgXUNFEusfUU2O7yYW/ JQkq0vaoZE7Koaem2ARSmk+QRFlufXlLZycvO0Ooib2fOWnlhEBwjAKTX3VVfaqbTqk4 Ty7nqNyGeKsRXwStETA1tEbfzdCZyUAoDsfhrt8W/APAXbvAOrSlifqSbbV8esqWvqn8 J0T78JNzxuJw7V/RUaeiPieSf2VPA64tY1qtpTaH5iiNvaK78hlZM9txyselP3aEUsBD rGeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751547726; x=1752152526; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=suqxcEDNBCLHVH6MEYrG4k9pSxU63uJSQ0xDlxOIj8M=; b=qv0Aq4Zk7jZbg+nFqc9DatX3QRWgcwHoKgMvpBuMGejpuL7Qw6X0mXSckPahA2L9Yx MxzPCjWnCwZB4ulzuA/Rb5jmeQiVGl1MYQlqu6GelVOhXWS0rvP7+us0wKMhZe2FPHBm 3uKh9GAjftfJqmdSRCi9wwL+Rg2fJJHeElU1/LT9BtERauo0xhzaQFoYWkzppMMP+Anr ixL9NuNIjEj9+5n5b+IVwmobwaYRg9by7/tl0oiZVJuVKMspIfKyk/3/RXj+JjXYrCcd OlJfSvdqGecIjC1UYVPU/WZqW7er3LIxI/D3yhd2ccExMmtryLEVHVoNERue9dn6yAAs raxQ== X-Forwarded-Encrypted: i=1; AJvYcCV9XvxjY9gLSeYhw+HHyXDOtM733DriGAVPoPuPUw5nk1dmOhPji/kowsVkAf/OABhTu52NsGbkfw==@kvack.org X-Gm-Message-State: AOJu0YzWTGfImfI8gt4V/mH/eI/ZFiFbffjfr2KiKAYc7HDYO48DBhPH gJ1V8AGyKL5ITXquR3jTGVlVnzdf5PvH8aHZydrZn7Cq3vlnnLtDs+ej X-Gm-Gg: ASbGnctualaxseU2UM/15nbNS8nKcrdEmb8piU5Dk0dG3Ly09OmpkO87AWmPr96KumM sHhHpgCqO0j2y3b1M4MKMaDUz2nG9hWfmeS7ZN/IkdOAWohIGvhvuEqez0bt5nsZfOh091xqchg hb1O3tvV7eCRcyinQBX43cC4IYuCz4VDrwCwn4hyH/LkWRhYRO1QRH13cyQHDnFhEJ4eHlLCI50 Szb+jmz8ENBnQnaOZV5rV9ue415GAqOh80WWjtSPL8ljZ3ie3vrMa+kvg1su4fyXXJY8MMqjV7K iLNrxSHCZIwyEC71QF7J0wDMKomLDDBqe/09sxNEk7UzJWbBPOc73TnumK3k1gkDYT5nyF5dRT0 2JudePXCSD4o= X-Google-Smtp-Source: AGHT+IFN3jK2lulyfvEhbh3K9++N3V/25lbHMvU2+TI6rKDdiedwACpF7X62+K8yahmFiIa6kkFmCA== X-Received: by 2002:a17:903:1aa7:b0:234:de0a:b36e with SMTP id d9443c01a7336-23c797b288emr46884075ad.49.1751547725660; Thu, 03 Jul 2025 06:02:05 -0700 (PDT) Received: from localhost.localdomain ([121.185.186.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23acb3ad9f5sm161942995ad.151.2025.07.03.06.02.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jul 2025 06:02:04 -0700 (PDT) From: Jeongjun Park To: stable@vger.kernel.org Cc: urezki@gmail.com, akpm@linux-foundation.org, edumazet@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Jeongjun Park Subject: [PATCH 6.12.y v2] mm/vmalloc: fix data race in show_numa_info() Date: Thu, 3 Jul 2025 22:01:48 +0900 Message-ID: <20250703130148.18096-1-aha310510@gmail.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 33AA71A0013 X-Stat-Signature: 54ptehp6f4e163ipadao8pe63rkbzpj4 X-Rspam-User: X-HE-Tag: 1751547727-684954 X-HE-Meta: U2FsdGVkX1896fOv8sB7TUagx2ineHZD/6N4Muic/ROyOCIfgiHOxvlO+OxUBYLCZByVTGhntBzgHI3X8+7OTtzrUA5i31AMUuLr6kpSmkFGajAR9KmKkIs1mkbhYdVWt6YlvXrVHMjbEGtwKA01+EypUkkwMJQjTx4pSMS/a7/FN52R3qa5lO2q/0M40tSRYz1ktot1qWX7tEgBRXKogSQtwn+cOWZCBMpJb+jQO/QM1pZwKxaHTMjGC3cIOY48waoXv5GlInhgR0lQz/yP/2oI9SxQRjLMQleutaJQBShaVpzNAV2eBZaUtg3+mZi06cMFBZ57nI+gHGgeaOE6LSdyRhymGRcK0snFLH+YvLVrfCEy8KmwGGqv4fpbyDM9OlDdnybyoiTQEXVw6qDyvUsDrciGvQMhO/lPOaODPv+eVD5zW/o+FCkoUmAAxqvjrg1wcyQuCWkh3qbkmQlzB8O8niOKmudaCxV3FO2oEuBZ3MXGdUXIcw0E9xvH9uLysOIPScwE8bq/tJJVkz7gDhFRf4O3c3gvv7iUD65AES4K9gEkUzdQclgNutz5dkIzOsDO5+1xye2PyNbyJk39AfLGieYbwY0RnXORix0H67g0iJLo+FnCYdEYYZfEQ3QUpyuz6B7HG8ouKS0ITh7JhjMaf+JTULiBFFBI8GRtVQEh8DaJk8jFzEmc/3Ebjrsa+blC14HoJTDMxvHGbrPu3Lmn0lpB0N2anvaax49Su7QfjYJOElLksL7uVXO1uoQmnD5KnsbppY9zQKnh0SDO6kkjWA8jFTTucIPrvX9qHaCzZZNl1brDMAMxbYX9L9Wrbw+ucqmMOWQSrQ60T3rNnkqB8YrI/MHEMzldQfaZAVQ3ir2GdjxoaTvEQKytKF7iFGRHVpCfwkc2SfZBTdjLTQ+ZRLfmeO29cn6zQJ0YiaI2jCNQ9+IxatYydooSUq6O7SyFfyPRX2PQOrxhTEO N3M3GiXh zb0mQXtv+uC/b/BkECGwyKlWdj2DCb+pvBtaWYpIGvHwB0L0nzUKSHeogVe0XqQU8w97gfArsHyIUvWsNZseSfeYpI2LlEDHI0wT6cJ+DfbTf7bYI58Ee74E92vweBbVvU/KuMOpDf+KWJlI= 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: commit 5c5f0468d172ddec2e333d738d2a1f85402cf0bc upstream. The following data-race was found in show_numa_info(): ================================================================== BUG: KCSAN: data-race in vmalloc_info_show / vmalloc_info_show read to 0xffff88800971fe30 of 4 bytes by task 8289 on cpu 0: show_numa_info mm/vmalloc.c:4936 [inline] vmalloc_info_show+0x5a8/0x7e0 mm/vmalloc.c:5016 seq_read_iter+0x373/0xb40 fs/seq_file.c:230 proc_reg_read_iter+0x11e/0x170 fs/proc/inode.c:299 .... write to 0xffff88800971fe30 of 4 bytes by task 8287 on cpu 1: show_numa_info mm/vmalloc.c:4934 [inline] vmalloc_info_show+0x38f/0x7e0 mm/vmalloc.c:5016 seq_read_iter+0x373/0xb40 fs/seq_file.c:230 proc_reg_read_iter+0x11e/0x170 fs/proc/inode.c:299 .... value changed: 0x0000008f -> 0x00000000 ================================================================== According to this report,there is a read/write data-race because m->private is accessible to multiple CPUs. To fix this, instead of allocating the heap in proc_vmalloc_init() and passing the heap address to m->private, vmalloc_info_show() should allocate the heap. Link: https://lkml.kernel.org/r/20250508165620.15321-1-aha310510@gmail.com Fixes: 8e1d743f2c26 ("mm: vmalloc: support multiple nodes in vmallocinfo") Signed-off-by: Jeongjun Park Suggested-by: Eric Dumazet Suggested-by: Andrew Morton Reviewed-by: "Uladzislau Rezki (Sony)" Signed-off-by: Andrew Morton --- mm/vmalloc.c | 63 +++++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index cc04e501b1c5..7888600b6a79 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3095,7 +3095,7 @@ static void clear_vm_uninitialized_flag(struct vm_struct *vm) /* * Before removing VM_UNINITIALIZED, * we should make sure that vm has proper values. - * Pair with smp_rmb() in show_numa_info(). + * Pair with smp_rmb() in vread_iter() and vmalloc_info_show(). */ smp_wmb(); vm->flags &= ~VM_UNINITIALIZED; @@ -4938,28 +4938,29 @@ bool vmalloc_dump_obj(void *object) #endif #ifdef CONFIG_PROC_FS -static void show_numa_info(struct seq_file *m, struct vm_struct *v) -{ - if (IS_ENABLED(CONFIG_NUMA)) { - unsigned int nr, *counters = m->private; - unsigned int step = 1U << vm_area_page_order(v); - if (!counters) - return; +/* + * Print number of pages allocated on each memory node. + * + * This function can only be called if CONFIG_NUMA is enabled + * and VM_UNINITIALIZED bit in v->flags is disabled. + */ +static void show_numa_info(struct seq_file *m, struct vm_struct *v, + unsigned int *counters) +{ + unsigned int nr; + unsigned int step = 1U << vm_area_page_order(v); - if (v->flags & VM_UNINITIALIZED) - return; - /* Pair with smp_wmb() in clear_vm_uninitialized_flag() */ - smp_rmb(); + if (!counters) + return; - memset(counters, 0, nr_node_ids * sizeof(unsigned int)); + memset(counters, 0, nr_node_ids * sizeof(unsigned int)); - for (nr = 0; nr < v->nr_pages; nr += step) - counters[page_to_nid(v->pages[nr])] += step; - for_each_node_state(nr, N_HIGH_MEMORY) - if (counters[nr]) - seq_printf(m, " N%u=%u", nr, counters[nr]); - } + for (nr = 0; nr < v->nr_pages; nr += step) + counters[page_to_nid(v->pages[nr])] += step; + for_each_node_state(nr, N_HIGH_MEMORY) + if (counters[nr]) + seq_printf(m, " N%u=%u", nr, counters[nr]); } static void show_purge_info(struct seq_file *m) @@ -4987,6 +4988,10 @@ static int vmalloc_info_show(struct seq_file *m, void *p) struct vmap_area *va; struct vm_struct *v; int i; + unsigned int *counters; + + if (IS_ENABLED(CONFIG_NUMA)) + counters = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL); for (i = 0; i < nr_vmap_nodes; i++) { vn = &vmap_nodes[i]; @@ -5003,6 +5008,11 @@ static int vmalloc_info_show(struct seq_file *m, void *p) } v = va->vm; + if (v->flags & VM_UNINITIALIZED) + continue; + + /* Pair with smp_wmb() in clear_vm_uninitialized_flag() */ + smp_rmb(); seq_printf(m, "0x%pK-0x%pK %7ld", v->addr, v->addr + v->size, v->size); @@ -5037,7 +5047,9 @@ static int vmalloc_info_show(struct seq_file *m, void *p) if (is_vmalloc_addr(v->pages)) seq_puts(m, " vpages"); - show_numa_info(m, v); + if (IS_ENABLED(CONFIG_NUMA)) + show_numa_info(m, v, counters); + seq_putc(m, '\n'); } spin_unlock(&vn->busy.lock); @@ -5047,19 +5059,14 @@ static int vmalloc_info_show(struct seq_file *m, void *p) * As a final step, dump "unpurged" areas. */ show_purge_info(m); + if (IS_ENABLED(CONFIG_NUMA)) + kfree(counters); return 0; } static int __init proc_vmalloc_init(void) { - void *priv_data = NULL; - - if (IS_ENABLED(CONFIG_NUMA)) - priv_data = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL); - - proc_create_single_data("vmallocinfo", - 0400, NULL, vmalloc_info_show, priv_data); - + proc_create_single("vmallocinfo", 0400, NULL, vmalloc_info_show); return 0; } module_init(proc_vmalloc_init); --