Received: by 2002:a05:7412:bc1a:b0:d7:7d3a:4fe2 with SMTP id ki26csp1302509rdb; Mon, 21 Aug 2023 03:57:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmLYGYgI/jFTkEAaKInA2uvn7ujtMKQZzncE9PZ5HVU+TggjIMF+gEPK8mdjHvUDr2mHQZ X-Received: by 2002:a17:906:20f:b0:99d:e5fe:5698 with SMTP id 15-20020a170906020f00b0099de5fe5698mr4787180ejd.61.1692615443914; Mon, 21 Aug 2023 03:57:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692615443; cv=none; d=google.com; s=arc-20160816; b=eTjNKqVH9buW9iTz/rHoDpfoqlQjLSD6q3LYnUZ2L0VjUgfv68ZBBXI1L5AMWyE8ob mIVBYnNjA1dc9CtJ7QT8ce3XzimUYmFrkDJGUgF0KL2XtqLY5xH3Z0G9pKGIfJrWfCBc FjCiC84B1XLQtywi7E9QLuxlDCMVleZlGWysAa0MmzfEzcONx8U0pqVCw+FjupuQnWna 3F/ppOyVGtVAqxKX/J+Ny25MLnnzcUESZR+gNetsr1UVDndLkxyHGlhC9kDEbiElCFMn tXuNhKe5Rp0KlS9z1UDUD+QCCiyFy6Zchuv8QAyBKJ1aLJB6oQpUygzry66LFUzY2yIn z/Wg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aOBMicZEz7Ljg63be/MngVcmadEK9dPurRpNMNjlTRU=; fh=1KVrD/LnRsN9N7k2d12iARV4DA2tVMW012QtKSrD46c=; b=ffqj1jA0N1iNU9un3VU1ZEwLv6TKvatu69w9smMs9njYzlQxHhuSJKywKjBgqA1P1Z 3QT5EnctSWm88EXAjSeuvUl7zpt15j4P4RpvRlNw07tMfIDOolveHJyWhOjipuqetTjX 4umGYVWp6HuqgU82dX49s5nI8A8BrblmuB9wO3qhL7pzQnkwS70IToHsr2DeILqUJ7gJ Qmue05M+HPUYo+rIFFHuMS+b/nDFV89qxmzfu8+boup7hRRI/UPKs/MuESP5AvHsnbql xUJPxLcaagDhIqKeZ9yw9ilzRzcFscAjllq4XnD+MTdqpFZy4P0MxDjWcucDtvVf1L/U DgGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=W6JM0y6V; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s1-20020a170906168100b00992ee6da4b2si5359568ejd.683.2023.08.21.03.56.59; Mon, 21 Aug 2023 03:57:23 -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=@kernel.org header.s=k20201202 header.b=W6JM0y6V; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232461AbjHUBUN (ORCPT + 99 others); Sun, 20 Aug 2023 21:20:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232380AbjHUBTu (ORCPT ); Sun, 20 Aug 2023 21:19:50 -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 00C79E2 for ; Sun, 20 Aug 2023 18:19:39 -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 AD2DB62656 for ; Mon, 21 Aug 2023 01:19:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A833DC433C7; Mon, 21 Aug 2023 01:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692580779; bh=vc/fpVk3bxy2ex4nbxSxEwbS+F8Y//JwnGv+3rBD+Rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W6JM0y6Va98w8Ku9RhzPIsJPh1GKZZwvBoNGv9Ghd+p75eCKzSAeS+bvkGig4j5kz em4QeLq0a15Z4rrcy7a5l6zeFftY3LH/5/dZUVoho6PFl965C1ItVatuPtwvyoRAdJ bKLrxxwesWLNjIqVN4ET5fIfMzlQeuVqkUB96bsDp9BBz/c/4vm/c8zcq2LD/NzAds nfANx9DmEW3znSW8aA761+Q47chkPMXdHAHVDja8g+VuhmYZ8BpxdCAPxghmfiW2Z9 AG7fhMg1GRuKtKCrZE2U3xc0xxv6ICMUlW0MCErVFrl3us9LU5WxwIsN4q5pS9LDj8 kvT7tfQvPzpNA== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Borislav Petkov , Peter Zijlstra , Babu Moger , Paolo Bonzini , Sean Christopherson , David.Kaplan@amd.com, Andrew Cooper , Nikolay Borisov , gregkh@linuxfoundation.org, Thomas Gleixner Subject: [PATCH 20/22] x86/retpoline: Remove .text..__x86.return_thunk section Date: Sun, 20 Aug 2023 18:19:17 -0700 Message-ID: <5325966e6bdbaea6ffd79720cfeb44abe9a88513.1692580085.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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 The '.text..__x86.return_thunk' section has no purpose. Remove it and let the return thunk code live in '.text..__x86.indirect_thunk'. Signed-off-by: Josh Poimboeuf --- arch/x86/kernel/vmlinux.lds.S | 3 --- arch/x86/lib/retpoline.S | 2 -- 2 files changed, 5 deletions(-) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 9188834e56c9..f1c3516d356d 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -132,10 +132,7 @@ SECTIONS LOCK_TEXT KPROBES_TEXT SOFTIRQENTRY_TEXT -#ifdef CONFIG_RETPOLINE *(.text..__x86.indirect_thunk) - *(.text..__x86.return_thunk) -#endif STATIC_CALL_TEXT ALIGN_ENTRY_TEXT_BEGIN diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index 415521dbe15e..49f2be7c7b35 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -129,8 +129,6 @@ SYM_CODE_END(__x86_indirect_jump_thunk_array) #ifdef CONFIG_RETHUNK - .section .text..__x86.return_thunk - #ifdef CONFIG_CPU_SRSO /* -- 2.41.0