From patchwork Thu Feb 15 21:39:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 201759 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp137376dyb; Thu, 15 Feb 2024 13:39:00 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVbQU2FPzGwNuJHG/tVstmvqIq036pk5VPlQRwwG/2gRXs2MDNL70rF2qyoWWpSLmx+yPA+xer7rgJedBkC+5h/3c0ABQ== X-Google-Smtp-Source: AGHT+IFtP6xQyvuhZLw1FUvYsgI6H1vmJOgIS6SQqCl8DLc5e+7zzPngKmbGkGmbR0N43dDVwd64 X-Received: by 2002:ac2:4c8a:0:b0:511:2f76:e093 with SMTP id d10-20020ac24c8a000000b005112f76e093mr2267611lfl.58.1708033139993; Thu, 15 Feb 2024 13:38:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708033139; cv=pass; d=google.com; s=arc-20160816; b=Y/Xn4mYzh8URA/TGuBFjvxRe8otrWhQxzAk5kgFhJWQm/cPqMAGGU/OzOH+E32xgzV 83ofWzN6jHuDGiKP9AIu9i1vswpqt4FPlR9KuwBT3OxYbuhDw29I1VkSxcNUWPDnzEfB 8EaIQ6FCEo+IMLmZfVZYlvgFnefP9HeLCLCxmUOs2gseqEf3zBc6AQPyAtq1WECvL1A7 frsM8bbHQl9LoCC8nLBD3HNU4qHUHV5ZBem0nxJdd2I4p5/n49fpY4ujLEc8nFH4oQj9 +m1VuvG2x5LdySyg5qMvkKdtDb0uB+JOn6LqSEmM9yfuViuqSVy/bVPfOVc5f/mo8ptR +FvQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:subject:cc:to:from:date:user-agent:message-id; bh=vsL229uv7J8wYTJybIoRmiFL6ttE9zhn+jnKFTgl3Ec=; fh=fOPa3ptxm2XaLUIe5lkhj5fc/4F7cXZTeHZnvWcmUdU=; b=j7fRYLVXxytUbiCXWHgZ7Y5ty1y3TmaDHw8DpQ2jHMF9b/9BPybnyyal0FvHRTuNGH BwZ/UbAXBALBO3zQK2+jmj0TnaOaO2nNTlRVE/ZNiwMOmEfk1hP2Qpp2pKcvb0UqYeCT 1hppYIN4UFoejGFbYN9gsqL2wmwLMDHL2cTb+L38W4aWvsYpC0phLf8ekzoKU3qlGbA5 WxcxsaC1js4a14r1fbYlfgQYKs9Iqt2/YIoF2QCCf1Q+C/iuqFEviYVcuenZpPa+/s15 gNdlr/arcBkldNdxuruAHBhGQP6g9qxVPczyxKCB+ACe5GrhlaMd+TlgLlXOiFXWOEx+ zmng==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-67704-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67704-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id w22-20020a1709064a1600b00a3d23300f77si961451eju.909.2024.02.15.13.38.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 13:38:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67704-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-67704-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67704-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 9528D1F22302 for ; Thu, 15 Feb 2024 21:38:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D7C01145B0C; Thu, 15 Feb 2024 21:38:11 +0000 (UTC) Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42D0178B67 for ; Thu, 15 Feb 2024 21:38:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708033090; cv=none; b=XqAZXecsxZurXe2mAgHFW/JRiGe/Og+gs1N34Qh3wESaoaeHTf8eb27fK5cTkCvIq2ap5aHJ6d5uV4whkBPUn2Dj6FIoKIOU+w52TldobU8+h3Z0gQdxMqjWnNoW5ger10GITKV90NpkUQLfI/DDAFAV9rdJeisGQBxdawHKf34= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708033090; c=relaxed/simple; bh=7CiiHSVOUXcrGH/JJmVwslHSn8uV127w5zLLdzyghM4=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=PEmsGcops3v84L7sL6wNiT/KbYopwy8sEH9vlv1r+SbKsGIyQcDLHwwvKpz7GUui8aOpjPYiXpyJsP2ToB/9VjX8py0fKSuQLEOravQAmM8QSocuGZtWJH/1N7wEukPe4FpX0oDmr/OrdTB5nx4WEd65PUn4UQ1ZSCV9L2F0y0w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D51B0C43394; Thu, 15 Feb 2024 21:38:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rajSK-00000000edY-2j0P; Thu, 15 Feb 2024 16:39:44 -0500 Message-ID: <20240215213944.508142048@goodmis.org> User-Agent: quilt/0.67 Date: Thu, 15 Feb 2024 16:39:17 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Catalin Marinas , Kalle Valo Subject: [for-linus][PATCH 1/4] tracing: Inform kmemleak of saved_cmdlines allocation References: <20240215213916.385127578@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791002557721159437 X-GMAIL-MSGID: 1791002557721159437 From: "Steven Rostedt (Google)" The allocation of the struct saved_cmdlines_buffer structure changed from: s = kmalloc(sizeof(*s), GFP_KERNEL); s->saved_cmdlines = kmalloc_array(TASK_COMM_LEN, val, GFP_KERNEL); to: orig_size = sizeof(*s) + val * TASK_COMM_LEN; order = get_order(orig_size); size = 1 << (order + PAGE_SHIFT); page = alloc_pages(GFP_KERNEL, order); if (!page) return NULL; s = page_address(page); memset(s, 0, sizeof(*s)); s->saved_cmdlines = kmalloc_array(TASK_COMM_LEN, val, GFP_KERNEL); Where that s->saved_cmdlines allocation looks to be a dangling allocation to kmemleak. That's because kmemleak only keeps track of kmalloc() allocations. For allocations that use page_alloc() directly, the kmemleak needs to be explicitly informed about it. Add kmemleak_alloc() and kmemleak_free() around the page allocation so that it doesn't give the following false positive: unreferenced object 0xffff8881010c8000 (size 32760): comm "swapper", pid 0, jiffies 4294667296 hex dump (first 32 bytes): ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ backtrace (crc ae6ec1b9): [] kmemleak_alloc+0x45/0x80 [] __kmalloc_large_node+0x10d/0x190 [] __kmalloc+0x3b1/0x4c0 [] allocate_cmdlines_buffer+0x113/0x230 [] tracer_alloc_buffers.isra.0+0x124/0x460 [] early_trace_init+0x14/0xa0 [] start_kernel+0x12e/0x3c0 [] x86_64_start_reservations+0x18/0x30 [] x86_64_start_kernel+0x7b/0x80 [] secondary_startup_64_no_verify+0x15e/0x16b Link: https://lore.kernel.org/linux-trace-kernel/87r0hfnr9r.fsf@kernel.org/ Link: https://lore.kernel.org/linux-trace-kernel/20240214112046.09a322d6@gandalf.local.home Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Cc: Catalin Marinas Fixes: 44dc5c41b5b1 ("tracing: Fix wasted memory in saved_cmdlines logic") Reported-by: Kalle Valo Tested-by: Kalle Valo Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index aa54810e8b56..8198bfc54b58 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -2339,6 +2340,7 @@ static void free_saved_cmdlines_buffer(struct saved_cmdlines_buffer *s) int order = get_order(sizeof(*s) + s->cmdline_num * TASK_COMM_LEN); kfree(s->map_cmdline_to_pid); + kmemleak_free(s); free_pages((unsigned long)s, order); } @@ -2358,6 +2360,7 @@ static struct saved_cmdlines_buffer *allocate_cmdlines_buffer(unsigned int val) return NULL; s = page_address(page); + kmemleak_alloc(s, size, 1, GFP_KERNEL); memset(s, 0, sizeof(*s)); /* Round up to actual allocation */