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;
From:   Daniel Jordan <daniel.m.jordan@oracle.com>
To:     mingo@redhat.com, peterz@infradead.org, vincent.guittot@linaro.org,
        yu.c.chen@intel.com, kprateek.nayak@amd.com, bsegall@google.com,
        dietmar.eggemann@arm.com, efault@gmx.de, wuyun.abel@bytedance.com,
        youssefesmat@chromium.org
Cc:     linux-kernel@vger.kernel.org, daniel.m.jordan@oracle.com
Subject: [PATCH v3] sched/fair: Preserve PLACE_DEADLINE_INITIAL deadline
Date:   Mon, 23 Oct 2023 11:43:19 -0400
Message-ID: <20231023154319.102437-1-daniel.m.jordan@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0UJmKxmfLqkmQpoqA5VhbGbJWrGfcVxIEM39ttAAcLzYZcuNpyHPwMfuzZMV?=
 =?us-ascii?Q?1bYk/iAgAu3V65ns14QIUOw5RLgz21BXOPzNrPx2gBhuDQT+XPlqFLsCIWJP?=
 =?us-ascii?Q?K9jkyyHNll2+N3wbH9+dWu87p0G1DPnFDqx/1DxJvgcarS3vRXKfl5csztat?=
 =?us-ascii?Q?FEBjAQGsJkj2PP4oCcphVFJ5nKr/60ACSrbuBVIdNIz2lvyEexM6BMYI1YaV?=
 =?us-ascii?Q?u7//PJd2ENprm/bYv877Y5jGQGlQBdOfuxqRxFD56URiUPdtlALy3CLFWxto?=
 =?us-ascii?Q?O8UOzfp4d+DgClE7VnFCM9UhO/BD2MpJTdIoEavZepPLNmSpxb+LhQuTGflh?=
 =?us-ascii?Q?fchDm/Un/n1H2B4FzPkuvUQeCeiKxouZ6b/5zRrsvy238VgQ3LZTpcwx2V7L?=
 =?us-ascii?Q?FJ8k7yg+envmbVLHI2kA6d3OWqerTjupy9ANAD3IFVWr3vHWdRZ+wDIKzWfj?=
 =?us-ascii?Q?3UIedjgzj+tj74G5aB00VYhJeyoQOtH7hCmuy1f38HVMG8W3TEtkSp4lXBTK?=
 =?us-ascii?Q?DrdQAt2DRjfgU/7qDr7k6yPdrKwFPs7WGw7lImwm3s0kQLGz0iAeKQP4NUEI?=
 =?us-ascii?Q?fSJwdtIE0y1MvoMiFEIwCfHmtOKfWxZdSWRMpfW21OoQ9LFpyHe8n9mO9l36?=
 =?us-ascii?Q?abu/IUIjRBwXN7C+CI7+3LDV13c64IzdADWlMcCpnSjtJTnAN9mZwZZ4qX5d?=
 =?us-ascii?Q?BrqSm3iHaLTxqAmM8KpmILhNXNikvHb9TsW0hvhzcaXsKpQpRrpBAz9sr75p?=
 =?us-ascii?Q?TT/h2AvKQ3DBJMWxNIAJswOd791ckD3uU/2sUtEUz+toT6/BWKMaOlx38zs/?=
 =?us-ascii?Q?YzUPqew0xcTx5np+NSsZNR2yHgasgVoFP1S3SQt9Q3fLrwjdfLSzGWQNB7Kq?=
 =?us-ascii?Q?Gbd7DZOI4saiF2TBSxJ45JyoY8Nfc8VJH96x0+gzHJyYumGcSY0pvYXqDVL6?=
 =?us-ascii?Q?KdPhXxT0KLyfOlTMm8FGRaLFXINZtmq+6NYkwZfBuzXYnsxnomLXbywJblbH?=
 =?us-ascii?Q?BOMwl5Bm7oLa5ANGzNFzJ1QQ0EvHZI29RYHxJP29JWiB55Qgk2BLUSrvW6kV?=
 =?us-ascii?Q?/36Cpd6/ucsiIU4luhghMRKF5bsQ8qosfht7A4M4n4KAMIC9Hp0RjU+HqzKj?=
 =?us-ascii?Q?KISkL0/vYhFS2sQWb6AHrwrgzJEd3DH8rM07h9Cv/5UtYSukVa1n7PvqkHFh?=
 =?us-ascii?Q?bOPv0z6A4DI+XcpUsBeaV9J6Sr2DC7WWAgC+aVkK+0wUvvRLU+HLqF5HKXTw?=
 =?us-ascii?Q?NogTkrS27daqXQFJgdGkRdszp7lSOBMUbVKF5WRoymzGi3bzlSJgf3TfeZqM?=
 =?us-ascii?Q?yU/VoeoHfIQUKYlQmh10yXdtNj7ipspQjUST/OgioSrZkLlqNeOp+VtJd5CV?=
 =?us-ascii?Q?UplH86qrSljbgJXYwHnciriPO4Cr4U3WzMaYcC2UGEuyrF+h526Sox1lqgTQ?=
 =?us-ascii?Q?fZ4kKTtMQEcdIcc/65/Klp7JlxtpCltvcMM2wFXs/vbPpQjhkd458+LcDb7n?=
 =?us-ascii?Q?5iTsAnZ2/TT/eo1tNo1daA22CSFwvXZqOL2ngRbBB+3mRh1Y8eDlgXTT5PSO?=
 =?us-ascii?Q?bXp/uLM4Be22YSSzkc1ZE53/hDQIBEvftKpHtVbvlBwh/8/wp48cTpgQCpA9?=
 =?us-ascii?Q?LQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?GynoMDumtk+VJVSZQkDFOivzVKbQSElR6N4gBXoc77jzYH7kl/Yp0LBelKTr?=
 =?us-ascii?Q?UYIJFoA1GXto9EHl/PRS/X54M9S1xx2Uu8OO3cjRlkCBMtfnH2EDqfX5aoge?=
 =?us-ascii?Q?gMnWLWuh68t0kAoYW4Kq1vaaTQ9eDhPE2Kb/rxjEIOyX4FZWuU3F41bIJRdM?=
 =?us-ascii?Q?DKR2gldsdNVCclqlLmrgANUgOg22GUM83jOyWoNF1gyi1N0SAskLOUOEtrf0?=
 =?us-ascii?Q?LWoWM4WS+G5tsrIz0pkmJaGwBz2XzVVnUYThfC4zlSNJRCc8Hk04devmSs+H?=
 =?us-ascii?Q?Z8YZf8CsnoFHNvsAiO29Vfu/11gV5DEwYMQh0ISuJY9Uc0imjuKmv1rz3taK?=
 =?us-ascii?Q?oQ7oMu2pnR/UrcuTVUBwbpsPJv7ZIiVBXLdbDVlCvXDKr+7Wf3mrX7wG7H/c?=
 =?us-ascii?Q?prjdjcy7LATshQ0985wLBdFoE4Py0YxqcVvTycAZvS3pXW2PxdT8KUacrACS?=
 =?us-ascii?Q?qoNkNMqkRumRGbewijeHB3Y0xWaVfL7qPXxdcat5VWqXHmBNXy4eSUPcPUOj?=
 =?us-ascii?Q?aSnVD8SE/OzNzKxA73tm2kn/6AQGHXDU6J1tNM690MEovrqyWqAVROCxAs96?=
 =?us-ascii?Q?dpnF0+5PV6/bjEA1Qhms3pwY529dqja3w7Ev/i9bbyM3EsOKGQfmx4JI8f1Q?=
 =?us-ascii?Q?ozZhEuoKtI7wyFh7YKJiW75a7eGZzHDzhOHQlg4wGtDqGyPAOm056R9pap/N?=
 =?us-ascii?Q?6fbBRw9SHcNNetoDICJrsNql3uS0V04ku3UB9kY5TuHl8+ZR+Fh8qWvffFkZ?=
 =?us-ascii?Q?E2IFpJutXKro0ktJ9cvkcOWl1n1Lc6lAftl2plqXBuECPtEgYtLZf3mhBQpT?=
 =?us-ascii?Q?flnJuGF3KLAtIxkhiz9I8kOTxhKoOnKv3RDf6AiKJKmnfZp8hOuV34ccktEF?=
 =?us-ascii?Q?f/d7gy5PUGB+piKlSb7mZmeWvSJjhHamH3zxiIl5w+o0qkQ30eV7dWiIEl1X?=
 =?us-ascii?Q?A9tD5PuRYaJ4ofW/lH+FZKOByz5LZccpPUjFfkdqiZuUesv182iuXo6IPvk2?=
 =?us-ascii?Q?tsAtVBkYi8H/h+2A0gLNqZVTsA4WWHFPANzrWpGvOtfTlBw=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 377bc065-131d-4bc8-8bad-08dbd3dec90e
