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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E03FC77B7A for ; Wed, 7 Jun 2023 20:00:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232129AbjFGUAU (ORCPT ); Wed, 7 Jun 2023 16:00:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232198AbjFGUAL (ORCPT ); Wed, 7 Jun 2023 16:00:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3D672126; Wed, 7 Jun 2023 13:00:03 -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 42E64642D0; Wed, 7 Jun 2023 20:00:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93B1FC4339B; Wed, 7 Jun 2023 20:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1686168002; bh=3nd2KNL9Cxth9WZjmaoxLETshYw2w7jnsDlr6NOt/eE=; h=Date:To:From:Subject:From; b=jeUNW3ZITVSW9UuSo8EDwO8wGVU1W0Tm7Lx/SPSvkWf9wA06elUpJqzgxml2FeU4W fIynU5U2SUGpu/yg84B3iidkHmJHd9mBA6+hO5LbzKPpksdXol7Y1yiYI3EuM/AjXA 7LB3zph63E757kV26a/xDXykoaq2RJ/fs/E5qz0Q= Date: Wed, 07 Jun 2023 13:00:01 -0700 To: mm-commits@vger.kernel.org, zwisler@google.com, trix@redhat.com, tglx@linutronix.de, stable@vger.kernel.org, rostedt@goodmis.org, prudo@redhat.com, paul.walmsley@sifive.com, palmer@rivosinc.com, palmer@dabbelt.com, npiggin@gmail.com, ndesaulniers@google.com, nathan@kernel.org, mpe@ellerman.id.au, mingo@redhat.com, hpa@zytor.com, horms@kernel.org, ebiederm@xmission.com, dyoung@redhat.com, dave.hansen@linux.intel.com, christophe.leroy@csgroup.eu, bp@alien8.de, bhe@redhat.com, aou@eecs.berkeley.edu, ribalda@chromium.org, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-hotfixes-stable] x86-purgatory-remove-pgo-flags.patch removed from -mm tree Message-Id: <20230607200002.93B1FC4339B@smtp.kernel.org> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The quilt patch titled Subject: x86/purgatory: remove PGO flags has been removed from the -mm tree. Its filename was x86-purgatory-remove-pgo-flags.patch This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Ricardo Ribalda Subject: x86/purgatory: remove PGO flags Date: Fri, 19 May 2023 16:47:37 +0200 If profile-guided optimization is enabled, the purgatory ends up with multiple .text sections. This is not supported by kexec and crashes the system. Link: https://lkml.kernel.org/r/20230321-kexec_clang16-v7-2-b05c520b7296@chromium.org Fixes: 930457057abe ("kernel/kexec_file.c: split up __kexec_load_puragory") Signed-off-by: Ricardo Ribalda Cc: Cc: Albert Ou Cc: Baoquan He Cc: Borislav Petkov (AMD) Cc: Christophe Leroy Cc: Dave Hansen Cc: Dave Young Cc: Eric W. Biederman Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Michael Ellerman Cc: Nathan Chancellor Cc: Nicholas Piggin Cc: Nick Desaulniers Cc: Palmer Dabbelt Cc: Palmer Dabbelt Cc: Paul Walmsley Cc: Philipp Rudo Cc: Ross Zwisler Cc: Simon Horman Cc: Steven Rostedt (Google) Cc: Thomas Gleixner Cc: Tom Rix Signed-off-by: Andrew Morton --- arch/x86/purgatory/Makefile | 5 +++++ 1 file changed, 5 insertions(+) --- a/arch/x86/purgatory/Makefile~x86-purgatory-remove-pgo-flags +++ a/arch/x86/purgatory/Makefile @@ -14,6 +14,11 @@ $(obj)/sha256.o: $(srctree)/lib/crypto/s CFLAGS_sha256.o := -D__DISABLE_EXPORTS +# When profile-guided optimization is enabled, llvm emits two different +# overlapping text sections, which is not supported by kexec. Remove profile +# optimization flags. +KBUILD_CFLAGS := $(filter-out -fprofile-sample-use=% -fprofile-use=%,$(KBUILD_CFLAGS)) + # When linking purgatory.ro with -r unresolved symbols are not checked, # also link a purgatory.chk binary without -r to check for unresolved symbols. PURGATORY_LDFLAGS := -e purgatory_start -z nodefaultlib _ Patches currently in -mm which might be from ribalda@chromium.org are