From patchwork Wed Dec 13 00:04:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 13490150 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 344F4C35274 for ; Wed, 13 Dec 2023 00:07:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6D086B03F8; Tue, 12 Dec 2023 19:07:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C1D876B03F9; Tue, 12 Dec 2023 19:07:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A98986B03FA; Tue, 12 Dec 2023 19:07:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 948AA6B03F8 for ; Tue, 12 Dec 2023 19:07:33 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5DC7F120A94 for ; Wed, 13 Dec 2023 00:07:33 +0000 (UTC) X-FDA: 81559855986.05.4F75946 Received: from smtp-fw-80009.amazon.com (smtp-fw-80009.amazon.com [99.78.197.220]) by imf29.hostedemail.com (Postfix) with ESMTP id 33C25120019 for ; Wed, 13 Dec 2023 00:07:31 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=Vd8MHtcd; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf29.hostedemail.com: domain of "prvs=704f7accf=graf@amazon.de" designates 99.78.197.220 as permitted sender) smtp.mailfrom="prvs=704f7accf=graf@amazon.de" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702426051; 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=ijxY/skruFfgxp/KO2yhFBX0a87YYNVgJHNp25q/K2g=; b=8pxq9ef7tj9vQV3Z22Yjd3cG9m5dGbYkmMqJ57AA3rap9KRm0djGg6q/ufTQURLLU6Zyuu sRVF5tX/qVa9BQb/iKW7yViqd4qnvXrqSRmZoLvHryRz+W+bOcDDB4IZHfEwE/zjrkIoV/ I4UUvVv7rZy4Yxxl6bEAl7xI4LRfUXk= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=Vd8MHtcd; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf29.hostedemail.com: domain of "prvs=704f7accf=graf@amazon.de" designates 99.78.197.220 as permitted sender) smtp.mailfrom="prvs=704f7accf=graf@amazon.de" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702426051; a=rsa-sha256; cv=none; b=IMT+yjrDU3MLh/X61etGfJccexSUPrqiH6EDAqw+0x4vyVKdcz7XOS6KWEDwAxgPg4c12z KvvwB6sWSJdQuqGjgBeEtNHnFa7abxfHktyPp6fbO4qEwH+UPPOY5DkZ0yQ2ZLGuDmIBQd 4wtBdJFhqArLZM4skp/SMkAIfJj9lOA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1702426051; x=1733962051; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ijxY/skruFfgxp/KO2yhFBX0a87YYNVgJHNp25q/K2g=; b=Vd8MHtcdaudKrb3RrBAHReqYpyUIwQIB4O6c9StD8QprE/Rvm/ivyBlQ dJC7gY1dinV1Y8B16b2MfPyGSpSkHDaPsRY9ITqmxjO4ghGqx7GH7KscC OtDNMKXCE+rFwYXqc0R6s+28ytDdZc9Yq32+pVXLSmPn2w+v/loJKdFJU c=; X-IronPort-AV: E=Sophos;i="6.04,271,1695686400"; d="scan'208";a="50248355" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-iad-1d-m6i4x-00fceed5.us-east-1.amazon.com) ([10.25.36.210]) by smtp-border-fw-80009.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 00:07:28 +0000 Received: from smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev (iad7-ws-svc-p70-lb3-vlan3.iad.amazon.com [10.32.235.38]) by email-inbound-relay-iad-1d-m6i4x-00fceed5.us-east-1.amazon.com (Postfix) with ESMTPS id 96E81A0B0F; Wed, 13 Dec 2023 00:07:20 +0000 (UTC) Received: from EX19MTAUWA002.ant.amazon.com [10.0.21.151:13591] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.2.31:2525] with esmtp (Farcaster) id d7626d9c-b144-446f-b11a-bed8a3932442; Wed, 13 Dec 2023 00:07:19 +0000 (UTC) X-Farcaster-Flow-ID: d7626d9c-b144-446f-b11a-bed8a3932442 Received: from EX19D020UWC004.ant.amazon.com (10.13.138.149) by EX19MTAUWA002.ant.amazon.com (10.250.64.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 13 Dec 2023 00:07:19 +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, 13 Dec 2023 00:07:15 +0000 From: Alexander Graf To: CC: , , , , , , , Eric Biederman , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , "Rob Herring" , Steven Rostedt , "Andrew Morton" , Mark Rutland , "Tom Lendacky" , Ashish Kalra , James Gowans , Stanislav Kinsburskii , , , , Anthony Yznaga , Usama Arif , David Woodhouse , Benjamin Herrenschmidt Subject: [PATCH 14/15] tracing: Recover trace events from kexec handover Date: Wed, 13 Dec 2023 00:04:51 +0000 Message-ID: <20231213000452.88295-15-graf@amazon.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231213000452.88295-1-graf@amazon.com> References: <20231213000452.88295-1-graf@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.253.83.51] X-ClientProxiedBy: EX19D037UWB002.ant.amazon.com (10.13.138.121) To EX19D020UWC004.ant.amazon.com (10.13.138.149) X-Rspamd-Queue-Id: 33C25120019 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: aebozdo6xj7wrgjekcxibh9ez3ookhjy X-HE-Tag: 1702426051-16840 X-HE-Meta: U2FsdGVkX1/AHQdrUei1qa4mu+xe13paeA4ZrkUP/VwxYlof9OzXDz2kp+qfUzO1RpOiq+x21kCml4G0J+wmAowkjxKyF7i97VyFbD7onGORMXBwgjzuRGJ8qn+8a0Q4FJz8IMl5joDJjGY3YiVdOnJjWSdZ3HYvEqicBOMkv06BwNC5owE6WCLmAohbhpu+P+HpCt+s6U7Nm84uNt1Dx02JSdy5MppNidchFH6ICvcfaI6ABTaODTt9LzeZyxkO6Y4iEWebJVXW2XxxD0H0pTV/Yh1mz3rFipPstUMELHI4VUjYLQhBIALI6TmJw9MT0OJCMMxjT7yqbzKLUpOTrLzmPSIOrDFdZ9NnbORsW2DCrAkOR01ftulxd3ZEBhSj+GPKICeEEj3+4rFqIchzmC3soc2igaDFiJEL3Qm3zDyuYSQqj4P9XZ2WbAnA34sErMwshsa7oAJkDWJfPe9mojDWgq/YX1QA/cq7aieb8a9hiGmczvwK8lHnpm+2XlCAU+5XknW6T7PpI9yClNVIWISilCwZ7ShDy4nQ3Kstm4+AlXJhvZ+LMChtzA8A6LB7RtvtbmAwHe0SBcHZ+2G1xsXAoMAbzFftQwEb0UJDOLrjqESEHGqvjcinAfdw59BzVfj9/jl0ZR0egh1YX54TJEKWvXxGwntwjWUToq/81axe9jMjxKIrN9/wKLTuexrnrSa2NQs2W8Moj43Tp+6o2/Pxh/ECQD3Z1RUMBV9cIUMCJX5ltFIPznHJUsJkhtffLWUYvn5+H++Y6riUux+NjCZnAwdfAKN1dWequ+frNxxaveBpKlx0oGQhd2yzKugghXnniQVlrofwxvWOb0nZTZq/9sbMo5PjRqoCd+SEFlMYZpxMPfxhGZpx5UwChuU3KKqw64lqcep9n9ERwUshm4BpJg3CX7aUNPF46YNBv65CIchcjqhF7qB6rGgBGm1AXW/NDUNmXxWC+cmo/7a cLnr62Sl 1ncLYYIBGxHjyWWNSbv5QeuXebACVSgd42RU3VjZXSH2DwDICGTwnfMzl/DuAC+GebCt+GiGVGoaB7DNKTgpgj12pQtkoO5E0okhz4X2tMHEh7Vpy8JBLHFJdBGFpjw9MOx6qA5fFd0UJH+11C195qgl97zSAQB5Z2xBn2ocsb/vcB1BdzTn3mB3CtU2fFPwCPpPDInuc3WSOKt8LVw3BKR+VyH/htrOvPWIB1bJKEGwNjTCfveVvvPunNnnONZpsO2kfM0viEDkGYUC4ISxOaQuzX8Ynlq0QMLDt7IpjFqjYmUK3K7XycGyNjNRWfmNrfkXTYpWbIrAldmCxcI/6WH/t6y9vHFtdq2ECsVS/i1drN9OpdlEaBq7ax1FYYes3vZ8ERdD6mRtGQa95DQtGP/t/DTrz/MdRIZyIyBXj3pxsFZlrArc9+liUIF15r0JQIT2cATCda+xxvH546idor3UVDa8043y5d9LPieDHldkKr7hKH5/XzUPrPRZQcu3UhOudkxDDNaYJ86kllnkHGy7tFqxMV4HM89B/rB+bb04fhzA12Z3+lFXOpr+Ko7PXQDdd6PHROFh2JAlsgJ4whRjYp+yRzbOYoCzhKtvK+NKVacQgxxBqmTQAXDCuirJsLSHdDKKk/vRuww4= 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: This patch implements all logic necessary to match a new trace event that we add against preserved trace events from kho. If we find a match, we give the new trace event the old event's identifier. That way, trace read-outs are able to make sense of buffer contents again because the parsing code for events looks at the same identifiers. Signed-off-by: Alexander Graf --- kernel/trace/trace_output.c | 65 ++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 113de40c616f..d2e2a6346322 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -749,6 +749,67 @@ void trace_event_read_unlock(void) up_read(&trace_event_sem); } +/** + * trace_kho_fill_event_type - restore event type info from KHO + * @event: the event type to enumerate + * + * Event types are semi-dynamically generated. To ensure that + * their identifiers match before and after kexec with KHO, + * let's match up unique name identifiers and fill in the + * respective ID information if we booted with KHO. + */ +static bool trace_kho_fill_event_type(struct trace_event *event) +{ +#ifdef CONFIG_FTRACE_KHO + const char *path = "/ftrace/events"; + void *fdt = kho_get_fdt(); + int err, len, off, id; + const void *p; + + if (!fdt) + return false; + + if (WARN_ON(!event->name)) + return false; + + pr_debug("Trying to revive event '%s'", event->name); + + off = fdt_path_offset(fdt, path); + if (off < 0) { + pr_debug("Could not find '%s' in DT", path); + return false; + } + + err = fdt_node_check_compatible(fdt, off, "ftrace,events-v1"); + if (err) { + pr_warn("Node '%s' has invalid compatible", path); + return false; + } + + p = fdt_getprop(fdt, off, event->name, &len); + if (!p) { + pr_warn("Event '%s' not found", event->name); + return false; + } + + if (len != sizeof(event->type)) { + pr_warn("Event '%s' has invalid length", event->name); + return false; + } + + id = *(const u32 *)p; + + /* Mark ID as in use */ + if (ida_alloc_range(&trace_event_ida, id, id, GFP_KERNEL) != id) + return false; + + event->type = id; + return true; +#endif + + return false; +} + /** * register_trace_event - register output for an event type * @event: the event type to register @@ -777,7 +838,9 @@ int register_trace_event(struct trace_event *event) if (WARN_ON(!event->funcs)) goto out; - if (!event->type) { + if (trace_kho_fill_event_type(event)) { + pr_debug("Recovered '%s' as id=%d", event->name, event->type); + } else if (!event->type) { event->type = alloc_trace_event_type(); if (!event->type) goto out;