From patchwork Mon Aug 21 01:19:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 136316 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2771735vqi; Sun, 20 Aug 2023 21:01:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFoVzrbdjL63NbNmtNMuzC3UqGqPjZ5cbFT9Nzsnz0NCng9tpK7FADryoJG+ZRNP7t83lFA X-Received: by 2002:a17:906:311b:b0:99c:ae06:918f with SMTP id 27-20020a170906311b00b0099cae06918fmr3643515ejx.38.1692590491240; Sun, 20 Aug 2023 21:01:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692590491; cv=none; d=google.com; s=arc-20160816; b=EGU/c338Y2qFHfgEab8u1BO6NGLk9wUh4q3QJCu90zlZfmjL5/T9s056KdroGshwwO oB9nk3ZaGoIOPX3/Qv1aAPhSf4B3AucrY6emGHCbXFt7DrBTJ3ke9Jtxy5t8n01Mjyix z2375im3rsI/sDqDYfiBRQD2+4r4n0WnpGbc3elkw4cwmiWXB6BPeAAO1K713meRb7jn 9AgDzx088+0ScwCz96osVuBJtiU3OhgtugzUysi8yAgWKV5kEixdOwM00x6u/LKVjl6t arhbHNkOdPR3AA7SqdnlIKjBfPpjJYjkLPuSCdZjaZzqfyMb9d9Kig9ZIAFr84uQ6NLl ZOlA== 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=bIcP2UEwxzFdZ/5256bnQnxfabhkbM/HmdaVI2wOaEY=; fh=1KVrD/LnRsN9N7k2d12iARV4DA2tVMW012QtKSrD46c=; b=LTftKV6Nsr3DnibvM7nMzFDXMQsSZEySBdC+rBmvUq3vBM+xdTInIQeX44L47FJ+gJ LeYz0mszpOFyecre4QL74FU/X8QzebaXidKZiiNep7pBjXDrdHgz0HQW91HOSF6tpTFg noh9F9XTvt+wbBJtfDHcTSrD5qL22cM59l7faL8h1keeB5NU5k8j/j/cxpRTr2gTlQPN 1hp3foxnH/DWZSebOZRN4Qw9+EMCc9Y6D+gimjWY7GW5NSJx6NZ9qf0kNwRcF1A9U0a5 0oFRWyO8eXrKzNtMe4MKcPpdUXl3RvTRRTLLRgqX7NwVD5TjfMubhukz64y11x1wCYSS Cf6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gjPPfc3X; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gr19-20020a170906e2d300b0099cd8eb7328si5013155ejb.637.2023.08.20.21.00.56; Sun, 20 Aug 2023 21:01:31 -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=gjPPfc3X; 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 S231428AbjHUBUE (ORCPT + 99 others); Sun, 20 Aug 2023 21:20:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232320AbjHUBTo (ORCPT ); Sun, 20 Aug 2023 21:19:44 -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 3EDC2CF 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 1753A6260C for ; Mon, 21 Aug 2023 01:19:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16867C433C9; 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=1692580778; bh=jFyALynF3no3jKDUUWb3xTWvMt/cZ/Q1OkgRNreEts4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gjPPfc3XNmsWXQoOsImxTwxJ0V9KL6VY2R1rcLaKSZOwhtsVSlHY7V3W8pFcTHEqT fMNH2oTZGJNLJeqwgwtPmGaRRedLI2HS6p0hWDLEqqlpc1Qjn7iUFI4RNhFZEeCDvv HrdimRMey1UBdvSAHdgbpr+9rDYI5Bt6hiZDv60hzIjDWIc2MqRaNuxXuiiccGZq50 9iEYGEDzT7+2P5Xek1nPvOvZFdNBPnun14M4Hv7tym1Ae6tqmD9mjqbmD48u1W9YMi pz5D8VizwoyapGSZYBcOhQ/sveapLkb88so7us2k3aJr0S5MRqpUcoj1Bn1EPjvuyc 4YEYlXDcbt9Gw== 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 19/22] x86/srso: Improve i-cache locality for alias mitigation Date: Sun, 20 Aug 2023 18:19:16 -0700 Message-ID: <61b4147837d1e0273d094f3d11384fcdcf9b637f.1692580085.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774809766868892719 X-GMAIL-MSGID: 1774809766868892719 Move srso_alias_return_thunk() to the same section as srso_alias_safe_ret() so they can share a cache line. Signed-off-by: Josh Poimboeuf --- arch/x86/lib/retpoline.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index af3c1f0e4fb8..415521dbe15e 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -166,14 +166,14 @@ SYM_CODE_START_NOALIGN(srso_alias_safe_ret) ret int3 SYM_FUNC_END(srso_alias_safe_ret) - .popsection -SYM_CODE_START(srso_alias_return_thunk) +SYM_CODE_START_NOALIGN(srso_alias_return_thunk) UNWIND_HINT_FUNC ANNOTATE_NOENDBR call srso_alias_safe_ret ud2 SYM_CODE_END(srso_alias_return_thunk) + .popsection /* * SRSO untraining sequence for Zen1/2, similar to retbleed_untrain_ret()