From patchwork Fri Dec 16 19:21:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13075337 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 9E67AC4167B for ; Fri, 16 Dec 2022 19:21:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B90E8E0005; Fri, 16 Dec 2022 14:21:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 341518E0001; Fri, 16 Dec 2022 14:21:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E3D58E0005; Fri, 16 Dec 2022 14:21:55 -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 0F2938E0001 for ; Fri, 16 Dec 2022 14:21:55 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CF0CB1A1214 for ; Fri, 16 Dec 2022 19:21:54 +0000 (UTC) X-FDA: 80249139348.13.896CF75 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf01.hostedemail.com (Postfix) with ESMTP id 3190940005 for ; Fri, 16 Dec 2022 19:21:52 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=puCmKh+r; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.54 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=1671218513; 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=npFjL6Dds3DKnQo07iUTlbqXMaucW9/yvERNl8ZNQRo=; b=Pvnk/vLTbFy/R8GqGM3ltG2RQwB1ZvvQeN2YibcBykLiNPOCBToEfVRx0K2MvmXJ4ytJe8 RUwWzfe9ij1nJBB8UVEAgJRfWPKVN3g3vNy6/m3jfgerTJYJP3btr7tRsJvbtV9YkF4rFv PPzUpGGK/+fVJ8CYR0HT9rPvx3mzxOE= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=puCmKh+r; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=nphamcs@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671218513; a=rsa-sha256; cv=none; b=B8Lg+Gyv2BO9+Dcn1+GEzrVEepgN/aoaSGrfYy4rkrE5uUATOaU1YkfRsi4x3088RFb7tu VOImdBfbzBxmWw8KLObCTCwlPuS0P30eaYyMiHmrN8NdLIO73tdqmpg/m8U8u3wtlWT34n iSgss+91iCaTJNUolQXaSODYLmFPmHA= Received: by mail-pj1-f54.google.com with SMTP id b13-20020a17090a5a0d00b0021906102d05so3324461pjd.5 for ; Fri, 16 Dec 2022 11:21:52 -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=npFjL6Dds3DKnQo07iUTlbqXMaucW9/yvERNl8ZNQRo=; b=puCmKh+rn1JVyyUrtJjttd3FuNpbSs+RvZ8ZxzxDamK/Cuevoa4qtVifp0nUVsS9lh 0su5AgtBOtGAeJcTOGyuWko0BwZQ7Hw6oQcDbbq9Y5NKHzQG9VITawrQHm9EI3qQUtXM AjUeShMh5cwQvSmrSrgxNusU8MJ0Ps5grqGE16Jv+htNHDWoIqXfzOF/h7F71mmC2Q1E NNvHAUFdO6YKiZApC81EFhAdwOFuqt2/XO3bAgLN5JBLh/DKhH01Xf0pI87uxLqwhDrf y630abcVgNDikwUEr0+Rj+UvB/s9o4pMrTtTDexj2Un1ME0s2kgTDdYZM42tUCJ8TC7f LBLg== 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=npFjL6Dds3DKnQo07iUTlbqXMaucW9/yvERNl8ZNQRo=; b=tIzNohKd3nz7C3ofhjzw6PCmnRcbGCV8zQqP2colqirXnkq7qv1m39BLYPTHCzDxTg dOZs6rmptCfREoTMg7KUxwJy4au1avWRPzmiN9WB5OrUPtai0aZYPnG+7bdVABY5U5CC 2U2A2dSKW/1xCFrvPL8w9cBWrfFfYYZIz1C6ieVfT+6jA/L5/JqHOBXeIOdiWGPHMV+R yae3gRwzCwYAldlJMmEfuVQa7eoy4E8+c9rBCPo1JkO+wItbDiIKtjmZPq+ly26ya9wJ F79niE9ZJjHQkBkAA8uh2Pjek2NTnh+KVg2PYQUCh5Q2M94EUA/ZqUpX+EKzewZJAeIR G55g== X-Gm-Message-State: ANoB5plxH8AnFVeaK5q0iWgYPbeua3VkVH0ftaQcIrII/CXxNs7N6HVH JNpX/8HXf+maVUnVgbcxOFE= X-Google-Smtp-Source: AA0mqf5iiz7kn+rL8ZNVOrzT6DCoAp/rEnkSuQcxifioDG25jx57bGRL2eOaG2gjKzao6LEbgDEnXw== X-Received: by 2002:a05:6a20:12cc:b0:9d:efbf:8151 with SMTP id v12-20020a056a2012cc00b0009defbf8151mr48168779pzg.26.1671218512074; Fri, 16 Dec 2022 11:21:52 -0800 (PST) Received: from localhost (fwdproxy-prn-011.fbsv.net. [2a03:2880:ff:b::face:b00c]) by smtp.gmail.com with ESMTPSA id q20-20020a631f54000000b00476c2180dbcsm1814843pgm.29.2022.12.16.11.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 11:21:51 -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, kernel-team@meta.com Subject: [PATCH v4 1/4] workingset: fix confusion around eviction vs refault container Date: Fri, 16 Dec 2022 11:21:46 -0800 Message-Id: <20221216192149.3902877-2-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216192149.3902877-1-nphamcs@gmail.com> References: <20221216192149.3902877-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 3190940005 X-Stat-Signature: utsnwd7p7no5qt9ckdege9it5mmcjipg X-HE-Tag: 1671218512-789701 X-HE-Meta: U2FsdGVkX1+i8mmYM9BN6RHoLIzfpQgyZ8JHmDW/MtTcPKcp56Z25bisaAdXIkHVYqKmV3x0mmuAjJ+8Hfh1TQepUt48lKoEDmAkmDq1FetiaEoZfq88y6v3lk9LNbEGbNjXRL8nD+WM5WgeUCn5+BV09kLKwJQgFax9d6bQvjat1w6du55Lg+h/yQN4hCrmkCMz1ei8BNhdkfDL10/Ay5GqHwWHBO2XuGCDr922ET6SWVc7cO0QaQfQk65R92FE01QF7JbyjB9+vAG9zV9ITNQorotfhunZ5FQ9GYpmkkDh8zSbH6u6rOO3YfXHY/7NrXeSFtOP8n6LfY3VOXMI/lC3O/xdUKdenku3ooe/NHEDIKizhaSYPSSBUvXwsS9oxUwaoFR1cGV93/fnJCK2xWeBb8c8WLx7ZIZpUqYYJP/h7zaerp2EVGdhoKBQq4yfAg8qXVQj59M0bIVxs+k5NP7mY6Bp9QkRo/W2ZxY58Mr90rwXBPBj7nYejzJqTaWazt7AxSK50lOUDbWVyp1c/lMMNWnr6BQrUivXPspb3m0tiDXsaqa0Ri9G1L5tl6F8CvXgqePj9AA143fh0S+lUZAm7taU3FjvUqzto6qYXv/Z0vV6P0WSl8PQXl3I9OF8rzDwDNdD9HInvIts1waU/5EB6pYoLGrQljYwtmCyU4mws295l1RTgm5phcO4mV7dBapgBjRNy8PZ+SVQCziGTAkUdCv0t3xFhIHIqErrNEgQ945umj+PaZibsb63tqp32hUGQ8/+QKRdRbScbedBKn0FrN/T+L3teJTKKJilioEmc5gBleZkB8DfwaYj2CzCxAu/tfC9Bfh1Uj+YlHt0r+n4bNgiaj/mmFVEgCNQGZy9havqhxFSoIS+foxEpp7R62OVOwrIG018F5ktQ5KSNZnZvsALvh2ymTYLdsGhUMMeW1fGSvcodzcRY9OBBDHuXuwE0AepTq/K8tOTYEb rlEWicyV rcUC3G5ILXr905iUIk/crEP14CefEW84JXNkxPhAraCIch0yRzT49JkMsukHVwTxWa43UEusfWrzhdnlIo6gREUnBfXtSySXLS9tvMqZuUXrC9FV/eV3wxISDkgFBlGltsUVk X-Bogosity: Ham, tests=bogofilter, spamicity=0.011115, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Johannes Weiner Refault decisions are made based on the lruvec where the page was evicted, as that determined its LRU order while it was alive. Stats and workingset aging must then occur on the lruvec of the new page, as that's the node and cgroup that experience the refault and that's the lruvec whose nonresident info ages out by a new resident page. Those lruvecs could be different when a page is shared between cgroups, or the refaulting page is allocated on a different node. There are currently two mix-ups: 1. When swap is available, the resident anon set must be considered when comparing the refault distance. The comparison is made against the right anon set, but the check for swap is not. When pages get evicted from a cgroup with swap, and refault in one without, this can incorrectly consider a hot refault as cold - and vice versa. Fix that by using the eviction cgroup for the swap check. 2. The stats and workingset age are updated against the wrong lruvec altogether: the right cgroup but the wrong NUMA node. When a page refaults on a different NUMA node, this will have confusing stats and distort the workingset age on a different lruvec - again possibly resulting in hot/cold misclassifications down the line. Fix the swap check and the refault pgdat to address both concerns. This was found during code review. It hasn't caused notable issues in production, suggesting that those refault-migrations are relatively rare in practice. Signed-off-by: Johannes Weiner Co-developed-by: Nhat Pham Signed-off-by: Nhat Pham --- mm/workingset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/workingset.c b/mm/workingset.c index ae7e984b23c6..79585d55c45d 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -457,6 +457,7 @@ void workingset_refault(struct folio *folio, void *shadow) */ 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); @@ -474,7 +475,7 @@ void workingset_refault(struct folio *folio, void *shadow) workingset_size += lruvec_page_state(eviction_lruvec, NR_INACTIVE_FILE); } - if (mem_cgroup_get_nr_swap_pages(memcg) > 0) { + if (mem_cgroup_get_nr_swap_pages(eviction_memcg) > 0) { workingset_size += lruvec_page_state(eviction_lruvec, NR_ACTIVE_ANON); if (file) { From patchwork Fri Dec 16 19:21:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13075338 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 DD415C4332F for ; Fri, 16 Dec 2022 19:21:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 788668E0006; Fri, 16 Dec 2022 14:21:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7393C8E0001; Fri, 16 Dec 2022 14:21:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B2438E0006; Fri, 16 Dec 2022 14:21:56 -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 4A9D08E0001 for ; Fri, 16 Dec 2022 14:21:56 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1B8721412D3 for ; Fri, 16 Dec 2022 19:21:56 +0000 (UTC) X-FDA: 80249139432.03.D1B0B2D Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf25.hostedemail.com (Postfix) with ESMTP id 5BF75A0003 for ; Fri, 16 Dec 2022 19:21:54 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bLCK2hqN; spf=pass (imf25.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.45 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=1671218514; 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=YRguhEw3CY77NjO4ltDj62CfZtUxun2rreMj0XQVN6o=; b=vv+thd7vIkF/6s5f+OnkQTnAW47GFJCu28QWCY4TZv1nAOXUsuEW5loyStYKsLsTpoQd7W Ds3dg7NGQenD86mzuKZghNJ8t8mXETg4nYUreNTnWMxFKRGCofaWKwbAAo0hUQiRyGDHt4 pR1zcTRo4CbbGsBx8mRIY095PCnrHFI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bLCK2hqN; spf=pass (imf25.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.45 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=1671218514; a=rsa-sha256; cv=none; b=B93nM5vd/Bul4cgiV5AOVj3xPgFbsi7P4w713jl7unp29WmrNt9AOM9ddhVvlwvmztyY5a 4MyMBxxcuZkMVgriHtNvQijY6Ltto6evWBHc7qORKwpTv7w3vcyBQeJG2ZdlMCqdQQYspV jLPLpPxxK4cmr9P1rBqAKW6lU9S6MJc= Received: by mail-pj1-f45.google.com with SMTP id v13-20020a17090a6b0d00b00219c3be9830so3328715pjj.4 for ; Fri, 16 Dec 2022 11:21:54 -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=YRguhEw3CY77NjO4ltDj62CfZtUxun2rreMj0XQVN6o=; b=bLCK2hqNYii/SsuUXicmahKFilm2y4LcmrGmBqCz6pUsilTWoASCwxc5AO4LkgY3GK BNDtUeOhpeK0OZJemExWg+NJLRLCmUtTrkCMfeba5o4kgT13f1nupOwKsbt0XPUqhYqI kkWz6T/+1q6oITzCcCVnfELipcygpGvxD+qEEhJMyjr+0b2zkF5e5UD6FCnTPriEQBkI z3OnhM/2gar1E8V7Z/DnlFlygglYKXpXsw9P7BciJ0kqjkCxtM7fCq937BfA/KhDKlCy qusCzpwm8/LQI382ikTfyrstyx14AtV+mjzebb+NL2RAzHM0fbstMWma32uyciV1qlTB PHQw== 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=YRguhEw3CY77NjO4ltDj62CfZtUxun2rreMj0XQVN6o=; b=yF3c3FIqbcN2g1ZcNL7fYdgNgDr3a1mgsfZMWcZwbvfxZG2HHGG4wyUn0azvXzF1t0 T917kwNtpKtLzU2D74LVkxsBTbmg1eow/AhpS5wHhxB/CyckfSiDuV5TOicf2QaNIter 4jRSW7Y6rFDaN+cTBvEWthKSON+CZQGh4cxO7hTfllkT8Iur73x5MOX4RqidNHzsZ3TA evaOswaSYkpwTqW5sedNo5erbTCbefU4tUQVky+drbbAxK0JGncasBJt3+We2oz/0h4P PgU+LDMnjBtE1RfOq8K3cwrmxKb9ZDXVYrr7BY0zpW8geNjzBQE2Zuc1tAapOK4jg6bq tqKA== X-Gm-Message-State: ANoB5plY7q/YjL3Lbf2LDRmCQkn0Arw98BBndVd7uUgzUWiMLXvBwjFF /Lxb/2dW0goR0NLCs8vUA80= X-Google-Smtp-Source: AA0mqf7XjbbHvBcGpWGYcKcB2pbEbhG53XHIzX/B65NQolULlkjq9BvuiIdLGc8YSdD0HDuycD39uA== X-Received: by 2002:a17:902:c213:b0:189:aa51:e27f with SMTP id 19-20020a170902c21300b00189aa51e27fmr43162444pll.44.1671218513304; Fri, 16 Dec 2022 11:21:53 -0800 (PST) Received: from localhost (fwdproxy-prn-120.fbsv.net. [2a03:2880:ff:78::face:b00c]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0018912c37c8fsm1982895plh.129.2022.12.16.11.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 11:21:52 -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, kernel-team@meta.com Subject: [PATCH v4 2/4] workingset: refactor LRU refault to expose refault recency check Date: Fri, 16 Dec 2022 11:21:47 -0800 Message-Id: <20221216192149.3902877-3-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216192149.3902877-1-nphamcs@gmail.com> References: <20221216192149.3902877-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5BF75A0003 X-Rspam-User: X-Stat-Signature: qxkyyfbt4gxca5hg37qbycayhe7kipep X-HE-Tag: 1671218514-782087 X-HE-Meta: U2FsdGVkX19IFkoMwmYMYpOefanUVjsz8YhLGr5Hod07x+olFnYDgkGcGEefq+fAtVaxPm+JDJj7CRWwsPII3ARHvqJSV+DhBKu09OtIhHLQVfItqI6VMclm2XmjjncY76CY8qs5JHL0e2xZCVi+efUMHlNRPTDO0hscTcSxQIJjuvyKs+ZUq8F0V65YP5ezFJL8SKEQ7RQEr0ZF0XWA2bzfQfoQ3AYZb/OiJbYQWQalx0mZJzPuXGFJ+IyDmXyuwTEjnDPwRFrZv1LRQh82yRb4EkzyNvdKdX88tfr011miSLJue/znylhevX6FAgtQ07UNE0RZ0BDU+l03Dg4Xg0TN6fVp0m1xssQlU8Qsjy9CYm05akH4fw4y8UtqL1CDxCq+TykBZCsDoTlvr4o6HJGhLlAxwDtMCm0FBY4KEYa6MBDB+WmpoXJxqLfQRye3nK1XJUqBesVKf/FWHSglBV2gs1drWxf8KCE6oIfE2tRqmQKE8NGKLh3+LNKB19GVwL0WOpTIIZ7gt/hjG43rXggl9DAMw/HbVJtzw78YaPRd9RniqRHpGzTTMvxGh9j/bUTPTCDQ8nKJ7Zd5FJ9c2fUUS2IhLi/BtgQO9mQSbCdkqUqTkujLVuMFS/j9YP5MrHJHTJUu1owncQWqV8hQl1ixjFOcVquUoIkGaFV0rXwrbZ2F/42mzz+yjJSbyKLmVqD5pgITotDBhWBfNrCmoR+ZrkjjqaRaY1EjPxUwNGSq4f/krZ10vgP4BSRBR0y+JVTMK4pan2VHvgvryY/XEooGJeMlmOyfKpAXU2YSNYgZBNeTxep9wHoAW5bRYPEuGaCS/VGuz1Pby685yu2lmzzR/Zc3fh075wqUfSj2HN+KW2AiLVXCt6zBH579O1B8zooSH1JNSLp5i4cHWkuOtr15CZxkjIs6wmJwVJYELxUTksi/Q8dRfe/vL6gCCTNXOmfTMHdGaVuzsQgZLS8 /9by15By fmwN4Vpu80oTDYcErepjYp3VVsHh0Oe92t6q9l1/FBvmX0NTfVxfeVnH46CFxK4DX8LnTVgEAcMIDJkWvefcG3DO6P3u/9U49sGCbKyrFyhacfcuLrcIaUSNEZXauN3yCha6y X-Bogosity: Ham, tests=bogofilter, spamicity=0.000021, 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 | 129 ++++++++++++++++++++++++++++++------------- 2 files changed, 92 insertions(+), 38 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..006482c4e0bd 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -244,6 +244,33 @@ 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, bool *workingset) +{ + struct mem_cgroup *eviction_memcg; + struct lruvec *lruvec; + struct lru_gen_struct *lrugen; + unsigned long min_seq; + + int memcgid; + struct pglist_data *pgdat; + unsigned long token; + + 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; @@ -306,6 +333,11 @@ static void *lru_gen_eviction(struct folio *folio) return NULL; } +static bool lru_gen_test_recent(void *shadow, bool file, bool *workingset) +{ + return true; +} + static void lru_gen_refault(struct folio *folio, void *shadow) { } @@ -373,40 +405,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, 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 +448,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 +471,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,8 +492,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(); + + nr = folio_nr_pages(folio); + memcg = folio_memcg(folio); + pgdat = folio_pgdat(folio); + lruvec = mem_cgroup_lruvec(memcg, pgdat); + + if (!workingset_test_recent(shadow, file, &workingset)) { + /* + * 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. + */ goto out; + } folio_set_active(folio); workingset_age_nonresident(lruvec, nr); @@ -498,6 +550,7 @@ void workingset_refault(struct folio *folio, void *shadow) mod_lruvec_state(lruvec, WORKINGSET_RESTORE_BASE + file, nr); } out: + mod_lruvec_state(lruvec, WORKINGSET_REFAULT_BASE + file, nr); rcu_read_unlock(); } From patchwork Fri Dec 16 19:21:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13075339 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 8DB3AC4167B for ; Fri, 16 Dec 2022 19:21:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2CD6E8E0007; Fri, 16 Dec 2022 14:21:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A63C8E0001; Fri, 16 Dec 2022 14:21:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00D318E0007; Fri, 16 Dec 2022 14:21:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E3BA98E0001 for ; Fri, 16 Dec 2022 14:21:57 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AC2C9A1233 for ; Fri, 16 Dec 2022 19:21:57 +0000 (UTC) X-FDA: 80249139474.21.1D3E122 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf29.hostedemail.com (Postfix) with ESMTP id D9E53120006 for ; Fri, 16 Dec 2022 19:21:55 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XyvoQwzM; spf=pass (imf29.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.43 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=1671218516; a=rsa-sha256; cv=none; b=z742+czWik8Qe3AhNEqgRVlyx5TFE5SH2siU7sT/EcmzVYjbGtBvWQsynwhK/5b1Me7233 JZlB1ULaIza4KtJhg1dJHjenJILgkq95is7Iaecghdz4xLP9L/oqjZo/xYsj9rV1+AsVH1 JqVpYrvINm6F3p9daaBN7wyzRkMEfk0= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XyvoQwzM; spf=pass (imf29.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.43 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=1671218516; 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=mcfj7//KZGx3L4vs1asXbZHiEbvSE2W37vabxM0hoJ8=; b=stUgltcBayVK1NUNSIwDOBkIpBbIVbjendcRv5W5agkDDZSH8Z6S1yYzXZFQRRzMZE9tAM CQbV3CEB/V/rDKlQjUK7SyE6sWdy1/DSJPtyUVZNlCTKodk7fmsiXd+zazwiwAT8Bp2eRV bW9sSKl+fqCSIbLrxKWNqbawkKSZWMA= Received: by mail-pj1-f43.google.com with SMTP id z8-20020a17090abd8800b00219ed30ce47so7066589pjr.3 for ; Fri, 16 Dec 2022 11:21:55 -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=mcfj7//KZGx3L4vs1asXbZHiEbvSE2W37vabxM0hoJ8=; b=XyvoQwzMgd30oKLXbNCSHtBaFKuZiO62uBdvtZ0V+ri6ypZX1wYUEYC6CfR9jnAIUZ oXovRbwVtPxgB8xGuhGfdOAADmxaUqygXmHamXKxCPOW7eJGEjBIOevihiXmmdOUuJyS SgBWKEpogOMb60EJL+GTwP/hvCjtOhvPAz2zhaG85oCoYeHRVFzrS80EM1bztbhLchFv P/XiJqCIg7w3Rlhu8FFDAxviL1e5ahSEpx7hnFilhVJCF0KDDYz1TzJV0glGWt7CDykz uSSwLQYRrFFBnKL4sTFD6V/4jx2878YW6rR4B+iHRm431MXqy3QZIxSiDTMMv3qrp7QO /ehA== 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=mcfj7//KZGx3L4vs1asXbZHiEbvSE2W37vabxM0hoJ8=; b=JIfiNHZGtW85gmGZmBnuHUa0ygQ0kcDaAMtUY11sdrlAQ4liMfw3eIW0spqhLylVOn P1eEVovvYVLJ2vk3HmmO5DDWxN/nFTvIRe3tbctcwHdQprPN9tYWzs/YE8yGJsbDEe9U sDSLA8iJecpQ3Mn4+94/M4FxFl091V+DfP8c4tV+sH3tfcjjxe7hFPoWzgZsec47nYnd Nsk9yVm07Nz6T2G/watIW0PXXchIQ62PKI770PUnZJwST9I58M8mNqzw9aMzvaZuRCwk qwmNRe+brAlpGZTfc++W3+su1GWc4f4GdBRBN1vp5kGB8an12HqHhxrKT6IoTWS2izGx kL3A== X-Gm-Message-State: ANoB5pnA6sWMghFTp+10a31e7kSYwrABv97mN0wBwix6dgB/cJuVkDr6 U2WgbaIQW8jyQNhgHQ0f4bDc8Rr+Jc4= X-Google-Smtp-Source: AA0mqf4bcRH4p+Q+rVHAlrlNkaHfUfl6OGuj5i02Ow7BCv6Ht00/D1exiyR13xkrkMCQSdy3+eT0/g== X-Received: by 2002:a17:902:8548:b0:18c:fd25:a934 with SMTP id d8-20020a170902854800b0018cfd25a934mr30262434plo.61.1671218514611; Fri, 16 Dec 2022 11:21:54 -0800 (PST) Received: from localhost (fwdproxy-prn-118.fbsv.net. [2a03:2880:ff:76::face:b00c]) by smtp.gmail.com with ESMTPSA id ja5-20020a170902efc500b001873aa85e1fsm1953676plb.305.2022.12.16.11.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 11:21:54 -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, kernel-team@meta.com Subject: [PATCH v4 3/4] cachestat: implement cachestat syscall Date: Fri, 16 Dec 2022 11:21:48 -0800 Message-Id: <20221216192149.3902877-4-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216192149.3902877-1-nphamcs@gmail.com> References: <20221216192149.3902877-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: D9E53120006 X-Rspamd-Server: rspam01 X-Stat-Signature: d8tif3fys9ki11kgmt6hpwg878bt5xqq X-HE-Tag: 1671218515-29732 X-HE-Meta: U2FsdGVkX1+gstb9KE6GJ2LOprdB7MlvhvdvtRFEVVpcSXFfrBFidgY2HUJr3vN2BBrmL6w0nRUnkEBuhLt1IXwpMFolxiVuHzOtcdR/4tTJ5eE9FtsUKu5pQ/U7SCbgaSi71EyO1DdrW/OcfDDjsf0Ji2NuoAC+klYL/pcHD/eDQ+OPcFrX00dvItxsuAtDWTl1FkqIq2VqLMsmdVhDIUcnsYmkjb+AQvve1bgaGvyl3/ETDshsGU6Nnssi1twnPg8U40i+kSPOFI58xmKeU4s7uXe2xkaKydob0da3+yqd1pE8A1F82LX7F9mnyNh3MaYRDSARTfiLMVHtCSEW73fdpwtrgzpBn4U/g4VW7/wX4C59MGuHq6NFSlCLEtFpSsRiWSh+npS5cua0UXNrxOnrs1xC7XxlBMhrpc/d8sUTuBoHDyDQp5QeXGzewS+bnGcjm+JK6T+CSCCwRvd8fRxfEhoDwHa2S5SEDJecPFQCEaki9qeTCJGjghAk5nGn64HpYto8qBm5fS8ZGKu4kqhA9Q2Z+lO7rskdLKpkROYApIY8goeaVEkDtb9bbQkyfY2FXqUj2C2KlF5VXSXh69DMSxrLNGD2jQp7M3916ZaCvhfy8lJP/fKu0rdMcJ7avVfIVXyUn3OEEzK/0UJ5fMe5ylg6Wlcfw7VHxWG5aDoMIHretUIn3NYh7mtd9bClVcQNngpOQhA+GAoAlEi6VU1foZ9QE9xiV/0KUGNLg1okwRlrfk4+aMXydchMxY0B6/1k0p5XlP3E/2A2RTISKUqo4dhtqa4i2cqh46SAPHgKUYDydyNS6XG2kqS54uYbPSRNOhmE2nLwNXqPLcnkzNEqjAbfpnghhAlz84xdp0BN+a6Ne/CmJMaMgfLmAsiQ36QuiUNOssW1U1sHO9IJtptzPmT5Vk/joeyQmYXnAD48sfRd4L3NF7jFEeI73yd7XENEiLI9wGsuGvVAY3h r1cW7vCe BSTVyaccTUAMtR7fWk3EMNFbLtDf7SSoHhgPS8skHVpbqkh8ss4EnwxJ1niUE2ZLAOLnnUmXOO4gr5vwO6lDvsbd4NW7rm1bxkvKkjgkK1BlaAm/QBMlFChXyXWxQG1F29gum 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: Implement 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 status 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, size_t cstat_size, 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 (recently) evicted pages, in the bytes range given by `off` and `len`. 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_size` allows users to obtain partial results. The syscall will copy the first `csstat_size` bytes to the specified userspace memory. `cstat_size` must be a non-negative value that is no larger than the current size of the cachestat struct. 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_size` 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 | 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 | 137 ++++++++++++++++++++ 20 files changed, 180 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..8902799121c9 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -46,6 +46,7 @@ #include #include +#include struct backing_dev_info; struct bdi_writeback; @@ -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..50f8c6999d99 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, off_t off, size_t len, + size_t cstat_size, 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..ecc4f781dd6c 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1798,6 +1798,16 @@ config RSEQ If unsure, say Y. +config CACHESTAT + 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..29ffb906caa4 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,136 @@ bool filemap_release_folio(struct folio *folio, gfp_t gfp) return try_to_free_buffers(folio); } EXPORT_SYMBOL(filemap_release_folio); + +#ifdef CONFIG_CACHESTAT +/** + * 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; + + continue; + } + + /* 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; + } + rcu_read_unlock(); +} +EXPORT_SYMBOL(filemap_cachestat); + +/* + * The cachestat(5) system call. + * + * cachestat() returns the page cache statistics of a file in the + * bytes specified by `off` and `len`: number of cached pages, + * number of dirty pages, number of pages marked for writeback, + * number of (recently) evicted pages. + * + * `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_size` allows users to obtain partial results. The syscall + * will copy the first `csstat_size` bytes to the specified userspace + * memory. It also makes the cachestat struct extensible - new fields + * can be added in the future without breaking existing usage. + * `cstat_size` must be a non-negative value that is no larger than + * the current size of the cachestat struct. + * + * 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, + size_t, cstat_size, 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 (off < 0 || cstat_size > sizeof(struct cachestat) || flags != 0) + return -EINVAL; + + if (!f.file) + return -EBADF; + + 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, cstat_size)) + return -EFAULT; + + return 0; +} +#endif /* CONFIG_CACHESTAT */ From patchwork Fri Dec 16 19:21:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13075340 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 D87DEC4332F for ; Fri, 16 Dec 2022 19:21:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 650238E0008; Fri, 16 Dec 2022 14:21:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5DCBE8E0001; Fri, 16 Dec 2022 14:21:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4089F8E0008; Fri, 16 Dec 2022 14:21:59 -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 2EC318E0001 for ; Fri, 16 Dec 2022 14:21:59 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 07D87C0528 for ; Fri, 16 Dec 2022 19:21:59 +0000 (UTC) X-FDA: 80249139558.10.9652C37 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf14.hostedemail.com (Postfix) with ESMTP id 40F36100007 for ; Fri, 16 Dec 2022 19:21:56 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=IlNGRJD0; spf=pass (imf14.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.44 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=1671218517; 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=FG5G46Dbq/DHdzwesOF9acAVNcEs0Ihso0tlt5RXEDY=; b=mNuBpQW3e2RNmGPx05imHtwRJCDQ4EnmJC/1xvRJL9Pls97wSqucVPWkfqmVEFgbSrpd/P KLrub51C438XYFoz37bvqtEZeuPTitRPwUr1JmoKT87Gt0iY6AMk4yuXLLswPHtZH/VrDh 9JVah9lclEe8c4iK0mRhG1rWbesj6GM= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=IlNGRJD0; spf=pass (imf14.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.44 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=1671218517; a=rsa-sha256; cv=none; b=Sog13Pt+nkLaGwgdqgP5WLcA/mO1QSm9vAZ+uUcQpw3kcyeS8mJMwgzTabLz21GCEJKKrB 0ZSIEvuiQhhwFQvEJVLoeM6lrMzLeVEtjZrh+IAcJ6+Fubtd8QjwUUUC0RqfeGENLahJto cafi3ppFVEBDkma142VDyay/CsESTAA= Received: by mail-pj1-f44.google.com with SMTP id t17so3432814pjo.3 for ; Fri, 16 Dec 2022 11:21:56 -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=FG5G46Dbq/DHdzwesOF9acAVNcEs0Ihso0tlt5RXEDY=; b=IlNGRJD0CfpCZopuQj0zx3wiL9mEdOdjBgo8LYmiixyfVsvodQD3G17SCag7559LB/ wzsGFpoucql6ygf+0dXVQvr4S8m0LrRE1He51KvpOFCyaTJipOl8YmPoMmU2lCAJ11YC jNY1pyk8F81zcvT7PUaYRgg/1U6I3fDJiR0RYLB2PY/9No/UcfscBQOQQ4llZF5O6GQk 0Rw+dZiCRftK/N0/ohUnhgXUXhghWrUXG1wcgUO5rzYZHt9AldvmZ/IW0RRc6TBJOpbj zNh0fixBQEjyA8NqUYtZR7Q30Ed5zuevo9RA/KCNl12jKSBjd9dcl0UeQIs4ojstqXq5 69Mw== 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=FG5G46Dbq/DHdzwesOF9acAVNcEs0Ihso0tlt5RXEDY=; b=uP5G6uNH9P7kJJCY3Yoj76uPYm9XI+FTfqFNKA++7zEkUnoJou0yhBIJ8BnuTjimBT Aue1p3sD5mwqzexdriHW0iOKfCYK//1iVZsz+ZyrEtloMkKIMjR5CgHLm3JzjB3ab8M+ J2jdGvaNp4t0j+I0JVtP5dOJIMHCG1RGfNNTVqf3VXijQGGB+DnhhMg9UnENbyNIxcNH fkztBKfuUtxUXgh8MnaCxS7YBS+jZqjpOOYD24ZyqJGFiPZMFKUBnTC7TKarw4mQ3u0s VQuhXnMCAK9mAptWRTIdVblsckhWW9Rd4k6ZKZGAP6S8Nx57Q/BLqGDNFLKPkU3t57bZ 4EhA== X-Gm-Message-State: ANoB5plSxJhEAOEek3HjTCTRX6Ui+FlmFRxTKA8VQAf5HeRQFyqL5RMU rIvhgp6HdBoigtKtHEMkWgY= X-Google-Smtp-Source: AA0mqf5FoztQexQfQdSJIWGJK9aDJEbyVQ/FROsDqdU0nFxl3K8eMaanyqse1wFokhcNfP6FZsw0Bw== X-Received: by 2002:a17:902:b20c:b0:189:3308:9a2b with SMTP id t12-20020a170902b20c00b0018933089a2bmr31666146plr.7.1671218516079; Fri, 16 Dec 2022 11:21:56 -0800 (PST) Received: from localhost (fwdproxy-prn-001.fbsv.net. [2a03:2880:ff:1::face:b00c]) by smtp.gmail.com with ESMTPSA id q13-20020a170902f34d00b0017a032d7ae4sm1986580ple.104.2022.12.16.11.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 11:21:55 -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, kernel-team@meta.com Subject: [PATCH v4 4/4] selftests: Add selftests for cachestat Date: Fri, 16 Dec 2022 11:21:49 -0800 Message-Id: <20221216192149.3902877-5-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216192149.3902877-1-nphamcs@gmail.com> References: <20221216192149.3902877-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 40F36100007 X-Rspam-User: X-Stat-Signature: ksa3hh5kxogjnfegxi4p4ny67oq1ej65 X-HE-Tag: 1671218516-348549 X-HE-Meta: U2FsdGVkX1/5ZInDAYuKiuWTcwl6lUo7dWKU3GMB5I0jrBr73+UPeiGrqjks5cvJvrQ5XA7GmxvbqVmCUU9qoWbO1o2VNW9U/+VTIMUENq4HWZZ23BSQ2Qz0pkvnWIg7HjnwYmotEn/tIkF2DMCLfsG226AfJsWQH7pX1yDMnrlRS4QU9x7z81mTQjh+Z4B05+MsyOppB2DyvNVkFmwhTJVN0gThQQSUy6gwNw87EO/t2fhfVDr6/M+jsPK/tzDavl4eoMHfn65NYrTPMb/BWd2xV+OddnwJJCXI1EoDeyyGhTiM5Efi6KsLR/gAfRL8MG7kw/3hRjO1q/+M5zjHpSMp1layezWYDnNawAsHt+uNlO8UOCLDKlLIShfO/1nD1XssddRJ0DkViriGb2AVl8jJbOUoKkHXIgcqZSKbkM+DwS7lsmIVlZL0Nio/gY+of8MVUxsit2mbb5jXQUWgQfziTMjZR2DabNHRhwpwjcJAZm1Y4NOmREan764C5kr73axqo7ScGpb+fGXSffClePlFQun7vlg2V1Bs3xwrDZwKpaOWTgKfDVZTvMGCIEc9WRtxPtqzML28n5CP6Bwq7rirAkX5xIahPH4eOsy1UZHY2CnAqYEBP00ewo/gsE0kPHTs0+iC+2fSkXH9gB4NQlRalV22RtrngiEqZOE/H0+cOJ7YeyNL02mTLXgbEWHVh2dqqeepDLDyy28Yxj1xwVMYg+YFDCCNvpAjzHZGhp+86siLw69JdsU8zrCE74Z1xz1mj1dgTQadOzpA+3S4Pu7uxGFWA7IepWBEa8seaSknu1/sKawxYx7KwoR+KS64Om0UqhFibwKMbL1RTRSDfBySuLCUzdo45WcfP6tLjqBOkU8hPdBdyRqF3pCrxVIpgB+hnIAabqmfUypeISADKtVF4iTmf2/MCBoxuqzAnIjFF/814tYIwbicaNyXgN/SzoRfxuYdBuwWZ4S9S82 vUj/X1AF ye6uLHraHQttHIy3Xu8/pZJAfiT2CxM3EH4u5ZC2Rwd+tjQ5XZDktX80H95rkAgYAwJ+0B3Xb8U+66I5tWAO8IPNL3e1QQxK/peRmYrpzADNWvqC9z/GDUU0QrGKHZt52ozuU 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 | 259 ++++++++++++++++++ 5 files changed, 277 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..3f5cd5695c51 --- /dev/null +++ b/tools/testing/selftests/cachestat/test_cachestat.c @@ -0,0 +1,259 @@ +// 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, 0, filesize, + sizeof(struct cachestat), &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, + sizeof(struct cachestat), &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, + sizeof(struct cachestat), &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; +}