From patchwork Sat Oct 22 07:29:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7738 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1110531wrr; Sat, 22 Oct 2022 01:53:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7UMYew27AZZX9x1hligS6prssYE1lmkytxSVx5HDhsWkbUrla0EpP5mP0FZ/+FSQroSf7o X-Received: by 2002:a17:906:4fca:b0:78d:b042:eeca with SMTP id i10-20020a1709064fca00b0078db042eecamr18551942ejw.685.1666428789132; Sat, 22 Oct 2022 01:53:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666428789; cv=none; d=google.com; s=arc-20160816; b=Z6e52OHU6GSOE9SD8eCQw2SvfOhwhedhjMswaFw7++3n9R+KyyIbDtAcxKLO+xXnHD iRfCF0Of3E4GKBtU/5C8TyHLwJI52hci5omm6ztirpkFjtRw3Hc4L+aYZxJTx40vEzn+ PHXEbQIV0P9MecpxpWPVmGuC56aEIQoGGdcn+aL6yoxoGrr7C3Woa47/pgI0AN2sMhFF bpXTPNGYYapPySlfZh7x8vYntS+2jMlPlxETffCN4Fsg2D1bv8OY29uxvbnkLOAtHgJb RmSUDggt0HecBTZtJDpE42s6zZFq2L+bRg/loqo4QYcyS2waUpyhGqZEzusPCL1JbEtG drzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+I1ggahSoBU9qBmgs9Qavr65lWLPtNk99cIWqYHxDAs=; b=EJHI0ZbAl6Auv/5GHXyS9ttdvqUrKBet3StwUPUx4l/THLNyzNRdODskm2I3wmqT6M I5osxL+kSBtf29ni4R4jBWSEyRKq0Y6IG/sHdKOOH1tWkOlbJNP1JIW/JJ50+NfeTywq Qx6izurcoQ62xZDYYKPfUb6rPXmDE7JB9QTEi4o0hYIovZQvKCNkT0ipkgik+kBoMGfd 4uTKDcdKxGMQHE46lCYSTQ4Rcw7RccBrlNBacIv2gm2+a3qLRpjgbn/rWDvc16GRgoHN Fjb5DyVcIK1T4PPSGKSUGk6PW0h212FM4Yq/J43zkAvLX00ZtXSjv5G5NJvTKm4+1yC3 /Deg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PdE1wxpJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e5-20020a17090658c500b0073d8f141e76si16283681ejs.130.2022.10.22.01.52.44; Sat, 22 Oct 2022 01:53:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PdE1wxpJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234981AbiJVIvJ (ORCPT + 99 others); Sat, 22 Oct 2022 04:51:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234963AbiJVItO (ORCPT ); Sat, 22 Oct 2022 04:49:14 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A09461E3920; Sat, 22 Oct 2022 01:10:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C84E1B82E3F; Sat, 22 Oct 2022 08:07:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4BF3C433C1; Sat, 22 Oct 2022 08:07:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666426072; bh=I4Y0X1nv5hy0ZnRex9psEdEmaD4dw31+0KM/lFOjzig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PdE1wxpJrDDeubUdwk3s6Yf/5YgTCk33cgisaHpaO6YlYN5hZJ7MJ6L4xQHanSKcU +ftKHLA0RnejbXVncGjDBxYm9d5E51d0m59AZNtj3T6KON/ayTg8kpH2IDWV/Df/YL Jrt1NnGK5cg+B9ThkgMKiM+IXVB6g8aX4sM0OzH0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Martin Rodriguez Reboredo , Jiri Olsa Subject: [PATCH 5.19 709/717] kbuild: Add skip_encoding_btf_enum64 option to pahole Date: Sat, 22 Oct 2022 09:29:48 +0200 Message-Id: <20221022072529.817908352@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747377233645348349?= X-GMAIL-MSGID: =?utf-8?q?1747377233645348349?= From: Martin Rodriguez Reboredo 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. Adding this option to scripts/pahole-flags.sh. This change does not have equivalent commit in linus tree, because linus tree has support for BTF_KIND_ENUM64 tag, so it does not need to be disabled. Signed-off-by: Martin Rodriguez Reboredo Signed-off-by: Jiri Olsa Signed-off-by: Greg Kroah-Hartman --- scripts/pahole-flags.sh | 4 ++++ 1 file changed, 4 insertions(+) --- a/scripts/pahole-flags.sh +++ b/scripts/pahole-flags.sh @@ -20,4 +20,8 @@ if [ "${pahole_ver}" -ge "122" ]; then extra_paholeopt="${extra_paholeopt} -j" fi +if [ "${pahole_ver}" -ge "124" ]; then + extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64" +fi + echo ${extra_paholeopt}