From patchwork Fri Jan 15 12:27:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 363613 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp277268jap; Fri, 15 Jan 2021 05:08:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbHYNsR2S1pFRGE7j1useOhxnwIns8UOTTMZWhqXQh1iYnwOZ2LFduPdaajvUHF4OAR1rT X-Received: by 2002:a17:906:7e0b:: with SMTP id e11mr8502145ejr.533.1610716030706; Fri, 15 Jan 2021 05:07:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610716030; cv=none; d=google.com; s=arc-20160816; b=UJu8ACNXTZ02gOqUttrx/VIqB/KJC9uTAVlRbRZ4JkZ6TN2kysjTkd5Ot9i1a+SjuQ b7R7Roh1S5lR9MsL/KcxqzcoLvVWr0eeVqC8UmfkItyEu2q+YvzKy4JvChpjAQ48g1YC ckiXC2kn8lpEax3Jlg+H7QxQMgHiusGdPRdswCx+fhxwUjKbon3xP7GbDxfuPBK5ehcq 1wGJUT76QsrkxakIg9fxKgHqOBPstkKa4mxP58SejGcsBYQCk+ajHr51WeuB87iLwktb VkwQoRTBEKMiqxXDULTlv/PlwkndutPNHcKJUQnkNlLn6laPt/zdzlzsPvn09VxKxxLX CD5Q== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VxHKrXeobCtnuEWIpUl7kqErHLgB9Rr4uI/U2B/gJC4=; b=pB3RbanbQ+d/ZyVlKmZz2mV2Xb+KtsMngNNQZgE3is/OY/jqT0ehzfc9dBh1jdbC2S ygJ6Dd6KzGIRQfK3lnXyAxQxHgUkqOX6EFv89YpUNaZqucVk0ufb1/Qq+HIHu2f9qIkx Aom0ps4O9sAsfcDrhat4YFDYYuPTPAn7szLKGvtC1Z6vc/BlhGvhDTZd17JOeT3CYb19 BDvW5Di6fcaDjxeV9uyWQzLb+iunNrS+x+WqdPuEADoBoqZIsKOxXkVNKccUA9unZLrI ZGPHCZVMuXzxWwCocn1y1fOvnro2RSClzWMd26iVTNMg+KNLz35JryZMoXcgwCKqfKv8 2qPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2eCUBtZX; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s7si3543505edw.47.2021.01.15.05.07.10; Fri, 15 Jan 2021 05:07:10 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2eCUBtZX; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732758AbhAONGo (ORCPT + 13 others); Fri, 15 Jan 2021 08:06:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:36468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732571AbhAOMbU (ORCPT ); Fri, 15 Jan 2021 07:31:20 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1A3DF23359; Fri, 15 Jan 2021 12:30:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1610713852; bh=zMvVyCvwo/EX6UZN4/MyQq2opcAvoCJ188svsQtvNys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2eCUBtZXJNMp/aCG/8rpzNtKxDzkg+uKuxN6qbBr13WH+bsKqlFDEPNVG6hvlbU/9 MDGHvO5at0RTxj+VRAS40SxsDbiy5hYgP1gGUujOR8KYck9GcUrSr39SbtDzJMURPh rmK61ngnLVri5Xn29KtX2ASk0ulE6/yCOKvKnilE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jian Cai , =?utf-8?b?RsSBbmctcnXDrCBTw7JuZw==?= , Nick Desaulniers , Kees Cook , Ingo Molnar , Luis Lozano , Manoj Gupta , linux-arch@vger.kernel.org, Nathan Chancellor Subject: [PATCH 4.9 10/25] vmlinux.lds.h: Add PGO and AutoFDO input sections Date: Fri, 15 Jan 2021 13:27:41 +0100 Message-Id: <20210115121957.192486980@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210115121956.679956165@linuxfoundation.org> References: <20210115121956.679956165@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nick Desaulniers commit eff8728fe69880d3f7983bec3fb6cea4c306261f upstream. Basically, consider .text.{hot|unlikely|unknown}.* part of .text, too. When compiling with profiling information (collected via PGO instrumentations or AutoFDO sampling), Clang will separate code into .text.hot, .text.unlikely, or .text.unknown sections based on profiling information. After D79600 (clang-11), these sections will have a trailing `.` suffix, ie. .text.hot., .text.unlikely., .text.unknown.. When using -ffunction-sections together with profiling infomation, either explicitly (FGKASLR) or implicitly (LTO), code may be placed in sections following the convention: .text.hot., .text.unlikely., .text.unknown. where , , and are functions. (This produces one section per function; we generally try to merge these all back via linker script so that we don't have 50k sections). For the above cases, we need to teach our linker scripts that such sections might exist and that we'd explicitly like them grouped together, otherwise we can wind up with code outside of the _stext/_etext boundaries that might not be mapped properly for some architectures, resulting in boot failures. If the linker script is not told about possible input sections, then where the section is placed as output is a heuristic-laiden mess that's non-portable between linkers (ie. BFD and LLD), and has resulted in many hard to debug bugs. Kees Cook is working on cleaning this up by adding --orphan-handling=warn linker flag used in ARCH=powerpc to additional architectures. In the case of linker scripts, borrowing from the Zen of Python: explicit is better than implicit. Also, ld.bfd's internal linker script considers .text.hot AND .text.hot.* to be part of .text, as well as .text.unlikely and .text.unlikely.*. I didn't see support for .text.unknown.*, and didn't see Clang producing such code in our kernel builds, but I see code in LLVM that can produce such section names if profiling information is missing. That may point to a larger issue with generating or collecting profiles, but I would much rather be safe and explicit than have to debug yet another issue related to orphan section placement. Reported-by: Jian Cai Suggested-by: Fāng-ruì Sòng Signed-off-by: Nick Desaulniers Signed-off-by: Kees Cook Signed-off-by: Ingo Molnar Tested-by: Luis Lozano Tested-by: Manoj Gupta Acked-by: Kees Cook Cc: linux-arch@vger.kernel.org Cc: stable@vger.kernel.org Link: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=add44f8d5c5c05e08b11e033127a744d61c26aee Link: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=1de778ed23ce7492c523d5850c6c6dbb34152655 Link: https://reviews.llvm.org/D79600 Link: https://bugs.chromium.org/p/chromium/issues/detail?id=1084760 Link: https://lore.kernel.org/r/20200821194310.3089815-7-keescook@chromium.org Debugged-by: Luis Lozano [nc: Fix small conflict around lack of NOINSTR_TEXT and .text..refcount] Signed-off-by: Nathan Chancellor Signed-off-by: Greg Kroah-Hartman --- include/asm-generic/vmlinux.lds.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -460,7 +460,10 @@ */ #define TEXT_TEXT \ ALIGN_FUNCTION(); \ - *(.text.hot TEXT_MAIN .text.fixup .text.unlikely) \ + *(.text.hot .text.hot.*) \ + *(TEXT_MAIN .text.fixup) \ + *(.text.unlikely .text.unlikely.*) \ + *(.text.unknown .text.unknown.*) \ *(.ref.text) \ MEM_KEEP(init.text) \ MEM_KEEP(exit.text) \