Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3202211pxb; Mon, 9 Nov 2020 05:29:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJxj/0OfqZyLBaQsAW1jn+EYngANUO6SCXQizH39RUgJEz5AfJrkZwyO8D9DwM7vbBKsy9OJ X-Received: by 2002:aa7:cf90:: with SMTP id z16mr16041359edx.174.1604928591089; Mon, 09 Nov 2020 05:29:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604928591; cv=none; d=google.com; s=arc-20160816; b=Ttt8nByiADrdJPeAyBi9Jzy7FCu7g47WGvuouhXprl93jbozFWSVd0sc7TX3npk0RM C8jWfIx7tB0/bnKzgES0pkNSVratLcJJzWkPWuBMgnSU8YzW0urkgZJb9dhUZ9NmmGdM xKyQEOhI6LIfQlmStbVEVrwEZZexbKRp3x+xFZ9TaPlPMEmYCCwDHfydGR2oo7C7ajkU 5NrmHFQrkoeI1YA8Aw3n9vnID0VvRmYbeGPdj8UJUepTF0pc+AvZ7NMQI6RGHka4E6jK Kd8hGXqt0aPdMbfTMtuiyEyr7XzkOO3oUFdmijcig6rGMUh88/lkmF2QOXvZbYeyMpLw 4hBg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eXMsPKoUQ51cn62BzpeLyWpQ+l0R5K6+PnX/raVCW/c=; b=H7cyy8pvRWJeTHwWxO5MuPN4RTNAFwE+LDpBcch9Q5ZY7+0sqDdBROS1JvVSQ+dS3c NyLQ7VGLG1ILkABkIqzlr21eBgYeD2z5TFIDH6a3mKit2EzIrJsrXE6wwJ046j+XZvV7 j09trmtCJ8FUzqfeZYEKmHlr1PqfmDGR8aRSiwYjpRQIIyIwAo3ZqdekdlT5Y6tWORSM IbqGDv0oVzj/HFhmiydCDGX1lKLJAr0saghYrFpLLztpM/Fp3k/O2AHTcDzjeQu/a1D6 aU7YBMMHRP5sMf2Q6CDsMuUM41/iCf0V9nq2ts+ivViNUx63xG+p2+eQ6Wuhpyyc7AB9 LvsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RqMe0i98; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a14si8394297edn.216.2020.11.09.05.29.28; Mon, 09 Nov 2020 05:29:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RqMe0i98; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732191AbgKIN2N (ORCPT + 99 others); Mon, 9 Nov 2020 08:28:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:40204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733061AbgKINOC (ORCPT ); Mon, 9 Nov 2020 08:14:02 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E68A92083B; Mon, 9 Nov 2020 13:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927641; bh=d0gPJV5WWEH+NZIHVHiJKGf1pstT/LiJ6O/8EHYy+7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RqMe0i98sxQhslLCo4ACnhjn9kUZN6lD3Cb+q7C0ZWiSAzL3ID5Vwl1iMII4ZoaUt ji9E1zRlwnA6vD1t4Y2iwPdz+FZZgZJEP9o3nbYWVAKlOg/oGKNELLz1yKgjIHtjc+ 7TVwsyNa5MspaXv2hsHzayP5MVi50ayFLrM3tpzw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasily Gorbik , Andrew Morton , Peter Zijlstra , Ingo Molnar , Linus Torvalds Subject: [PATCH 5.4 30/85] lib/crc32test: remove extra local_irq_disable/enable Date: Mon, 9 Nov 2020 13:55:27 +0100 Message-Id: <20201109125024.034824347@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125022.614792961@linuxfoundation.org> References: <20201109125022.614792961@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vasily Gorbik commit aa4e460f0976351fddd2f5ac6e08b74320c277a1 upstream. Commit 4d004099a668 ("lockdep: Fix lockdep recursion") uncovered the following issue in lib/crc32test reported on s390: BUG: using __this_cpu_read() in preemptible [00000000] code: swapper/0/1 caller is lockdep_hardirqs_on_prepare+0x48/0x270 CPU: 6 PID: 1 Comm: swapper/0 Not tainted 5.9.0-next-20201015-15164-g03d992bd2de6 #19 Hardware name: IBM 3906 M04 704 (LPAR) Call Trace: lockdep_hardirqs_on_prepare+0x48/0x270 trace_hardirqs_on+0x9c/0x1b8 crc32_test.isra.0+0x170/0x1c0 crc32test_init+0x1c/0x40 do_one_initcall+0x40/0x130 do_initcalls+0x126/0x150 kernel_init_freeable+0x1f6/0x230 kernel_init+0x22/0x150 ret_from_fork+0x24/0x2c no locks held by swapper/0/1. Remove extra local_irq_disable/local_irq_enable helpers calls. Fixes: 5fb7f87408f1 ("lib: add module support to crc32 tests") Signed-off-by: Vasily Gorbik Signed-off-by: Andrew Morton Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Greg Kroah-Hartman Link: https://lkml.kernel.org/r/patch.git-4369da00c06e.your-ad-here.call-01602859837-ext-1679@work.hours Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- lib/crc32test.c | 4 ---- 1 file changed, 4 deletions(-) --- a/lib/crc32test.c +++ b/lib/crc32test.c @@ -683,7 +683,6 @@ static int __init crc32c_test(void) /* reduce OS noise */ local_irq_save(flags); - local_irq_disable(); nsec = ktime_get_ns(); for (i = 0; i < 100; i++) { @@ -694,7 +693,6 @@ static int __init crc32c_test(void) nsec = ktime_get_ns() - nsec; local_irq_restore(flags); - local_irq_enable(); pr_info("crc32c: CRC_LE_BITS = %d\n", CRC_LE_BITS); @@ -768,7 +766,6 @@ static int __init crc32_test(void) /* reduce OS noise */ local_irq_save(flags); - local_irq_disable(); nsec = ktime_get_ns(); for (i = 0; i < 100; i++) { @@ -783,7 +780,6 @@ static int __init crc32_test(void) nsec = ktime_get_ns() - nsec; local_irq_restore(flags); - local_irq_enable(); pr_info("crc32: CRC_LE_BITS = %d, CRC_BE BITS = %d\n", CRC_LE_BITS, CRC_BE_BITS);