X-MS-Exchange-CrossTenant-AuthSource: SA1PR10MB5711.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2023 15:43:21.4655
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: W2t96ey4ZaP2wM2SYhgLw9mZGrNBT6HIqmvavWcjM8aKcYvrKtjua21uSisyN3ZxrP6/2rO+Q+zlqJ7e3utNhv4PvU1a2UnGMIumxami6DQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6444
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-10-23_14,2023-10-19_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 phishscore=0
 mlxlogscore=999 mlxscore=0 bulkscore=0 suspectscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310170001
 definitions=main-2310230137
X-Proofpoint-GUID: z-gb5_pGTmGqE9O4ZvDcvnQ4z0AgAQIx
X-Proofpoint-ORIG-GUID: z-gb5_pGTmGqE9O4ZvDcvnQ4z0AgAQIx
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: <linux-kernel.vger.kernel.org>
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, 23 Oct 2023 08:44:50 -0700 (PDT)

An entity is supposed to get an earlier deadline with
PLACE_DEADLINE_INITIAL when it's forked, but the deadline gets
overwritten soon after in enqueue_entity() the first time a forked
entity is woken so that PLACE_DEADLINE_INITIAL is effectively a no-op.

Placing in task_fork_fair() seems unnecessary since none of the values
that get set (slice, vruntime, deadline) are used before they're set
again at enqueue time, so get rid of that (and with it all of
task_fork_fair()) and just pass ENQUEUE_INITIAL to enqueue_entity() via
wake_up_new_task().

