From patchwork Tue Oct 10 03:09:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 150453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2248028vqo; Mon, 9 Oct 2023 20:10:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEt1LOe08k7J5wa3QT6R/aYGLqwcLnDs+YDqbsk2Lv6TKZfCgWnIH1D5NIx1h8t3Gib9ODS X-Received: by 2002:a05:6a00:d6e:b0:68f:b8ca:b11 with SMTP id n46-20020a056a000d6e00b0068fb8ca0b11mr11724551pfv.11.1696907412871; Mon, 09 Oct 2023 20:10:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696907412; cv=none; d=google.com; s=arc-20160816; b=DSN2M6qWEhdFcqeFFYE54nytTkEpgxnVBRjbMFvhZIcjxaVSMbLyW54HY9NRR1tK1l 0wY8BAlTvKKDQ58QUFluKia4tIaJ9S1DQc/PyF++v51zcXF6QYjRW+na3zIZrTJ/aQaL 7JFvYIHwnKqpYe9t7jsPGQan/Rg9iiikgkfLUcY2WcXa++grWWE4Ltot0lof07qWGm8m a9gZAr3BIFP08atdMrV3pmZ2RutsdARqO4WoNvJMViUfifDlj4VIsa1y+gn5WzSwacGp VT9KW8+DuO/sYeabyb7uyzgtwaBTkVz8f9nn0E+Pr6JBfX6AklhP7CAqyKybYvriyLyF vfcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:references :in-reply-to:message-id:date; bh=C73xyrOrapItYJDxmqbNlMB202oL5YPluC6Y6B3KSt4=; fh=g66mwGaaEwasfANWCPBZJhFXmC0KrsU+d88cLge1kZM=; b=eO/PZsSbG4rkaycSD0ojEYBUvbQjvo2CskaqL8g+b743dVAZxVO549C408PdtjTUXC +dQ+z4AZUtiIR0OdXNVkw/MEiPhbJ1GKAy4sZDuT1U7DVh8S/iNdagkuSd4gsSiB1njJ w78fhi7jUV/UK8GAPAk2Yk3F3tf8zZ45sA71m97Zr+95ynyQNoJtjlUlQBGsUmZZ1nSg 5AQDeA1jn4u/X4CkXMbsV8Am4lBOm0g5THaIPMXx2w4Xm9umUI+8qx9qrQZpQ1pAXDkA fZyWLN9UO1sHlgCvQ1K9uUs2tZuPI7Sb5EQfQEfC1kcCneOAVfC7kTxBxp2FwCVqdJKY KwSg== 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:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id 23-20020a630f57000000b0057759a5b7ccsi8038367pgp.305.2023.10.09.20.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 20:10:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id B1B1C81DA5EB; Mon, 9 Oct 2023 20:10:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1441903AbjJJDJ5 (ORCPT + 20 others); Mon, 9 Oct 2023 23:09:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378482AbjJJDJz (ORCPT ); Mon, 9 Oct 2023 23:09:55 -0400 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 820B6E9 for ; Mon, 9 Oct 2023 20:09:49 -0700 (PDT) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4S4LVK3g89z4xPYp; Tue, 10 Oct 2023 11:09:45 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl1.zte.com.cn with SMTP id 39A39XXP084207; Tue, 10 Oct 2023 11:09:33 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp05[null]) by mapi (Zmail) with MAPI id mid14; Tue, 10 Oct 2023 11:09:35 +0800 (CST) Date: Tue, 10 Oct 2023 11:09:35 +0800 (CST) X-Zmail-TransId: 2b076524c06f155-bf0e1 X-Mailer: Zmail v1.0 Message-ID: <202310101109350209198@zte.com.cn> In-Reply-To: References: ZSPayGSz6HQBp+3W@gmail.com,202310092030430136422@zte.com.cn,ZSP3cuEsgwWcIKRw@gmail.com,CAJuCfpFabCn8gcuLV322RKC=xzVm0C+64HQP+CkFNJZ4VO42ZA@mail.gmail.com Mime-Version: 1.0 From: To: , , , Cc: , , Subject: =?utf-8?q?=5BPATCH_linux-next_v2_1/4=5D_sched/psi=3A_Change_update?= =?utf-8?q?=5Ftriggers=28=29_to_a_=27void=27_function?= X-MAIL: mse-fl1.zte.com.cn 39A39XXP084207 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6524C079.001/4S4LVK3g89z4xPYp X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email 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 (morse.vger.email [0.0.0.0]); Mon, 09 Oct 2023 20:10:10 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779336387280021177 X-GMAIL-MSGID: 1779336387280021177 From: Yang Yang Update_triggers() always returns now + group->rtpoll_min_period, and the return value is only used by psi_rtpoll_work(), so change update_triggers() to a void function, let group->rtpoll_next_update = now + group->rtpoll_min_period directly. This will avoid unnecessary function return value passing & simplifies the function. Suggested-by: Suren Baghdasaryan Signed-off-by: Yang Yang --- kernel/sched/psi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index 1d0f634725a6..fec8aab096a8 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -434,7 +434,7 @@ static u64 window_update(struct psi_window *win, u64 now, u64 value) return growth; } -static u64 update_triggers(struct psi_group *group, u64 now, bool *update_total, +static void update_triggers(struct psi_group *group, u64 now, bool *update_total, enum psi_aggregators aggregator) { struct psi_trigger *t; @@ -503,8 +503,6 @@ static u64 update_triggers(struct psi_group *group, u64 now, bool *update_total, /* Reset threshold breach flag once event got generated */ t->pending_event = false; } - - return now + group->rtpoll_min_period; } static u64 update_averages(struct psi_group *group, u64 now) @@ -706,7 +704,8 @@ static void psi_rtpoll_work(struct psi_group *group) } if (now >= group->rtpoll_next_update) { - group->rtpoll_next_update = update_triggers(group, now, &update_total, PSI_POLL); + group->rtpoll_next_update = now + group->rtpoll_min_period; + update_triggers(group, now, &update_total, PSI_POLL); if (update_total) memcpy(group->rtpoll_total, group->total[PSI_POLL], sizeof(group->rtpoll_total)); From patchwork Tue Oct 10 03:20:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 150454 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2251621vqo; Mon, 9 Oct 2023 20:21:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEj1rLG59X7iGRlmVnfGhCb8ooOA7M2nfsvy/IfiaV7qbXfROngsg6vX1BliyD4QsxrMOUk X-Received: by 2002:a05:6a20:4306:b0:13e:debc:3657 with SMTP id h6-20020a056a20430600b0013edebc3657mr18512662pzk.30.1696908097683; Mon, 09 Oct 2023 20:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696908097; cv=none; d=google.com; s=arc-20160816; b=dhfak5oPo5sabKjaelMKv4OwOVTbe5yoplN3YhENE1m3w6oWHHgwi5QW/mc0Zh33BH R3cmNWo0x4VMjS4dfMS3avXNQhGk2hHMRj+Ra7KsK2EtgGyxboeoV7ewk1TXYzaG+QaO LehnPtmItAIX31TTFA8jpX7F2DWJHef3gTPb+MRdUEK74JuIZjcF+m3vULbEuATUhDV1 DIvlExQhIrg7QcGd7Dwsf3fsmVjS65Hrv6TCgoE/jwp1lXTnryikgtPu/Df+l7QVosTT qqy1f7rSb7V+wRlNXg+32UXo95iZwuc87M+fxqhYSjCyEZsAjbrVju+PBjnUYK8C7GC2 AFZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:references :in-reply-to:message-id:date; bh=C9soboPZztxMFrRpP/VQa+llx8vobbdO1Cup+Ab5Uo8=; fh=P+rGFuRL1sCVMGcWZBsJKK/wdrRW+WoZNRHB2OIX/Q4=; b=KcG4qRGvJyUNaNhArkw8AtRoUwx+P3BstCGxVxXZyrNAw9E+/eAE1d7l9IHv8DIK15 3YTi608hmxhGAbyLtWehGm24kE6lHO31Kr+Qhp0Y/mLogBIEVac9QPUkbGDX3E2dgneI q/YwcAQ0IKps1/TnLfh0zVqz82Z8g8g5+eJsPB/r/LumKvnxpfUzyWbet0NPZlI//WOv EaV5C7orT3jTp5nR32c3T4qmxmZ3/5phQ4npudsJSCTMRJIvYbhCoZ9GQPB3LKtwx2v0 s+tOwPgxwDuwHtt07d3fKBX6/YYT7YMlg0jhaTDBlyB0HLZRioyUWFqmivq5q2MEm/vv tM5w== 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:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id t8-20020a6564c8000000b00578d6a88716si10436375pgv.3.2023.10.09.20.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 20:21:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 49C588263E8A; Mon, 9 Oct 2023 20:21:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1441903AbjJJDVC (ORCPT + 20 others); Mon, 9 Oct 2023 23:21:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378482AbjJJDVA (ORCPT ); Mon, 9 Oct 2023 23:21:00 -0400 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F35C1A6 for ; Mon, 9 Oct 2023 20:20:58 -0700 (PDT) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4S4LlC0mGWz8XrRQ; Tue, 10 Oct 2023 11:20:55 +0800 (CST) Received: from szxlzmapp05.zte.com.cn ([10.5.230.85]) by mse-fl2.zte.com.cn with SMTP id 39A3Khen070641; Tue, 10 Oct 2023 11:20:43 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp06[null]) by mapi (Zmail) with MAPI id mid14; Tue, 10 Oct 2023 11:20:44 +0800 (CST) Date: Tue, 10 Oct 2023 11:20:44 +0800 (CST) X-Zmail-TransId: 2b086524c30cffffffffe81-35b9a X-Mailer: Zmail v1.0 Message-ID: <202310101120445530640@zte.com.cn> In-Reply-To: References: ZSPayGSz6HQBp+3W@gmail.com,202310092030430136422@zte.com.cn,ZSP3cuEsgwWcIKRw@gmail.com,CAJuCfpFabCn8gcuLV322RKC=xzVm0C+64HQP+CkFNJZ4VO42ZA@mail.gmail.com Mime-Version: 1.0 From: To: , , , Cc: , , , , Subject: =?utf-8?q?=5BPATCH_linux-next_v2_2/4=5D_sched/psi=3A_Avoid_update_t?= =?utf-8?q?riggers_and_rtpoll=5Ftotal_when_it_is?= =?utf-8?q?_unnecessary?= X-MAIL: mse-fl2.zte.com.cn 39A3Khen070641 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6524C317.000/4S4LlC0mGWz8XrRQ X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email 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 (fry.vger.email [0.0.0.0]); Mon, 09 Oct 2023 20:21:33 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778156291723326049 X-GMAIL-MSGID: 1779337105783932685 From: Yang Yang When psimon wakes up and there are no state changes for rtpoll_states, it's unnecessary to update triggers and rtpoll_total because the pressures being monitored by user had not changed. This will help to slightly reduce unnecessary computations of psi. Signed-off-by: Yang Yang Cc: Zhang Yunkai Cc: Ran Xiaokai --- kernel/sched/psi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index fec8aab096a8..143f8eb34f9d 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -705,10 +705,11 @@ static void psi_rtpoll_work(struct psi_group *group) if (now >= group->rtpoll_next_update) { group->rtpoll_next_update = now + group->rtpoll_min_period; - update_triggers(group, now, &update_total, PSI_POLL); - if (update_total) + if (changed_states & group->rtpoll_states) { + update_triggers(group, now, &update_total, PSI_POLL); memcpy(group->rtpoll_total, group->total[PSI_POLL], sizeof(group->rtpoll_total)); + } } psi_schedule_rtpoll_work(group, From patchwork Tue Oct 10 03:24:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 150462 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2252421vqo; Mon, 9 Oct 2023 20:24:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGd1k30ZYrz7UzYO3OEZ7PG3huwklw53fv/L+4dwTxh6YBzjW3qH63wbzsCrrMZ0KRqRxeV X-Received: by 2002:a05:6358:2817:b0:12b:da97:aba6 with SMTP id k23-20020a056358281700b0012bda97aba6mr16661495rwb.24.1696908273641; Mon, 09 Oct 2023 20:24:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696908273; cv=none; d=google.com; s=arc-20160816; b=tOWUrywD06T43oJXnuFrUzWX+n44XplWJeE7bVQM0cIiORRsANr8xnHRDxtyH1tIDR se+kqk7vdHJ7SYO06wckan93+5+tsZI7uQrhTDtViSpEZ7n9FVQnRlc6kVmGRNjsYKmk V1E+C9oiiv+kVtFDsSwji8QlEKirPs5ap9e7XKDlBUusoOdCwVbcEmqsOyhvC0HXJ9mt uYWBUevmjQa6NMmj8Fqjo/rffjBd2HqIeiD8P56pULaEupkYeEAuWqFB1Kcmseb1wxhj 673weDOFL/HmOP5VVOX/B9GIdI5qlJ/RS9LltOMgyP0iF7Y26WEU0S7ckA0Rr7UJw7dn uGuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:references :in-reply-to:message-id:date; bh=QjcK9ViUAuI+FjH6k6suopZnQpSb9hmla9tuw3QrIDM=; fh=g66mwGaaEwasfANWCPBZJhFXmC0KrsU+d88cLge1kZM=; b=mhktiVvB5ZUqEYjPfm3nmUkxgMo0bvkD3Ggwfy3RPhcPKFGnoOuA7EpoURa/tdC69I ntwSTB5Z+CKp0hEDk5LgEC10EiLHK1b6gTs1ev7Y4FMLFu6y9+bZjdGmqmMJVQpqDWPq tKmE0xEQuF2VPGPm16qQBphYnG1reKR9AxUEUFH98Ud4Ge8Eidbb/wR/E/e99dnVX4gG hCkKIgLesCB4UzLjgCF7f3JI2GU7n6mVQL8WvIfXFpTJezuYk6RwjWxysxaw5v3Ep0Cb Cj5HFPNSY0tRfuQ9LtLoffihC+63hgKIUikwCHewI74qB7iG6OmpFhCWL1mPk3TSds8W 6Bdw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id s16-20020a17090aad9000b0027b14cd13a3si10802152pjq.73.2023.10.09.20.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 20:24:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 6FD6C81FADBC; Mon, 9 Oct 2023 20:24:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1441985AbjJJDYQ (ORCPT + 20 others); Mon, 9 Oct 2023 23:24:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1441983AbjJJDYP (ORCPT ); Mon, 9 Oct 2023 23:24:15 -0400 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC58BAC for ; Mon, 9 Oct 2023 20:24:13 -0700 (PDT) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4S4Lpy1sYCz8XrRG; Tue, 10 Oct 2023 11:24:10 +0800 (CST) Received: from szxlzmapp06.zte.com.cn ([10.5.230.252]) by mse-fl1.zte.com.cn with SMTP id 39A3O1FY006580; Tue, 10 Oct 2023 11:24:01 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp03[null]) by mapi (Zmail) with MAPI id mid14; Tue, 10 Oct 2023 11:24:03 +0800 (CST) Date: Tue, 10 Oct 2023 11:24:03 +0800 (CST) X-Zmail-TransId: 2b056524c3d3ffffffffb7a-bc80c X-Mailer: Zmail v1.0 Message-ID: <202310101124033093148@zte.com.cn> In-Reply-To: References: ZSPayGSz6HQBp+3W@gmail.com,202310092030430136422@zte.com.cn,ZSP3cuEsgwWcIKRw@gmail.com,CAJuCfpFabCn8gcuLV322RKC=xzVm0C+64HQP+CkFNJZ4VO42ZA@mail.gmail.com Mime-Version: 1.0 From: To: , , , Cc: , , Subject: =?utf-8?q?=5BPATCH_linux-next_v2_3/4=5D=C2=A0sched/psi=3A_update_rt?= =?utf-8?q?poll=5Fnext=5Fupdate_after_update?= =?utf-8?q?_triggers_and_rtpoll=5Ftotal?= X-MAIL: mse-fl1.zte.com.cn 39A3O1FY006580 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6524C3DA.000/4S4Lpy1sYCz8XrRG X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email 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 (morse.vger.email [0.0.0.0]); Mon, 09 Oct 2023 20:24:29 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779337289624108866 X-GMAIL-MSGID: 1779337289624108866 From: Yang Yang Update group->rtpoll_next_update after called update_triggers() and update rtpoll_total. This will prevent bugs if update_triggers() uses group->rtpoll_next_update in the future, and it makes more sense to set the next update time after we finished the current update. Signed-off-by: Yang Yang Suggested-by: Suren Baghdasaryan --- kernel/sched/psi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index 143f8eb34f9d..79f8db0c6150 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -704,12 +704,12 @@ static void psi_rtpoll_work(struct psi_group *group) } if (now >= group->rtpoll_next_update) { - group->rtpoll_next_update = now + group->rtpoll_min_period; if (changed_states & group->rtpoll_states) { update_triggers(group, now, &update_total, PSI_POLL); memcpy(group->rtpoll_total, group->total[PSI_POLL], sizeof(group->rtpoll_total)); } + group->rtpoll_next_update = now + group->rtpoll_min_period; } psi_schedule_rtpoll_work(group,