From nobody Tue Dec 16 16:38:08 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A56A7C28B2B for ; Fri, 19 Aug 2022 16:36:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353182AbiHSQfY (ORCPT ); Fri, 19 Aug 2022 12:35:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353499AbiHSQbt (ORCPT ); Fri, 19 Aug 2022 12:31:49 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0C9010C818; Fri, 19 Aug 2022 09:05:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CA96FB8281A; Fri, 19 Aug 2022 16:05:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20C83C433C1; Fri, 19 Aug 2022 16:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660925152; bh=dJ4gpbam+XmG3kQqJjRjup7wnD2kSrhGt7KyInmx5Qk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i5ovZsFT7mQ4OoiXPz6CcAt9niAfYhASF2xA4bDBeVY4JIpPB3QJw/BSWQDOW3noW ysQdenEM8rkkuR3k7ECB+iZsRZWfjXsfTcHopo7RTsahLCaNqv+hQDKn0SHUAIlpCN 4aUCXwwToxtTurpWQ6ydIXE21EbpAVJcdI0Jvszo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tetsuo Handa , Thomas Gleixner , Alexandre Chartre , Peter Zijlstra , Andrew Morton , Sasha Levin Subject: [PATCH 5.10 400/545] lib/smp_processor_id: fix imbalanced instrumentation_end() call Date: Fri, 19 Aug 2022 17:42:50 +0200 Message-Id: <20220819153847.326395667@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220819153829.135562864@linuxfoundation.org> References: <20220819153829.135562864@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Tetsuo Handa [ Upstream commit bd27acaac24e4b252ee28dddcabaee80456d0faf ] Currently instrumentation_end() won't be called if printk_ratelimit() returned false. Link: https://lkml.kernel.org/r/a636d8e0-ad32-5888-acac-671f7f553bb3@I-love= .SAKURA.ne.jp Fixes: 126f21f0e8d46e2c ("lib/smp_processor_id: Move it into noinstr sectio= n") Signed-off-by: Tetsuo Handa Cc: Thomas Gleixner Cc: Alexandre Chartre Cc: Peter Zijlstra Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- lib/smp_processor_id.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c index 525222e4f409..2916606a9333 100644 --- a/lib/smp_processor_id.c +++ b/lib/smp_processor_id.c @@ -46,9 +46,9 @@ unsigned int check_preemption_disabled(const char *what1,= const char *what2) =20 printk("caller is %pS\n", __builtin_return_address(0)); dump_stack(); - instrumentation_end(); =20 out_enable: + instrumentation_end(); preempt_enable_no_resched_notrace(); out: return this_cpu; --=20 2.35.1