From patchwork Fri Jan 26 15:23:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mitchell.augustin@canonical.com X-Patchwork-Id: 1891469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TM1gY4v0Dz23f9 for ; Sat, 27 Jan 2024 02:23:53 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rTO3O-0000JI-CX; Fri, 26 Jan 2024 15:23:38 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rTO3I-0000HC-AF for kernel-team@lists.ubuntu.com; Fri, 26 Jan 2024 15:23:32 +0000 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (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 ADF373F5F4 for ; Fri, 26 Jan 2024 15:23:31 +0000 (UTC) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-783c781aa5dso99510285a.0 for ; Fri, 26 Jan 2024 07:23:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706282610; x=1706887410; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TqwTa2eHylmOKCpEv7qOdz/Lus6P6b6Z4TCfLQinbEg=; b=N7goW6NUOj6HrXE4vlhZCK7gN8RWGvpYRK1QGRM/LKVz6X1IWQdjpsqDMGsEGBkhzt PMNBxpINmkCyASLwob/GhJDqkJF7WO7b9EBW1XxZI0ErD97mYISHFGOoI5Lt/FjLeorq OtZ/hvIxKK/Xwd55WHn7LtGKnf9fz9Q7rII6g9AARlfRw1NWvcT/GCyD5vD/MMzOE+pq vUYRGT9rFYIIM+sWgGCCBxfk3qA+FiUQjpFUuj8x3OU+WE0rxb8ojd8EbDb83d8xPu1s sd2XJRySZMAr6Nt46zeyTSlZiIWQvXNDq+eUZrZC8iLxdXnQOE4JiY+RBCh6JB0Db1bN XNpA== X-Gm-Message-State: AOJu0YyxMyOe5cJqo8HAXDipC7aAw4M9/sSAlfxwFSoyckETVbZK+xv1 zzO20x2VREg/+agYA9oAEbNkTS2DBNKD1eDfatzRuEOI6h9ywPSCCboIXoYhGQxZkWuyLWSSpSI n+15+4HxXTlM0a9VsXk9DYIqUJhvbAWwcRa0zcEDUTDRq/1KniXdd/QjnwxtT4QraNmzYIswezo NPC8beL78hHw== X-Received: by 2002:a05:620a:611f:b0:783:9e86:8d62 with SMTP id oq31-20020a05620a611f00b007839e868d62mr1593017qkn.132.1706282610497; Fri, 26 Jan 2024 07:23:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/V4FfEnoutWaEXQ9nsqhJtXNygMEgxR/jkAhhE01D1RRroaaFKtBrpjkoyaxTF5NFm1nluw== X-Received: by 2002:a05:620a:611f:b0:783:9e86:8d62 with SMTP id oq31-20020a05620a611f00b007839e868d62mr1593011qkn.132.1706282610228; Fri, 26 Jan 2024 07:23:30 -0800 (PST) Received: from localhost ([216.114.108.10]) by smtp.gmail.com with ESMTPSA id i10-20020a05620a248a00b00783648524a8sm639839qkn.130.2024.01.26.07.23.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 07:23:29 -0800 (PST) From: mitchell.augustin@canonical.com To: kernel-team@lists.ubuntu.com Subject: [SRU JAMMY] [PATCH] (upstream) scripts/pahole-flags.sh: Add --skip_encoding_btf_enum64 for pahole versions >= 124 Date: Fri, 26 Jan 2024 09:23:28 -0600 Message-Id: <20240126152328.73258-1-mitchell.augustin@canonical.com> X-Mailer: git-send-email 2.34.1 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: Mitchell Augustin BugLink: https://bugs.launchpad.net/bugs/2051376 New pahole (version 1.24) generates by default new BTF_KIND_ENUM64 BTF tag, which is not supported by stable kernel. As a result the kernel with CONFIG_DEBUG_INFO_BTF option will fail to compile with following error: BTFIDS vmlinux FAILED: load BTF from vmlinux: Invalid argument New pahole provides --skip_encoding_btf_enum64 option to skip BTF_KIND_ENUM64 generation and produce BTF supported by stable kernel. (cherry picked from commit b775fbf532dc01ae53a6fc56168fd30cb4b0c658) Signed-off-by: Mitchell Augustin --- scripts/pahole-flags.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh index ac8b23787427..d38fa6d84d62 100755 --- a/scripts/pahole-flags.sh +++ b/scripts/pahole-flags.sh @@ -4,7 +4,7 @@ extra_paholeopt= if ! [ -x "$(command -v ${PAHOLE})" ]; then - return + exit 0 fi pahole_ver=$($(dirname $0)/pahole-version.sh ${PAHOLE}) @@ -17,4 +17,8 @@ if [ "${pahole_ver}" -ge "121" ]; then extra_paholeopt="${extra_paholeopt} --btf_gen_floats" fi +if [ "${pahole_ver}" -ge "124" ]; then + extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64" +fi + echo ${extra_paholeopt}