Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4321739ybz; Tue, 28 Apr 2020 09:19:55 -0700 (PDT) X-Google-Smtp-Source: APiQypJyzmWi7Jov2znseowFqJ7wizWJH9pTz1lx5YmZCrUB1U0exf949cVsLwhzwhGNW5nJ+SE7 X-Received: by 2002:a05:6402:206f:: with SMTP id bd15mr24252730edb.24.1588090795771; Tue, 28 Apr 2020 09:19:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588090795; cv=none; d=google.com; s=arc-20160816; b=fWP/xwgcuNLjholN6+kinlTXbRBe9U8AWrFnWiJ9ELZZ4mC6rL1gdOA1pGLUME4fCm qRlgiksSZQEHVCVuoa8cJRvtfEkzC+1+uDiM9jn8/grdHbMQiHg2g86kXGYGmQOmKxFF blHBUKNpoRbXtoDCmp6O+zblXcfU+RYA7/edehmNsX2qf7uzZ978keucid+cYY7PY+AW E4jEnQJ3c/gcukoC4LhMCQWi5KaPJ9OH4YR61/QgD/opoRcSbPpG1wRnihEY1F9wRwt+ L2mTsxiuhOzdRuTc7wofm05PjGgu+4m4Njcm8MC3vFHW/f9WSMGjhg2Hh1wHDu6eapXU NhlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=rDRxVYoqu4jBaHjL5nQgf4JCTrI8hpo4fCoe5mCi1VY=; b=fhrJarui+W08WP/szbFsOcloaO1Ju+5dQ4qBQ44/xnYI1Lc4p/Y790SByP+geW20BH GphSaojZvOFpRqNpGS/KoS/D2j/2hd1REJf4K5FzCA4bX+8YDr5uhA2D30P9UpRsUvY2 I0i/nNdQE26QymdVKpsrTpqGiezMuhDeRlgSF9OQHym62kuVWqtPxmHEGBVnS84iPNEn st2tF8FMN2XXtpLLhbPA59nm3hsCund5t80+jBwINn+uFErs+jdN89SS2WsLqCUYhKTu RdYIz85x946Bzb8+WYmqPhbgNbqr8tVw2hPvJJcKlI3ARlAK7bbHB9NXzDJW9YcDO1ab e0lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=U5diXMQa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cm21si1839421edb.275.2020.04.28.09.19.25; Tue, 28 Apr 2020 09:19:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=U5diXMQa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728371AbgD1QPl (ORCPT + 99 others); Tue, 28 Apr 2020 12:15:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728225AbgD1QPl (ORCPT ); Tue, 28 Apr 2020 12:15:41 -0400 Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12BFDC03C1AB; Tue, 28 Apr 2020 09:15:41 -0700 (PDT) Received: by mail-qt1-x844.google.com with SMTP id z90so17706103qtd.10; Tue, 28 Apr 2020 09:15:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rDRxVYoqu4jBaHjL5nQgf4JCTrI8hpo4fCoe5mCi1VY=; b=U5diXMQaQ+jUdquhp3DncLsRDg3FzZOMxBGIGHLhVDQRNaSecGBAOx1bs6+OAtHGgT JhIDMrffKZr08/u8CfyfBan6NXy3spYxF5z9VfCYm9RmUb3VsC5C4guUdZo6bZm9vOM7 SKLXoxeJSJhIhuGMZ7ZeP4KqLo3TY2+XWoB2AexYvgn38x7wd8flXF4GT7rF0YqNSkFY PH4Ktt30Mar3F4Txq2SPLBRUiR76voOf3LdHYLs8/B1yVKQzvjQSMU/oFnercfmYsfAF yCZIgGq18PUv57d5PVBbskx8ekJOthBXbxOlOy7S7HOJG+eSHAmJ1NOn/ZAPJ8IG4mZO r2Lw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=rDRxVYoqu4jBaHjL5nQgf4JCTrI8hpo4fCoe5mCi1VY=; b=oHry/VrNuT9K9Egxzd91INcP8z1NRv+sZBS++2FDbZpsqB4UshKkfPl7VSsPrrBIlW HKMgB6ol3Bkzt/8yjO3etvzjJ1HZ78uj6VUNZ8bt5iXiBJcwtrD+ZqxRXGbxEv8xHN87 cDrg7Dyn31fZd0WFl+HD8/UEa+zSaxuL0qFaoDbzGbAN5YS/6gUMrpZW3n41MQJ+cZ8T guAZtuVuR7S+oGZJfl2RK4gR8coQT096u2MQnBkUayG+kG8kT8D3guwMMAYA6GFfrfRZ sBSzb+eGs/6a/ueE+akSw1Al+/90+k4LV8jWCVy+kB9+dAs+AFqwGR+CH9x8jjwa95gT mhUg== X-Gm-Message-State: AGi0PuYahToY42SWH5L/9ZnVkoi1lu1x9BZr11EH7jZE6JUYzxFl81WB X1o7wfZNQrX9lTQSSv6gZsw= X-Received: by 2002:ac8:3403:: with SMTP id u3mr197920qtb.274.1588090538743; Tue, 28 Apr 2020 09:15:38 -0700 (PDT) Received: from dschatzberg-fedora-PC0Y6AEN.thefacebook.com ([2620:10d:c091:480::1:3e4a]) by smtp.gmail.com with ESMTPSA id z2sm14087421qkc.28.2020.04.28.09.15.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 09:15:37 -0700 (PDT) From: Dan Schatzberg Cc: Johannes Weiner , Shakeel Butt , Roman Gushchin , Jens Axboe , Alexander Viro , Jan Kara , Amir Goldstein , Tejun Heo , Li Zefan , Michal Hocko , Vladimir Davydov , Andrew Morton , Hugh Dickins , Chris Down , Yang Shi , Ingo Molnar , "Peter Zijlstra (Intel)" , Mathieu Desnoyers , Andrea Arcangeli , Dan Schatzberg , Thomas Gleixner , linux-block@vger.kernel.org (open list:BLOCK LAYER), linux-kernel@vger.kernel.org (open list), linux-fsdevel@vger.kernel.org (open list:FILESYSTEMS (VFS and infrastructure)), cgroups@vger.kernel.org (open list:CONTROL GROUP (CGROUP)), linux-mm@kvack.org (open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)) Subject: [PATCH v5 2/4] mm: support nesting memalloc_use_memcg() Date: Tue, 28 Apr 2020 12:13:48 -0400 Message-Id: <20200428161355.6377-3-schatzberg.dan@gmail.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200428161355.6377-1-schatzberg.dan@gmail.com> References: <20200428161355.6377-1-schatzberg.dan@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Weiner The memalloc_use_memcg() function to override the default memcg accounting context currently doesn't nest. But the patches to make the loop driver cgroup-aware will end up nesting: [ 98.137605] alloc_page_buffers+0x210/0x288 [ 98.141799] __getblk_gfp+0x1d4/0x400 [ 98.145475] ext4_read_block_bitmap_nowait+0x148/0xbc8 [ 98.150628] ext4_mb_init_cache+0x25c/0x9b0 [ 98.154821] ext4_mb_init_group+0x270/0x390 [ 98.159014] ext4_mb_good_group+0x264/0x270 [ 98.163208] ext4_mb_regular_allocator+0x480/0x798 [ 98.168011] ext4_mb_new_blocks+0x958/0x10f8 [ 98.172294] ext4_ext_map_blocks+0xec8/0x1618 [ 98.176660] ext4_map_blocks+0x1b8/0x8a0 [ 98.180592] ext4_writepages+0x830/0xf10 [ 98.184523] do_writepages+0xb4/0x198 [ 98.188195] __filemap_fdatawrite_range+0x170/0x1c8 [ 98.193086] filemap_write_and_wait_range+0x40/0xb0 [ 98.197974] ext4_punch_hole+0x4a4/0x660 [ 98.201907] ext4_fallocate+0x294/0x1190 [ 98.205839] loop_process_work+0x690/0x1100 [ 98.210032] loop_workfn+0x2c/0x110 [ 98.213529] process_one_work+0x3e0/0x648 [ 98.217546] worker_thread+0x70/0x670 [ 98.221217] kthread+0x1b8/0x1c0 [ 98.224452] ret_from_fork+0x10/0x18 where loop_process_work() sets the memcg override to the memcg that submitted the IO request, and alloc_page_buffers() sets the override to the memcg that instantiated the cache page, which may differ. Make memalloc_use_memcg() return the old memcg and convert existing users to a stacking model. Delete the unused memalloc_unuse_memcg(). Signed-off-by: Johannes Weiner Reviewed-by: Shakeel Butt Acked-by: Roman Gushchin --- fs/buffer.c | 6 +++--- fs/notify/fanotify/fanotify.c | 5 +++-- fs/notify/inotify/inotify_fsnotify.c | 5 +++-- include/linux/sched/mm.h | 28 +++++++++------------------- 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 599a0bf7257b..b4e99c6b52ec 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -851,13 +851,13 @@ struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size, struct buffer_head *bh, *head; gfp_t gfp = GFP_NOFS | __GFP_ACCOUNT; long offset; - struct mem_cgroup *memcg; + struct mem_cgroup *memcg, *old_memcg; if (retry) gfp |= __GFP_NOFAIL; memcg = get_mem_cgroup_from_page(page); - memalloc_use_memcg(memcg); + old_memcg = memalloc_use_memcg(memcg); head = NULL; offset = PAGE_SIZE; @@ -876,7 +876,7 @@ struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size, set_bh_page(bh, page, offset); } out: - memalloc_unuse_memcg(); + memalloc_use_memcg(old_memcg); mem_cgroup_put(memcg); return head; /* diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 5435a40f82be..54c787cd6efb 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -353,6 +353,7 @@ struct fanotify_event *fanotify_alloc_event(struct fsnotify_group *group, gfp_t gfp = GFP_KERNEL_ACCOUNT; struct inode *id = fanotify_fid_inode(inode, mask, data, data_type); const struct path *path = fsnotify_data_path(data, data_type); + struct mem_cgroup *oldmemcg; /* * For queues with unlimited length lost events are not expected and @@ -366,7 +367,7 @@ struct fanotify_event *fanotify_alloc_event(struct fsnotify_group *group, gfp |= __GFP_RETRY_MAYFAIL; /* Whoever is interested in the event, pays for the allocation. */ - memalloc_use_memcg(group->memcg); + oldmemcg = memalloc_use_memcg(group->memcg); if (fanotify_is_perm_event(mask)) { struct fanotify_perm_event *pevent; @@ -451,7 +452,7 @@ struct fanotify_event *fanotify_alloc_event(struct fsnotify_group *group, } } out: - memalloc_unuse_memcg(); + memalloc_use_memcg(oldmemcg); return event; } diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c index 2ebc89047153..d27c6e83cea6 100644 --- a/fs/notify/inotify/inotify_fsnotify.c +++ b/fs/notify/inotify/inotify_fsnotify.c @@ -69,6 +69,7 @@ int inotify_handle_event(struct fsnotify_group *group, int ret; int len = 0; int alloc_len = sizeof(struct inotify_event_info); + struct mem_cgroup *oldmemcg; if (WARN_ON(fsnotify_iter_vfsmount_mark(iter_info))) return 0; @@ -93,9 +94,9 @@ int inotify_handle_event(struct fsnotify_group *group, * trigger OOM killer in the target monitoring memcg as it may have * security repercussion. */ - memalloc_use_memcg(group->memcg); + oldmemcg = memalloc_use_memcg(group->memcg); event = kmalloc(alloc_len, GFP_KERNEL_ACCOUNT | __GFP_RETRY_MAYFAIL); - memalloc_unuse_memcg(); + memalloc_use_memcg(oldmemcg); if (unlikely(!event)) { /* diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h index c49257a3b510..95e8bfb0cab1 100644 --- a/include/linux/sched/mm.h +++ b/include/linux/sched/mm.h @@ -316,31 +316,21 @@ static inline void memalloc_nocma_restore(unsigned int flags) * __GFP_ACCOUNT allocations till the end of the scope will be charged to the * given memcg. * - * NOTE: This function is not nesting safe. + * NOTE: This function can nest. Users must save the return value and + * reset the previous value after their own charging scope is over */ -static inline void memalloc_use_memcg(struct mem_cgroup *memcg) +static inline struct mem_cgroup * +memalloc_use_memcg(struct mem_cgroup *memcg) { - WARN_ON_ONCE(current->active_memcg); + struct mem_cgroup *old = current->active_memcg; current->active_memcg = memcg; -} - -/** - * memalloc_unuse_memcg - Ends the remote memcg charging scope. - * - * This function marks the end of the remote memcg charging scope started by - * memalloc_use_memcg(). - */ -static inline void memalloc_unuse_memcg(void) -{ - current->active_memcg = NULL; + return old; } #else -static inline void memalloc_use_memcg(struct mem_cgroup *memcg) -{ -} - -static inline void memalloc_unuse_memcg(void) +static inline struct mem_cgroup * +memalloc_use_memcg(struct mem_cgroup *memcg) { + return NULL; } #endif -- 2.24.1