Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3094443rwb; Mon, 15 Aug 2022 17:59:57 -0700 (PDT) X-Google-Smtp-Source: AA6agR4m5pynEQUVGYn6oNNfxtaxD73wAvEqWkywaliFMy2fAXI6ZCKu/WtupEofpWc9KW/Qh3ed X-Received: by 2002:a17:907:2cd1:b0:730:65c9:4c18 with SMTP id hg17-20020a1709072cd100b0073065c94c18mr11917878ejc.324.1660611597464; Mon, 15 Aug 2022 17:59:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660611597; cv=none; d=google.com; s=arc-20160816; b=BiYOVsnRpr2JAG+W0SzijzMXuWFBsnwwu+apJwiH8kOeUWrA8qfAD4pCgGO2yqNFvt 3Q+wfuhVTz/BcU45ZbHBiImP9TfwohdrwH5v3u+xBOSEd4UjDZeimYsoHQ4YcV7NCw6/ SdMEl4cQyMopBqEU6nnjH9m90dmAnOOADi5ycX7s+4ZtbivPaNNOl+iGXcXZVsKwaeWj we0+8T3IywKRA7nxJ3e5SrFk8is2otXttNP04E5PexIsWoCjynVTYxjz25X0bUghJ8c/ TO9qtjSXZqxJ9NW8ni5iQZWqIkBphS1ye7/TmGpRcsgWpnTPqIRh8+9f5A2Iecr7RcSK ahKA== 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=aJ8y0h+S4DwRpQinScRPrD7BmhuI9DPCpOE5Kb3kHkk=; b=abei7jQ/D3eew6pa+qtbxWOwZNbmzmbOTimncHwKN/PTcoFAgx09I0fV7Iq5v9o9nW IGTY9B2lNGaY255CknKbU8KmLyc9iAYcNVJQ+J8jk8PwfIcMUl7oLOfAigQ/tH00frUJ JqMXC7vgm37KKy5VPSEX8WqNV/BmIvdfE8dLgnaoFkvHJOCHwkZF3joxTs3WVr/jKeAl 9ClSpFabEfpvZTMbirQ+1Ig61j7mE7POeh8wQY205MDKLpWdUk/PQpoSEfGmoKc+L2Yv oMW8ya8ZFhl2Ek5zvcBzVK5T8jzn8zGrwddnkctEgKzscgI58sKgMJJai7JdINkCAbeS lXzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OxPWjquO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q13-20020a056402518d00b0043dcc0d6eb4si9956211edd.607.2022.08.15.17.59.24; Mon, 15 Aug 2022 17:59:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OxPWjquO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240703AbiHPArF (ORCPT + 99 others); Mon, 15 Aug 2022 20:47:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245366AbiHPAol (ORCPT ); Mon, 15 Aug 2022 20:44:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E34AF193554; Mon, 15 Aug 2022 13:41:19 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 819BE61234; Mon, 15 Aug 2022 20:41:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FD76C433C1; Mon, 15 Aug 2022 20:41:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660596078; bh=ZlNZIoT0xcoVZ4uXOg7Rh64aSqYXluwZIxnpm37NvZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OxPWjquORya+rMGZHv7BuNBb1UvaApczctRtpRselLrVaPRpPlAUWy0unzULNqcu3 /d8Uf/lEWv4//02GV/Be3VQZ2OzrJme3Zin0XG/zEIKv5jJbrzBfpST+wsaJh6mu26 +ex4mZTwQ80xOA/0R+TqF610E37F8m/3AJVDpmxc= 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.19 0965/1157] lib/smp_processor_id: fix imbalanced instrumentation_end() call Date: Mon, 15 Aug 2022 20:05:21 +0200 Message-Id: <20220815180518.273302726@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 section") 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 046ac6297c78..a2bb7738c373 100644 --- a/lib/smp_processor_id.c +++ b/lib/smp_processor_id.c @@ -47,9 +47,9 @@ unsigned int check_preemption_disabled(const char *what1, const char *what2) printk("caller is %pS\n", __builtin_return_address(0)); dump_stack(); - instrumentation_end(); out_enable: + instrumentation_end(); preempt_enable_no_resched_notrace(); out: return this_cpu; -- 2.35.1