From patchwork Sat Dec 10 13:57:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 32031 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1328604wrr; Sat, 10 Dec 2022 06:05:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf7uqUrLBZ0+Bzj267y/7/Oy2wj4uaeMh2erM0NKaMne3LG+RMZuHZu79z5SMf2VT+S3pa5V X-Received: by 2002:a17:906:1984:b0:7c0:8c83:79b8 with SMTP id g4-20020a170906198400b007c08c8379b8mr8361521ejd.53.1670680767279; Sat, 10 Dec 2022 05:59:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670680767; cv=none; d=google.com; s=arc-20160816; b=h3gHck/ceoK7iFSzT4gGQHa98UfybdEBeQi0bEEMKDeyoGwDHvLd+TLjD+4M6RyU6M Ki5FuLu4ZPaTGJbZxXanFhQ0yUkgaxhSninNBX3+qSL1a+azaD8Pk5DQXZxjulxYH1l1 dOyouAKS6yRQMEsZRoXVY6Z7wBtSMt+PXpWWHjgMfWWM3CSrbAflY4ylUmLjRfHbjYFK 5FQRmhVb/8s9vmFbAb8TrgIJZWX/1gh08ljqESef87jyDdjDS1LidXfkipgNjmBZugH0 BlBh82JZF/eydwHOn+LoT01GVQneWfV3PnAsNQJbJJqI/6dVV1fXwoNEvuyQzO2EdP8C nq8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=rATBNIyjstJl8nI3AvfmV6pyUpM3Ojmh/kOWO0PMr+c=; b=CFGkXt72k2sSkIZOW6i92NhHbIOtU+gip66kv9lkURvzSNHvvxHCZJmUFk/wdBszXP vVWH6/8fr7uN70gtBOlt7QTkkfjn0luQ7zJwTCOmAO3QasO15BHKuGdYA2uqN8bqmSNS q6TZshxh1uNgKFcYdhFt0Mug3Zrt98VB05bYQXR81A/eSfnWf+BMFlkF+CIppNKpdkul ysKFYtSI2CDxN1INxLGghI8qaSC5TuVmEvEoHsW8FMQZwc4bpMBcmxfKo5H2AmA501Wa PS9Gz0rI6MDczkpJEEhIkBnWqzmkQryxET2/W93LEwsjQCF+DLdxyD3zymlT8CQ9d6P2 KhlA== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ta16-20020a1709078c1000b007825337afeesi2053200ejc.273.2022.12.10.05.59.04; Sat, 10 Dec 2022 05:59:27 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229674AbiLJN6e (ORCPT + 99 others); Sat, 10 Dec 2022 08:58:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229560AbiLJN60 (ORCPT ); Sat, 10 Dec 2022 08:58:26 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF43613F90; Sat, 10 Dec 2022 05:58:25 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 59BE560C1E; Sat, 10 Dec 2022 13:58:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC867C43396; Sat, 10 Dec 2022 13:58:24 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1p40Mx-000klu-2e; Sat, 10 Dec 2022 08:58:23 -0500 Message-ID: <20221210135823.690094761@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 10 Dec 2022 08:57:53 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Peter Zijlstra , Thomas Gleixner , "x86@kernel.org" , Borislav Petkov , Ingo Molnar , stable@vger.kernel.org Subject: [for-next][PATCH 03/25] ftrace/x86: Add back ftrace_expected for ftrace bug reports References: <20221210135750.425719934@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS 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?1751835756021282234?= X-GMAIL-MSGID: =?utf-8?q?1751835756021282234?= From: "Steven Rostedt (Google)" After someone reported a bug report with a failed modification due to the expected value not matching what was found, it came to my attention that the ftrace_expected is no longer set when that happens. This makes for debugging the issue a bit more difficult. Set ftrace_expected to the expected code before calling ftrace_bug, so that it shows what was expected and why it failed. Link: https://lore.kernel.org/all/CA+wXwBQ-VhK+hpBtYtyZP-NiX4g8fqRRWithFOHQW-0coQ3vLg@mail.gmail.com/ Link: https://lore.kernel.org/linux-trace-kernel/20221209105247.01d4e51d@gandalf.local.home Cc: Masami Hiramatsu Cc: Andrew Morton Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: "x86@kernel.org" Cc: Borislav Petkov Cc: Ingo Molnar Cc: stable@vger.kernel.org Fixes: 768ae4406a5c ("x86/ftrace: Use text_poke()") Signed-off-by: Steven Rostedt (Google) --- arch/x86/kernel/ftrace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index bd165004776d..e07234ec7e23 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -217,7 +217,9 @@ void ftrace_replace_code(int enable) ret = ftrace_verify_code(rec->ip, old); if (ret) { + ftrace_expected = old; ftrace_bug(ret, rec); + ftrace_expected = NULL; return; } }