Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp1471907rwl; Wed, 12 Apr 2023 13:27:49 -0700 (PDT) X-Google-Smtp-Source: AKy350aUGmyPDIvHdvNIunVwi6n9ekczIHyA4xOKLPS04bqOjw6gtc7PXuS+YUT7mhihKA5j7I7b X-Received: by 2002:a05:6a20:7b1a:b0:d9:b59c:d09e with SMTP id s26-20020a056a207b1a00b000d9b59cd09emr7722840pzh.11.1681331269513; Wed, 12 Apr 2023 13:27:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681331269; cv=none; d=google.com; s=arc-20160816; b=OKswezp2HM4wWHSBGlxWQ+HrYSA/nYmCblVyIY44X+TddPtDmkR6m38O9Hokz8p/Gc k1qXqahC3sgCwO2UIPfJIoZs/wLhwPsLFYubAZvqpabKVyXaXP+5aUwms97eris8Y4n/ AzegsbAhJQoEd7AQN3GRw69OmhYMc/advUaob1IUHcz5FWJpt0olCUjcr0eHncnpYZyA D33kgfqjZcsF3r8k3xk8XnnQQjvQ7b4Ft7BATDLnc/uReH75hobYB8rYxgWQKCRlJych AzJsMsKhcZ/b8G93IjdbAJ7mWZ4seZpkqYdbZtmS89XFJqK8UGQEUn/Gii2mN/mm2U2E LBgQ== 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=HtWzieDnWcNJLmiP1f/Wpq9muFbVp4eFjgZD886nCW0=; b=ArGC0DydFAZ1cEZdga0FaMxKZOxkrnOWk/qO4Jmds12mLWEDQHY3FF8E25BLQF5krZ u0RxUIP2JO6cX82zBSinamLVoGD01wY+zUnp2T1VbzsCs2mKO0Kul7i+HnSHj8xDL7DT gBivK1YDeI0q2qbtEPFY1ljcKMHYy18SZBgp70rSmu5W1r7LhJRrInkX+Mml255prG5P BFyAQ3/jCSsmszpDJ2rLm5GHL9qo9h9HXuh57aFB9O88lkkoj0Gl4amTOVXar2jlDCfZ aO3SH92jEebWBlfZG5p5Z0MnpUUKm6Xy2KG4sHeXoSrujSbVklp55DJHk8KTN9o+9EuS y5uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pP+al7ot; 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 b17-20020aa79511000000b00594252e8a11si7363015pfp.170.2023.04.12.13.27.37; Wed, 12 Apr 2023 13:27:49 -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=pP+al7ot; 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 S229872AbjDLU02 (ORCPT + 99 others); Wed, 12 Apr 2023 16:26:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229742AbjDLU0X (ORCPT ); Wed, 12 Apr 2023 16:26:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3665594 for ; Wed, 12 Apr 2023 13:26:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C5AF36390B for ; Wed, 12 Apr 2023 20:26:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BA5BC433A0; Wed, 12 Apr 2023 20:26:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681331182; bh=1f+D/INVsHu7FMXl7yZ+eU5VEMYIQVwkoMtNsfmlqSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pP+al7otwpbXGE80VGWlfTn9pWbN4cNBbQ2+KqmiaPq120LvBUGSf2OTCjJPTUkeg jroiqW0R8dJO+svdRTI7WKALwssdYQqpdSHaAQWRMpbgShx9Pdi7ha1Kb+3V4x8EmI h2tCUFObYtaDioKtWNyK78YNrAilq5fH9S1P4wcqaMuVCS2LqEm5hpoibxXUI4rvPs A7mOYjCXWT7E4A+0qvg0lhThk+WETbMBjx8kHtMm0vSJuWa+vLtWdQpAuUHSHDY0xm RkP8cxVzfG2XQoBocJwDjMn+b5FDP+gO8V6+ykj8FMpVBs8dnbfZolDje7Jzr+5/iP 02Dgp6UoUQO/g== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Miroslav Benes Subject: [PATCH 2/3] x86/linkage: Fix padding for typed functions Date: Wed, 12 Apr 2023 13:26:14 -0700 Message-Id: <721f0da48d2a49fe907225711b8b76a2b787f9a8.1681331135.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 CFI typed functions are failing to get padded properly for CONFIG_CALL_PADDING. Signed-off-by: Josh Poimboeuf --- 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 dd9b8118f784..0953aa32a324 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 */ -- 2.39.2