From patchwork Fri May 19 17:18:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 96540 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1398127vqo; Fri, 19 May 2023 10:23:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71yaW8BVp6IzahBfMhQV2f/OOnAF21qp0eIib7vfTdlkFdpxbwjdYUYm1MLsyJOcA3MuDR X-Received: by 2002:a17:902:ce83:b0:1ac:b449:3528 with SMTP id f3-20020a170902ce8300b001acb4493528mr3162684plg.46.1684516991669; Fri, 19 May 2023 10:23:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684516991; cv=none; d=google.com; s=arc-20160816; b=EFgN/wY/XaSdvxoI3vkin8eEfNo2x0gioAyUwH8IuntsimFOWkrIOqD/rKLCxuVIwi zmYgt9x/f4Igf4PBZ6Gqwh3xe2N+ImmR1xuGM1vbODADCafyJMZaMGGQzgrQnf7vu7gZ mNIjWroOrj7TOAa1TbzQXiuBrtUVlAXpykFAOo8jcJoVEbht/zFYv/k8QdXUpoqLxeGe HYZMmQ1lCXsTZSXUQKXySidVmiIgCTKhTlw7e8Nd7guQ5FeBDTwxxs8AefRJlRNNVdtG aFQddfnDw4yPCYHs304/QMq8eG2bInF7wYAM9uvCOml/G+6J0+71hHdw+Eu/tPL+LQfn H6Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UnFfGU/I4XqnD3vR2plxo+ON4CdNtjzdhInwWKp0AYA=; b=b0JmlX4WC0KjzUOdiDmyq8pK61G4mjTRbue92tYLHf9wF+QcUwKDHDozMIcP2mC0KK csqx04xzKLtpj8vUZ6uPMJHYRZRPm4S9czgh/zsdu6YE6Y57Fjv5vQX1Jv1vBhXKsdBO sbiJUWHj5F7sF/GhYn/z4bJPTSvSsmOX6Zsl3GycAeQISUxD2HNsEfmu/IvePPf3D8Kc YaUNaSpaTxRJTxsGHzmoKJymRJ5/IfH+7UxuzVh5tOZIggyO3ILJBlSqf0HdlOHbRWAP DmEsWcLpHdw5DROPqRpsTK6nG5h6OW5JQt4bckLt1uYTzR7ujfs17NCqgQKjSWuEWjjT FMZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="lxH/4MUC"; 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=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bu26-20020a63295a000000b005348cc20de5si1346122pgb.841.2023.05.19.10.22.56; Fri, 19 May 2023 10:23:11 -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=@chromium.org header.s=google header.b="lxH/4MUC"; 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=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231804AbjESRVa (ORCPT + 99 others); Fri, 19 May 2023 13:21:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230525AbjESRVE (ORCPT ); Fri, 19 May 2023 13:21:04 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27E0119F for ; Fri, 19 May 2023 10:20:59 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-25374c9be49so1402066a91.3 for ; Fri, 19 May 2023 10:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1684516858; x=1687108858; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UnFfGU/I4XqnD3vR2plxo+ON4CdNtjzdhInwWKp0AYA=; b=lxH/4MUC2qjFAGmxlIf7xL66pYKuvfuFHFniVj+sFei0k520ZoJVIsJ2TuQTYRFKmU Kv7RzI/+zr61ZR632FK90CsTulb8O6mzHcizjQlqqXpquiqqpjeZ06rYt7ixiRLOzaPI g9JXyU6LG/ka08BvJnteCTM4hKwIRgOw+mRuc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684516858; x=1687108858; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UnFfGU/I4XqnD3vR2plxo+ON4CdNtjzdhInwWKp0AYA=; b=g1BRZ/JYgaKjr+Pzrf3b3159+iBV21oiEqBFeuLuCfi9+vSwLLvpiFsy6HBBKxBYrV Aw5tm5tcwWBbNL4f1y5pVX1rY8OyEX38v9yE15YPXL0bApB9tnHrqkl7/SNsxQNnO8Qr GDperggsPLYEg7EwQzhgnzom/Q6FEYAcbhfVXy8zD3N5DPBSejJQ6tXIYxAWTXzelkWd ENrbAATbmh39REh/qOxeI9p/HbCoVzY368h/u/O+sJlD63cfEPUwfLiwXbNlKghCg1tG M69rO1dr7xo5ln3Tsl5VpPt08sCAhZE2Dt0zEMyvNua3lyaBrn2IUhnWw9D6MIBBemfN 79LQ== X-Gm-Message-State: AC+VfDy2oYM9aU0FNRhGQSvhDBK6xmyp3leLPuTk6LGoZq7arfu9OmLb v9OY4DWSEb9sBS9907eUrGruDQ== X-Received: by 2002:a17:90a:2a42:b0:252:e7db:66df with SMTP id d2-20020a17090a2a4200b00252e7db66dfmr2384233pjg.49.1684516858651; Fri, 19 May 2023 10:20:58 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:9b89:2dd0:d160:429d]) by smtp.gmail.com with ESMTPSA id gj19-20020a17090b109300b0024e4f169931sm1763835pjb.2.2023.05.19.10.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 10:20:57 -0700 (PDT) From: Douglas Anderson To: Petr Mladek , Andrew Morton Cc: Matthias Kaehlcke , kgdb-bugreport@lists.sourceforge.net, Stephane Eranian , mpe@ellerman.id.au, Tzung-Bi Shih , Daniel Thompson , Mark Rutland , linuxppc-dev@lists.ozlabs.org, Sumit Garg , npiggin@gmail.com, davem@davemloft.net, Marc Zyngier , Stephen Boyd , sparclinux@vger.kernel.org, christophe.leroy@csgroup.eu, Catalin Marinas , ravi.v.shankar@intel.com, Randy Dunlap , Pingfan Liu , Guenter Roeck , Lecopzer Chen , Ian Rogers , ito-yuichi@fujitsu.com, ricardo.neri@intel.com, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, Will Deacon , Chen-Yu Tsai , linux-kernel@vger.kernel.org, Masayoshi Mizuma , Andi Kleen , Douglas Anderson Subject: [PATCH v5 07/18] watchdog/perf: Rename watchdog_hld.c to watchdog_perf.c Date: Fri, 19 May 2023 10:18:31 -0700 Message-ID: <20230519101840.v5.7.Ice803cb078d0e15fb2cbf49132f096ee2bd4199d@changeid> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230519101840.v5.18.Ia44852044cdcb074f387e80df6b45e892965d4a1@changeid> References: <20230519101840.v5.18.Ia44852044cdcb074f387e80df6b45e892965d4a1@changeid> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1766344089050711201?= X-GMAIL-MSGID: =?utf-8?q?1766344089050711201?= The code currently in "watchdog_hld.c" is for detecting hardlockups using perf, as evidenced by the line in the Makefile that only compiles this file if CONFIG_HARDLOCKUP_DETECTOR_PERF is defined. Rename the file to prepare for the buddy hardlockup detector, which doesn't use perf. It could be argued that the new name makes it less obvious that this is a hardlockup detector. While true, it's not hard to remember that the "perf" detector is always a hardlockup detector and it's nice not to have names that are too convoluted. Acked-by: Nicholas Piggin Reviewed-by: Petr Mladek Signed-off-by: Douglas Anderson --- (no changes since v4) Changes in v4: - ("Rename watchdog_hld.c to watchdog_perf.c") new for v4. kernel/Makefile | 2 +- kernel/{watchdog_hld.c => watchdog_perf.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename kernel/{watchdog_hld.c => watchdog_perf.c} (99%) diff --git a/kernel/Makefile b/kernel/Makefile index b69c95315480..7eb72033143c 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -91,7 +91,7 @@ obj-$(CONFIG_FAIL_FUNCTION) += fail_function.o obj-$(CONFIG_KGDB) += debug/ obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o -obj-$(CONFIG_HARDLOCKUP_DETECTOR_PERF) += watchdog_hld.o +obj-$(CONFIG_HARDLOCKUP_DETECTOR_PERF) += watchdog_perf.o obj-$(CONFIG_SECCOMP) += seccomp.o obj-$(CONFIG_RELAY) += relay.o obj-$(CONFIG_SYSCTL) += utsname_sysctl.o diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_perf.c similarity index 99% rename from kernel/watchdog_hld.c rename to kernel/watchdog_perf.c index 2125b09e09d7..8b8015758ea5 100644 --- a/kernel/watchdog_hld.c +++ b/kernel/watchdog_perf.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Detect hard lockups on a system + * Detect hard lockups on a system using perf * * started by Don Zickus, Copyright (C) 2010 Red Hat, Inc. *