From patchwork Mon Feb 7 15:15:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589358 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=hIu3QiGA; 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 4JsqTN2dN8z9s5B for ; Tue, 8 Feb 2022 02:15:36 +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 1nH5jj-0003Bg-LV; Mon, 07 Feb 2022 15:15:27 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nH5jh-00039z-An for kernel-team@lists.ubuntu.com; Mon, 07 Feb 2022 15:15:25 +0000 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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-0.canonical.com (Postfix) with ESMTPS id 10E723F1A1 for ; Mon, 7 Feb 2022 15:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644246925; bh=uBWCawWP448pDUDnNbtVWq7HJHP5oZu1cANqFUgzFBI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hIu3QiGAdV+ckrLR/V+eM4YVNBOOYFZOGV0bHpiwPCW6PVUXMLRc+tA+oaKCYS4Sh xelelbn9y0G0MxoKVzLYy2eEgJ1S9aAC7jMRWY5txTji4O1fIqwzH5B0dZldVjnr9P NYtJ5pt9hFIQuIEypCCBT+NEQGiAe4vO82ALc7rK3Gd/zy4FEkGRzQv71THU7CbqeS pzAHFZ1jrWPYFjNP8HVLTnH1qANgG6cBSlog2DcNsLdjgJ0yxcyuGLDb/hthxLA3HA 4DiFthgTB5zamyUETdQMNgGq7qlMh9JbYoV3Z5QyKzRYVTGZQ/jNFdY4asSWkTmYJj gRt8Z1gSfEJYg== Received: by mail-ed1-f71.google.com with SMTP id bq19-20020a056402215300b0040f276105a4so4435000edb.2 for ; Mon, 07 Feb 2022 07:15:25 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=uBWCawWP448pDUDnNbtVWq7HJHP5oZu1cANqFUgzFBI=; b=1gMf6CPufNXWh1+n8CUcl3BxzF2cTaXnpukbWx26ByhOy34XdxdeCxbYMX/hLX6ghR ZKBfyEiHn37L3LFsXnGiRuVTXkvvN6tPG85Kx/MHY0D6UT3BQBZiJbYDe8xhooilBYlM 5Lu1GJu8uVsep9oGe3lKDJQbVfvhtS5T4NUYQh5KAKGm/jx+AbQjuDu+nxfT0Y9k04Qv rxBWMhMpjYDcHYl+ObPpBgGlrq6/bu7F+iWFQ7HGycVnZGlFINgw8iccvpdUdfDzHuCt UWUYAr/14hD05opy4giyJmvr0BLrQ11imFORmw4v7hN8mnootCNzGdgqsgzAjchTWuSS 4g0A== X-Gm-Message-State: AOAM533HZA/ngzmreP3Gch1fP28h+nBRJzv5TT/mWsQhjI1orQ0k7JKb iJQvVQ30dCXtYZ7jNp4fOriI9/hJqFew6rWckk1RtRY5f/hZE4WLBIocRuEXWWL+MrgwkRJZOvw I9Igh9fY5S+UD7/k5OJJitbPnoby0Z8/lxjyj8quD6g== X-Received: by 2002:aa7:d714:: with SMTP id t20mr3738844edq.391.1644246924500; Mon, 07 Feb 2022 07:15:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJylZzB18y8i2bTDVJxJlDb05jQcGK6M+DR5PyuVfsHHo71kpqEjZO9qqDDbpIRPIR5kVXY+gQ== X-Received: by 2002:aa7:d714:: with SMTP id t20mr3738820edq.391.1644246924169; Mon, 07 Feb 2022 07:15:24 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id d25sm3788584ejz.4.2022.02.07.07.15.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 07:15:23 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][UNSTABLE][PATCH 1/7] kbuild: Unify options for BTF generation for vmlinux and modules Date: Mon, 7 Feb 2022 15:15:10 +0000 Message-Id: <20220207151516.211675-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220207151516.211675-1-dimitri.ledkov@canonical.com> References: <20220207151516.211675-1-dimitri.ledkov@canonical.com> 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" From: Jiri Olsa Using new PAHOLE_FLAGS variable to pass extra arguments to pahole for both vmlinux and modules BTF data generation. Adding new scripts/pahole-flags.sh script that detect and prints pahole options. [ fixed issues found by kernel test robot ] Signed-off-by: Jiri Olsa Signed-off-by: Andrii Nakryiko Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20211029125729.70002-1-jolsa@kernel.org (cherry picked from v5.16-rc1 commit 9741e07ece7c247dd65e1aa01e16b683f01c05a8) Signed-off-by: Dimitri John Ledkov --- Makefile | 3 +++ scripts/Makefile.modfinal | 2 +- scripts/link-vmlinux.sh | 11 +---------- scripts/pahole-flags.sh | 20 ++++++++++++++++++++ 4 files changed, 25 insertions(+), 11 deletions(-) create mode 100755 scripts/pahole-flags.sh diff --git a/Makefile b/Makefile index af0024462d..993cbd13a7 100644 --- a/Makefile +++ b/Makefile @@ -480,6 +480,8 @@ LZ4 = lz4c XZ = xz ZSTD = zstd +PAHOLE_FLAGS = $(shell PAHOLE=$(PAHOLE) $(srctree)/scripts/pahole-flags.sh) + CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF) NOSTDINC_FLAGS := @@ -545,6 +547,7 @@ export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL +export PAHOLE_FLAGS # Files to ignore in find ... statements diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index ff80577743..ce9661d968 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -40,7 +40,7 @@ quiet_cmd_ld_ko_o = LD [M] $@ quiet_cmd_btf_ko = BTF [M] $@ cmd_btf_ko = \ if [ -f vmlinux ]; then \ - LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J --btf_base vmlinux $@; \ + LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J $(PAHOLE_FLAGS) --btf_base vmlinux $@; \ else \ printf "Skipping BTF generation for %s due to unavailability of vmlinux\n" $@ 1>&2; \ fi; diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index d74cee5c43..3ea7cece7c 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -205,7 +205,6 @@ vmlinux_link() gen_btf() { local pahole_ver - local extra_paholeopt= if ! [ -x "$(command -v ${PAHOLE})" ]; then echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available" @@ -220,16 +219,8 @@ gen_btf() vmlinux_link ${1} - if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then - # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars - extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars" - fi - if [ "${pahole_ver}" -ge "121" ]; then - extra_paholeopt="${extra_paholeopt} --btf_gen_floats" - fi - info "BTF" ${2} - LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1} + LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${PAHOLE_FLAGS} ${1} # Create ${2} which contains just .BTF section but no symbols. Add # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh new file mode 100755 index 0000000000..2b99fc7701 --- /dev/null +++ b/scripts/pahole-flags.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 + +extra_paholeopt= + +if ! [ -x "$(command -v ${PAHOLE})" ]; then + return +fi + +pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/') + +if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then + # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars + extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars" +fi +if [ "${pahole_ver}" -ge "121" ]; then + extra_paholeopt="${extra_paholeopt} --btf_gen_floats" +fi + +echo ${extra_paholeopt} From patchwork Mon Feb 7 15:15:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589359 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=EJsT5Ym4; 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 4JsqTQ0Ph2z9s5B for ; Tue, 8 Feb 2022 02:15:38 +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 1nH5jk-0003Cf-Su; Mon, 07 Feb 2022 15:15:28 +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 1nH5ji-0003Ar-Sj for kernel-team@lists.ubuntu.com; Mon, 07 Feb 2022 15:15:26 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (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 A87113F1CA for ; Mon, 7 Feb 2022 15:15:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644246926; bh=3tQTmRH3D6cDlERr+kVfrOc2Y2bAriTF1NPpu4R0zSk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EJsT5Ym44vR92aVYeKv02cCFbRMF2mYlP9i0l/KU30Ug44YjtJlHrBLdMa+cgzMk1 Q2LyLOV7SbHZ8VmDpAvgpmRUtLirgR+U8TyvgiZ2pmWXRSyf0w5p3YTiOpDqb5ONqQ IldgHWDkQxu+r/FCHlyx6oOMgZV0QVrKMzlKZmjOJXgwbrX0TS8KoGDz9lCkyNZNb0 kv30ykjLUt7sZ4Dzr1Jch3OXj3OYw3uYqqC4p+nFoKrxY9nvlYrgTE7A8TSExD7+iM kEO6EXMFVyI1/aUjbjreMdlWB6+ABDCpdsEpO76Q2ENfiNob+Xbf+aLq4Yf4KpcN6N r3zbZ0g+I0y1g== Received: by mail-ej1-f71.google.com with SMTP id q19-20020a1709064c9300b006b39291ff3eso4449547eju.5 for ; Mon, 07 Feb 2022 07:15:26 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=3tQTmRH3D6cDlERr+kVfrOc2Y2bAriTF1NPpu4R0zSk=; b=V/ftIDf22JUtbefDoRhEVU3khP9iz8IFulBsYGjZQHKBjqewiJLLjvR+OA57t+YqBS bk3RnUY/DEhL17viAH9VaD/x6Y1OI61Bzeeo1UXzmLpzDfDriKUUWNsnVQUqkncUuNEG F8R7TBJrlfELdlQf26DvOg+Ph8mIMWdF1oTMK+K1ZVieeSTw54oQR80VFA0LoNrRLrLe nhR05mlo1ftSTQJkPMV8QZfFaRiqXbWFFhElWoLjmlBCNFzKVAjFWDsIrzcTZps6HEVe c7Q7z3QU29uc5pFNYP7D1WNNaTf6eqa/1eohgRRvQ0ccmyvED/qjST1f6dAdaltT0EbT WZBA== X-Gm-Message-State: AOAM533nxJ7K7STnWD+KY7+5RxRWsNrcyFZWgRs7ZzdR75M3jfHho4sz zUbvWnhhKOf8HpS30AGNYl7J0t4vLB4T2oIYYi1c02UqthTSlhvI9cP+OnEUu7XPA/o2KxzKpaf OXL7ptYHu2ve+//VmR7XOLymAJz6k+BSSAo+/XU+ljw== X-Received: by 2002:a05:6402:3552:: with SMTP id f18mr14419258edd.189.1644246926182; Mon, 07 Feb 2022 07:15:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9nk/YI/huyHwhc1jTTxNYY3RTEn7vhWxA5wzixtiI/zrtnYpFaKbaPNCk43nSbXh1cv5tuQ== X-Received: by 2002:a05:6402:3552:: with SMTP id f18mr14419242edd.189.1644246925994; Mon, 07 Feb 2022 07:15:25 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id kb25sm1616168ejc.130.2022.02.07.07.15.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 07:15:25 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][UNSTABLE][PATCH 2/7] MAINTAINERS: Add scripts/pahole-flags.sh to BPF section Date: Mon, 7 Feb 2022 15:15:11 +0000 Message-Id: <20220207151516.211675-3-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220207151516.211675-1-dimitri.ledkov@canonical.com> References: <20220207151516.211675-1-dimitri.ledkov@canonical.com> 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" From: Nathan Chancellor Currently, scripts/pahole-flags.sh has no formal maintainer. Add it to the BPF section so that patches to it can be properly reviewed and picked up. Signed-off-by: Nathan Chancellor Signed-off-by: Daniel Borkmann Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220201205624.652313-2-nathan@kernel.org (cherry picked from bpf-next commit f67644b4f282d42acf5ad9b0175ef5671314ab12) Signed-off-by: Dimitri John Ledkov --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 53c9614358..b694a8bd6e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3417,6 +3417,7 @@ F: net/sched/act_bpf.c F: net/sched/cls_bpf.c F: samples/bpf/ F: scripts/bpf_doc.py +F: scripts/pahole-flags.sh F: tools/bpf/ F: tools/lib/bpf/ F: tools/testing/selftests/bpf/ From patchwork Mon Feb 7 15:15:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589360 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=n6tK6LF4; 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 4JsqTS0l2cz9s5B for ; Tue, 8 Feb 2022 02:15:40 +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 1nH5jn-0003Eo-3J; Mon, 07 Feb 2022 15:15:31 +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 1nH5jk-0003CI-Mp for kernel-team@lists.ubuntu.com; Mon, 07 Feb 2022 15:15:28 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (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 53ABD3F1CA for ; Mon, 7 Feb 2022 15:15:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644246928; bh=Ti+5PmW3NN2vH7WYrMaCqHA4mEv8qkML/JvdeVI+2is=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=n6tK6LF4YTA7bLiOwxhZErW4mSYbs1dbmKpfQyd4yHWAjAo3LoNN6xC4L3/In9Q2y uZZS471ScoaD9MPGJp/IhAxyaUvyzIvtvFUxPnz2FS2HyPLvY/2ddi/YiocEUJcgL4 40F2igTsNh4BLOo7l+NcVleRnNt5DorFw190Z8NUh8Adm98+tRAy9h5tOmG5UmXIRc gBHFw4TjD1FrqEboqHzXAw1Mfe8JppgSZYlAhQntfxFBgdTNVWIUCF9tHfOroFwpKI f/LJadGP5VmiQEQWbglhhYWDRONfMTPvDgKE18J1Ycty+4/okeYKQrRW3oRhJRYXx2 8wTaqXfcm4BXA== Received: by mail-ej1-f71.google.com with SMTP id ka12-20020a170907990c00b006c41c582397so2933883ejc.11 for ; Mon, 07 Feb 2022 07:15:28 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ti+5PmW3NN2vH7WYrMaCqHA4mEv8qkML/JvdeVI+2is=; b=zxeYPZ+lfmuYw6w8RvTial94PdFdRWAOUSY84Oy1QdETc8ERS53FY+HcfHAm72G/bq UNLDQ9ENhQlrA0ENfmyNfaEmojefGMbRIFJygyxEsHQZjQj9lxH8kLM5frgx4dgOHy/c dXB/xX6WRTYtug07u0e9/DKk17b4XRaOqiIdXure2h3AQhiiHZ2/9DwcHJH1kOK2sZRZ G9g7t+Fg/YZOeCP8RF7DInEqA3N4MN6i1t1NgHpPdLKR1cUJAkh+PqEPv8nVN+xh5M9Y kEfTxO54DRLeQmX5aYPCyI29gn6xF+Ij4Cu4n17AcOvuJJXKqjpOni0Tbl7kU5nuUETV QSJw== X-Gm-Message-State: AOAM530G5t7WfJR/IgzXjtirEc06oVscC/nfNpwamH9uSdqXjchhEf5s 4HeP1EhAji/cnjeHSfXMYp86/a46UFzFGyozpuWvoyUP0pntyNF/EpZV61n546nxKd5wCc8taey G/E0OtJ7Jjo8css12TDk23nfgfgy9ltvqTkkStG+rbA== X-Received: by 2002:a05:6402:4392:: with SMTP id o18mr2843318edc.338.1644246927774; Mon, 07 Feb 2022 07:15:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzoDvftsJHq3QWM/Q/lvCjtbBDCEQHuqaEyZuJ1j+qUJaJJSCcMXjLGl9jGqmlBwlrDpPuIHg== X-Received: by 2002:a05:6402:4392:: with SMTP id o18mr2843293edc.338.1644246927526; Mon, 07 Feb 2022 07:15:27 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id r22sm3786182ejo.48.2022.02.07.07.15.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 07:15:27 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][UNSTABLE][PATCH 3/7] kbuild: Add CONFIG_PAHOLE_VERSION Date: Mon, 7 Feb 2022 15:15:12 +0000 Message-Id: <20220207151516.211675-4-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220207151516.211675-1-dimitri.ledkov@canonical.com> References: <20220207151516.211675-1-dimitri.ledkov@canonical.com> 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" From: Nathan Chancellor There are a few different places where pahole's version is turned into a three digit form with the exact same command. Move this command into scripts/pahole-version.sh to reduce the amount of duplication across the tree. Create CONFIG_PAHOLE_VERSION so the version code can be used in Kconfig to enable and disable configuration options based on the pahole version, which is already done in a couple of places. Signed-off-by: Nathan Chancellor Signed-off-by: Daniel Borkmann Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220201205624.652313-3-nathan@kernel.org (cherry picked from bpf-next commit 613fe169237785a4bb1d06397b52606b2967da53) Signed-off-by: Dimitri John Ledkov --- MAINTAINERS | 1 + init/Kconfig | 4 ++++ scripts/pahole-version.sh | 13 +++++++++++++ 3 files changed, 18 insertions(+) create mode 100755 scripts/pahole-version.sh diff --git a/MAINTAINERS b/MAINTAINERS index b694a8bd6e..ba0e2495c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3418,6 +3418,7 @@ F: net/sched/cls_bpf.c F: samples/bpf/ F: scripts/bpf_doc.py F: scripts/pahole-flags.sh +F: scripts/pahole-version.sh F: tools/bpf/ F: tools/lib/bpf/ F: tools/testing/selftests/bpf/ diff --git a/init/Kconfig b/init/Kconfig index 602380550a..c6b8051c8d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -86,6 +86,10 @@ config CC_HAS_ASM_INLINE config CC_HAS_NO_PROFILE_FN_ATTR def_bool $(success,echo '__attribute__((no_profile_instrument_function)) int x();' | $(CC) -x c - -c -o /dev/null -Werror) +config PAHOLE_VERSION + int + default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE)) + config CONSTRUCTORS bool diff --git a/scripts/pahole-version.sh b/scripts/pahole-version.sh new file mode 100755 index 0000000000..f8a32ab93a --- /dev/null +++ b/scripts/pahole-version.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# Usage: $ ./pahole-version.sh pahole +# +# Prints pahole's version in a 3-digit form, such as 119 for v1.19. + +if [ ! -x "$(command -v "$@")" ]; then + echo 0 + exit 1 +fi + +"$@" --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/' From patchwork Mon Feb 7 15:15:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589361 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=udI58gyI; 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 4JsqTV3t3Fz9s5B for ; Tue, 8 Feb 2022 02:15:42 +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 1nH5jp-0003I2-9y; Mon, 07 Feb 2022 15:15:33 +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 1nH5jm-0003Dp-Df for kernel-team@lists.ubuntu.com; Mon, 07 Feb 2022 15:15:30 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (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 DA4313F1CA for ; Mon, 7 Feb 2022 15:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644246929; bh=hANXAM2QIhFgJs4T6MF2qsWZL0SHwNyX+cp2FFsZFCc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=udI58gyIkgiSe2U5FaA7chRZXJAPtdEqi3MHsCYynfg8j2VogdJq/+zdAwupR8Nlk vl4FSwm4d6/iZdxl8+7DQ37bgTWGdFy7oUCQk2szxnOuT+MoEk/PVEaJmK2SN3sp/P 493D30MS4OGh1xlSzUO5m4a0llj/IjU2OV9kvlW9U7Y9qp3ax8ef+ylQTpd4fUM03h DXVzZ7RxA5fOTQ1cS+3QKzPNsn0J1gUZskTgwKqtXHTTMO/kJqQZWPkY8w8fJ2ZiAM czOaw9kdIxntyQNDiKoXwaewvKQXdAdBuh+Dv+345WrxuSie2vLj9DhDKx+1opV0Lg RwSUcaU51ODqg== Received: by mail-ej1-f71.google.com with SMTP id qq4-20020a17090720c400b006c6a6c55ed6so1817739ejb.12 for ; Mon, 07 Feb 2022 07:15:29 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=hANXAM2QIhFgJs4T6MF2qsWZL0SHwNyX+cp2FFsZFCc=; b=oRQcHosRyvIiZk2WL7h54KKR4Yb5LCbord6Mp/j8EygRuJfUdYFzakT+9OWI3AbdfL 0duqcZc3YQYR6CUk7l6U9iuayn1E+IlDCvATDfk/VLwVtcjb6SfLWDg2xxYehxPlcbiP NW0vos5KstjWUvjRg0p9QtC+JY45qDZPT5mcb8ma98UeJKRi7/0131QwIAYN9/7AzDjm Uic5NAKFgwG3AqUgglgLLhDmXbdy/uoi0TDNvhsKyVyxjFkj7HtkVcUtpCthh13xzbR2 yn++fLS8kbufhbNPtFcXb0oO+Q5CyT6/6s91ZlwhIdrw9TMzXaHGaang7Nx5dvWHc+l4 IzfQ== X-Gm-Message-State: AOAM533976cbi8FRNDYzRabJsZyKg81cfRZawsoMSJDhC2V0ugejFPLF 2MjCu+j0P5PVsS09dk9bLGrSBgvAhVHCBVkPJqnpEpQx6W4o2tPO51d4DgZLjao5zSD6Ho25x8W Z3QKzGwbq5AqQ5svgclgKNnFSjdMX/9N+0Rg7BSgkCA== X-Received: by 2002:a17:907:60cb:: with SMTP id hv11mr184116ejc.122.1644246929366; Mon, 07 Feb 2022 07:15:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQFo0WzqgCP759sSV0WOckPX7t4w7MpLt6qCnhqMCikfsOhugtm+XbhgHQB8UDUCtV8H3GlA== X-Received: by 2002:a17:907:60cb:: with SMTP id hv11mr184109ejc.122.1644246929145; Mon, 07 Feb 2022 07:15:29 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id fw16sm1591540ejc.120.2022.02.07.07.15.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 07:15:28 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][UNSTABLE][PATCH 4/7] scripts/pahole-flags.sh: Use pahole-version.sh Date: Mon, 7 Feb 2022 15:15:13 +0000 Message-Id: <20220207151516.211675-5-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220207151516.211675-1-dimitri.ledkov@canonical.com> References: <20220207151516.211675-1-dimitri.ledkov@canonical.com> 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" From: Nathan Chancellor Use pahole-version.sh to get pahole's version code to reduce the amount of duplication across the tree. Signed-off-by: Nathan Chancellor Signed-off-by: Daniel Borkmann Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220201205624.652313-4-nathan@kernel.org (cherry picked from bpf-next commit 2d6c9810eb8915c4ddede707b8e167a1d919e1ca) Signed-off-by: Dimitri John Ledkov --- scripts/pahole-flags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh index 2b99fc7701..ac8b237874 100755 --- a/scripts/pahole-flags.sh +++ b/scripts/pahole-flags.sh @@ -7,7 +7,7 @@ if ! [ -x "$(command -v ${PAHOLE})" ]; then return fi -pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/') +pahole_ver=$($(dirname $0)/pahole-version.sh ${PAHOLE}) if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars From patchwork Mon Feb 7 15:15:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589362 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=C3gV58aY; 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 4JsqTb5Ftsz9s5B for ; Tue, 8 Feb 2022 02:15:47 +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 1nH5jv-0003QL-Hn; Mon, 07 Feb 2022 15:15:39 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nH5jn-0003Fg-Jw for kernel-team@lists.ubuntu.com; Mon, 07 Feb 2022 15:15:31 +0000 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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-0.canonical.com (Postfix) with ESMTPS id 73E1F3F199 for ; Mon, 7 Feb 2022 15:15:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644246931; bh=VPxHfOltvpB/G96kgq4Nsv9vEFcUrW+cwHl4IPQHsKA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=C3gV58aYknWIzBXdCQgrUUpR2FjkrJQuP1+kTh1fzZjSngwENPhf4owRzlvEPJa+G zIPoFfL+0wh9taYoBENcchhEeg4CpYfs0UcFVWTBeuk5lFQ7llzmsXMC3cvmmuaQ7S 0IwBuKGt+TxwTj5+B5MDULx2eYluhyPEjLvynRIsmLFMRMAKR/df0f+N7/DPTRu1wH fuJaYxDFDS2TQG9XTgzKT3Sh3VDEzA+Xz1K8nDxkcWIZaap/VhuRtzayJ5JWuJYcqd ubZeiVNQYfTEpLuhIhZcWq2YOkGJJs/UnCVLlEAiaagBLWOZNR2mjJWH0o9caH1zJG BEHqJfXherbew== Received: by mail-ed1-f71.google.com with SMTP id n8-20020a50cc48000000b0040f345d624aso3831937edi.6 for ; Mon, 07 Feb 2022 07:15:31 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=VPxHfOltvpB/G96kgq4Nsv9vEFcUrW+cwHl4IPQHsKA=; b=GiY61SCkGdhXdMzkr2g8r4b46ab2/34rU/DfGkb3TDO3GTJKVU8Zdx4dI5UfQDd100 S+9H9VIY8RxLStP7btQhG+fZzSpKEsl5prWjnT7vzmOocA8vdSgfKtY4MMn6gkR6L/4v UFVkYRqZ3+dJl0/VShcJaOQScjI6ZaEHluJ4AGY9H8bwMbbsUFm6+7PlojusEoLENItY /4b7sOIwesaqqDf4E7XPksyOZLYIb/dGM6hL8rIwFAKHcRVRgrS9AHRZokdVNzGbbcM5 a3+MdjfgPvRzanGmQBlIrkyAPjjlG6/FNtamRb+Ht/RYaTuawCnt3289y4r0OVa9JpR3 oKKw== X-Gm-Message-State: AOAM531p1kvWhJLHQbCqTfe9zO0SK/I5hLIB1KlVCMWi7qdwVz/hoqXX bE1l3MDar/auWuyxcc1+OsNfAW1NnplHwfiAZjNOVPKKEz9e8U9wm7Ieo932vrmFrnx0fp1f6Rt E36OOMYpoCAwGjiLC7FxPUKBq/cjMCXfBV/c6QA+6Xg== X-Received: by 2002:a17:906:edae:: with SMTP id sa14mr172571ejb.722.1644246930908; Mon, 07 Feb 2022 07:15:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBUCxkcOYpV3fnU75IGMRaMjFz8ujt1ikfS/5hHCEGYPIwsh+NIYvEHiB7933k3TbDmqg7CQ== X-Received: by 2002:a17:906:edae:: with SMTP id sa14mr172556ejb.722.1644246930646; Mon, 07 Feb 2022 07:15:30 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id p5sm2153491ejr.105.2022.02.07.07.15.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 07:15:30 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][UNSTABLE][PATCH 5/7] lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION Date: Mon, 7 Feb 2022 15:15:14 +0000 Message-Id: <20220207151516.211675-6-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220207151516.211675-1-dimitri.ledkov@canonical.com> References: <20220207151516.211675-1-dimitri.ledkov@canonical.com> 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" From: Nathan Chancellor Now that CONFIG_PAHOLE_VERSION exists, use it in the definition of CONFIG_PAHOLE_HAS_SPLIT_BTF and CONFIG_PAHOLE_HAS_BTF_TAG to reduce the amount of duplication across the tree. Signed-off-by: Nathan Chancellor Signed-off-by: Daniel Borkmann Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20220201205624.652313-5-nathan@kernel.org (cherry picked from bpf-next commit 6323c81350b73a4569cf52df85f80273faa64071) (conflicts did not apply PAHOLE_HAS_BTF_TAG hunk as did not cherry-pick pre-req) Signed-off-by: Dimitri John Ledkov --- lib/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 2a9b6dcdac..53fef9b551 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -322,7 +322,7 @@ config DEBUG_INFO_BTF DWARF type info into equivalent deduplicated BTF type info. config PAHOLE_HAS_SPLIT_BTF - def_bool $(success, test `$(PAHOLE) --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'` -ge "119") + def_bool PAHOLE_VERSION >= 119 config DEBUG_INFO_BTF_MODULES def_bool y From patchwork Mon Feb 7 15:15:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589363 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=YFcIxwCt; 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 4JsqTd1Dszz9sCD for ; Tue, 8 Feb 2022 02:15:49 +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 1nH5jv-0003Qu-Ow; Mon, 07 Feb 2022 15:15:39 +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 1nH5jp-0003IE-Er for kernel-team@lists.ubuntu.com; Mon, 07 Feb 2022 15:15:33 +0000 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.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 389A13F1CA for ; Mon, 7 Feb 2022 15:15:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644246933; bh=62fyjpYaiSD0PmVGQ515T/lY/nSpQnwJjnjh4khQ5rY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YFcIxwCtAOYamMUpnRHVoEas9wQ4MNGHh0keenQXnHlhOmig9UFo1JQdMtNmpOlPr ge7onAxB8RmDhi0/1l/pCXy31sWS+aAtW4k3Cb1zjH/2dRqRsMQ7DgMsLNJGCHWYFx IDG7nNU3Y+TDd+S6d1TWjRMAYLojs2ATyBnb+BgpC7oLP5JeBQHAAEZD1o4hFGjAv9 J8fFRy3puLeC85bGUmgCgIAuPdqjWQBdp1K+BJnGVlLhg/edkbEU3mp58juEvoe5ep G7vmpcPjUK97OjRIfbc8OWSmGjdfk/DHt0nt4eNmzNAWvb1aQhe7Ol5s+uRXEYjA3R Wusuertbv5cxQ== Received: by mail-ed1-f70.google.com with SMTP id o6-20020a50c906000000b0040f6ac3dbb5so1754654edh.17 for ; Mon, 07 Feb 2022 07:15:33 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=62fyjpYaiSD0PmVGQ515T/lY/nSpQnwJjnjh4khQ5rY=; b=3wY6fCF69sBbRNM9mfOUsm7vig6G/Na+EAk6gcxQVvpCriy+6tVfm1Aq7IYaYe45Ts Kf1Ow7CYOWv58MD1Fvdejr6VLt6pgSMtQKFRRXqeFLUerMbz6Y8rygqvne96Fhx/MrY4 KJl5P/T4Rmjl5JCLPbmQJL6PFLO9w0ntgN1Ca05+9OOy9YSolJtE+B63IhMH0mt3q+eG xy/6KKjXUtpspQdlARtM3gB6/0M6ECgR1mbbra/OZlyjwJ3PIRXf9uUxeU0FVPeH3QX9 vIyOB7vAADQ0BGcVRWcYFXeLxmvBGjThmwOpBQTeodP/Dgpj3gicJbgIJPFXhZLeTlHC ilPQ== X-Gm-Message-State: AOAM530OWyVBoDtIEROJBPhBtYLhZY8qFZHgkByXMeNWDKMh9a/xZjxq 4rwQi6T5fJy9GeMKKM1TvVt4tmglEpn6J1RcMKosUeJJuIxeYBpEYG+Yb4ffT6yeWv5CCI0+JPW QGPbG9YO171CuCl+dh1wD+iqIowP9MPq1mboQN5zS2A== X-Received: by 2002:a17:907:2d8d:: with SMTP id gt13mr139917ejc.583.1644246932599; Mon, 07 Feb 2022 07:15:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSiDSs2nJkiXKPHSocc2GNK6/Xr7W012QRVhUvzhijUGypRwMOB41Uj+doDz1X7zUI9m9NZA== X-Received: by 2002:a17:907:2d8d:: with SMTP id gt13mr139901ejc.583.1644246932328; Mon, 07 Feb 2022 07:15:32 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id n13sm3010158eja.67.2022.02.07.07.15.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 07:15:32 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][UNSTABLE][PATCH 6/7] lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+ Date: Mon, 7 Feb 2022 15:15:15 +0000 Message-Id: <20220207151516.211675-7-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220207151516.211675-1-dimitri.ledkov@canonical.com> References: <20220207151516.211675-1-dimitri.ledkov@canonical.com> 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" From: Nathan Chancellor 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 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 (cherry picked from bpf-next commit 42d9b379e3e1790eafb87c799c9edfd0b37a37c7) Signed-off-by: Dimitri John Ledkov --- lib/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 53fef9b551..12649e4c2b 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -296,7 +296,7 @@ config DEBUG_INFO_DWARF4 config DEBUG_INFO_DWARF5 bool "Generate DWARF Version 5 debuginfo" depends on !CC_IS_CLANG || (CC_IS_CLANG && (AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 23502))) - 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 From patchwork Mon Feb 7 15:15:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1589364 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=ZxH/GNHg; 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 4JsqTf5szqz9s5B for ; Tue, 8 Feb 2022 02:15:50 +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 1nH5jy-0003VK-Hy; Mon, 07 Feb 2022 15:15:42 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nH5jr-0003Km-3L for kernel-team@lists.ubuntu.com; Mon, 07 Feb 2022 15:15:35 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (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-0.canonical.com (Postfix) with ESMTPS id B8B6F3F199 for ; Mon, 7 Feb 2022 15:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644246934; bh=RuIXBG3erItbvncpTvWDvYbHyZarRO2CEyUVRtzeYnE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZxH/GNHg0FdL7JvRQwl/q1mNetEnKjvsUaRVyLEc90ScB1z6pB2XKuSj8qCWd4WIn nzzmIULEuV36vc+vRcp4S0IyO6n5HXbQlbyN0UMG+Gg3cqdUveSbEwvtRkXHTueuBt GXTm2XlPcFl2lCaLfeA2uCKf2lY2Gth7nfyTO6d196xsLmKjxcAigCTPC02fr71ArQ UzYKm+JJhxElAgUb/dQVuo8szGO1RU2RF5ybcEND/57m05vwozU1AcmrhXcvjJ+/fz OJ7lizq8Yd9IwlRJ/JzGpemCCMrO/dDxprtgcBZ1VrjJ4G4grbMhdKjeyDw2xrR6bQ 6HTQ2SpYFjRyw== Received: by mail-ej1-f72.google.com with SMTP id qo24-20020a170907213800b006c7479720ddso1685920ejb.2 for ; Mon, 07 Feb 2022 07:15:34 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=RuIXBG3erItbvncpTvWDvYbHyZarRO2CEyUVRtzeYnE=; b=OmBgHQJ+n0tA1lR5vBFPZGnIGOWBY33TuvbrFRz3Z6yg/9aAo77ynnim8UciukGdpq VY8XFLMToQp+n7j5o+LCtmDdVgh3pQhunXk7JqUbxvcQS2cQ4bbCeSkdkJJACYB00A1E euuteJzGs/bVMck8lwC/l9yUTbOojWszS34t7Jt4C5M0j6UMHaefgWIG/oujuuVQ8GHw wLeoQgpka6o9CP5RwVq/qVPpFzOl5rpaLAcZr3Eq2VWudo71HG5R1YuCkYnqUflR7ajy 5SxJHgNP+Rs3Aeh/O4DeXYqwepmjpXZM9pgZfZNwWyLGDPJ+LLuR5gxn3j7ZhNLDf8yn 6rIw== X-Gm-Message-State: AOAM532LTWdp6dRXcAOkuIcHWwclOYwMW+ptXpkS+eV1N7M+Ay/aIStX 4CVNnhhJuxolV9jPAGNs6c7F900u48YyoJHr4BHM4ZycDase2vIAMXxtSzjdwmCTY9bZKF7ZLqC uVWUnxlnjmglFSNqOpV/KxtKs8B9NARXc5UcklH2CzQ== X-Received: by 2002:a05:6402:5309:: with SMTP id eo9mr7394311edb.257.1644246934164; Mon, 07 Feb 2022 07:15:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJyCKgTSUTxDroBVPr3TGFrCU8Hsv8OtJHzNGi6cdEU3ntQ6G3HIdjsXMhgPGOILn6AvnATqwA== X-Received: by 2002:a05:6402:5309:: with SMTP id eo9mr7394299edb.257.1644246933996; Mon, 07 Feb 2022 07:15:33 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id i14sm5379031edr.100.2022.02.07.07.15.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 07:15:33 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [J][UNSTABLE][PATCH 7/7] UBUNTU: [Config] upgrade debug symbols from DWARF4 to DWARF5 Date: Mon, 7 Feb 2022 15:15:16 +0000 Message-Id: <20220207151516.211675-8-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220207151516.211675-1-dimitri.ledkov@canonical.com> References: <20220207151516.211675-1-dimitri.ledkov@canonical.com> 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" pahole is new enough across all releases to support DWARF5. DWARF5 provides better debug symbols that are also more compact. Test build indicates ~10% reduction in debug linux install size. Signed-off-by: Dimitri John Ledkov --- debian.master/config/annotations | 3 +-- debian.master/config/config.common.ubuntu | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index d6fca7d01f..607bad8774 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11669,8 +11669,7 @@ CONFIG_DEBUG_INFO_BTF flag note> Compile-time checks and compiler options >> Compile the kernel with debug info >> DWARF version CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT 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_DWARF5 policy<{'armhf': 'n'}> +CONFIG_DEBUG_INFO_DWARF5 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> # Menu: Kernel hacking >> Debug Oops, Lockups and Hangs CONFIG_PANIC_ON_OOPS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d40449329e..38cb2917e8 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2583,8 +2583,8 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_BTF_MODULES=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -CONFIG_DEBUG_INFO_DWARF4=y -# CONFIG_DEBUG_INFO_DWARF5 is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +CONFIG_DEBUG_INFO_DWARF5=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set @@ -7465,6 +7465,7 @@ CONFIG_PAGE_POOL=y CONFIG_PAGE_REPORTING=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAHOLE_HAS_SPLIT_BTF=y +CONFIG_PAHOLE_VERSION=121 CONFIG_PALMAS_GPADC=m CONFIG_PANASONIC_LAPTOP=m CONFIG_PANEL=m