Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp6378843rwb; Tue, 9 Aug 2022 14:19:49 -0700 (PDT) X-Google-Smtp-Source: AA6agR4kigVZAuuJOY9Iel29kbf1hee8jPHA6XJ1P1zB7LJYY8959NQI4TNbkbEGRUqkmWijxGeN X-Received: by 2002:aa7:8096:0:b0:52d:d5f6:2ea6 with SMTP id v22-20020aa78096000000b0052dd5f62ea6mr25148236pff.0.1660079989609; Tue, 09 Aug 2022 14:19:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660079989; cv=none; d=google.com; s=arc-20160816; b=nxqiAiQNVirZQrEn4s5nB1vHbtauQq3NjksoiQF7BTH7U714EnZk2fo2xM3ZS8nSVc QffDZkQrd57wsqllEDqcK9WErOFFUphyisYsZ5kmRKphYGwH9igJLr90ftmywY+rMcX8 Ue6SrM8kccuB+3Lo6OuGYohTgfy0EtEsUVrYmjMgn9Y6t8bLWmnI8b05OctpmR31jNWu i6LE5HxRNbIJvlwDjYX0fxBROGc8xnZvSlEpQwBQ/SuExW6Q0a4jXoXTpztfpgf2PHht Z9fMz3sGpRJHHyG7kgqgPPNthyY5o8pdlfcwO3dVLAoybDF45SJ03BivNxFOwxDFNAc4 zoyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=OiRiIa99R7oGv2piguqWalTBcjueSAci3acszFCpEmU=; b=Zy0ARL1u0hm3atLAXRqK9hgttsvcPRtgCbFvXqRV0Yf9Z66MyOOQ6dSGaeT7BzYcue BEZWcYpc2+FrZ1berPv/BMdUdyzc77NCWYCUUpFKyEVG3PBJJnDoErDxdnay2grH1d/W NN8v4HOMla6nRQkoAE0HpGo25F73GKVfIogdRcLYE5a8+eNjo3DCIZ3Db6E2LwMiAGJ1 klxx8dwKBEHrgnql1TQgvrvvOIujsXL8Fh3a3wHF5l1lNLgDL+5f7WH4Byqk27Vd+8OO Rt0cLoLkrCYZ4DKUmetqRMQQWm5B7Osa0ZAHuSWZyG/ae7AKfubBiftQDkYqMF2qXrbc WG/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="eR/ti91y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q13-20020a17090a68cd00b001efbff1c4a3si119465pjj.76.2022.08.09.14.19.35; Tue, 09 Aug 2022 14:19:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="eR/ti91y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230005AbiHIVAC (ORCPT + 99 others); Tue, 9 Aug 2022 17:00:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229491AbiHIU7d (ORCPT ); Tue, 9 Aug 2022 16:59:33 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 704E42A952 for ; Tue, 9 Aug 2022 13:59:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660078771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OiRiIa99R7oGv2piguqWalTBcjueSAci3acszFCpEmU=; b=eR/ti91yIB0h7loWSo1NcdBrYUQOg37sAxTKGqWNoUvkYdkmSBwYZCFOQFihvG8Rzf1ua1 XheReIurcLKitW3rXtwNQ3sQnA2+B4yM7oMNxmbsdZitnioPKRXBiTFrFzUFZLPMTV6NwU EzLMxzWm/pcV1O7NQVWzZq/0Y1TiOMM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-623-3cftRi9rOVSovNZExMJVFg-1; Tue, 09 Aug 2022 16:59:24 -0400 X-MC-Unique: 3cftRi9rOVSovNZExMJVFg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84E6038173CC; Tue, 9 Aug 2022 20:59:23 +0000 (UTC) Received: from llong.com (unknown [10.22.18.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 151BA40CF8EB; Tue, 9 Aug 2022 20:59:23 +0000 (UTC) From: Waiman Long To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Waiman Long Subject: [PATCH] mm/slab_common: Deleting kobject in kmem_cache_destroy() without holding slab_mutex/cpu_hotplug_lock Date: Tue, 9 Aug 2022 16:59:01 -0400 Message-Id: <20220809205901.76595-1-longman@redhat.com> MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A circular locking problem is reported by lockdep due to the following circular locking dependency. +--> cpu_hotplug_lock --> slab_mutex --> kn->active#126 --+ | | +---------------------------------------------------------+ One way to break this circular locking chain is to avoid holding cpu_hotplug_lock and slab_mutex while deleting the kobject in sysfs_slab_unlink() which should be equivalent to doing a write_lock and write_unlock pair of the kn->active virtual lock. Since the kobject structures are not protected by slab_mutex or the cpu_hotplug_lock, we can certainly release those locks before doing the delete operation. Move sysfs_slab_unlink() and sysfs_slab_release() to the newly created kmem_cache_release() and call it outside the slab_mutex & cpu_hotplug_lock critical sections. Signed-off-by: Waiman Long --- mm/slab_common.c | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index 17996649cfe3..9274fb03563e 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -392,6 +392,30 @@ kmem_cache_create(const char *name, unsigned int size, unsigned int align, } EXPORT_SYMBOL(kmem_cache_create); +#ifdef SLAB_SUPPORTS_SYSFS +/* + * For a given kmem_cache, kmem_cache_destroy() should only be called + * once or there will be a use-after-free problem. The actual deletion + * and release of the kobject does not need slab_mutex or cpu_hotplug_lock + * protection. So they are now done without holding those locks. + */ +static void kmem_cache_release(struct kmem_cache *s, bool workfn) +{ + if (!workfn) + sysfs_slab_unlink(s); + + if (workfn || !(s->flags & SLAB_TYPESAFE_BY_RCU)) + sysfs_slab_release(s); + else + schedule_work(&slab_caches_to_rcu_destroy_work); +} +#else +static inline void kmem_cache_release(struct kmem_cache *s, bool workfn) +{ + slab_kmem_cache_release(s); +} +#endif + static void slab_caches_to_rcu_destroy_workfn(struct work_struct *work) { LIST_HEAD(to_destroy); @@ -418,11 +442,7 @@ static void slab_caches_to_rcu_destroy_workfn(struct work_struct *work) list_for_each_entry_safe(s, s2, &to_destroy, list) { debugfs_slab_release(s); kfence_shutdown_cache(s); -#ifdef SLAB_SUPPORTS_SYSFS - sysfs_slab_release(s); -#else - slab_kmem_cache_release(s); -#endif + kmem_cache_release(s, true); } } @@ -437,20 +457,10 @@ static int shutdown_cache(struct kmem_cache *s) list_del(&s->list); if (s->flags & SLAB_TYPESAFE_BY_RCU) { -#ifdef SLAB_SUPPORTS_SYSFS - sysfs_slab_unlink(s); -#endif list_add_tail(&s->list, &slab_caches_to_rcu_destroy); - schedule_work(&slab_caches_to_rcu_destroy_work); } else { kfence_shutdown_cache(s); debugfs_slab_release(s); -#ifdef SLAB_SUPPORTS_SYSFS - sysfs_slab_unlink(s); - sysfs_slab_release(s); -#else - slab_kmem_cache_release(s); -#endif } return 0; @@ -465,14 +475,16 @@ void slab_kmem_cache_release(struct kmem_cache *s) void kmem_cache_destroy(struct kmem_cache *s) { + int refcnt; + if (unlikely(!s) || !kasan_check_byte(s)) return; cpus_read_lock(); mutex_lock(&slab_mutex); - s->refcount--; - if (s->refcount) + refcnt = --s->refcount; + if (refcnt) goto out_unlock; WARN(shutdown_cache(s), @@ -481,6 +493,8 @@ void kmem_cache_destroy(struct kmem_cache *s) out_unlock: mutex_unlock(&slab_mutex); cpus_read_unlock(); + if (!refcnt) + kmem_cache_release(s, false); } EXPORT_SYMBOL(kmem_cache_destroy); -- 2.31.1