From patchwork Tue Feb 9 19:01:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 12078867 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 305C5C433DB for ; Tue, 9 Feb 2021 19:01:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9363064E7E for ; Tue, 9 Feb 2021 19:01:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9363064E7E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D8BCA6B0005; Tue, 9 Feb 2021 14:01:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D3AE96B006C; Tue, 9 Feb 2021 14:01:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C03716B006E; Tue, 9 Feb 2021 14:01:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0084.hostedemail.com [216.40.44.84]) by kanga.kvack.org (Postfix) with ESMTP id A46826B0005 for ; Tue, 9 Feb 2021 14:01:36 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 4B8CA99B3 for ; Tue, 9 Feb 2021 19:01:36 +0000 (UTC) X-FDA: 77799648192.25.edge51_1909e3527609 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 7F76E184C4DC0 for ; Tue, 9 Feb 2021 19:01:29 +0000 (UTC) X-HE-Tag: edge51_1909e3527609 X-Filterd-Recvd-Size: 6320 Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Tue, 9 Feb 2021 19:01:28 +0000 (UTC) Received: by mail-qv1-f52.google.com with SMTP id ew18so9206375qvb.4 for ; Tue, 09 Feb 2021 11:01:28 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=YMKTZdgN+ApLkWCndc7XhEgCcK+nIdQXAhjOxRLrovs=; b=1ILh68/NP5l/G7S16U0oxNfUCDuypDgiZHfAby/Q3FDossuYdKi04IofVJrtdlUv3h J0JpwX/TkNjlZGRKE+v4SQyd6HTyGJ+lQIjFzAR63oks20pvihdIuKhyJYeBRSQqiFxd Wacz1OSJzE1wMnzew7eaZevYCSl7JMJ3IYXqiv57tVrsDpyF6Usj44DuF1a9VpyHRkpn /zb/ySXsLtTjvZKa6CyMcXz73uizRxGZENJq8xXvS89p9JUYp4ALknig//YQ2rWUNaeK O3+Tx3bGp9of0fC3u3z7tw+/odYHMlkyR6e7Fy79ytBjXf1LVlo/3rmcJ1U17GfWrhjj jl3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YMKTZdgN+ApLkWCndc7XhEgCcK+nIdQXAhjOxRLrovs=; b=GVyISGjA0A4iUrkYw60dbGvb8yDWZhN0Rv8cSao+JdAprhKPy5hVgQwkNjMalzwabW 5xpxUAZxEzxtc4cBtt3dQaKGakZAITUI4OobBbx4e/kC1zUxvzBZ/u0nzpHz2NYKXr6S +WMz2OaFkragmp8Z3JvITxWDtmqNSpaUznFbAoeeEORowDB02rmPaEdRwecz8zVqNtTw dDSG1YKohfTXqJueQjDTWas8gkroRPnv0rSH9eHcfHSNz4+RvMYOLBYgInMdCLy5tGKo uZSSEfdC33oWEZkB7xcTZvpBzbLDvxiuXglZPl+Gv7wV3gm/6asSpaqXTLAaCqZypJN7 OS1w== X-Gm-Message-State: AOAM533HV8Bks2yXx72q+BVACSwFW/kH0PB91PBkK7HrbliN+umxv381 xaAe+85T6FlhSO5KnSkGyuvcCA== X-Google-Smtp-Source: ABdhPJzE1oxrOQvVokLNs2sj/ZfJYA4/9hHzo0LXS4aCsZyDz6uiaCLCjdEkUPcQzGEHcpTOPhQfqA== X-Received: by 2002:a0c:f986:: with SMTP id t6mr22149242qvn.15.1612897288164; Tue, 09 Feb 2021 11:01:28 -0800 (PST) Received: from localhost (70.44.39.90.res-cmts.bus.ptd.net. [70.44.39.90]) by smtp.gmail.com with ESMTPSA id 82sm2656726qkd.48.2021.02.09.11.01.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 11:01:27 -0800 (PST) From: Johannes Weiner To: Andrew Morton Cc: Muchun Song , Shakeel Butt , Michal Hocko , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH] fs: buffer: use raw page_memcg() on locked page Date: Tue, 9 Feb 2021 14:01:26 -0500 Message-Id: <20210209190126.97842-1-hannes@cmpxchg.org> X-Mailer: git-send-email 2.30.0 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: alloc_page_buffers() currently uses get_mem_cgroup_from_page() for charging the buffers to the page owner, which does an rcu-protected page->memcg lookup and acquires a reference. But buffer allocation has the page lock held throughout, which pins the page to the memcg and thereby the memcg - neither rcu nor holding an extra reference during the allocation are necessary. Use a raw page_memcg() instead. This was the last user of get_mem_cgroup_from_page(), delete it. Reported-by: Muchun Song Signed-off-by: Johannes Weiner Reviewed-by: Shakeel Butt Acked-by: Roman Gushchin Acked-by: Michal Hocko --- fs/buffer.c | 4 ++-- include/linux/memcontrol.h | 7 ------- mm/memcontrol.c | 23 ----------------------- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 96c7604f69b3..dc5d3e22c493 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -847,7 +847,8 @@ struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size, if (retry) gfp |= __GFP_NOFAIL; - memcg = get_mem_cgroup_from_page(page); + /* The page lock pins the memcg */ + memcg = page_memcg(page); old_memcg = set_active_memcg(memcg); head = NULL; @@ -868,7 +869,6 @@ struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size, } out: set_active_memcg(old_memcg); - mem_cgroup_put(memcg); return head; /* * In case anything failed, we just free everything we got. diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index a8c7a0ccc759..a44b2d51aecc 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -687,8 +687,6 @@ 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); - struct lruvec *lock_page_lruvec(struct page *page); struct lruvec *lock_page_lruvec_irq(struct page *page); struct lruvec *lock_page_lruvec_irqsave(struct page *page, @@ -1169,11 +1167,6 @@ 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 51778fa9b462..9e455815fb7a 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1048,29 +1048,6 @@ 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_memcg(page); - - if (mem_cgroup_disabled()) - return NULL; - - rcu_read_lock(); - /* Page should not get uncharged and freed memcg under us. */ - if (!memcg || WARN_ON_ONCE(!css_tryget(&memcg->css))) - memcg = root_mem_cgroup; - rcu_read_unlock(); - return memcg; -} -EXPORT_SYMBOL(get_mem_cgroup_from_page); - static __always_inline struct mem_cgroup *active_memcg(void) { if (in_interrupt())