From patchwork Tue Oct 9 18:47:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 10633187 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B28CF933 for ; Tue, 9 Oct 2018 18:48:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8F4229552 for ; Tue, 9 Oct 2018 18:48:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D82F2956E; Tue, 9 Oct 2018 18:48:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3855A29552 for ; Tue, 9 Oct 2018 18:48:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AEED66B000C; Tue, 9 Oct 2018 14:48:20 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A762E6B000D; Tue, 9 Oct 2018 14:48:20 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93EAA6B000E; Tue, 9 Oct 2018 14:48:20 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by kanga.kvack.org (Postfix) with ESMTP id 511AA6B000C for ; Tue, 9 Oct 2018 14:48:20 -0400 (EDT) Received: by mail-yb1-f199.google.com with SMTP id n8-v6so1181630ybo.9 for ; Tue, 09 Oct 2018 11:48:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5KEsEdGBvrMUNWtGyEIiTPpN958jHDkc6gRi8ilCin8=; b=HUQGeFZ17M6f2SJi0jkYbyD7fKpQXkTMxyc81b3HajzdlEf0EZUF0DRGLj/v1ZjEaD vvEDZ9OjVrUjQ55naxbLuxQ2mWRkU8ARE9E8KmTlq5FYyUX5U+/b3Vk9ynp3KJTD+HG6 ib1FIobcvjyKOIg2yrQcPrO671w8tNHx5JE2uP1yYPywC1jA+RoWarlT5Wk9zBTcEd9H WTs8oRIhcsJP/XoHipxtklLjlJH/iAI3w1Ao7Y0scGhP9wyh6krybvPbWVxbb1Zs/XSv xCzFjJKEdWm/IQNcMLgNjf7uApX4l4ZDXEP3b+VmxqTXpB89/Wq0KS7i0l/O5bMdBuYJ HpEQ== X-Gm-Message-State: ABuFfoh9PqipUohR152oOBYRQt3OlMBZF30H5I3UHrVX/vtNdtLeLvET YhnvFUEqGO02bu5tTI/hQHPiUkC7mktQ+mDL0JGfgY4k6VWbBMeB/t17VMAqPdf+P8PxZZnby0d 1R5MkqpmgesJSh++YIitd1EWcEfnLSZ76m1qx8eh+xnck9eDu6v7j2vpE8ANRx/fusaROxLMP4l y+ezeLvXhMaj5+O5ymN35cUgGiOWqqP1ANfQYUuLksSmsNt0qLpEz3gLHpUPDTdRcGsRRpVMFve YJbvUrC9QyvSaa3aoGGW+2rvGxVDhAac5ZwnEy62Nn/pD6As3/DalFcA+UWCmjZCP4LA8gGaDdE PQav7NcGRX7nfgS209eDzovgbpOaKgRHPAL/HXAOaYLnIoocPnY7cl0eLt/hWbBDRPYTW1rCYuc 4 X-Received: by 2002:a25:1e88:: with SMTP id e130-v6mr4536974ybe.123.1539110900082; Tue, 09 Oct 2018 11:48:20 -0700 (PDT) X-Received: by 2002:a25:1e88:: with SMTP id e130-v6mr4536946ybe.123.1539110899328; Tue, 09 Oct 2018 11:48:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539110899; cv=none; d=google.com; s=arc-20160816; b=OKzwsqdmOnKWoPG2BpPzIVecGv6ERctxNRvPypIZd1RQqtkHG2+Ph+wU7r5FmJgiEH iLtP70kV1euI5FDJlTk4oo0iav7xciychANAL3hcokTScQEpNahmeBJCAkMzD8G9gm7H UGn+XVKm8E1pGoAoSX6bOKy8VxxwHGmLZ1DsNjWdR4HrOt5fiHbFA8+GsoWG2nrKdlQ5 e9P2xP5q+GCFConZvJQaKiNjUNoMgKRiJBkE3K3pjl4vmDfN3iO5ivp8vpN3EHqk0cXQ +pCrJ3swkSLk9IKjd/nIj6UV0JW8zRBZuBedLubjrIJ4i5H7gG5rWhIjm1mY6dHAfo/o /Eqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=5KEsEdGBvrMUNWtGyEIiTPpN958jHDkc6gRi8ilCin8=; b=zYYbvTTMgmdF1Eq58F+ZygxgVztFTnRKzBetUzNN3x6uRlEUTUsrvesJZ3L9GEeEhM k/k9YvBUsZ/C2fxpsqbXZDLO46CI59oJn4JnFbYviHYwOnqtYtKih1Hl5UWiQRlFcic6 7zApJXmOwepwKx6lqOgLsosRmxc+pEFPhAiUL2/YmttbNUaagiJ7RlKvv9LnHdDS/bx6 SbMlIVuMqqrOYXpSy/pEcdqZuo5FkZPargtoXFPMIM7Hq/OJHIqFsN1T07kswmFUQi1Y TI5XGjcaEBS/+rxCq/0KK707YKTvG1rmzuSrOCfZddi0eiEC/8baKZXxImKN5DcEcUKN 20Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=iHW4Xuaz; spf=pass (google.com: domain of hannes@cmpxchg.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id n186-v6sor2343296ywc.51.2018.10.09.11.48.19 for (Google Transport Security); Tue, 09 Oct 2018 11:48:19 -0700 (PDT) Received-SPF: pass (google.com: domain of hannes@cmpxchg.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=iHW4Xuaz; spf=pass (google.com: domain of hannes@cmpxchg.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5KEsEdGBvrMUNWtGyEIiTPpN958jHDkc6gRi8ilCin8=; b=iHW4XuazhRFqlrZRq9IUKEVo7Apl+liUkomlKYHmxGSxyFc2pckXE8G6NTzXQ5su7/ okopKOrLP5N1PXqh8N8RYwtSnbtaSlmxmce+2IQchMunbthj/9WDU89QVNbdwqc0/kX8 fxvzAZ3mhC1Q2vL895UEFZY6BDqyNjZ0D9m98T8Lg5KGnpYzoo9BFONj02tvdJM2e+jg ljsIwB7FxTAVrnnLRXuoZT08vIztvbrB19hE0Gcmei1orsZIunZ7qsGA2F4dhN9jpaRh eI7yUuXCKEhL4VwqEszgnTOYaVxXbQLTsfQ/NwOSYTWkzpZTmpm+LF4U7D8oNofLm8gu oyjg== X-Google-Smtp-Source: ACcGV63u3zwG+OP0mGmwt3IuEh4X6VI2/AtHABSD8/EI77QXHbis0ICPaJuSb4LP/KYxxnZ84Yp3ug== X-Received: by 2002:a81:2609:: with SMTP id m9-v6mr16924353ywm.67.1539110899119; Tue, 09 Oct 2018 11:48:19 -0700 (PDT) Received: from localhost ([2620:10d:c091:200::6:14c5]) by smtp.gmail.com with ESMTPSA id o202-v6sm35068808ywo.38.2018.10.09.11.48.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Oct 2018 11:48:18 -0700 (PDT) From: Johannes Weiner To: Andrew Morton Cc: Rik van Riel , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 3/4] mm: workingset: add vmstat counter for shadow nodes Date: Tue, 9 Oct 2018 14:47:32 -0400 Message-Id: <20181009184732.762-4-hannes@cmpxchg.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181009184732.762-1-hannes@cmpxchg.org> References: <20181009184732.762-1-hannes@cmpxchg.org> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Make it easier to catch bugs in the shadow node shrinker by adding a counter for the shadow nodes in circulation. Signed-off-by: Johannes Weiner Signed-off-by: Johannes Weiner --- include/linux/mmzone.h | 1 + mm/vmstat.c | 1 + mm/workingset.c | 12 ++++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 4179e67add3d..d82e80d82aa6 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -161,6 +161,7 @@ enum node_stat_item { NR_SLAB_UNRECLAIMABLE, NR_ISOLATED_ANON, /* Temporary isolated pages from anon lru */ NR_ISOLATED_FILE, /* Temporary isolated pages from file lru */ + WORKINGSET_NODES, WORKINGSET_REFAULT, WORKINGSET_ACTIVATE, WORKINGSET_RESTORE, diff --git a/mm/vmstat.c b/mm/vmstat.c index d08ed044759d..6038ce593ce3 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1143,6 +1143,7 @@ const char * const vmstat_text[] = { "nr_slab_unreclaimable", "nr_isolated_anon", "nr_isolated_file", + "workingset_nodes", "workingset_refault", "workingset_activate", "workingset_restore", diff --git a/mm/workingset.c b/mm/workingset.c index f564aaa6b71d..cfdf6adf7e7c 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -378,11 +378,17 @@ void workingset_update_node(struct xa_node *node) * as node->private_list is protected by the i_pages lock. */ if (node->count && node->count == node->nr_values) { - if (list_empty(&node->private_list)) + if (list_empty(&node->private_list)) { list_lru_add(&shadow_nodes, &node->private_list); + __inc_lruvec_page_state(virt_to_page(node), + WORKINGSET_NODES); + } } else { - if (!list_empty(&node->private_list)) + if (!list_empty(&node->private_list)) { list_lru_del(&shadow_nodes, &node->private_list); + __dec_lruvec_page_state(virt_to_page(node), + WORKINGSET_NODES); + } } } @@ -472,6 +478,8 @@ static enum lru_status shadow_lru_isolate(struct list_head *item, } list_lru_isolate(lru, item); + __dec_lruvec_page_state(virt_to_page(node), WORKINGSET_NODES); + spin_unlock(lru_lock); /*