Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp3926516imm; Tue, 29 May 2018 17:14:18 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIt5ADKPY1Nd0hYlOogblk+sLI73coEQm92t8Vy/mbHRVgD5Y+uCsaqLXekKA3XFD3SPyAk X-Received: by 2002:a17:902:9689:: with SMTP id n9-v6mr493656plp.363.1527639258231; Tue, 29 May 2018 17:14:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527639258; cv=none; d=google.com; s=arc-20160816; b=JzXEFtgeXrdS9Qx7FnMD7+79zEAFc2iHeGMCmFhU2es0bxwQINdXyvgHLYm9uPTYPk Gzh3nvRPz9tHrsRs5iQk9XtmHRW3joAu6OnFws71tbvUUWbx7jQgFnjeoaX5aEJ3nrXp QS6VPpv4D7TeDtDxLbd9OdUc/NjRL7Vd1fBUmpLaOO2wfhTErbqamYJZ/KGgiNI3dyzB icT/iPQiHl5PwkiEmkAMDh5ONfT9NLONXENuW6bRFLcYuFDuA9vyXcYFW/dIPlCEw6hv kfNtwX2+uV/GE4sJQplhz4U7VpHDpRKBSOdABOEXVgMjIvOrH9j8vjAxO91Z0xAdimwp avIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=2OJnmQ7l7NGFZP9ipCIfC7mNh4H09z1pqCsCgocmqlg=; b=RbMfeGCIvzkCvbnCRutRd1zWRNGmzazmGrhFlfT8DZmsxbSxvOe6y0KPKhQgzPBNJn GvS2m/1l9sPI/392GwtYqJLiUmqRtGZWp/Y+QAQtZ41briN7f8/3NZaoMPBSj1uwbHqI rWgWuLLgOIG8/UoJMWTj9tmHC3ynQD0YS6QZFZ9OpsA6IZvNaxbKIS8xcRg6LPAchl/L ONMkFGQnTcbD/p2ayUGWkq0zR3hSrfRkitv32wlHEbtEgq1yA7g+N8Plzay4sajr4i+x 26kVI1mZ0o4qa1Nikv1YeF5trlI+lzl9OlKkyOargyQzMCTgSGnQj/+Wun2xFFKfLwTl bVrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=sGtyIGYK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v199-v6si11381161pgb.87.2018.05.29.17.14.03; Tue, 29 May 2018 17:14:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=sGtyIGYK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755445AbeE3AMQ (ORCPT + 99 others); Tue, 29 May 2018 20:12:16 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:38803 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755130AbeE3AMM (ORCPT ); Tue, 29 May 2018 20:12:12 -0400 Received: by mail-pg0-f67.google.com with SMTP id c9-v6so4471320pgf.5 for ; Tue, 29 May 2018 17:12:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=2OJnmQ7l7NGFZP9ipCIfC7mNh4H09z1pqCsCgocmqlg=; b=sGtyIGYK4ifx7d1x9COXRmNyEoP2iG9FUajUa3T0KuY2mASWiq5x3XrKRS2BjMiTN8 QgAm6Szq+2t895V94c9pfSbYTAIITezaFw4NC/o9wmI6uK6nyMK1tSB7WG5dXomzIbyf jRUdED+tSv65W/o/Guz/dkn2VdpB6T7wHSMLScmP4acScM2HkfVL+sJUKgLSxFgKsKJF Pdqamd4v7fuGzE2C22qLYRFO61Tdt5CfFOqlFtLMtUbN0P/+N/rnd/R+/NtPUg24PQb2 iVd+kMCuKFjjzo/Svn/s4C/Wk1kvgpIYywoJoCsyonvcJMdPyAV+EgirbxsnS+HOYldA GZFA== 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; bh=2OJnmQ7l7NGFZP9ipCIfC7mNh4H09z1pqCsCgocmqlg=; b=FQ//SsRntE6anP6T7fZGkE75++kdVC/UH7MF7bYOWm3qgMjPUABRf78dmJ7DIxY4ih /3Go1eRpFJbPFrCW4BngRURkazbn48erIo+EsMcD62aBAeAWlY8Oc/SIkySLYFpUUFDt 4cqpC30B9bBmJfHMC6XlWlkIrAeZ9j0rHB8wdCxahtOp/FqeJejGqek07CI2EJuvdX2t 5bYwftk02QAfREeqoBQFp/f4vxZIvEB5ATEnqpASWTjFbN7P8LZ+aYOM6bSkV3OZ8OmH ELe5tXtm8U/9lgFMZ0LYU3cJ2EF6tdVW56zV6Lkb6woDBo2QTyr0AechE3LyJPanuqgB 22Fw== X-Gm-Message-State: ALKqPwc/E9q92bg1f8PJgArVfDlzIulTQZxNyCmJdVW30kSd5Sz3FZ69 VYs8tt+jMgq9D7epZqmFc7t6YQ== X-Received: by 2002:a62:9e88:: with SMTP id f8-v6mr512253pfk.206.1527639131138; Tue, 29 May 2018 17:12:11 -0700 (PDT) Received: from shakeelb.mtv.corp.google.com ([2620:15c:2cb:201:3a5f:3a4f:fa44:6b63]) by smtp.gmail.com with ESMTPSA id r79-v6sm13295844pfe.115.2018.05.29.17.12.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 May 2018 17:12:09 -0700 (PDT) From: Shakeel Butt To: Michal Hocko , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Greg Thelen , Johannes Weiner , Vladimir Davydov , Tejun Heo Cc: Linux MM , Cgroups , LKML , Shakeel Butt Subject: [PATCH v3] mm: fix race between kmem_cache destroy, create and deactivate Date: Tue, 29 May 2018 17:12:04 -0700 Message-Id: <20180530001204.183758-1-shakeelb@google.com> X-Mailer: git-send-email 2.17.0.921.gf22659ad46-goog Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The memcg kmem cache creation and deactivation (SLUB only) is asynchronous. If a root kmem cache is destroyed whose memcg cache is in the process of creation or deactivation, the kernel may crash. Example of one such crash: general protection fault: 0000 [#1] SMP PTI CPU: 1 PID: 1721 Comm: kworker/14:1 Not tainted 4.17.0-smp ... Workqueue: memcg_kmem_cache kmemcg_deactivate_workfn RIP: 0010:has_cpu_slab ... Call Trace: ? on_each_cpu_cond __kmem_cache_shrink kmemcg_cache_deact_after_rcu kmemcg_deactivate_workfn process_one_work worker_thread kthread ret_from_fork+0x35/0x40 To fix this race, on root kmem cache destruction, mark the cache as dying and flush the workqueue used for memcg kmem cache creation and deactivation. Signed-off-by: Shakeel Butt --- Changelog since v2: - Instead of refcount, flush the workqueue Changelog since v1: - Added more documentation to the code - Renamed fields to be more readable --- include/linux/slab.h | 1 + mm/slab_common.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 9ebe659bd4a5..71c5467d99c1 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -658,6 +658,7 @@ struct memcg_cache_params { struct memcg_cache_array __rcu *memcg_caches; struct list_head __root_caches_node; struct list_head children; + bool dying; }; struct { struct mem_cgroup *memcg; diff --git a/mm/slab_common.c b/mm/slab_common.c index b0dd9db1eb2f..a3496375f5ea 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -136,6 +136,7 @@ void slab_init_memcg_params(struct kmem_cache *s) s->memcg_params.root_cache = NULL; RCU_INIT_POINTER(s->memcg_params.memcg_caches, NULL); INIT_LIST_HEAD(&s->memcg_params.children); + s->memcg_params.dying = false; } static int init_memcg_params(struct kmem_cache *s, @@ -608,7 +609,7 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg, * The memory cgroup could have been offlined while the cache * creation work was pending. */ - if (memcg->kmem_state != KMEM_ONLINE) + if (memcg->kmem_state != KMEM_ONLINE || root_cache->memcg_params.dying) goto out_unlock; idx = memcg_cache_id(memcg); @@ -712,6 +713,9 @@ void slab_deactivate_memcg_cache_rcu_sched(struct kmem_cache *s, WARN_ON_ONCE(s->memcg_params.deact_fn)) return; + if (s->memcg_params.root_cache->memcg_params.dying) + return; + /* pin memcg so that @s doesn't get destroyed in the middle */ css_get(&s->memcg_params.memcg->css); @@ -823,11 +827,24 @@ static int shutdown_memcg_caches(struct kmem_cache *s) return -EBUSY; return 0; } + +static void flush_memcg_workqueue(struct kmem_cache *s) +{ + mutex_lock(&slab_mutex); + s->memcg_params.dying = true; + mutex_unlock(&slab_mutex); + + flush_workqueue(memcg_kmem_cache_wq); +} #else static inline int shutdown_memcg_caches(struct kmem_cache *s) { return 0; } + +static inline void flush_memcg_workqueue(struct kmem_cache *s) +{ +} #endif /* CONFIG_MEMCG && !CONFIG_SLOB */ void slab_kmem_cache_release(struct kmem_cache *s) @@ -845,6 +862,8 @@ void kmem_cache_destroy(struct kmem_cache *s) if (unlikely(!s)) return; + flush_memcg_workqueue(s); + get_online_cpus(); get_online_mems(); -- 2.17.0.921.gf22659ad46-goog