From patchwork Thu Nov 3 12:07:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Qiao X-Patchwork-Id: 14834 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp485421wru; Thu, 3 Nov 2022 05:06:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4WwjioxQZQTAzUORk0PoKwLJUs08Eu6MaK+iUgRYv5m72Zx4X7WlLo/XhPM/35eiCVV+zN X-Received: by 2002:a17:90b:3446:b0:213:4990:fa2 with SMTP id lj6-20020a17090b344600b0021349900fa2mr49470323pjb.73.1667477187699; Thu, 03 Nov 2022 05:06:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667477187; cv=none; d=google.com; s=arc-20160816; b=ej6KVE1PtW0Rnk2VmFgkDkZYYBZkjqi+QNeJhlor/1P+dzm59W/teBFlpfCDpHqYis dJU+QmW9Qgk/APg8PNBLIytIM2CR3yY3T9oYz6zgr+tiFycOYt1a5z6Zof4D21xcMHHf ThRxJsclOagjyLvm/kHHycZDMXiqdm0gc6FfjsKvjNivqcSquG6T7+AAf1p6h7dYaarw kFeDzeTi1Y26u16UEDbl50ToNJyiJmG1IlupSzIg6lam69dx4iQ4NxCnVx425t3gz0C8 xI0al5G6s8PnzMMUiobVgU/Zw0JPxr04bin6DdqiGMxMKCk68Nrx8KgIaLJUf2gkuEVe YUlw== 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=N1b4P6zRfCpiYzokWBUJ/Dz2w0jA/v8u+AravTtPlB0=; b=zDVGq3fJsekG+NxfWTDCVsJkMDT1JFKYZEv97nh6P3LGrip82tR8z2MJftYqtk9C5x sF40/AI0jJHoLzByjLSMMdkrGjLShmy95i9GCedyvz+kXZdYJx02RhzjRyvmxo737z0S GoYTunM/Q/rxNUfMqx5XX1LoPmlQNNZNbEZZLNWKVsDnSM3Ctpgc95I0QMS/dgKZHb+e wM5Bak1Jdpf8zApalZ13BTnJxisKEkPXCQYHG8VtI4/4222m2vn6F7H6D0v0BfwK2Dyd DBBp0rwr6jZEyGGnXkqacUgq4NI39HGBikBzHKkJGFFX19MPS07ToYbQTvEb7M6pF82s YdNA== 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 k3-20020a170902760300b0017d6ffda9e3si504879pll.369.2022.11.03.05.06.00; Thu, 03 Nov 2022 05:06:27 -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 S230203AbiKCLim (ORCPT + 99 others); Thu, 3 Nov 2022 07:38:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231381AbiKCLiZ (ORCPT ); Thu, 3 Nov 2022 07:38:25 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74EAA11C3B for ; Thu, 3 Nov 2022 04:38:24 -0700 (PDT) Received: from dggpeml500020.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4N31sC4BtVzJnL5; Thu, 3 Nov 2022 19:35:27 +0800 (CST) Received: from dggpeml500018.china.huawei.com (7.185.36.186) by dggpeml500020.china.huawei.com (7.185.36.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 3 Nov 2022 19:38:22 +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; Thu, 3 Nov 2022 19:38:22 +0800 From: Zhang Qiao To: , , , , CC: , , , , , , , , Zhang Qiao Subject: [PATCH v2 1/2] sched: Init new task's vruntime after select cpu Date: Thu, 3 Nov 2022 20:07:19 +0800 Message-ID: <20221103120720.39873-2-zhangqiao22@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221103120720.39873-1-zhangqiao22@huawei.com> References: <20221103120720.39873-1-zhangqiao22@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.191] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) 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?1748476559804664434?= X-GMAIL-MSGID: =?utf-8?q?1748476559804664434?= 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 --- v1->v2: make sched_task_fork static. 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..21481bd22bdf 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); +} + +static 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); } /*