From patchwork Wed Jan 17 14:47:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 13521812 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 4080CC47DA2 for ; Wed, 17 Jan 2024 14:49:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA7CE6B0104; Wed, 17 Jan 2024 09:49:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C31226B0106; Wed, 17 Jan 2024 09:49:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD21F6B0105; Wed, 17 Jan 2024 09:49:38 -0500 (EST) 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 9E19E6B0103 for ; Wed, 17 Jan 2024 09:49:38 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3DBD6C0BCC for ; Wed, 17 Jan 2024 14:49:38 +0000 (UTC) X-FDA: 81689086836.13.A79C6FC Received: from smtp-fw-9105.amazon.com (smtp-fw-9105.amazon.com [207.171.188.204]) by imf22.hostedemail.com (Postfix) with ESMTP id 15DFEC000C for ; Wed, 17 Jan 2024 14:49:35 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=iFsVCWLN; spf=pass (imf22.hostedemail.com: domain of "prvs=7399cbc58=graf@amazon.de" designates 207.171.188.204 as permitted sender) smtp.mailfrom="prvs=7399cbc58=graf@amazon.de"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705502976; 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=ruxorAX7sTRaNP9DeVEeTzlVbb3kqSKxCB0MMvWdBXg=; b=ConeO3Kdkj81huUe60ki9xnQ/l9/21uNbLSCAQ1QwMt3mTGyzLoSSHK/eGd/w+GcaJqHrg OhCUapCyED1MmAvM0Yaz2rw1casSVzLepGMfUnYyPpKkVhZsrVC8fbyWPqxh2+3J/cPRUg MhOIeQwcqGXS+uW2PjQB+jBc130zAgM= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=iFsVCWLN; spf=pass (imf22.hostedemail.com: domain of "prvs=7399cbc58=graf@amazon.de" designates 207.171.188.204 as permitted sender) smtp.mailfrom="prvs=7399cbc58=graf@amazon.de"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705502976; a=rsa-sha256; cv=none; b=l8bPw5/wNILkFzhQeYrF8YjOuQjv0ZuuRsrL6mNhsFtYMU3o+B8M2QPWQoip1fltuLoMPc qzcIyzf4ZFQ3FJ8uM2204pXpmEdwMUnGi1wY1PsflMvhcZ/5qJ/CcuMtg7fc1QX3HtWTo/ Rp8eygeE7UC17+25XSHfpbXs8s5FRpI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1705502977; x=1737038977; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ruxorAX7sTRaNP9DeVEeTzlVbb3kqSKxCB0MMvWdBXg=; b=iFsVCWLNKEtbpWPJEm+5ELderzmtK2EUKvJ41ttX98/n/FZEwp6JzjZM VaZF0I57BC0YabHV2pGeyV1qeKLO179YQAEj+GPDgKOn3nfl8cHb2Wihy lmQ4wAayjIJ+xSAq/hcsi3l4t+2pgOQqACVwHFKq/gxIKqiCPIXOOooe3 M=; X-IronPort-AV: E=Sophos;i="6.05,200,1701129600"; d="scan'208";a="698396273" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-pdx-2c-m6i4x-8c5b1df3.us-west-2.amazon.com) ([10.25.36.210]) by smtp-border-fw-9105.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2024 14:49:35 +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-2c-m6i4x-8c5b1df3.us-west-2.amazon.com (Postfix) with ESMTPS id 6E2D040D43; Wed, 17 Jan 2024 14:49:33 +0000 (UTC) Received: from EX19MTAUWB001.ant.amazon.com [10.0.21.151:11385] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.63.213:2525] with esmtp (Farcaster) id 8d349bb0-742a-4194-b22b-5d064281ea8f; Wed, 17 Jan 2024 14:49:33 +0000 (UTC) X-Farcaster-Flow-ID: 8d349bb0-742a-4194-b22b-5d064281ea8f Received: from EX19D020UWC004.ant.amazon.com (10.13.138.149) by EX19MTAUWB001.ant.amazon.com (10.250.64.248) 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:32 +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:29 +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 14/17] tracing: Add kho serialization of trace events Date: Wed, 17 Jan 2024 14:47:01 +0000 Message-ID: <20240117144704.602-15-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) X-Rspamd-Queue-Id: 15DFEC000C X-Rspam-User: X-Stat-Signature: 5btqwpa685skuis5ssc8owuekpw1wzf7 X-Rspamd-Server: rspam01 X-HE-Tag: 1705502975-134985 X-HE-Meta: U2FsdGVkX1+wyLpNTyrTpLM1Ltby5QCXQY2bdp8V0vv+YwNkN8YYC+fgmMW4Juhi7SXWBW3omd1LLJNiL30T+A3lTFQNRL8nBNwVUtsk2y9hmaVuyOTl3OVIVPqPV6V3h0oYqNwJ8I6GRTrxO+W9Zm7E5hO8p18jKpamJw0IEFqCMwJAe6OtUrmul83YbeWT+DUkYgwwIMb44zz2nU4Ye9CbTEy9kMzN7cvxheEBa9QnGsT99JPrhvDY+qt9B4Jl/YqXcEzXustjhxgaI7J41fLq6+Z6x2lgS7InzmAOjDx8ESgXid0hCEC0GoyBHtV/qvhyZAwQHE7neXHHQHY0aivzQcD6UvXOB5PsDwylIjxGdy5pVfzQzAQpUgZYaNJMRXkH1CqEZI4zO8OlnMZNPYz6gB5Etxqo5Lnl88SmXYPMeDpj5wac3YVbmELTE2rrcmJgdviXxbLfpR7fXppx94sHLwvuRf38xRoD56yce/ZbqHgp4Bsc6Y0qTHpESTMz3TROsjBDvbGw/hJCHZHxUqI4TI1bgulrnQAEbD/ZTnmEkOYiEH6svRndiKdXo4n5+fAho6UAPwmo9lcblH9u3tIBMEy8DwI2hQQcjTw64VnITkQtq9EcWrDYAEL3ZjmCbR8qHZJWlmft6TAY/lqzuy/8N3dcEksLq3/OEU1rrRRd08G4ly0n6MCTvX/wbewjG4MbWIwpC23eZrrRy/BWhXTtP4hzSu/6PVqtyz1nmsY9Ioz6uxweZhoXKFeO2PrEYCXTpEcQiymiKjhqJ0M6ujQGtul0E2d7k2GcvEBXM/folgdEODWh0Msz5dbgMrfhXPx+AfwgVDYXfC31SQ4m+IQ9xoy+hISnz5+BFaZVmRmkcM5b9u81NB7RmuXy0lEGGSqseBc5OQ3NRQNYmHNeSQoi3qBrrlGa1CC5vKqYdCAM7tVcJP5cLmkx27stahfO1ENARMCb4oLVxnwK6mW MKuu5Bfs SPF2N1o/ku1GlzS8LIB9rYlSq9mA0Dup4Zz9LjPahmCKxIq3pkz4zZqRZwt0Rw1sS0iNGvRh/lj68SWfxbZWpzspGqToKu7RmvsbZXUMz9xaCu+sWALSWnRe1vsrHZu4JrFz+3o3xb7WTSkbTEAIcSMdvVlnmNHb22MT6bgb74ZNq95F1wklB1FynEXzf+XzbCCAc2lRRAxqKbKHunlx0pZ8QY+AfbgMvIkeQ5iK6r2HNUq4NTUfo8Ma3CBicCMoBhcCaOKJKvonbjRTf/KSC0o3mBHPM37teJncfsGYSL1/qsctIdhEnd5wmiazM2lGOVe7wqM7y22NV4+lxZwu3utPGao/nwRHF59AOl+my2aJYxdZyfv/uRn1fcmGm7IuBZypd1COy/vAvjZtIiCKkamzVtHzKBYHc/VbOtUyV+nzBJwzp1pgYV+dV3C+g12KMDSerqps/241S/9YBulU7O8DZCF/GCZzCDXHmxZX2bUiJ0ZVCjdxJVlsG14cB7aEkcNaM31JdYNDoNNlB5RZYTG5z1oQXXzbfQR+mbxAnDoir7EMdBxOyGB38n4BCkCDY89kfXZwDFArIZHZ0+n9SGtIXxBmGCp3NQQ9Psqq8zXZ79AklTKK+wKtv/g== 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: Events and thus their parsing handle in ftrace have dynamic IDs that get assigned whenever the event is added to the system. If we want to parse trace events after kexec, we need to link event IDs back to the original trace event that existed before we kexec'ed. There are broadly 2 paths we could take for that: 1) Save full event description across KHO, restore after kexec, merge identical trace events into a single identifier. 2) Recover the ID of post-kexec added events so they get the same ID after kexec that they had before kexec This patch implements the second option. It's simpler and thus less intrusive. However, it means we can not fully parse affected events when the kernel removes or modifies trace events across a kho kexec. Signed-off-by: Alexander Graf --- v1 -> v2: - Leave anything that requires a name in trace.c to keep buffers unnamed entities - Put events as array into a property, use fingerprint instead of names to identify them - Reduce footprint without CONFIG_FTRACE_KHO v2 -> v3: - s/"global_trace"/"global-trace"/ --- kernel/trace/trace.c | 3 +- kernel/trace/trace_output.c | 89 +++++++++++++++++++++++++++++++++++++ kernel/trace/trace_output.h | 5 +++ 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index a5d7f5b4c19f..b5a6a2115b75 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9364,7 +9364,7 @@ init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer); static int trace_kho_off_tr(struct trace_array *tr) { - const char *name = tr->name ? tr->name : "global_trace"; + const char *name = tr->name ? tr->name : "global-trace"; const void *fdt = kho_get_fdt(); char *path; int off; @@ -10648,6 +10648,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_events(fdt); err |= trace_kho_write_trace_array(fdt, &global_trace); err |= fdt_end_node(fdt); diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 3e7fa44dc2b2..7d8815352e20 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include "trace_output.h" @@ -669,6 +671,93 @@ int trace_print_lat_context(struct trace_iterator *iter) return !trace_seq_has_overflowed(s); } +/** + * event2fp - Return fingerprint of an event + * @event: The event to fingerprint + * + * For KHO, we need to match events before and after kexec to recover its type + * id. This function returns a hash that combines an event's name, and all of + * its fields' lengths. + */ +static u32 event2fp(struct trace_event *event) +{ + struct ftrace_event_field *field; + struct trace_event_call *call; + struct list_head *head; + const char *name; + u32 crc32 = ~0; + + /* Low type numbers are static, nothing to checksum */ + if (event->type && event->type < __TRACE_LAST_TYPE) + return event->type; + + call = container_of(event, struct trace_event_call, event); + name = trace_event_name(call); + if (name) + crc32 = crc32_le(crc32, name, strlen(name)); + + head = trace_get_fields(call); + list_for_each_entry(field, head, link) + crc32 = crc32_le(crc32, (char *)&field->size, sizeof(field->size)); + + return crc32; +} + +struct trace_event_map { + u32 crc32; + u32 type; +}; + +static int __maybe_unused _trace_kho_write_events(void *fdt) +{ + struct trace_event_call *call; + int count = __TRACE_LAST_TYPE - 1; + struct trace_event_map *map; + int err = 0; + int i; + + down_read(&trace_event_sem); + /* Allocate an array that we can place all maps into */ + list_for_each_entry(call, &ftrace_events, list) + count++; + + map = vmalloc(count * sizeof(*map)); + if (!map) + return -ENOMEM; + + /* Then fill the array with all crc32 values */ + count = 0; + for (i = 1; i < __TRACE_LAST_TYPE; i++) + map[count++] = (struct trace_event_map) { + .crc32 = count, + .type = count, + }; + + list_for_each_entry(call, &ftrace_events, list) { + struct trace_event *event = &call->event; + + map[count++] = (struct trace_event_map) { + .crc32 = event2fp(event), + .type = event->type, + }; + } + up_read(&trace_event_sem); + + /* And finally write it into a DT variable */ + err |= fdt_property(fdt, "events", map, count * sizeof(*map)); + + vfree(map); + return err; +} + +#ifdef CONFIG_FTRACE_KHO +int trace_kho_write_events(void *fdt) +{ + return _trace_kho_write_events(fdt); +} +#endif + + /** * ftrace_find_event - find a registered event * @type: the type of event to look for diff --git a/kernel/trace/trace_output.h b/kernel/trace/trace_output.h index dca40f1f1da4..07481f295436 100644 --- a/kernel/trace/trace_output.h +++ b/kernel/trace/trace_output.h @@ -25,6 +25,11 @@ extern enum print_line_t print_event_fields(struct trace_iterator *iter, extern void trace_event_read_lock(void); extern void trace_event_read_unlock(void); extern struct trace_event *ftrace_find_event(int type); +#ifdef CONFIG_FTRACE_KHO +extern int trace_kho_write_events(void *fdt); +#else +static inline int trace_kho_write_events(void *fdt) { return -EINVAL; } +#endif extern enum print_line_t trace_nop_print(struct trace_iterator *iter, int flags, struct trace_event *event);