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 27382C76195 for ; Tue, 28 Mar 2023 12:21:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229654AbjC1MVz (ORCPT ); Tue, 28 Mar 2023 08:21:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230155AbjC1MVy (ORCPT ); Tue, 28 Mar 2023 08:21:54 -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 6AE52F5 for ; Tue, 28 Mar 2023 05:21:53 -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 065F76172D for ; Tue, 28 Mar 2023 12:21:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 129BBC433EF; Tue, 28 Mar 2023 12:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1680006112; bh=lDpDbQW7zBYO7HZ71ac+g/bCvNjl2cG0fwlGFhMo2qY=; h=Subject:To:Cc:From:Date:From; b=A22tXnih4qY3zwLsPyoVpvU7PN+FBbnZVksg4OAasRbcgIwXU4Xo7kTQoRI4VkWH+ ZzTxMW3o78ihDruLDGGKYxcd8rPb+cW7g2DzML5fjLTBvG6s2X46537/yz9DNig23I 6WQND76Ob6JDu/jBGcXKf/871AtLwlTQI6/pDYZI= Subject: FAILED: patch "[PATCH] kcsan: avoid passing -g for test" failed to apply to 6.1-stable tree To: elver@google.com, akpm@linux-foundation.org, dvyukov@google.com, glider@google.com, nathan@kernel.org, stable@vger.kernel.org Cc: From: Date: Tue, 28 Mar 2023 14:21:49 +0200 Message-ID: <16800061091616@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 6.1-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 . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 5eb39cde1e2487ba5ec1802dc5e58a77e700d99e # git commit -s git send-email --to '' --in-reply-to '16800061091616@kroah.com' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 5eb39cde1e24 ("kcsan: avoid passing -g for test") 6fcd4267a840 ("kernel: kcsan: kcsan_test: build without structleak plugin") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 5eb39cde1e2487ba5ec1802dc5e58a77e700d99e Mon Sep 17 00:00:00 2001 From: Marco Elver Date: Thu, 16 Mar 2023 23:47:05 +0100 Subject: [PATCH] kcsan: avoid passing -g for test Nathan reported that when building with GNU as and a version of clang that defaults to DWARF5, the assembler will complain with: Error: non-constant .uleb128 is not supported This is because `-g` defaults to the compiler debug info default. If the assembler does not support some of the directives used, the above errors occur. To fix, remove the explicit passing of `-g`. All the test wants is that stack traces print valid function names, and debug info is not required for that. (I currently cannot recall why I added the explicit `-g`.) Link: https://lkml.kernel.org/r/20230316224705.709984-2-elver@google.com Fixes: 1fe84fd4a402 ("kcsan: Add test suite") Signed-off-by: Marco Elver Reported-by: Nathan Chancellor Cc: Alexander Potapenko Cc: Dmitry Vyukov Cc: Signed-off-by: Andrew Morton diff --git a/kernel/kcsan/Makefile b/kernel/kcsan/Makefile index 8cf70f068d92..a45f3dfc8d14 100644 --- a/kernel/kcsan/Makefile +++ b/kernel/kcsan/Makefile @@ -16,6 +16,6 @@ obj-y := core.o debugfs.o report.o KCSAN_INSTRUMENT_BARRIERS_selftest.o := y obj-$(CONFIG_KCSAN_SELFTEST) += selftest.o -CFLAGS_kcsan_test.o := $(CFLAGS_KCSAN) -g -fno-omit-frame-pointer +CFLAGS_kcsan_test.o := $(CFLAGS_KCSAN) -fno-omit-frame-pointer CFLAGS_kcsan_test.o += $(DISABLE_STRUCTLEAK_PLUGIN) obj-$(CONFIG_KCSAN_KUNIT_TEST) += kcsan_test.o