From patchwork Thu Jan 24 21:15:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 10780153 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E87BC1390 for ; Thu, 24 Jan 2019 21:15:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D80C82F805 for ; Thu, 24 Jan 2019 21:15:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB55F2F83A; Thu, 24 Jan 2019 21:15:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E36B2F805 for ; Thu, 24 Jan 2019 21:15:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7B43D8E009E; Thu, 24 Jan 2019 16:15:50 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 76C3C8E0097; Thu, 24 Jan 2019 16:15:50 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5BAA78E009E; Thu, 24 Jan 2019 16:15:50 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 141618E0097 for ; Thu, 24 Jan 2019 16:15:50 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id p9so5698920pfj.3 for ; Thu, 24 Jan 2019 13:15:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Yle1TlNGJaGEEnORF+DKn94y7Tdky3DBMIMdCA8cBkQ=; b=M5uvNn5pK1rzgIeDJxKtxWQWny+mJdtUBZNJPuJKbYhhYYJDEeaviaEkYjFcELASEh cS6nom4pc/KhL88vAboeebqhcPzwRrSoqeL7C6G9kp3PnxeORI2btmkrFf9Dt09a1m+g 5wVUGfKK80F8nzvAUPN2FogYNPTybMEnPYKUGP9PIXi09dgx9lOzCtobRaGTIK3fRQR6 p+b85G9+MjXWoRvCUKvVpVuxMZCbpxHj5Yi4iojTSDz4+oVouyuvvSC4pEk+0hjhl9vP 5syj1iAf1f49HXmGr3kPhBb03N4EtUKsuI1TmuorZxr2hlzOQpYBpzzeu5rzovD8GfUG E3ww== X-Gm-Message-State: AJcUukcKTG05JAk7lOyYNTtRsmZYNtrv04Uc6UAD4GiH7zjZzHL4u0+k 9ZEKVijYEamgKk8WLlcpdO68EcAbUTEQ4YX8ksT47VbKFnJZWgdXVrFFVpULyPR84YmAVdWRzZn iFOXdyE1UCgAQfgy21813fKc+Ax7EuYnkECeAOpswpIJzXWJNIIQ4Zr76olSymgZsp4da8OVicg 8fq1/TH36DpnBKdlst+JUSCnj7ya9xySTil1q0wua9MJuUzQYXMfqq4FEbnj+LV3//OtJ587cO0 ti3Kl5ria+f6n4X22y0dhT1qmacfRry6+59iXAU5X5j37K1Bwxj5NrdnxQ2cSJlo2I0fR9R8Uus vX42O44uGWaKPpc//M+24ypPwyONU0CscpXnuIkRFyiyvyPatP0pX7SeX29+/1qAxrXjQFIBCGH Q X-Received: by 2002:a17:902:be0e:: with SMTP id r14mr7678406pls.124.1548364549727; Thu, 24 Jan 2019 13:15:49 -0800 (PST) X-Received: by 2002:a17:902:be0e:: with SMTP id r14mr7678363pls.124.1548364548811; Thu, 24 Jan 2019 13:15:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548364548; cv=none; d=google.com; s=arc-20160816; b=vgqUWhJstge0OHGFLzMeBnteRgUlrf60EZ09IL4KLfGG8hmv59jajeULzf6/FYRL7X eU9LReC1TIUFIaI5f+A/0qDJZ6z9IJsiyobO825ZPEi4QIondlfvkK9sivMJcYDvVtCk 3kmDoTXJLZqOrF5hd4+GdHZSJY3LSltzM6Whn2K583f8APegaE/N8Mwe1CBP9ItOat/C zj4EV91hRSX8slJbJUUNTrdXFLiU/dRrFi7V/RiFdI2pzPQdAQEjPBHOZ2Q6VxOgVX/8 p1us1PLkejMth/DtR5Kuut2brkyRZr5IOgGUDf4vocleQ8b0TOHQ2P5nIXctC7W7cOa3 /jnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Yle1TlNGJaGEEnORF+DKn94y7Tdky3DBMIMdCA8cBkQ=; b=FIIz2oGbqYl1WxdemuMQF+ioTIReflhvOzscyUbIkHfYt60SxQhahz8XQAgAadGOPN 4dvhgEA/E4wlntVLycYpLMBGtdRvv6WXCqSvm8gAIyCsNay1OJMUT3irTWiEW+hhQGR8 ijZjje0rr/OfOViWwIpt9Akk7MpEbLlQT5CvbQU2t03KMUTgvWSwir2e9WwdmK0ZxM/V FF+1ljHbhV7rLZ1++XtAhdOrQxvu1tMhft6npM4/v8EUQ7G5QJ7kAcJ+o2y6DKosNgBf sECOs8hM1YVnKRoql9uNRuLw+ku5bhk/16S0o62+bLiIpC1TnXi1OBRCXr4WXjz/4fZa sd9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=G5aiYxBy; spf=pass (google.com: domain of surenb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id u10sor35044647pgr.25.2019.01.24.13.15.48 for (Google Transport Security); Thu, 24 Jan 2019 13:15:48 -0800 (PST) Received-SPF: pass (google.com: domain of surenb@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=G5aiYxBy; spf=pass (google.com: domain of surenb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yle1TlNGJaGEEnORF+DKn94y7Tdky3DBMIMdCA8cBkQ=; b=G5aiYxByVc6VsErIA8+F4qk2siELUvTdPPrbChQIOsAm83h4aweDW1EtGssVAsYcqr d0Hbfi1U48XHWNKKSg6xfBhvQrj7g8/hZUrKv+aKhCRjAxjIsEjMdq9EtxxcRfVJu90f BX6molsDxFs4E2ZxSEKUqzNfPjR4gcB67U8DPKVZujIWJXG+/xQti5Q/HhQ39OkRPKta 4qHw9QqImaawmIin18WKnJassSVIia4mg97ND/pwSl+bQs6LEJIkMU8ykdXNaM3OntUy 4wCAEHFwa73hdoSX8Xisl4JJso5mKIZzv+rz5PzXQafcVRCiPugAP22E9Ys7jJVMBrL2 ulKw== X-Google-Smtp-Source: ALg8bN7c9mCecQ7dN9e6nW340zvc5kgy4jrTniqrJWOGIuXa6rjmzTyuutcXsHTaWk10Kf/c9uFy0w== X-Received: by 2002:a63:ed42:: with SMTP id m2mr7480273pgk.147.1548364548221; Thu, 24 Jan 2019 13:15:48 -0800 (PST) Received: from surenb0.mtv.corp.google.com ([2620:0:1000:1612:3320:4357:47df:276b]) by smtp.googlemail.com with ESMTPSA id j197sm29626418pgc.76.2019.01.24.13.15.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jan 2019 13:15:47 -0800 (PST) From: Suren Baghdasaryan To: gregkh@linuxfoundation.org Cc: tj@kernel.org, lizefan@huawei.com, hannes@cmpxchg.org, axboe@kernel.dk, dennis@kernel.org, dennisszhou@gmail.com, mingo@redhat.com, peterz@infradead.org, akpm@linux-foundation.org, corbet@lwn.net, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Suren Baghdasaryan Subject: [PATCH v3 3/5] psi: introduce state_mask to represent stalled psi states Date: Thu, 24 Jan 2019 13:15:16 -0800 Message-Id: <20190124211518.244221-4-surenb@google.com> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog In-Reply-To: <20190124211518.244221-1-surenb@google.com> References: <20190124211518.244221-1-surenb@google.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP The psi monitoring patches will need to determine the same states as record_times(). To avoid calculating them twice, maintain a state mask that can be consulted cheaply. Do this in a separate patch to keep the churn in the main feature patch at a minimum. This adds 4-byte state_mask member into psi_group_cpu struct which results in its first cacheline-aligned part to become 52 bytes long. Add explicit values to enumeration element counters that affect psi_group_cpu struct size. Signed-off-by: Suren Baghdasaryan Acked-by: Johannes Weiner --- include/linux/psi_types.h | 9 ++++++--- kernel/sched/psi.c | 29 +++++++++++++++++++---------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h index 2cf422db5d18..762c6bb16f3c 100644 --- a/include/linux/psi_types.h +++ b/include/linux/psi_types.h @@ -11,7 +11,7 @@ enum psi_task_count { NR_IOWAIT, NR_MEMSTALL, NR_RUNNING, - NR_PSI_TASK_COUNTS, + NR_PSI_TASK_COUNTS = 3, }; /* Task state bitmasks */ @@ -24,7 +24,7 @@ enum psi_res { PSI_IO, PSI_MEM, PSI_CPU, - NR_PSI_RESOURCES, + NR_PSI_RESOURCES = 3, }; /* @@ -41,7 +41,7 @@ enum psi_states { PSI_CPU_SOME, /* Only per-CPU, to weigh the CPU in the global average: */ PSI_NONIDLE, - NR_PSI_STATES, + NR_PSI_STATES = 6, }; struct psi_group_cpu { @@ -53,6 +53,9 @@ struct psi_group_cpu { /* States of the tasks belonging to this group */ unsigned int tasks[NR_PSI_TASK_COUNTS]; + /* Aggregate pressure state derived from the tasks */ + u32 state_mask; + /* Period time sampling buckets for each state of interest (ns) */ u32 times[NR_PSI_STATES]; diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index fe24de3fbc93..2262d920295f 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -212,17 +212,17 @@ static bool test_state(unsigned int *tasks, enum psi_states state) static void get_recent_times(struct psi_group *group, int cpu, u32 *times) { struct psi_group_cpu *groupc = per_cpu_ptr(group->pcpu, cpu); - unsigned int tasks[NR_PSI_TASK_COUNTS]; u64 now, state_start; + enum psi_states s; unsigned int seq; - int s; + u32 state_mask; /* Snapshot a coherent view of the CPU state */ do { seq = read_seqcount_begin(&groupc->seq); now = cpu_clock(cpu); memcpy(times, groupc->times, sizeof(groupc->times)); - memcpy(tasks, groupc->tasks, sizeof(groupc->tasks)); + state_mask = groupc->state_mask; state_start = groupc->state_start; } while (read_seqcount_retry(&groupc->seq, seq)); @@ -238,7 +238,7 @@ static void get_recent_times(struct psi_group *group, int cpu, u32 *times) * (u32) and our reported pressure close to what's * actually happening. */ - if (test_state(tasks, s)) + if (state_mask & (1 << s)) times[s] += now - state_start; delta = times[s] - groupc->times_prev[s]; @@ -406,15 +406,15 @@ static void record_times(struct psi_group_cpu *groupc, int cpu, delta = now - groupc->state_start; groupc->state_start = now; - if (test_state(groupc->tasks, PSI_IO_SOME)) { + if (groupc->state_mask & (1 << PSI_IO_SOME)) { groupc->times[PSI_IO_SOME] += delta; - if (test_state(groupc->tasks, PSI_IO_FULL)) + if (groupc->state_mask & (1 << PSI_IO_FULL)) groupc->times[PSI_IO_FULL] += delta; } - if (test_state(groupc->tasks, PSI_MEM_SOME)) { + if (groupc->state_mask & (1 << PSI_MEM_SOME)) { groupc->times[PSI_MEM_SOME] += delta; - if (test_state(groupc->tasks, PSI_MEM_FULL)) + if (groupc->state_mask & (1 << PSI_MEM_FULL)) groupc->times[PSI_MEM_FULL] += delta; else if (memstall_tick) { u32 sample; @@ -435,10 +435,10 @@ static void record_times(struct psi_group_cpu *groupc, int cpu, } } - if (test_state(groupc->tasks, PSI_CPU_SOME)) + if (groupc->state_mask & (1 << PSI_CPU_SOME)) groupc->times[PSI_CPU_SOME] += delta; - if (test_state(groupc->tasks, PSI_NONIDLE)) + if (groupc->state_mask & (1 << PSI_NONIDLE)) groupc->times[PSI_NONIDLE] += delta; } @@ -447,6 +447,8 @@ static void psi_group_change(struct psi_group *group, int cpu, { struct psi_group_cpu *groupc; unsigned int t, m; + enum psi_states s; + u32 state_mask = 0; groupc = per_cpu_ptr(group->pcpu, cpu); @@ -479,6 +481,13 @@ static void psi_group_change(struct psi_group *group, int cpu, if (set & (1 << t)) groupc->tasks[t]++; + /* Calculate state mask representing active states */ + for (s = 0; s < NR_PSI_STATES; s++) { + if (test_state(groupc->tasks, s)) + state_mask |= (1 << s); + } + groupc->state_mask = state_mask; + write_seqcount_end(&groupc->seq); if (!delayed_work_pending(&group->clock_work))