From patchwork Mon Aug 28 18:33:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 137072 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3534033vqm; Mon, 28 Aug 2023 12:21:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhBIbyo6JntN72y4fUCzCCGQVimTK9vPKHTS2NYAaon2pInVxCVJU+rKzu/MH1A73QdH0j X-Received: by 2002:a17:907:c2a:b0:9a1:8993:9532 with SMTP id ga42-20020a1709070c2a00b009a189939532mr595902ejc.30.1693250482490; Mon, 28 Aug 2023 12:21:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693250482; cv=none; d=google.com; s=arc-20160816; b=ajoNkJD7HTua1xGDyub0OA0dO/XNjy2F0VUIEKNSpGkr+CqN8GY9OrliuhUnIR7O6z 3gnUl3Fpc1puNEUWIGga372o5riwh1WA/OJt3QwD0wOHIyXGttfDz406L2CnXgDNBDh9 c5CSUPDbluwao0a90GL87HA/iPQ09HCINKdbDLnlAuq4ZdFDIZ6XYr0kZ26YPDw0PmY5 f1OpPY0cD2s6GX0YrIIvI5BSEkfcuZ1grECo0lPI7K4dhJxY5i5Bn3x+uRNDmHMEaE6t FSsT91PhVqKw6EQYWJRVD27Lb2nkB+sT5rDpd9D5lzC/xUGuKja/S+REiOyig6n2+t8h YTjA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=opV/fTvoQG03tZPjhKnrnZhb+pKlUcJOHLeljZSm7bc=; fh=3DcI1lvhqsxkey4vMp7AZZgu9GCGCqTM17EjMYt6fZY=; b=IiZm4Vw65wr5/kVtwV9cRS88YvkaoEgqM+qjN3DSKGhMPpES7zLHhqU/0fJ1+vFc2U LGdVUS1Q4C+ZeIix9IG2daf6CQAoqESilN+jc0TJ4LlenEDmXQ7gBqbHqQlljXzvwNyP Mt0PQnb+GNQoJCyhEE48CSppqz9tuHj5hHYOK0wIfJggF3feT+o5pnC6zfG9KosCW9eO j7zxIh3aI6LXJ6RDQyKQTf7z/USXwUOKCNcJ0KHqbq24NzWh5v+sQgSvewfxJR98k+J2 vQLXVM0k+GFLnWgN80hxaARHOU/N/Q8MZYTMyxqMcnBtr9/NehmwCC6fMfqlzfKkSZrE Fe1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JLl7eKcV; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d17-20020a170906371100b009a1f0917c26si5007743ejc.677.2023.08.28.12.20.43; Mon, 28 Aug 2023 12:21:22 -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=@kernel.org header.s=k20201202 header.b=JLl7eKcV; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231636AbjH1SeD (ORCPT + 99 others); Mon, 28 Aug 2023 14:34:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232647AbjH1Sdk (ORCPT ); Mon, 28 Aug 2023 14:33:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB1D0191; Mon, 28 Aug 2023 11:33:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6E20963E38; Mon, 28 Aug 2023 18:33:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 434E3C433C7; Mon, 28 Aug 2023 18:33:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693247615; bh=d9s+rleTXjh+026kI2xWsxmN3r2l1b03zx5KLcfxN1o=; h=From:To:Cc:Subject:Date:From; b=JLl7eKcVOYvqYwCZx8WuoW5qAEQxNojEVCj58HmPzmnbXaDXNc+9KIC3d1egAZf/i G9wacsZ5VdVSc+x3ogaIsPtGMC7K8JoZI+5bVnrM/OCqUvHB6F6FRAWhHqJiEFT1df QJHwXmkfyblzKeg8pPr6QuaCH+LOvdPMrsPmb4h/CeQTuT2U85a/pHoHhAwvSEBtCk wt98pjgYRQDgVjMu7PfwZtqhiaOStwuDvZI2bRBBdHbp4cmZGHt619296TVT+D42g6 ta59kocFoNrWKE4qQObSKDMl7UTvD0aj4+VjNBpwojAluxPqOcmrCU2tJQSGZhZSms FimAYEksbRE4Q== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Andrii Nakryiko , Mykola Lysenko , bpf@vger.kernel.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Alexei Starovoitov , Daniel Borkmann , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next] selftests/bpf: Include build flavors for install target Date: Mon, 28 Aug 2023 20:33:29 +0200 Message-Id: <20230828183329.546959-1-bjorn@kernel.org> X-Mailer: git-send-email 2.39.2 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775501817695497518 X-GMAIL-MSGID: 1775501817695497518 From: Björn Töpel When using the "install" or targets depending on install, e.g. "gen_tar", the BPF machine flavors weren't included. A command like: | make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- O=/workspace/kbuild \ | HOSTCC=gcc FORMAT= SKIP_TARGETS="arm64 ia64 powerpc sparc64 x86 sgx" \ | -C tools/testing/selftests gen_tar would not include bpf/no_alu32, bpf/cpuv4, or bpf/bpf-gcc. Include the BPF machine flavors for "install" make target. Signed-off-by: Björn Töpel --- tools/testing/selftests/bpf/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) base-commit: 8be6f88b9d3fe1f6724daec4a70d6023742c9df7 diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index edef49fcd23e..7c77a21c3371 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -598,12 +598,14 @@ $(eval $(call DEFINE_TEST_RUNNER,test_progs)) TRUNNER_BPF_BUILD_RULE := CLANG_NOALU32_BPF_BUILD_RULE TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) $(eval $(call DEFINE_TEST_RUNNER,test_progs,no_alu32)) +INSTDIRS := no_alu32 # Define test_progs-cpuv4 test runner. ifneq ($(CLANG_CPUV4),) TRUNNER_BPF_BUILD_RULE := CLANG_CPUV4_BPF_BUILD_RULE TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) $(eval $(call DEFINE_TEST_RUNNER,test_progs,cpuv4)) +INSTDIRS += cpuv4 endif # Define test_progs BPF-GCC-flavored test runner. @@ -611,6 +613,7 @@ ifneq ($(BPF_GCC),) TRUNNER_BPF_BUILD_RULE := GCC_BPF_BUILD_RULE TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(call get_sys_includes,gcc,) $(eval $(call DEFINE_TEST_RUNNER,test_progs,bpf_gcc)) +INSTDIRS += bpf_gcc endif # Define test_maps test runner. @@ -714,3 +717,12 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ # Delete partially updated (corrupted) files on error .DELETE_ON_ERROR: + +DEFAULT_INSTALL_RULE := $(INSTALL_RULE) +override define INSTALL_RULE + $(DEFAULT_INSTALL_RULE) + @for DIR in $(INSTDIRS); do \ + mkdir -p $(INSTALL_PATH)/$$DIR; \ + rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR;\ + done +endef