Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp3251484pxp; Tue, 8 Mar 2022 10:23:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxSaBRlX8X2pwv5gfkdIYWx6uMh2MxvMXwfJCc4fDNsViXchVp6XB284pEdUkFmzJVMBmG X-Received: by 2002:a17:907:72c3:b0:6ce:5256:1125 with SMTP id du3-20020a17090772c300b006ce52561125mr14890950ejc.697.1646763826254; Tue, 08 Mar 2022 10:23:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646763826; cv=none; d=google.com; s=arc-20160816; b=OPMDWBlIISbDn6YJqZ+15KjMmS5z4VbpcoRqQIaF+jeQPPLXOK6FU3HEyg7e/zCZgf rjBGVahK5n4CjLArBsye7+ehRG3GM5WqjDfQFmBnngrQqDoL8XvkIoqyc9fp7+ftzkHi ClP8K2e+98U/W2Lq5EONBHt8Yu0hIZabtbWP2rQUxZxIrziNcJSQWGEZWejyRirRem4k 4+bVUzZcNnxihAU6MgB3rIvrqvySdoDSjsonZ/SPHIU7jDLgAjN1f/ns7b2EeuMz7P7O 5/7nsScNajydmSYl3oHG8lASE5YYQabUMI+81D8tW4uxKL/prxeVBoYO46whjpTnc1IV Dppw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id:dkim-signature; bh=fh+AeJ8aNhji6VlzhvpE46DroTHAIn4XV7uW4+efjvc=; b=DgOSsNurpLqctgunUuPbBkYEjFP314+HfCswowGIjxyimsC2Nj4SYrMYZvEz2vOB9S ksIJtJFSfCgZVlfUOJAp6mtMvhdalHJB2+5dLhWh1aWTbJ2VcCYTfla/MSt9/D1YOuox 1E7F3yvqol+OQUU2Hb4spEDUsA/VEvhaZoAHpb7yDivp5DBUMI9aRXuU/OLT0zm1yr6j tVtDsDNQG22WgCarX0ft+5HsoiJGQ6jCJT0nqr79qnbr6TywOTgPBeqydeNK8pGvhk69 ukw2ConR8rk81sbADe8jkWxpVLXyBuXmRJZp8tpHjfU9WdwHXMB8HardPyjO44gKVkBU PbnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=desiato.20200630 header.b=Pski3LI+; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ym13-20020a170907330d00b006d09b726ffbsi10516083ejb.159.2022.03.08.10.23.22; Tue, 08 Mar 2022 10:23:46 -0800 (PST) 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=@infradead.org header.s=desiato.20200630 header.b=Pski3LI+; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348713AbiCHP61 (ORCPT + 99 others); Tue, 8 Mar 2022 10:58:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240553AbiCHP4J (ORCPT ); Tue, 8 Mar 2022 10:56:09 -0500 Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20FEB4F9C6 for ; Tue, 8 Mar 2022 07:55:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=fh+AeJ8aNhji6VlzhvpE46DroTHAIn4XV7uW4+efjvc=; b=Pski3LI+g8vM6rv2WhgZTSo3vC bNqYRKp2cDlNhdFeQUItvTWUGnF0mWDEBLi8dN5r/S3wQOH54H2nswT2Vj1WJPAdGyZu3ERRMxJ1t RhswcTXiz74kpLryJkqa5TIhCQ/JD02SeYBPnmWcfAzabdrF4On/yq++7iliROy7Dr7xOisEGcoRG sxxjgj+K+aZYaZXGDDrmt34NiLQTlqdw0EklqJrB0/lt15Efh7efo9gazadlOZZbw5h0VsfTtUJiB 8OkLE02LBAdoFua/T0DbRDdLWhCzT2LKJH8iS2lLZ8RDWXEWl1Rhinutjgixzb4Fe1owml04XcjFD sD8O6zFg==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by desiato.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nRcAb-00GUiK-G1; Tue, 08 Mar 2022 15:54:41 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id E459D3007C3; Tue, 8 Mar 2022 16:54:38 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id C32D42B55FFBB; Tue, 8 Mar 2022 16:54:38 +0100 (CET) Message-ID: <20220308154317.402118218@infradead.org> User-Agent: quilt/0.66 Date: Tue, 08 Mar 2022 16:30:15 +0100 From: Peter Zijlstra To: x86@kernel.org, joao@overdrivepizza.com, hjl.tools@gmail.com, jpoimboe@redhat.com, andrew.cooper3@citrix.com Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, ndesaulniers@google.com, keescook@chromium.org, samitolvanen@google.com, mark.rutland@arm.com, alyssa.milburn@intel.com, mbenes@suse.cz, rostedt@goodmis.org, mhiramat@kernel.org, alexei.starovoitov@gmail.com Subject: [PATCH v4 04/45] objtool,efi: Update __efi64_thunk annotation References: <20220308153011.021123062@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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_NONE,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 The current annotation relies on not running objtool on the file; this won't work when running objtool on vmlinux.o. Instead explicitly mark __efi64_thunk() to be ignored. This preserves the status quo, which is somewhat unfortunate. Luckily this code is hardly ever used. Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/platform/efi/Makefile | 1 - arch/x86/platform/efi/efi_thunk_64.S | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) --- a/arch/x86/platform/efi/Makefile +++ b/arch/x86/platform/efi/Makefile @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -OBJECT_FILES_NON_STANDARD_efi_thunk_$(BITS).o := y KASAN_SANITIZE := n GCOV_PROFILE := n --- a/arch/x86/platform/efi/efi_thunk_64.S +++ b/arch/x86/platform/efi/efi_thunk_64.S @@ -20,12 +20,14 @@ */ #include +#include #include #include .text .code64 -SYM_CODE_START(__efi64_thunk) +SYM_FUNC_START(__efi64_thunk) +STACK_FRAME_NON_STANDARD __efi64_thunk push %rbp push %rbx @@ -79,7 +81,7 @@ SYM_CODE_START(__efi64_thunk) 2: pushl $__KERNEL_CS pushl %ebp lret -SYM_CODE_END(__efi64_thunk) +SYM_FUNC_END(__efi64_thunk) .bss .balign 8