From patchwork Tue Sep 19 09:53:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 141792 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3254083vqi; Tue, 19 Sep 2023 02:55:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJVGnnyfr1ALjnGxmW761du1klUAphzywpN2ep9ApdzOkcyN05iEEC3PrAOE4IceP5TfZ3 X-Received: by 2002:a05:6358:91b:b0:142:ec44:a85 with SMTP id r27-20020a056358091b00b00142ec440a85mr14193676rwi.5.1695117356954; Tue, 19 Sep 2023 02:55:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695117356; cv=none; d=google.com; s=arc-20160816; b=ZlQpAFWgxMujNsM7XtOz+iV77tlZ7gT1lB0TRzrmNWBU8wGuxDiIH6f9OiJtPMLA+i KiZ38Pl58w7TyseBgJ8wz9/7tIvVM/yFHqbfgJGjgcJdd5YMhnfqBzOz6rfpiqeCOvOr ZdLlp6+l+xGJUO5wnlDOj0F9N9tgq/Uh5NJSwCTYuHlJNtWtxv+0Cdm/JaWtv3fvLbM5 aK7bB4h2o3yeD7c+eVgmwL4ScZHMgpgJ/+tMNGO9KqRJVTYD+phgoyYh30zxkSugwwUA CDsGC6n9ygBeomjuw2JyuCWc4GjxFbaF4xfoZEjfslS3STU82LNslfAGGzDEkN6KbujX gbZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=AciVSB1c/O8v/KJdkdF318d6t4wpRj6CKrTHEVii/8k=; fh=TJa98jjcJcAUyvo2yQiOqi+wukdLlQU80th5XskGe8U=; b=o/1S48hVJsoyIHm1wrIP/+Mu0pcosabDZwqcbOhairpAJZEjFPf6hiwJYJ59g57qEt bXE3SErN7Mvew+4mJVay+kkavGR+cZmiK0h8ddentUIJdBR68U66bwwLRfrTaEtZoI+c HtU2jHAtVdQohzYMJ4IW30+jfwe+WquBiPQlE0tghPCnLK16uOjcvPjCALSds7fAWTud MoOz7X2Nv0nzBJ2Hp+CjcoJPpIYZSguY/efkq//Xij+96gnfVGa+DZApmwFfFO7NtsUT jRhHz41q/uKCPPnsRNh2FMy6fC1pTJ5vjc+gxestTm6xCRfZla1x0PgGmMEArm/zyPAk dx2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nsVmhmZ9; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bs8-20020a632808000000b00578086eb5e9si8427091pgb.97.2023.09.19.02.55.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 02:55:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nsVmhmZ9; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 03C6A81DDBFD; Tue, 19 Sep 2023 02:54:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231906AbjISJyI (ORCPT + 26 others); Tue, 19 Sep 2023 05:54:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231835AbjISJxV (ORCPT ); Tue, 19 Sep 2023 05:53:21 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCAE8CCE; Tue, 19 Sep 2023 02:53:14 -0700 (PDT) Date: Tue, 19 Sep 2023 09:53:12 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695117193; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AciVSB1c/O8v/KJdkdF318d6t4wpRj6CKrTHEVii/8k=; b=nsVmhmZ9suJXlNQ3ed4Kut1ddYFesNtcxwAcjMbBQSi9WKKIWUuxfsuzQofN5TM9ys1OsO t+czCswW9BRwZTtkREcj5i1IWn6qJ6aL6YPEZYKj9poVx13d6HcTLfHL7GXXJI8Lgg5IEc I6XKq4X8a33I1oADlnr7D+1TP7PCTLSLXzti+qOdJFMN5+frkHwzl4ZgwwH0F5JAIRasHa q9VARiiMWp2tU91z4a31+aYtZuv2K35WElFvJaDyCL/R33TtyCAOswZ82eNQBeHkwi1poq KLBGSQ8qKw77Zgy4/79HkPVSQgMM6t476qGnGhBKL/QfcIWkbE2qpiP6OHiy6A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695117193; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AciVSB1c/O8v/KJdkdF318d6t4wpRj6CKrTHEVii/8k=; b=6YcfN5GS541EUyhV8yj9PIkL9f6bl105ZQagVhlR93PhqUTpREM1Dw8L/A1OaxXUh40Jej VCRw/BDWRkorMTDQ== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/bugs] x86/srso: Improve i-cache locality for alias mitigation Cc: Josh Poimboeuf , Ingo Molnar , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <169511719256.27769.1212265500162415596.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 19 Sep 2023 02:54:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777459377698584663 X-GMAIL-MSGID: 1777459377698584663 The following commit has been merged into the x86/bugs branch of tip: Commit-ID: da3bd8872ee00f23b58c7f62dfd403dcc83e074b Gitweb: https://git.kernel.org/tip/da3bd8872ee00f23b58c7f62dfd403dcc83e074b Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:04:55 -07:00 Committer: Ingo Molnar CommitterDate: Tue, 19 Sep 2023 11:42:47 +02:00 x86/srso: Improve i-cache locality for alias mitigation 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 Signed-off-by: Ingo Molnar Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/eadaf5530b46a7ae8b936522da45ae555d2b3393.1693889988.git.jpoimboe@kernel.org --- arch/x86/lib/retpoline.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index cd86aeb..9ab634f 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -177,15 +177,14 @@ SYM_START(srso_alias_safe_ret, SYM_L_GLOBAL, SYM_A_NONE) int3 SYM_FUNC_END(srso_alias_safe_ret) - .section .text..__x86.return_thunk - -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) + .section .text..__x86.return_thunk /* * Some generic notes on the untraining sequences: *