From patchwork Mon Nov 27 11:22:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 170094 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3017159vqx; Mon, 27 Nov 2023 03:18:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IGIjwKSWrBLNwVb6B/933zNZESOquU6ubPVGVPXimKrwziyjv5kBCY7Q3+lg0Lt+OPmy//3 X-Received: by 2002:a17:902:da88:b0:1cf:c9ca:501c with SMTP id j8-20020a170902da8800b001cfc9ca501cmr3576199plx.5.1701083888596; Mon, 27 Nov 2023 03:18:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701083888; cv=none; d=google.com; s=arc-20160816; b=dhctEY1JcrIy5ed193vrIFnxzLRSmXGFJ68Kk2bPkSGaxif40e6ssahMJylqiM/Y48 K07LGjYVPCxYzmxSDOtQGgZQHJfqBT4jTblGuX2cCQxrNP9tgt95SFVn5MHLWN1LcVKh D3n+gEf5aAyVHEcVjGTgsiuOyCiCgHaMxi/UHhOJ4TyMlqJ7hweU0xwpKz5Jjr4ub5p0 zHXYQukLkjtCutbR6oljOidUi2s4P03qDCcyi1L9VqEVusO/0tgCAX+oC+SziRmuhCjX TVqKHgrz9Y5gmx7xUxT+Bs4qs9GhqwNZyUuZzCcoClvwOuxyWVMDi6VcBNTtiGsbZYAe VPIg== 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=RxygdbCwhFvZhy1DSxLeI1A8Uq8uWYLb6tI9SAGddDg=; fh=egEhXZCnaBLtpm4qYSrtRMrshqmkwFn8cHv/a9vnQgc=; b=dBfDIq9U7Uk6+LGWKnRagbWxP85Ll21C+sQSwYdCdF/0YbwvJrCkVKy0drUWDX4Ym7 p0EJCk2t3JIr6kez8LsAZxZ4ErtMzuX2tcEQMMpbheoE01GTFTVybIqZ13iK3PHKlf+w 4CT3techcEtj2qOhKaU3USUpF3oeNj7G0/K1bxJl0nkFBPaVCMdOj4b2VXLdNyrem9os 0Zy+XXsEvkEb/Kd3ahGUKa5VBZfscdLJ+2NcRDZ97aGsDrZs0FMfke9VxEKGzoalD3pQ ZCfrwMsU28u4Rv7jsp6zxf8gzo1a2ho/Rk57mRlV8zIzCfaHQb5yVjk9wNXHu9Wle05z bXCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id z10-20020a170903018a00b001cfb4ceb73bsi5337523plg.569.2023.11.27.03.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 03:18:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3DC97805F0A2; Mon, 27 Nov 2023 03:18:07 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233134AbjK0LRz (ORCPT + 99 others); Mon, 27 Nov 2023 06:17:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233122AbjK0LRx (ORCPT ); Mon, 27 Nov 2023 06:17:53 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D3B6185 for ; Mon, 27 Nov 2023 03:17:59 -0800 (PST) Received: from dggpemm100020.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Sf32g6Y5CzWh8q; Mon, 27 Nov 2023 19:17:15 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm100020.china.huawei.com (7.185.36.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 27 Nov 2023 19:17:56 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 27 Nov 2023 19:17:56 +0800 From: Yang Yingliang To: CC: , , , , , , , , , , , , , Subject: [PATCH v2] sched/smt: fix unbalance sched_smt_present dec/inc Date: Mon, 27 Nov 2023 19:22:08 +0800 Message-ID: <20231127112208.1309105-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 03:18:07 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783715739425898479 X-GMAIL-MSGID: 1783715739425898479 I got the following warn report while doing stress test: jump label: negative count! WARNING: CPU: 3 PID: 38 at kernel/jump_label.c:263 static_key_slow_try_dec+0x9d/0xb0 Call Trace: __static_key_slow_dec_cpuslocked+0x16/0x70 sched_cpu_deactivate+0x26e/0x2a0 cpuhp_invoke_callback+0x3ad/0x10d0 cpuhp_thread_fun+0x3f5/0x680 smpboot_thread_fn+0x56d/0x8d0 kthread+0x309/0x400 ret_from_fork+0x41/0x70 ret_from_fork_asm+0x1b/0x30 Because when cpuset_cpu_inactive() fails in sched_cpu_deactivate(), the cpu offline failed, but sched_smt_present is decremented before calling sched_cpu_deactivate(), it leads to unbalanced dec/inc, so fix it by incrementing sched_smt_present in the error path. Fixes: c5511d03ec09 ("sched/smt: Make sched_smt_present track topology") Reviewed-by: Chen Yu Reviewed-by: Tim Chen Signed-off-by: Yang Yingliang --- v1 -> v2: Fix typo in commit log. --- kernel/sched/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index a708d225c28e..477b9500c8b9 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9711,6 +9711,10 @@ int sched_cpu_deactivate(unsigned int cpu) sched_update_numa(cpu, false); ret = cpuset_cpu_inactive(cpu); if (ret) { +#ifdef CONFIG_SCHED_SMT + if (cpumask_weight(cpu_smt_mask(cpu)) == 2) + static_branch_inc_cpuslocked(&sched_smt_present); +#endif balance_push_set(cpu, false); set_cpu_active(cpu, true); sched_update_numa(cpu, true);