From patchwork Tue Jan 24 02:11: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: 13113305 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67F0EC54EB4 for ; Tue, 24 Jan 2023 02:11:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3AD06B0074; Mon, 23 Jan 2023 21:11:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EC2696B0075; Mon, 23 Jan 2023 21:11:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC7B46B0078; Mon, 23 Jan 2023 21:11:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A74C36B0074 for ; Mon, 23 Jan 2023 21:11:23 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 755F91A03D3 for ; Tue, 24 Jan 2023 02:11:23 +0000 (UTC) X-FDA: 80388065646.25.40F2276 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf13.hostedemail.com (Postfix) with ESMTP id A46392000D for ; Tue, 24 Jan 2023 02:11:21 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=I2ybDYgQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674526281; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cRcWpKR8j+Ur7LPi1tUnqjlAf0HkEcdLuumL6I9JC7o=; b=ehCjGtGG0VjljM86gLHJ9hFubtX2jqYOcl0JKCbNZZAFSAs/KFVczhOrUAEb5Edvj2Chow sB7eouyLHQwAUndeQJT2Tvhchh3u+A18puVSQoeVrQElI1NldZrFOuy6cqVbwvbFQGf1pm 5O7OP6kEREFbkDLPjTWJL+sIYQ7elfQ= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=I2ybDYgQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674526281; a=rsa-sha256; cv=none; b=Ar8fANg/LuFWfk/Cr6W8tdY96k0/1FGl4UAXHH6tMu03/pHib1vbNWMrzcxQbMHNEKmfqx IMX1TRGDFU5pdJxmIEyeIK+fp62c9smyO4gcCCukIgD95fW1yOktrVN1HCZNzsPymfDUa/ CbHfjLwA5UxJ1AeLkWzEkXsA0WiO/7c= Received: by mail-pl1-f169.google.com with SMTP id jl3so13339938plb.8 for ; Mon, 23 Jan 2023 18:11:21 -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=cRcWpKR8j+Ur7LPi1tUnqjlAf0HkEcdLuumL6I9JC7o=; b=I2ybDYgQDja4idScpPWc9//gSPFmJsAY2maNHzanJ6eznD3iqfVg1VF06dyNDCorqW rGSYaEdeCCxMn+KvWOTWHVqKSdpyhDlM+i19X77qZMx6oo9YEk+jlQeapJ2YOmYgV3NS nUnHF/bvPHK4C4BCeQM5EINi3NBER8BP6ifA7NpvCWAknTPr9fXR2UAGbIjyUTZdCdTs pPIrUtiFutaLCBj/isOcA5BUwrbGNzVv2yKsKHMRdajVN4i4sLNhHgfzv4LgvJXLzw/q re+dbBTwLzNe8RnItPN3HYax1sp2EvKk8UgR6w1snBjXFuhC35jtXsPkc4ejwxL//SFQ MZwg== 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=cRcWpKR8j+Ur7LPi1tUnqjlAf0HkEcdLuumL6I9JC7o=; b=29IyHQOOxKkW+Cv5sRWn4WXjkphGCopekxDVKpJ7DT3cKB12ZmlPkCYrlsf/xIjqVj LqR/XvsfWwJoa8vREgBf6ssdAvVHbcGU+5VV7Ga7NXSJVp+cFc2Cm+9ypMZqWJ2/4Wxg HzvDFx4fjmWjq7wHLCQxjDZDTLiwohgk0WoDq5rfLqWsJNtiaNEidRfoRMJ47hDK6E39 nV45mwuBy7GJ8PrGaFa3hP3DrKDdK/UlcyN2bxnzgI1dhoH3pf1rjpeCTvV0+KzPOBh/ t940JsAh8nnUyqvqc1l7MUC0S+GUQOSj0naJ9loL4CKDxWLIGMRPh529GoPR6J6kQCfH LjIg== X-Gm-Message-State: AFqh2kqaNRwGn1UTfqyvZurSJLpGZkL6Bfic3vfXrwOAPZrmE7DAjjJ/ O85wtue89F3lY+wRB1fFFkE= X-Google-Smtp-Source: AMrXdXt/aCCUSGn4NbrAdFByJdNJtJPiPYrQi1+7PjBZ758At2+9kLZpMtfDAUaLIh+9snd1qzJ/Hw== X-Received: by 2002:a17:902:cf4b:b0:189:76ef:e112 with SMTP id e11-20020a170902cf4b00b0018976efe112mr30322497plg.41.1674526280522; Mon, 23 Jan 2023 18:11:20 -0800 (PST) Received: from localhost (fwdproxy-prn-003.fbsv.net. [2a03:2880:ff:3::face:b00c]) by smtp.gmail.com with ESMTPSA id b6-20020a6567c6000000b0047899d0d62csm218144pgs.52.2023.01.23.18.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 18:11:20 -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, linux-api@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v7 1/3] workingset: refactor LRU refault to expose refault recency check Date: Mon, 23 Jan 2023 18:11:16 -0800 Message-Id: <20230124021118.154078-2-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230124021118.154078-1-nphamcs@gmail.com> References: <20230124021118.154078-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: A46392000D X-Stat-Signature: urqgy5ubgqh4hxmaxtdk7cq4i5a3jgen X-HE-Tag: 1674526281-532027 X-HE-Meta: U2FsdGVkX19Y6K/AH3GKs1Vt1wlKzGoM8ZdNMjQTl96DG0La6Vk8avAHB85fH/2YTWkXWFE5YPAnplwC9vTt+ytCEqe8CUtcOVHA7SqgZpqhd1fdpGWj8aBqYDteermjZk7F7ByG8ST6k/Mlvsmta89I9YJniOOpH6SQnsJUoM6D1noVdLqSC6+j416WnBnJmndo7tlsvC1mCN8g0mGzmdzPDLSIlfN6FjmBO4caJsPAq6c/SJFHsp/JA7obu2FqUfJCeQRp7VuDLjV4qMzMkYRLKsumkNtTbCMlKkTXmvhAiKklgFA4OP8fPBf0qu7YXpsWz5ultJngfMUFi9+++8WB2ZOa9gc8CkjNCFrnF37g7FnH0y+WVz1WZzU4/QY/C6PuvUMXuaAufsD5UbCs6ssL9owh31qtrTFG0tt6ovmNzJp/7dW2UQvftiExjmr04mF9nX+YLt/OFw87KFjv3cwP/uiGZNfyKf8NbR/bfJlX8P8Pd9IfVsQQeWqP9ivJXwbbNQBnZfRtf7Wmf0WallX7et8Wj5Rt0pHsWzNeM4EevqRMqol1Jn+/om+ch3gD8+Ld0OTNRnxr5nuANA1/QqUOWsINvVs12zRMM2uu9dD+xrbH6BkUq7nqtETsvU+8vifvld6Z0tWixEe2uh2GC4+9LVVi4LkfGI78Worn8QFwSH/ekjo91w4cainqzxEyAqLEMbPBx8n/gDIHrQto8xSmn3/njf0FsKbOh45ksE8hc/6dgYsSw9ckqawuoAmzIdFcXp7RnfUtwURcN2JgJhC9DEV60B8VXX5kePPT1Ue5zPy3qaGkPYOIAK8Ql06+7ExcT9AZ70NfMkr2rtSJdrijpVsyr35LEFdD2+yPmo1IHQ6sSOQ/C0imL/6aBgiYqedsIRxdfpdKLcCS0hfEDLQpujFcYC0P5h7EVCK8OM5iPDWcdD3pRlZ5jZbKGJP8XmAP7d+0Cs4JytNGJII R0KSQarG 5h54HW3HiBp1BR4imTPBMQceFp7b+/VsDGt/bXLkhva45WQYc9NU0nF1LBuxCmxhTefddQOJSRUXU9T4cAik3Uw2gxtdUdmhp9k6Sb3SvyIgEhxOJMx4ZQ9YtlWMHGMuW9V7tQBdsX7SD2TPUDcxz1L/fxPFPpy0AlZl7EUybLJ5YQx/LXYlmRoYoaWOccnxOw3nZhOXTp1A7IlBNXq9w2nH8AB7C8udfU0CJlVJDknvubH66EjJCQ6S/PRei0rtTRfQanh6gZB6yfQYSIQtLlP99DvOgtqryRKu/nDAkMzaAMxMSvqrmVxTJzSCGB4RWlWWfbnWz9aVCN+zuJ7r65WjhyYNJjpF4l+bgs3Ba6JBb8b/fzNiHW+R7R477+SrH21g1s6/K/3hUvUWwlJtZQWj9Igs86kNU7LWXk8hZLu+hhTA/5slpB69Z6fJHDemxv5/b X-Bogosity: Ham, tests=bogofilter, spamicity=0.000034, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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(-) 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..2f2d94867366 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()) + 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 Tue Jan 24 02:11: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: 13113306 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEE1EC61D9D for ; Tue, 24 Jan 2023 02:11:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3C2C6B0075; Mon, 23 Jan 2023 21:11:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EC3B66B0078; Mon, 23 Jan 2023 21:11:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D143E6B007B; Mon, 23 Jan 2023 21:11:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BE0BB6B0075 for ; Mon, 23 Jan 2023 21:11:24 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 97A8C8018E for ; Tue, 24 Jan 2023 02:11:24 +0000 (UTC) X-FDA: 80388065688.14.61401BA Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf04.hostedemail.com (Postfix) with ESMTP id BA6B440012 for ; Tue, 24 Jan 2023 02:11:22 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=dj9fBSW0; spf=pass (imf04.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674526282; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lyKvDLCJcKSgVtBGtQednXBpIFCZCdbGl+v9cpdCXso=; b=ZFw2NdD1P0o8nOYDfPTou9qqaAgJGjFjXclfDJLqMItSdDx45Dg6Wi86SI74z62vwnccMR MiNEGd9K5gXwQRC8NPfBfdnrDoqz7nUO3/iVxmHj9g7CM0YVYepsPEKv2jmfPDNpRLwGpB Kqw2qKiNY4molfUmqCpHQhk08X9lfVQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=dj9fBSW0; spf=pass (imf04.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674526282; a=rsa-sha256; cv=none; b=afetxvfzKApsiYMhcv2EsEEgokg2vzO4W83Cp1hqLkbtt7Rj5TbYw68JBEcYMObPdY+uCd m4WCTxEfmk1FfHUrpStGg1xUUAQmRdmFevbkUH25kiXwad801c0U/elSK6LGyX8wTIWRba KkfvvvQr9Rhlaf3leRe+XAr59p2m1rQ= Received: by mail-pf1-f181.google.com with SMTP id z3so10278505pfb.2 for ; Mon, 23 Jan 2023 18:11:22 -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=lyKvDLCJcKSgVtBGtQednXBpIFCZCdbGl+v9cpdCXso=; b=dj9fBSW0EvpMRQo/QUHWxOoMwg/z3Ed7q5mm3fCpHs0r2L+r/w5TrMm1XnzeBWDWgy +5/7XPpTjXjYGZwurK3OaMsLoyv0QOwSGDBWE279QAaARdU2jlL99Z+rkh4VdMqUxRFP 7nBCdTlN6CKAY2bz5UXWivm8HOfdnqrxvKWqtL7T0CFvNAtujNpROohAR9VZ9CTbOFTn GJx2qdihizTC/fegceC7U76qRwcHX5RtTag5IghJET0XBIJiZIPnLlZXSECDT5+mHnHv JCujKGCYGiTubfzYjGoeoeJn5UMUdF6+pIYFhH+POBpTNhWrcZg3qhl+GlCQJVWFNyJv P77g== 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=lyKvDLCJcKSgVtBGtQednXBpIFCZCdbGl+v9cpdCXso=; b=ONh3CBRank3G+4RvLcrMAKqLqNuosecazFnyzN9nkQ8wGG8aQAry36HXaF2PsKeGQo RDMbpaGQtDmW7TfuNJyYA+REs/XX8Ya4bmkZanaNKQqS7eEXJa0BZRX0bPqpY/BHm6LF 2gCYbIpW1fLz1N+jgIPM2nxuO9Ipxx6kWpHcFfPSuFs4cB7hIKW8CF7CWxhSf6rwjYyC lA6brkzxAzPRk8tpL1uGiOoGecAIRGrQ6vc9tYrWSUQzQCMYLmTFBecy7m8S7hkhAwbb qDR0H5We11rjfeeOX/bykBaFNoBt1Wffqz2C+0yQ4qbzT8Exma2vrmWdvdguJz5ZdmGS 9Zcg== X-Gm-Message-State: AFqh2kqpzTpi7y+huKZVNGlH52Ijrfen8ijqDFr4BqtWFpPUcMg92F0y wlSfnDLR07oAAL5LIplK91U= X-Google-Smtp-Source: AMrXdXuJlS1DDm0aqYmdxk/bUjT4ezD5RqV1FF3fE8nsNyg5Dhw9HSYBlcAEt5Qh1H4tMlw72uF+gQ== X-Received: by 2002:a62:61c3:0:b0:581:2a6:f04c with SMTP id v186-20020a6261c3000000b0058102a6f04cmr48406969pfb.30.1674526281613; Mon, 23 Jan 2023 18:11:21 -0800 (PST) Received: from localhost (fwdproxy-prn-015.fbsv.net. [2a03:2880:ff:f::face:b00c]) by smtp.gmail.com with ESMTPSA id t18-20020a056a00139200b0058e17922ad0sm253225pfg.185.2023.01.23.18.11.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 18:11:21 -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, linux-api@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v7 2/3] cachestat: implement cachestat syscall Date: Mon, 23 Jan 2023 18:11:17 -0800 Message-Id: <20230124021118.154078-3-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230124021118.154078-1-nphamcs@gmail.com> References: <20230124021118.154078-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Stat-Signature: t6nxuwen4t4z1n8ggseg8tz4qgn787jh X-Rspam-User: X-Rspamd-Queue-Id: BA6B440012 X-Rspamd-Server: rspam06 X-HE-Tag: 1674526282-712284 X-HE-Meta: U2FsdGVkX188HSxhm00x7z0sb8PceWFb9oRprkFIpUj8gGXiWdyFCMutLAdR72EZ8WnJ8//Adh5szjpPQEbGghXduG0L+qHVBCeLJfIxNdWi34gArxgRbfcV6g8wluXLDpxXDamrZtgLqIAdvRsTraJVAITIM+hL6knvgYhKzmlYHT21rh8DmwyKk5oRn7Rx+rvdoENU24eerM8q1FsueXZnPox2x06UFxzj9AoyVWRU+J4zel6frkzqvTOTjbckP7BB4x6yj8ibTJSX6oGurcyVLavJbj7GL+BKBkHPBkP2iZD1BQrbIzsJHHczI7dZwc4ZZC5fr5DsK6Fr0EMKf5072aBR90VdShGgnMSJIZRBN1ifo6qLDLh+BEMpLpg3AJ8SlpTiuWT/+PG4pcW8BGN9/Il/Bs8YL3DX2HonUs+dpXTKblieQ/VJ6juXeZWsEZ3e/43rIayG+w3oqHZY3cTTLvj6e8czJs0Ug7lMKN5lpXMxIWkttKW9mFvRdlrh55kHZJkeUefR1ZaD7LeRWxFz+eCRvnv2fAiDREo5hAW5u5FRul1Cd6MlxE5JYhNxIXUCTP62Ei4g8hU1hlIuXzp//iG/R7oW7dkk6nh9iTWt5aOeQIo9OcJCpuJAixe9QJ2QnSDYHtPWmPpAohfZ44jZBG7oTIVY5JRNloyHuFOGx8eR4bbnhEFZIT7/YaXv5kU0z3/bk932dgMhG8yda3kncKio6p7P3CeqrNvJRbP3wVN9aWFQilH5AkyPNtjO8BGt+G6Mo+4mQFdi1tbsoY6j5t9Agtp10fQTHbWlcw+vjo8VNKssY6AotF6++NIG0FhE9ILDC+K4st/O/ZKRgxPmZDWmzSJLsCEv49+VZZJKB318uQL/b3yw+usGEihVW+E789JaCqaDrAYIbO6j/C5Qv2TDjL45aCUaaBun3zktXPQeiPDGQo+y3RS4hjoz33ZER9AjHKcj3GJeIpg sESnzsaC js4GsYrXvdSjYWYBit4st76BsYn/BsTpWyp+QbWQxyHWV/yj3pALJouPCMLO6jhLKwHZXnKJSepClbkrCSGMp+1xw6gNRTDWEJNL4sKj0zuGAM+kq3UmSpb98y7+xgsBhtxuGHHwfcmLyOBJKRIQeQFOutAQPTr1jEzGERWOan3J+L+9IYmmQVhJ/AcHSrF/3dtsnjVmVNDn/8fWmfB0uhIHc0xWFp7bH3galjoqqa93uARmA2l/kHiqvfY0d4hw8y+dja3CsMZB8DsUhb6K2qU2jvJ0sW2dvz8liOgcZPHj9XzZDGhqkAB9nsF4Y3Xiw1bF9d7df/ydtsts/O0mxT2MZbozPf4niGW71S4VP7kzAZ3x/jsvWKpUnwIRJCOoe+6x7OvqRoffvZqT+mvIts8RflgTxaraoFeJAs1Kl/doZWCglxCE4aKWiiUtkmp63FSoO 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: 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. 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, off_t off, size_t len, unsigned int cstat_version, 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. `cstat_version` is an unsigned integer indicating the specific version of the cachestat struct. It must be at least 1, and does not exceed the latest version number (which is currently 1). For now, user should just pass 1. 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 `cstat_version` or `flags` EBADF invalid file descriptor. Signed-off-by: Nhat Pham --- arch/alpha/kernel/syscalls/syscall.tbl | 1 + arch/arm/tools/syscall.tbl | 1 + arch/ia64/kernel/syscalls/syscall.tbl | 1 + arch/m68k/kernel/syscalls/syscall.tbl | 1 + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + arch/parisc/kernel/syscalls/syscall.tbl | 1 + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + arch/s390/kernel/syscalls/syscall.tbl | 1 + arch/sh/kernel/syscalls/syscall.tbl | 1 + arch/sparc/kernel/syscalls/syscall.tbl | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + include/linux/fs.h | 3 + include/linux/syscalls.h | 4 + include/uapi/asm-generic/unistd.h | 5 +- include/uapi/linux/mman.h | 9 ++ init/Kconfig | 10 ++ kernel/sys_ni.c | 1 + mm/filemap.c | 154 ++++++++++++++++++++ 20 files changed, 198 insertions(+), 1 deletion(-) diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl index 8ebacf37a8cf..1f13995d00d7 100644 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl @@ -490,3 +490,4 @@ 558 common process_mrelease sys_process_mrelease 559 common futex_waitv sys_futex_waitv 560 common set_mempolicy_home_node sys_ni_syscall +561 common cachestat sys_cachestat diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index ac964612d8b0..8ebed8a13874 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -464,3 +464,4 @@ 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 diff --git a/arch/ia64/kernel/syscalls/syscall.tbl b/arch/ia64/kernel/syscalls/syscall.tbl index 72c929d9902b..f8c74ffeeefb 100644 --- a/arch/ia64/kernel/syscalls/syscall.tbl +++ b/arch/ia64/kernel/syscalls/syscall.tbl @@ -371,3 +371,4 @@ 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 diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl index b1f3940bc298..4f504783371f 100644 --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl @@ -450,3 +450,4 @@ 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 diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl index 820145e47350..858d22bf275c 100644 --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl @@ -456,3 +456,4 @@ 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 diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl index 8a99c998da9b..7c84a72306d1 100644 --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl @@ -448,3 +448,4 @@ 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 diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl index 2bca64f96164..937460f0a8ec 100644 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl @@ -530,3 +530,4 @@ 448 common process_mrelease sys_process_mrelease 449 common futex_waitv sys_futex_waitv 450 nospu set_mempolicy_home_node sys_set_mempolicy_home_node +451 common cachestat sys_cachestat diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl index 799147658dee..7df0329d46cb 100644 --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl @@ -453,3 +453,4 @@ 448 common process_mrelease sys_process_mrelease sys_process_mrelease 449 common futex_waitv sys_futex_waitv sys_futex_waitv 450 common set_mempolicy_home_node sys_set_mempolicy_home_node sys_set_mempolicy_home_node +451 common cachestat sys_cachestat sys_cachestat diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl index 2de85c977f54..97377e8c5025 100644 --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl @@ -453,3 +453,4 @@ 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 diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl index 4398cc6fb68d..faa835f3c54a 100644 --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl @@ -496,3 +496,4 @@ 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 diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 320480a8db4f..bc0a3c941b35 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 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/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl index 52c94ab5c205..2b69c3c035b6 100644 --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl @@ -421,3 +421,4 @@ 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 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..d3fe6ba8eb38 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,9 @@ 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, off_t off, size_t len, + unsigned int cstat_version, 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..cd639fae9086 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 +__SYSCALL(__NR_cachestat, 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..0305eaf5b3f5 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -55,6 +56,13 @@ #include /* for try_to_free_buffers */ #include +#include + +#include "swap.h" + +#ifdef CONFIG_CACHESTAT_SYSCALL +#define LATEST_CACHESTAT_VERSION 1 +#endif /* * Shared mappings implemented 30.11.1994. It's not fully working yet, @@ -3949,3 +3957,149 @@ 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 +/* + * 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. + * + * `cstat_version` is an unsigned integer indicating the specific version + * of the cachestat struct. It must be at least 1, and does not exceed the + * latest version number (which is currently 1). For now, user should + * just pass 1. + * + * 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_DEFINE6(cachestat, unsigned int, fd, off_t, off, size_t, len, + unsigned int, cstat_version, 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 || cstat_version < 1 || + cstat_version > LATEST_CACHESTAT_VERSION) { + 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; +} +#endif /* CONFIG_CACHESTAT_SYSCALL */ From patchwork Tue Jan 24 02:11: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: 13113307 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9C06C05027 for ; Tue, 24 Jan 2023 02:11:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E521D6B0078; Mon, 23 Jan 2023 21:11:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DB0FB6B007B; Mon, 23 Jan 2023 21:11:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C05406B007D; Mon, 23 Jan 2023 21:11:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id A89416B0078 for ; Mon, 23 Jan 2023 21:11:25 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8EB60140490 for ; Tue, 24 Jan 2023 02:11:25 +0000 (UTC) X-FDA: 80388065730.10.CEC165E Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by imf26.hostedemail.com (Postfix) with ESMTP id B16E614000A for ; Tue, 24 Jan 2023 02:11:23 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=qolPgDzV; spf=pass (imf26.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674526283; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OaOZQvWhqFGfMeSz4AFcJuI7rpVT7E7rM49XqO7Em38=; b=O6SrAEheBq6GlguIDfyF+e5phprdSMza6YpqofEJ3DmMGGO6QSJMfRLTFk+vLrF2OE6HLZ TaXJSqa3Ulh4qEskfU9UKcAASnFX1Z9eeYuHiivTOhdQzXK6aOgQJuP0ML+kXo6n3Oxc42 +deKw8RD5J5aixQJYZU3k9dHuBGbrq8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=qolPgDzV; spf=pass (imf26.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674526283; a=rsa-sha256; cv=none; b=634jZEfdDLJHWjtQe1wGOcZ3BmKf+lBagNqwCjvOzzhCh4wDRXNGkSA57A8RQ9PCU1CdLp cTr49obsbPJxT4kIItpWi4wumdGq9rrp3eJIUtWzc8h5w3YBzisw8fbHgMvh6lcH5M9t3d bFJx2cCYS51z3dUm5D7j3a9QycQvh8U= Received: by mail-pg1-f176.google.com with SMTP id 78so10396866pgb.8 for ; Mon, 23 Jan 2023 18:11:23 -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=OaOZQvWhqFGfMeSz4AFcJuI7rpVT7E7rM49XqO7Em38=; b=qolPgDzV6WTMmEI6CTfee/XNnVeFwSycBdR6sxa3RDTKsFEDFbfMDpf1yuiHkUoB0W qCAwE42zut1UXqmTkksmHh7anIagLJcUdajFLA2QC2PYIw7xbyYuvxoK/6F+f/4wqGaI YKyROuufnspTUugUqFdGDlv806xubBy0D0UGkfDDKKg0GW4KLgCL4ahV8fQduxJQlJPu WTDFRZwSuWONdLpOdHCOiIa4oLlPgBmgXQSG87O7gLMHf0Rztwdlwj/s3xSZB9V2URG1 rQ82yD4/PYKQw/+d9rMXUMQQK5gCTvKbZhUZ9K4PVgk+VtNkM0VjEr/hMyLXaoDHdDNF tfjw== 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=OaOZQvWhqFGfMeSz4AFcJuI7rpVT7E7rM49XqO7Em38=; b=cHHHE2xnSl4p44tVjBVluqLCC796xuoW+Rykd2BzAd1ZN4K6BLNF9NMAjrDlpVwtLn k03bpnXXmQTgbAMHIX0t/CP9ManPgn53w0IEKVEFftDKZr3810ABkkduTMdMtZOyQulM fGHoZkuBR2knh8a//5xt7/9b0NRQ8+O+SVS4Dtt2bXKS77tMhlK/9bKPOO05x3+KwNbG QMWIXbhOyxO6bF5GNXtLxjGH28kMpKvSXddgZT5FKlyZitceUsYvMBssui8Tn+K65fOl PPRuRPf30+tczQTU2PIZkLrsoqjDnmdCYc0/3UT1u4Lq24PJtODkJm7mwtFOt04+W3TR rVxA== X-Gm-Message-State: AFqh2kpo+Z5Ke3Ctj/Ycy+46UdBGh0tdFx0yH+y/SDwT4TOOK2nd/67Q V0s1E0qPJ4b91PR9tjf43VE= X-Google-Smtp-Source: AMrXdXvmznlWSyCEdUPu/4HGztouGzRHNa2KB7pdYIy6UE4wCwA8w9Q4jMeoYnMU36XGxYsXHQbg+Q== X-Received: by 2002:a62:79d2:0:b0:582:b089:d9be with SMTP id u201-20020a6279d2000000b00582b089d9bemr27995513pfc.13.1674526282605; Mon, 23 Jan 2023 18:11:22 -0800 (PST) Received: from localhost (fwdproxy-prn-021.fbsv.net. [2a03:2880:ff:15::face:b00c]) by smtp.gmail.com with ESMTPSA id w1-20020aa78581000000b0058a666aea32sm276555pfn.147.2023.01.23.18.11.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 18:11:22 -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, linux-api@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v7 3/3] selftests: Add selftests for cachestat Date: Mon, 23 Jan 2023 18:11:18 -0800 Message-Id: <20230124021118.154078-4-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230124021118.154078-1-nphamcs@gmail.com> References: <20230124021118.154078-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: B16E614000A X-Stat-Signature: h66set1xgq9ubcab9xju355g1e8z536x X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1674526283-381983 X-HE-Meta: U2FsdGVkX1966QyogyfBzDyNMaRZHKO4XyECJD/1qCH89hhM039Ni08yyD6Z9Lasv2UBJCWnuFR1QnQgBcX7hjp9kLEvjCFSBOg0gPnLKF6rstr9cgdYoeZoB7RSwXUncNvl/3ssHNmXyF9ZTMTholjajYw/ftu0iFwsh9JxpckrQM4mrTMVB8UmHV8qmi9eX7yqI1XjpU+HYFFogfhAGR/e4XcQWFdeWBUmAavSQNPOe//caYdG42z6bpXCATLBeYMi8J0lpEPZ72VDkd9jqogrM8XHtXW0vo3AzoHjn5pX2LVDSsa36tROuMOFuwMuDhWQDhivFEqwhKnlv6iVf1FIMfgKlrLBppip+eATOc6h0u60s9en1clfCfPsWD0wgXvSDuZ7SMlQXMVawQ2GId1uMRiuWUx2s6Cw7rQRnMhTa/2x4YnYW8owVSBYhP5hI5GdO5cw1wWlhIORQiEvQDq9EDlXpirpenRjMqm4Vo5uJmunG7599oWx3jkij6FUUtQ3ZCJB02+wPyUcWbObsHR9PRCcnCdfYyjpKA7SL40iUcCG8839nV/ZvfLkOvirqrpe0KatQHEi1S7ZQNzJRVRseCNGCiP7wOchArTtnCjjpx6XwVINzv5W6aza/A9ZdxFTq+Obos/Sy9ZQJbdTZNhPpxTTrg1qKr9N0wMvcKCo+aApHQW5wtOnU1gHEX+yY2Lm24EwhYbWnp2bljPKCFLFmzNrQPZUiog7IgFL6/prAcA3D9jPcf2OkVv+5m6bmidTfhgJJ0zOWPsauMXHyjz5ojrPzZ2ckgWIhSEkKV7MgH2FvUaWl3CRWj71Gfq0d+1/Rvtomm/FKJAP53vaZoeGXGW+cKZd7lVZTXsJdixBEdxAxr3IXYtcxOgsm4ldvoDMFSL+IiwLqP8c4omVhs5K7foOhBU6TpWzWF5KBJYG8RJp/uRaHE5HWtk8442tMAgTyrY5TlfW7ZBrVdE 0WleBDEb 8ttQiUoFvKub7oqi/ThQNzFf6McXp7hWguFs0PY3dTiPRIIL7fDQGdEFVOg+ZQBb5h12APU02YFOPili70xyU2DngniuPWRaYEW9vOHECsv47rlKCLO8tIP0/QZD2XxwTjbrzMCUNiyUp1Ujg8DSiwbGTLEu6SKF1o0+CPVx3wI+sP2LC8onoII54mfHluPmz4UjNZf4nKqQ8h/xE3wpF0vS+YrVCwCBjCqpIWou2WV9cAZ3waLlH3IW4cYBu003EdEqQ/YItynqXRzaiDCV6mya5wl76aXu72ZCVbuRsS1bGtn1RzW5T0uGtyF/faZRP0cHDwK/J+rR8TqLetd72eTgJ7KrJVXgX5IsHH3whwiUhzgAZvwTikuQabLikGFJJyRb+c7ZEoim2v154BHuTWmjfOnjB+fsY0r9iqcd5e0oh5PM5xuqvF4FaEBhyVhkScAQCY2+bKSXBiP1Na83BKPSxzCfEoaTeC6BBs8+4hgL9FnhXqavEb84pxeq0A/u9me6Bg83W51WnQcP5iqJO++DH3HHd1Vht4t4cf5/lMkUW4W4JOtWlwzgO1zBzJmMuO7HaD+yGBa8C19ebhjvIUPbvn99xOvgO+NGWEjVjqTKHoYx/TGXmwzjorA== 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: 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 | 260 ++++++++++++++++++ 5 files changed, 278 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 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..dc2894028eee --- /dev/null +++ b/tools/testing/selftests/cachestat/test_cachestat.c @@ -0,0 +1,260 @@ +// 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; +static const int cstat_version = 1; /* first version */ + +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, 0, filesize, + cstat_version, &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, 0, filesize, + cstat_version, &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, off, compute_len, + cstat_version, &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; +}