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))