From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7CF3842A80; Tue, 7 Jul 2026 00:12:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783383153; cv=none; b=kXunwxGR//amXMG38X9e9MpS1M7k+Mvzo+LDc/zwSU1dyKIuhU7stSG0Qe+Ne1p4L+w1SaLJbcMCyBKNDAC1Tz0oOU21Bg0Mk57FHjfFwH8EHeRbP/noVzf+DmWhOh2BDng9kiTdSfLqv5yr3SfOhaftYbmneW0EjViOxiYDL5s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783383153; c=relaxed/simple; bh=Gs0DY4skzUxDJcoAUdLKS+CVrIjwqmDpuXBlhkdHboY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tgxinPDpyoVdj86+KjdMOGPKWZdifNY2W+DtK35xrtHo07FBqntiip9kOuU5faCR6bFcB+EXNtNI4bx1SoJs4iCOZ8PBXqSJEI4BxYK3MztJ3dFISJnEvQxBr+y9jAEqXzwDvXYCgmz4ZDU6fcZEVyP5OFB2z5BMAf+AWUQlAE4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=F1UZYWxv; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="F1UZYWxv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3870C1F00A3D; Tue, 7 Jul 2026 00:12:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783383152; bh=G53dXQhkJaxH3bQ+S+EqX2WmpEbXWk3f96dnSqTuycQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F1UZYWxvF6mI2HrgQQOSlpaX2eL9UagAL7Zvm+o6G9sVXshOo5YnvP7jnlpe1CXdn vEVagpZHKcBnYy5Ayw6FKIzn41RthCQ2ZvZoxCZJI8Kovy/DmNaAq1PzlY+s15O6gb jzw9/l7xeWzGUbmJURVe37MMxlt3hOmM/1VgXIEhPM2bIwzOQwAc1sb+GPKdoIy5lz ydkjWP4b5KI4xUapibUkUIxcbJuiS4VaUeM613wb156P1OHSBr4O4YUAjDfNiavQdz 1ms/rGjp8dQc8nkLlP2cuE2fE8pkv7Zrv08eWHG4BPE9+bkJoXA46wldrC98T6qBM+ FHGrnmG+a+fKA== From: Tejun Heo To: David Vernet , Andrea Righi , Changwoo Min Cc: sched-ext@lists.linux.dev, Emil Tsalapatis , linux-kernel@vger.kernel.org, Tejun Heo Subject: [PATCH v3 sched_ext/for-7.3 02/36] sched_ext: Rename extra_enq_flags to remote_activate_enq_flags Date: Mon, 6 Jul 2026 14:11:55 -1000 Message-ID: <20260707001229.1410929-3-tj@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260707001229.1410929-1-tj@kernel.org> References: <20260707001229.1410929-1-tj@kernel.org> Precedence: bulk X-Mailing-List: sched-ext@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit scx_rq.extra_enq_flags carries scx-specific enqueue flags across the activate_task() boundary during a cross-rq task move in move_remote_task_to_local_dsq(). Rename it to remote_activate_enq_flags to name that role, and fix the stale comment that referenced the old move_task_to_local_dsq() name. No functional change. Signed-off-by: Tejun Heo --- kernel/sched/ext/ext.c | 10 +++++----- kernel/sched/sched.h | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/sched/ext/ext.c b/kernel/sched/ext/ext.c index b1bd506fd6ec..d15cf3c7f87c 100644 --- a/kernel/sched/ext/ext.c +++ b/kernel/sched/ext/ext.c @@ -1824,7 +1824,7 @@ static void enqueue_task_scx(struct rq *rq, struct task_struct *p, int core_enq_ { struct scx_sched *sch = scx_task_sched(p); int sticky_cpu = p->scx.sticky_cpu; - u64 enq_flags = core_enq_flags | rq->scx.extra_enq_flags; + u64 enq_flags = core_enq_flags | rq->scx.remote_activate_enq_flags; if (enq_flags & ENQUEUE_WAKEUP) rq->scx.flags |= SCX_RQ_IN_WAKEUP; @@ -2097,13 +2097,13 @@ static void move_remote_task_to_local_dsq(struct task_struct *p, u64 enq_flags, /* * We want to pass scx-specific enq_flags but activate_task() will * truncate the upper 32 bit. As we own @rq, we can pass them through - * @rq->scx.extra_enq_flags instead. + * @rq->scx.remote_activate_enq_flags instead. */ WARN_ON_ONCE(!cpumask_test_cpu(cpu_of(dst_rq), p->cpus_ptr)); - WARN_ON_ONCE(dst_rq->scx.extra_enq_flags); - dst_rq->scx.extra_enq_flags = enq_flags; + WARN_ON_ONCE(dst_rq->scx.remote_activate_enq_flags); + dst_rq->scx.remote_activate_enq_flags = enq_flags; activate_task(dst_rq, p, 0); - dst_rq->scx.extra_enq_flags = 0; + dst_rq->scx.remote_activate_enq_flags = 0; } /* diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 56acf502ba26..80b72d934ff3 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -797,7 +797,8 @@ struct scx_rq { struct list_head runnable_list; /* runnable tasks on this rq */ struct list_head ddsp_deferred_locals; /* deferred ddsps from enq */ unsigned long ops_qseq; - u64 extra_enq_flags; /* see move_task_to_local_dsq() */ + /* see move_remote_task_to_local_dsq() */ + u64 remote_activate_enq_flags; u32 nr_running; u32 cpuperf_target; /* [0, SCHED_CAPACITY_SCALE] */ bool in_select_cpu; -- 2.54.0