From patchwork Sun Feb 19 07:33:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 59088 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp756084wrn; Sun, 19 Feb 2023 00:39:48 -0800 (PST) X-Google-Smtp-Source: AK7set+urF/qPMM4CW2+80mP2UvLjTck+wtNAQXkkmqnhXe4Uy54mVLr+xSJNdS1s2ifKherTc5N X-Received: by 2002:a05:6a00:1bc8:b0:5a8:473e:2fdc with SMTP id o8-20020a056a001bc800b005a8473e2fdcmr2317756pfw.12.1676795987932; Sun, 19 Feb 2023 00:39:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676795987; cv=none; d=google.com; s=arc-20160816; b=pfGfZbZgIbvhjzNGurW8KB3J4ZBPZfmi+jNyD5gBV05cRriFumJFS8Et/I17efS3vi 4u+BMrU3kkuYjnqPuFdl/b9lRJThyXtg/5GKGG2VfLHacFJ3So8b62ki4te3npQsLy8l q0cSVPYDRz1NbqZKA2qmwc+ccbTK1v1cyyjGiSzoSkFt7vFavl4fdUGHixov6s42F5o7 oE7R4sTtYZYYMebR378Ryb9dMfs5IKV2DbhI/utKtllC+ynqb01gZoSOdLN5rw2kctm6 g1musEu3SYh0XDxUb1umIeR1buPR7FmLM6JfMThWX4EhuAipuoueQY6aiGbSdim8Nfpb OW5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=foTbT4QwdeCG8p/+pG7+6hYxA8iHmzjKmefWFVB0gjc=; b=HGUKlsrHLIpQyFUpAKk/E+cwQVrR0kjtFOHO0lXLCQIuvx8ae68kXGqzo37IR/TcbU 1ZSDzh3nQYG5gE6IZMmvUosEdLyVpnnkcVBPVp7bTUqGgBlNIIPGtjLbBPStkrn3x6Zf gly7PdGnvyr2nMlvHvCErJ6YQseIjwBWfFwJZtz+5DxKWoNHfVV3cOA29YjvuCjPVcrK 1968zne3BrUnrVnMpAj5aqleeVoBxes2hfJ2dWzIMfbg9AuLi0hWicsYXuIHGhTjLmyf 5IPQfIp6KB9vynhLlQTrja1165aXl7JNB6DpOFzJkcM/WR2ttoquuK5VV9zMEkj51y4/ H/NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=M942xidG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j187-20020a62c5c4000000b005731d316830si10287048pfg.23.2023.02.19.00.39.34; Sun, 19 Feb 2023 00:39:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=M942xidG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229709AbjBSHeI (ORCPT + 99 others); Sun, 19 Feb 2023 02:34:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229656AbjBSHeB (ORCPT ); Sun, 19 Feb 2023 02:34:01 -0500 Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FC1AFF33; Sat, 18 Feb 2023 23:33:33 -0800 (PST) Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-171d6fa4c5dso317737fac.6; Sat, 18 Feb 2023 23:33:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=foTbT4QwdeCG8p/+pG7+6hYxA8iHmzjKmefWFVB0gjc=; b=M942xidGgMKr/OauZOPmRqRj/n2NxWP9yZV+FKV0A0eh+VjgQBEhFdESqBfA0GlCuc lRqkkkX8S8t6DWDnX/Bt5qBtZglDeLAwAiO5VrB9tzIsYBi7MmITfMxahbeV9o20Ui// 21WZtokjKghT2CQKgpfQ8cxaj9PRTsbnj6o0m7YaxXlDmx3DDOtfJEdaDfKtgxy5r1uO SrS3Rofj0+iN93Q9Jwts+h98i5F0HPQVpOnn2pYXG5oiuIHypLxc1wGgvbot9Hnmuoid /YX+UV0H+dP4Mj+E9GHdI8k8hEQmmZglej7TjZHdQ1FrDRPjl6eHgcKt2Ad0i0D7pU7l rX1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=foTbT4QwdeCG8p/+pG7+6hYxA8iHmzjKmefWFVB0gjc=; b=Pjak+2zeyYLE5wRqFwHbDJ8vf5g8X+e3Ve3cqIl+ZOKueFXq8+1VlGji4WMSZNV1yz L2/TPDItWqYQ1X8aDdnpuj0+qoOr9ERfm5IWnIiFkLdS5ZGFTo5NWfAI012/+DRCJhrT eJ2xo7S3Sg5e4uXBSdBBP2gDTpgYGWKjfpodAvQ24IFsp59BZhg+gSoRFg/c+4d3Oa+k 3jluKAZKqYBZyHziwV/rcJPJCqyZbz4TTHxgtVRGDigNblbXvKiM/UjcBIzDAb69cs7t 7UccENbC3/TwXgmvL4OTQDegep+rcqsz53rGXWU61wa1H1W6Fw58HbXg4Q755kKcaCWc dbhQ== X-Gm-Message-State: AO0yUKWvOJ0KHcotGal91YPbxWC0jobuQVU1QFd9lwxj10ob/WDcCzme ISR6MaiyWUh5ifzuLJmgWQs= X-Received: by 2002:a05:6870:c111:b0:16a:7b27:71d3 with SMTP id f17-20020a056870c11100b0016a7b2771d3mr6234295oad.7.1676792012296; Sat, 18 Feb 2023 23:33:32 -0800 (PST) Received: from localhost (227.sub-174-197-65.myvzw.com. [174.197.65.227]) by smtp.gmail.com with ESMTPSA id u6-20020a056870440600b0016e49af5815sm3425295oah.51.2023.02.18.23.33.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 23:33:32 -0800 (PST) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, bfoster@redhat.com, willy@infradead.org, arnd@arndb.de, linux-api@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v10 1/3] workingset: refactor LRU refault to expose refault recency check Date: Sat, 18 Feb 2023 23:33:16 -0800 Message-Id: <20230219073318.366189-2-nphamcs@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219073318.366189-1-nphamcs@gmail.com> References: <20230219073318.366189-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758248029818236005?= X-GMAIL-MSGID: =?utf-8?q?1758248029818236005?= In preparation for computing recently evicted pages in cachestat, refactor workingset_refault and lru_gen_refault to expose a helper function that would test if an evicted page is recently evicted. Signed-off-by: Nhat Pham --- include/linux/swap.h | 1 + mm/workingset.c | 142 +++++++++++++++++++++++++++++-------------- 2 files changed, 97 insertions(+), 46 deletions(-) -- 2.39.1 diff --git a/include/linux/swap.h b/include/linux/swap.h index a18cf4b7c724..dae6f6f955eb 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -361,6 +361,7 @@ static inline void folio_set_swap_entry(struct folio *folio, swp_entry_t entry) } /* linux/mm/workingset.c */ +bool workingset_test_recent(void *shadow, bool file, bool *workingset); void workingset_age_nonresident(struct lruvec *lruvec, unsigned long nr_pages); void *workingset_eviction(struct folio *folio, struct mem_cgroup *target_memcg); void workingset_refault(struct folio *folio, void *shadow); diff --git a/mm/workingset.c b/mm/workingset.c index 79585d55c45d..5f1d20a0a2fd 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -244,6 +244,30 @@ static void *lru_gen_eviction(struct folio *folio) return pack_shadow(mem_cgroup_id(memcg), pgdat, token, refs); } +/* + * Test if the folio is recently evicted. + * + * As a side effect, also populates the references with + * values unpacked from the shadow of the evicted folio. + */ +static bool lru_gen_test_recent(void *shadow, bool file, int *memcgid, + struct pglist_data **pgdat, unsigned long *token, bool *workingset) +{ + struct mem_cgroup *eviction_memcg; + struct lruvec *lruvec; + struct lru_gen_struct *lrugen; + unsigned long min_seq; + + unpack_shadow(shadow, memcgid, pgdat, token, workingset); + eviction_memcg = mem_cgroup_from_id(*memcgid); + + lruvec = mem_cgroup_lruvec(eviction_memcg, *pgdat); + lrugen = &lruvec->lrugen; + + min_seq = READ_ONCE(lrugen->min_seq[file]); + return (*token >> LRU_REFS_WIDTH) == (min_seq & (EVICTION_MASK >> LRU_REFS_WIDTH)); +} + static void lru_gen_refault(struct folio *folio, void *shadow) { int hist, tier, refs; @@ -258,23 +282,22 @@ static void lru_gen_refault(struct folio *folio, void *shadow) int type = folio_is_file_lru(folio); int delta = folio_nr_pages(folio); - unpack_shadow(shadow, &memcg_id, &pgdat, &token, &workingset); - - if (pgdat != folio_pgdat(folio)) - return; - rcu_read_lock(); + if (!lru_gen_test_recent(shadow, type, &memcg_id, &pgdat, &token, + &workingset)) + goto unlock; + memcg = folio_memcg_rcu(folio); if (memcg_id != mem_cgroup_id(memcg)) goto unlock; + if (pgdat != folio_pgdat(folio)) + return; + lruvec = mem_cgroup_lruvec(memcg, pgdat); lrugen = &lruvec->lrugen; - min_seq = READ_ONCE(lrugen->min_seq[type]); - if ((token >> LRU_REFS_WIDTH) != (min_seq & (EVICTION_MASK >> LRU_REFS_WIDTH))) - goto unlock; hist = lru_hist_from_seq(min_seq); /* see the comment in folio_lru_refs() */ @@ -306,6 +329,12 @@ static void *lru_gen_eviction(struct folio *folio) return NULL; } +static bool lru_gen_test_recent(void *shadow, bool file, int *memcgid, + struct pglist_data **pgdat, unsigned long *token, bool *workingset) +{ + return false; +} + static void lru_gen_refault(struct folio *folio, void *shadow) { } @@ -373,40 +402,31 @@ void *workingset_eviction(struct folio *folio, struct mem_cgroup *target_memcg) folio_test_workingset(folio)); } -/** - * workingset_refault - Evaluate the refault of a previously evicted folio. - * @folio: The freshly allocated replacement folio. - * @shadow: Shadow entry of the evicted folio. +/* + * Test if the folio is recently evicted by checking if + * refault distance of shadow exceeds workingset size. * - * Calculates and evaluates the refault distance of the previously - * evicted folio in the context of the node and the memcg whose memory - * pressure caused the eviction. + * As a side effect, populate workingset with the value + * unpacked from shadow. */ -void workingset_refault(struct folio *folio, void *shadow) +bool workingset_test_recent(void *shadow, bool file, bool *workingset) { - bool file = folio_is_file_lru(folio); struct mem_cgroup *eviction_memcg; struct lruvec *eviction_lruvec; unsigned long refault_distance; unsigned long workingset_size; - struct pglist_data *pgdat; - struct mem_cgroup *memcg; - unsigned long eviction; - struct lruvec *lruvec; unsigned long refault; - bool workingset; int memcgid; - long nr; + struct pglist_data *pgdat; + unsigned long eviction; - if (lru_gen_enabled()) { - lru_gen_refault(folio, shadow); - return; - } + if (lru_gen_enabled()) + return lru_gen_test_recent(shadow, file, &memcgid, &pgdat, &eviction, + workingset); - unpack_shadow(shadow, &memcgid, &pgdat, &eviction, &workingset); + unpack_shadow(shadow, &memcgid, &pgdat, &eviction, workingset); eviction <<= bucket_order; - rcu_read_lock(); /* * Look up the memcg associated with the stored ID. It might * have been deleted since the folio's eviction. @@ -425,7 +445,8 @@ void workingset_refault(struct folio *folio, void *shadow) */ eviction_memcg = mem_cgroup_from_id(memcgid); if (!mem_cgroup_disabled() && !eviction_memcg) - goto out; + return false; + eviction_lruvec = mem_cgroup_lruvec(eviction_memcg, pgdat); refault = atomic_long_read(&eviction_lruvec->nonresident_age); @@ -447,21 +468,6 @@ void workingset_refault(struct folio *folio, void *shadow) */ refault_distance = (refault - eviction) & EVICTION_MASK; - /* - * The activation decision for this folio is made at the level - * where the eviction occurred, as that is where the LRU order - * during folio reclaim is being determined. - * - * However, the cgroup that will own the folio is the one that - * is actually experiencing the refault event. - */ - nr = folio_nr_pages(folio); - memcg = folio_memcg(folio); - pgdat = folio_pgdat(folio); - lruvec = mem_cgroup_lruvec(memcg, pgdat); - - mod_lruvec_state(lruvec, WORKINGSET_REFAULT_BASE + file, nr); - mem_cgroup_flush_stats_delayed(); /* * Compare the distance to the existing workingset size. We @@ -483,7 +489,51 @@ void workingset_refault(struct folio *folio, void *shadow) NR_INACTIVE_ANON); } } - if (refault_distance > workingset_size) + + return refault_distance <= workingset_size; +} + +/** + * workingset_refault - Evaluate the refault of a previously evicted folio. + * @folio: The freshly allocated replacement folio. + * @shadow: Shadow entry of the evicted folio. + * + * Calculates and evaluates the refault distance of the previously + * evicted folio in the context of the node and the memcg whose memory + * pressure caused the eviction. + */ +void workingset_refault(struct folio *folio, void *shadow) +{ + bool file = folio_is_file_lru(folio); + struct pglist_data *pgdat; + struct mem_cgroup *memcg; + struct lruvec *lruvec; + bool workingset; + long nr; + + if (lru_gen_enabled()) { + lru_gen_refault(folio, shadow); + return; + } + + rcu_read_lock(); + + /* + * The activation decision for this folio is made at the level + * where the eviction occurred, as that is where the LRU order + * during folio reclaim is being determined. + * + * However, the cgroup that will own the folio is the one that + * is actually experiencing the refault event. + */ + nr = folio_nr_pages(folio); + memcg = folio_memcg(folio); + pgdat = folio_pgdat(folio); + lruvec = mem_cgroup_lruvec(memcg, pgdat); + + mod_lruvec_state(lruvec, WORKINGSET_REFAULT_BASE + file, nr); + + if (!workingset_test_recent(shadow, file, &workingset)) goto out; folio_set_active(folio); From patchwork Sun Feb 19 07:33:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 59087 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp752488wrn; Sun, 19 Feb 2023 00:27:01 -0800 (PST) X-Google-Smtp-Source: AK7set/98XiR+GLFY6WpVGb7atttyknDdBxmDmRPWb1hLGo1horRjtI+j0yfidvD21uizUX9wLmt X-Received: by 2002:a17:90b:4c50:b0:233:cc85:6fad with SMTP id np16-20020a17090b4c5000b00233cc856fadmr3129427pjb.13.1676795221206; Sun, 19 Feb 2023 00:27:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676795221; cv=none; d=google.com; s=arc-20160816; b=hDKvLzaX1kjP9TLYfdzY/q4qNl2Dv0uFJLzG9KZKr2ClwJ30Ux8yWLH/rNO/D7SAdf RcDqt6pMcXD6C8gBGycxMeBKx/kywvd+iemDZNFslHo042+9ARZ82zSLt1iuXUxmI742 ebdxqvYcQMI0qfm6A9yo1ZacfvqranCi3vxFqUoSXIIuJGdUFe8rxaCo44VMdI09c80e /jbKQUa5nCnVnoWW33aS726CCbJkzB1UFFUxXQu7SSIJsgktrNczG6gDbvgt8wo2HEaW hdrVkE0G3mQpgAnhP9awiTCDDIO9lqcLiLJ5VsHdbrmaDtzkggkaik6QuiRqh/YgwCGE +k1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AlynQezfHAvAVV88tDFCiMn0mp/ma0Jf15lF8KMULwE=; b=0w4HKTMPDe4njQYLikH1CGakSMhKEtNJyVxMnfBaVHdywMtFHLQCmkQLN0q9jPdBsS 5fg8DVLtGWX+lhMHZo6qxUMn1K7VcciCfC/dutrw7UV8Cm5hnc0mcb8XagkptBTwQOKq TlWpMMDXbQA4BqPVBFMJfCAYm/ne3L2xQAMIjYJwlK6/NoEb4Xy1f1n8DPSEI13LSIcW GLZrCS+i/1HvSYRPL18lgeUXZKASSB1T0JBqTFMSl/YZBuVq8ryuy1I35B90Aa1W80Ar rfOfK/QD64PH1s1VMYSgqrLdSqNSADJO1A3pXCjj4k51gayW0vbSXjdPxLprVQdPb0Do bVqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dyzaeJeR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k7-20020a170902c40700b0019b0321c3besi7005500plk.19.2023.02.19.00.26.48; Sun, 19 Feb 2023 00:27:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dyzaeJeR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229663AbjBSHeL (ORCPT + 99 others); Sun, 19 Feb 2023 02:34:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229698AbjBSHeH (ORCPT ); Sun, 19 Feb 2023 02:34:07 -0500 Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED34112846; Sat, 18 Feb 2023 23:33:39 -0800 (PST) Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-171b38c1ef7so2353966fac.9; Sat, 18 Feb 2023 23:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AlynQezfHAvAVV88tDFCiMn0mp/ma0Jf15lF8KMULwE=; b=dyzaeJeRkZ76kFwW87dY2/OjAQ4R6h3m+1H3Km8Y7hKcEyGTxRidR2F4qaKtakNY5B f8kgl8T9pPAOtVfS0RDmNVNSRA3vr6sgA9kLU9F/nIKmuOgq+IMe4p1/ILwZUDlT5puF TU5YxelzjYRB0iHQGcfX5LiMUGWj8I4BykJGd67Kq/kGoDX3rlqiJVjSS+FDKV1YrXsb idT5IWHKypLWcn9eox+CBgMmWcbeUCC5wU5D5FR2Dwmx+ExnwcERNcvkoDDBsPprCyOu JR8EIW0xm2/O3nOMCTU7fatgqwWx/uStu7h/EaYKVkd3WsWjf/Ne3pgv+Bkh8kFizpPb Dgtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AlynQezfHAvAVV88tDFCiMn0mp/ma0Jf15lF8KMULwE=; b=imzKhpeihkGNTZGuDjEgnR+728QzLvBo8UxI96zLSzs8FjeXVGWwdP46euiRz0E8U5 0NyjnhH3nAoJcz/JBzpaOdErtfnv8Zymev5piCVHdu73yx2gk4kWwePJ7qb+5wVUzy29 mqVHf0rMVFA5rSJXHS+2pxFq7g+98GDMrx1HgULYS1NSs+y/xlPafz8fOzTor6+vbmfE xPUPVkBc7eqYFd2a/Xc49SdRto5biyDFcA059vxmqUfnnWu9nN7fhEvsqAFtbqjl7J3G q2+jPzKIoPdZqHdOcnm+Gk5izOC+MZXDjizBLoFqQwj81mwmeOhU7KIcbBK0QBE1RQho tp8w== X-Gm-Message-State: AO0yUKWg6NIXLVDfmn6sk+uEoDTQ3E+iHjS3GFvzb7vB0SRGLCVYKJ/4 S0wuJYSoFu+D6EwvqT9SRtc= X-Received: by 2002:a05:6870:8915:b0:16e:707f:db66 with SMTP id i21-20020a056870891500b0016e707fdb66mr7555582oao.17.1676792018893; Sat, 18 Feb 2023 23:33:38 -0800 (PST) Received: from localhost (227.sub-174-197-65.myvzw.com. [174.197.65.227]) by smtp.gmail.com with ESMTPSA id g18-20020a4ad852000000b0051fdb2cba97sm3749063oov.7.2023.02.18.23.33.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 23:33:38 -0800 (PST) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, bfoster@redhat.com, willy@infradead.org, arnd@arndb.de, linux-api@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v10 2/3] cachestat: implement cachestat syscall Date: Sat, 18 Feb 2023 23:33:17 -0800 Message-Id: <20230219073318.366189-3-nphamcs@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219073318.366189-1-nphamcs@gmail.com> References: <20230219073318.366189-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758247225695354765?= X-GMAIL-MSGID: =?utf-8?q?1758247225695354765?= There is currently no good way to query the page cache state of large file sets and directory trees. There is mincore(), but it scales poorly: the kernel writes out a lot of bitmap data that userspace has to aggregate, when the user really doesn not care about per-page information in that case. The user also needs to mmap and unmap each file as it goes along, which can be quite slow as well. This patch implements a new syscall that queries cache state of a file and summarizes the number of cached pages, number of dirty pages, number of pages marked for writeback, number of (recently) evicted pages, etc. in a given range. Currently, the syscall is only wired in for x86 architecture. NAME cachestat - query the page cache statistics of a file. SYNOPSIS #include struct cachestat { __u64 nr_cache; __u64 nr_dirty; __u64 nr_writeback; __u64 nr_evicted; __u64 nr_recently_evicted; }; int cachestat(unsigned int fd, size_t len, loff_t off, struct cachestat *cstat, unsigned int flags); DESCRIPTION cachestat() queries the number of cached pages, number of dirty pages, number of pages marked for writeback, number of evicted pages, number of recently evicted pages, in the bytes range given by `off` and `len`. An evicted page is a page that is previously in the page cache but has been evicted since. A page is recently evicted if its last eviction was recent enough that its reentry to the cache would indicate that it is actively being used by the system, and that there is memory pressure on the system. These values are returned in a cachestat struct, whose address is given by the `cstat` argument. The `off` and `len` arguments must be non-negative integers. If `len` > 0, the queried range is [`off`, `off` + `len`]. If `len` == 0, we will query in the range from `off` to the end of the file. The `flags` argument is unused for now, but is included for future extensibility. User should pass 0 (i.e no flag specified). RETURN VALUE On success, cachestat returns 0. On error, -1 is returned, and errno is set to indicate the error. ERRORS EFAULT cstat points to an invalid address. EINVAL invalid offset or flags. EBADF invalid file descriptor. Signed-off-by: Nhat Pham --- arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + include/linux/compat.h | 4 +- include/linux/fs.h | 3 + include/linux/syscalls.h | 3 + include/uapi/asm-generic/unistd.h | 5 +- include/uapi/linux/mman.h | 9 ++ init/Kconfig | 10 ++ kernel/sys_ni.c | 1 + mm/filemap.c | 158 +++++++++++++++++++++++++ 10 files changed, 193 insertions(+), 2 deletions(-) -- 2.39.1 diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 320480a8db4f..01d1cc009250 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -455,3 +455,4 @@ 448 i386 process_mrelease sys_process_mrelease 449 i386 futex_waitv sys_futex_waitv 450 i386 set_mempolicy_home_node sys_set_mempolicy_home_node +451 i386 cachestat sys_cachestat compat_sys_cachestat diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl index c84d12608cd2..227538b0ce80 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -372,6 +372,7 @@ 448 common process_mrelease sys_process_mrelease 449 common futex_waitv sys_futex_waitv 450 common set_mempolicy_home_node sys_set_mempolicy_home_node +451 common cachestat sys_cachestat # # Due to a historical design error, certain syscalls are numbered differently diff --git a/include/linux/compat.h b/include/linux/compat.h index 594357881b0b..1c5d385be859 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -816,7 +816,9 @@ asmlinkage long compat_sys_sendmsg(int fd, struct compat_msghdr __user *msg, asmlinkage long compat_sys_recvmsg(int fd, struct compat_msghdr __user *msg, unsigned int flags); -/* mm/filemap.c: No generic prototype for readahead */ +/* mm/filemap.c */ +asmlinkage long compat_sys_cachestat(int fd, size_t len, compat_arg_u64(off), + struct cachestat __user *cstat, unsigned int flags); /* security/keys/keyctl.c */ asmlinkage long compat_sys_keyctl(u32 option, diff --git a/include/linux/fs.h b/include/linux/fs.h index e654435f1651..83300f1491e7 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -75,6 +75,7 @@ struct fs_context; struct fs_parameter_spec; struct fileattr; struct iomap_ops; +struct cachestat; extern void __init inode_init(void); extern void __init inode_init_early(void); @@ -830,6 +831,8 @@ void filemap_invalidate_lock_two(struct address_space *mapping1, struct address_space *mapping2); void filemap_invalidate_unlock_two(struct address_space *mapping1, struct address_space *mapping2); +void filemap_cachestat(struct address_space *mapping, pgoff_t first_index, + pgoff_t last_index, struct cachestat *cs); /* diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index a34b0f9a9972..9f384a6d7e77 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -72,6 +72,7 @@ struct open_how; struct mount_attr; struct landlock_ruleset_attr; enum landlock_rule_type; +struct cachestat; #include #include @@ -1056,6 +1057,8 @@ asmlinkage long sys_memfd_secret(unsigned int flags); asmlinkage long sys_set_mempolicy_home_node(unsigned long start, unsigned long len, unsigned long home_node, unsigned long flags); +asmlinkage long sys_cachestat(unsigned int fd, size_t len, loff_t offset, + struct cachestat __user *cstat, unsigned int flags); /* * Architecture-specific system calls diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 45fa180cc56a..dc5fcfee7f09 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -886,8 +886,11 @@ __SYSCALL(__NR_futex_waitv, sys_futex_waitv) #define __NR_set_mempolicy_home_node 450 __SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node) +#define __NR_cachestat 451 +__SC_COMP(__NR_cachestat, sys_cachestat, compat_sys_cachestat) + #undef __NR_syscalls -#define __NR_syscalls 451 +#define __NR_syscalls 452 /* * 32 bit systems traditionally used different diff --git a/include/uapi/linux/mman.h b/include/uapi/linux/mman.h index f55bc680b5b0..fe03ed0b7587 100644 --- a/include/uapi/linux/mman.h +++ b/include/uapi/linux/mman.h @@ -4,6 +4,7 @@ #include #include +#include #define MREMAP_MAYMOVE 1 #define MREMAP_FIXED 2 @@ -41,4 +42,12 @@ #define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB #define MAP_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB +struct cachestat { + __u64 nr_cache; + __u64 nr_dirty; + __u64 nr_writeback; + __u64 nr_evicted; + __u64 nr_recently_evicted; +}; + #endif /* _UAPI_LINUX_MMAN_H */ diff --git a/init/Kconfig b/init/Kconfig index 694f7c160c9c..da96ac29af1d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1798,6 +1798,16 @@ config RSEQ If unsure, say Y. +config CACHESTAT_SYSCALL + bool "Enable cachestat() system call" if EXPERT + default y + help + Enable the cachestat system call, which queries the page cache + statistics of a file (number of cached pages, dirty pages, + pages marked for writeback, (recently) evicted pages). + + If unsure say Y here. + config DEBUG_RSEQ default n bool "Enabled debugging of rseq() system call" if EXPERT diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index 860b2dcf3ac4..04bfb1e4d377 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -299,6 +299,7 @@ COND_SYSCALL(set_mempolicy); COND_SYSCALL(migrate_pages); COND_SYSCALL(move_pages); COND_SYSCALL(set_mempolicy_home_node); +COND_SYSCALL(cachestat); COND_SYSCALL(perf_event_open); COND_SYSCALL(accept4); diff --git a/mm/filemap.c b/mm/filemap.c index 08341616ae7a..a00b5988d21c 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -55,6 +56,9 @@ #include /* for try_to_free_buffers */ #include +#include + +#include "swap.h" /* * Shared mappings implemented 30.11.1994. It's not fully working yet, @@ -3949,3 +3953,157 @@ bool filemap_release_folio(struct folio *folio, gfp_t gfp) return try_to_free_buffers(folio); } EXPORT_SYMBOL(filemap_release_folio); + +/** + * filemap_cachestat() - compute the page cache statistics of a mapping + * @mapping: The mapping to compute the statistics for. + * @first_index: The starting page cache index. + * @last_index: The final page index (inclusive). + * @cs: the cachestat struct to write the result to. + * + * This will query the page cache statistics of a mapping in the + * page range of [first_index, last_index] (inclusive). The statistics + * queried include: number of dirty pages, number of pages marked for + * writeback, and the number of (recently) evicted pages. + */ +void filemap_cachestat(struct address_space *mapping, pgoff_t first_index, + pgoff_t last_index, struct cachestat *cs) +{ + XA_STATE(xas, &mapping->i_pages, first_index); + struct folio *folio; + + rcu_read_lock(); + xas_for_each(&xas, folio, last_index) { + unsigned long nr_pages; + pgoff_t folio_first_index, folio_last_index; + + if (xas_retry(&xas, folio)) + continue; + + nr_pages = folio_nr_pages(folio); + folio_first_index = folio_pgoff(folio); + folio_last_index = folio_first_index + nr_pages - 1; + + /* Folios might straddle the range boundaries, only count covered subpages */ + if (folio_first_index < first_index) + nr_pages -= first_index - folio_first_index; + + if (folio_last_index > last_index) + nr_pages -= folio_last_index - last_index; + + if (xa_is_value(folio)) { + /* page is evicted */ + void *shadow = (void *)folio; + bool workingset; /* not used */ + + cs->nr_evicted += nr_pages; + +#ifdef CONFIG_SWAP /* implies CONFIG_MMU */ + if (shmem_mapping(mapping)) { + /* shmem file - in swap cache */ + swp_entry_t swp = radix_to_swp_entry(folio); + + shadow = get_shadow_from_swap_cache(swp); + } +#endif + if (workingset_test_recent(shadow, true, &workingset)) + cs->nr_recently_evicted += nr_pages; + + goto resched; + } + + /* page is in cache */ + cs->nr_cache += nr_pages; + + if (folio_test_dirty(folio)) + cs->nr_dirty += nr_pages; + + if (folio_test_writeback(folio)) + cs->nr_writeback += nr_pages; + +resched: + if (need_resched()) { + xas_pause(&xas); + cond_resched_rcu(); + } + } + rcu_read_unlock(); +} +EXPORT_SYMBOL(filemap_cachestat); + +#ifdef CONFIG_CACHESTAT_SYSCALL +long ksys_cachestat(unsigned int fd, size_t len, loff_t off, + struct cachestat __user *cstat, unsigned int flags) +{ + struct fd f = fdget(fd); + struct address_space *mapping; + struct cachestat cs; + pgoff_t first_index = off >> PAGE_SHIFT; + pgoff_t last_index = + len == 0 ? ULONG_MAX : (off + len - 1) >> PAGE_SHIFT; + + if (!f.file) + return -EBADF; + + if (off < 0 || flags != 0) { + fdput(f); + return -EINVAL; + } + + memset(&cs, 0, sizeof(struct cachestat)); + mapping = f.file->f_mapping; + filemap_cachestat(mapping, first_index, last_index, &cs); + fdput(f); + + if (copy_to_user(cstat, &cs, sizeof(struct cachestat))) + return -EFAULT; + + return 0; +} + +/* + * The cachestat(5) system call. + * + * cachestat() returns the page cache statistics of a file in the + * bytes range specified by `off` and `len`: number of cached pages, + * number of dirty pages, number of pages marked for writeback, + * number of evicted pages, and number of recently evicted pages. + * + * An evicted page is a page that is previously in the page cache + * but has been evicted since. A page is recently evicted if its last + * eviction was recent enough that its reentry to the cache would + * indicate that it is actively being used by the system, and that + * there is memory pressure on the system. + * + * `off` and `len` must be non-negative integers. If `len` > 0, + * the queried range is [`off`, `off` + `len`]. If `len` == 0, + * we will query in the range from `off` to the end of the file. + * + * The `flags` argument is unused for now, but is included for future + * extensibility. User should pass 0 (i.e no flag specified). + * + * Because the status of a page can change after cachestat() checks it + * but before it returns to the application, the returned values may + * contain stale information. + * + * return values: + * zero - success + * -EFAULT - cstat points to an illegal address + * -EINVAL - invalid arguments + * -EBADF - invalid file descriptor + */ +SYSCALL_DEFINE5(cachestat, unsigned int, fd, size_t, len, loff_t, off, + struct cachestat __user *, cstat, unsigned int, flags) +{ + return ksys_cachestat(fd, len, off, cstat, flags); +} + +#ifdef CONFIG_COMPAT +COMPAT_SYSCALL_DEFINE6(cachestat, unsigned int, fd, size_t, len, + compat_arg_u64_dual(off), struct cachestat __user *, cstat, + unsigned int, flags) +{ + return ksys_cachestat(fd, len, compat_arg_u64_glue(off), cstat, flags); +} +#endif +#endif /* CONFIG_CACHESTAT_SYSCALL */ From patchwork Sun Feb 19 07:33:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 59086 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp747834wrn; Sun, 19 Feb 2023 00:10:23 -0800 (PST) X-Google-Smtp-Source: AK7set84HXuoOwxPb8CUr29w2ipq3uEER4KwsmSb9cmnAXXdq4dHSpTwvsuiSKmIocVBTvOBO8ga X-Received: by 2002:a17:907:97c3:b0:8af:ef00:b853 with SMTP id js3-20020a17090797c300b008afef00b853mr5506854ejc.73.1676794223439; Sun, 19 Feb 2023 00:10:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676794223; cv=none; d=google.com; s=arc-20160816; b=eWVsie/TGMN1zJ8AFQnr9oJRGZr/7yZ4OLMntnEbWwqzGc703bJxwG0+LB27p9yqVH GQ7gXoAmNfnZunrOGXqnT+OaAqMDCKQV0t36ncakU8Val1II13ROY8CtbBLGv82LrhX8 qCGC0ZilXq445R5wEwNQJ4fCdhCAThd251J9sOnFRqamXfPyPbqd8ir1wQON4vwrFkNp yha4pxMCQjJUkHT/oSQiL3axhI/uBC5Ao1rvd5VuKUpxa8FswltZT8tfjGq0MZ01jMUk rF+EQfLos5jne+pcByyR1psCR1eLItuoy4oVFQQB41oNaUo1VZG1LYizrp275J75393N InHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=A6ekRPQWIOO9h97zjQvvrZJ6rFQp5B1ODkwvrN46IL8=; b=qTjSdneS58tR3prvxTlpc1t+tChWqMTYoaojoouLAJLL6hpjbFZmDjWnuPNnT17Kmn L11AjPP1ITGIG9dfY5vdS8oNs9Khr5P37TwA0FqgOG/9o44t6L6HURBIHdfeqA2knrxG 5KDJj/7pRUwhWcMd2CKlzoxtGpSgcSC/4qeZkky7Wx+B/pw5dZi3VAoZfDRLf2D7KWP4 5MZLBFUVxAIkW0hT67Oc8ZPBXfhqPwblGdJCpB+bYsp1HF8SlwmBYpMVG+u0gz93yasI Kmq5xq8ynnHNkX+5lj6tWcSmRTGuX9Mu2ach3rxEprF1ZJBv8U4JQgchQcauo6rtWsLe Y+XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="VIXw+j/9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fh6-20020a1709073a8600b0088e0c76c466si9846548ejc.356.2023.02.19.00.09.51; Sun, 19 Feb 2023 00:10:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="VIXw+j/9"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229694AbjBSHeO (ORCPT + 99 others); Sun, 19 Feb 2023 02:34:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229711AbjBSHeI (ORCPT ); Sun, 19 Feb 2023 02:34:08 -0500 Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CDB112BF2; Sat, 18 Feb 2023 23:33:46 -0800 (PST) Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-171dc4abbf8so17393fac.4; Sat, 18 Feb 2023 23:33:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A6ekRPQWIOO9h97zjQvvrZJ6rFQp5B1ODkwvrN46IL8=; b=VIXw+j/9K0ueRJ3XZk56qe8QOL0Cmpp7GG1nfaoqd3mrwXvQjCOiuvqI3MWGdIsqPh NaQSgSHqheGO1jZax3FsreUoTTAOxducCXCHLU9jQ1cnIjpNfQxt3HsFKsigcuIdyN3Y +9YWSZPcHl0mF+YL7hl2tQ35jopvi/ziMoQxKbIO7pHLy9syY3n4EDs0LsO2UAUkDTwN uG7VPb4moTRdlVk93TwqFHZU1f9QlzzuW2Y+BjvqunA5mn3GKnxB3ishhVrg4z1YNkFD /T8V5EU+PYcLGlt8OQeA+DQDK9MxHrY5tRy4KkGmItFO0ftXjFIOeHG2GLQdWaSb9onW oxKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A6ekRPQWIOO9h97zjQvvrZJ6rFQp5B1ODkwvrN46IL8=; b=v0TwhSFUWY9WbDk1ZYebh2X29JrgjD1U4xmzUb3wcHfwedWMgjmcBbdxIqymW6p2aE iCYNlyEZ7JcRX8XjbHXtZvtM0Vy1yCris8Z9wtZ6jSZrOpYMMReIA+p66lvhMuYiUe6d s4Kk8D7k6RK0Usr+xGxJ8iKUVfVAMDGiILtG/sqYfrwgF7x7jZSoExVjBnAuQzqSrddL n9PLaxwskGr9BjtroH85WVToZbc/pcUbh7WyzuUKsZnNRT79fF7CBrwgb8hDAO3n8JRp UIBS9oLnTXBwyA2hl7DNLxamHOVgaO9pDLDDjA0Jdv7sCWhRpyf9FLStbf0Hog/jVgih Ueqw== X-Gm-Message-State: AO0yUKVk04AAOqPGHK2qQdWUpW2mjMtM1zq7dtNJrfTTp1ug8wM0w/bj shchG1EIF3cdxYHhlzdXjQg= X-Received: by 2002:a05:6870:a693:b0:16e:8556:41e4 with SMTP id i19-20020a056870a69300b0016e855641e4mr6822908oam.3.1676792025333; Sat, 18 Feb 2023 23:33:45 -0800 (PST) Received: from localhost (227.sub-174-197-65.myvzw.com. [174.197.65.227]) by smtp.gmail.com with ESMTPSA id r8-20020a056870624800b0016b7fe3be05sm3412107oak.39.2023.02.18.23.33.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 23:33:45 -0800 (PST) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, bfoster@redhat.com, willy@infradead.org, arnd@arndb.de, linux-api@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v10 3/3] selftests: Add selftests for cachestat Date: Sat, 18 Feb 2023 23:33:18 -0800 Message-Id: <20230219073318.366189-4-nphamcs@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230219073318.366189-1-nphamcs@gmail.com> References: <20230219073318.366189-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758246179463070613?= X-GMAIL-MSGID: =?utf-8?q?1758246179463070613?= Test cachestat on a newly created file, /dev/ files, and /proc/ files. Also test on a shmem file (which can also be tested with huge pages since tmpfs supports huge pages). Signed-off-by: Nhat Pham --- MAINTAINERS | 7 + tools/testing/selftests/Makefile | 1 + tools/testing/selftests/cachestat/.gitignore | 2 + tools/testing/selftests/cachestat/Makefile | 8 + .../selftests/cachestat/test_cachestat.c | 256 ++++++++++++++++++ 5 files changed, 274 insertions(+) create mode 100644 tools/testing/selftests/cachestat/.gitignore create mode 100644 tools/testing/selftests/cachestat/Makefile create mode 100644 tools/testing/selftests/cachestat/test_cachestat.c -- 2.39.1 diff --git a/MAINTAINERS b/MAINTAINERS index a198da986146..792a866353ec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4552,6 +4552,13 @@ S: Supported F: Documentation/filesystems/caching/cachefiles.rst F: fs/cachefiles/ +CACHESTAT: PAGE CACHE STATS FOR A FILE +M: Nhat Pham +M: Johannes Weiner +L: linux-mm@kvack.org +S: Maintained +F: tools/testing/selftests/cachestat/test_cachestat.c + CADENCE MIPI-CSI2 BRIDGES M: Maxime Ripard L: linux-media@vger.kernel.org diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 0464b2c6c1e4..3cad0b38c5c2 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -4,6 +4,7 @@ TARGETS += amd-pstate TARGETS += arm64 TARGETS += bpf TARGETS += breakpoints +TARGETS += cachestat TARGETS += capabilities TARGETS += cgroup TARGETS += clone3 diff --git a/tools/testing/selftests/cachestat/.gitignore b/tools/testing/selftests/cachestat/.gitignore new file mode 100644 index 000000000000..d6c30b43a4bb --- /dev/null +++ b/tools/testing/selftests/cachestat/.gitignore @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +test_cachestat diff --git a/tools/testing/selftests/cachestat/Makefile b/tools/testing/selftests/cachestat/Makefile new file mode 100644 index 000000000000..fca73aaa7d14 --- /dev/null +++ b/tools/testing/selftests/cachestat/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 +TEST_GEN_PROGS := test_cachestat + +CFLAGS += $(KHDR_INCLUDES) +CFLAGS += -Wall +CFLAGS += -lrt + +include ../lib.mk diff --git a/tools/testing/selftests/cachestat/test_cachestat.c b/tools/testing/selftests/cachestat/test_cachestat.c new file mode 100644 index 000000000000..5d0fe5ae62f1 --- /dev/null +++ b/tools/testing/selftests/cachestat/test_cachestat.c @@ -0,0 +1,256 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../kselftest.h" + +static const char * const dev_files[] = { + "/dev/zero", "/dev/null", "/dev/urandom", + "/proc/version", "/proc" +}; +static const int cachestat_nr = 451; + +void print_cachestat(struct cachestat *cs) +{ + ksft_print_msg( + "Using cachestat: Cached: %lu, Dirty: %lu, Writeback: %lu, Evicted: %lu, Recently Evicted: %lu\n", + cs->nr_cache, cs->nr_dirty, cs->nr_writeback, + cs->nr_evicted, cs->nr_recently_evicted); +} + +bool write_exactly(int fd, size_t filesize) +{ + char data[filesize]; + bool ret = true; + int random_fd = open("/dev/urandom", O_RDONLY); + + if (random_fd < 0) { + ksft_print_msg("Unable to access urandom.\n"); + ret = false; + goto out; + } else { + int remained = filesize; + char *cursor = data; + + while (remained) { + ssize_t read_len = read(random_fd, cursor, remained); + + if (read_len <= 0) { + ksft_print_msg("Unable to read from urandom.\n"); + ret = false; + goto close_random_fd; + } + + remained -= read_len; + cursor += read_len; + } + + /* write random data to fd */ + remained = filesize; + cursor = data; + while (remained) { + ssize_t write_len = write(fd, cursor, remained); + + if (write_len <= 0) { + ksft_print_msg("Unable write random data to file.\n"); + ret = false; + goto close_random_fd; + } + + remained -= write_len; + cursor += write_len; + } + } + +close_random_fd: + close(random_fd); +out: + return ret; +} + +/* + * Open/create the file at filename, (optionally) write random data to it + * (exactly num_pages), then test the cachestat syscall on this file. + * + * If test_fsync == true, fsync the file, then check the number of dirty + * pages. + */ +bool test_cachestat(const char *filename, bool write_random, bool create, + bool test_fsync, unsigned long num_pages, int open_flags, + mode_t open_mode) +{ + size_t PS = sysconf(_SC_PAGESIZE); + int filesize = num_pages * PS; + bool ret = true; + long syscall_ret; + struct cachestat cs; + + int fd = open(filename, open_flags, open_mode); + + if (fd == -1) { + ksft_print_msg("Unable to create/open file.\n"); + goto out; + } else { + ksft_print_msg("Create/open %s\n", filename); + } + + if (write_random) { + if (!write_exactly(fd, filesize)) { + ksft_print_msg("Unable to access urandom.\n"); + ret = false; + goto out1; + } + } + + syscall_ret = syscall(cachestat_nr, fd, filesize, 0, &cs, 0); + + ksft_print_msg("Cachestat call returned %ld\n", syscall_ret); + + if (syscall_ret) { + ksft_print_msg("Cachestat returned non-zero.\n"); + ret = false; + goto out1; + + } else { + print_cachestat(&cs); + + if (write_random) { + if (cs.nr_cache + cs.nr_evicted != num_pages) { + ksft_print_msg( + "Total number of cached and evicted pages is off.\n"); + ret = false; + } + } + } + + if (test_fsync) { + if (fsync(fd)) { + ksft_print_msg("fsync fails.\n"); + ret = false; + } else { + syscall_ret = syscall(cachestat_nr, fd, filesize, 0, &cs, 0); + + ksft_print_msg("Cachestat call (after fsync) returned %ld\n", + syscall_ret); + + if (!syscall_ret) { + print_cachestat(&cs); + + if (cs.nr_dirty) { + ret = false; + ksft_print_msg( + "Number of dirty should be zero after fsync.\n"); + } + } else { + ksft_print_msg("Cachestat (after fsync) returned non-zero.\n"); + ret = false; + goto out1; + } + } + } + +out1: + close(fd); + + if (create) + remove(filename); +out: + return ret; +} + +bool test_cachestat_shmem(void) +{ + size_t PS = sysconf(_SC_PAGESIZE); + size_t filesize = PS * 512 * 2; /* 2 2MB huge pages */ + int syscall_ret; + off_t off = PS; + size_t compute_len = PS * 512; + char *filename = "tmpshmcstat"; + struct cachestat cs; + bool ret = true; + unsigned long num_pages = compute_len / PS; + int fd = shm_open(filename, O_CREAT | O_RDWR, 0600); + + if (fd < 0) { + ksft_print_msg("Unable to create shmem file.\n"); + ret = false; + goto out; + } + + if (ftruncate(fd, filesize)) { + ksft_print_msg("Unable to trucate shmem file.\n"); + ret = false; + goto close_fd; + } + + if (!write_exactly(fd, filesize)) { + ksft_print_msg("Unable to write to shmem file.\n"); + ret = false; + goto close_fd; + } + + syscall_ret = syscall(cachestat_nr, fd, compute_len, off, &cs, 0); + + if (syscall_ret) { + ksft_print_msg("Cachestat returned non-zero.\n"); + ret = false; + goto close_fd; + } else { + print_cachestat(&cs); + if (cs.nr_cache + cs.nr_evicted != num_pages) { + ksft_print_msg( + "Total number of cached and evicted pages is off.\n"); + ret = false; + } + } + +close_fd: + shm_unlink(filename); +out: + return ret; +} + +int main(void) +{ + int ret = 0; + + for (int i = 0; i < 5; i++) { + const char *dev_filename = dev_files[i]; + + if (test_cachestat(dev_filename, false, false, false, + 4, O_RDONLY, 0400)) + ksft_test_result_pass("cachestat works with %s\n", dev_filename); + else { + ksft_test_result_fail("cachestat fails with %s\n", dev_filename); + ret = 1; + } + } + + if (test_cachestat("tmpfilecachestat", true, true, + true, 4, O_CREAT | O_RDWR, 0400 | 0600)) + ksft_test_result_pass("cachestat works with a normal file\n"); + else { + ksft_test_result_fail("cachestat fails with normal file\n"); + ret = 1; + } + + if (test_cachestat_shmem()) + ksft_test_result_pass("cachestat works with a shmem file\n"); + else { + ksft_test_result_fail("cachestat fails with a shmem file\n"); + ret = 1; + } + + return ret; +}