From patchwork Fri Apr 14 14:47:54 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: 83463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp377646rwl; Fri, 14 Apr 2023 07:54:24 -0700 (PDT) X-Google-Smtp-Source: AKy350bbwg+vo1vAlLKAMPQbkttKY64laUSUwLyacL22O6e3wrAhS3jXo09jamWDfgXOwuF9HO2q X-Received: by 2002:a05:6a00:134d:b0:63b:2654:f23d with SMTP id k13-20020a056a00134d00b0063b2654f23dmr9131450pfu.16.1681484064389; Fri, 14 Apr 2023 07:54:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681484064; cv=none; d=google.com; s=arc-20160816; b=0891HZNTlyy7js2lUBM1w4qPDNIivvv83ED0eaU1DymHWcJ7In3sosK/QRlq3oKXJX o8E0PzejyNatM+DWpf9PscaIei9yoH6u3J3cVg7CgqpXXoMs597G/esMsr/V055XqsJ9 o0C75YnIkovoD/6SO/bBGeZSU6akTOur9X3JtuHnMeZ7bXSw+IkGNrQpWhfmv2JBgoKu atsnPl26eNg0xAGTApZG8bIX4lW51dDsppbo3Kc9RIVWIcAbQAL2xdAK289kdYI/Z8n/ kwoqL8LBVCZ3cd7f4YpYLBhqkBde7y4aeivSKf+IZam3pwdlfslUsdz6UVjsjsncHiT4 ZvAA== 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=YpQp1L1uLgmErLsZ5BTeSfkrRYT17nARxSl8FG39kb4=; b=CEelTGRzB/XZKrE0Q+BHDpdrl6+3SIvEzcRH8kyIrUChCKA7T2/U/wpCrYk3E00ikI amCxE41xDieejLBHu1s0mAjk7XPC05yAAEG2K7ivk1H2DyWmW/r/TEz0Y6a50Hwn5xdp v/I605MXdMxVVhOvme6FuwK6cFHEKFFf2AUNJXaWY4zRAdeCYtkOYnca+g0KTKxX96Hi GIctyJzyEG5dODDiUiVXA/xGIlIzxGVO1dnTXUwLjKZs+b82VZ8PrhkqRj1PcrLZJcrb SIGDIbKqUZpPvmOX4k/drfjiOaHzS6ABHKhPA3CRzfHDQYzO3lLIBGcq5zUY7hGipIca UIQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SMLQwEdQ; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=DzWmPIZc; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x21-20020aa79575000000b0062ae6345c6fsi4188918pfq.394.2023.04.14.07.54.07; Fri, 14 Apr 2023 07:54:24 -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=@linutronix.de header.s=2020 header.b=SMLQwEdQ; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=DzWmPIZc; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231217AbjDNOsA (ORCPT + 99 others); Fri, 14 Apr 2023 10:48:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230390AbjDNOr6 (ORCPT ); Fri, 14 Apr 2023 10:47:58 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 503B9B767; Fri, 14 Apr 2023 07:47:56 -0700 (PDT) Date: Fri, 14 Apr 2023 14:47:54 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1681483674; 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=YpQp1L1uLgmErLsZ5BTeSfkrRYT17nARxSl8FG39kb4=; b=SMLQwEdQtAeSSqC4JZV1VavL/Nfnh6QhalXPHkIkYLDvcLEGkL+O/NrJzT69c3wCk4AWum tGOJZQYeQcQHDreaUSXEz8ogbyu6SwiJ6x7qED/GrNQJLap7IUKI8wUagsQiDK3+TOAjEi yN5sfFfkddnuj60JhT4M4u6RzRI1hDhwRmyk9I4i32VKH5xwHtqhYd9vUTHLGgJqRAnq04 uVWhrPtVHv66rU/8owy/m8yq81XqkalOQZz7+C4i+218uBAR17C1kqO7l9hXJZqP3jspZG xUVw4PxIPdRVompekutwpm14gbvQZucVFSdixTHuNY2HfrouNoKjs+TY5ppkFw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1681483674; 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=YpQp1L1uLgmErLsZ5BTeSfkrRYT17nARxSl8FG39kb4=; b=DzWmPIZcmD7K5cIrT5OnPZQS0Isb0zJaQCeJ6Qg+5Y801h7gw3KsqSwRjaqqKTAJq0ljN6 ChzTz8Yh8hr4p3DA== 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: objtool/core] x86/linkage: Fix padding for typed functions Cc: Josh Poimboeuf , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <721f0da48d2a49fe907225711b8b76a2b787f9a8.1681331135.git.jpoimboe@kernel.org> References: <721f0da48d2a49fe907225711b8b76a2b787f9a8.1681331135.git.jpoimboe@kernel.org> MIME-Version: 1.0 Message-ID: <168148367428.404.12784919569941633105.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763005619377726142?= X-GMAIL-MSGID: =?utf-8?q?1763163834224598601?= The following commit has been merged into the objtool/core branch of tip: Commit-ID: 4a2c3448ed3d362431c249ec0eb0f90281804ea8 Gitweb: https://git.kernel.org/tip/4a2c3448ed3d362431c249ec0eb0f90281804ea8 Author: Josh Poimboeuf AuthorDate: Wed, 12 Apr 2023 13:26:14 -07:00 Committer: Peter Zijlstra CommitterDate: Fri, 14 Apr 2023 16:08:30 +02:00 x86/linkage: Fix padding for typed functions CFI typed functions are failing to get padded properly for CONFIG_CALL_PADDING. Signed-off-by: Josh Poimboeuf Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/721f0da48d2a49fe907225711b8b76a2b787f9a8.1681331135.git.jpoimboe@kernel.org --- arch/x86/include/asm/linkage.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h index dd9b811..0953aa3 100644 --- a/arch/x86/include/asm/linkage.h +++ b/arch/x86/include/asm/linkage.h @@ -99,7 +99,7 @@ /* SYM_TYPED_FUNC_START -- use for indirectly called globals, w/ CFI type */ #define SYM_TYPED_FUNC_START(name) \ - SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN) \ + SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_F_ALIGN) \ ENDBR /* SYM_FUNC_START -- use for global functions */