From patchwork Fri Oct 15 06:16:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhaoyang Huang X-Patchwork-Id: 12560065 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 67D25C433F5 for ; Fri, 15 Oct 2021 06:17:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 116CA61163 for ; Fri, 15 Oct 2021 06:17:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 116CA61163 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id A2368900002; Fri, 15 Oct 2021 02:17:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D2D16B0071; Fri, 15 Oct 2021 02:17:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C295900002; Fri, 15 Oct 2021 02:17:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0222.hostedemail.com [216.40.44.222]) by kanga.kvack.org (Postfix) with ESMTP id 7DD686B006C for ; Fri, 15 Oct 2021 02:17:10 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 32F8D1815522C for ; Fri, 15 Oct 2021 06:17:10 +0000 (UTC) X-FDA: 78697664220.20.99DE0E7 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf16.hostedemail.com (Postfix) with ESMTP id 0E0B4F000092 for ; Fri, 15 Oct 2021 06:17:08 +0000 (UTC) Received: by mail-pj1-f42.google.com with SMTP id na16-20020a17090b4c1000b0019f5bb661f9so6606257pjb.0 for ; Thu, 14 Oct 2021 23:17:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id; bh=Orm3UeNHwghzj3N/xisLRG+91t3d+f7m71sow6oNdJA=; b=CKkg/YiO3XvCr+Zcpr88QGN42HIvqQgz+W9kRXFsHty6eTR9KbfoTy6YQHZ6php8AQ B1rDsUpraLSi7qP6UzJ+ycyNzDvgp2JJ5ZkD8DAhuhobKmgkE0m4j/kcasnp23uVnlo8 t4ah4M8lA0CJQSoovEbY0VrX7QWSkLXI7o1tRTkvmCarTmhUhvLmJBzo5vUsOHcMmZpq eR4xx1me6mUAhv3/jAvb0OVzoGWbkkMKUJUxGDRm6fu40NvWitVxvASwdhtzSX35nS/9 hhkUNPOab3Z/kD0HYNGZPJf35u/q6yI9/TpfNEHFgPirNf+Gg/0orVfkEKbbyCDGpKwO qQnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id; bh=Orm3UeNHwghzj3N/xisLRG+91t3d+f7m71sow6oNdJA=; b=V+TnsZoCbFT6c69qhPcNkqSDzUmlBHik1NAelEWlySwU/+4pRLiebeApRazKFNHz1b t0zBJ27sY2o0O9poZXR0VDiYZtyEm120s+XzQyha/ldOXBIqCBBxCMdozKWsAFHC3wt3 UqHNGXKsVsAMcYxdSBKBvBnpewlzxnkZwqz3E2LwK0P3JICdjEVhyP0RXuhK1KcZ0xzD K8zQWBIDKjTnZoZ+cbaDYFtuzbjd9owaVd3qFvVhK676uYN5xYSBt8OvJJ5mc6mPWMvE oWJZrZ61yjpdALe3ldfSW+5WhLnHFVVJS5FhfkJonX3M7t4JTwBCzD0ScGlIeFZsp61E 3dBg== X-Gm-Message-State: AOAM531/yzuvDcSsVcTvCz9AYpCZ2Loy8MuuKSkmKpM2qBMvvx4LD407 WdoEAMl2UcfpU8H6PYp9juw= X-Google-Smtp-Source: ABdhPJzDLnq2OQWwwG/BVEjydEFPwpwL3SFgrjNa/2TKCLqyjwYcM8yEYoPrycVYPeTWEhQuFD/inA== X-Received: by 2002:a17:902:9303:b029:12c:29c:43f9 with SMTP id bc3-20020a1709029303b029012c029c43f9mr9418992plb.5.1634278628867; Thu, 14 Oct 2021 23:17:08 -0700 (PDT) Received: from bj03382pcu.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id 197sm4056947pfv.6.2021.10.14.23.17.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Oct 2021 23:17:08 -0700 (PDT) From: Huangzhaoyang To: Andrew Morton , Johannes Weiner , Michal Hocko , Vladimir Davydov , Zhaoyang Huang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [Resend PATCH] psi : calc cfs task memstall time more precisely Date: Fri, 15 Oct 2021 14:16:52 +0800 Message-Id: <1634278612-17055-1-git-send-email-huangzhaoyang@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-Stat-Signature: posimu4mzckw9z5inn6gywmd7gd3fq1w Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="CKkg/YiO"; spf=pass (imf16.hostedemail.com: domain of huangzhaoyang@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=huangzhaoyang@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 0E0B4F000092 X-HE-Tag: 1634278628-28836 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: From: Zhaoyang Huang In an EAS enabled system, there are two scenarios discordant to current design, 1. workload used to be heavy uneven among cores for sake of scheduler policy. RT task usually preempts CFS task in little core. 2. CFS task's memstall time is counted as simple as exit - entry so far, which ignore the preempted time by RT, DL and Irqs. With these two constraints, the percpu nonidle time would be mainly consumed by none CFS tasks and couldn't be averaged. Eliminating them by calc the time growth via the proportion of cfs_rq's utilization on the whole rq. eg. Here is the scenario which this commit want to fix, that is the rt and irq consume some utilization of the whole rq. This scenario could be typical in a core which is assigned to deal with all irqs. Furthermore, the rt task used to run on little core under EAS. Binder:305_3-314 [002] d..1 257.880195: psi_memtime_fixup: original:30616,adjusted:25951,se:89,cfs:353,rt:139,dl:0,irq:18 droid.phone-1525 [001] d..1 265.145492: psi_memtime_fixup: original:61616,adjusted:53492,se:55,cfs:225,rt:121,dl:0,irq:15 Signed-off-by: Zhaoyang Huang --- kernel/sched/psi.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index cc25a3c..754a836 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -182,6 +182,8 @@ struct psi_group psi_system = { static void psi_avgs_work(struct work_struct *work); +static unsigned long psi_memtime_fixup(u32 growth); + static void group_init(struct psi_group *group) { int cpu; @@ -492,6 +494,21 @@ static u64 window_update(struct psi_window *win, u64 now, u64 value) return growth; } +static unsigned long psi_memtime_fixup(u32 growth) +{ + struct rq *rq = task_rq(current); + unsigned long growth_fixed = (unsigned long)growth; + + if (!(current->policy == SCHED_NORMAL || current->policy == SCHED_BATCH)) + return growth_fixed; + + if (current->in_memstall) + growth_fixed = div64_ul((1024 - rq->avg_rt.util_avg - rq->avg_dl.util_avg + - rq->avg_irq.util_avg + 1) * growth, 1024); + + return growth_fixed; +} + static void init_triggers(struct psi_group *group, u64 now) { struct psi_trigger *t; @@ -658,6 +675,7 @@ static void record_times(struct psi_group_cpu *groupc, u64 now) } if (groupc->state_mask & (1 << PSI_MEM_SOME)) { + delta = psi_memtime_fixup(delta); groupc->times[PSI_MEM_SOME] += delta; if (groupc->state_mask & (1 << PSI_MEM_FULL)) groupc->times[PSI_MEM_FULL] += delta; @@ -928,8 +946,8 @@ void psi_memstall_leave(unsigned long *flags) */ rq = this_rq_lock_irq(&rf); - current->in_memstall = 0; psi_task_change(current, TSK_MEMSTALL, 0); + current->in_memstall = 0; rq_unlock_irq(rq, &rf); }