From patchwork Mon Oct 31 12:51:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Qiao X-Patchwork-Id: 13259 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2285257wru; Mon, 31 Oct 2022 05:33:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5M6asySlpUFzgXGxSETWFPC+uB6NZxEPKBk9on6rRfi45Cc/D2aiZOfQKELXJgo6T86Jka X-Received: by 2002:a63:4f20:0:b0:46f:b887:4cc9 with SMTP id d32-20020a634f20000000b0046fb8874cc9mr5446856pgb.306.1667219603934; Mon, 31 Oct 2022 05:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667219603; cv=none; d=google.com; s=arc-20160816; b=iO0eNRIrrfAoyxmK4G5GgpFV8wH8v2Gzl72IP0Q7WDT62nPupZbpRrCUigjJaS1hSV lTMVkDYz0hzJ+LMwwTTIEOYAoL7EpOsbT1ss6z1xsyUGLY9akVqoEKXihGgT0k70+Qyk WYVU0BOiHModSVq554JFAbP3W9/EqnnK1VUBzdaAIjXqL9JpsvIQG5ZjvKfBJkvTNqa1 pTBxSRhRUgl36+RSwjwlRf7xxA3prkvYWqwUDhOszx8NHhSCDsmnfpNJ5zax63yPvNtY C3wUtmiNgRpPh6f60Gnyevp1GvgdyCEDLOqbVAVTduVXKFzYicpbDyGTXKZWpL3rkUp0 ZvJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=Twqc2M1U/2q+dKwi4vzB0JrL4JXAB+DfkRyBmi/jVQo=; b=UIk6pePhYa1sqKPfk/f8fAOMZTUZZnEyoaMFdPYRIueGKZoPXcko1BtYkFdhgVKZcb f0U7mqIzsLrB4EaSSI8G1Nyybz7VVqrMtD4E4J5UYokqXWrCWaoJDRixjfNe5m1qVj5X Qh2Ex5wGXB0zhX2V/+GItzbcUKx4B/PGgERfsBhjUTDtPGQs16WrFNmuyyx9ZjrC1JhQ dEmar1WNC2/hMxPfuoKcb5wLv9t4JjbU9FW9HGTCA+t0Nki8hT94MWLWl6uJMbi/n+Sc TeW9IsbX/MrjUHhuAOYIz9MnE+VJmzXMST5HjHy1tDqjizJv+vEOv8MORe9IwmO8m8K3 uC7g== 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 x24-20020a63db58000000b0046fd05d55e0si2212143pgi.567.2022.10.31.05.33.10; Mon, 31 Oct 2022 05:33:23 -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; 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 S231384AbiJaMXB (ORCPT + 99 others); Mon, 31 Oct 2022 08:23:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231330AbiJaMWt (ORCPT ); Mon, 31 Oct 2022 08:22:49 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8D22F02D for ; Mon, 31 Oct 2022 05:22:14 -0700 (PDT) Received: from dggpeml500023.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N1Bwn66ZDz15MHl; Mon, 31 Oct 2022 20:17:13 +0800 (CST) Received: from dggpeml500018.china.huawei.com (7.185.36.186) by dggpeml500023.china.huawei.com (7.185.36.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 31 Oct 2022 20:22:13 +0800 Received: from huawei.com (10.67.174.191) by dggpeml500018.china.huawei.com (7.185.36.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 31 Oct 2022 20:22:13 +0800 From: Zhang Qiao To: , , , CC: , , , , , , , , Subject: [PATCH next 1/2] sched: Init new task's vruntime after select cpu Date: Mon, 31 Oct 2022 20:51:12 +0800 Message-ID: <20221031125113.72980-2-zhangqiao22@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221031125113.72980-1-zhangqiao22@huawei.com> References: <20221031125113.72980-1-zhangqiao22@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.191] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500018.china.huawei.com (7.185.36.186) 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?1748206462915765950?= X-GMAIL-MSGID: =?utf-8?q?1748206462915765950?= When create a new task, we initialize vruntime of the new task at sched_cgroup_fork(). However, this action is executed too early and may be incorrect, because it use current cpu to init the vruntime, but the new task actually runs on the cpu assigned at wake_up_new_task(). So the patch call task_fork() after select fork cpu and use the ready cpu(the child will run on it) init the new task. Signed-off-by: Zhang Qiao --- kernel/sched/core.c | 7 ++++++- kernel/sched/fair.c | 7 +------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index e4ce124ec701..ca5677206efd 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4627,9 +4627,13 @@ void sched_cgroup_fork(struct task_struct *p, struct kernel_clone_args *kargs) * so use __set_task_cpu(). */ __set_task_cpu(p, smp_processor_id()); + raw_spin_unlock_irqrestore(&p->pi_lock, flags); +} + +void sched_task_fork(struct task_struct *p) +{ if (p->sched_class->task_fork) p->sched_class->task_fork(p); - raw_spin_unlock_irqrestore(&p->pi_lock, flags); } void sched_post_fork(struct task_struct *p) @@ -4682,6 +4686,7 @@ void wake_up_new_task(struct task_struct *p) #endif rq = __task_rq_lock(p, &rf); update_rq_clock(rq); + sched_task_fork(p); post_init_entity_util_avg(p); activate_task(rq, p, ENQUEUE_NOCLOCK); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index e4a0b8bd941c..34845d425180 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -11603,12 +11603,8 @@ static void task_fork_fair(struct task_struct *p) struct cfs_rq *cfs_rq; struct sched_entity *se = &p->se, *curr; struct rq *rq = this_rq(); - struct rq_flags rf; - rq_lock(rq, &rf); - update_rq_clock(rq); - - cfs_rq = task_cfs_rq(current); + cfs_rq = task_cfs_rq(p); curr = cfs_rq->curr; if (curr) { update_curr(cfs_rq); @@ -11626,7 +11622,6 @@ static void task_fork_fair(struct task_struct *p) } se->vruntime -= cfs_rq->min_vruntime; - rq_unlock(rq, &rf); } /*