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 8EBCAC636D6 for ; Thu, 23 Feb 2023 11:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234004AbjBWLyg (ORCPT ); Thu, 23 Feb 2023 06:54:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234040AbjBWLyK (ORCPT ); Thu, 23 Feb 2023 06:54:10 -0500 Received: from mail-ed1-x549.google.com (mail-ed1-x549.google.com [IPv6:2a00:1450:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D801454A07 for ; Thu, 23 Feb 2023 03:54:07 -0800 (PST) Received: by mail-ed1-x549.google.com with SMTP id fi8-20020a056402550800b004a26cc7f6cbso14460848edb.4 for ; Thu, 23 Feb 2023 03:54:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=aqI5qRz1R2l92R95izh+z71292tP3IreESGLJDlY42w=; b=r5DLdzyiLefsEEbLLBNJXanRJcEV6piHQkD0uKbvvFGwGxZMeWUEZyqimk08IkkDgW sljfAcKxXzbHexzFzbfShoYNlJBhkd5Yimz9ECpYaz1JlOJNL8onMof/89jTGOqyvEod m7vlKRPwdSCOSVJ6zSy4puUAFrFe9qxzt7Dobqedwu4PwtgCeYaKBBdBSzVeHAqdTK61 0d7++akMPINK2HYjPjMQ1EZnorjvmhN3IcxzRasHAU0Gfom+0s3o9j8G7CkZyJ8jr/KM AwVwa5Fe3mjT+6+2kvGxbt55Gax5wcwLxwQjWfengdR2wfpovOSCppjHfuXO6/feXB8l pG2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aqI5qRz1R2l92R95izh+z71292tP3IreESGLJDlY42w=; b=jF7xgbss/zR71yEQTslByI+fndj1el6fgNardvovBsHPmGFGZdWcDkpvkQWUYDIBkn 4RXEWf5uZ6Qi6jxpwWvvBEPH30timqAHCPVwta3eJ65fXUAQ5uWJqBAjKsFGBlbHPGak fZQWr/tyPuRCD/jJmKmMgsMxxhmFE1TJQO0XyrdYVoDgnmpOs8KdbjgXKzxukZo7gAzk OMAIFxlM2qyc0ew1YqbSPiA7UUyuJSvK+bqjfFpM7rnl9h7M05eNAWYwR9faGQ8WuNIk PJUQ3/qPMTY00mhmWguh7FgcUn3dsHB6zQS06fjv9QI1lsDrRCZW/AuguYc2i+qeOlRH loaQ== X-Gm-Message-State: AO0yUKUYR4XN/naoXJ3dUTp7mslcVbDgJCj2kIt2Q2QmyCti5Qr4K4nr PJ0Z3qm9ukkzHQigqxFHoIGtqfyxUYqk4zFgqfuNl/DHJCDcz/OqSs5F5a4Qwo2YjQRFPHBIxpC MsINqXrzbgLLaMh1lo7xYlFQQH7nfV7Mmgbct95jKXJp1L+24njJKPv1hK6wEJVs4mbXQeshQmx A= X-Google-Smtp-Source: AK7set/4h+iHm/PkGUfEY5SE2abz0fqYl0ctlcK48eQu18xhDc5UlrdrQp0M76tx5+fa5TINSt+SWYwimd31UQ== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:209:cf33:dc28:3e98:f5e9]) (user=maennich job=sendgmr) by 2002:a17:906:76d0:b0:8de:e66a:d788 with SMTP id q16-20020a17090676d000b008dee66ad788mr4278993ejn.7.1677153246106; Thu, 23 Feb 2023 03:54:06 -0800 (PST) Date: Thu, 23 Feb 2023 11:53:51 +0000 In-Reply-To: <20220201205624.652313-1-nathan@kernel.org> Message-Id: <20230223115351.1241401-5-maennich@google.com> Mime-Version: 1.0 References: <20220201205624.652313-1-nathan@kernel.org> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Subject: [PATCH v5.15 v2 4/4] lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ From: Matthias Maennich To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, maennich@google.com, stable@vger.kernel.org, Greg Kroah-Hartman , Nathan Chancellor , Andrii Nakryiko , Daniel Borkmann Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nathan Chancellor [ Upstream commit 42d9b379e3e1790eafb87c799c9edfd0b37a37c7 ] Commit 98cd6f521f10 ("Kconfig: allow explicit opt in to DWARF v5") prevented CONFIG_DEBUG_INFO_DWARF5 from being selected when CONFIG_DEBUG_INFO_BTF is enabled because pahole had issues with clang's DWARF5 info. This was resolved by [1], which is in pahole v1.21. Allow DEBUG_INFO_DWARF5 to be selected with DEBUG_INFO_BTF when using pahole v1.21 or newer. [1]: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=7d8e829f636f47aba2e1b6eda57e74d8e31f733c Change-Id: I9cc90f12abcc8a809bb263e31ec16766d9384e40 Signed-off-by: Nathan Chancellor Signed-off-by: Daniel Borkmann Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220201205624.652313-6-nathan@kernel.org Signed-off-by: Matthias Maennich --- lib/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 944fd2ae756b..dbbd243c865f 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -302,7 +302,7 @@ config DEBUG_INFO_DWARF4 config DEBUG_INFO_DWARF5 bool "Generate DWARF Version 5 debuginfo" depends on !CC_IS_CLANG || AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 23502 && AS_HAS_NON_CONST_LEB128) - depends on !DEBUG_INFO_BTF + depends on !DEBUG_INFO_BTF || PAHOLE_VERSION >= 121 help Generate DWARF v5 debug info. Requires binutils 2.35.2, gcc 5.0+ (gcc 5.0+ accepts the -gdwarf-5 flag but only had partial support for some -- 2.39.2.637.g21b0678d19-goog