From patchwork Mon Oct 10 22:57:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13003321 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 917B1C433FE for ; Mon, 10 Oct 2022 22:58:55 +0000 (UTC) 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:Message-ID: Mime-Version: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=ls7x2UTwOiJCnLEsMddmWmbRvPnD0K632s1iIw/Cybc=; b=okW HoFe2lOfKRwOc84w7usQ+i5Fa3YUBesNXxNJKrWPbf7flG27IcQZOtIRbctNj5j3EV1E4Ds9AVgOX xFrhDU6Fia4x2BIcrNA9Tq2Bs/Ba6Rllh0rwmqKLViwqJQQfa1Olkqz5uJSERO6fMqy5KTo5euG4H BxmH55Lzz4HQdhQhjzrNCD9vf1t6Hohwi/2YBeqecJThZaGR7RJEv92nJqEQAQYZwAJT0b6odc/yq Eh9bXPIy8bhHNxx71rYIPQ/VJ5gSi0ecddv0zR3HRrulm8vmPcyh3FarqPdUqshL7iyO5oKRgJBXN Qbmb6H7VcAVzRbvf04JO71kPinKY4KA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oi1ib-002Wqh-8o; Mon, 10 Oct 2022 22:57:53 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oi1iY-002WpV-4W for linux-arm-kernel@lists.infradead.org; Mon, 10 Oct 2022 22:57:52 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-3576c47f204so117287207b3.2 for ; Mon, 10 Oct 2022 15:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=ZOGfuJwXRj12fO3BljnUi1xO+5sJG5ZEdUnatRMgzws=; b=o7pcdVU0htkuRrTFLLOe2e+a5lVBDRa6RxWuow7evJJTfE2Xgzv1CiLIJiN+CRp44U DusSUzL258D5xV4DvXT/lv6iJN1XwuPkAY13KirA9dz7I35HBry03uN8byrPoRhQMS+R BmFr2JLlMGfptQoh5PFQBsZzDPYmVSdFlrrudNSg/OEKDGtN3kOyXHIaF9f1jlGef5FI UDYWfjmHnegrAmTDcRdeoqY/03eDmUkkj4oWIYgVzqhsH6zhcN5w3GjuRYupBt2+aWD9 T+PW8vObHEMsRicSW6VRZcrEuB04iHDXar0v38eFTaoGTMomSYAyNosbi0TT9JlIGGLh KIZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ZOGfuJwXRj12fO3BljnUi1xO+5sJG5ZEdUnatRMgzws=; b=k2z3YMKmJoKUQSOet8Fzg/ftgzMtIoVCVsfTf1SGPiRjg9FXS7JlMDjPDJveyhIMEw oCbdrFM71lG8zMRS1N+xhqUqrdV5fupzYweC741TwFn7XhTDeYz9NTm3RWWo9ux4cHtm 6GQZvaHaTlsNdT6bm62q7HUGvFNg11xA5tMgsxlHyxD+gUlvQ1PKGvL6gVmTETwlL/8n 2txS7QJ8YyP+acPaMfGpLHr64fy2wkfhCWYrCmxlT1ARNMEDoteH7YvWAuOcdevj9e1B qM1yTgRmxUnJXvcwYxqGW3TmZFOrzlBA++dzy0sjgmUiT/MY1ec6bunDreWNjqIz9DTm 87Gg== X-Gm-Message-State: ACrzQf00iLjNGA+2Psl5zEToOhj7L3ZAqd1E80KI1I67+EDLF4WBKsz6 LJpNJwsY/TeVsoknLyHEw++tcNGF3v4= X-Google-Smtp-Source: AMsMyM4k3yfQD01vLbzRI6tebk2S0oMcUQfElSBZCO2Jz7yjnkXKSkJ74yp0g6hgyBod2XWH6Moj8vJ9Oeo= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:32c:a73b:234e:d836]) (user=surenb job=sendgmr) by 2002:a25:3416:0:b0:6c0:c042:954e with SMTP id b22-20020a253416000000b006c0c042954emr8311756yba.521.1665442668669; Mon, 10 Oct 2022 15:57:48 -0700 (PDT) Date: Mon, 10 Oct 2022 15:57:44 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog Message-ID: <20221010225744.101629-1-surenb@google.com> Subject: [RESEND PATCH v4 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, yt.chang@mediatek.com, wenju.xu@mediatek.com, jonathan.jmchen@mediatek.com, show-hong.chen@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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221010_155750_210244_91D7FA3A X-CRM114-Status: GOOD ( 25.73 ) 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). This patch also ensures correct ordering between clearing poll_scheduled flag and obtaining changed_states using memory barrier. Correct ordering between updating changed_states and setting poll_scheduled is ensured by atomic_xchg operation. 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 --- This patch somehow slipped through the cracks after being acked by Johannes in [1] and I didn't notice it until now because we cherry-picked it into Android kernel trees due to the urgency at that time. On the bright side, this change has been tested for about a year in the field by millions of devices. Resending v4 of this patch previously posted at [2], rebased on the latest Linus' TOT. [1] https://lore.kernel.org/lkml/YOdwxh3487PeMHRX@cmpxchg.org/ [2] https://lore.kernel.org/lkml/20210708203648.2399667-1-surenb@google.com/ include/linux/psi_types.h | 1 + kernel/sched/psi.c | 60 +++++++++++++++++++++++++++++++++------ 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h index c7fe7c089718..3f78c9bf7bb1 100644 --- a/include/linux/psi_types.h +++ b/include/linux/psi_types.h @@ -170,6 +170,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 7f6030091aee..2f548beeae50 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -188,6 +188,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); group->poll_min_period = U32_MAX; @@ -561,18 +562,17 @@ 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. + * atomic_xchg should be called even when !force to provide a + * full memory barrier (see the comment inside psi_poll_work). */ - if (timer_pending(&group->poll_timer)) + if (atomic_xchg(&group->poll_scheduled, 1) && !force) return; rcu_read_lock(); @@ -584,12 +584,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; @@ -597,6 +600,43 @@ 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); + /* + * A task change can race with the poll worker that is supposed to + * report on it. To avoid missing events, ensure ordering between + * poll_scheduled and the task state accesses, such that if the poll + * worker misses the state update, the task change is guaranteed to + * reschedule the poll worker: + * + * poll worker: + * atomic_set(poll_scheduled, 0) + * smp_mb() + * LOAD states + * + * task change: + * STORE states + * if atomic_xchg(poll_scheduled, 1) == 0: + * schedule poll worker + * + * The atomic_xchg() implies a full barrier. + */ + smp_mb(); + } 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) { @@ -622,7 +662,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); @@ -747,7 +788,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); @@ -1223,6 +1264,7 @@ void psi_trigger_destroy(struct psi_trigger *t) * can no longer be found through group->poll_task. */ kthread_stop(task_to_destroy); + atomic_set(&group->poll_scheduled, 0); } kfree(t); }