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 A6D8CC47258 for ; Wed, 17 Jan 2024 14:49:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 381566B010D; Wed, 17 Jan 2024 09:49:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 331426B010E; Wed, 17 Jan 2024 09:49:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1AA2D6B010F; Wed, 17 Jan 2024 09:49:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0791F6B010D for ; Wed, 17 Jan 2024 09:49:41 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CDA72120BD3 for ; Wed, 17 Jan 2024 14:49:40 +0000 (UTC) X-FDA: 81689086920.19.4F3BAF3 Received: from smtp-fw-33001.amazon.com (smtp-fw-33001.amazon.com [207.171.190.10]) by imf20.hostedemail.com (Postfix) with ESMTP id 6366B1C0019 for ; Wed, 17 Jan 2024 14:49:38 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=LQjmjpU+; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf20.hostedemail.com: domain of "prvs=7399cbc58=graf@amazon.de" designates 207.171.190.10 as permitted sender) smtp.mailfrom="prvs=7399cbc58=graf@amazon.de" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705502978; a=rsa-sha256; cv=none; b=6N89HlPD46BaT9q2OgP7/TLQ+veG+BCQg8Bv4BZd4J8aFDxXFg6lW7FsLDzdMjp7loQVSx jvYqVXVx27ncRp0n0G5hgEaaVNAiAGvFsZqn8iM7GOTuc+dO2qIwvkPVuIP+oBBJC02i09 /8LN+WRw2ETtdOwYecBoTXl83J4ObVk= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=LQjmjpU+; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf20.hostedemail.com: domain of "prvs=7399cbc58=graf@amazon.de" designates 207.171.190.10 as permitted sender) smtp.mailfrom="prvs=7399cbc58=graf@amazon.de" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705502978; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=U0hyYTkhSxvX6+T1x6RjDPfV1ywV5C7Siqc3ZcSpla8=; b=7fmm4gLHAujnCubeVaZqmPFfLDKSPZzwC1iFG3OFmZ8sAZUf6SDZrFBP0OvyqozTLg3fsv bYd05AJSch7Nz523rQuMJHQegni5w2pOP9k+tbmaknHCZgeANDFhMJXB8y8PFLA7mW564z NQBGSz5Dsj6pHZKAxb2KQaVzIaCh4So= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1705502979; x=1737038979; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U0hyYTkhSxvX6+T1x6RjDPfV1ywV5C7Siqc3ZcSpla8=; b=LQjmjpU+BNuFPbycuZHiU2n6pzClUJ52oglbKnArU6nBvOe/QTVzwPQH 0wQOT9rb6XlApqFPE1fQBKScg4W/XtE37zimHiJbDsmehJcSW41XbDuDj sw6DzHClE7BYbqtNuPnLMoUpBHa7gG9kkwxqKMJ6s89dw3o/wKzXpu46w A=; X-IronPort-AV: E=Sophos;i="6.05,200,1701129600"; d="scan'208";a="322019440" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-pdx-2b-m6i4x-14781fa4.us-west-2.amazon.com) ([10.43.8.6]) by smtp-border-fw-33001.sea14.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2024 14:49:29 +0000 Received: from smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev (pdx2-ws-svc-p26-lb5-vlan3.pdx.amazon.com [10.39.38.70]) by email-inbound-relay-pdx-2b-m6i4x-14781fa4.us-west-2.amazon.com (Postfix) with ESMTPS id 6A2AF160007; Wed, 17 Jan 2024 14:49:25 +0000 (UTC) Received: from EX19MTAUWB002.ant.amazon.com [10.0.38.20:54156] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.60.181:2525] with esmtp (Farcaster) id 512a89a9-fd01-4e5a-876b-90d048f33ffd; Wed, 17 Jan 2024 14:49:25 +0000 (UTC) X-Farcaster-Flow-ID: 512a89a9-fd01-4e5a-876b-90d048f33ffd Received: from EX19D020UWC004.ant.amazon.com (10.13.138.149) by EX19MTAUWB002.ant.amazon.com (10.250.64.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 17 Jan 2024 14:49:24 +0000 Received: from dev-dsk-graf-1a-5ce218e4.eu-west-1.amazon.com (10.253.83.51) by EX19D020UWC004.ant.amazon.com (10.13.138.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 17 Jan 2024 14:49:21 +0000 From: Alexander Graf To: CC: , , , , , , , Eric Biederman , "H . Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Steven Rostedt , Andrew Morton , Mark Rutland , "Tom Lendacky" , Ashish Kalra , James Gowans , Stanislav Kinsburskii , , , , Anthony Yznaga , Usama Arif , David Woodhouse , Benjamin Herrenschmidt , Rob Herring , Krzysztof Kozlowski Subject: [PATCH v3 12/17] tracing: Add kho serialization of trace buffers Date: Wed, 17 Jan 2024 14:46:59 +0000 Message-ID: <20240117144704.602-13-graf@amazon.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240117144704.602-1-graf@amazon.com> References: <20240117144704.602-1-graf@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.253.83.51] X-ClientProxiedBy: EX19D032UWB004.ant.amazon.com (10.13.139.136) To EX19D020UWC004.ant.amazon.com (10.13.138.149) Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6366B1C0019 X-Stat-Signature: utxcggqw4q7b1jeq19gp47hwsbi8udpe X-HE-Tag: 1705502978-587697 X-HE-Meta: U2FsdGVkX18qfse+mm49GyBnYS25o3z47a1WmOrXL1gENW/u81XhwWSEUny4Dia0A6XW+xR5vZwu2d3HL8TSTZRIbB7fbXvKMkFWPulhKdIrrJwDzeIH55eVOzrf8w8TEoLD6/7AkTRfzv1UAY6HKeNGduRdXZQDYS+RTcR2MFVe6PowD8dsMTRxZore9f0pTbkQO6p8cbp40Q0BP1QaZ1nY4XTejN9KDtuE1xEifHYFXonWauYbjC7B1yNYd18yiFmVdm+M1BTwSqnl/JJ65wmqRHQR5jl47FkM1J7446mBQvo6wmEKA/PDzFyb2PHbYeDtp2zbAPZntv4woRKIP0Vlu/y5oE+7EIu0xzLH4xVb/LInioCVfaP+FBJboNfEIqvaQ7077mKyLso22Bq181sdtfWp/Q5t8NkQDICG+wfZnDplyi57SoIyJfEPzQUx+rjCo1DBKASF6a/tqi/8ykEgKd6wVMf26CaHd9XGboXHdWmtzZaosVWqRZueoD4PwNubNmZRYLNBVpLG61PBMQ3v1o43Ca57Hp6D1jDK6T5IMl/SFxqmbsXFsSgzqhAxog6mmP/mz5Yg2e0fvkKx8Cd07FLX0vbopZ2Oku8etAJ/rz1N/b8nyOsp1sGzumcTgEdGvE8k2ZzRCjmTeQn9s4xcPAJjnXYah7Utd50YlizWwyASQi0cqq5bo6fFd/yhQrpgahZvq55gny3zN05YgPnrJG9EI/R4agbMddnOgIYy1dhmgS7r7W/APq8jCghe9AJOd3VK3FVbzPc/cvHa8lQ2edFFqs151Ye65kzKwwRBwK1slstm8mhEZ/3Eq0XgRkzvwgG8SXKIE5zLx18G6BZmepHoJYF79p8HGsyI/eSO62fwN+BTXOjLVKC6u64GwO/0qKF2IQKawZXfvlxAgprKVns5mR+aPHbdA6snvFnfSbSYmQXLMVawaEVHkWBjsy8J+5dvVH+3rXoMkFW Zl5A6hv2 SdWy8c+v2vwhIERbw6xqc0RRr033RGW3B3Gxz7LxGjtzpusctrdjQXbPFb3xkibS3e7I5vVZcs9OR5DQT+cYcXQhQgk3oqj6KSQk47kYBiElYaQEPJ1ILnmZznzjMzdxgbWWXntFi67E8v3vksBJRHINUgJjhqtNDoWGCWlJFnb9Pchy95rrTfiBANBRUg++7OC9Of45JwWin8iu6SOsYY01KxzIGt49OgnWzT4Y7RlLTXnWqvYn1M4JMpKWFvH/P4nmRZ6/diCtPjvQfmrulU0hT/uRUMnfWWQOG+v09TWB8VPdpl1c0qTEizRyTTefWWPPqOEHY55JVz4i1GHKFgdBI9s/IjxHR6gsM9uvHB7INWY54KmGhbvfNXc3LYrmqj55hWPRMnwIALubrCiynItZM5dPmAzNgNxtvL0F5IfJYzy94wvy8jIEj5/p2ZUOgg1JQ3XP2+Ido4lkh7w1KQXxgYGJoYqxGE4/FpwNOYSLQGQR0DY07WAcdPW4FjVsDUDwbBbbgLKevqRKbxYNsa4rI/Gb1hTBZAc2R2twxZ+R3yKUnNDtycsL5CxSod9DUVZ/12KLM4w49eFMc+4ZRl988ApGyeuGcr6SvZr902brtcfAPEb4XbAxMasHKcPmvbmIdj1HLgWfy58pmL6UMklgu5w== 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: When we do a kexec handover, we want to preserve previous ftrace data into the new kernel. At the point when we write out the handover data, ftrace may still be running and recording new events and we want to capture all of those too. To allow the new kernel to revive all trace data up to reboot, we store all locations of trace buffers as well as their linked list metadata. We can then later reuse the linked list to reconstruct the head pointer. This patch implements the write-out logic for trace buffers. Signed-off-by: Alexander Graf --- v1 -> v2: - Leave the node generation code that needs to know the name in trace.c so that ring buffers can stay anonymous v2 -> v3: - s/"global_trace"/"global-trace"/ - s/"trace_flags"/"trace-flags"/ --- include/linux/ring_buffer.h | 2 + kernel/trace/ring_buffer.c | 76 +++++++++++++++++++++++++++++++++++++ kernel/trace/trace.c | 16 ++++++++ 3 files changed, 94 insertions(+) diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 782e14f62201..1c5eb33f0cb5 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -211,4 +211,6 @@ int trace_rb_cpu_prepare(unsigned int cpu, struct hlist_node *node); #define trace_rb_cpu_prepare NULL #endif +int ring_buffer_kho_write(void *fdt, struct trace_buffer *buffer); + #endif /* _LINUX_RING_BUFFER_H */ diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 9286f88fcd32..33b41013cda9 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -5859,6 +5860,81 @@ int trace_rb_cpu_prepare(unsigned int cpu, struct hlist_node *node) return 0; } +#ifdef CONFIG_FTRACE_KHO +static int rb_kho_write_cpu(void *fdt, struct trace_buffer *buffer, int cpu) +{ + int i = 0; + int err = 0; + struct list_head *tmp; + const char compatible[] = "ftrace,cpu-v1"; + char name[] = "cpuffffffff"; + int nr_pages; + struct ring_buffer_per_cpu *cpu_buffer; + bool first_loop = true; + struct kho_mem *mem; + uint64_t mem_len; + + if (!cpumask_test_cpu(cpu, buffer->cpumask)) + return 0; + + cpu_buffer = buffer->buffers[cpu]; + + nr_pages = cpu_buffer->nr_pages; + mem_len = sizeof(*mem) * nr_pages * 2; + mem = vmalloc(mem_len); + + snprintf(name, sizeof(name), "cpu%x", cpu); + + err |= fdt_begin_node(fdt, name); + err |= fdt_property(fdt, "compatible", compatible, sizeof(compatible)); + err |= fdt_property(fdt, "cpu", &cpu, sizeof(cpu)); + + for (tmp = rb_list_head(cpu_buffer->pages); + tmp != rb_list_head(cpu_buffer->pages) || first_loop; + tmp = rb_list_head(tmp->next), first_loop = false) { + struct buffer_page *bpage = (struct buffer_page *)tmp; + + /* Ring is larger than it should be? */ + if (i >= (nr_pages * 2)) { + pr_err("ftrace ring has more pages than nr_pages (%d / %d)", i, nr_pages); + err = -EINVAL; + break; + } + + /* First describe the bpage */ + mem[i++] = (struct kho_mem) { + .addr = __pa(bpage), + .len = sizeof(*bpage) + }; + + /* Then the data page */ + mem[i++] = (struct kho_mem) { + .addr = __pa(bpage->page), + .len = PAGE_SIZE + }; + } + + err |= fdt_property(fdt, "mem", mem, mem_len); + err |= fdt_end_node(fdt); + + vfree(mem); + return err; +} + +int ring_buffer_kho_write(void *fdt, struct trace_buffer *buffer) +{ + int err, i; + + for (i = 0; i < buffer->cpus; i++) { + err = rb_kho_write_cpu(fdt, buffer, i); + if (err) + return err; + } + + return 0; +} +#endif + #ifdef CONFIG_RING_BUFFER_STARTUP_TEST /* * This is a basic integrity check of the ring buffer. diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 9a0d96975c9c..9505a929a726 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -10577,6 +10577,21 @@ void __init early_trace_init(void) init_events(); } +static int trace_kho_write_trace_array(void *fdt, struct trace_array *tr) +{ + const char *name = tr->name ? tr->name : "global-trace"; + const char compatible[] = "ftrace,array-v1"; + int err = 0; + + err |= fdt_begin_node(fdt, name); + err |= fdt_property(fdt, "compatible", compatible, sizeof(compatible)); + err |= fdt_property(fdt, "trace-flags", &tr->trace_flags, sizeof(tr->trace_flags)); + err |= ring_buffer_kho_write(fdt, tr->array_buffer.buffer); + err |= fdt_end_node(fdt); + + return err; +} + static int trace_kho_notifier(struct notifier_block *self, unsigned long cmd, void *v) @@ -10603,6 +10618,7 @@ static int trace_kho_notifier(struct notifier_block *self, err |= fdt_begin_node(fdt, "ftrace"); err |= fdt_property(fdt, "compatible", compatible, sizeof(compatible)); + err |= trace_kho_write_trace_array(fdt, &global_trace); err |= fdt_end_node(fdt); if (!err) { -- 2.40.1 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879