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 B72E0C77B7C for ; Thu, 3 Jul 2025 13:00:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 30EFB6B0187; Thu, 3 Jul 2025 09:00:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2DFC26B0188; Thu, 3 Jul 2025 09:00:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1CE446B0189; Thu, 3 Jul 2025 09:00: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 0BFA46B0187 for ; Thu, 3 Jul 2025 09:00:41 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8BDB8140203 for ; Thu, 3 Jul 2025 13:00:40 +0000 (UTC) X-FDA: 83622962640.18.F86839C Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf05.hostedemail.com (Postfix) with ESMTP id 9B29C100023 for ; Thu, 3 Jul 2025 13:00:38 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=CFXNAbMp; spf=pass (imf05.hostedemail.com: domain of aha310510@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=aha310510@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751547638; 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=+V9/b+CRzGm0ij32xv/mNYvSmebJP/k00QdwusN4ULA=; b=DnGi227bafr1kF6rVu9nVLRC7STH+11yWrYJuRdxghYMTpU/eORFNHengX1KgeZk0hXLUu sUALPSXZfoBCH5yvWDswCVSL8LTZYVT2fVNszLtqr2CClCy9L3E5666TokTjVJqgefkfRb Jz75kDS7dFJngTOqnO2/HyY0aDrvNEc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751547638; a=rsa-sha256; cv=none; b=l9kcptUrStcoWdgogYi1bgkdxAQtRWMCxJHpPRLlZ45GK1ml1OPMh46LLJ2az+fgB81htA 3iF73TJyb+FFVNsBAxfZVGy/XiqdAe43FJaVhzd25HMrdtWVPNmmiFam+4Pt8lQoG0o357 XtybWbf0ABvU4PJZoDOMZeAgpJZyz3I= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=CFXNAbMp; spf=pass (imf05.hostedemail.com: domain of aha310510@gmail.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=aha310510@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-235d6de331fso72144815ad.3 for ; Thu, 03 Jul 2025 06:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751547637; x=1752152437; 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=+V9/b+CRzGm0ij32xv/mNYvSmebJP/k00QdwusN4ULA=; b=CFXNAbMpx46RhFwB8i5LneJWsC7ucyN3kxg2KHfY+jqMtL02nawigHr94EmkYDgjrC +enR5wBP2WIfP6mRDMcxuABHts7itKX6PpmGOPo8yCwpYZXf7dLYyLMgJUoZ3i677YY8 /YcFQZs3Wtx/X6+1nqDh7E2Cmm45csZMOrCheQAb5nN6ss9JGw4nXjkc7i+EcCnksIQM Opiy6sWQ0Mbii5wEhW9fM4sN2bO4ZmRztX04Od0rGCAPmehgrYei2HcO/weeMJeURQhe ue/E78/g+McXISI64cy/CJmlpZqAwoho9gU54ScsdgztSI+bWd/mbDSYjU+WpsanfRRT EWLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751547637; x=1752152437; 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=+V9/b+CRzGm0ij32xv/mNYvSmebJP/k00QdwusN4ULA=; b=XU5upQrjVZ41UoO7ZrX4U1iaLfn3O2sg65CXSvTb7mRbBmjXdya8eenmCigYgAJ0Ul MwM4+7gOj5IebHMZU5MBOAI2K5ld0KizOtWICJcsSTgJU0U3hi6q5VKVzRwWqrvU0S2S gWOm4U3ayrE9N7r/zU+u5z11xU9vGDn6sr/i4pc2MXOZw2pJ9DItkAx5HPn+YQypXglE RAfk/ZG75385cndiTHYzLu9VGKfmvkEF2i5/ebQZnXaROscrl0ypi7v617OiQ4PUM4EY jEx4eKHVNs/WtGdwkvXV8qj0y0lM+sy6Jp456qokMym/i5NMv8S8n+6I76HFJ4JFqnQN gnzA== X-Forwarded-Encrypted: i=1; AJvYcCUSp8lJYTNgs1+2TIjEuizaow63Xx35zEsW53C5/ZR2a4Lt6W5Jk8YBpQFB5gTwRyH23XzzkueBIQ==@kvack.org X-Gm-Message-State: AOJu0Yz5bSadtt9D8r7ChxTEvoga0w/TOR1n/FmIrbTG+SR8q16lHn8d zR13vQ70FdA7q8mf9SdOKOEgfbXCi4SQHnv/7d56bk0z+wK6i6IBQC98 X-Gm-Gg: ASbGncvP8Se7obFjPc6flkzzcVzVy35C+TMQsJDUZUm7n7H1h02n2maQHlgL82/gm3m 6VNWC9WrrbL9x6JMcAZlEtAwrxn4vxNqIkYpuljvqbFPx9gfLFAZHcFBFqXyfZS0Yme1vUKSNFV rXfBpxsVmwjzgXgP3hahimQZS6dj0WwsnN2uPdGFE7imr2raSo7/a0wjQYLWd1X+h3WbjJ1c5p/ nwY0jElAfkNTTWpWLcnQHjKCQGuYDGHedQV1uWHCHhtosassMUQJcKbzCHW2h3/NppdKAFy9X7/ 9/pqzv/eGKapkLzx4hf0RTc3dIm+X2hdtotrffJ3T7EJeaJdIkOMmY9uWHsxSk3etfyxjvXkYcd 7 X-Google-Smtp-Source: AGHT+IFnS4sUDe612i/mziOiSd8eMOHyas6kczjurdDjVmc8V2M7FS1CkSHh17LwoanozUJYLQIDPg== X-Received: by 2002:a17:903:1a67:b0:235:a9b:21e0 with SMTP id d9443c01a7336-23c795742fbmr52192025ad.0.1751547636725; Thu, 03 Jul 2025 06:00:36 -0700 (PDT) Received: from localhost.localdomain ([121.185.186.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23c71c3e272sm34161445ad.215.2025.07.03.06.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jul 2025 06:00:35 -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.15.y v2] mm/vmalloc: fix data race in show_numa_info() Date: Thu, 3 Jul 2025 22:00:07 +0900 Message-ID: <20250703130007.16755-1-aha310510@gmail.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 9B29C100023 X-Stat-Signature: a8egmee1hk8thhkhy7n383t88xphwwdg X-HE-Tag: 1751547638-29354 X-HE-Meta: U2FsdGVkX1/7AmhETSLH0mkhFFKYMtwkFkTcazTXNnuaQSTJgfVX0QRxsUNwbiOZNutmqUzR+ZUzUsoRwKLlEck06V54auK7kNuaNWx675TEdX7ji5J9FCV9Zlblw3U0T0lFhYNfWO3Q3IXMr/ERZzJIn8uNR44r2bV8z9jZRodS3uQY1yXHPg3qJ3AEDsAB5IuyhbvcneYGq7ecWkO8jPetcO45mvUKyoPKaZtZ5SI4FOOlnt6WpOK+OOL91m8ovVfn2FmkNsxX+XMImOlk1okEyRrZePZ0OeJMgJKTojndU9xlaxdTnWMvNLyvWs7iC+jSCP9i15sisb9d34aQ06dUa0gD1jbwFfGlyvGejgy6isQgbS2NGyYYZFB3aS8iotbxZ1Pw/XonAGsr1u9XKiIrI6aHiUdGj5xWRhgXa9cZjkHrU3sjvs6JgJggCr2kC4/RtP37YU8x2lGuoPxpRT+d0E7DXh25EVWoDsjbUMHsZaAeBxmMKYg9mgWwD/8GuLHmI2TH6WcmNNr9DZ7QcAPT+1MBw7hS4I1NQdlRSxtoL2FlzUPwUfXzWdIsWhPKgFeeUsvHHK7x7iiKLnjlJHWeawIZ7vQA7zqWtZGJsM/6zKaJZ4CXJnjqkAOQO4xO3dh3rRdXN4g3be0IWcPV0qdPB0r0qS0SyclP7ln5IhckXuZ23tKFo2njhfNfWOzquvCu7HN5oSg3zdIxfBhd7IhjWa2ShxH+X06DOY/CY5HinaT6OzrClY36wPDPhu+o9poF+gdBrJjSID3NmeqJT9TOD0lVRR5YBc1FQncgzvwHBj8EULpBp52M/MgLQIxtaA2ybXLScyouEgQKaxgOoNTshH2oK9g/UBute5C0+9VIzq8tTx2uivQk/EWus7+Czp03kRjOSVHt1/2GIwJlY6qZkqSZFHhrlX1qTYcXDwVrrYKVdd6cbJrdNpectkHHqtBFOpMcuBbZ65tVL2W VeJexr+D /k043bk9OjXCQmynNEd6HkHU+sKpQ6t7G87y6ESBPxvm/LIzLQlgI8qNHTkwQMi8iwv7X/ReAcs9PcWSsv/YND26c9iY/hd8JXz76Tl7LjWbggy0kgfMPh16th40oVv32h8PN4NAHdi8AvKWKkMBRoB0S1pXKmFo49L6iIvteKTzyeYMGLsnsSsV93qG4Yg6DgNqibv3RTArUtrrS1Iq98Kr+A+lmFK6rXI8H0Nmyib0vEg5JGAqIYE4ujqyb+xEBWkxaF8qiQbA2j2HxfpPkk5wOxRBLpDIZTMuY6c4aW6+9X1qYeaKXwEjfpyXeOqAmczooXDgEXs8SbY8WBKt1pWaik5MqE6Houh4XKteR2knSqU5ATDFObG8cmbHD6QcmR4o6whb7kHghmyKyfjucRlFr/Uad8ssCvTs1+GPH9xJlXtLxo3DxofbXPKxSp7NJg11BYCFVe9O1auvm8Pa8MzbYNUT/XwtH1GXrP7ZxQPFtFKH2jaKu/v6iAAVLaVxYS9XVO+gkuDURIBLp3WJ5vAJAeg+NpMmsAtKm5pQUX7a99PZwIzDHlyoC83Vqs9h4twUQO0WDYP6KZrhtxU4N04ZSbi7NwGaOVeAx 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 00cf1b575c89..3fb534dcf14d 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3100,7 +3100,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; @@ -4934,28 +4934,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) @@ -4983,6 +4984,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]; @@ -4999,6 +5004,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); @@ -5033,7 +5043,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); @@ -5043,19 +5055,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); --