From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06682C433F5 for ; Tue, 9 Nov 2021 01:29:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E4AE9610A3 for ; Tue, 9 Nov 2021 01:29:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242997AbhKIBcF (ORCPT ); Mon, 8 Nov 2021 20:32:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:58560 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243222AbhKIB1A (ORCPT ); Mon, 8 Nov 2021 20:27:00 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3BCED61B52; Tue, 9 Nov 2021 01:10:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636420216; bh=L69go92Y+yQkk7S6ITdAON0QWpp26Ykm/JPM6rJDeaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hWFCilZEyIU+5eSlQTB7coaIKXkb0GvBlz2irQMuWsAKn9UBZkvSf6BgczVPBPc44 X40b7eCCkVytQPo2bOZ5rJQiaP09jxkjyHHvEVTOzW+0+FmzXwQ0QdLo7E0x3jPK2s E+oKfw12gd68JUcEa3Yie4CaXfiaudoDdhW3rFXj8NUzBK/h0xKXgnlU7OZ2y2v3lI bfbANpzzF4RVPRzo/YiVGEcEaQA3mCwTXZZG6WEExRyVvkukQyZw3P4Mx1p2yFwuqt ZszoELvewJMwroUxgcXO3u4prZcIDw2XSysKYwTygsDVPabzb19TLJK7WLbi45aGRq jXDPGfP72IHRQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sven Schnelle , Helge Deller , Sasha Levin , James.Bottomley@HansenPartnership.com, rmk+kernel@armlinux.org.uk, willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, hanyihao@vivo.com, linux-parisc@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 29/30] parisc: fix warning in flush_tlb_all Date: Mon, 8 Nov 2021 20:09:17 -0500 Message-Id: <20211109010918.1192063-29-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211109010918.1192063-1-sashal@kernel.org> References: <20211109010918.1192063-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sven Schnelle [ Upstream commit 1030d681319b43869e0d5b568b9d0226652d1a6f ] I've got the following splat after enabling preemption: [ 3.724721] BUG: using __this_cpu_add() in preemptible [00000000] code: swapper/0/1 [ 3.734630] caller is __this_cpu_preempt_check+0x38/0x50 [ 3.740635] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.15.0-rc4-64bit+ #324 [ 3.744605] Hardware name: 9000/785/C8000 [ 3.744605] Backtrace: [ 3.744605] [<00000000401d9d58>] show_stack+0x74/0xb0 [ 3.744605] [<0000000040c27bd4>] dump_stack_lvl+0x10c/0x188 [ 3.744605] [<0000000040c27c84>] dump_stack+0x34/0x48 [ 3.744605] [<0000000040c33438>] check_preemption_disabled+0x178/0x1b0 [ 3.744605] [<0000000040c334f8>] __this_cpu_preempt_check+0x38/0x50 [ 3.744605] [<00000000401d632c>] flush_tlb_all+0x58/0x2e0 [ 3.744605] [<00000000401075c0>] 0x401075c0 [ 3.744605] [<000000004010b8fc>] 0x4010b8fc [ 3.744605] [<00000000401080fc>] 0x401080fc [ 3.744605] [<00000000401d5224>] do_one_initcall+0x128/0x378 [ 3.744605] [<0000000040102de8>] 0x40102de8 [ 3.744605] [<0000000040c33864>] kernel_init+0x60/0x3a8 [ 3.744605] [<00000000401d1020>] ret_from_kernel_thread+0x20/0x28 [ 3.744605] Fix this by moving the __inc_irq_stat() into the locked section. Signed-off-by: Sven Schnelle Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- arch/parisc/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index d72f003106835..ad6545dafe039 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -940,9 +940,9 @@ void flush_tlb_all(void) { int do_recycle; - __inc_irq_stat(irq_tlb_count); do_recycle = 0; spin_lock(&sid_lock); + __inc_irq_stat(irq_tlb_count); if (dirty_space_ids > RECYCLE_THRESHOLD) { BUG_ON(recycle_inuse); /* FIXME: Use a semaphore/wait queue here */ get_dirty_sids(&recycle_ndirty,recycle_dirty_array); @@ -961,8 +961,8 @@ void flush_tlb_all(void) #else void flush_tlb_all(void) { - __inc_irq_stat(irq_tlb_count); spin_lock(&sid_lock); + __inc_irq_stat(irq_tlb_count); flush_tlb_all_local(NULL); recycle_sids(); spin_unlock(&sid_lock); -- 2.33.0