From patchwork Mon Jun 19 07:19:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 109750 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2833618vqr; Mon, 19 Jun 2023 00:48:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5FvJYpfZFOPvNf+Wxsk3qdE3/gzSPlS8BlLhqY+183hcc4ASlJV04lX9FNx4y0LoORjQu9 X-Received: by 2002:a05:6a21:3414:b0:118:b72c:2924 with SMTP id yn20-20020a056a21341400b00118b72c2924mr7382591pzb.60.1687160899493; Mon, 19 Jun 2023 00:48:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687160899; cv=none; d=google.com; s=arc-20160816; b=UHeQb/KLQAD8+XcodupklnFuOD/+8IjMxzqUsbaZojoyzb0TemJW/Q4p05XNW40338 TgaAu1KNLEY0fgLbUVyQ7meDEbgyAn43O/o+nw5VR0ltUmG4FP5/b3HoBJ7Cwo0f1sYL DhI5aWgcYZ+CPYwjycZ5l58WgHO3Tl7D1BQTrskkTnlufwhPwonN0pPMBm8ydOj+Nf8E TRXE8pSv5WbhRccn3JpolB03kyweNAza4GofXx+b2BTCjzeNxY7h6y7bCw25SXlbQ7+7 5wmITZnXx5u+wbn3mxVP5jI1yURiD0LvjKW7O66CafiAVLxpWqx8PEAYkszOlzZVaqgw QMcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=9bIlAELKtUbYdZR0ivn/WpuIu6jp8odOt7LINu/DiaA=; b=taf3b+l8TK8SgZW/P04iCen/6gPfE/6JssJoWxVBi5DxQEny4UZhqIOhRM9j2cKX83 PzR35SbeJp+ouz95IYkjwdy5V5fPOs7bzRhhMji8g0dFrVgDn3Ue58+vJf4pD1ON13ub mxnvvfN3u+U7IYqa1vJ5wooQtkj3yjCrgh71JqY2XyZ8LSgugdTFloF5Bo6WDFOwYVLG 7aZPWuSnQuABWlAS8mzj3DfX5vns0te8xM0fwQ/y179qDmGNX0Pr+jPxudjAjDduFaNo GlwHHAhWNuJ7y3L5I2XcbTrdTV9Wr7wDgy53XOiVPzVgz9iBlU7sNDeP1uwOor93Zbv5 /nqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=aQoHIoff; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x15-20020aa79acf000000b0064d42dddf9fsi6930992pfp.32.2023.06.19.00.48.03; Mon, 19 Jun 2023 00:48:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=aQoHIoff; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229520AbjFSHTR (ORCPT + 99 others); Mon, 19 Jun 2023 03:19:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229476AbjFSHTP (ORCPT ); Mon, 19 Jun 2023 03:19:15 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D6A0106; Mon, 19 Jun 2023 00:19:14 -0700 (PDT) Date: Mon, 19 Jun 2023 07:19:10 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1687159152; h=from:from:sender:sender:reply-to: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; bh=9bIlAELKtUbYdZR0ivn/WpuIu6jp8odOt7LINu/DiaA=; b=aQoHIoffl8QnBHYO2VdxuVac/1XWmU0O2xgFAHdppPw37ZdW2KlR2jgiOoHs/U82IViW3E 7SPogmUZgia8/VhB2YnUisKA+A9ba41FmuG5H9zuD1vrcT/lLWq3uRFYRVOF0GYfZfvKDn eYMf0Lo0Zu7uBJUI4O+KEajQgnFc7NbRZXfKmHK2lrrZqQCpL2BMSW/sViyiHaeRo6oFnd /jc83feNbWFV1X/JGefFzSO68jcCdfRbe+fCXq7+CXRdBd8NfE8h4+5uSIwF2Um/KDVqwp q2tbNNEsqkjpqWJcviKXsEz24a+FJpjw2l7cSsDHNEzWlXSmPw9hkHJ6P2ZSkg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1687159152; h=from:from:sender:sender:reply-to: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; bh=9bIlAELKtUbYdZR0ivn/WpuIu6jp8odOt7LINu/DiaA=; b=s0j5Kx4jAXLeV0GMcGhNotCsrBqujxc/AB8lxzgfF1pDaoek7IxV5tUtnrvsS0VCvXcA+q 0EgucUq4Yrc0UACA== From: "tip-bot2 for Sebastian Andrzej Siewior" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] tracing/timer: Add missing hrtimer modes to decode_hrtimer_mode(). Cc: Sebastian Andrzej Siewior , Thomas Gleixner , Mukesh Ojha , "Steven Rostedt (Google)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230418143854.8vHWQKLM@linutronix.de> References: <20230418143854.8vHWQKLM@linutronix.de> MIME-Version: 1.0 Message-ID: <168715915092.404.14169439064532434818.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763526149150430279?= X-GMAIL-MSGID: =?utf-8?q?1769116427135761548?= The following commit has been merged into the timers/core branch of tip: Commit-ID: 2951580ba6adb082bb6b7154a5ecb24e7c1f7569 Gitweb: https://git.kernel.org/tip/2951580ba6adb082bb6b7154a5ecb24e7c1f7569 Author: Sebastian Andrzej Siewior AuthorDate: Tue, 18 Apr 2023 16:38:54 +02:00 Committer: Thomas Gleixner CommitterDate: Mon, 19 Jun 2023 09:09:14 +02:00 tracing/timer: Add missing hrtimer modes to decode_hrtimer_mode(). The trace output for the HRTIMER_MODE_.*_HARD modes is seen as a number since these modes are not decoded. The author was not aware of the fancy decoding function which makes the life easier. Extend decode_hrtimer_mode() with the additional HRTIMER_MODE_.*_HARD modes. Fixes: ae6683d815895 ("hrtimer: Introduce HARD expiry mode") Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Reviewed-by: Mukesh Ojha Acked-by: Steven Rostedt (Google) Link: https://lore.kernel.org/r/20230418143854.8vHWQKLM@linutronix.de --- include/trace/events/timer.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h index 3e8619c..b4bc282 100644 --- a/include/trace/events/timer.h +++ b/include/trace/events/timer.h @@ -158,7 +158,11 @@ DEFINE_EVENT(timer_class, timer_cancel, { HRTIMER_MODE_ABS_SOFT, "ABS|SOFT" }, \ { HRTIMER_MODE_REL_SOFT, "REL|SOFT" }, \ { HRTIMER_MODE_ABS_PINNED_SOFT, "ABS|PINNED|SOFT" }, \ - { HRTIMER_MODE_REL_PINNED_SOFT, "REL|PINNED|SOFT" }) + { HRTIMER_MODE_REL_PINNED_SOFT, "REL|PINNED|SOFT" }, \ + { HRTIMER_MODE_ABS_HARD, "ABS|HARD" }, \ + { HRTIMER_MODE_REL_HARD, "REL|HARD" }, \ + { HRTIMER_MODE_ABS_PINNED_HARD, "ABS|PINNED|HARD" }, \ + { HRTIMER_MODE_REL_PINNED_HARD, "REL|PINNED|HARD" }) /** * hrtimer_init - called when the hrtimer is initialized