From patchwork Thu Jan 12 03:38:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 42234 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3675512wrt; Wed, 11 Jan 2023 19:46:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXvmeDHQt7bWFBnJ+C02uXnmJEA0Ln8c1JG82Ii4qGYT0DTZq/BNXnoF5UYxofbB2k1955/o X-Received: by 2002:a17:906:99d1:b0:7c0:ff76:dc12 with SMTP id s17-20020a17090699d100b007c0ff76dc12mr47698667ejn.2.1673495198566; Wed, 11 Jan 2023 19:46:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673495198; cv=none; d=google.com; s=arc-20160816; b=etlPc7AzFlczAFcp7mLOWWODLaPx+CLc4bMn/tn9JQYRBgck3eKHglWZ32B7PCROHn qLuXm28r3AoBPD8NUQ0jU268PabxDoCNvlQTu+fZ36+40B51wiks8zKBjo2Gnw3qXAwh ePym0nIiFzwdowg3SqG4jFFhNqWZpIVRyyCbN/8kSbO/ogEKfLq1POf1rbtCqd4XIXDz nyJBJ5lfLnn8KSzoGcjIuu/nEJELAYNi3oqvDQ0DVi6iWZevGyibVyRNC0WfLSN1DfEC W6zknUmzJdhhi1qOrzf7s2H8DVBsk3phtnA2qD23vWLKlxaF3LuiOmmnhSPsNFlrb8WR 5s8Q== 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=Hdy8evq9aEzsSJWTwKhArdDnRsA14InSYocFfECmcoo=; b=WWAw+/NwlLnxySwv0ZEk87CCJMRN4BgSiyPIZDbyxSBRoHpS2nNjGMX+w+2Utxzo00 YL543s8BJAqyuUYEvB1xwyozJuTODBbiHt+IYhjIYxejEHsR0OcRrgGBU0XqF6PnxAtJ 1athfMk/dijht8BMvH7AcTh5NvZdrCquu+WFZejMqAiAlTN17Bu0QYUY+mMsRhW5pe8R lPbbMClhNc3nh6QgzpGm/BIMU9bbSc0attacgKrgvfNJHI2YQKUYQ7651+C8VJjZoZEg FoLIePWKE7yJ0nt/VL/WG+qEMjxiV5xlyAwkqcHdwyiR9NfvBIohDkWig5w4crLf4Pfl luRQ== 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z15-20020a17090655cf00b007c500a2f33asi12440340ejp.208.2023.01.11.19.46.14; Wed, 11 Jan 2023 19:46:38 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236145AbjALDkv (ORCPT + 99 others); Wed, 11 Jan 2023 22:40:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235045AbjALDkq (ORCPT ); Wed, 11 Jan 2023 22:40:46 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B54F544352; Wed, 11 Jan 2023 19:40:45 -0800 (PST) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NsqzH3cVnz16Mfg; Thu, 12 Jan 2023 11:39:07 +0800 (CST) Received: from ubuntu1804.huawei.com (10.67.174.61) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 12 Jan 2023 11:40:42 +0800 From: Yang Jihong To: , , , , , , , , CC: Subject: [PATCH] perf/core: Fix account interrupt throttle Date: Thu, 12 Jan 2023 11:38:11 +0800 Message-ID: <20230112033811.58924-1-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT MIME-Version: 1.0 X-Originating-IP: [10.67.174.61] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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?1754786901454838071?= X-GMAIL-MSGID: =?utf-8?q?1754786901454838071?= In literal sense of "max_samples_per_tick", if hwc->interrupts == max_samples_per_tick, it should not be throttled, therefore, the judgment condition should be changed to "hwc->interrupts > max_samples_per_tick". In fact, this may cause the hardlockup to fail, The minimum value of max_samples_per_tick may be 1, in this case, the return value of __perf_event_account_interrupt function is 1. As a result, nmi_watchdog gets throttled, which would stop PMU (Use x86 architecture as an example, see x86_pmu_handle_irq). Signed-off-by: Yang Jihong --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index d56328e5080e..ced98e028d86 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9414,7 +9414,7 @@ __perf_event_account_interrupt(struct perf_event *event, int throttle) } else { hwc->interrupts++; if (unlikely(throttle - && hwc->interrupts >= max_samples_per_tick)) { + && hwc->interrupts > max_samples_per_tick)) { __this_cpu_inc(perf_throttled_count); tick_dep_set_cpu(smp_processor_id(), TICK_DEP_BIT_PERF_EVENTS); hwc->interrupts = MAX_INTERRUPTS;