From nobody Mon Sep 29 21:22:40 2025 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 6DF8FC00140 for ; Mon, 15 Aug 2022 23:39:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233700AbiHOXjj (ORCPT ); Mon, 15 Aug 2022 19:39:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353872AbiHOXgs (ORCPT ); Mon, 15 Aug 2022 19:36:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6D16152403; Mon, 15 Aug 2022 13:09:26 -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 ams.source.kernel.org (Postfix) with ESMTPS id 21147B80EAD; Mon, 15 Aug 2022 20:09:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 609DDC433C1; Mon, 15 Aug 2022 20:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660594163; bh=iy8R8sqgD1gbKLq9szHjKnBerfPbsLFLctTGUlSnXtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Otw8msMNlEgZf1LHF3wXfXhy16P8ATVcZdu8nRt9Q6vcLPGYf7gjWA/D0v0UGTmX+ ESUiXAkPwLZ8ymFremfhxeM1dt2PLy4RAMrNLUTirzZwaNmakPLUgizaG6KgeRT7sc 8uZpS3qeXOktu5gaV8jkayBpRkgg1Hcy066Fjkdw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Paul E. McKenney" , Sasha Levin Subject: [PATCH 5.19 0388/1157] torture: Adjust to again produce debugging information Date: Mon, 15 Aug 2022 19:55:44 +0200 Message-Id: <20220815180455.216861829@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Paul E. McKenney [ Upstream commit 5c92d7501699a5deb72a579f808500db5bb6f92a ] A recent change to the DEBUG_INFO Kconfig option means that simply adding CONFIG_DEBUG_INFO=3Dy to the .config file and running "make oldconfig" no longer works. It is instead necessary to add CONFIG_DEBUG_INFO_NONE=3Dn and (for example) CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=3Dy. This combination will then result in CONFIG_DEBUG_INFO being selected. This commit therefore updates the Kconfig options produced in response to the kvm.sh --gdb, --kasan, and --kcsan Kconfig options. Fixes: f9b3cd245784 ("Kconfig.debug: make DEBUG_INFO selectable from a choi= ce") Signed-off-by: Paul E. McKenney Signed-off-by: Sasha Levin --- tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/= selftests/rcutorture/bin/kvm.sh index 263e16aeca0e..6c734818a875 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh @@ -164,7 +164,7 @@ do shift ;; --gdb) - TORTURE_KCONFIG_GDB_ARG=3D"CONFIG_DEBUG_INFO=3Dy"; export TORTURE_KCONFI= G_GDB_ARG + TORTURE_KCONFIG_GDB_ARG=3D"CONFIG_DEBUG_INFO_NONE=3Dn CONFIG_DEBUG_INFO_= DWARF_TOOLCHAIN_DEFAULT=3Dy"; export TORTURE_KCONFIG_GDB_ARG TORTURE_BOOT_GDB_ARG=3D"nokaslr"; export TORTURE_BOOT_GDB_ARG TORTURE_QEMU_GDB_ARG=3D"-s -S"; export TORTURE_QEMU_GDB_ARG ;; @@ -180,7 +180,7 @@ do shift ;; --kasan) - TORTURE_KCONFIG_KASAN_ARG=3D"CONFIG_DEBUG_INFO=3Dy CONFIG_KASAN=3Dy"; ex= port TORTURE_KCONFIG_KASAN_ARG + TORTURE_KCONFIG_KASAN_ARG=3D"CONFIG_DEBUG_INFO_NONE=3Dn CONFIG_DEBUG_INF= O_DWARF_TOOLCHAIN_DEFAULT=3Dy CONFIG_KASAN=3Dy"; export TORTURE_KCONFIG_KAS= AN_ARG if test -n "$torture_qemu_mem_default" then TORTURE_QEMU_MEM=3D2G @@ -192,7 +192,7 @@ do shift ;; --kcsan) - TORTURE_KCONFIG_KCSAN_ARG=3D"CONFIG_DEBUG_INFO=3Dy CONFIG_KCSAN=3Dy CONF= IG_KCSAN_STRICT=3Dy CONFIG_KCSAN_REPORT_ONCE_IN_MS=3D100000 CONFIG_KCSAN_VE= RBOSE=3Dy CONFIG_DEBUG_LOCK_ALLOC=3Dy CONFIG_PROVE_LOCKING=3Dy"; export TOR= TURE_KCONFIG_KCSAN_ARG + TORTURE_KCONFIG_KCSAN_ARG=3D"CONFIG_DEBUG_INFO_NONE=3Dn CONFIG_DEBUG_INF= O_DWARF_TOOLCHAIN_DEFAULT=3Dy CONFIG_KCSAN=3Dy CONFIG_KCSAN_STRICT=3Dy CONF= IG_KCSAN_REPORT_ONCE_IN_MS=3D100000 CONFIG_KCSAN_VERBOSE=3Dy CONFIG_DEBUG_L= OCK_ALLOC=3Dy CONFIG_PROVE_LOCKING=3Dy"; export TORTURE_KCONFIG_KCSAN_ARG ;; --kmake-arg|--kmake-args) checkarg --kmake-arg "(kernel make arguments)" $# "$2" '.*' '^error$' --=20 2.35.1