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 89A4FC47088 for ; Sat, 3 Dec 2022 10:59:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229540AbiLCK7n (ORCPT ); Sat, 3 Dec 2022 05:59:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbiLCK7m (ORCPT ); Sat, 3 Dec 2022 05:59:42 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA4251CB28 for ; Sat, 3 Dec 2022 02:59:40 -0800 (PST) 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 7573A60BAD for ; Sat, 3 Dec 2022 10:59:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6541BC433C1; Sat, 3 Dec 2022 10:59:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1670065179; bh=NL3ytCFhTtF1PzpJ0HVJFWk7U/vxR7q9l7xt92sc/PM=; h=Subject:To:Cc:From:Date:From; b=169KP4t9WmproTmqQYMRFeLG2h+azdjD0M2uyYH0TVS8rC4UGFmPzSOu/4l2ArTT7 sbK3X916Y7A8K4x0tXe7Yuc5yrZiUCHwb3BZGReQQG8G6wBDEgC5O6clSO6TdV6siY /VQhRjFRK7HzRJwa/SEGeVJJRVFSteBN98hSBqC0= Subject: FAILED: patch "[PATCH] Kconfig.debug: provide a little extra FRAME_WARN leeway when" failed to apply to 5.4-stable tree To: lee@kernel.org, Rodrigo.Siqueira@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, akpm@linux-foundation.org, alexander.deucher@amd.com, arnd@arndb.de, christian.koenig@amd.com, daniel@ffwll.ch, harry.wentland@amd.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, nathan@kernel.org, ndesaulniers@google.com, stable@vger.kernel.org, sunpeng.li@amd.com, trix@redhat.com, tzimmermann@suse.de Cc: From: Date: Sat, 03 Dec 2022 11:59:33 +0100 Message-ID: <167006517322713@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Possible dependencies: 152fe65f300e ("Kconfig.debug: provide a little extra FRAME_WARN leeway when KASAN is enabled") 8d192bec534b ("parisc: Increase FRAME_WARN to 2048 bytes on parisc") 867050247e29 ("xtensa: increase size of gcc stack frame check") 55b70eed81cb ("parisc: Increase size of gcc stack frame check") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 152fe65f300e1819d59b80477d3e0999b4d5d7d2 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 25 Nov 2022 12:07:50 +0000 Subject: [PATCH] Kconfig.debug: provide a little extra FRAME_WARN leeway when KASAN is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When enabled, KASAN enlarges function's stack-frames. Pushing quite a few over the current threshold. This can mainly be seen on 32-bit architectures where the present limit (when !GCC) is a lowly 1024-Bytes. Link: https://lkml.kernel.org/r/20221125120750.3537134-3-lee@kernel.org Signed-off-by: Lee Jones Acked-by: Arnd Bergmann Cc: Alex Deucher Cc: "Christian König" Cc: Daniel Vetter Cc: David Airlie Cc: Harry Wentland Cc: Leo Li Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: "Pan, Xinhui" Cc: Rodrigo Siqueira Cc: Thomas Zimmermann Cc: Tom Rix Cc: Signed-off-by: Andrew Morton diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index a1005415f0f4..580e453e284e 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -399,6 +399,7 @@ config FRAME_WARN default 2048 if GCC_PLUGIN_LATENT_ENTROPY default 2048 if PARISC default 1536 if (!64BIT && XTENSA) + default 1280 if KASAN && !64BIT default 1024 if !64BIT default 2048 if 64BIT help