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=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 1B500C388F9 for ; Tue, 3 Nov 2020 18:17:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CEC392080D for ; Tue, 3 Nov 2020 18:17:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604427428; bh=wdPJ++pPOhLTCvtP7L3oaiK3ot7HLlq+W9RM2fCiiyM=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=pp9XDGRKLlUBGAO9qISvylLfw0YlFBLYEaZYZx1puWm50pFF61fN2s8PyCZz9Xvwv iTDOPmbSGSvGKTKmBT/5+VUy/faJWn62/8Omm95xhFhC7siPkoBgyHgIEIa+dXj0S5 8gh3VuJhyVtxdYVxaWx//KWSJSB+wC6IInboEfRU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729065AbgKCSRI (ORCPT ); Tue, 3 Nov 2020 13:17:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:39492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725385AbgKCSRI (ORCPT ); Tue, 3 Nov 2020 13:17:08 -0500 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (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 8DC4120757; Tue, 3 Nov 2020 18:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604427426; bh=wdPJ++pPOhLTCvtP7L3oaiK3ot7HLlq+W9RM2fCiiyM=; h=Date:From:To:Subject:From; b=U0xBULs96D4hoEYm6aT4CAtrUVGZkUmilJP8v0fY2YBPtMFYo3THOMPYkgFov7PtK hff+xN0snZZe+DRQRinCAoyZcdOELxTkBPQqcGoYCnqjf5DyPEuWQP5odWDYohSb7G /wbV1Jgn6+b4NNCiaMT+nUmZ+gu2ETJKP2tDl1Is= Date: Tue, 03 Nov 2020 10:17:06 -0800 From: akpm@linux-foundation.org To: gor@linux.ibm.com, gregkh@linuxfoundation.org, mingo@kernel.org, mm-commits@vger.kernel.org, peterz@infradead.org Subject: [merged] lib-crc32test-remove-extra-local_irq_disable-enable.patch removed from -mm tree Message-ID: <20201103181706.2dtvUwv8A%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: lib/crc32test: remove extra local_irq_disable/enable has been removed from the -mm tree. Its filename was lib-crc32test-remove-extra-local_irq_disable-enable.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Vasily Gorbik Subject: lib/crc32test: remove extra local_irq_disable/enable 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: [<0000000000d54870>] show_stack+0x90/0xf8 [<0000000000d675d2>] dump_stack+0xa2/0xd8 [<0000000000d6c9ac>] check_preemption_disabled+0xe4/0xe8 [<00000000001d6098>] lockdep_hardirqs_on_prepare+0x48/0x270 [<00000000002ac274>] trace_hardirqs_on+0x9c/0x1b8 [<0000000001441430>] crc32_test.isra.0+0x170/0x1c0 [<0000000001441764>] crc32test_init+0x1c/0x40 [<0000000000100cd0>] do_one_initcall+0x40/0x130 [<0000000001411586>] do_initcalls+0x126/0x150 [<0000000001411826>] kernel_init_freeable+0x1f6/0x230 [<0000000000d6cc92>] kernel_init+0x22/0x150 [<0000000000d7bcc4>] ret_from_fork+0x24/0x2c no locks held by swapper/0/1. Remove extra local_irq_disable/local_irq_enable helpers calls. Link: https://lkml.kernel.org/r/patch.git-4369da00c06e.your-ad-here.call-01602859837-ext-1679@work.hours Fixes: 5fb7f87408f1 ("lib: add module support to crc32 tests") Signed-off-by: Vasily Gorbik Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Greg Kroah-Hartman Signed-off-by: Andrew Morton --- lib/crc32test.c | 4 ---- 1 file changed, 4 deletions(-) --- a/lib/crc32test.c~lib-crc32test-remove-extra-local_irq_disable-enable +++ a/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); _ Patches currently in -mm which might be from gor@linux.ibm.com are