From patchwork Tue Oct 17 10:37:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154055 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4039917vqb; Tue, 17 Oct 2023 03:38:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF6LsXm3IRLOoNkIAnkZLGmp6DgePSkx/Kka3C2fGGQhHURquX+Qpqq8b4MzU3zvG26PBBl X-Received: by 2002:a05:6a20:d80d:b0:163:c167:964a with SMTP id iv13-20020a056a20d80d00b00163c167964amr1649001pzb.1.1697539111968; Tue, 17 Oct 2023 03:38:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697539111; cv=none; d=google.com; s=arc-20160816; b=o0aE0i2gzJkVDO7XrkDzXS1SjzgmGP+3xkbjieGsTtxhtFI+S/Jd/zgJih8exxd10I bgmrDBCPd9j0DSZlQhd+/GizRB+P/SSOr4rwSEv2R2iLUhbEnYgWRjBvvTd5wMx9VBpz 9hMIrHk8WlpG3+iJnXnaWWISonFNohy3YAnQhppXjenKseZ5oc3EHBYT2MX6yojFI/fz Sjtl3tpnG/wbFAWZx1aOiBtFU2i1HievfgHVRp8No3Op4PTNjTv5bFfOj+JZa/M5YKgA MKOTPBTzym32DXLxMosLFgTnuTNTVbc0und+tFp2+jWV9hZ5/qS9x94CySvrESWkIUCt bFAg== 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=jOUpGVMsQBZ2QUUfUNiJuYEv+l4P/BnMVfAnk1T3+y0=; fh=wKrPioF+0wPaktGqmf0aQvlk8PY4Pc32rTAsBSAiP8I=; b=LmY+bEWSEjunvI0gE2GEpCBZiDZLKwMjNXYRRls5Kc1ywSoGIuZNxBaKnt2eg2gJ2m RRkNeoil+rvFx2m8dB8hs/m0lAZpuGMgiP6RKNNQQzt5aSVxjIR3UmuTr9rJ5ge1uMsf zAsJqGlJ2Dnj8CC5F+Uloi7b0eHnXx9Q76H3ScNxx2RMSaFu3eIjLbSe/qiykFBDZ/C8 8PZGu0M/V+SB4dxqxR2Nl5VKAknSLDLb3iqmvxW4MC6z2NFL7yWs2GaLNcSeJ571S/Hu 4ODq7KzDh/CEtQoOxtbXyYGNib6l+naDPY3/y1FfT288IBCMScEKjJgvaIUS5kKk501h OCww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GBbWpDWR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id q125-20020a632a83000000b005ac86e7df6esi1477877pgq.363.2023.10.17.03.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 03:38:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GBbWpDWR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id EE70980A1841; Tue, 17 Oct 2023 03:38:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343707AbjJQKiX (ORCPT + 19 others); Tue, 17 Oct 2023 06:38:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343685AbjJQKiT (ORCPT ); Tue, 17 Oct 2023 06:38:19 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0868BFF; Tue, 17 Oct 2023 03:38:18 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95C7CC433CA; Tue, 17 Oct 2023 10:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697539097; bh=RUBKVlsGzVBXGtjDnQ7Enr6nWmXXOHg87V2AX3JQHyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GBbWpDWRQqxCKAh8ALF7WRA18h7wWeqp0dama8SsxwSVZ0Qata3wtLLrNjItPEsXX uWKKGnMYDHGyiTMthJys+FRlJvBWsTlF/dL3hJC09E6G7N+SiujmzH7JBJoHzDj+Zu DsBpdUomgRKbBrSknU7UNuM91a1oUi/WITbpfoQ5i9uLZRUbub25ILQHLNik1SMY6W ckOp9eVScbOkTqe3MJgfCL9tsuJAZO6sJApVmyNq1/W3gRgBY8sOCsmqfOOSgUUrvk BUvmPH1ko+HOs7YOh9+SDZfst0PBLNNb8ZkjpYO3iGvn9Q95Xg2mUgP4KEs4l+3Gwi 5vPMdu/FLYGfQ== 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 4/4] kbuild: refactor module BTF rule Date: Tue, 17 Oct 2023 19:37:42 +0900 Message-Id: <20231017103742.130927-4-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=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 17 Oct 2023 03:38:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779998772088832521 X-GMAIL-MSGID: 1779998772088832521 newer_prereqs_except and if_changed_except are ugly hacks of the newer_prereqs and if_changed in scripts/Kbuild.include. Remove. Signed-off-by: Masahiro Yamada --- scripts/Makefile.modfinal | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index 9fd7a26e4fe9..6ab10dba05c7 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -19,6 +19,9 @@ vmlinux := ifdef CONFIG_DEBUG_INFO_BTF_MODULES ifneq ($(wildcard vmlinux),) vmlinux := vmlinux +cmd_btf = ; \ + LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J $(PAHOLE_FLAGS) --btf_base vmlinux $@; \ + $(RESOLVE_BTFIDS) -b vmlinux $@ else $(warning Skipping BTF generation due to unavailability of vmlinux) endif @@ -41,27 +44,11 @@ quiet_cmd_ld_ko_o = LD [M] $@ cmd_ld_ko_o += \ $(LD) -r $(KBUILD_LDFLAGS) \ $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ - -T scripts/module.lds -o $@ $(filter %.o, $^) + -T scripts/module.lds -o $@ $(filter %.o, $^) \ + $(cmd_btf) -quiet_cmd_btf_ko = BTF [M] $@ - cmd_btf_ko = \ - LLVM_OBJCOPY="$(OBJCOPY)" $(PAHOLE) -J $(PAHOLE_FLAGS) --btf_base vmlinux $@; \ - $(RESOLVE_BTFIDS) -b vmlinux $@ - -# Same as newer-prereqs, but allows to exclude specified extra dependencies -newer_prereqs_except = $(filter-out $(PHONY) $(1),$?) - -# Same as if_changed, but allows to exclude specified extra dependencies -if_changed_except = $(if $(call newer_prereqs_except,$(2))$(cmd-check), \ - $(cmd); \ - 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 $(vmlinux) FORCE +$(call if_changed_except,ld_ko_o,vmlinux) -ifdef vmlinux - +$(if $(newer-prereqs),$(call cmd,btf_ko)) -endif targets += $(modules:%.o=%.ko) $(modules:%.o=%.mod.o)