From patchwork Tue May 23 14:39:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 98034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2201428rwl; Tue, 23 May 2023 08:15:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4LlpbQ/k0ijgLxCbGNQQRk+jYfJYcN/iH4fEfjq6J3cEoEwrXSHW55jrwT2TUZauWyQP/K X-Received: by 2002:a05:6a20:728a:b0:10b:9527:7127 with SMTP id o10-20020a056a20728a00b0010b95277127mr7372590pzk.20.1684854908309; Tue, 23 May 2023 08:15:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684854908; cv=none; d=google.com; s=arc-20160816; b=hTsScuE7R/FlUz+I0n5Fbow1Z+S8S/NAN4IiOSuWSfVXnKQEqAdBkCnFC4bsQZWHgK Av+UxA76lNmqtSV7yWg0h1DMMaL0LQp78nZoyL7nN5Ah3P3mCXitgKXIzZC6SDRseR/Z jNzWipjKLFeYjWB6N1C3ga60mg8gN3mffHdUrimbmuOysAW/oPZuhPSykfJhA01EW1pf tGYK+uItLXG45F03vZUU+kQCdxdqLp1zHP7CtiMCTQDDteNtec+X1GsN68crLOxieEQe jg6KbO+iwNeeiGGDsUyADOQpQrBCRqwFL3NdzQ+d3ZBNW+Zi7cR76N/z/zf2vOZR3yiU FYIA== 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:dkim-signature; bh=zEbJUA2VY3P1Gw/9E3ZC2zbULYIeWfglzaOBedvnWVU=; b=XJvPCyu91oYzl2evBIYYRTSYl7DO/BVadINBhuSKSbgr5dEDhMTCw7Yb2kRCF8gH/I vGImEoKoiqFQestSo7muHlKr/LcVL25VPrPeI0IB0dihViIYFc/04tUUgNuvnHpgR/pm 3XPFs0xh7kMT7+pkF8blRNGHAFX6DwjFXeKB6BCBviLQjcgbZOuVjZ7RP1F75lX/wGLp PjIEGmhcbRNX8c+h8GU9lHSlOKbq1mNJ1XCOPmjVXlvxkfXE3f61ajCvKweH8554RORA 0OHwKjG9KQIBcagbrHsCOKT76pn/BCY/aQ5rUrloJuZuEUI55UawBqsgIO3DacGSGU2C Am+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=NFeLY3Sk; 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 n7-20020a6543c7000000b00520e69b7439si6413925pgp.560.2023.05.23.08.14.55; Tue, 23 May 2023 08:15:08 -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=NFeLY3Sk; 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 S237338AbjEWOkb (ORCPT + 99 others); Tue, 23 May 2023 10:40:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229960AbjEWOk2 (ORCPT ); Tue, 23 May 2023 10:40:28 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EBB2E9 for ; Tue, 23 May 2023 07:40:27 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-64d41763796so2950962b3a.2 for ; Tue, 23 May 2023 07:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1684852827; x=1687444827; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zEbJUA2VY3P1Gw/9E3ZC2zbULYIeWfglzaOBedvnWVU=; b=NFeLY3SkA8AC3qhDYso7wMcli0cn4QwrTfP1yc8JJHOY+KU7eeYHu6Y5qgeh9CLKOH RIjeh7iU5NLc9qaleOGDBNFgmHHWAFHhCEfTd50q93OvDiKqgC4CafhCUG+QkavJWOF6 dMJFbEQ0nrQJvt+lBesUHD0pW6muhDoZzvjx0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684852827; x=1687444827; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zEbJUA2VY3P1Gw/9E3ZC2zbULYIeWfglzaOBedvnWVU=; b=DGFGs6RF8lG2+w5G/WN0w+CcI6AzPW2KWNwY+OzzWVBqMIVNG8kcoO4tj91hDDOhVN 3BSyGh+a/AfxN6hH2e59HVohmUB1lYzvrzRRpkNfPPRxHOpTDIcP+hNKZfQwhQuYk5Dy WtuQNLNwBDoR+aP3N44sMKhsWDr1g4kDE9kz0G9NkA0NQ9yNG9L/ttZkdv3oCfiUbm/x Uq9JKYIe0DXkxBtaVMgzyeGGtU2HWJ+kJgsyiYW+uru6QMWbAnRB/svYrO/JqgDO9QyI nVa5FQlwd9l6u3BjUeXvgMh36Q54PvH6hQibzMEUFvoLWO/sziyiacgfYhx15LRv4+Nh Vkzg== X-Gm-Message-State: AC+VfDybefhFinw4kH+Utc0nNbE953c2TJdcP3xjgR6G3UWRocjiK731 wUfLzktJQZRregfSgSv0l4gW5g== X-Received: by 2002:a05:6a00:140b:b0:63d:3339:e967 with SMTP id l11-20020a056a00140b00b0063d3339e967mr18303483pfu.19.1684852826764; Tue, 23 May 2023 07:40:26 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:ed64:17be:457a:f5e4]) by smtp.gmail.com with ESMTPSA id a14-20020a62e20e000000b00643889e30c2sm3701402pfi.180.2023.05.23.07.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 07:40:25 -0700 (PDT) From: Douglas Anderson To: Andrew Morton , Arnd Bergmann Cc: Douglas Anderson , Catalin Marinas , Lecopzer Chen , Pingfan Liu , Sumit Garg , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: Only HAVE_HARDLOCKUP_DETECTOR_PERF if the PMU config is enabled Date: Tue, 23 May 2023 07:39:53 -0700 Message-ID: <20230523073952.1.I60217a63acc35621e13f10be16c0cd7c363caf8c@changeid> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog 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?1766698420304557637?= X-GMAIL-MSGID: =?utf-8?q?1766698420304557637?= If you try to enable the arm64 perf-based hardlockup detector but you don't enable CONFIG_ARM_PMU then you'll get an error: arch/arm64/kernel/watchdog_hld.c: In function 'arch_perf_nmi_is_available': arch/arm64/kernel/watchdog_hld.c:35:16: error: implicit declaration of function 'arm_pmu_irq_is_nmi' [-Werror=implicit-function-declaration] 35 | return arm_pmu_irq_is_nmi(); It doesn't make sense to enable HAVE_HARDLOCKUP_DETECTOR_PERF if the PMU isn't enabled. Let's add a dependency. HW_PERF_EVENTS is a synonum for ARM_PMU and makes the most logical sense here, so add the dependency on that. Reported-by: Arnd Bergmann Closes: https://lore.kernel.org/r/20230522114922.1052421-1-arnd@kernel.org Fixes: 02ea35ee19d9 ("arm64: enable perf events based hard lockup detector") Signed-off-by: Douglas Anderson Acked-by: Arnd Bergmann --- This is an alternative fix to the one Arnd proposed. I think it's a little cleaner / more correct. I'm not sure the exact way to mark "Fixes" for things in Andrew's tree these days. I don't think the git hash is stable? I wouldn't object to this being squashed into the patch it's fixing. arch/arm64/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 3eacf40da850..0b055e6cda00 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -203,7 +203,8 @@ config ARM64 select HAVE_FUNCTION_ERROR_INJECTION select HAVE_FUNCTION_GRAPH_TRACER select HAVE_GCC_PLUGINS - select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI + select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && \ + HW_PERF_EVENTS && HAVE_PERF_EVENTS_NMI select HAVE_HW_BREAKPOINT if PERF_EVENTS select HAVE_IOREMAP_PROT select HAVE_IRQ_TIME_ACCOUNTING