From nobody Fri Jul 24 22:51:55 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 0E5AC3BC68A for ; Wed, 22 Jul 2026 12:03:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784721841; cv=none; b=XLCvrvCTewmxczJhf07ETK4OellSr4NEUVxjkybCOuSeCobB/Y+b3tpPcJwjQRag2KI75nL3jruVu9Jg0xZFtpG0l+Jg90Ly4RqeLfoqdf1Nhtx/tGqzpYUCAR3JJoseAF8/pq5aUCSfMAwlLh+cAFXCc3xf849Nx61Yv3CsQQk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784721841; c=relaxed/simple; bh=2eRjFhrg4kQn1hABh8Y4K5PXRDZM53B81c8Pso0e3+Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FOTf7FMLEqttGZRcvXgDbQqk+SrhRyAblT1Pl3FMIYO8jhXE9WEO1xgX5ScJ+lx4F9ijbHWhUkp5XCt16czLvwBnqPIVaxbL7D32urygeOXVsJnfSkR+olWKxvcW12BrB+MMDyzrX+0z+Fryfd09+51uOB0XbFOmjWOgME7WlOs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OduWSYZY; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OduWSYZY" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2cc97653887so135688235ad.1 for ; Wed, 22 Jul 2026 05:03:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784721838; x=1785326638; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kpkRbSbkd73DtmXIcFCB59977l8fgqPl4SC2xV9dHpk=; b=OduWSYZY5SRcWQSgcYRcxRpy1/6lHMsFuiZZHRSRmieR6auGirF+fGWgZWVPvQxe8D DKafU6pXGYs/a4o3QLl3D9fga4h+slUdsdXZIwwyYnd28yj7/4zDsAuqs9gOFRpr9AEB 4tx2uG1XrVw2q8whE9Y8jhiqPN0JaTLWY8CmnOanEn//Bhj7gnWbAyqpdqM72tDJGrH4 VE/EMvszD53OuRwFQ8M0wTfX30DQJLKO6XTboX9vV2BEufjyaKpNZ/gpU7SK6KwaE2QM HMUUJpKEWckVIHOi1a9K7StjQ29hKSUW2wAgk022Rg2ly7WtWgW4FtemSte5W0R5hF18 19Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784721838; x=1785326638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=kpkRbSbkd73DtmXIcFCB59977l8fgqPl4SC2xV9dHpk=; b=XcSl+Xe4kqiVblXUQKv+USkdxRQeboBhFQer81e3KB4mU9ZUhw0j7ddKZPXGrj0m7X rTG3cl1xW3BI2G0WecXB0uyHLym0zZ4liNJdfMtXnoaFWzTElz2AQ1VViq5sQF3LC3ha Ze4jV9akAyjBqOOWJrl7j2XyorI1zKcZ9hWOOz9qdVSx5dTODp8JUIyMa+SAE5KwRPid PgEMnCOp74amYQCS0MRgddWKctjSnhUYmcaFB5NC+k8uHVWrjL7ScKd8S74uEEdnfzSG 2tR27VNWbih9Dz0ix0Pt2xTOeGuz5g5Iw+9u8CinYeRaZ2Wt11/QxPKVCswKQ1s6v2BZ tNxg== X-Forwarded-Encrypted: i=1; AHgh+RocF6mpfUG/NanDyirozJnlv9Pof22GXs0xLpDnLBKMwVkQ4/gw/f4G/CIkL6L8Z+hPw703Jn1yABmJBik=@vger.kernel.org X-Gm-Message-State: AOJu0YzPxE9GYXeEkiWrBUG+3SVpvItIy+PLyvg+Is8vUmVH/S3wyP2m hkdv6vMSV1IexAkm2/+s3dNeduauDuTfV1RSqh1pSu0DGoOt7ohzUvxd X-Gm-Gg: AR+sD11xcwiqAuUqK8L/qH4oh3ng/8s1jcHvmXI8Q7nYuoWkXXRr2y6tdZwVyeyoFSn TbbtZ65DucZoCAnhoNfAlQQJoMeR57fX53DK/6vSHFeuwKq14B/vnl+9jaLYXNjL31SnfOaTmxd ODgGB7lyjhHg+L1eTPFanR4xolfoucltTbLZsoYUQiL6E2JXDWNUBCKsYKSichAafDQxBQ4TbZ9 Jma9BjrpBaaVAM7nLrpuQwg8+nzRfk2i9DUo2Kxqzh8Y3K/2IY7koHc3QqA8OnlN7QCz5ZTtoR1 amBabSWe+4kdPGQUFS/D3ZiT3HOhOlqqQx4NZHgnY9WEibXMzNlW2bWchXn0sqS0w8KHV8PM1Ua wgEUOE9ov4CeIeD7sRkBvLLypuMeaE0AKdmAkeICxv1E8zinW6Z1aGyGfncD9b0YNsCVsxwj0Du eA8L3E57ktv6MG95jh4NKn+6JWVgVl+KMI+8m/NSGPzSYqgD0c9Lf4yKx83/7z4/dv X-Received: by 2002:a17:903:3b8f:b0:2cc:d192:50b8 with SMTP id d9443c01a7336-2cf34a31907mr253281885ad.47.1784721837149; Wed, 22 Jul 2026 05:03:57 -0700 (PDT) Received: from mi-HP-ProDesk-680-G6-PCI-Microtower-PC.mioffice.cn ([43.224.245.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf8f00a6f5sm13835985ad.37.2026.07.22.05.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 05:03:56 -0700 (PDT) From: "zhidao su (Xiaomi)" To: K Prateek Nayak , John Stultz Cc: Peter Zijlstra , Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , linux-kernel@vger.kernel.org, "zhidao su (Xiaomi)" Subject: [PATCH v5] sched/proxy_exec: Detect cycles in proxy walks Date: Wed, 22 Jul 2026 20:03:46 +0800 Message-ID: <20260722120346.93000-1-soolaugust@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <51450a8f-f053-45b3-a2fc-2bd0b75181b6@amd.com> References: <51450a8f-f053-45b3-a2fc-2bd0b75181b6@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" find_proxy_task() can keep walking the same blocked_on chain if the chain contains a cycle. A simple A->B->A deadlock can leave the CPU spinning in __schedule() with rq->lock held. Use the rq pick sequence as a per-walk marker. Mark each task visited by the current walk. If the walk sees the same marker again, break the cycle by clearing blocked_on at the detection point and deactivating that task. The marker is only consumed while holding rq->lock. Clear it when a task is activated, so stale state from an earlier pick or another rq is not carried into the next queued lifetime. Tested with a PE cycle reproducer in virtme-ng: buggy kernel: vng timed out without returning fixed kernel: WARN_ONCE "sched/pe: deadlock cycle detected" Reviewed-by: K Prateek Nayak Signed-off-by: zhidao su (Xiaomi) --- Changes since v4: - Use sched_proxy_enqueue_task() to clear stale proxy-walk state when a task is activated. - Stop marking the donor early; only mark the finalized owner. - Use pr_warn_once() for the cycle warning. include/linux/sched.h | 3 +++ kernel/sched/core.c | 19 +++++++++++++++++-- kernel/sched/sched.h | 11 +++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 968b18a7f4702..b1c46e21bc268 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1256,6 +1256,9 @@ struct task_struct { * under preempt_disable(). */ struct task_struct *blocked_donor; +#ifdef CONFIG_SCHED_PROXY_EXEC + u64 proxy_pick_seq; +#endif =20 #ifdef CONFIG_DETECT_HUNG_TASK_BLOCKER /* diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2e7cde033a319..c1bb4f98dd64a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2221,6 +2221,7 @@ void activate_task(struct rq *rq, struct task_struct = *p, int flags) if (task_on_rq_migrating(p)) flags |=3D ENQUEUE_MIGRATED; =20 + sched_proxy_enqueue_task(p); enqueue_task(rq, p, flags); =20 WRITE_ONCE(p->on_rq, TASK_ON_RQ_QUEUED); @@ -6724,6 +6725,7 @@ static bool try_to_block_task(struct rq *rq, struct t= ask_struct *p, } =20 #ifdef CONFIG_SCHED_PROXY_EXEC + static inline void proxy_set_task_cpu(struct task_struct *p, int cpu) { unsigned int wake_cpu; @@ -6839,14 +6841,14 @@ static void proxy_migrate_task(struct rq *rq, struc= t rq_flags *rf, } =20 /* - * Find runnable lock owner to proxy for mutex blocked donor + * Find runnable lock owner to proxy for a blocked donor * * Follow the blocked-on relation: * * ,-> task * | | blocked-on * | v - * blocked_donor | mutex + * blocked_donor | blocking primitive * | | owner * | v * `-- task @@ -6874,6 +6876,8 @@ find_proxy_task(struct rq *rq, struct task_struct *do= nor, struct rq_flags *rf) struct task_struct *p; int owner_cpu; =20 + rq->proxy_pick_seq++; + /* Follow blocked_on chain. */ for (p =3D donor; p->is_blocked; p =3D owner) { /* if its PROXY_WAKING, do return migration or run if current */ @@ -6990,6 +6994,14 @@ find_proxy_task(struct rq *rq, struct task_struct *d= onor, struct rq_flags *rf) */ return proxy_resched_idle(rq); } + + if (owner->proxy_pick_seq =3D=3D rq->proxy_pick_seq) { + pr_warn_once("sched/pe: deadlock cycle detected, pid %d\n", + p->pid); + __clear_task_blocked_on(p, NULL); + goto deactivate; + } + owner->proxy_pick_seq =3D rq->proxy_pick_seq; /* * OK, now we're absolutely sure @owner is on this * rq, therefore holding @rq->lock is sufficient to @@ -9057,6 +9069,9 @@ void __init sched_init(void) raw_spin_lock_init(&rq->cpu_epoch_lock); rq->cpu_epoch_next =3D jiffies; #endif +#ifdef CONFIG_SCHED_PROXY_EXEC + rq->proxy_pick_seq =3D 1; +#endif =20 zalloc_cpumask_var_node(&rq->scratch_mask, GFP_KERNEL, cpu_to_node(i)); } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 26ae13c86b699..d5d9de509dfdb 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1154,6 +1154,7 @@ struct rq { #ifdef CONFIG_SCHED_PROXY_EXEC struct task_struct __rcu *donor; /* Scheduling context */ struct task_struct __rcu *curr; /* Execution context */ + u64 proxy_pick_seq; #else union { struct task_struct __rcu *donor; /* Scheduler context */ @@ -3092,6 +3093,16 @@ static inline void __block_task(struct rq *rq, struc= t task_struct *p) extern void activate_task(struct rq *rq, struct task_struct *p, int flags); extern void deactivate_task(struct rq *rq, struct task_struct *p, int flag= s); =20 +static inline void sched_proxy_enqueue_task(struct task_struct *p) +{ +#ifdef CONFIG_SCHED_PROXY_EXEC + if (!sched_proxy_exec()) + return; + + p->proxy_pick_seq =3D 0; +#endif +} + extern void wakeup_preempt(struct rq *rq, struct task_struct *p, int flags= ); =20 /* base-commit: 04998aa54848f15332202d0bea008d2ca1ed1713 --=20 2.43.0