From patchwork Thu Nov 4 19:57:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oskolkov X-Patchwork-Id: 12603751 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA573C4332F for ; Thu, 4 Nov 2021 19:58:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7F2D361241 for ; Thu, 4 Nov 2021 19:58:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7F2D361241 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=posk.io Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id C68986B0071; Thu, 4 Nov 2021 15:58:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C1903940007; Thu, 4 Nov 2021 15:58:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F5E16B0071; Thu, 4 Nov 2021 15:58:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0139.hostedemail.com [216.40.44.139]) by kanga.kvack.org (Postfix) with ESMTP id 8CF3E6B0071 for ; Thu, 4 Nov 2021 15:58:14 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 4B7915BE28 for ; Thu, 4 Nov 2021 19:58:14 +0000 (UTC) X-FDA: 78772309308.06.E24FBD7 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf03.hostedemail.com (Postfix) with ESMTP id 239BF3003991 for ; Thu, 4 Nov 2021 19:58:05 +0000 (UTC) Received: by mail-pl1-f170.google.com with SMTP id p18so9009387plf.13 for ; Thu, 04 Nov 2021 12:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posk.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kn7HcLx2rgjoyJ/6+3r40P+Pen7ukIAo+wVP/YczDEw=; b=NnefiZ/HQboeZhUCkOlLFeSKbp/Nb79N0ujKczBC+icr521XdNlff2Et7z9NiC6bLz rACkbydAtEGgoRLvW2J0kU+OTYRV43EoalgfnXc3KuVABx2n1ZXrNNXcGzNTFza+85GN xuSqKDwiOgPc9g8GPEDQ/1uTggDB1hoqw6rbEmyIapzctyVRDqbgz7vmtk3s28Szak0A wQEgMcKBrYU9NRhYXUNu2Sp1xIeQfa6MG5LmAAbEuq59uSkc/aMGMRcPgbTPVTdk/2WW rFYF0MrHaPjXkKwncibx8ukVQje41jdMmYp8E4oxohJeHQh72l007FBjicodjYR1Rszj wN/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kn7HcLx2rgjoyJ/6+3r40P+Pen7ukIAo+wVP/YczDEw=; b=qPv62GgQvgUxwDF/abn/mVd+Dvdfhlqz+gyKc1hBso+bVGEoPHZLhbhtV+3BlHPV0p d1dni8xqP9D3VCsB/8DXDJgtFJnmvDd4ToApF0u7Jft9YHQ972zTls+KRZvsZs0Ik616 8zOT63pbXyjuXus7F3JvFvczXXaOgk5dPOJWpmrb9Zsv9n9LdFlHHNqAkxbxb0wrWylI tKsdiatcbrNqksE/L+CePtc3mcnRfXR5oixWZx9wrYL1rusEXQIwSLg1JERprUv8FzTv 39EE1jrKtwSkRAY0bvn7MYQedZ5nkuds9ixZ3tWUCSHUUh+Baa1DoGVI0qmRQIIAUiBP XqgQ== X-Gm-Message-State: AOAM531Envh+/qwRr3jruUsk6gjWw05q0Wf4PgVJhjXAriIempKTB+d7 NJyD6fNfkXJgXsk9hKsQfKFoZw== X-Google-Smtp-Source: ABdhPJzUPgDe2i60uA6JKyweoFtgtNwPlwTvdDud9kjKXef4u8SPVtK10C/rbFlVZDrrk7qE+K5rSw== X-Received: by 2002:a17:90b:3e81:: with SMTP id rj1mr24697695pjb.111.1636055890785; Thu, 04 Nov 2021 12:58:10 -0700 (PDT) Received: from posk-g1.lan (23-118-52-46.lightspeed.sntcca.sbcglobal.net. [23.118.52.46]) by smtp.gmail.com with ESMTPSA id w185sm5487853pfb.38.2021.11.04.12.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 12:58:10 -0700 (PDT) From: Peter Oskolkov X-Google-Original-From: Peter Oskolkov To: Peter Zijlstra , Ingo Molnar , Thomas Gleixner , Andrew Morton , Dave Hansen , Andy Lutomirski , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org Cc: Paul Turner , Ben Segall , Peter Oskolkov , Peter Oskolkov , Andrei Vagin , Jann Horn , Thierry Delisle Subject: [PATCH v0.8 1/6] sched/umcg: add WF_CURRENT_CPU and externise ttwu Date: Thu, 4 Nov 2021 12:57:59 -0700 Message-Id: <20211104195804.83240-2-posk@google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211104195804.83240-1-posk@google.com> References: <20211104195804.83240-1-posk@google.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 239BF3003991 X-Stat-Signature: 1knrgrwk3c5udaenjcjmb5p8bku7y7tt Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=posk.io header.s=google header.b="NnefiZ/H"; spf=pass (imf03.hostedemail.com: domain of posk@posk.io designates 209.85.214.170 as permitted sender) smtp.mailfrom=posk@posk.io; dmarc=none X-HE-Tag: 1636055885-821052 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Add WF_CURRENT_CPU wake flag that advices the scheduler to move the wakee to the current CPU. This is useful for fast on-CPU context switching use cases such as UMCG. In addition, make ttwu external rather than static so that the flag could be passed to it from outside of sched/core.c. Signed-off-by: Peter Oskolkov --- kernel/sched/core.c | 3 +-- kernel/sched/fair.c | 4 ++++ kernel/sched/sched.h | 15 +++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) -- 2.25.1 diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f2611b9cf503..763d94c0edf3 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3963,8 +3963,7 @@ bool ttwu_state_match(struct task_struct *p, unsigned int state, int *success) * Return: %true if @p->state changes (an actual wakeup was done), * %false otherwise. */ -static int -try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) +int try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) { unsigned long flags; int cpu, success = 0; diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 13950beb01a2..8827a8947c33 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6890,6 +6890,10 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags) if (wake_flags & WF_TTWU) { record_wakee(p); + if ((wake_flags & WF_CURRENT_CPU) && + cpumask_test_cpu(cpu, p->cpus_ptr)) + return cpu; + if (sched_energy_enabled()) { new_cpu = find_energy_efficient_cpu(p, prev_cpu); if (new_cpu >= 0) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index f0b249ec581d..57f6bd05f537 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2028,13 +2028,14 @@ static inline int task_on_rq_migrating(struct task_struct *p) } /* Wake flags. The first three directly map to some SD flag value */ -#define WF_EXEC 0x02 /* Wakeup after exec; maps to SD_BALANCE_EXEC */ -#define WF_FORK 0x04 /* Wakeup after fork; maps to SD_BALANCE_FORK */ -#define WF_TTWU 0x08 /* Wakeup; maps to SD_BALANCE_WAKE */ +#define WF_EXEC 0x02 /* Wakeup after exec; maps to SD_BALANCE_EXEC */ +#define WF_FORK 0x04 /* Wakeup after fork; maps to SD_BALANCE_FORK */ +#define WF_TTWU 0x08 /* Wakeup; maps to SD_BALANCE_WAKE */ -#define WF_SYNC 0x10 /* Waker goes to sleep after wakeup */ -#define WF_MIGRATED 0x20 /* Internal use, task got migrated */ -#define WF_ON_CPU 0x40 /* Wakee is on_cpu */ +#define WF_SYNC 0x10 /* Waker goes to sleep after wakeup */ +#define WF_MIGRATED 0x20 /* Internal use, task got migrated */ +#define WF_ON_CPU 0x40 /* Wakee is on_cpu */ +#define WF_CURRENT_CPU 0x80 /* Prefer to move the wakee to the current CPU. */ #ifdef CONFIG_SMP static_assert(WF_EXEC == SD_BALANCE_EXEC); @@ -3052,6 +3053,8 @@ static inline bool is_per_cpu_kthread(struct task_struct *p) extern void swake_up_all_locked(struct swait_queue_head *q); extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait); +extern int try_to_wake_up(struct task_struct *tsk, unsigned int state, int wake_flags); + #ifdef CONFIG_PREEMPT_DYNAMIC extern int preempt_dynamic_mode; extern int sched_dynamic_mode(const char *str);