From patchwork Mon Jun 18 09:18:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 10470373 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 B6AAD6020C for ; Mon, 18 Jun 2018 09:18:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB36528740 for ; Mon, 18 Jun 2018 09:18:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9FE3B2883A; Mon, 18 Jun 2018 09:18:37 +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=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 1F3CA28740 for ; Mon, 18 Jun 2018 09:18:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37AF46B000E; Mon, 18 Jun 2018 05:18:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2B2036B026B; Mon, 18 Jun 2018 05:18:31 -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 091076B0008; Mon, 18 Jun 2018 05:18:30 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f200.google.com (mail-wr0-f200.google.com [209.85.128.200]) by kanga.kvack.org (Postfix) with ESMTP id 7998F6B000C for ; Mon, 18 Jun 2018 05:18:30 -0400 (EDT) Received: by mail-wr0-f200.google.com with SMTP id r2-v6so11493986wrm.15 for ; Mon, 18 Jun 2018 02:18:30 -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=hIelfCnl3m8PpTjNwhbmOkPdGqVAdkU75o5TEQ0MIm0=; b=to3KDTOQHX1qyqIsAiobggskndPH6jY/eUrzyqYL6uqYHKfWF1fNs4AHgQXMuB2I+t YdHnIyaRzaSLBPr/zwKIqzUhj6q7kDfP3UASnfrE/zHva9lCDlWkRg2KGa0l5v/huz1R G8qNEb8MZlQOJxYj8N6oo20S5SVXIYGuQ7/tHz4Io7zVcxUtzo1TmPLLpX7llcvPJiIi c4ZMG97u8mPTy2CVSqpDbGDrK/bGk9+UohlviOT48Ev+XEiOCsRK/XcAixR0wW4S8ZV5 ZHE/3oynn/fHIgie9bkPWQhqXKaoyadvOQe8SThPPthWCbOpl5Yd742usbwcxolguC2B VPJQ== 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: APt69E2p4fvxVpoLi3++rxl+DHm/nicZBN/uyfMyfNt6FmUjs4gLo6Nx +joTeJxdppy1ok56DPLCislQ38u/x1ymMw3aiTD1Tvh+N2xxwcbo3s455Yt66cvvJjS3urbqe3t 5SCUPdlckOzviPeok/ljbvVhEiLmVXpYTtx7T66Z62FhqHlqyuH7QP5qLA3eDHXRUQw== X-Received: by 2002:a50:d08e:: with SMTP id v14-v6mr10446215edd.182.1529313509995; Mon, 18 Jun 2018 02:18:29 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLmwVF5HzmiHpZfLR5utd1/HStEhQZ6IYpz2vyRDDD/4Gozhugqte0RN6IzA9+9VpZ2VCnG X-Received: by 2002:a50:d08e:: with SMTP id v14-v6mr10446164edd.182.1529313508715; 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=wS0diyxs1+waVN4rs/M+5uwDw5pS8S6kVF8HjEy5qNu2ZkDjHFR2rB+F7rMFCHVb5m W2UpG52ptP8eY1NOgdsHD+8KUh/cSB4qkZlPtDI9qLP/As4PhnTG9zVhn4NHb6ANpX95 AcgEpXNKEr4vwendZXhzwVmnosEk5jYUeif8jl5hUX8nvgUt8or/FVajWf/UXChMsuuu 3rVyQ7b1TNKzeUx3w/pZBI57zjCNaCxQ+AV/0VQZkpp6Rnfi9YYSr0ZBKZNiR2T64svw iczZNlqcg4/cJhE9xaSRvAGjBW0G1YUFBZpfI9P3HKDfjqFM2ekhfOcfGrzPx2dk+ahx IeAg== 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=hIelfCnl3m8PpTjNwhbmOkPdGqVAdkU75o5TEQ0MIm0=; b=O0nj9w+Y+rvV6tL6qFugRJuvG01VWaNbWk/rdCTLZe0pNYpH1ZLDiyUHioTZ+QINpp wj1dkePGXgfyN03zw0rpDyR7xeV2nlcOs5FIN7n1NeRCB/hkbCqTeTyMzk7kWQyS6fLN w0Xm0Bn7/hFw7wCrzCfSG3MHPcs9mChLciCIj7VBXDsnGPOCqz5+uBJrOQZRVZSNpzdU WE7iDHv6v+4i39j7CXr77fyCQz+QmjdKTDgaAk/pETcePm31pwlJ6kbHB2UtbuJyW7uh FHHHA42ew0phZ3DFiEYq/aYObbX2t1HhDozR+d0m87KabJD1sii/ias+qGdRwPCXnNa0 II1A== 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 h6-v6si6876954edd.152.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 relay1.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id CDE7CACA3; 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 Subject: [PATCH v2 4/7] dcache: allocate external names from reclaimable kmalloc caches Date: Mon, 18 Jun 2018 11:18:05 +0200 Message-Id: <20180618091808.4419-5-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 We can use the newly introduced kmalloc-reclaimable-X caches, to allocate external names in dcache, which will take care of the proper accounting automatically, and also improve anti-fragmentation page grouping. This effectively reverts commit f1782c9bc547 ("dcache: account external names as indirectly reclaimable memory") and instead passes __GFP_RECLAIMABLE to kmalloc(). The accounting thus moves from NR_INDIRECTLY_RECLAIMABLE_BYTES to NR_SLAB_RECLAIMABLE, which is also considered in MemAvailable calculation and overcommit decisions. Signed-off-by: Vlastimil Babka --- fs/dcache.c | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index 0e8e5de3c48a..518c9ed8db8c 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -257,24 +257,10 @@ static void __d_free(struct rcu_head *head) kmem_cache_free(dentry_cache, dentry); } -static void __d_free_external_name(struct rcu_head *head) -{ - struct external_name *name = container_of(head, struct external_name, - u.head); - - mod_node_page_state(page_pgdat(virt_to_page(name)), - NR_INDIRECTLY_RECLAIMABLE_BYTES, - -ksize(name)); - - kfree(name); -} - static void __d_free_external(struct rcu_head *head) { struct dentry *dentry = container_of(head, struct dentry, d_u.d_rcu); - - __d_free_external_name(&external_name(dentry)->u.head); - + kfree(external_name(dentry)); kmem_cache_free(dentry_cache, dentry); } @@ -305,7 +291,7 @@ void release_dentry_name_snapshot(struct name_snapshot *name) struct external_name *p; p = container_of(name->name, struct external_name, name[0]); if (unlikely(atomic_dec_and_test(&p->u.count))) - call_rcu(&p->u.head, __d_free_external_name); + kfree_rcu(p, u.head); } } EXPORT_SYMBOL(release_dentry_name_snapshot); @@ -1608,7 +1594,6 @@ EXPORT_SYMBOL(d_invalidate); struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name) { - struct external_name *ext = NULL; struct dentry *dentry; char *dname; int err; @@ -1629,14 +1614,15 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name) dname = dentry->d_iname; } else if (name->len > DNAME_INLINE_LEN-1) { size_t size = offsetof(struct external_name, name[1]); - - ext = kmalloc(size + name->len, GFP_KERNEL_ACCOUNT); - if (!ext) { + struct external_name *p = kmalloc(size + name->len, + GFP_KERNEL_ACCOUNT | + __GFP_RECLAIMABLE); + if (!p) { kmem_cache_free(dentry_cache, dentry); return NULL; } - atomic_set(&ext->u.count, 1); - dname = ext->name; + atomic_set(&p->u.count, 1); + dname = p->name; } else { dname = dentry->d_iname; } @@ -1675,12 +1661,6 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name) } } - if (unlikely(ext)) { - pg_data_t *pgdat = page_pgdat(virt_to_page(ext)); - mod_node_page_state(pgdat, NR_INDIRECTLY_RECLAIMABLE_BYTES, - ksize(ext)); - } - this_cpu_inc(nr_dentry); return dentry; @@ -2761,7 +2741,7 @@ static void copy_name(struct dentry *dentry, struct dentry *target) dentry->d_name.hash_len = target->d_name.hash_len; } if (old_name && likely(atomic_dec_and_test(&old_name->u.count))) - call_rcu(&old_name->u.head, __d_free_external_name); + kfree_rcu(old_name, u.head); } /*