From patchwork Tue Apr 13 10:07:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Glitta X-Patchwork-Id: 12200009 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,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 E270EC433B4 for ; Tue, 13 Apr 2021 10:07:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8BD20613C1 for ; Tue, 13 Apr 2021 10:07:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BD20613C1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EAAC86B006E; Tue, 13 Apr 2021 06:07:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E5A2D6B0070; Tue, 13 Apr 2021 06:07:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C88606B0071; Tue, 13 Apr 2021 06:07:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0162.hostedemail.com [216.40.44.162]) by kanga.kvack.org (Postfix) with ESMTP id A5E8F6B006E for ; Tue, 13 Apr 2021 06:07:51 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 4A1F945CD for ; Tue, 13 Apr 2021 10:07:51 +0000 (UTC) X-FDA: 78026917542.20.19B5404 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by imf16.hostedemail.com (Postfix) with ESMTP id 3D3A280192E3 for ; Tue, 13 Apr 2021 10:07:50 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id h4so6801720wrt.12 for ; Tue, 13 Apr 2021 03:07:50 -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:mime-version :content-transfer-encoding; bh=FwM59yTbDnSoBD6KRDn+z40LZ7IN7rcrI7Nk5SqbzKk=; b=DmlHPLWjktVtVCap8dnE1YNFhOzBBX2MikJhZs80jTxbZXQbAu0XaH2k4E9CCyFNnB llQQ5U246amGzAotRafCx3zfT6S9116pgxiVrwmiYNDskkMzIOzhAxO6ZRAVohV2itq9 lmRmHHwrjWfPUr8GGkRhwfip9og38JOALfflR7MMcXoNcNsvx6WVC+Pe3h+11hJPtGb4 Glsjv92p1DnUelTcU6LaMw1bvwabzXwLOtAjxh7T4sMFfa1Z6RxSv1ZmW3Pg54LCKORT j2JwjOT0A+C66rMdQw7zwjAtBc9l/HBCp2uIwCpm8i3cfxW3iws+ajIkVJgR4qnyzdCE Qv4A== 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=FwM59yTbDnSoBD6KRDn+z40LZ7IN7rcrI7Nk5SqbzKk=; b=i1sTfVkA1LGRj90CmNUwcSXfoLCkG/9OghGgxaL1nfh+bWVfN2jbXY2W3OpMUWcK0T Oo72JLRG+nj7pWdzji+oIRRmuAgt2ilZsUFaG07Tj/DvKw99X0AzQ3DvAVZ0L+LJVfdm KRl3vfyAgPbc/J5F1JaCZgh51Bz+qWPpJPP8LkxP9D4tuRGGvtfce7LxaXd9xGDbRfck RU/L7RRqDF631SYOefA+SURa82Ke2Sn+R/1s1rbO23+iVHSCUOhhzhf7zI6Re1WebdXF Kcu5f9+mPtIfEAT3ddPiuKWxhYx1Q3LjwDmpTGOIIYoMSgFHCMF6K4rNc8rXmlMVzCP6 doMg== X-Gm-Message-State: AOAM530W4dMKs5aUL5XTsvtHBOUoVgRsVi0bj2TCNSXG6FEqeY8edZrH 51a1LT3Wpx5qU8sCalMKe54= X-Google-Smtp-Source: ABdhPJwXFmzq87jl09bdCGZ4jT2r6PxCUkOiH71mR48+QR5bl2xTbEJNaFq7hfl8HDD3uCWaO8PDNA== X-Received: by 2002:adf:bc49:: with SMTP id a9mr13537107wrh.109.1618308469638; Tue, 13 Apr 2021 03:07:49 -0700 (PDT) Received: from oliver-Z170M-D3H.cuni.cz ([2001:718:1e03:5128:35b3:1d60:e26d:e79b]) by smtp.gmail.com with ESMTPSA id b1sm19621280wru.90.2021.04.13.03.07.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 03:07:49 -0700 (PDT) From: glittao@gmail.com To: brendanhiggins@google.com, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, vbabka@suse.cz Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-mm@kvack.org, elver@google.com, dlatypov@google.com, Oliver Glitta Subject: [PATCH v4 1/3] kunit: make test->lock irq safe Date: Tue, 13 Apr 2021 12:07:45 +0200 Message-Id: <20210413100747.4921-1-glittao@gmail.com> X-Mailer: git-send-email 2.31.1.272.g89b43f80a5 MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 3D3A280192E3 X-Stat-Signature: yb6samtymnnzhhuqaxycb3gd7jycu916 Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf16; identity=mailfrom; envelope-from=""; helo=mail-wr1-f45.google.com; client-ip=209.85.221.45 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618308470-184963 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: From: Vlastimil Babka The upcoming SLUB kunit test will be calling kunit_find_named_resource() from a context with disabled interrupts. That means kunit's test->lock needs to be IRQ safe to avoid potential deadlocks and lockdep splats. This patch therefore changes the test->lock usage to spin_lock_irqsave() and spin_unlock_irqrestore(). Signed-off-by: Vlastimil Babka Signed-off-by: Oliver Glitta Reviewed-by: Brendan Higgins Reviewed-by: Marco Elver Acked-by: Daniel Latypov Acked-by: Vlastimil Babka --- include/kunit/test.h | 5 +++-- lib/kunit/test.c | 18 +++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/kunit/test.h b/include/kunit/test.h index 49601c4b98b8..524d4789af22 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -515,8 +515,9 @@ kunit_find_resource(struct kunit *test, void *match_data) { struct kunit_resource *res, *found = NULL; + unsigned long flags; - spin_lock(&test->lock); + spin_lock_irqsave(&test->lock, flags); list_for_each_entry_reverse(res, &test->resources, node) { if (match(test, res, (void *)match_data)) { @@ -526,7 +527,7 @@ kunit_find_resource(struct kunit *test, } } - spin_unlock(&test->lock); + spin_unlock_irqrestore(&test->lock, flags); return found; } diff --git a/lib/kunit/test.c b/lib/kunit/test.c index ec9494e914ef..2c62eeb45b82 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -442,6 +442,7 @@ int kunit_add_resource(struct kunit *test, void *data) { int ret = 0; + unsigned long flags; res->free = free; kref_init(&res->refcount); @@ -454,10 +455,10 @@ int kunit_add_resource(struct kunit *test, res->data = data; } - spin_lock(&test->lock); + spin_lock_irqsave(&test->lock, flags); list_add_tail(&res->node, &test->resources); /* refcount for list is established by kref_init() */ - spin_unlock(&test->lock); + spin_unlock_irqrestore(&test->lock, flags); return ret; } @@ -515,9 +516,11 @@ EXPORT_SYMBOL_GPL(kunit_alloc_and_get_resource); void kunit_remove_resource(struct kunit *test, struct kunit_resource *res) { - spin_lock(&test->lock); + unsigned long flags; + + spin_lock_irqsave(&test->lock, flags); list_del(&res->node); - spin_unlock(&test->lock); + spin_unlock_irqrestore(&test->lock, flags); kunit_put_resource(res); } EXPORT_SYMBOL_GPL(kunit_remove_resource); @@ -597,6 +600,7 @@ EXPORT_SYMBOL_GPL(kunit_kfree); void kunit_cleanup(struct kunit *test) { struct kunit_resource *res; + unsigned long flags; /* * test->resources is a stack - each allocation must be freed in the @@ -608,9 +612,9 @@ void kunit_cleanup(struct kunit *test) * protect against the current node being deleted, not the next. */ while (true) { - spin_lock(&test->lock); + spin_lock_irqsave(&test->lock, flags); if (list_empty(&test->resources)) { - spin_unlock(&test->lock); + spin_unlock_irqrestore(&test->lock, flags); break; } res = list_last_entry(&test->resources, @@ -621,7 +625,7 @@ void kunit_cleanup(struct kunit *test) * resource, and this can't happen if the test->lock * is held. */ - spin_unlock(&test->lock); + spin_unlock_irqrestore(&test->lock, flags); kunit_remove_resource(test, res); } #if (IS_ENABLED(CONFIG_KASAN) && IS_ENABLED(CONFIG_KUNIT)) From patchwork Tue Apr 13 10:07:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Glitta X-Patchwork-Id: 12200011 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,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 38B1CC43460 for ; Tue, 13 Apr 2021 10:07:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C65CC61370 for ; Tue, 13 Apr 2021 10:07:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C65CC61370 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 66DCC6B0070; Tue, 13 Apr 2021 06:07:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CFD66B0071; Tue, 13 Apr 2021 06:07:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D3AF6B0072; Tue, 13 Apr 2021 06:07:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0167.hostedemail.com [216.40.44.167]) by kanga.kvack.org (Postfix) with ESMTP id 1BE316B0070 for ; Tue, 13 Apr 2021 06:07:53 -0400 (EDT) Received: from smtpin34.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D356B180AD806 for ; Tue, 13 Apr 2021 10:07:52 +0000 (UTC) X-FDA: 78026917584.34.754484C Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by imf29.hostedemail.com (Postfix) with ESMTP id A4332EB for ; Tue, 13 Apr 2021 10:07:50 +0000 (UTC) Received: by mail-wr1-f46.google.com with SMTP id s7so15709168wru.6 for ; Tue, 13 Apr 2021 03:07:52 -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=IrJAk+UldH6qP01JSUzgiPrgZtp9nH0fv06TlY9Jo/g=; b=jJVA9nCOEP2FOKXHdaunw/29pRazbvTuu3ekgJ6BRJdlI+wntoIdK9fNhNVYbVKiMK 11wF7frYuG6YuaF+k3RucHuPn6QD6GT/ngyzcxH1GRmhYkf5+tLRvgWGcqpYjiMomlSp piFiaQonPPpNcLuGYoG7ksSB4SO8nVTz3wrXUV1hUjp6ZoJgPyyPTH5fg/Xs5s0j+ldS 1jNwTvo6HRrs8H2aD4jJ10s6Z2wPtOFAGboPfBTM3U2x+2j1JRrGvofndN6K/Kd3XCyn helA49HNM3cQlrHfW7MQcO4u1s7tacXURk2Y2ldo2GPpY/Cbw9mjQpQKh4bEFWFsWVmz UjGg== 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=IrJAk+UldH6qP01JSUzgiPrgZtp9nH0fv06TlY9Jo/g=; b=RV9wvsBEgIEE0gw/q891yWgvE2fXKYkoD3bAJoFSTJsr5mABHoTR4bWZnf6iDnVawu SYH2hk/Hlyw4XidrMW4YjCqUpKjAXyB0KXUvC9oGfOwTiVfF8ezPMTm38mTXMAEqzPWJ KiT7Snpq5cr866j9qsrB3V9Wbd/wIVkeYAEi0yBmmea2IUqNEVT6hY1Ie/Fp4suCimto EPB+D2f1gydahb4ityyqA1dlfGJ6DyeIvgKp2TnANc/aLz2GJHmzqBR47h6QhGV03o3J UrYFFyW0xsE4u0wAnlHt9jd326SVU8VBmJ5bBWRhQ61diijwO5opLaFxv5NF1B6gasHC 0BCw== X-Gm-Message-State: AOAM5324EcfqfZIhA+NfiLvpFIVPCETX8OBLOtBnq4PPRXWnVcaezlaN 3A718g4joxDYMagMm2m2VAU= X-Google-Smtp-Source: ABdhPJyj9RcsM9NsQ33efZgexwmUAO45OwieULPualI3iTJB8jeW+92OmdRnp7H/lAcG/94oPccqvw== X-Received: by 2002:a5d:6983:: with SMTP id g3mr2989699wru.415.1618308471508; Tue, 13 Apr 2021 03:07:51 -0700 (PDT) Received: from oliver-Z170M-D3H.cuni.cz ([2001:718:1e03:5128:35b3:1d60:e26d:e79b]) by smtp.gmail.com with ESMTPSA id b1sm19621280wru.90.2021.04.13.03.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 03:07:51 -0700 (PDT) From: glittao@gmail.com To: brendanhiggins@google.com, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, vbabka@suse.cz Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-mm@kvack.org, elver@google.com, dlatypov@google.com, Oliver Glitta Subject: [PATCH v4 3/3] slub: remove resiliency_test() function Date: Tue, 13 Apr 2021 12:07:47 +0200 Message-Id: <20210413100747.4921-3-glittao@gmail.com> X-Mailer: git-send-email 2.31.1.272.g89b43f80a5 In-Reply-To: <20210413100747.4921-1-glittao@gmail.com> References: <20210413100747.4921-1-glittao@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: A4332EB X-Stat-Signature: o9tj5oz33q1h8foxkodu5wxsadbbjt1y Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf29; identity=mailfrom; envelope-from=""; helo=mail-wr1-f46.google.com; client-ip=209.85.221.46 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618308470-472413 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: From: Oliver Glitta Function resiliency_test() is hidden behind #ifdef SLUB_RESILIENCY_TEST that is not part of Kconfig, so nobody runs it. This function is replaced with KUnit test for SLUB added by the previous patch "selftests: add a KUnit test for SLUB debugging functionality". Signed-off-by: Oliver Glitta Acked-by: Vlastimil Babka Acked-by: David Rientjes --- mm/slub.c | 64 ------------------------------------------------------- 1 file changed, 64 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index d7df8841d90a..c65e2c471a13 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -154,9 +154,6 @@ static inline bool kmem_cache_has_cpu_partial(struct kmem_cache *s) * - Variable sizing of the per node arrays */ -/* Enable to test recovery from slab corruption on boot */ -#undef SLUB_RESILIENCY_TEST - /* Enable to log cmpxchg failures */ #undef SLUB_DEBUG_CMPXCHG @@ -4939,66 +4936,6 @@ static int list_locations(struct kmem_cache *s, char *buf, } #endif /* CONFIG_SLUB_DEBUG */ -#ifdef SLUB_RESILIENCY_TEST -static void __init resiliency_test(void) -{ - u8 *p; - int type = KMALLOC_NORMAL; - - BUILD_BUG_ON(KMALLOC_MIN_SIZE > 16 || KMALLOC_SHIFT_HIGH < 10); - - pr_err("SLUB resiliency testing\n"); - pr_err("-----------------------\n"); - pr_err("A. Corruption after allocation\n"); - - p = kzalloc(16, GFP_KERNEL); - p[16] = 0x12; - pr_err("\n1. kmalloc-16: Clobber Redzone/next pointer 0x12->0x%p\n\n", - p + 16); - - validate_slab_cache(kmalloc_caches[type][4]); - - /* Hmmm... The next two are dangerous */ - p = kzalloc(32, GFP_KERNEL); - p[32 + sizeof(void *)] = 0x34; - pr_err("\n2. kmalloc-32: Clobber next pointer/next slab 0x34 -> -0x%p\n", - p); - pr_err("If allocated object is overwritten then not detectable\n\n"); - - validate_slab_cache(kmalloc_caches[type][5]); - p = kzalloc(64, GFP_KERNEL); - p += 64 + (get_cycles() & 0xff) * sizeof(void *); - *p = 0x56; - pr_err("\n3. kmalloc-64: corrupting random byte 0x56->0x%p\n", - p); - pr_err("If allocated object is overwritten then not detectable\n\n"); - validate_slab_cache(kmalloc_caches[type][6]); - - pr_err("\nB. Corruption after free\n"); - p = kzalloc(128, GFP_KERNEL); - kfree(p); - *p = 0x78; - pr_err("1. kmalloc-128: Clobber first word 0x78->0x%p\n\n", p); - validate_slab_cache(kmalloc_caches[type][7]); - - p = kzalloc(256, GFP_KERNEL); - kfree(p); - p[50] = 0x9a; - pr_err("\n2. kmalloc-256: Clobber 50th byte 0x9a->0x%p\n\n", p); - validate_slab_cache(kmalloc_caches[type][8]); - - p = kzalloc(512, GFP_KERNEL); - kfree(p); - p[512] = 0xab; - pr_err("\n3. kmalloc-512: Clobber redzone 0xab->0x%p\n\n", p); - validate_slab_cache(kmalloc_caches[type][9]); -} -#else -#ifdef CONFIG_SYSFS -static void resiliency_test(void) {}; -#endif -#endif /* SLUB_RESILIENCY_TEST */ - #ifdef CONFIG_SYSFS enum slab_stat_type { SL_ALL, /* All slabs */ @@ -5847,7 +5784,6 @@ static int __init slab_sysfs_init(void) } mutex_unlock(&slab_mutex); - resiliency_test(); return 0; }