From patchwork Wed Jun 12 23:19:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 13695646 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 C6F4EC27C53 for ; Wed, 12 Jun 2024 23:20:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC5A96B0089; Wed, 12 Jun 2024 19:20:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C4E3E6B008C; Wed, 12 Jun 2024 19:20:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC7E76B0092; Wed, 12 Jun 2024 19:20:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8A0496B0089 for ; Wed, 12 Jun 2024 19:20:15 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2441A40602 for ; Wed, 12 Jun 2024 23:20:15 +0000 (UTC) X-FDA: 82223807190.02.381DC95 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf25.hostedemail.com (Postfix) with ESMTP id E07A6A0004 for ; Wed, 12 Jun 2024 23:20:11 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of "SRS0=9b5n=NO=goodmis.org=rostedt@kernel.org" designates 145.40.73.55 as permitted sender) smtp.mailfrom="SRS0=9b5n=NO=goodmis.org=rostedt@kernel.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718234412; 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: references:references; bh=ThqnLmRpsQGN4xu6Y6odrqca3Sbrpfi9MpT8PdxlZgU=; b=jKEDkeePo3J1KFuyYPNOff0T5bWS1hayUQmIU/7SvBD5MqlxKMJ3PUYDiyXqsqcsCmaQx3 LBXmjh68SxIoDKaJNoEchOzfpzxffIYn/TEsvf4prqgOpN+wo/9UjEVoElrcKh2L7SAC46 fFMrsPXnw5jpvnw6/SiTqJPOLRYMeHo= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of "SRS0=9b5n=NO=goodmis.org=rostedt@kernel.org" designates 145.40.73.55 as permitted sender) smtp.mailfrom="SRS0=9b5n=NO=goodmis.org=rostedt@kernel.org"; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718234412; a=rsa-sha256; cv=none; b=X5q6bS6VsHh0iao8KErN+ifwUzL0zoAQhEgIVQxgsGOKTWy4CM05e70bHhboDAF4xwUFtM /Zo40zUk2A4YKcYZtNbvLHxlSibRqWfh59FfJIqG9y7I8Az1P2n5qOgQypD1COuk1CQAf0 IdUzUUZcwpgsKQdD8MDiN53lTgiS110= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 5849ECE23E6; Wed, 12 Jun 2024 23:20:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EEFEC4DDEF; Wed, 12 Jun 2024 23:20:07 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1sHXGU-00000001ddv-1zmX; Wed, 12 Jun 2024 19:20:26 -0400 Message-ID: <20240612232026.329660169@goodmis.org> User-Agent: quilt/0.68 Date: Wed, 12 Jun 2024 19:19:42 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Vincent Donnefort , Joel Fernandes , Daniel Bristot de Oliveira , Ingo Molnar , Peter Zijlstra , suleiman@google.com, Thomas Gleixner , Vineeth Pillai , Youssef Esmat , Beau Belgrave , Alexander Graf , Baoquan He , Borislav Petkov , "Paul E. McKenney" , David Howells , Mike Rapoport , Dave Hansen , Tony Luck , Guenter Roeck , Ross Zwisler , Kees Cook , linux-mm@kvack.org Subject: [PATCH v6 08/13] tracing: Add option to use memmapped memory for trace boot instance References: <20240612231934.608252486@goodmis.org> MIME-Version: 1.0 X-Stat-Signature: fnba5wo9h81spctpfahiu34bkxgoajsr X-Rspam-User: X-Rspamd-Queue-Id: E07A6A0004 X-Rspamd-Server: rspam02 X-HE-Tag: 1718234411-821474 X-HE-Meta: U2FsdGVkX1/fQlUHsehIDXbPEqDUfNTSdUljcCH9E9Zh+LsJYDldSv/MyD7awHSudN5HABbNxE+TuvrHM3m34lBNOKZQq5XFE0/PqZTW988RlwAlo30B3NocrgyjBU+F2/LqDoCrZ3uCX7GFp5HDffgVX42nZjJpT9cqQDrzbOOxbapaajV/qI2g3ufN5l7csGx14WTfNw6vnOFcfMeTNrusleSlDVxgSY6Y66HMbOXUU5AwPX+BzYeC8hwJFdDJprtKL/ZYhfDzyBPS49nSOGYReHhKgLGd3qags7xdwdTg2yfRFDIcLFq6JRgoWPzaypG70TG0DM0iU2K5rLKmsCutSiJXipsFWey87wPhYZKs7jSq4pAZuFZDorLpLobfO07EGwk7r/jO9rlIQkYLaWQBbE0ZiF8qIpfNZniW910WBeGDPyflqiY+BMAUEvNGmGNVG+1XAXOlFtUgAZkIJKyMqAH/Ln3dCeS8m3iwydavCx1JGNoEM1U9Ddsu+yUQNtz8PC6qLQws54twj2fL3BudHIzg5Iy+a1bD/TjGlvOjP+zHCox2N6luZSDNjx0TXDmTSZWd58TkHI984pRGdd97Qk/4fxv55WFsOg4p82oLCOxveRcrfC55R6bkzqrcfIWuciiLfCvCmDMKDQDR51LecMd67g5l+Efl/PrLcIUX3ZMGJOnmLSZw/5alW4GIhUx4JhehBBUv6/lLv7Yp9cHCEFymMPcs1qd9BgU6XWT4h05DKHdV2s2exB0KiUpMTOYeaBqKTUwl52DHWHYWRODVcCda6L1btCd5qwT8ksAqC6khbYRCaJA7zwq9aT+ssr9dpFH3uGu9AI6blVv8SNqy6Mq1V812GFoa/rFJxH2R1WyY9IttxWBJVqx0s72ZC+wOTP2P8zbIwNKIU0KPec+mWpKy60/IXQj4Vmg2tfn7FgHQKAIbCAJ9g83uBDObOR5ORHOpdbl/0bVWICG Sx1Jowng xA2qWm4nQNcVvyNlUex9HIvOgPN63WBrkAzQwZxe0Jhk0qQYWPN/CNe5WXMKp+qQ0ELuich8rmD0n/GYAJ9uLdKRrt1jUStJEvmQpmUCKXq8jzqT/yMqtkd36a0tPbxII3I10TuWk6Q8g2jOZlyB9gDqYx44PJPzvF1hyKyqD2uDMmNCMqvnBkzqcJYSgiIXqtCd6EpjZkSHBenW7hHE+m8k+eTLtxNsX4OznbvBrgIam5/hzsYxCTJJ7XxkrGsowFrWtCa/Hf7kdniEZu7e5kLu5KfDZ+tGfkFufcvr8VzAd1aqPOHq1kxJMKIat8sLk8ALxGGPKwVtTJikVmj/swP6VWkoY7XqV2SZF40QH0m6lNlu+c/4rmp/F3/+J/OrAlSMDiLvsXK5oisIcNzSnI6t2NXyNWnk1F7aX 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: From: "Steven Rostedt (Google)" Add an option to the trace_instance kernel command line parameter that allows it to use the reserved memory from memmap boot parameter. memmap=12M$0x284500000 trace_instance=boot_mapped@0x284500000:12M The above will reserves 12 megs at the physical address 0x284500000. The second parameter will create a "boot_mapped" instance and use the memory reserved as the memory for the ring buffer. That will create an instance called "boot_mapped": /sys/kernel/tracing/instances/boot_mapped Note, because the ring buffer is using a defined memory ranged, it will act just like a memory mapped ring buffer. It will not have a snapshot buffer, as it can't swap out the buffer. The snapshot files as well as any tracers that uses a snapshot will not be present in the boot_mapped instance. Cc: linux-mm@kvack.org Signed-off-by: Steven Rostedt (Google) --- .../admin-guide/kernel-parameters.txt | 9 +++ kernel/trace/trace.c | 75 +++++++++++++++++-- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index b600df82669d..ff26b6094e79 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6754,6 +6754,15 @@ the same thing would happen if it was left off). The irq_handler_entry event, and all events under the "initcall" system. + If memory has been reserved (see memmap for x86), the instance + can use that memory: + + memmap=12M$0x284500000 trace_instance=boot_map@0x284500000:12M + + The above will create a "boot_map" instance that uses the physical + memory at 0x284500000 that is 12Megs. The per CPU buffers of that + instance will be split up accordingly. + trace_options=[option-list] [FTRACE] Enable or disable tracer options at boot. The option-list is a comma delimited list of options diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 622fe670949d..dfde26aa3211 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9504,6 +9504,31 @@ static int instance_mkdir(const char *name) return ret; } +static u64 map_pages(u64 start, u64 size) +{ + struct page **pages; + phys_addr_t page_start; + unsigned int page_count; + unsigned int i; + void *vaddr; + + page_count = DIV_ROUND_UP(size, PAGE_SIZE); + + page_start = start; + pages = kmalloc_array(page_count, sizeof(struct page *), GFP_KERNEL); + if (!pages) + return 0; + + for (i = 0; i < page_count; i++) { + phys_addr_t addr = page_start + i * PAGE_SIZE; + pages[i] = pfn_to_page(addr >> PAGE_SHIFT); + } + vaddr = vmap(pages, page_count, VM_MAP, PAGE_KERNEL); + kfree(pages); + + return (u64)(unsigned long)vaddr; +} + /** * trace_array_get_by_name - Create/Lookup a trace array, given its name. * @name: The name of the trace array to be looked up/created. @@ -10350,6 +10375,7 @@ __init static void enable_instances(void) { struct trace_array *tr; char *curr_str; + char *name; char *str; char *tok; @@ -10358,19 +10384,56 @@ __init static void enable_instances(void) str = boot_instance_info; while ((curr_str = strsep(&str, "\t"))) { + unsigned long start = 0; + unsigned long size = 0; + unsigned long addr = 0; tok = strsep(&curr_str, ","); + name = strsep(&tok, "@"); + if (tok) { + start = memparse(tok, &tok); + if (!start) { + pr_warn("Tracing: Invalid boot instance address for %s\n", + name); + continue; + } + } - if (IS_ENABLED(CONFIG_TRACER_MAX_TRACE)) - do_allocate_snapshot(tok); + if (start) { + if (*tok != ':') { + pr_warn("Tracing: No size specified for instance %s\n", name); + continue; + } + tok++; + size = memparse(tok, &tok); + if (!size) { + pr_warn("Tracing: Invalid boot instance size for %s\n", + name); + continue; + } + addr = map_pages(start, size); + if (addr) { + pr_info("Tracing: mapped boot instance %s at physical memory 0x%lx of size 0x%lx\n", + name, start, size); + } else { + pr_warn("Tracing: Failed to map boot instance %s\n", name); + continue; + } + } else { + /* Only non mapped buffers have snapshot buffers */ + if (IS_ENABLED(CONFIG_TRACER_MAX_TRACE)) + do_allocate_snapshot(name); + } - tr = trace_array_get_by_name(tok, NULL); + tr = trace_array_create_systems(name, NULL, addr, size); if (!tr) { - pr_warn("Failed to create instance buffer %s\n", curr_str); + pr_warn("Tracing: Failed to create instance buffer %s\n", curr_str); continue; } - /* Allow user space to delete it */ - trace_array_put(tr); + + /* Only allow non mapped buffers to be deleted */ + if (!start) + trace_array_put(tr); while ((tok = strsep(&curr_str, ","))) { early_enable_events(tr, tok, true);