From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45D64C4742C for ; Fri, 13 Nov 2020 22:34:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E540322259 for ; Fri, 13 Nov 2020 22:34:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iiW0miU/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726181AbgKMWe2 (ORCPT ); Fri, 13 Nov 2020 17:34:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29554 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725981AbgKMWe2 (ORCPT ); Fri, 13 Nov 2020 17:34:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605306866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8Rq1SwLUmuk5yTiT3dYLgLhG1v7f4gsVqDXVvnML+kQ=; b=iiW0miU/Wf46LMu701BcvKbeels5SbOrwnq9IVK2WyUG0sfTul2s80mMXeav1KZiogixAb 1GL2O1eOhLuxlgAL1LRv12egNL2TX4Nn1wUt7jBZ7D7BBfRGxj2u1pk31uecwKjQP7HKKy EsV6klylq23LXUNU1nAJMpkFcoUmof4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-508-kgiX0vPEOgWkK_HzwNLmJg-1; Fri, 13 Nov 2020 17:34:24 -0500 X-MC-Unique: kgiX0vPEOgWkK_HzwNLmJg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11ACD186DD33; Fri, 13 Nov 2020 22:34:22 +0000 (UTC) Received: from treble (ovpn-117-69.rdu2.redhat.com [10.10.117.69]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 71FFA5D707; Fri, 13 Nov 2020 22:34:15 +0000 (UTC) Date: Fri, 13 Nov 2020 16:34:12 -0600 From: Josh Poimboeuf To: Sami Tolvanen Cc: Peter Zijlstra , Jann Horn , the arch/x86 maintainers , Masahiro Yamada , Steven Rostedt , Will Deacon , Greg Kroah-Hartman , "Paul E. McKenney" , Kees Cook , Nick Desaulniers , clang-built-linux , Kernel Hardening , linux-arch , Linux ARM , linux-kbuild , kernel list , linux-pci@vger.kernel.org Subject: Re: [PATCH v6 22/25] x86/asm: annotate indirect jumps Message-ID: <20201113223412.inono2ekrs7ky7rm@treble> References: <20201021085606.GZ2628@hirez.programming.kicks-ass.net> <20201023173617.GA3021099@google.com> <20201110022924.tekltjo25wtrao7z@treble> <20201110174606.mp5m33lgqksks4mt@treble> <20201113195408.atbpjizijnhuinzy@treble> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Nov 13, 2020 at 12:24:32PM -0800, Sami Tolvanen wrote: > > I still don't see this warning for some reason. > > Do you have CONFIG_XEN enabled? I can reproduce this on ToT master as follows: > > $ git rev-parse HEAD > 585e5b17b92dead8a3aca4e3c9876fbca5f7e0ba > $ make defconfig && \ > ./scripts/config -e HYPERVISOR_GUEST -e PARAVIRT -e XEN && \ > make olddefconfig && \ > make -j110 > ... > $ ./tools/objtool/objtool check -arfld vmlinux.o 2>&1 | grep secondary > vmlinux.o: warning: objtool: __startup_secondary_64()+0x2: return with > modified stack frame > > > Is it fixed by adding cpu_bringup_and_idle() to global_noreturns[] in > > tools/objtool/check.c? > > No, that didn't fix the warning. Here's what I tested: I think this fixes it: From: Josh Poimboeuf Subject: [PATCH] x86/xen: Fix objtool vmlinux.o validation of xen hypercalls Objtool vmlinux.o validation is showing warnings like the following: # tools/objtool/objtool check -barfld vmlinux.o vmlinux.o: warning: objtool: __startup_secondary_64()+0x2: return with modified stack frame vmlinux.o: warning: objtool: xen_hypercall_set_trap_table()+0x0: <=== (sym) Objtool falls through all the empty hypercall text and gets confused when it encounters the first real function afterwards. The empty unwind hints in the hypercalls aren't working for some reason. Replace them with a more straightforward use of STACK_FRAME_NON_STANDARD. Reported-by: Sami Tolvanen Signed-off-by: Josh Poimboeuf --- arch/x86/xen/xen-head.S | 9 ++++----- include/linux/objtool.h | 8 ++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 2d7c8f34f56c..3c538b1ff4a6 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -6,6 +6,7 @@ #include #include +#include #include #include @@ -67,14 +68,12 @@ SYM_CODE_END(asm_cpu_bringup_and_idle) .pushsection .text .balign PAGE_SIZE SYM_CODE_START(hypercall_page) - .rept (PAGE_SIZE / 32) - UNWIND_HINT_EMPTY - .skip 32 - .endr + .skip PAGE_SIZE #define HYPERCALL(n) \ .equ xen_hypercall_##n, hypercall_page + __HYPERVISOR_##n * 32; \ - .type xen_hypercall_##n, @function; .size xen_hypercall_##n, 32 + .type xen_hypercall_##n, @function; .size xen_hypercall_##n, 32; \ + STACK_FRAME_NON_STANDARD xen_hypercall_##n #include #undef HYPERCALL SYM_CODE_END(hypercall_page) diff --git a/include/linux/objtool.h b/include/linux/objtool.h index 577f51436cf9..746617265236 100644 --- a/include/linux/objtool.h +++ b/include/linux/objtool.h @@ -109,6 +109,12 @@ struct unwind_hint { .popsection .endm +.macro STACK_FRAME_NON_STANDARD func:req + .pushsection .discard.func_stack_frame_non_standard + .long \func - . + .popsection +.endm + #endif /* __ASSEMBLY__ */ #else /* !CONFIG_STACK_VALIDATION */ @@ -123,6 +129,8 @@ struct unwind_hint { .macro UNWIND_HINT sp_reg:req sp_offset=0 type:req end=0 .endm #endif +.macro STACK_FRAME_NON_STANDARD func:req +.endm #endif /* CONFIG_STACK_VALIDATION */ -- 2.25.4