From patchwork Thu Oct 14 16:07:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1540999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=NAHbI8ws; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVZ7b5JKtz9sNH for ; Fri, 15 Oct 2021 03:08:10 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mb3H0-0007GA-99; Thu, 14 Oct 2021 16:08:02 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mb3Gz-0007Fh-49 for kernel-team@lists.ubuntu.com; Thu, 14 Oct 2021 16:08:01 +0000 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id E7DF43FFF5 for ; Thu, 14 Oct 2021 16:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1634227680; bh=SWu7dYL9vPr7Clg6/aDnQndo7k/zzasYHa8L5yJPNtA=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=NAHbI8wshd2alPy8kFSobKJoN7nEVX4j9LaglU59zsf8/eDCPvOdQYXqZlKSY+2zM VghepWQNojK8h1+ZKWOfQq382OX/e+gaZUa/tT1XTZFbF2T7Rzk1vW9YFD2AZ4ZuNd ldxwV9Vs75XqjGOS4n7OMh8Bg/j+VpSe1PEPSRQapfFS1s6oVLMLuZyicPTUr4JfcM 22Need/8TsrYTrAlP0s+r9LNXgAb290Eybqsu4a5+Y9F7jy8yMraJp5h2k+2hjC0UH axoVQHrqc/ermkaSKfmm4FwGSg9cpDSMrTyD2WHvK+MAwBzOYdKFYDPZy+IDLpmtZm s/Py4CB8eR8SQ== Received: by mail-wr1-f70.google.com with SMTP id d13-20020adfa34d000000b00160aa1cc5f1so4914304wrb.14 for ; Thu, 14 Oct 2021 09:08:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=SWu7dYL9vPr7Clg6/aDnQndo7k/zzasYHa8L5yJPNtA=; b=dITLG1MFphq5ssA9dGjoyEFMX7ake+40/WVjIadgfYBynGGQUH4vR/4uBzw3dGGAwb PvIyxr0RM5+WV4/Jle2T4qYCB9vY6dLE3IuOc3MFVtwytjIr7e+1k7pSLamOU+Rz9HH2 04+5H65uBZms4hlrwSv8f1tmGdUe1CN8igS2awRrkLpciRtzfMf2arwtCFhMY1mlxhLH F/qr/c84VBHY/unYww5v04kPlKbGVdHcS9S26At1DAoUOHXbGspsOgi1ocMsLiYxTDK0 FjM77xDIBd19zaEkTRNzvnrlhMEJXoUHOgiA76vmX4IvYXbDbNbUjT6ODmZawWPQ7AoY 5SUA== X-Gm-Message-State: AOAM533hPslnJgwiqIJ28vGPq7yavVWipQ6PMMOmoMk0AYvrs8WYpotR g5LSYzR0Vn+fHA1LDjl1heNzqd65+7cw4R7IfDhk/mx54qEZ5xK5tXlARYvDaCZHWpxpVwqe9zd b//uFn3Ldge16dFEh+jMvT4ab7Qix0ipZ5tpv7+rHGQ== X-Received: by 2002:a05:600c:350f:: with SMTP id h15mr6769958wmq.62.1634227679583; Thu, 14 Oct 2021 09:07:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDDRXhwQn3oJSo/ArYOltLMGSvYpu1vWZGSQW6+AIdaYoHm+4qu5G4ANUALkSxlzkpDS172w== X-Received: by 2002:a05:600c:350f:: with SMTP id h15mr6769910wmq.62.1634227679256; Thu, 14 Oct 2021 09:07:59 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:cbee:94b7:8de3:1e11]) by smtp.gmail.com with ESMTPSA id n66sm2590539wmn.2.2021.10.14.09.07.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 09:07:58 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [SRU][f/aws-5.11][PATCH] UBUNTU: [Config] Re-enable CONFIG_DEBUG_INFO_BTF on all arches Date: Thu, 14 Oct 2021 17:07:52 +0100 Message-Id: <20211014160752.37725-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" New backport of pahole is now available that works with new enough kernels, thus it is now possible to re-enable CONFIG_DEBUG_INFO_BTF on all arches. BugLink: https://bugs.launchpad.net/bugs/1945632 Signed-off-by: Dimitri John Ledkov Acked-by: Tim Gardner Acked-by: Kelsey Skunberg --- debian.aws-5.11/config/annotations | 2 +- debian.aws-5.11/config/config.common.ubuntu | 2 +- debian.aws-5.11/scripts/helpers/local-mangle | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/debian.aws-5.11/config/annotations b/debian.aws-5.11/config/annotations index 98a3cb99b0..ac7a97792f 100644 --- a/debian.aws-5.11/config/annotations +++ b/debian.aws-5.11/config/annotations @@ -10245,6 +10245,7 @@ CONFIG_DEBUG_INFO_REDUCED policy<{'amd64': 'n', 'arm64': ' CONFIG_DEBUG_INFO_COMPRESSED policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_DEBUG_INFO_SPLIT policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_DEBUG_INFO_DWARF4 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_DEBUG_INFO_BTF policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_GDB_SCRIPTS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> # CONFIG_DEBUG_INFO mark note @@ -13019,4 +13020,3 @@ CONFIG_APPLDATA_NET_SUM policy<{'s390x': 'm'}> # # -CONFIG_DEBUG_INFO_BTF policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> diff --git a/debian.aws-5.11/config/config.common.ubuntu b/debian.aws-5.11/config/config.common.ubuntu index a888d37a71..7f909c6b2a 100644 --- a/debian.aws-5.11/config/config.common.ubuntu +++ b/debian.aws-5.11/config/config.common.ubuntu @@ -2133,7 +2133,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO=y -# CONFIG_DEBUG_INFO_BTF is not set +CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_DWARF4=y # CONFIG_DEBUG_INFO_REDUCED is not set diff --git a/debian.aws-5.11/scripts/helpers/local-mangle b/debian.aws-5.11/scripts/helpers/local-mangle index 99b7255850..009d6e4069 100755 --- a/debian.aws-5.11/scripts/helpers/local-mangle +++ b/debian.aws-5.11/scripts/helpers/local-mangle @@ -5,15 +5,6 @@ . debian/debian.env -ANN=${DEBIAN}/config/annotations -CFG=${DEBIAN}/config/config.common.ubuntu - -# -# CONFIG_DEBUG_INFO_BTF requires /usr/bin/pahole v1.16 or higher. Focal only has v1.15. -sed -i '/CONFIG_DEBUG_INFO_BTF/d' ${ANN} -echo "CONFIG_DEBUG_INFO_BTF policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>" >> ${ANN} -sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${CFG} - # Do not enforce CONFIG_ARM64_BTI_KERNEL in Focal, as it depends on a newer # gcc version. Note that the config itself is already removed in an earlier # stage when 'make' is run, updating config 'GCC_VERSION' and removing