From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D4853F871A for ; Mon, 20 Jul 2026 11:13:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784546000; cv=none; b=g/pqKR03wzQBGfQXoxusicTUHCM0RAWBI/QzwpHNNyXY8eE6YmY+Bd+WpLG+5QjcMk4NK+tTrky8H72dNirAKGiDJRKcXdd/FEXmXMv2wZQhsqDHOcE2kquwQ1bJzjGLFv/0pb58yfhHFPLsmb60CI9vRtVzjudyZ+iNu6GKnss= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784546000; c=relaxed/simple; bh=vYmmEJdAFCMl4uFdGoDC7UpVngdWPs05SlrMvDkcKoE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jys3ZrcQbKx3hnjzHsrGyx/PjPBs8kqzxfkzolJc5NJHnkT88sKFVNMkHxUvcAVPIN9Wr2bf23Dv/Lx+nNHkpiv/ntCOZQzY5Wsn1bTVT7+NXpm5+fF0qXgL+pKiXppFXGrlLCxAvldROtk/z/ol57GQp/nwH8QVd2NLlU2xCi8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=ZxFw8gfu; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="ZxFw8gfu" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4955484387cso9025675e9.1 for ; Mon, 20 Jul 2026 04:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1784545995; x=1785150795; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=7uQXAJRjVDCtTQypbHSGkyeg+ewr6QOBdRjNsYUu+5U=; b=ZxFw8gfukgCnTGc8TxzeaFi/urviz5iceOXA+xEHNZSK2J7eo09BU32Yc5Sc9MboBg ThgcDXL9qdZi37yzBMOU0X5I85CQPwt/6t8CopOfeIdPzhYVLEyR08q1UQb9KJe+7zPk DNGZD7PuEvRLpizWXubrxJps76JzvNMdbEzwMIyhLfoO6Jkacw5Sr9euY6JTrH/hgZiR dT/LkJzTSYsHptn63qM1teiRkkJ0a4gD5c+xno2Z1xCVpF46LhbvKy1mVptxYs/Nbuvs I/phkYTgIuH7WSr9VRpDMKp7bhnGDcb4dg3u0QjAGcYS2ifiFR4Wa8Ewy34gf2Tj3E8q yo8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784545995; x=1785150795; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=7uQXAJRjVDCtTQypbHSGkyeg+ewr6QOBdRjNsYUu+5U=; b=jemwz11xAlH4RPrYSLuGogmpAAMXBvQt6mpuUhxH+UJBDI97eHmmC7slav+HpCaxvo r0h6Cjfcw48hQjRd3PY+cyk2lKxHrswc2KdU0uVLjxkFOQikg5TkXS7hzYWBb23h7XL1 IrMI41bTQ85NYawvwMKZOl591E4Rl2pLzfl7SVFbgU6gvLwvpdveLXn0If6q3nGypZHD b+bnMInNj4tPk8xQod9o0nObRkdR4sYuSAt6gjDG8hh7xcmCMZU+ncvjy3KXgXGjdpHi b2io7ls4zY4DR0Uz2RGuDew/PZ2D0zmxhNzZEbQsqOG+LpS0e4qKBqYfytCZWodOINSB YPRg== X-Forwarded-Encrypted: i=1; AHgh+Ro+xvu/THJAu4AOV2/i8FlEfp/5leG2IXWFhwHaPEUErSe3fIDXv5ReOu6pvXBtLevjIfGy07NRiZtecJE=@vger.kernel.org X-Gm-Message-State: AOJu0YyI10Qi5itCypM0tHMs3zCCjudvmto0wfW4fkj2khsTn2Iq5pBz syPiFrK52TYehUBWs17sZdfPLY88uxblXQVPeV+WnWnw33DnIvZ/Iza1m5ElLqXVMAA= X-Gm-Gg: AfdE7cmBeF9tS1P3rNL+Dg6tNPH9tRQblU/+K6GB7AP/JtAbv5uuoUi7eHit7TbzC7Y KCj9FWM8kTfsAGK23RUtuUdDLq5L4mrwuxzTmYoWoxv8dQ+tX3Izhi9NsHsINwqCIUWaTDbs/Vq VEx49CakD+PN49TJT0rCcWV5AwfbI5LIwE0A2u8tQ9LrcxWIdebmJOANn+XvfnD9qtM8nV0FOmq 6Xx4uUMyrsu89jZI4xKubqpfeuFK9zgbsh2G6wr219GBRQza444o5l4nI//9R7enkknfI6eQpma VsjoJAe4qpFepm+xPw2iOyrUY50z8QvYya+5UThGWMHn2HQt5bM6jhrzJJPatnEA9eA0xiasqm3 5H3YUj8tpkjStU8y4QNdl6S8JoaVSbt3riryieukJ371TnhymmTWRmbkkExQW6wo30A== X-Received: by 2002:a05:600c:1c28:b0:493:bd2a:93bb with SMTP id 5b1f17b1804b1-4954a3d0be6mr156951935e9.3.1784545995348; Mon, 20 Jul 2026 04:13:15 -0700 (PDT) Received: from localhost ([2804:7f0:b765:c3e:cc5f:6c4b:db0a:5d2a]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-976fc3f3d1csm7075640241.6.2026.07.20.04.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 04:13:14 -0700 (PDT) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Mon, 20 Jul 2026 08:13:07 -0300 Subject: [PATCH v2 1/3] selftests/bpf: Fix make install target Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260720-selftests-bpf_fixes-v2-1-b450eda93dfe@suse.com> References: <20260720-selftests-bpf_fixes-v2-0-b450eda93dfe@suse.com> In-Reply-To: <20260720-selftests-bpf_fixes-v2-0-b450eda93dfe@suse.com> To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Shuah Khan , =?utf-8?q?Alexis_Lothor=C3=A9_=28eBPF_Foundation=29?= , Ihor Solodrai , Christian Brauner Cc: bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openssh-sha256; t=1784545988; l=2003; i=rbm@suse.com; h=from:subject:message-id; bh=vYmmEJdAFCMl4uFdGoDC7UpVngdWPs05SlrMvDkcKoE=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QOBdurL64DfSVQ3AWQ8Avf1JZq2ngBA6dIuruKmkdnqiFfvE91QiKd05rfeRY6Eu1JA2W3LirdC Se9UvaWH6zg4= X-Developer-Key: i=rbm@suse.com; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g After "make install", test_progs fails because two files end up in the wrong place: - bpftool: TEST_GEN_PROGS_EXTENDED flattens it into $(INSTALL_PATH), losing the tools/sbin/ prefix that detect_bpftool_path() expects. Remove it from TEST_GEN_PROGS_EXTENDED and install it explicitly under tools/sbin/ instead. - *.BTF: resolve_btfids writes resolve_btfids.test.o.BTF as a side-effect of the build but INSTALL_RULE never copies it over. Install all *.BTF files alongside the rest of the per-flavor output. Fixes: f21fae577446 ("selftests/bpf: Add a few helpers for bpftool testing") Fixes: 522397d05e7d ("resolve_btfids: Change in-place update with raw binary output") Signed-off-by: Ricardo B. Marlière --- tools/testing/selftests/bpf/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index b642ee489ea6..55d394438705 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -324,8 +324,6 @@ TRUNNER_BPFTOOL := $(DEFAULT_BPFTOOL) USE_BOOTSTRAP := "bootstrap/" endif -TEST_GEN_PROGS_EXTENDED += $(TRUNNER_BPFTOOL) - $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(BPFOBJ) TESTING_HELPERS := $(OUTPUT)/testing_helpers.o @@ -1055,10 +1053,13 @@ endif DEFAULT_INSTALL_RULE := $(INSTALL_RULE) override define INSTALL_RULE $(DEFAULT_INSTALL_RULE) + @mkdir -p $(INSTALL_PATH)/tools/sbin + @rsync -a $(if $(PERMISSIVE),--ignore-missing-args) $(TRUNNER_BPFTOOL) $(INSTALL_PATH)/tools/sbin/ + @rsync -a $(if $(PERMISSIVE),--ignore-missing-args) $(OUTPUT)/*.BTF $(INSTALL_PATH)/ @for DIR in $(TEST_INST_SUBDIRS); do \ mkdir -p $(INSTALL_PATH)/$$DIR; \ rsync -a $(if $(PERMISSIVE),--ignore-missing-args) \ - $(OUTPUT)/$$DIR/*.bpf.o \ + $(OUTPUT)/$$DIR/*.bpf.o $(OUTPUT)/$$DIR/*.BTF \ $(INSTALL_PATH)/$$DIR; \ done endef -- 2.55.0