From patchwork Thu Jan 25 22:13:11 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: 1891166 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 4TLqT91BPKz23dy for ; Fri, 26 Jan 2024 18:44:12 +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 1rTGsW-0007GR-GF; Fri, 26 Jan 2024 07:43:56 +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 1rT7yE-0008Hx-B5 for kernel-team@lists.ubuntu.com; Thu, 25 Jan 2024 22:13:14 +0000 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.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-0.canonical.com (Postfix) with ESMTPS id 04A443F460 for ; Thu, 25 Jan 2024 22:13:14 +0000 (UTC) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6868e2ed965so60607476d6.2 for ; Thu, 25 Jan 2024 14:13:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706220792; x=1706825592; 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=UzgYAQNGizu48vcFyjYgMQG3Dqiea41MwoH909JW0rM=; b=J2bp5rQ8vwM/v5Fk2aNDNeHTLOW2B8pIuhkRV8NB2fOGLLtFIiB0cwm296nAlOCcgl 1/es0TwxjJYGa4+l/cPy3Vn79UHbimrORM2sW9/lt3+nYDMdgaW9kafwSoi4xkcv//aV EpknkJCPXEgT2dxM7lkZfjpCOwJ91Y7tQ6MgrfzXpH8VA4lE9dBDwfLsmwaVxQAadDX8 0k8GlQVGc6Civ8AQbADRD+Gdr8t2EjiITzCNhlXV2VBIQRNcCEoD3/00OsNI6re66ZLH C7Hesw40Z50B4mG63/uW8QWxOuk40Qkw6+cIXZctCACcOnMKrmLBZ/dl+1zQ2dJmFQeT u4fA== X-Gm-Message-State: AOJu0Yxo5hlUcNKrnlGvg7Bh3AfAsnL1twu5eBW3DiHzG/vms5Aui4JT rTTUFybLk1HPjv6jMYcCvtpmeqID/vsfwKAjeDP2tH6Xu+y2hOQ1tJYcIyMg4Q7KxyMfCADzDuq P4lM9VHhV9DQQ6ghoXK2ltpmT8EV3UwMeM1K4iHQyKMGncxCLsIDSCrwoxnqQ/bu6ybYGCWXVzO d5o0NykakfrQ== X-Received: by 2002:a05:6214:484:b0:686:ab99:cceb with SMTP id pt4-20020a056214048400b00686ab99ccebmr481702qvb.12.1706220792807; Thu, 25 Jan 2024 14:13:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IHTPLR1e7HW2TSnzkV6flS0FlruqfS5L+JpSgiRPv8i9sGbP5ctVAf2UrCe9CkrZnF9FvW6zQ== X-Received: by 2002:a05:6214:484:b0:686:ab99:cceb with SMTP id pt4-20020a056214048400b00686ab99ccebmr481694qvb.12.1706220792548; Thu, 25 Jan 2024 14:13:12 -0800 (PST) Received: from localhost ([216.114.108.10]) by smtp.gmail.com with ESMTPSA id qq9-20020a0562142c0900b006869dae6ef2sm3358264qvb.106.2024.01.25.14.13.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 14:13:12 -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: Thu, 25 Jan 2024 16:13:11 -0600 Message-Id: <20240125221311.912250-1-mitchell.augustin@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 26 Jan 2024 07:43:54 +0000 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 [ Upstream commit b775fbf532dc01ae53a6fc56168fd30cb4b0c658 ] 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. 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}