From patchwork Wed Jun 30 20:51:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 12352821 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECD32C11F65 for ; Wed, 30 Jun 2021 20:53:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B37FD613EC for ; Wed, 30 Jun 2021 20:53:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B37FD613EC Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Mime-Version: Message-Id:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=VpUgPp/PTDIIMMs5cK8sQqMu2O4WaM9Fuloomsi1BjA=; b=wi5 RZoTvWGpAGN5iqN+rJhwPzY8cYlNxFG6K10CceaSSIBbbRmv21T3ta6S2e11XxlE6Le3Xsz42L/Qy 3FyqsqMyM6e7a3EvZz2asZamPkm1r3v4PEYgsi8y1nyX6Di/rART09VXFgq/H19uV7Ms+lIF5uw+8 cSlDXaNLL2zE1pejEk/ERIOj7TqbkXqIM4O/727vbW4Lz/mLjlu7EBdZV05M7PUvdMSe6yL4FGe1H uIL7bakSwu/yKdLiwqFy7IX6ZMIJyHbUvlJNFbiAz1WCtQANDXAUpeEM3oZGVYIzc8vg4HBEGMwmh wk8ZPtd7ydzywHOnSxmmiEGJeKnQIRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyhBj-00FGfL-D1; Wed, 30 Jun 2021 20:52:03 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyhBe-00FGdi-M4 for linux-arm-kernel@lists.infradead.org; Wed, 30 Jun 2021 20:52:00 +0000 Received: by mail-yb1-xb49.google.com with SMTP id w13-20020a056902100db0290559a715f5bbso5039114ybt.23 for ; Wed, 30 Jun 2021 13:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=WXCJB/sn116SgSEffDSjzbCu9ljJn1wLs+Vne4KFJ+E=; b=bte2f2XYQ1DOjqMdsGzUOiZHs6KmPl58pU/flR4jZH0dBZSy8TYGRVvNhSf84qCwA/ dXsgZrL4sL1B5mC7YRq0UR0PMS0UYxmuQqlaArrawpRYBZHIZLdY7+j2aU0obbPWyrhG JR2At/fYtMg3FMmKwu99cf1V9+UgCvu0qJfTMiN1FXJKrd5Ll+pucNzKR2RXvoRriWIa +lynkComSrHQiP/O3PaMv26IpIBO6mnSHNt6poK6AEEJpErvgj9LNZikO/Vs4JmECX4N zL6utMIXpZJ/rsK9TEwZXF35TZI81+WjZ+cVDv/reDpTSSXltwRS3zbmFRVImYMSQeBN abtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=WXCJB/sn116SgSEffDSjzbCu9ljJn1wLs+Vne4KFJ+E=; b=mImkxu7c6gJgjLJmcWVHMhvKLFfuvxipS++vQzvBLOdw8sy4J1SCgzY07dLo+lwz0+ Kx829iOHkVwX9Eqij/BPDVV1ZOE/FH7+W4udPNk6xyyPkkMsKiX5444J1PpTpSBsozCC WDkaqlJLml2SQ/O+mjeyx7F+sPlCTLxS9qN1WqiGMILBImluO1X924Hyd9T1viQAyhuC pRljgeXViYlRmFTo0E/+EjoIJCm3WyIfOQ1CDkWbXTwUNTpEhKKWfb1ck67SZf4JSGFC LuSxE5toTsorG2PUFZZas8lVLghmVCrHBt//jZzwKAKBHsPtFRON7eP6VQY3HMv0pLqi G7QA== X-Gm-Message-State: AOAM533J8dTm/g8VSH5gD859P00i9ul/kmRxKFppDz8c5k831o2Ah8N3 d7Wt6tDJAtdhHtwNxQYhjzMKlakcwlo= X-Google-Smtp-Source: ABdhPJxpwShbTyniu85SbURsJRjlKLSAmfOYgM4PaRy3d7FcNFtwT37Wj1f61GUqf0SviwEqaC0xBrhUbOI= X-Received: from surenb1.mtv.corp.google.com ([2620:15c:211:200:e135:81d1:5036:d9ff]) (user=surenb job=sendgmr) by 2002:a25:3b46:: with SMTP id i67mr49622177yba.207.1625086315507; Wed, 30 Jun 2021 13:51:55 -0700 (PDT) Date: Wed, 30 Jun 2021 13:51:51 -0700 Message-Id: <20210630205151.137001-1-surenb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog Subject: [PATCH v2 1/1] psi: stop relying on timer_pending for poll_work rescheduling From: Suren Baghdasaryan To: peterz@infradead.org Cc: hannes@cmpxchg.org, mingo@redhat.com, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, matthias.bgg@gmail.com, minchan@google.com, timmurray@google.com, yt.chang@mediatek.com, wenju.xu@mediatek.com, jonathan.jmchen@mediatek.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel-team@android.com, surenb@google.com, SH Chen X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210630_135158_792025_35B1DEE5 X-CRM114-Status: GOOD ( 21.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Psi polling mechanism is trying to minimize the number of wakeups to run psi_poll_work and is currently relying on timer_pending() to detect when this work is already scheduled. This provides a window of opportunity for psi_group_change to schedule an immediate psi_poll_work after poll_timer_fn got called but before psi_poll_work could reschedule itself. Below is the depiction of this entire window: poll_timer_fn wake_up_interruptible(&group->poll_wait); psi_poll_worker wait_event_interruptible(group->poll_wait, ...) psi_poll_work psi_schedule_poll_work if (timer_pending(&group->poll_timer)) return; ... mod_timer(&group->poll_timer, jiffies + delay); Prior to 461daba06bdc we used to rely on poll_scheduled atomic which was reset and set back inside psi_poll_work and therefore this race window was much smaller. The larger window causes increased number of wakeups and our partners report visible power regression of ~10mA after applying 461daba06bdc. Bring back the poll_scheduled atomic and make this race window even narrower by resetting poll_scheduled only when we reach polling expiration time. This does not completely eliminate the possibility of extra wakeups caused by a race with psi_group_change however it will limit it to the worst case scenario of one extra wakeup per every tracking window (0.5s in the worst case). By tracing the number of immediate rescheduling attempts performed by psi_group_change and the number of these attempts being blocked due to psi monitor being already active, we can assess the effects of this change: Before the patch: Run#1 Run#2 Run#3 Immediate reschedules attempted: 684365 1385156 1261240 Immediate reschedules blocked: 682846 1381654 1258682 Immediate reschedules (delta): 1519 3502 2558 Immediate reschedules (% of attempted): 0.22% 0.25% 0.20% After the patch: Run#1 Run#2 Run#3 Immediate reschedules attempted: 882244 770298 426218 Immediate reschedules blocked: 881996 769796 426074 Immediate reschedules (delta): 248 502 144 Immediate reschedules (% of attempted): 0.03% 0.07% 0.03% The number of non-blocked immediate reschedules dropped from 0.22-0.25% to 0.03-0.07%. The drop is attributed to the decrease in the race window size and the fact that we allow this race only when psi monitors reach polling window expiration time. Fixes: 461daba06bdc ("psi: eliminate kthread_worker from psi trigger scheduling mechanism") Reported-by: Kathleen Chang Reported-by: Wenju Xu Reported-by: Jonathan Chen Signed-off-by: Suren Baghdasaryan Tested-by: SH Chen Acked-by: Johannes Weiner --- changes in v2: - Simplified atomic_cmpxchg() condition per PeterZ - Added Tested-by: include/linux/psi_types.h | 1 + kernel/sched/psi.c | 41 ++++++++++++++++++++++++++++----------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h index 0a23300d49af..ef8bd89d065e 100644 --- a/include/linux/psi_types.h +++ b/include/linux/psi_types.h @@ -158,6 +158,7 @@ struct psi_group { struct timer_list poll_timer; wait_queue_head_t poll_wait; atomic_t poll_wakeup; + atomic_t poll_scheduled; /* Protects data used by the monitor */ struct mutex trigger_lock; diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index 58b36d17a09a..82b664ca9ee9 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -195,6 +195,7 @@ static void group_init(struct psi_group *group) INIT_DELAYED_WORK(&group->avgs_work, psi_avgs_work); mutex_init(&group->avgs_lock); /* Init trigger-related members */ + atomic_set(&group->poll_scheduled, 0); mutex_init(&group->trigger_lock); INIT_LIST_HEAD(&group->triggers); memset(group->nr_triggers, 0, sizeof(group->nr_triggers)); @@ -555,18 +556,14 @@ static u64 update_triggers(struct psi_group *group, u64 now) return now + group->poll_min_period; } -/* Schedule polling if it's not already scheduled. */ -static void psi_schedule_poll_work(struct psi_group *group, unsigned long delay) +/* Schedule polling if it's not already scheduled or forced. */ +static void psi_schedule_poll_work(struct psi_group *group, unsigned long delay, + bool force) { struct task_struct *task; - /* - * Do not reschedule if already scheduled. - * Possible race with a timer scheduled after this check but before - * mod_timer below can be tolerated because group->polling_next_update - * will keep updates on schedule. - */ - if (timer_pending(&group->poll_timer)) + /* cmpxchg should be called even when !force to set poll_scheduled */ + if (atomic_cmpxchg(&group->poll_scheduled, 0, 1) && !force) return; rcu_read_lock(); @@ -578,12 +575,15 @@ static void psi_schedule_poll_work(struct psi_group *group, unsigned long delay) */ if (likely(task)) mod_timer(&group->poll_timer, jiffies + delay); + else + atomic_set(&group->poll_scheduled, 0); rcu_read_unlock(); } static void psi_poll_work(struct psi_group *group) { + bool force_reschedule = false; u32 changed_states; u64 now; @@ -591,6 +591,23 @@ static void psi_poll_work(struct psi_group *group) now = sched_clock(); + if (now > group->polling_until) { + /* + * We are either about to start or might stop polling if no + * state change was recorded. Resetting poll_scheduled leaves + * a small window for psi_group_change to sneak in and schedule + * an immegiate poll_work before we get to rescheduling. One + * potential extra wakeup at the end of the polling window + * should be negligible and polling_next_update still keeps + * updates correctly on schedule. + */ + atomic_set(&group->poll_scheduled, 0); + } else { + /* Polling window is not over, keep rescheduling */ + force_reschedule = true; + } + + collect_percpu_times(group, PSI_POLL, &changed_states); if (changed_states & group->poll_states) { @@ -616,7 +633,8 @@ static void psi_poll_work(struct psi_group *group) group->polling_next_update = update_triggers(group, now); psi_schedule_poll_work(group, - nsecs_to_jiffies(group->polling_next_update - now) + 1); + nsecs_to_jiffies(group->polling_next_update - now) + 1, + force_reschedule); out: mutex_unlock(&group->trigger_lock); @@ -740,7 +758,7 @@ static void psi_group_change(struct psi_group *group, int cpu, write_seqcount_end(&groupc->seq); if (state_mask & group->poll_states) - psi_schedule_poll_work(group, 1); + psi_schedule_poll_work(group, 1, false); if (wake_clock && !delayed_work_pending(&group->avgs_work)) schedule_delayed_work(&group->avgs_work, PSI_FREQ); @@ -1235,6 +1253,7 @@ static void psi_trigger_destroy(struct kref *ref) * can no longer be found through group->poll_task. */ kthread_stop(task_to_destroy); + atomic_set(&group->poll_scheduled, 0); } kfree(t); }