From patchwork Fri Jan 26 18:54:41 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: 1891595 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 4TM6M92sb4z23f9 for ; Sat, 27 Jan 2024 05:55:00 +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 1rTRLn-0003ld-RB; Fri, 26 Jan 2024 18:54:51 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rTRLi-0003l5-9p for kernel-team@lists.ubuntu.com; Fri, 26 Jan 2024 18:54:46 +0000 Received: from mail-ot1-f71.google.com (mail-ot1-f71.google.com [209.85.210.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 1DC993F460 for ; Fri, 26 Jan 2024 18:54:44 +0000 (UTC) Received: by mail-ot1-f71.google.com with SMTP id 46e09a7af769-6dbdc7135bfso545694a34.2 for ; Fri, 26 Jan 2024 10:54:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706295283; x=1706900083; 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=NLvsajMq0H9/0t2hZliy3VI0kHnou2Ck9MGsgKeY/5k=; b=MAAqhhLvPZTeYfbNIz5pP5vKreTeaJJcfwsRSAF0VK+nqvRbSwVT5ZkAMRAhlqXuzg DnqYAwJSJ+sI9SAGE8pv6/KGJ9jHKxaqQcbp0Y4w7IC/1/m8E3SgKhtHVunfamp6dWM8 9r06gHK3zRUPm5V6/o4+QgOHgcWXCL47V5BmgizR3VFe5Wn76H+wVB0nDNH2zOLmUOap yTy70OSKJV8wGF4ID98Gc2gdruog69DhenVTRA67kb9ld1QgY+uBTIeKkH7AAgQERi0m SIGLs3PsRZWASDkPthacuWJtcimO1JplGz6sdVwIjPvLVPCSE/pMqiEQWEWgXl+lP6KU sjUQ== X-Gm-Message-State: AOJu0YwED6Ro1Iwd3KG09DAEhQHcW5dgwvLpE65e7EG0HqEQc3G/ZAAD NaJUDbOh8KDcPr5vHtLUdni3c5cwUblRVVcHE0RuaNepQKw6huFUsgW5Na9xdKjQ2QtJ0F4lU56 vF1iIETooYwvU62QSmiE6aO1XIPsYTg00UaeZ6GysC83pMVpRrJ3CrpYHlq7rfvPQmGcgO6rPni bqLSjVj1HFRw== X-Received: by 2002:a05:6830:6a8e:b0:6db:fced:791a with SMTP id da14-20020a0568306a8e00b006dbfced791amr199537otb.38.1706295282881; Fri, 26 Jan 2024 10:54:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IGeo6Ps+uRRnc+dUf77eNdMVRdNYvO8m6Wa6An30+bxJ5yGLtPdMKZNHL0EyznCK7CuaionMA== X-Received: by 2002:a05:6830:6a8e:b0:6db:fced:791a with SMTP id da14-20020a0568306a8e00b006dbfced791amr199524otb.38.1706295282526; Fri, 26 Jan 2024 10:54:42 -0800 (PST) Received: from localhost ([216.114.108.10]) by smtp.gmail.com with ESMTPSA id fk9-20020a05622a558900b0042a68abc4e7sm758960qtb.17.2024.01.26.10.54.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 10:54:42 -0800 (PST) From: mitchell.augustin@canonical.com To: kernel-team@lists.ubuntu.com Subject: [SRU JAMMY] [PATCH] UBUNTU: SAUCE: scripts/pahole-flags.sh: Add --skip_encoding_btf_enum64 for pahole versions >= 124 Date: Fri, 26 Jan 2024 12:54:41 -0600 Message-Id: <20240126185441.475521-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 UpstreamStatus: Merged with 5.15.148 This patch will not go upstream since 6.7-rc1 converts this script into a makefile snippet, and since this patch is already present in upstream 5.15.148 and the master branch for Noble. 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 in 5.15.148 tree) Signed-off-by: Mitchell Augustin Signed-off-by: Martin Rodriguez Reboredo Signed-off-by: Jiri Olsa Signed-off-by: Greg Kroah-Hartman 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}