From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2615C433EF for ; Mon, 16 May 2022 03:17:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239585AbiEPDRJ (ORCPT ); Sun, 15 May 2022 23:17:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238156AbiEPDRI (ORCPT ); Sun, 15 May 2022 23:17:08 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DDF111C18; Sun, 15 May 2022 20:17:07 -0700 (PDT) Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4L1ksZ6DQlzgYHC; Mon, 16 May 2022 11:15:46 +0800 (CST) Received: from dggpemm500002.china.huawei.com (7.185.36.229) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 16 May 2022 11:17:05 +0800 Received: from localhost.localdomain (10.175.112.125) by dggpemm500002.china.huawei.com (7.185.36.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 16 May 2022 11:17:05 +0800 From: Chen Wandun To: , , , , , Subject: [PATCH 1/2] psi: add support for multi level pressure stall trigger Date: Mon, 16 May 2022 11:35:23 +0800 Message-ID: <20220516033524.3130816-1-chenwandun@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500002.china.huawei.com (7.185.36.229) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Nowadays, psi events are triggered when stall time exceed stall threshold, but no any different between these events. Actually, events can be divide into multi level, each level represent a different stall pressure, that is help to identify pressure information more accurately. echo "some 150000 350000 1000000" > /proc/pressure/memory would add [150ms, 350ms) threshold for partial memory stall measured within 1sec time window. Signed-off-by: Chen Wandun --- include/linux/psi_types.h | 3 ++- kernel/sched/psi.c | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h index c7fe7c089718..2b1393c8bf90 100644 --- a/include/linux/psi_types.h +++ b/include/linux/psi_types.h @@ -119,7 +119,8 @@ struct psi_trigger { enum psi_states state; /* User-spacified threshold in ns */ - u64 threshold; + u64 min_threshold; + u64 max_threshold; /* List node inside triggers list */ struct list_head node; diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index 6f9533c95b0a..17dd233b533a 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -541,7 +541,7 @@ static u64 update_triggers(struct psi_group *group, u64 now) /* Calculate growth since last update */ growth = window_update(&t->win, now, total[t->state]); - if (growth < t->threshold) + if (growth < t->min_threshold || growth >= t->max_threshold) continue; t->pending_event = true; @@ -1087,15 +1087,18 @@ struct psi_trigger *psi_trigger_create(struct psi_group *group, { struct psi_trigger *t; enum psi_states state; - u32 threshold_us; + u32 min_threshold_us; + u32 max_threshold_us; u32 window_us; if (static_branch_likely(&psi_disabled)) return ERR_PTR(-EOPNOTSUPP); - if (sscanf(buf, "some %u %u", &threshold_us, &window_us) == 2) + if (sscanf(buf, "some %u %u %u", &min_threshold_us, + &max_threshold_us, &window_us) == 3) state = PSI_IO_SOME + res * 2; - else if (sscanf(buf, "full %u %u", &threshold_us, &window_us) == 2) + else if (sscanf(buf, "full %u %u %u", &min_threshold_us, + &max_threshold_us, &window_us) == 3) state = PSI_IO_FULL + res * 2; else return ERR_PTR(-EINVAL); @@ -1107,8 +1110,11 @@ struct psi_trigger *psi_trigger_create(struct psi_group *group, window_us > WINDOW_MAX_US) return ERR_PTR(-EINVAL); + if (min_threshold_us >= max_threshold_us) + return ERR_PTR(-EINVAL); + /* Check threshold */ - if (threshold_us == 0 || threshold_us > window_us) + if (max_threshold_us > window_us) return ERR_PTR(-EINVAL); t = kmalloc(sizeof(*t), GFP_KERNEL); @@ -1117,7 +1123,8 @@ struct psi_trigger *psi_trigger_create(struct psi_group *group, t->group = group; t->state = state; - t->threshold = threshold_us * NSEC_PER_USEC; + t->min_threshold = min_threshold_us * NSEC_PER_USEC; + t->max_threshold = max_threshold_us * NSEC_PER_USEC; t->win.size = window_us * NSEC_PER_USEC; window_reset(&t->win, 0, 0, 0); -- 2.25.1