From patchwork Wed Sep 19 00:45:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shakeel Butt X-Patchwork-Id: 10605129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40A3414DA for ; Wed, 19 Sep 2018 00:45:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 256182B618 for ; Wed, 19 Sep 2018 00:45:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 187EC2B63B; Wed, 19 Sep 2018 00:45:16 +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 870882B618 for ; Wed, 19 Sep 2018 00:45:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC6A28E0002; Tue, 18 Sep 2018 20:45:13 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D761A8E0001; Tue, 18 Sep 2018 20:45:13 -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 C664B8E0002; Tue, 18 Sep 2018 20:45:13 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by kanga.kvack.org (Postfix) with ESMTP id 940558E0001 for ; Tue, 18 Sep 2018 20:45:13 -0400 (EDT) Received: by mail-yb1-f199.google.com with SMTP id a12-v6so1755815ybe.21 for ; Tue, 18 Sep 2018 17:45:13 -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:date:message-id:mime-version :subject:from:to:cc; bh=dPLvabeEu2R5NLjbgna2in9ApyNxHhQTFLi6gYIcZD0=; b=XqpO4FmLCNY2eIbrkDB2+7eEKnyt5lMNtQ4EyLQ6zJ6QE1Sgo3DG3f6/5pa4i1y/Kl nL9paOpUmN15+SZmaLYAUMKlq6we84gNm6eqz+8uRcZJ8kPOxRYnw0qQzqEVH/Aw79wS qPUF1yz7W3IlIsKGBqS62piqE38tU3hUOrUy7GrgGg7hcfUXnONsVPLvSnRe40nZO2kX e/GnY+NqboW3dN2abDRjJZ2R7XwoAkM7o1IzOVagnTTDKg4FTbIimV5xKozCrVQ1gmCU qo8kp4grYM3RAAKlYPSa+g26nq5JtmAJDzIpjxSryDKqs1iB5620mE9ltD5SgqzqHPzr 5zmA== X-Gm-Message-State: APzg51D9bxZYEcDxrqJ3KPTBRZcv+3Woeiy7nkK5PHy8UT+8wc/50Ctj H77DCGLf79OVGAKFoRQ4VEdB/uHKvS4SluNlMbJhmexYCVVYy5E7VOKzc/2XAoUAdbdjjHeUWxl Ez8lZitJuUBXQBosILr/Rhku572jL6DG5TLxfWIgpgnPOrLSCVZEt53YeIiNZ7LxER40B40uBWl jzIbJchNLeQ7LoQMXlKAXBafiO5baQ5qP1tYpKsY0cSF30byNS8iZccdaANhU4xJKdk66XMhCpE SzD/8jrXxE9ErD9kLcBIhQ/Xco1h2HgJzGy8KfAKNpmcxynV/7Cs4tXqsICQQyd/nMFKHGjzKwF 9lP2lPANdK5XKxB2AUvkXnRP4x2zgXRsAn3mhjW/guTQal4chi0AeUOdg3s+N8m261+XXjgay6p H X-Received: by 2002:a25:f807:: with SMTP id u7-v6mr13934975ybd.7.1537317913253; Tue, 18 Sep 2018 17:45:13 -0700 (PDT) X-Received: by 2002:a25:f807:: with SMTP id u7-v6mr13934954ybd.7.1537317912143; Tue, 18 Sep 2018 17:45:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537317912; cv=none; d=google.com; s=arc-20160816; b=JLs6XHf9R8dO9vNS+9gByFBIQyel+tgZl+4FMSsv0jzKEMuOyV0WOMCrRPLJihsot7 5mvXu4BthmZT7Pwoa7FvkLVCa9l+YmRwnt97cMsDkP9dWh921oPfW2NhQ894fPAm8h84 nZSyx6g383Od3lxspInKh9WmDgrMKWWbPcLN9exLYWml4Oq7DDSHuvKHXx61aaEq6bZl ZXbfTXVwzT/39Cx/mdXFi63Ynb1LMSsQfWp9wm+YZQkr+7ugIGB6wNuR8mccbUJdMo2F Sx4nRcuUaqB1Kgu25+uBAeu6lXvXNDqS4HBgY4ocCzxmpkRr1wlEEWeZrgEyLk17+/EY ijkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:mime-version:message-id:date:dkim-signature; bh=dPLvabeEu2R5NLjbgna2in9ApyNxHhQTFLi6gYIcZD0=; b=sronJxC4BFyIinvGc46C6oIEfkqOD95ViQihxULXvxiiuepRrdXDazjB9ijxuxDkRo Yp6KToJGhzpwPrEk+A8Q6PzCyYhSbc/GlbvRTQJtj6/ogtFVewNhOEIeiE3TeWcdItCS GU/QQAqbGjEGz1XV2Og/XAunqmgJSxo3f1d+Tf3ilDQVpe0HyTLxPA4gSOVcGD9BiJgP 3Jr3NhwuV2I9s2dCXhdYBAkATkWsJTDQ/8MLGw3ZYRD2egfaElbbEnQzo5QxfBtNQwgG fXUilqENQ3M7+0/SjjCd6zZO6bSEIl0oAfAcBKUGCpHNNCNdx4ePE5MzMhtMQQVRLJyQ h0yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=D9KTvBvr; spf=pass (google.com: domain of 3f5yhwwgkclgqfyiccjzemmejc.amkjglsv-kkityai.mpe@flex--shakeelb.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3F5yhWwgKCLgqfYiccjZemmejc.amkjglsv-kkitYai.mpe@flex--shakeelb.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) by mx.google.com with SMTPS id 133-v6sor2339360ywm.438.2018.09.18.17.45.11 for (Google Transport Security); Tue, 18 Sep 2018 17:45:12 -0700 (PDT) Received-SPF: pass (google.com: domain of 3f5yhwwgkclgqfyiccjzemmejc.amkjglsv-kkityai.mpe@flex--shakeelb.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=D9KTvBvr; spf=pass (google.com: domain of 3f5yhwwgkclgqfyiccjzemmejc.amkjglsv-kkityai.mpe@flex--shakeelb.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3F5yhWwgKCLgqfYiccjZemmejc.amkjglsv-kkitYai.mpe@flex--shakeelb.bounces.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=date:message-id:mime-version:subject:from:to:cc; bh=dPLvabeEu2R5NLjbgna2in9ApyNxHhQTFLi6gYIcZD0=; b=D9KTvBvrrAn23w6+nsWFdBhh5C7g8llWsnMC/BzXW0nGAXspOy4e9BubHJLItqLxt5 nbZlHvMY08B0mvPSdc/43Vf21U8YDgbIBpJBLb+PA7eg03ur18PwVxfnbekEvNqXyK6m zKYVbVPRC4QTO3I+KOQ2NESTqBDI5VgcuP+/ocHFqQzGJfiR2Jfr/n4iXqS1xacLOskx BXLhnwKFNv5XEYvMkiU+FgdtXU2sg8RkXl9XNKHdl+DnQFvnfRhSlZRxAzLerEvninOv sdO2jN0nCRQJeKEGCDI6500p8Ca3xckLP6psNtZBY0Ag9FR1m0VYeviPkbi+MxKiNwDS eDyg== X-Google-Smtp-Source: ANB0VdYR0M8iYbdDE6eEQVtSk0vNIl4Lqjjd4AmEHMfpP7qupf0EQT4vugvnaWs2cWFbVQqC8eqUnFc6rnqbng== X-Received: by 2002:a81:180b:: with SMTP id 11-v6mr3712124ywy.19.1537317911673; Tue, 18 Sep 2018 17:45:11 -0700 (PDT) Date: Tue, 18 Sep 2018 17:45:01 -0700 Message-Id: <20180919004501.178023-1-shakeelb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.19.0.397.gdd90340f6a-goog Subject: [PATCH] memcg: remove memcg_kmem_skip_account From: Shakeel Butt To: Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Greg Thelen Cc: linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Shakeel Butt 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 flag memcg_kmem_skip_account was added during the era of opt-out kmem accounting. There is no need for such flag in the opt-in world as there aren't any __GFP_ACCOUNT allocations within memcg_create_cache_enqueue(). Signed-off-by: Shakeel Butt Acked-by: Johannes Weiner --- include/linux/sched.h | 3 --- mm/memcontrol.c | 24 +----------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 977cb57d7bc9..c30e3cd4b81c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -723,9 +723,6 @@ struct task_struct { #endif #ifdef CONFIG_MEMCG unsigned in_user_fault:1; -#ifdef CONFIG_MEMCG_KMEM - unsigned memcg_kmem_skip_account:1; -#endif #endif #ifdef CONFIG_COMPAT_BRK unsigned brk_randomized:1; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e79cb59552d9..bde698a0bb99 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2460,7 +2460,7 @@ static void memcg_kmem_cache_create_func(struct work_struct *w) /* * Enqueue the creation of a per-memcg kmem_cache. */ -static void __memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, +static void memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, struct kmem_cache *cachep) { struct memcg_kmem_cache_create_work *cw; @@ -2478,25 +2478,6 @@ static void __memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, queue_work(memcg_kmem_cache_wq, &cw->work); } -static void memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, - struct kmem_cache *cachep) -{ - /* - * We need to stop accounting when we kmalloc, because if the - * corresponding kmalloc cache is not yet created, the first allocation - * in __memcg_schedule_kmem_cache_create will recurse. - * - * However, it is better to enclose the whole function. Depending on - * the debugging options enabled, INIT_WORK(), for instance, can - * trigger an allocation. This too, will make us recurse. Because at - * this point we can't allow ourselves back into memcg_kmem_get_cache, - * the safest choice is to do it like this, wrapping the whole function. - */ - current->memcg_kmem_skip_account = 1; - __memcg_schedule_kmem_cache_create(memcg, cachep); - current->memcg_kmem_skip_account = 0; -} - static inline bool memcg_kmem_bypass(void) { if (in_interrupt() || !current->mm || (current->flags & PF_KTHREAD)) @@ -2531,9 +2512,6 @@ struct kmem_cache *memcg_kmem_get_cache(struct kmem_cache *cachep) if (memcg_kmem_bypass()) return cachep; - if (current->memcg_kmem_skip_account) - return cachep; - memcg = get_mem_cgroup_from_current(); kmemcg_id = READ_ONCE(memcg->kmemcg_id); if (kmemcg_id < 0)