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 D2DDFC3ABC0 for ; Thu, 8 May 2025 13:35:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D6626B008C; Thu, 8 May 2025 09:35:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 884376B0092; Thu, 8 May 2025 09:35:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 74C9F6B0093; Thu, 8 May 2025 09:35:49 -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 563B86B008C for ; Thu, 8 May 2025 09:35:49 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5E05180463 for ; Thu, 8 May 2025 13:35:49 +0000 (UTC) X-FDA: 83419838418.25.8A661B4 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by imf17.hostedemail.com (Postfix) with ESMTP id 6D8E940004 for ; Thu, 8 May 2025 13:35:47 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Dff+2bC3; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of aha310510@gmail.com designates 209.85.210.178 as permitted sender) smtp.mailfrom=aha310510@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746711347; a=rsa-sha256; cv=none; b=Se8GK5kned+ZjpqFr132b4FR+3TKLckjdrn2XJdw8jCpj3cXpjVehJGkfyVCu3CAaPNVuU +Q5sr+/2JGwAFsLm+f4SzDAdNTPHnAAHXFeMw3g0RvL75Bm3ex04afn+rjoOSjs6aE+KF7 jkEGbxZkA5A2kCCSi1hJSK3lILJSXZc= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Dff+2bC3; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of aha310510@gmail.com designates 209.85.210.178 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=1746711347; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=s5cd1JuMxkuWCim9GZfUS6E7KDoCCe0+9iFH893TFEo=; b=v3k0iHM65WnD/binzl461jyypyw33N47eNjhr7CVx6gMYZv//drMGUvOAzayl71Fih31M8 CB9K5Vys6d+fgnrtIW/WAS1jaX+/5hwI3xFktfL1YlqjEe1dEQwHi1Z/nrXAfl0A8ad5vE i20BU7DSgY3be9IwYWwDz2KBENDn2bw= Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-736ad42dfd6so770127b3a.3 for ; Thu, 08 May 2025 06:35:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746711346; x=1747316146; darn=kvack.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=s5cd1JuMxkuWCim9GZfUS6E7KDoCCe0+9iFH893TFEo=; b=Dff+2bC3uCja51hMosyKSos4JoWNYc4zRIaxAvEGuzKFslk4EP89H5h1oecF7a2ljv 7j7tW4POGuMFEIQ9BstNrzJnePFUbhFwWutUaNyUjjnK4hmcBmnqqftyhgQ96PIJdHR3 /j5ZTJIOQ50DTwW7CwKrtFW785aD1UjojaROi1RwqwQi+g1IwcArnQK2UuGCcE9pkPGt oVoyYuVA1XK9WUaZwvTq0lLvYp9Z9lv6hcI4eX4NJMmebwV0KOPxhCG5Oc3YH+9GDlcE kG8tJEzkhqx/VqXXkLkZzYnkaw4O5ELyT0dbp7afgguc1Avi4cEJp+aS0r3hr1x1Ml9L JCFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711346; x=1747316146; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=s5cd1JuMxkuWCim9GZfUS6E7KDoCCe0+9iFH893TFEo=; b=oOYfhMnzV995ho0K9p2qg8TO9GceDvRZGrtY8vfrXpCBlFZfkfKOqtlrOKFikEJRaD 5CGkUEbo86g2pm68OYgI6cJ5gKueyfU/ZzKXrS3Wze5yQOtCI5GOsiuloqkzrXZUjGa4 /26X2pqT+eX7UH800PAfDc6OIRBslNr6Re/kbC7dltFgPCsMsSQFHburENLYUmabXN8C BwNds6Pt3mc95EZkiPpn/YFbVhgrUOzMl1TnhIq2LrSNW7+V+1dHdrVaGNCJjCRrc4dl 3Tgsqda7cHqn+t4uL56uQGzxDQ1ahPzhzDoDHYC8ooMpxZm28/B/LU9DLam+ilhPe8LH Na6Q== X-Forwarded-Encrypted: i=1; AJvYcCXuyw2AAZDNgjZzCqkqmMwD9QcUWqidDwnbhJLE12LyZCR51K1gueRWjf+xiPDoF91Y4tVLaObGXA==@kvack.org X-Gm-Message-State: AOJu0Yx0OM9sYKFwn3lHvnelliR2gD/UBe56Sm+nlKhppkT/ueXWXW5O yigTMXG8OEPUDLp0zAOwnTN34WHcSXnLO0eXVFQLAlCzzMF5AUbPV1tv0bZfaS+Uq7TayOl9lql A5u5xZbOUz+ieMSmv1txVQOSLUUc= X-Gm-Gg: ASbGncseV68iRBqaX4UeOdyxoK5OL3pvNAjct52DV2n2/bTxxdgTShjlZEACHR88ldw KWQCCAFp3b/WnydKv6GE7zCd6+jguBmNVCdgAnWIkzHWCHmwNRTuXF624QA1ctPjsczko4eogoA nthZA3eZShvDN7Sceg8QV3hyFo X-Google-Smtp-Source: AGHT+IE56KfqX3gxisy1zZ+EZNu7DWCHUYLZbZ7arwvjCNqBZsK/byADttzPPnDqlOOI/RQ2bPzL6mIsBpNRCSIRZIU= X-Received: by 2002:a05:6a20:394d:b0:1f5:709d:e0cc with SMTP id adf61e73a8af0-2148d63dcb9mr12759568637.40.1746711346123; Thu, 08 May 2025 06:35:46 -0700 (PDT) MIME-Version: 1.0 References: <20250508065558.149091-1-aha310510@gmail.com> In-Reply-To: From: Jeongjun Park Date: Thu, 8 May 2025 22:35:37 +0900 X-Gm-Features: ATxdqUGmB4SFgx7KWzfPXB2ytFLx8C_yqKkywCIeBIwxDqEjIseu0ZDsugTUaOI Message-ID: Subject: Re: [PATCH v4] mm/vmalloc: fix data race in show_numa_info() To: Uladzislau Rezki Cc: akpm@linux-foundation.org, edumazet@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 6D8E940004 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: 93jyahweyzrznxjchy1pt1176nd7t7o4 X-HE-Tag: 1746711347-410371 X-HE-Meta: U2FsdGVkX1/+keAwp0dClEmxtN3g6+vtD3H0WGNfFwWV/3IDypcsn/vumx5y79/s8wnlkhXL/thVUQKxZ2E8A9SUCjA2uxDGzFn/MB7s8nsVEO3Lk1kT3XgEYgiKbjOkr+BRcQQZ8SmCb+973j4k4fnw6njbsjzugWKN5apAmz5Q9FSbO5VnhVlsbVQYqhkJphjViodf8or8GfmNJLi52Zx+yC084xmlZw0m0aNM+aYm7Z1iUtGfSNw7mP1pScUdRwVFPFFXgwaAlyLvtfu7OIewK2OKp3qNbGJUU83qj4gblRZn8Dk7Q6TiTggpTYI5v0ZJBXRcYfGbFMYwNtzVkwvuJa6gcjEJe+9sH8dmUZT7pD9uHuuKLWwv7n2cFI6V8SbSpKxKuZueZx922H2VHvD36kPTbZOkDhLv69irlytCYoaKQuJmZryxEDAHlCh41C15svQwBSdUh+XZe6qKSOhKbmFJ5tSqVnseBlz3GzEKJe31rUqCmzjbV44eFlfBKRpeTx2T64+9Ibvuwhji9n+aLYZ0oHFumqNJKxu2Z4lYsTZXgKBzCcN1Wq0vrLQfKLbHZvN26JlTBjaeeDH0TiQ3HP+gVtDp9O1BNSI5s4p/dIu1dVNofos6iFWVqMNQa1D3aSqd4Qrj9m9MZckEcXbR+yiWzMhw4i/2DPt7h3QUkhfDBlw9QXxYE/bXHOUBHOuJALVOqaAAxPhUlX8wOqA+RO3d3aY6DRz5cVz34Ijt3/fsYUTIxJmvK/m3vf+sXNrBLo2BWj0+oAJ10kCFK56lmLcEfd8oQAvu+J9zECCOWPx5wt8PCvoeNIkJhgYTEEhYlAapD/cdJMltTwSDGoEDAUEmQJilaOBl0Z3TRpzmGQzQ8Gh2rElmTTDtMsX/dAqSe3K9krTq6aIhRSZtLVdTR4cqsk78R4yzzt03kpdcsCIGY5+SMZj+A9z2jZ2IH+ofti9nVrjoUcqa3xj ZCZs6bQa 6XbMiID7vGnWP6PXqV+zGG2jCX9EGJa27Vv621lyb7kM5LLrr4HoHV8+Kr3x77TOd9eqMnYBa2QeZN+GC4RRhBJG21semzqO0nNpZI0zMy/9UeoYcHljRRtl6qXQHQzb+ExLGkXCj/A9ZJgJ/eX7dPgfS4dBBZi9B+BfAiUKH1VKcIgOTXpdt0Z71K1KDzJrIPBN0q1ha8iSZTin5Wefxtk41XuelOPlE/8KONwJ1KM7F10FEntQvpDlIYQ22tZLkDLWeGLDhmxRuHgiAp/RbU8GzAuvzj3jwxeRcwRC3O29p3CeHC/+anCS6D9ZSR8G5iyMM5AanIXwgg5BAqa2dXbe3xYrZf3vKLpx2YOXpaDB43zKNIfVQv7fQspRGzg4/PhErjTrI5FBpTlXSZT5G7J5Wxq45PkC4VZAymyVucXILBz0MtND3xD1OYWlXoraDvxPoZcOpQPNcpMwysnwN7lps0xDl4dlgjCLB9eIt/vTuHzo= 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: Uladzislau Rezki wrote: > > On Thu, May 08, 2025 at 03:55:58PM +0900, Jeongjun Park wrote: > > 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. > > > > Fixes: a47a126ad5ea ("vmallocinfo: add NUMA information") > > Suggested-by: Eric Dumazet > > Suggested-by: Uladzislau Rezki (Sony) > > Suggested-by: Andrew Morton > > Signed-off-by: Jeongjun Park > > --- > > v4: Change the way counters array heap is allocated, per Andrew Morton's suggestion. > > And fix it to call smp_rmb() in the correct location. > > - Link to v3: https://lore.kernel.org/all/20250507142552.9446-1-aha310510@gmail.com/ > > v3: Following Uladzislau Rezki's suggestion, we check v->flags beforehand > > to avoid printing uninitialized members of vm_struct. > > - Link to v2: https://lore.kernel.org/all/20250506082520.84153-1-aha310510@gmail.com/ > > v2: Refactoring some functions and fix patch as per Eric Dumazet suggestion > > - Link to v1: https://lore.kernel.org/all/20250505171948.24410-1-aha310510@gmail.com/ > > --- > > mm/vmalloc.c | 61 ++++++++++++++++++++++++++++------------------------ > > 1 file changed, 33 insertions(+), 28 deletions(-) > > > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > > index 3ed720a787ec..112df5a86106 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; > > @@ -4914,28 +4914,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) > > @@ -4962,8 +4963,11 @@ static int vmalloc_info_show(struct seq_file *m, void *p) > > struct vmap_node *vn; > > struct vmap_area *va; > > struct vm_struct *v; > > + unsigned int *counters = NULL; > > > Setting NULL can be dropped. > > > int i; > > > > + counters = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL); > "if (IS_ENABLED(CONFIG_NUMA))"? If no NUMA, allocating and freeing sounds > like without any reason. > > > + > > for (i = 0; i < nr_vmap_nodes; i++) { > > vn = &vmap_nodes[i]; > > > > @@ -4979,6 +4983,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); > > @@ -5013,7 +5022,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); > > @@ -5023,19 +5034,13 @@ static int vmalloc_info_show(struct seq_file *m, void *p) > > * As a final step, dump "unpurged" areas. > > */ > > show_purge_info(m); > > + kfree(counters); > > > Maybe check for NULL before and IS_ENABLED(CONFIG_NUMA)? > > -- > Uladzislau Rezki Hmm....then I think patching vmalloc_info_show() like this should work. --- mm/vmalloc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 3ed720a787ec..b60355256211 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -4962,8 +4962,12 @@ static int vmalloc_info_show(struct seq_file *m, void *p) struct vmap_node *vn; struct vmap_area *va; struct vm_struct *v; + unsigned int *counters = NULL; int i; + 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]; @@ -5013,7 +5017,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 (counters) + show_numa_info(m, v, counters); + seq_putc(m, '\n'); } spin_unlock(&vn->busy.lock); @@ -5023,6 +5029,7 @@ static int vmalloc_info_show(struct seq_file *m, void *p) * As a final step, dump "unpurged" areas. */ show_purge_info(m); + kfree(counters); return 0; } -- This way, we won't allocate heap unnecessarily when CONFIG_NUMA is disabled, and we only need to check if counters are NULL or not before calling show_numa_info(). However, if you change it like this, counters must always be initialized to NULL. Regards, Jeongjun Park