From patchwork Tue May 9 22:17:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 91778 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3213870vqo; Tue, 9 May 2023 15:36:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4RaMx/04RE4SJreb5orARnYZyqOSKOxdkB6Ur4CZyaZRPG9bsJ2imtikzS2guRPWY5+0pc X-Received: by 2002:a05:6a00:995:b0:645:fc7f:4002 with SMTP id u21-20020a056a00099500b00645fc7f4002mr11228518pfg.2.1683671780784; Tue, 09 May 2023 15:36:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683671780; cv=none; d=google.com; s=arc-20160816; b=DwdBU0htmHTRva3LU/LgbtVYBsKIEwK+qWws36GOPAZXVLGpeJAn3f4wYJiGa2cW/o +h8AxeVA2q1ebMhsSKl4aiBkGb8Tji4VA7ygT43wG0bFrWnQS1GM0j16o05DwW2tFtJK tRnmnJZ86lNk89TJxzlWcXO5kT1ihl+BE0RF0NhY4cohfDYKkIQY/oPsshDS7xGOjXro lPK8khN3kqenF0k//qvneakDIE9gYmWxDeIiUCWaraD9Nk1UkyCCBJxvu69stz3vcBzp 3tmqoEMC6cbisVHTrhimR5RKeBNiXtBPjeaP2kvc70M5p1LZMpCvUOviRnsRooUimBFl wDkA== 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 :message-id:date:subject:cc:to:from; bh=72+TCfLTe3VOmVryeaKHq3TZFBle6kNMp9de1NWr5jA=; b=ASX2QsYEIEOO4bN5Q6aCW9SR4phqAw7G+uql27uf7TNo1A4xoF87bwFs2bKNpU3Y8D LliJC2TYC7BuWpN6GgAiPx62LcPTFi9HMee1MgXenEmv9pOpr9ZSq5LMX5lkky4f+0si 8iT2te1Fp5mkM9ZuMnLvxXEBxpB3dCfi/Efw/a1iTpolLfNFaKtgItgBkDuktRoVCaHI 7wKnPktKWQeUirjkk/HkgnU+o2P06z/toWSumRxrogbfyoDr3qlnvQQDd5Y9DnE0bocX yIzMPDrB0B3uEt2ZVkBHow7gEhq7Gs/TrCa5PCJN122R7ZPFp0qvwSU/Bajb5l0H9RPR bxgQ== 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e16-20020aa798d0000000b00593a808158esi3435247pfm.156.2023.05.09.15.36.08; Tue, 09 May 2023 15:36:20 -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; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233354AbjEIWR6 convert rfc822-to-8bit (ORCPT + 99 others); Tue, 9 May 2023 18:17:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230016AbjEIWR4 (ORCPT ); Tue, 9 May 2023 18:17:56 -0400 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0497B93 for ; Tue, 9 May 2023 15:17:43 -0700 (PDT) Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 349KVue4022845 for ; Tue, 9 May 2023 15:17:34 -0700 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3qfrf2u5t4-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 09 May 2023 15:17:34 -0700 Received: from twshared24695.38.frc1.facebook.com (2620:10d:c0a8:1b::2d) by mail.thefacebook.com (2620:10d:c0a8:82::e) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 9 May 2023 15:17:32 -0700 Received: by devbig932.frc1.facebook.com (Postfix, from userid 4523) id 8323F1D54669C; Tue, 9 May 2023 15:17:18 -0700 (PDT) From: Song Liu To: CC: , Song Liu , Andrew Morton , Peter Zijlstra Subject: [PATCH] watchdog: Prefer use "ref-cycles" for NMI watchdog Date: Tue, 9 May 2023 15:17:00 -0700 Message-ID: <20230509221700.859865-1-song@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: KAAC0ys7_igI88cCGTrVtA4ETSojQHhZ X-Proofpoint-ORIG-GUID: KAAC0ys7_igI88cCGTrVtA4ETSojQHhZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-09_14,2023-05-05_01,2023-02-09_01 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,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?1765457821207875571?= X-GMAIL-MSGID: =?utf-8?q?1765457821207875571?= NMI watchdog permanently consumes one hardware counters per CPU on the system. For systems that use many hardware counters, this causes more aggressive time multiplexing of perf events. OTOH, some CPUs (mostly Intel) support "ref-cycles" event, which is rarely used. Try use "ref-cycles" for the watchdog. If the CPU supports it, so that one more hardware counter is available to the user. If the CPU doesn't support "ref-cycles", fall back to "cycles". The downside of this change is that users of "ref-cycles" need to disable nmi_watchdog. Cc: Andrew Morton Cc: Peter Zijlstra Signed-off-by: Song Liu --- kernel/watchdog_hld.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_hld.c index 247bf0b1582c..f77109d98641 100644 --- a/kernel/watchdog_hld.c +++ b/kernel/watchdog_hld.c @@ -100,7 +100,7 @@ static inline bool watchdog_check_timestamp(void) static struct perf_event_attr wd_hw_attr = { .type = PERF_TYPE_HARDWARE, - .config = PERF_COUNT_HW_CPU_CYCLES, + .config = PERF_COUNT_HW_REF_CPU_CYCLES, .size = sizeof(struct perf_event_attr), .pinned = 1, .disabled = 1, @@ -286,6 +286,12 @@ int __init hardlockup_detector_perf_init(void) { int ret = hardlockup_detector_event_create(); + if (ret) { + /* Failed to create "ref-cycles", try "cycles" instead */ + wd_hw_attr.config = PERF_COUNT_HW_CPU_CYCLES; + ret = hardlockup_detector_event_create(); + } + if (ret) { pr_info("Perf NMI watchdog permanently disabled\n"); } else {