From patchwork Mon Jun 18 09:18:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 10470381 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AC2AA6032A for ; Mon, 18 Jun 2018 09:18:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BCEA28919 for ; Mon, 18 Jun 2018 09:18:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 405E928943; Mon, 18 Jun 2018 09:18:52 +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, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable 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 B54D1288DB for ; Mon, 18 Jun 2018 09:18:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5D4F6B026B; Mon, 18 Jun 2018 05:18:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A2D3C6B026E; Mon, 18 Jun 2018 05:18:35 -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 80D016B026C; Mon, 18 Jun 2018 05:18:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f72.google.com (mail-wm0-f72.google.com [74.125.82.72]) by kanga.kvack.org (Postfix) with ESMTP id 1D6C46B026B for ; Mon, 18 Jun 2018 05:18:35 -0400 (EDT) Received: by mail-wm0-f72.google.com with SMTP id f65-v6so5153832wmd.2 for ; Mon, 18 Jun 2018 02:18:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=bqblh5bGsEgpsGRXzQhZJ3oLIA6Jr9oA5/MQPYW5rcA=; b=M8SqwOhUAHtVfarzuHXgEpp62cNmK6J6yObiw03dKtssqhHJkTWNDQt34AT1WSzpQ5 K7tVTYs9UsLsjFzkZxSFsMJ+G2STxSVlsdwLClNMnlxne802qrXui9L2H7qBdfgJahYc eSZm6yb5IOoFcwa/D5PbqqqPjN1rTl8hXvBM56dq4X8mqlRLTl9r3o+bNCkFOt6p+Ein 6OglbnqC6M1jBfgrAlP3NQq725l+wRXMLNKpoA3sk5RltMJYuQSUyBphrIzawj7NNoj1 1oxG118nYOkKntg2jdKxp4Tk5xQc55cXS46Bn4TZJfX13rTD5M3UhUCUlkEuNVHaiiX2 kOsg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of vbabka@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Gm-Message-State: APt69E2RXl51+ZTnCCgBBCqNu4liCE2Ycf0m3eAw0Pqcc+Bf41lpvslF SrzU83RSJs6V0K6anjf3p3znZ7u4Ql7/zPfsV/Idx/C2mH4gQSkchJK4ZDmnx2H/TGFy5KMVP76 KYGSs3cKOXucJMgb16vIjT+q1gF4dd1/kzY9mr/GMUDQntYD87foY1V7eGNa+GUT0cg== X-Received: by 2002:a50:8f86:: with SMTP id y6-v6mr10691345edy.290.1529313514666; Mon, 18 Jun 2018 02:18:34 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLRrljcWXArnklCRHoGDtbDuwbsvTMd2P/qNtI6yS7oomrby47tZHO5ee0vk1JRpWIK/av/ X-Received: by 2002:a50:8f86:: with SMTP id y6-v6mr10691128edy.290.1529313508988; Mon, 18 Jun 2018 02:18:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529313508; cv=none; d=google.com; s=arc-20160816; b=i87tUNFVqinPJSfTZd9WDl+r+bHwxUlvCJFd9XI7EZo9Dht78MOH3bSRe9lW6vHKQZ Y0nxLU0eCttmH810G7sgqAUzsoB1yGWFFE1A8xVJ1/tHF87AgYrNN4IcyIONVPAiuIjT KXEKGxtF+e6Bh97r+daV7wyYglK7/ZXPLE6QixFUza6X9z/yFvTvzAZ5kHREk1YAUAma i04pZ4/ztLjQrraIXjPEYn6oZ8DTfGreY57KU2h7/4QukB6EkgUBAP+pX9DQq49bxAxW rqJl4UrF5tUGEa5yGCgE7UPnh+Mbfy4SI07uM493YBtVfIR4cCmtUOX2Aszi351Jwfia bIrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=bqblh5bGsEgpsGRXzQhZJ3oLIA6Jr9oA5/MQPYW5rcA=; b=LVy/weFKXkc5ResU0sTr6nE+76NO6HiN3hcicX6e7KdqVVaU71FD1ivqCgaqb6UFfm jwk9Wd9UiFOFajkLj4xdNxh8QF4++CNRUdYtu+qqHkkcamXIieZxIEGiqb5nKjGojLoK hLoWWOQ2y2Am0H8YcIeMlUTRm846Y3mXsrIEZC01TufDOzFbsRZ2S/ed03pJrBekx3mj ZGWkumflH527Ub003wQk/YCsWFu6Jcztpxfy38okqZLHwsyE26SjciF/b3JGSQNqmrdy TlTZV1YBEufGb8yGIymHzxN/HK0Tm+acPH2fh3WZLy2Ui3luKkQq1TXNqWmtA5mg9boN vabg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of vbabka@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=vbabka@suse.cz Received: from mx2.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id m52-v6si6715926edc.418.2018.06.18.02.18.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 02:18:28 -0700 (PDT) Received-SPF: pass (google.com: domain of vbabka@suse.cz designates 195.135.220.15 as permitted sender) client-ip=195.135.220.15; Authentication-Results: mx.google.com; spf=pass (google.com: domain of vbabka@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DEF0EADCA; Mon, 18 Jun 2018 09:18:27 +0000 (UTC) From: Vlastimil Babka To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Roman Gushchin , Michal Hocko , Johannes Weiner , linux-api@vger.kernel.org, Christoph Lameter , David Rientjes , Mel Gorman , Matthew Wilcox , Vlastimil Babka , Vijayanand Jitta , Laura Abbott , Sumit Semwal Subject: [PATCH v2 5/7] mm: rename and change semantics of nr_indirectly_reclaimable_bytes Date: Mon, 18 Jun 2018 11:18:06 +0200 Message-Id: <20180618091808.4419-6-vbabka@suse.cz> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618091808.4419-1-vbabka@suse.cz> References: <20180618091808.4419-1-vbabka@suse.cz> 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 The vmstat counter NR_INDIRECTLY_RECLAIMABLE_BYTES was introduced by commit eb59254608bc ("mm: introduce NR_INDIRECTLY_RECLAIMABLE_BYTES") with the goal of accounting objects that can be reclaimed, but cannot be allocated via a SLAB_RECLAIM_ACCOUNT cache. This is now possible via kmalloc() with __GFP_RECLAIMABLE flag, and the dcache external names user is converted. The counter is however still useful for accounting direct page allocations (i.e. not slab) with a shrinker, such as the ION page pool. So keep it, and: - change granularity to pages to be more like other counters; sub-page allocations should be able to use kmalloc - rename the counter to NR_KERNEL_MISC_RECLAIMABLE - expose the counter again in vmstat as "nr_kernel_misc_reclaimable"; we can again remove the check for not printing "hidden" counters Signed-off-by: Vlastimil Babka Cc: Vijayanand Jitta Cc: Laura Abbott Cc: Sumit Semwal --- drivers/staging/android/ion/ion_page_pool.c | 4 ++-- include/linux/mmzone.h | 2 +- mm/page_alloc.c | 19 +++++++------------ mm/util.c | 3 +-- mm/vmstat.c | 6 +----- 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c index 9bc56eb48d2a..b7ad2d2449ac 100644 --- a/drivers/staging/android/ion/ion_page_pool.c +++ b/drivers/staging/android/ion/ion_page_pool.c @@ -33,8 +33,8 @@ static void ion_page_pool_add(struct ion_page_pool *pool, struct page *page) pool->low_count++; } - mod_node_page_state(page_pgdat(page), NR_INDIRECTLY_RECLAIMABLE_BYTES, - (1 << (PAGE_SHIFT + pool->order))); + mod_node_page_state(page_pgdat(page), NR_KERNEL_MISC_RECLAIMABLE, + 1 << pool->order); mutex_unlock(&pool->mutex); } diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 32699b2dc52a..c2f6bc4c9e8a 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -180,7 +180,7 @@ enum node_stat_item { NR_VMSCAN_IMMEDIATE, /* Prioritise for reclaim when writeback ends */ NR_DIRTIED, /* page dirtyings since bootup */ NR_WRITTEN, /* page writings since bootup */ - NR_INDIRECTLY_RECLAIMABLE_BYTES, /* measured in bytes */ + NR_KERNEL_MISC_RECLAIMABLE, /* reclaimable non-slab kernel pages */ NR_VM_NODE_STAT_ITEMS }; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1521100f1e63..8ceb45e11b97 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4704,6 +4704,7 @@ long si_mem_available(void) unsigned long pagecache; unsigned long wmark_low = 0; unsigned long pages[NR_LRU_LISTS]; + unsigned long reclaimable; struct zone *zone; int lru; @@ -4729,19 +4730,13 @@ long si_mem_available(void) available += pagecache; /* - * Part of the reclaimable slab consists of items that are in use, - * and cannot be freed. Cap this estimate at the low watermark. + * Part of the reclaimable slab and other kernel memory consists of + * items that are in use, and cannot be freed. Cap this estimate at the + * low watermark. */ - available += global_node_page_state(NR_SLAB_RECLAIMABLE) - - min(global_node_page_state(NR_SLAB_RECLAIMABLE) / 2, - wmark_low); - - /* - * Part of the kernel memory, which can be released under memory - * pressure. - */ - available += global_node_page_state(NR_INDIRECTLY_RECLAIMABLE_BYTES) >> - PAGE_SHIFT; + reclaimable = global_node_page_state(NR_SLAB_RECLAIMABLE) + + global_node_page_state(NR_KERNEL_MISC_RECLAIMABLE); + available += reclaimable - min(reclaimable / 2, wmark_low); if (available < 0) available = 0; diff --git a/mm/util.c b/mm/util.c index 3351659200e6..891f0654e7b5 100644 --- a/mm/util.c +++ b/mm/util.c @@ -675,8 +675,7 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin) * Part of the kernel memory, which can be released * under memory pressure. */ - free += global_node_page_state( - NR_INDIRECTLY_RECLAIMABLE_BYTES) >> PAGE_SHIFT; + free += global_node_page_state(NR_KERNEL_MISC_RECLAIMABLE); /* * Leave reserved pages. The pages are not for anonymous pages. diff --git a/mm/vmstat.c b/mm/vmstat.c index 75eda9c2b260..7c677d3a61ec 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1161,7 +1161,7 @@ const char * const vmstat_text[] = { "nr_vmscan_immediate_reclaim", "nr_dirtied", "nr_written", - "", /* nr_indirectly_reclaimable */ + "nr_kernel_misc_reclaimable", /* enum writeback_stat_item counters */ "nr_dirty_threshold", @@ -1704,10 +1704,6 @@ static int vmstat_show(struct seq_file *m, void *arg) unsigned long *l = arg; unsigned long off = l - (unsigned long *)m->private; - /* Skip hidden vmstat items. */ - if (*vmstat_text[off] == '\0') - return 0; - seq_puts(m, vmstat_text[off]); seq_put_decimal_ull(m, " ", *l); seq_putc(m, '\n');