From patchwork Fri Mar 31 07:08:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13195315 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 B41F7C77B62 for ; Fri, 31 Mar 2023 07:08:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE69A6B0074; Fri, 31 Mar 2023 03:08:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D97B56B0075; Fri, 31 Mar 2023 03:08:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5F406B0078; Fri, 31 Mar 2023 03:08:24 -0400 (EDT) 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 B60436B0074 for ; Fri, 31 Mar 2023 03:08:24 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8B24E160213 for ; Fri, 31 Mar 2023 07:08:24 +0000 (UTC) X-FDA: 80628314928.22.941D95A Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by imf13.hostedemail.com (Postfix) with ESMTP id D78BE20008 for ; Fri, 31 Mar 2023 07:08:22 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=YADI96jV; spf=pass (imf13.hostedemail.com: domain of 35YYmZAoKCLQsimlsUbgYXaiiafY.Wigfchor-ggepUWe.ila@flex--yosryahmed.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=35YYmZAoKCLQsimlsUbgYXaiiafY.Wigfchor-ggepUWe.ila@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680246502; 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-type:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=AxV13ttd0okhRK37057Bft4LTQPnmiMqtPZxYuE9zT4=; b=s+BBOFqUMBQrbRyA4v31hid9B/B9DIuH8urEP9MYPDyib1gjHRDX/u6jDaJuHhWAbAZmSn sdSew32+3W382ym67QWPK+Ak+AwlD281C8gpeFn/F3pGCrgm5C7PlM0ZhGKILnyH3sryz7 b5nxxaXxhjS/yOpMvLgctCVsTj2Zi3s= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=YADI96jV; spf=pass (imf13.hostedemail.com: domain of 35YYmZAoKCLQsimlsUbgYXaiiafY.Wigfchor-ggepUWe.ila@flex--yosryahmed.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=35YYmZAoKCLQsimlsUbgYXaiiafY.Wigfchor-ggepUWe.ila@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680246502; a=rsa-sha256; cv=none; b=BXD/phP2xgpsKrnMWZbHAhC5Wg7/QUmzTbA4frh/DeGGvS5Pwus6E9j1k7leVYKPgVZbLf kF7LLTBOYu2rlHLDaDKDORubmHdJh7jn8HLa8oLwRxaUPLLIBZLqoeGSONjqtPZF0segEa E7STjklXX+T+1KwbsvetRmrWp6IUT3g= Received: by mail-pg1-f201.google.com with SMTP id s9-20020a634509000000b004fc1c14c9daso6481599pga.23 for ; Fri, 31 Mar 2023 00:08:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680246501; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=AxV13ttd0okhRK37057Bft4LTQPnmiMqtPZxYuE9zT4=; b=YADI96jVgiYPZRSA/peAggJ1UQ51//UvA/NHqCLbFRbrvy6NrfGn7y68B7SqPbKkWr 0St+ZzCJthd+R7lYoheP1BORTpoCjw4zPzaECkLQxVQTHrMI8B9cjt7DcBGKSw82qoV7 govybumASYXhf60cCUp/IaMa0u8IjM5BtYMB7XLWRbZTN2AHMrwl7r6Pl36MpeIoLENE DQR8j5Vv14GXCDRTUsQx4sKmHq9BSMZeAYA1VDEA82FeD7/GDaQmT73P882/ebuiiwwv zKf3lK298QFggp7XoIt7VpvXlIweYbvefoc6upchYkznH6ammqvuCWagsQRerA20UDUV 19pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680246501; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=AxV13ttd0okhRK37057Bft4LTQPnmiMqtPZxYuE9zT4=; b=zl2nOBHSdqQbiPBG6B3AYQOf8MxUB8lcXtsB3IA/842rgZdNwBkZ72zEB8zvRFY01D gpcHkac0CDpXjHHxQvGh35+NfgDVzsyNsBy1c4nn1ZKL7kfhLBjJW9dM4d+94IbH9rl3 /PWWw6JkcQiv0lBgNzsc2m6Q0uo8fV442Z+TwPq9Zp5pHIepuGnQMrp5ozwMn0ymShhv 7goOHT0+9hwN109bSPUYkShV8VZgR65dCjCdH1WlSlc5w9NT1hJjn1MXeF3iQk1Fx4hX q3LVmQ0+5JEgxkjeNZ6c7m6kSXJl1YmVsd4xFoxDx6CwN2FxqhYW/FrZA/LoJopQF3+c 7cWg== X-Gm-Message-State: AAQBX9dSx8dWagFQH/rYmzmBC+X9JFO3HrFyKrvyoM+reAe/yjM18F00 6EE5POBLtoFK+UU5X5X6NknBwuRMlytZYpgl X-Google-Smtp-Source: AKy350b0knEaTNZ6EqlFZpPPUswwWCJeCMzE7r5/axoeUeK3BbwwP1Kc/GQBYQhutWHarYFOq+PIColFf89yH3jn X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a17:90a:68cb:b0:23f:d120:4413 with SMTP id q11-20020a17090a68cb00b0023fd1204413mr7943430pjj.1.1680246501490; Fri, 31 Mar 2023 00:08:21 -0700 (PDT) Date: Fri, 31 Mar 2023 07:08:15 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230331070818.2792558-1-yosryahmed@google.com> Subject: [PATCH v3 0/3] Ignore non-LRU-based reclaim in memcg reclaim From: Yosry Ahmed To: Andrew Morton , Alexander Viro , "Darrick J. Wong" , Christoph Lameter , David Rientjes , Joonsoo Kim , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, "Matthew Wilcox (Oracle)" , Miaohe Lin , David Hildenbrand , Johannes Weiner , Peter Xu , NeilBrown , Shakeel Butt , Michal Hocko , Yu Zhao , Dave Chinner Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, Yosry Ahmed X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: D78BE20008 X-Stat-Signature: hd69ycoez5qsnmrqa8qi7addji6frqmi X-HE-Tag: 1680246502-544860 X-HE-Meta: U2FsdGVkX19Vs/mK7C30vVBqijse94AvCs2sa19O4ZphAdkixPYKoM7qa8UUeFsA5xvp4Yw01F6He0yF7aDGo/YpQbIa+cLyZh1TwUThxqAE9DBN5dNLxyX5Jru3qA4viR3MdXVsBoxdJ2dAKtbY5oG0Fl+u6z/rkDkem5ol6uBqTKXDgwrf2ygcmng2JtB7/ZCk+vDHqVrsaYdbVSUMBblCQdJkMzUgPWQlPAxyCRFrp1fj53EOlDgeSharQ81tmAiTM5D9u6/qRfQC7WkpLj/8/Ejo/TyZDsiGSObADXAXutzztSJ2xfYZ8hcSyMDT9l/Bt70Gd9L7/RW8i24zjUjsk2r7K7A0rjtUF/+bLvMsJzrmx6Dks9jB+28roInoEvjAfOj6VNyeoR90QsBdDN6CebXW91p9wrLqRg41X2jJDJLOaIGHQY1Hzj6v5Q+ozj2uMXf13iL8pGCITkCUZmviQmU0fKag8IGj8oquO4ha6MN+seIJB1JWdsqMsyIOS2LtZUFi2NhPgdpyIp3VkdsZktMZBJGpBG4qaNBwyznDHHcUz7yiacuFNeqzae3uX6OU6ZTQqv9Htdv9cEbBKwgtQhB+FXJY4+PHycQE+9N7v7nSd2LNYQdcTnow6zKPOkBUqsNonorLkgdrW8YRFnt95pg0EX8IeBSgE8sXoWIfgTlxAi12yqu7DzPLkXjCglaVjGcj/0DIa7M5eQRTPXookHydCLpYN3rqA91I5vBgHH9goM2hcuF+MECGspd7zPIY9vmZGjJJD/4n8+U7whu5s33ID8iwF+6xZqZh5QuYLbJCVFTz/yxNr2FC4T0SuER/Vr+3OV6wI3cytRe7QctJWwAA79Kpz6c54CYx1PhFg9TcyfU6zfpJ+/lBJ6+Yzl9POE/AfdzatfxU2GN//Jfz9MLX3Az9FBGtZkeWU+NPkbnQMG7CG7688h3dd8UTh88dXJPbDzoQ7xXnrtt Sn+qp1fb BhqUXM8/DyH5ydRR9JCpIniqh2xJRnd7gWpebKi1CUTUm8kAr/QwmJvK/HVr20Z5H573erodetZLRjsibpSvxpwAFN4v0zR6bRPvx+zNOi8XF4Nk8ZD3/gHOAZgY00p1ZdJzvSUmQjLoYWRt1LWFBWinxlETMU0vXfQRLolZG3GRxq+dvUIS678yUFAN9nIavmeYcuXmkh/ZBlpNOn0qmU5CuF/ixXJ6tD9T8TqCNiNLVOjCCJ1p+U4j6LU5WUI5kOEXd12Xu3mnwRzIC02GZCtEjTwe6f5QBb24go0r2RVLb7lYQbW/k1Xv+9QaYNbC1kpkAVxTEzjaKd23i3+aSSq2/YQaqrx/Fm4rrKZF0pV7u5h2Z7KyETDm3qaJNA6UVyQv+Fi5UDDh+jH8sVoCK59Jb3NSMlqI+8k5TZ/F9i2VjkXf/CrMjlcnBl61GBOfMC8Ezip7VE56KxowFDlNnNadRGSYCR2kvv9y5TmOup70VxsU95PYCD0pN5xA8v1oocQ2IGk8MkcyS5s+9TVyQc2AV30qXtyHq1AIiIp5/1YID6LxyVDITH43p+M8XXcKnsAxAC2jo6QoXJKi5xs2oqUXC9GlT8g7zwYMs64nt3N0tpeTVNLzBTtbM0THvK5fy0e1+5SOo2V1KPBAxf/1T69KGxL0U9ox3ojbK5XbB/VVy5tYRdj0PEK5RiQos6Jwcd5Sxp+Tft2tZ7f4= 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: Upon running some proactive reclaim tests using memory.reclaim, we noticed some tests flaking where writing to memory.reclaim would be successful even though we did not reclaim the requested amount fully. Looking further into it, I discovered that *sometimes* we over-report the number of reclaimed pages in memcg reclaim. Reclaimed pages through other means than LRU-based reclaim are tracked through reclaim_state in struct scan_control, which is stashed in current task_struct. These pages are added to the number of reclaimed pages through LRUs. For memcg reclaim, these pages generally cannot be linked to the memcg under reclaim and can cause an overestimated count of reclaimed pages. This short series tries to address that. Patches 1-2 are just refactoring, they add helpers that wrap some operations on current->reclaim_state, and rename reclaim_state->reclaimed_slab to reclaim_state->reclaimed. Patch 3 ignores pages reclaimed outside of LRU reclaim in memcg reclaim. The pages are uncharged anyway, so even if we end up under-reporting reclaimed pages we will still succeed in making progress during charging. Do not let the diff stat deceive you, the core of this series is patch 3, which has one line of code change. All the rest is refactoring and one huge comment. v2 -> v3: - Fixed a compilation problem in patch 2 reported by the bot. - Rebased on top of v6.3-rc2. v1 -> v2: - Renamed report_freed_pages() to mm_account_reclaimed_pages(), as suggested by Dave Chinner. There were discussions about leaving updating current->reclaim_state open-coded as it's not worth hiding the current dereferencing to remove one line, but I'd rather have the logic contained with mm/vmscan.c so that the next person that changes this logic doesn't have to change 7 different files. - Renamed add_non_vmscan_reclaimed() to flush_reclaim_state() (Johannes Weiner). - Added more context about how this problem was found in the cover letter (Johannes Weiner). - Added a patch to move set_task_reclaim_state() below the definition of cgroup_reclaim(), and added additional helpers in the same position. This way all the helpers for reclaim_state live together, and there is no need to declare cgroup_reclaim() early or move its definition around to call it from flush_reclaim_state(). This should also fix the build error reported by the bot in !CONFIG_MEMCG. RFC -> v1: - Exported report_freed_pages() in case XFS is built as a module (Matthew Wilcox). - Renamed reclaimed_slab to reclaim in previously missed MGLRU code. - Refactored using reclaim_state to update sc->nr_reclaimed into a helper and added an XL comment explaining why we ignore reclaim_state->reclaimed in memcg reclaim (Johannes Weiner). Yosry Ahmed (3): mm: vmscan: move set_task_reclaim_state() after cgroup_reclaim() mm: vmscan: refactor updating reclaimed pages in reclaim_state mm: vmscan: ignore non-LRU-based reclaim in memcg reclaim fs/inode.c | 3 +- fs/xfs/xfs_buf.c | 3 +- include/linux/swap.h | 5 ++- mm/slab.c | 3 +- mm/slob.c | 6 +-- mm/slub.c | 5 +-- mm/vmscan.c | 88 +++++++++++++++++++++++++++++++++++--------- 7 files changed, 81 insertions(+), 32 deletions(-)