Received: by 2002:ab2:6a05:0:b0:1f8:1780:a4ed with SMTP id w5csp1977204lqo; Mon, 13 May 2024 04:33:14 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUWzbjhF5ZGXTxnXU4EIQCXKTCr3ssvIkRdW5Coi+Xq2XS1gJvyJW46qsfawausMd84nqlsGqJBTcR0kxasrugbsH0UEKXEHaAlv0woHQ== X-Google-Smtp-Source: AGHT+IGdnm9qzZ5fqMPicaIP/CGoiwd0LL7H+gUlE7DhHNN1S4LsuYrQBdbUprVmwLig1ASHiQYi X-Received: by 2002:a25:870e:0:b0:de6:1056:c9e7 with SMTP id 3f1490d57ef6-dee4f2f6b6amr8564688276.8.1715599993886; Mon, 13 May 2024 04:33:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715599993; cv=pass; d=google.com; s=arc-20160816; b=SHeQHEE+Uu+vanTKMu6uod/sB7DqGzP1NrwXM3x6TdsxOY4gI7Ll1m7RgzCDHgFRGd FJi0vSr132nQpp36hOG1U8Sx8SMnpYE2piYNjeE1t6hGynqczY1w4g+0e9pjRGPBzQ3P 7dYOyyQ14I+Ie73ADCfs/DE738bPzwnJYPhEBkkINWDg3TcZuhb62F5DQin81+zrdPDq GQADCI6qmLgLjnzlroN1fXfKr9tYCSw00zPpWw6SGlYh1g73il2gSyNlbOQkz2Cx4n1F AwArD7VBTZOE/Pzqt9RNeXMkAvFelV/WywV1sBuEBJdk8/jakLOUC5F+4GFL2PGtwA6I 2lVA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=54evBAuhpnIbgDCbHAgBJwdKwEdND6gn70BNk2pLCuo=; fh=iytV63EdFttU3vmagNwN/8JPrd2O83l82Q+o5GEDgwA=; b=Fdwu9M3apACk3/sOiPgWuvRO7Gg0uJuj3aRRS0aLCe6SbG2+4548uFJl/yKiH2l1zQ PcgnXXK3qx+GHTVeUgXGXP85OcIXj/7roMafTzzyV5JnO+Pdk7qu2+w9EE3XXu22bfiH f2UQj8k/zrtvNLzqbXfMDeZV77oI6tV2u9sUiBMYHRCOLQ23R/vejrdiOqh10WhogVpv NMcZFOdnuvgomGLah6X9ZSBrApqHC6+cxRfAj0LBj2+wzWa2yJhUNHwXOTwYSpXZZSH4 dCpDcZFoz0Muyfn3ngztv8mCM7OV3IowUn5+n7N9aXvQcm2Nzao9QqVSX4/7RjBNHYt5 kCnw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KekUXzHc; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-177505-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-177505-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id d75a77b69052e-43df569a875si97879341cf.463.2024.05.13.04.33.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 04:33:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-177505-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KekUXzHc; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-177505-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-177505-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 9B4681C22B01 for ; Mon, 13 May 2024 11:33:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 739BC14C5A4; Mon, 13 May 2024 11:33:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KekUXzHc" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5810914C584 for ; Mon, 13 May 2024 11:33:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715599986; cv=none; b=Umt7wDCaYkPMLcFiyeeVLtNSTyAOICYyqeENx34FLwUpepJyevGKQSbs/FWitE51nr7msJ5VqHmgzMPRImBaobt+dJXV1b/c7m/2iqILeEtznqMp+wdb9RdVKj3DkbHLdiGdqASrbqlaSV1Do50ywc9DIXOYd6IO1aLphOE9NQw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715599986; c=relaxed/simple; bh=0k5DBiev6Hez4iRlP0Z+hV0EZ/1rw9D59hE5bmw14XQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=dbaKQ999v+iYf8GbDR7zL1bG544nwFBlgdaWzSR5HL4icjPwsY3gBPleNQksB1ezVvKZQ7GIwj/0cRoM929prBZ5aHIK6my+//V7npJ5woJ50sNh0X2xqMfTMu2skMWBjEgdx1h6Ung8+l5Y2T8fQzCq0EtmaSdw+JGhNSgicEw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=KekUXzHc; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715599984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=54evBAuhpnIbgDCbHAgBJwdKwEdND6gn70BNk2pLCuo=; b=KekUXzHcLmvOQDNh7PXtS3qLl5XDYdKHpt8kcItRCBA90QLgDiuZ2fJD4ZcDG5DoqrYeTi nTrGIbEyPiCREMOx8m1L8UxzwrfZgGPnHPck/a022rHgPAzvBxquKmOWNbKTsJQhYJzP0x U47aZULiqyUcov2hBGBPKSMM8/kcR/s= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-76-b22GMANPMli0g95TKxwUrg-1; Mon, 13 May 2024 07:27:02 -0400 X-MC-Unique: b22GMANPMli0g95TKxwUrg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id A3D328025F9; Mon, 13 May 2024 11:27:01 +0000 (UTC) Received: from alecto.usersys.redhat.com (unknown [10.43.17.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AC691C00A90; Mon, 13 May 2024 11:27:00 +0000 (UTC) From: Artem Savkov To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , bpf@vger.kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Artem Savkov , Jan Stancek Subject: [PATCH bpf-next] bpftool: fix make dependencies for vmlinux.h Date: Mon, 13 May 2024 13:26:58 +0200 Message-ID: <20240513112658.43691-1-asavkov@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 With pre-generated vmlinux.h there is no dependency on neither vmlinux nor bootstrap bpftool. Define dependencies separately for both modes. This avoids needless rebuilds in some corner cases. Suggested-by: Jan Stancek Signed-off-by: Artem Savkov --- tools/bpf/bpftool/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index dfa4f1bebbb31..ba927379eb201 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -204,10 +204,11 @@ ifeq ($(feature-clang-bpf-co-re),1) BUILD_BPF_SKELS := 1 -$(OUTPUT)vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL_BOOTSTRAP) ifeq ($(VMLINUX_H),) +$(OUTPUT)vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL_BOOTSTRAP) $(QUIET_GEN)$(BPFTOOL_BOOTSTRAP) btf dump file $< format c > $@ else +$(OUTPUT)vmlinux.h: $(VMLINUX_H) $(Q)cp "$(VMLINUX_H)" $@ endif -- 2.44.0