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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 5109CC433FE for ; Fri, 10 Sep 2021 00:42:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3ADCF61179 for ; Fri, 10 Sep 2021 00:42:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232245AbhIJAnG (ORCPT ); Thu, 9 Sep 2021 20:43:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:44080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232395AbhIJAS4 (ORCPT ); Thu, 9 Sep 2021 20:18:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2A897611CE; Fri, 10 Sep 2021 00:17:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631233052; bh=2w3CfM81UXHMrSm3u6yO2WyGTxebKw3iwdEfJLS67O4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RJwg+ko2vsJGVA2k0ISIPu1fnMNvVFQ/Ka4QwLcchi8su1ZUHAD2nibv8ehlh9lCz yaqlp9Ix0M52mNc0q79DnFcMh8Q5v038AnQLlCkD0kPTwtuTC6xQXZII7OXkGpCrKJ vJaFdA2wg1IGGj7VqSONFY5xQbb5nEMxZmMdB4rNJ0BkZ/nakkhUatm3ti+3OApHkk S0FfCXTNGfVH2b9KiXLSkJlyRuo055h6IMp0dD715ONEQqA1Q5JG8GVl0HaNPseQfw oJDE35BHWOUoftnP5HzzVE41YqIy+lyI+26lPXXSqvX5W/n0s1KMgUbngKpKHUDBTO yqfneN/Le4Rtg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe Leroy , Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.14 68/99] powerpc/32: indirect function call use bctrl rather than blrl in ret_from_kernel_thread Date: Thu, 9 Sep 2021 20:15:27 -0400 Message-Id: <20210910001558.173296-68-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210910001558.173296-1-sashal@kernel.org> References: <20210910001558.173296-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: stable@vger.kernel.org From: Christophe Leroy [ Upstream commit 113ec9ccc8049c3772f0eab46b62c5d6654c09f7 ] Copied from commit 89bbe4c798bc ("powerpc/64: indirect function call use bctrl rather than blrl in ret_from_kernel_thread") blrl is not recommended to use as an indirect function call, as it may corrupt the link stack predictor. This is not a performance critical path but this should be fixed for consistency. Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/91b1d242525307ceceec7ef6e832bfbacdd4501b.1629436472.git.christophe.leroy@csgroup.eu Signed-off-by: Sasha Levin --- arch/powerpc/kernel/entry_32.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 0273a1349006..61fdd53cdd9a 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -161,10 +161,10 @@ ret_from_fork: ret_from_kernel_thread: REST_NVGPRS(r1) bl schedule_tail - mtlr r14 + mtctr r14 mr r3,r15 PPC440EP_ERR42 - blrl + bctrl li r3,0 b ret_from_syscall -- 2.30.2