From patchwork Wed Jun 27 19:12:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 10492487 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 5ABB4601A0 for ; Wed, 27 Jun 2018 19:13:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54CA129D9C for ; Wed, 27 Jun 2018 19:13:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5300D29F17; Wed, 27 Jun 2018 19:13:11 +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=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL 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 4EFB829EE8 for ; Wed, 27 Jun 2018 19:13:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8CC146B000D; Wed, 27 Jun 2018 15:13:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8280F6B000E; Wed, 27 Jun 2018 15:13:06 -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 6A6286B0010; Wed, 27 Jun 2018 15:13:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f72.google.com (mail-pg0-f72.google.com [74.125.83.72]) by kanga.kvack.org (Postfix) with ESMTP id 1FB926B000D for ; Wed, 27 Jun 2018 15:13:06 -0400 (EDT) Received: by mail-pg0-f72.google.com with SMTP id t5-v6so1303184pgt.18 for ; Wed, 27 Jun 2018 12:13:06 -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; bh=m6tdRrvKpKkGOKc/97tUsEByWeLMusIKApVaRRiu7mU=; b=Ve3BWuISw+Dwc1bH5EA6aeN+NscAIr4q6SgGjJY4e1rvWKavFD3jQTHm0vBWcpQ2u2 8S1IkF5qZWNtknuDrhwPoYsyQl+K2sq8t1t/kd3Th4PyqRQKIKB5W4s4vD/6iV4lNGL3 1qKUfmyNgfG9RB+EUr4j9Ds/Na9F+WHg8UH3RdMLoSPDAOKksXjbBTZ/x5mbGjZXi+dm lNCN5AsfyP18F0lwWyF3HP6k64IsioS/YPzNymMCbhxxStE418/fpG8v2aTDM+tWYngG 8j4yj78gB5GPhavrBKw4pWoX8DwRrlRADEqKbFOmjQ6ENs5KsvsO1IJHtO2sRAObPylv ouzA== X-Gm-Message-State: APt69E1LUD4SIO4pkKJkjS5ijrRXkfNAh1bYzBKzsQcPXNXSdwdH+He3 t6e6Ay8k1lOVOAHum9zIRltIgFNuEn8rAmYuf8Bq7sGUWeLWUJmE7dlBOdfOEu0JmoQCibCWMLy p19fxv3JKiYPFBBb8NUmjM7bAcJ2AH5SXJ/+5M4vONEh5MxiC3/qWD3H5WccnKnRpB+IeviH1f7 +hCjsaU1f0y5nAIaAdJDjyyL7V7SJK7LDjNcIk9zrKughtwNbE51rheW5mkNb6hjLf9wnzlitCq 6dCJKu2dmhwS6Ebvca2e8exFRblQLjtj0pmq5tLENrCbRrF2FV617YtMg8DDatlNe+dy+lEtsDe V/ZSFtt8aOvFrRoEU1jin8/9nx27rkEeoN4g1MsYnGbr1mY0ahEGQGmraHIqSx7XwMp/KKG+m1/ + X-Received: by 2002:a17:902:123:: with SMTP id 32-v6mr7233345plb.181.1530126785810; Wed, 27 Jun 2018 12:13:05 -0700 (PDT) X-Received: by 2002:a17:902:123:: with SMTP id 32-v6mr7233309plb.181.1530126784922; Wed, 27 Jun 2018 12:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530126784; cv=none; d=google.com; s=arc-20160816; b=pNdoBs3qx6H/sF7qBUMIJrGTNk+O3JgFiCFwP4u7GwsGY3XbBjw9FA4b4BdIfsDlXL s34T7Mx4M57fVoAIRb8awB2CwSoxU6GXI4NhGeHrgsI18xXRSGA8p1hTaV9oHPONZ//3 S4Q8aEXq7BSgnrMkaJXLy3Ev2N2N/Q/wHaPM6ISk0Ev6HmRUMOpVdITTToAgYoPfhopj T9XVxsGZVkQUc1cJeNZcvoJ+SakK6lp2ITm9YzOva5/QSRKbYPOWfM6oioHyYNreDVgz SIen24ROFMzQrsWibEst7S0BSh3P63VZG5qz1KZlCJ9ivDqijU5v7sUUc+JAotXRk3GP 9Ndw== 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 :dkim-signature:arc-authentication-results; bh=m6tdRrvKpKkGOKc/97tUsEByWeLMusIKApVaRRiu7mU=; b=t+Az2faS7wDi5zx9Af38d0aryJSbpJlxOTk8owuQASBSwXrEbRTS9VGUOnaqB1HXbl mVjpxCguXT0CNTTXQRJBg0X1a2GUNcjJT6J+iFqkpdaVGRY8He5I3OY+UveYyuwtuQ5U f2Rp1LPfjaCPqKXSCsWf+tM5qiLtJK0gbqxsRcXQvFwbLRsJrCbWBAyB3owjtoxZk2JF vB/jmPp9nMioFuTnoxiMYI3pG1JkYE9nskVII72Rpg5DcTE81zyaF48xsC3/1y74pQIk RbF68z6zybTKHZCuA1vGeVwA1e5O1Z5EH2It7oBYeoCB5wczy1PAVsZL2sHmDuRv4GdQ V0EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=kB85XWA+; spf=pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shakeelb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m13-v6sor1197635pgd.251.2018.06.27.12.13.04 for (Google Transport Security); Wed, 27 Jun 2018 12:13:04 -0700 (PDT) Received-SPF: pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=kB85XWA+; spf=pass (google.com: domain of shakeelb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shakeelb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m6tdRrvKpKkGOKc/97tUsEByWeLMusIKApVaRRiu7mU=; b=kB85XWA+cW/Cagq0Dweo+oofwnOc402eWhHxVOKirFbUyN8vz5fZfEA/K9qnPx0BIp 32Mo/J0ve02NLb1YyTtaqvzB8fQj5BVIrrUx5bVe4wFW/zHBcb9jH4a2+ZBVmTDGkZyq hP5AJ6VqguuZ43OEUpGQMr2rRATt3AK5PJ0Ji1gt4rPdlvWgKTaSs7/ye6/yOG29y2Or FzzaY+n3z59Q5ALwHba6Cc8caBjDLe6DGGHaJxafMPhGgSAu0JiV8bY0olDYJN6yK/Bb CikBqVj7SvsUnd6VH0N749G8eGBAyvDOSmOT4o1+uSCpfzuRFZ1vOW9//ubb63crRbiq OWRg== X-Google-Smtp-Source: ADUXVKLmOp0m6t4Vpa3AxLUUNG0u1WwK7TaMYvk2jP/1SylTU3bUPg7OOz3RXtr+GKjvDQOxCAa3cQ== X-Received: by 2002:a63:3f05:: with SMTP id m5-v6mr6162564pga.51.1530126784136; Wed, 27 Jun 2018 12:13:04 -0700 (PDT) Received: from shakeelb.mtv.corp.google.com ([2620:15c:2cb:201:3a5f:3a4f:fa44:6b63]) by smtp.gmail.com with ESMTPSA id l6-v6sm8733667pfc.172.2018.06.27.12.13.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 12:13:02 -0700 (PDT) From: Shakeel Butt To: Andrew Morton Cc: Michal Hocko , Johannes Weiner , Vladimir Davydov , Jan Kara , Greg Thelen , Amir Goldstein , Roman Gushchin , Alexander Viro , linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt , Jan Kara Subject: [PATCH 2/2] fs, mm: account buffer_head to kmemcg Date: Wed, 27 Jun 2018 12:12:50 -0700 Message-Id: <20180627191250.209150-3-shakeelb@google.com> X-Mailer: git-send-email 2.18.0.rc2.346.g013aa6912e-goog In-Reply-To: <20180627191250.209150-1-shakeelb@google.com> References: <20180627191250.209150-1-shakeelb@google.com> 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 buffer_head can consume a significant amount of system memory and is directly related to the amount of page cache. In our production environment we have observed that a lot of machines are spending a significant amount of memory as buffer_head and can not be left as system memory overhead. Charging buffer_head is not as simple as adding __GFP_ACCOUNT to the allocation. The buffer_heads can be allocated in a memcg different from the memcg of the page for which buffer_heads are being allocated. One concrete example is memory reclaim. The reclaim can trigger I/O of pages of any memcg on the system. So, the right way to charge buffer_head is to extract the memcg from the page for which buffer_heads are being allocated and then use targeted memcg charging API. Signed-off-by: Shakeel Butt Cc: Michal Hocko Cc: Jan Kara Cc: Amir Goldstein Cc: Greg Thelen Cc: Johannes Weiner Cc: Vladimir Davydov Cc: Roman Gushchin Cc: Andrew Morton Cc: Alexander Viro --- Changelog since v2: - get_mem_cgroup_from_page() returns root_mem_cgroup if page->memcg is either NULL or css_tryget_online fails. Changelog since v1: - simple code cleanups fs/buffer.c | 10 +++++++++- include/linux/memcontrol.h | 7 +++++++ mm/memcontrol.c | 22 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/fs/buffer.c b/fs/buffer.c index 8194e3049fc5..235826333936 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -45,6 +45,7 @@ #include #include #include +#include #include static int fsync_buffers_list(spinlock_t *lock, struct list_head *list); @@ -815,10 +816,14 @@ struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size, struct buffer_head *bh, *head; gfp_t gfp = GFP_NOFS; long offset; + struct mem_cgroup *memcg; if (retry) gfp |= __GFP_NOFAIL; + memcg = get_mem_cgroup_from_page(page); + memalloc_use_memcg(memcg); + head = NULL; offset = PAGE_SIZE; while ((offset -= size) >= 0) { @@ -835,6 +840,9 @@ struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size, /* Link the buffer to its page */ set_bh_page(bh, page, offset); } +out: + memalloc_unuse_memcg(); + mem_cgroup_put(memcg); return head; /* * In case anything failed, we just free everything we got. @@ -848,7 +856,7 @@ struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size, } while (head); } - return NULL; + goto out; } EXPORT_SYMBOL_GPL(alloc_page_buffers); diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index cb04b382c8d2..919b98ddda45 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -380,6 +380,8 @@ struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm); +struct mem_cgroup *get_mem_cgroup_from_page(struct page *page); + static inline struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css){ return css ? container_of(css, struct mem_cgroup, css) : NULL; @@ -865,6 +867,11 @@ static inline struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) return NULL; } +static inline struct mem_cgroup *get_mem_cgroup_from_page(struct page *page) +{ + return NULL; +} + static inline void mem_cgroup_put(struct mem_cgroup *memcg) { } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b25ca5c13196..21a7c2fb8097 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -713,6 +713,28 @@ struct mem_cgroup *get_mem_cgroup_from_mm(struct mm_struct *mm) } EXPORT_SYMBOL(get_mem_cgroup_from_mm); +/** + * get_mem_cgroup_from_page: Obtain a reference on given page's memcg. + * @page: page from which memcg should be extracted. + * + * Obtain a reference on page->memcg and returns it if successful. Otherwise + * root_mem_cgroup is returned. + */ +struct mem_cgroup *get_mem_cgroup_from_page(struct page *page) +{ + struct mem_cgroup *memcg = page->mem_cgroup; + + if (mem_cgroup_disabled()) + return NULL; + + rcu_read_lock(); + if (!memcg || !css_tryget_online(&memcg->css)) + memcg = root_mem_cgroup; + rcu_read_unlock(); + return memcg; +} +EXPORT_SYMBOL(get_mem_cgroup_from_page); + /** * If current->active_memcg is non-NULL, do not fallback to current->mm->memcg. */