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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BE62C001B0 for ; Wed, 9 Aug 2023 14:20:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233263AbjHIOUj (ORCPT ); Wed, 9 Aug 2023 10:20:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231752AbjHIOUg (ORCPT ); Wed, 9 Aug 2023 10:20:36 -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 E0BFE1FEE for ; Wed, 9 Aug 2023 07:20:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 77CE563868 for ; Wed, 9 Aug 2023 14:20:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 156A7C433C8; Wed, 9 Aug 2023 14:20:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691590834; bh=RP3S8qQe8GkEijJORvJffgE78gAf5hx7H6yU+j0EzxM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=bDUwVt+KyasZIWo4T0S1n7ImwmAA1NZ9OMfFsklXXiHGcmUoPvT9Nz9pAU7sC05jB AheSauweONLtQDh6uLflexb4ezgJivzkF2Yq35cYEZWcmmOPDeEgUtvrP1uV2m3wnc VfCfS5YFIPV6/WZy5rzERhCLv1ooWtS2XW1AJuLxIIlAJpoxv0pgapMU59lRS+s77X /NfNrsu1//hyxpgbiW8CtARVjifTwZMv9hO9bC5dkz+uhg48itDOClhLbzkqPMeV9I ILkaevivS1PFc2QsiXLCEGPX+nHiotsZxTrxasdLlrp4XM0SR7ji1sqMupUDIYvV4h PPgG/MKK8x6NA== Date: Wed, 9 Aug 2023 10:20:31 -0400 From: Josh Poimboeuf To: Peter Zijlstra Cc: x86@kernel.org, linux-kernel@vger.kernel.org, David.Kaplan@amd.com, Andrew.Cooper3@citrix.com, gregkh@linuxfoundation.org Subject: Re: [RFC][PATCH 12/17] x86/cpu: Rename original retbleed return thunk Message-ID: <20230809142031.jkj4pa2mhccrdmmd@treble> References: <20230809071218.000335006@infradead.org> <20230809072201.259675763@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230809072201.259675763@infradead.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 09, 2023 at 09:12:30AM +0200, Peter Zijlstra wrote: > +++ b/tools/objtool/check.c > @@ -455,7 +455,12 @@ static int decode_instructions(struct ob > return -1; > } > > - if (func->return_thunk || !strcmp(func->name, "srso_safe_ret") || func->alias != func) > + /* > + * Both zen_return_thunk() and srso_safe_ret() are embedded inside > + * another instruction and objtool doesn't grok that. Skip validating them. > + */ > + if (!strcmp(func->name, "zen_return_thunk") || > + !strcmp(func->name, "srso_safe_ret") || func->alias != func) Hm, speaking of renaming they should probably be called retbleed_return_thunk() and srso_return_thunk(). -- Josh