From patchwork Tue Jun 11 19:28:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 13694147 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 20319C27C75 for ; Tue, 11 Jun 2024 19:29:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC5CE6B00B6; Tue, 11 Jun 2024 15:28:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A75FC6B00BD; Tue, 11 Jun 2024 15:28:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93ED46B00BF; Tue, 11 Jun 2024 15:28:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 76D796B00B6 for ; Tue, 11 Jun 2024 15:28:59 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2B61C161634 for ; Tue, 11 Jun 2024 19:28:59 +0000 (UTC) X-FDA: 82219595598.04.B5EE30B Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf17.hostedemail.com (Postfix) with ESMTP id C8CDA4000C for ; Tue, 11 Jun 2024 19:28:56 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of "SRS0=hOOK=NN=goodmis.org=rostedt@kernel.org" designates 145.40.73.55 as permitted sender) smtp.mailfrom="SRS0=hOOK=NN=goodmis.org=rostedt@kernel.org"; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718134137; a=rsa-sha256; cv=none; b=fdflM40YpfYIxfmiqsT1tcB+Df7uGvQeHXG753bcJINt1SDal39Otrxv4Ly6LPdgW8iRnr M4t7s2BN1MhLS3MrLrGuiWYUBF7XG84Y84fZo7xT6c+/D9BF2Oroe2keLIPxsO8JtVQyjX 7sgyrybfp7QA/QBnDyVbRbyqctTN5Rg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of "SRS0=hOOK=NN=goodmis.org=rostedt@kernel.org" designates 145.40.73.55 as permitted sender) smtp.mailfrom="SRS0=hOOK=NN=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=1718134137; 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=68yH1u0KRVrYja+hJwggZ3BPrRc+wYrdyMocq3AtVxXSWiyDu3KZKaHzBsiMtrjpoUhO/I Y/AKkCQBPgDX/QXSaMA8Cgtmissxt21xgW5ZOk+1x5+YhQ7Tq5Oj6/ZQAoHCC2x5ydq1oz sAv5PrIZlAuUSodiaLmFyM9hbJHfweg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 5C615CE1DBE; Tue, 11 Jun 2024 19:28:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 322CAC4AF50; Tue, 11 Jun 2024 19:28:52 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1sH7B6-00000001TtR-2laI; Tue, 11 Jun 2024 15:29:08 -0400 Message-ID: <20240611192908.518698789@goodmis.org> User-Agent: quilt/0.68 Date: Tue, 11 Jun 2024 15:28:36 -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 v4 08/13] tracing: Add option to use memmapped memory for trace boot instance References: <20240611192828.691638177@goodmis.org> MIME-Version: 1.0 X-Stat-Signature: egdwxdk4yozkhmup5z1heg7wahipyemg X-Rspamd-Queue-Id: C8CDA4000C X-Rspamd-Server: rspam04 X-Rspam-User: X-HE-Tag: 1718134136-272769 X-HE-Meta: U2FsdGVkX1+8GX+8agX3G3NBJzJmJh8s5f1Y6T5//Yqc4riU5ScylG43C8ZxTH+8tWNzk7aEIWwYzEuYoZEfh923SFUSz1GqHriXCL0PQ3olj57YLzM2FnfSJHnCxCrFRNP572reBUg321ihIgf31Z7c3I15ZqGUrKFqj+3hqyJVUGNGCNaZdKt9Htkpakhr62fj1pPcvhBEaDCHyAXs3jRJb6ujBBksw9NVsc+GQLzqqLMcz0CYr3ZkVvkv4Icy/7mP8NLEJ4XanLdGpFBvtW1ael7djsEdf/rfnngVpj0cAChHZYxgnxHAQ+M8Ehd/dmxM7qpQZsQWg8ln0yFg/WC9KVRVCd6uOlVJwE+szN8/Ql7n5Aq0F+uH1bECiL7ANWNEUbQ1M3DL9W01v5ZJc3YVoR5NEXjK01+AiGldDAyHL3aU7I6/3voXo0CjgFUqHkX5YlRsTeVfjOXmQu9ulliSy/6NYQwFbEvfQxZ5I+bcqtsr8f4RqUKAjYln3lZ9Q6JVpSMpxgQ2q4RLmOp1dDzq15GvLu2O6DaXznB5qE3RWM1iin6iN3P+f9U8npBs68QmVv7loRpUilLCOBkqqRNuqwOEgWp7Q8VwQ82FQ8L6mYIbHgD8trctJEJDicW84nvMHRU0QNnUj8jXoUDmPC8J8dWfj1FdEcZvF/9KGfWZQhbbYj1wKD78vd1Zt6yLUJ8U5dD0BVL7qDQ+Z5IGFH6DkivvEUUtu4dDxYJLhB93cBOztVNuJsVmUaQ4gnSJmDZY/aGuVi1TKgr8V2MUo3dLTPLiqn3/hBh42DoEyoBu6kbh8b1HHPk49nHFxvCjLlOhSkgULox2eCADurG29Hl1Py70xTbMWNNCHbqmDxUU+AAicncDcSpJ4rGZVhUvokFmTSMsGjGo9qAmjVYqSbcVqDJuhJk9pW5lvL0eilPIREQLgEs1hd33D9ijlkUD8JkCGQrd8u5TRlWDb2l KKkHq/r+ GpI1Q2mhRpI1yuAMsbNTYAg3PkAue3WmdzBuxTkjdS5dlZ8cE4kRBlAo2i5NXCGImrvF9FqUW+0dp56jnu25+k3ZnxG9NaNkuBTcw4+A89v7daDyf0djCNpLWLvIGFryCtzpbXKDCs9QKMSMAfK4wtZ/ZAC13jMLj7N+4CbDE0RRYOtzjfnDi3+u662lyRW21EeDmwMkqVjJ9AYYOqN256iJqza3/XUqcnuNQC+e0X1Od/nda78a1TF79fLBlcEF1GcMM7eTBb2Udh2PZTtIvUL+lrlWaLbjopd54LYQie3iboLqkM9F7sqZmczWn97aSi/Zjfh5ugGVlg0M4DInpbuzSABYhP3i/1EHxwGqwcvpGyuEQSkX+utiPzHVVNZUpFLhofoTsC2+z4TubTEDXkUjpk0eJdo1D2PRY 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);