From patchwork Tue Oct 17 10:37:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154057 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4039986vqb; Tue, 17 Oct 2023 03:38:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFVRJf6kki4cmZELTlYtnpGsPxKJHSoINhc4M78COiUuvMJnXmX0lnXVOmISXRERm4pc2rn X-Received: by 2002:a17:902:ec89:b0:1ca:85b4:b962 with SMTP id x9-20020a170902ec8900b001ca85b4b962mr1873205plg.4.1697539123036; Tue, 17 Oct 2023 03:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697539123; cv=none; d=google.com; s=arc-20160816; b=VJDV63WAroVv1JT430IR3KvMR08YiljIgJE3dOtsCT4mXaMyXqeT7xVgET3DBYisV5 uT5XdruT6oV4tGfuF3UoRms+mGz4B6MVbgG0gClDLBq/02zs95sgkuiHKpBH6fffJOXW EDtQGwWxNWioXv9bV1J67fVOiqSKOkc5crDy96YthmGf7sZO21KrNqowYenIJZygnXUF nRJ188FBSNMeHHHtXX1WA1Mh8j8dHH8uY75TxfHDzXDxuQEdCf+rWXntQJbiJRMbMkYI Sd32JJk/5ClCp+DquWxFHc7G2YC3IS0bb4+Agp82DQjhGyk9saZZnrN02Xtf2VbPl+qp vWwg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wlkma3USDT5CsODedSN3f9uKVCRuNbsAHHBLx68oQPE=; fh=wKrPioF+0wPaktGqmf0aQvlk8PY4Pc32rTAsBSAiP8I=; b=U56UydbM9dJ9paS7N75jguV33iB8jp6NXKIiCRcj2mdwiouYixOxLFTDea3C3PUmje hogtDmlilCCjXHNOtHLDNFTRHOJdIiQhYZi6wnf0mVgTbmfOw8ln6ZpYZnXKuMck/IFQ d/hsRmgCVxmSzVvlp+ev9SmwNSgMKLmHIjggXCXIyeMfApZaMRPfOauBsoSmU+gfEb/O Pljaf5avxDD4GvwzeM9SIHa8kpKDDsibpmiRTkPhmiNHMQK37asunFdhZ9PCh9EJCdve tEEAhTT9yN77UFLoPN09Bt5/6oMmuezn3UpI8V/rSc5jSDZ1UtFGYxTe9oYRVsmQ1BGA R33w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=USa0Dj7I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id b5-20020a170903228500b001c5fc13fb2dsi1610590plh.294.2023.10.17.03.38.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 03:38:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=USa0Dj7I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 25C2A802F6A9; Tue, 17 Oct 2023 03:38:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343683AbjJQKiU (ORCPT + 19 others); Tue, 17 Oct 2023 06:38:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343548AbjJQKiS (ORCPT ); Tue, 17 Oct 2023 06:38:18 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 849AAA2; Tue, 17 Oct 2023 03:38:16 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23DDCC433C8; Tue, 17 Oct 2023 10:38:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697539096; bh=waFeOWzoowEXA/GGZGLjVsE0MWpxTTUslAmqc2q+E5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=USa0Dj7IBbk3ONmbe6o+cZSZlTH0OD99mqtxWorNSzHyZZzpt1oTDK7PtaXoILlBh 4QXfEPc9h6tLJHHOtLmZPJt/+Q7eEOpe5eUJfaHRdzAIEO1okzvPitXyHR+ZBqB6c5 AmjlW/jjH2V1D5CVgt938CcUGJNb+ImtWyotSjKl1+uSYi97C25PRlSHYEJnt10Aya mpzBko3H4mtuqni0/otbiZul77lDtDvt3ZAdKWKk9pRmI5p4K/HbOlyK4DoLIPsncu pHdjm6Tq/aSI6VL31dh4bYOES1mrs6WwX1nHNEoTpuUjfOh72nczyNWgBaSJphi8s6 c98gpJG0vV4dg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 3/4] kbuild: skip module BTF with one-time check for vmlinux Date: Tue, 17 Oct 2023 19:37:41 +0900 Message-Id: <20231017103742.130927-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231017103742.130927-1-masahiroy@kernel.org> References: <20231017103742.130927-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 17 Oct 2023 03:38:40 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779998783359327908 X-GMAIL-MSGID: 1779998783359327908 When CONFIG_DEBUG_INFO_BTF_MODULES is enabled, vmlinux presence is checked in every module build, resulting in repetitive warning messages if vmlinux is missing. Check vmlinux and print a warning just once. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/Makefile.modfinal | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index 8568d256d6fb..9fd7a26e4fe9 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -14,6 +14,15 @@ include $(srctree)/scripts/Makefile.lib # find all modules listed in modules.order modules := $(call read-file, $(MODORDER)) +vmlinux := + +ifdef CONFIG_DEBUG_INFO_BTF_MODULES +ifneq ($(wildcard vmlinux),) +vmlinux := vmlinux +else +$(warning Skipping BTF generation due to unavailability of vmlinux) +endif +endif __modfinal: $(modules:%.o=%.ko) @: @@ -36,12 +45,8 @@ quiet_cmd_ld_ko_o = LD [M] $@ quiet_cmd_btf_ko = BTF [M] $@ cmd_btf_ko = \ - if [ ! -f vmlinux ]; then \ - printf "Skipping BTF generation for %s due to unavailability of vmlinux\n" $@ 1>&2; \ - else \ LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J $(PAHOLE_FLAGS) --btf_base vmlinux $@; \ - $(RESOLVE_BTFIDS) -b vmlinux $@; \ - fi; + $(RESOLVE_BTFIDS) -b vmlinux $@ # Same as newer-prereqs, but allows to exclude specified extra dependencies newer_prereqs_except = $(filter-out $(PHONY) $(1),$?) @@ -52,9 +57,9 @@ if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check), \ printf '%s\n' 'savedcmd_$@ := $(make-cmd)' > $(dot-target).cmd, @:) # Re-generate module BTFs if either module's .ko or vmlinux changed -%.ko: %.o %.mod.o scripts/module.lds $(and $(CONFIG_DEBUG_INFO_BTF_MODULES),$(KBUILD_BUILTIN),vmlinux) FORCE +%.ko: %.o %.mod.o scripts/module.lds $(vmlinux) FORCE +$(call if_changed_except,ld_ko_o,vmlinux) -ifdef CONFIG_DEBUG_INFO_BTF_MODULES +ifdef vmlinux +$(if $(newer-prereqs),$(call cmd,btf_ko)) endif