Fixes: e8f331bcc270 ("sched/smp: Use lag to simplify cross-runqueue placement")
Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Reviewed-by: Chen Yu <yu.c.chen@intel.com>
Tested-by: K Prateek Nayak <kprateek.nayak@amd.com>
---

v3
 - Rebased on tip/sched/core and retested.  The "none of the values that
   get set (slice, vruntime, deadline) are used" part was checked
   without this patch by poisoning slice, vruntime, and deadline when
   placing from task_fork_fair() and checking for the poisoned values
   everywhere they're read until the entity is placed again in enqueue_entity().
 - Added Chen Yu's R-b and Prateek's T-b

 kernel/sched/core.c |  2 +-
 kernel/sched/fair.c | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 264c2eb380d7f..bdfdd9598137c 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4856,7 +4856,7 @@ void wake_up_new_task(struct task_struct *p)
 	update_rq_clock(rq);
 	post_init_entity_util_avg(p);
 
-	activate_task(rq, p, ENQUEUE_NOCLOCK);
+	activate_task(rq, p, ENQUEUE_INITIAL | ENQUEUE_NOCLOCK);
 	trace_sched_wakeup_new(p);
 	wakeup_preempt(rq, p, WF_FORK);
 #ifdef CONFIG_SMP
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 4b70b0d146987..544de3b43e146 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -12417,29 +12417,6 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)
 	task_tick_core(rq, curr);
 }
 
-/*
- * called on fork with the child task as argument from the parent's context
- *  - child not yet on the tasklist
- *  - preemption disabled
- */
-static void task_fork_fair(struct task_struct *p)
-{
-	struct sched_entity *se = &p->se, *curr;
-	struct cfs_rq *cfs_rq;
-	struct rq *rq = this_rq();
-	struct rq_flags rf;
-
-	rq_lock(rq, &rf);
-	update_rq_clock(rq);
-
-	cfs_rq = task_cfs_rq(current);
-	curr = cfs_rq->curr;
-	if (curr)
-		update_curr(cfs_rq);
-	place_entity(cfs_rq, se, ENQUEUE_INITIAL);
-	rq_unlock(rq, &rf);
-}
-
 /*
  * Priority of the task has changed. Check to see if we preempt
  * the current task.
@@ -12943,7 +12920,6 @@ DEFINE_SCHED_CLASS(fair) = {
 #endif
 
 	.task_tick		= task_tick_fair,
-	.task_fork		= task_fork_fair,
 
 	.prio_changed		= prio_changed_fair,
 	.switched_from		= switched_from_fair,
-- 
2.42.0