From patchwork Wed Feb 14 15:26:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 200988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp1288863dyb; Wed, 14 Feb 2024 07:25:08 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV6yA8g7Y8m2+KZk3PRH7BO5ZFE9mzNUpoCiMrlv4DTR1abHlTD9e580hf8p2sMwxMsoa0vj1pTbU6OFAWXbzjg64dDSA== X-Google-Smtp-Source: AGHT+IGYhcVOltPIzfLmhBGomNSyoaoT0iFt2IJ/OdmCLNrTbZOxz4Y6fgSODQu2+lhc+yAaHrqi X-Received: by 2002:a17:906:2993:b0:a3c:de7:f59a with SMTP id x19-20020a170906299300b00a3c0de7f59amr1903631eje.60.1707924308139; Wed, 14 Feb 2024 07:25:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707924308; cv=pass; d=google.com; s=arc-20160816; b=CjZp0fVWmkqB6Xm2MYcgoDi6KmD0kHviMAz6TtPJ0nJ+4Lus9cithufymTDcFGdSVn WpIAd7F3t2GWOM5oAwV8bFksNcYORHBWhglnvlqIxktTC/WT6fVimEYjWFsdZ7zO+UmR SRT5zOtunZv7jqKe6qB3REfV2O/R1vIjA0Q2tX6eSV+6g55VQz/iFwMZKZNIJKCJYHcN QCy52Q1vJ2MLVv3e4Bj1vobKM2Kh3yDZMOtpoDj8pySBfOnjmXE7UuDNxPpLZe+vigoZ cfCCDc1RY1x4L5pQ+86gFb/eMP2sf0+pOgyk0LQERqP77/QQg4eEiKdrAFev19ZBADd1 j4/Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:subject:cc:to:from :date; bh=mkCdyD3nq2AbfL4ubGPidbtzTrY6wNfyBrNOogKA2AA=; fh=Fu7J1FtjEsiWajvgxyZVI9YAqNMMLix7iilU8vdhtsI=; b=oPzjMUgvX7pS2ux4W7QYwXilZ9xEZ5UShy3kl6fwfGn6O/CUEn6ACyqf2FB1GDQSKb jnB9LX/VZuUP2jxzbQAfw8XeKquGahcKeApbBKUE1ytYsz0ej2yGc+BOkI2aMFDtQR8i 3uEy9Wys7n8WmNkoZ/vkUSx2mDBvrPbFtbNjnr3cuwChtwhExbjQBVOlzTcGQRfqHrcT s7TWI1DFSzpZweM7xOZ3LP4ko2oX214MuEwbN8PlwnzdEsajC9Y6Ty7XkB1oxTKi8xh9 YtRLDNnyz/qfRIjQUmVVPE5g2KFmOX99Zdo9HYFGcn92Qjv2/E/gh6muw9CORfPIqcda sHOA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-65413-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-65413-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCU0W+AHREablxQy/Neilf4lV9OgycVYRWin34RO5EW9HseKhflv9FWjkeEhpckISG3lmljUtAvSd2dhetXeG7S2PIMfng== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id b19-20020a1709062b5300b00a3d045e19e4si1647550ejg.563.2024.02.14.07.25.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 07:25:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-65413-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-65413-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-65413-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 A67471F221A4 for ; Wed, 14 Feb 2024 15:25:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6D6675C604; Wed, 14 Feb 2024 15:24:46 +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 F36AB5C615; Wed, 14 Feb 2024 15:24:44 +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=1707924285; cv=none; b=LiEh+jnjVNLmCKQEQHgBa3Ar96ycPyvinv/8PunXOcCQ5n/+ruSXBvHll0SxM+83OYnvu5GmAiT/Gmv+V+3+6scizq+koasZSOqWNLy4X/cpjbf3DypxqOQWL1aNtxdwPcmyvDjg2dHUbPTqrM2e+6Oi0qUhzqBjhAHw4g4J/w8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707924285; c=relaxed/simple; bh=L5cnEPgQBCTKATmDrlFkB5ENVPxihI25y/FHUbAZsmc=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=KKXRN0leKqSplbb8E1wFXYLgDUAS+Ez+kDZFt1ipgMCJmopXfi2oLI9LRSWRFHqA2Vz27FEXVnXcTNFfH7hRkMxlj5aj7Y4DYIYOPUEwxz90a6vcag4noMyvvD1y75hS52qMHAGgeHPpN7ZXbPf9bc9Zd/omh3KAlFCd3XuzLYY= 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 A1613C433C7; Wed, 14 Feb 2024 15:24:43 +0000 (UTC) Date: Wed, 14 Feb 2024 10:26:14 -0500 From: Steven Rostedt To: LKML , Linux Trace Kernel Cc: Masami Hiramatsu , Mathieu Desnoyers , Kalle Valo , Catalin Marinas Subject: [PATCH] tracing: Inform kmemleak of saved_cmdlines allocation Message-ID: <20240214102614.1a1405be@gandalf.local.home> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) 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: 1790888439437530878 X-GMAIL-MSGID: 1790888439437530878 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/ Fixes: 44dc5c41b5b1 ("tracing: Fix wasted memory in saved_cmdlines logic") Reported-by: Kalle Valo Signed-off-by: Steven Rostedt (Google) Reviewed-by: Catalin Marinas --- kernel/trace/trace_sched_switch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c index e4fbcc3bede5..de4182224ea2 100644 --- a/kernel/trace/trace_sched_switch.c +++ b/kernel/trace/trace_sched_switch.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "trace.h" @@ -190,6 +191,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); } @@ -210,6 +212,7 @@ static struct saved_cmdlines_buffer *allocate_cmdlines_buffer(unsigned int val) s = page_address(page); memset(s, 0, sizeof(*s)); + kmemleak_alloc(s, size, 1, GFP_KERNEL); /* Round up to actual allocation */ val = (size - sizeof(*s)) / TASK_COMM_LEN;