From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D522C136352 for ; Sat, 12 Jul 2025 03:34:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752291257; cv=none; b=fBkEUmtaJhA64vcX586EfkHCrbI41Iz6DYpucbWwOP8+Zd+oA4HeLnOu1+9XzxcDogyNJ7/dXAzF7/W8o+IVFmyIQXXUqjjF3lwnRjsxedhv2NzK/M7TwG2g9mKLGB0QCG0qEfdZE2NDf09bDTvKc63vke7/jvFRDIQpc6YRr94= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752291257; c=relaxed/simple; bh=VWgHxyi7LDDBO4Gn93TVM5lfgdvjoH0TRNH9C5pGwss=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=onQ7NEWXpUOjL78f1T1+Q5Np1PBIxqexrayKOCDDVmiGaIct3fdTGkmgwIg6H5IwZK00r+Vd8jieFL7KZluP45fGI9w+f41Y43eyku19PL4KZFutTp8xJeo0+XS+KV2p5KaiqPBw0iqT4B0Pu6UsvervMHBkTmrM8qE1BrL6vU8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jstultz.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=tYGf6GYA; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jstultz.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="tYGf6GYA" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-23536f7c2d7so42005205ad.2 for ; Fri, 11 Jul 2025 20:34:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752291255; x=1752896055; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ivjBPFJqY0Lz+cvcJfjKk19gbOyQS173V3105eKSA3c=; b=tYGf6GYA86poNT1Gj69D1jv+QeAMIJOYVo9ZWnM2jR2I7B42yg1jFrrJoErSAn4Iko hu/AgIpjabOnM5/WmJD9o9nL3Yfwvi4bUOoclfSCSjx29Xwn9BTdBSjb8UzuVpEN2j1t 72XtmzFZE2LdRb+Sz4hZJcmVbrJI6PzqFFzg1T/V29rxRiRiqujrpm4RnBxva5BEfL4M 8cjaGtjzdb+JtV6oRw18QrD0RV/OUGqVeXhywiurvLNQKt6XJ+s/9w2C4RkUrABzUS1j MMISITc0/NuDnoIlo5lN0LQsx36aFABAVISYBnDOIK5/QL5QdP/FCasM/MMstdcm23l1 L7yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752291255; x=1752896055; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ivjBPFJqY0Lz+cvcJfjKk19gbOyQS173V3105eKSA3c=; b=tlU8xYk/dkL8EaXIn67o8SFKQw9/h7iBiYiuhdEzD9wsRzGQyBkV+8QaWGJmFbT9iz /DdU2kcJa8i8uZh1gDeiEyTtwbTyyJ4gziHfeDYbgnfUz0lvomGBBXYuYiRyA/EEpZrX K2pZjE4c7I8eGl4ZVRMKP6Uco+C45PXB8UAs/I7LIXqShR64rizN+Zn1qhOcVs5PngYR i8wX1askQsAW2r5Xz2yxrhzGAK0WYBWZTgavoZU4pfSljN8DPPUwZ+5ieO7SDGdrGI6p gjRhR+mXxf0T589K12QHq9FmDednfdHgFqYzAAz/1J6XVXWYJkzLHfQEpPgaWsOlun/B YpjA== X-Gm-Message-State: AOJu0YzfHLQ7C+4LzNc1f45PpAllo6ByHAD5CZbWU7Kkey2zDJjQc7mU Q08LcvXbZOOxhlEMeD6ELUrAdCbZiDfSYwEi+EXlrGmPrj5rgZh/v/wXPxJ1u3I3KfQefu+vivb wZC+xz9XJFvwQjiPw64/+kBzvSDJlwy2C8fEnGk3sA4p7h9dUhUvJKEOoWd9QadCIeZKiaAFOb7 dgGIDTqdiMO4cwnIIlU9ictK/praAvv/OiqIdA9AXzZLxODWQZ X-Google-Smtp-Source: AGHT+IEzvGypPpwTdLR61tX5Qreu93vLW0bjmeM1IQ2Kfy1C9LpbI714yZ0CwfmQcI6QWmkA0AWo9I14suZf X-Received: from pjvf13.prod.google.com ([2002:a17:90a:da8d:b0:314:3153:5650]) (user=jstultz job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:dacd:b0:23d:dcf5:47e1 with SMTP id d9443c01a7336-23dee237ff0mr70391925ad.31.1752291255055; Fri, 11 Jul 2025 20:34:15 -0700 (PDT) Date: Sat, 12 Jul 2025 03:33:42 +0000 In-Reply-To: <20250712033407.2383110-1-jstultz@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250712033407.2383110-1-jstultz@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250712033407.2383110-2-jstultz@google.com> Subject: [PATCH v19 1/8] sched: Add CONFIG_SCHED_PROXY_EXEC & boot argument to enable/disable From: John Stultz To: LKML Cc: John Stultz , K Prateek Nayak , Joel Fernandes , Qais Yousef , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Valentin Schneider , Steven Rostedt , Ben Segall , Zimuzo Ezeozue , Mel Gorman , Will Deacon , Waiman Long , Boqun Feng , "Paul E. McKenney" , Metin Kaya , Xuewen Yan , Thomas Gleixner , Daniel Lezcano , Suleiman Souhlal , kuyo chang , hupu , kernel-team@android.com Content-Type: text/plain; charset="UTF-8" Add a CONFIG_SCHED_PROXY_EXEC option, along with a boot argument sched_proxy_exec= that can be used to disable the feature at boot time if CONFIG_SCHED_PROXY_EXEC was enabled. Also uses this option to allow the rq->donor to be different from rq->curr. Tested-by: K Prateek Nayak Signed-off-by: John Stultz --- v7: * Switch to CONFIG_SCHED_PROXY_EXEC/sched_proxy_exec= as suggested by Metin Kaya. * Switch boot arg from =disable/enable to use kstrtobool(), which supports =yes|no|1|0|true|false|on|off, as also suggested by Metin Kaya, and print a message when a boot argument is used. v8: * Move CONFIG_SCHED_PROXY_EXEC under Scheduler Features as Suggested by Metin * Minor rework reordering with split sched contexts patch v12: * Rework for selected -> donor renaming v14: * Depend on !PREEMPT_RT to avoid build issues for now v15: * Depend on EXPERT while patch series upstreaming is in progress. v16: * Allow "sched_proxy_exec" without "=true" to enable proxy-execution at boot time, in addition to the "sched_proxy_exec=true" or "sched_proxy_exec=false" options as suggested by Steven * Drop the "default n" in Kconfig as suggested by Steven * Add !SCHED_CLASS_EXT dependency until I can investigate if sched_ext can understand split contexts, as suggested by Peter v17: * Expanded the commit message a bit to clarify that the option allows the split contexts (rq->donor and rq->curr) to be different tasks, from feedback from Juri Lelli Cc: Joel Fernandes Cc: Qais Yousef Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Juri Lelli Cc: Vincent Guittot Cc: Dietmar Eggemann Cc: Valentin Schneider Cc: Steven Rostedt Cc: Ben Segall Cc: Zimuzo Ezeozue Cc: Mel Gorman Cc: Will Deacon Cc: Waiman Long Cc: Boqun Feng Cc: "Paul E. McKenney" Cc: Metin Kaya Cc: Xuewen Yan Cc: K Prateek Nayak Cc: Thomas Gleixner Cc: Daniel Lezcano Cc: Suleiman Souhlal Cc: kuyo chang Cc: hupu Cc: kernel-team@android.com --- .../admin-guide/kernel-parameters.txt | 5 ++++ include/linux/sched.h | 13 +++++++++ init/Kconfig | 12 ++++++++ kernel/sched/core.c | 29 +++++++++++++++++++ kernel/sched/sched.h | 12 ++++++++ 5 files changed, 71 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index f1f2c0874da9d..5b89464ca570a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6387,6 +6387,11 @@ sa1100ir [NET] See drivers/net/irda/sa1100_ir.c. + sched_proxy_exec= [KNL] + Enables or disables "proxy execution" style + solution to mutex-based priority inversion. + Format: + sched_verbose [KNL,EARLY] Enables verbose scheduler debug messages. schedstats= [KNL,X86] Enable or disable scheduled statistics. diff --git a/include/linux/sched.h b/include/linux/sched.h index 4f78a64beb52c..ba2a02ead8c7e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1664,6 +1664,19 @@ struct task_struct { randomized_struct_fields_end } __attribute__ ((aligned (64))); +#ifdef CONFIG_SCHED_PROXY_EXEC +DECLARE_STATIC_KEY_TRUE(__sched_proxy_exec); +static inline bool sched_proxy_exec(void) +{ + return static_branch_likely(&__sched_proxy_exec); +} +#else +static inline bool sched_proxy_exec(void) +{ + return false; +} +#endif + #define TASK_REPORT_IDLE (TASK_REPORT + 1) #define TASK_REPORT_MAX (TASK_REPORT_IDLE << 1) diff --git a/init/Kconfig b/init/Kconfig index 666783eb50abd..5c2b036c85a9d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -875,6 +875,18 @@ config UCLAMP_BUCKETS_COUNT If in doubt, use the default value. +config SCHED_PROXY_EXEC + bool "Proxy Execution" + # Avoid some build failures w/ PREEMPT_RT until it can be fixed + depends on !PREEMPT_RT + # Need to investigate how to inform sched_ext of split contexts + depends on !SCHED_CLASS_EXT + # Not particularly useful until we get to multi-rq proxying + depends on EXPERT + help + This option enables proxy execution, a mechanism for mutex-owning + tasks to inherit the scheduling context of higher priority waiters. + endmenu # diff --git a/kernel/sched/core.c b/kernel/sched/core.c index ec68fc686bd74..45daa0e5b27d3 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -119,6 +119,35 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_compute_energy_tp); DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); +#ifdef CONFIG_SCHED_PROXY_EXEC +DEFINE_STATIC_KEY_TRUE(__sched_proxy_exec); +static int __init setup_proxy_exec(char *str) +{ + bool proxy_enable = true; + + if (*str && kstrtobool(str + 1, &proxy_enable)) { + pr_warn("Unable to parse sched_proxy_exec=\n"); + return 0; + } + + if (proxy_enable) { + pr_info("sched_proxy_exec enabled via boot arg\n"); + static_branch_enable(&__sched_proxy_exec); + } else { + pr_info("sched_proxy_exec disabled via boot arg\n"); + static_branch_disable(&__sched_proxy_exec); + } + return 1; +} +#else +static int __init setup_proxy_exec(char *str) +{ + pr_warn("CONFIG_SCHED_PROXY_EXEC=n, so it cannot be enabled or disabled at boot time\n"); + return 0; +} +#endif +__setup("sched_proxy_exec", setup_proxy_exec); + /* * Debugging: various feature bits * diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 475bb5998295e..6b61e0c7f6e78 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1151,10 +1151,15 @@ struct rq { */ unsigned int nr_uninterruptible; +#ifdef CONFIG_SCHED_PROXY_EXEC + struct task_struct __rcu *donor; /* Scheduling context */ + struct task_struct __rcu *curr; /* Execution context */ +#else union { struct task_struct __rcu *donor; /* Scheduler context */ struct task_struct __rcu *curr; /* Execution context */ }; +#endif struct sched_dl_entity *dl_server; struct task_struct *idle; struct task_struct *stop; @@ -1349,10 +1354,17 @@ DECLARE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); #define cpu_curr(cpu) (cpu_rq(cpu)->curr) #define raw_rq() raw_cpu_ptr(&runqueues) +#ifdef CONFIG_SCHED_PROXY_EXEC +static inline void rq_set_donor(struct rq *rq, struct task_struct *t) +{ + rcu_assign_pointer(rq->donor, t); +} +#else static inline void rq_set_donor(struct rq *rq, struct task_struct *t) { /* Do nothing */ } +#endif #ifdef CONFIG_SCHED_CORE static inline struct cpumask *sched_group_span(struct sched_group *sg); -- 2.50.0.727.gbf7dc18ff4-goog