From patchwork Wed Feb 15 12:07:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 57513 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp155809wrn; Wed, 15 Feb 2023 04:14:20 -0800 (PST) X-Google-Smtp-Source: AK7set+cGLgD8eRz1YO47ZO5YkiUmTs97oelt2nkBYN4QDD8+pMRpvl0KIOHgqtz0etVBPr107ZY X-Received: by 2002:a05:6a20:1ea3:b0:bc:8a99:1943 with SMTP id dl35-20020a056a201ea300b000bc8a991943mr1477851pzb.15.1676463260084; Wed, 15 Feb 2023 04:14:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676463260; cv=none; d=google.com; s=arc-20160816; b=M/Q9iVzT32g0oak/zZMX+42uyqS7on1LMb/6F4VJcoWLHh83qBYIAH4QCEbmbwa0hU 6JbNzPjKBKkNhYCzjIBdW5XpaQRGhlyeQVISq88cLu9YhymyxiKJhd1XpeMgcmlklFOO b0LYO0FKS3alYyj/8aYZFnA1f6itSWJ4vL4PERaQ4UV+GGqUkQKR6ud0MF1m1YyQHdDx n3FY0jYurIgjeCfDc/HsszY83P9eXB8K+0019ZcYgpBBh7y6SY5BRnsyXkdlX+tXyLYN 961c6NSc33vd9T2RMVzM8JWCWp3UuqRQKUs9nEeQYJmzlOZTLwg8LD7g5ZACW9H0DFVb RmOw== 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=fMMetxbtkLdBmBdnjqsV0DSu+zcJDkB0d+zjgiBgIOc=; b=tpIv01spuxPY4Te6DskYnURAozaaZO20to2V8MF7KXGLfDmmUEUd57WCXyEbeKRBD5 XxWWfsuIrjWObGWqbvHJSuIL9E5b5SszrWDF3TWqXT+EP0UCe+vcO/LZBWO2PAWBzX0U kSUTxETpo9RBJbbw+gKRKpYMRBAAhRChwi1Z4TfaTN3RIAC3aydLrSP/mnYrNB4FBv4s EP1ydGRDGUTDDzlDNW7ij/bXyOqBnLAYLPfqwpfrmdTRQuxTEnRuFQgL7WX+WKKKh8cg MJR7WC/Ft5ERH31+qSp0tKVgLN+BKpOh1wDqZ3J8z2lKHRlyEVTzn4vTzTyOzTlR+Zxz hhUA== 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 z9-20020a637e09000000b004dac8ca24e4si17072323pgc.356.2023.02.15.04.14.05; Wed, 15 Feb 2023 04:14:20 -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 S233456AbjBOMJl (ORCPT + 99 others); Wed, 15 Feb 2023 07:09:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229503AbjBOMJk (ORCPT ); Wed, 15 Feb 2023 07:09:40 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81AC82387A; Wed, 15 Feb 2023 04:09:39 -0800 (PST) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PGxdg54JXzRrwZ; Wed, 15 Feb 2023 20:07:03 +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.2507.17; Wed, 15 Feb 2023 20:09:36 +0800 From: Yang Jihong To: , , , , , , , , CC: Subject: [PATCH RESEND v2] perf/core: Fix hardlockup failure caused by perf throttle Date: Wed, 15 Feb 2023 20:07:26 +0800 Message-ID: <20230215120726.239233-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: dggems701-chm.china.huawei.com (10.3.19.178) 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?1757899138990163300?= X-GMAIL-MSGID: =?utf-8?q?1757899138990163300?= 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 --- Changes since v1: - Modify commit title. 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 c4be13e50547..c5c3c033ef6b 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9409,7 +9409,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;