From nobody Wed Feb 11 19:41:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF2BCC7619A for ; Tue, 11 Apr 2023 04:26:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230233AbjDKE0Z (ORCPT ); Tue, 11 Apr 2023 00:26:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230109AbjDKE0K (ORCPT ); Tue, 11 Apr 2023 00:26:10 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE13C30FC for ; Mon, 10 Apr 2023 21:25:36 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id v67-20020a254846000000b00b8189f73e94so30494977yba.12 for ; Mon, 10 Apr 2023 21:25:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1681187136; x=1683779136; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=JX517IRT7COXCefv+Z6JEfzB3hFBTiM6JAYd9NR6DHw=; b=n9OxpFiiHvxNx2CGROwrN80pWd5CJMjso971ZiubbKw5jiObrq1Mgugo656rBrOxZI ALNs0u7HNNBRzN3hFKunqUuD60DBlEUJuSpu5M63wGVw+oZk7tL/Ft+aZ0bLKw7wP1Jb IJn5E27ux0G9/iqH6GdQ9ZyiXmFtQBbbHVW3IMjByLI5KO0xXyFGvKS57q2/jepT3ZtF xRk9XIm340tUnkDYpUl65TsRljG/MUSXWNAY+85L7vgnqlIlnfFRY/6W/wocYOXk7KHq m22eKPovkhjAGGHSZRv8wh2PZEQJuxXNkF5YuM2gSkkysxEuMgqlM0HwIfMR2UDg9rFy fANQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681187136; x=1683779136; 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=JX517IRT7COXCefv+Z6JEfzB3hFBTiM6JAYd9NR6DHw=; b=pIpPfgA742YbsTa2Art3pA43Aq34lnw55C3P+piGcdVV9/e2bqW6sqmUdnBGKQwOrA FWq055BzxLxO8t/afOjCQLGyGtKXLKNHvtXWM+uACOiD0HmGg+LmplI3YmuqvLXsJILZ 1N8VmpFfwZWCLRTArcsx3tCJiuHfgIgU8OT6FWXv3JPfAJDEYOh1S04OcT59ZmTGgnqg XUtI5NXSHngCXoF3Ti0XbwN+A5LiyQufxbUBtIUuInqO6iS3UVbDzy9BEex2bKU/l5lw +KtbOxcOf41wqPe1Xe9ntxTSWZqh4lTloBSdSbaVo4N4yqP3u4h4wpNREybhKJhsS44I OH4g== X-Gm-Message-State: AAQBX9fEqAjXowjyTnmzxRdYbwMqsJlfVGVC4nNlLLJOOYxpID6CXYCl us+5dL0AXWjqezPUDw0FnbU7AHpBtG9T2k3/k0ZDUtf95pX62go11PJlsrIXUm/OYGU9xPLZRX6 JiU3hH8R5J/UNHuCgDFLSemnLSSooQ2AUH6sCj+qLpjkyCugk0RY1/xRd8cNN94Np6O19KTQ= X-Google-Smtp-Source: AKy350Zcs3W4gptUndbilLC3UgkG7fame+KRWIflBq00QUXM77IOGDtAvm9f3ebv6zQqUhxbZCRJV8UxM+5A X-Received: from jstultz-noogler2.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:600]) (user=jstultz job=sendgmr) by 2002:a05:6902:12c7:b0:b26:884:c35e with SMTP id j7-20020a05690212c700b00b260884c35emr10795372ybu.4.1681187136322; Mon, 10 Apr 2023 21:25:36 -0700 (PDT) Date: Tue, 11 Apr 2023 04:25:07 +0000 In-Reply-To: <20230411042511.1606592-1-jstultz@google.com> Mime-Version: 1.0 References: <20230411042511.1606592-1-jstultz@google.com> X-Mailer: git-send-email 2.40.0.577.gac1e443424-goog Message-ID: <20230411042511.1606592-11-jstultz@google.com> Subject: [PATCH v3 10/14] sched: Unnest ttwu_runnable in prep for proxy-execution From: John Stultz To: LKML Cc: John Stultz , Joel Fernandes , Qais Yousef , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Valentin Schneider , Steven Rostedt , Ben Segall , Zimuzo Ezeozue , Mel Gorman , Daniel Bristot de Oliveira , Will Deacon , Waiman Long , Boqun Feng , "Paul E . McKenney" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Slightly rework ttwu_runnable to minimize the nesting to help make the proxy-execution changes easier to read. Should be no logical change here. 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: Daniel Bristot de Oliveira Cc: Will Deacon Cc: Waiman Long Cc: Boqun Feng Cc: "Paul E . McKenney" Signed-off-by: John Stultz --- kernel/sched/core.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index a9cf8397c601..82a62480d8d7 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3776,18 +3776,20 @@ static int ttwu_runnable(struct task_struct *p, int= wake_flags) int ret =3D 0; =20 rq =3D __task_rq_lock(p, &rf); - if (task_on_rq_queued(p)) { - if (!task_on_cpu(rq, p)) { - /* - * When on_rq && !on_cpu the task is preempted, see if - * it should preempt the task that is current now. - */ - update_rq_clock(rq); - check_preempt_curr(rq, p, wake_flags); - } - ttwu_do_wakeup(p); - ret =3D 1; + if (!task_on_rq_queued(p)) + goto out_unlock; + + if (!task_on_cpu(rq, p)) { + /* + * When on_rq && !on_cpu the task is preempted, see if + * it should preempt the task that is current now. + */ + update_rq_clock(rq); + check_preempt_curr(rq, p, wake_flags); } + ttwu_do_wakeup(p); + ret =3D 1; +out_unlock: __task_rq_unlock(rq, &rf); =20 return ret; --=20 2.40.0.577.gac1e443424-goog