From patchwork Thu Jan 16 13:22:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 11336885 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 495856C1 for ; Thu, 16 Jan 2020 13:23:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B823206D5 for ; Thu, 16 Jan 2020 13:23:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hjIiv/NE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726975AbgAPNXV (ORCPT ); Thu, 16 Jan 2020 08:23:21 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:38475 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726689AbgAPNWT (ORCPT ); Thu, 16 Jan 2020 08:22:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579180938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gzqQE7mWfqS9gbpZpl6m88cnGx3MlkQu/XGO40kZXJg=; b=hjIiv/NEGtOQzkxuzUnOFJ+y9lZYIiSgMYufe4/BLirwTe8zVVjeV6n/ZGIhZnNWZzx/rS VaZKBY/3HyNzD2ckVyWJlcYaLeMy7V8WnXWs2bYIQB20NUzEWt2IHl4CNA7pTKPVLZ9AdX 8+CzjK/gpf/6DQ+ftqfcvV0Kcd3mFsw= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-341-lkdl1OGuOtGn_DC_weVdkw-1; Thu, 16 Jan 2020 08:22:17 -0500 X-MC-Unique: lkdl1OGuOtGn_DC_weVdkw-1 Received: by mail-lj1-f200.google.com with SMTP id w6so5154888ljo.20 for ; Thu, 16 Jan 2020 05:22:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=gzqQE7mWfqS9gbpZpl6m88cnGx3MlkQu/XGO40kZXJg=; b=PF/sPtftmdJ2EZ51r4hrM+wb6Bz8TiJHrR1tFtGhbkQ11+8dLb65KMPZwp7n655Y77 nkt7vkWljNFqdNIlA4zlwvjAiS+f3sSZ+tRIP39jFJ/sLpV/ebBFgDDklm2lJBYJ8tQH WkRpWX6mVXrpUd3fBCYE1Sv60ZqifzaZ9czyViRvFozyq+M1MjqKlpmGs5kAbrKCuVp8 +Nclk9RXjLATZtuj8UoQO0DNoXQeXjq6zktCp2qz+u12rOSInv4NCLQSg4m/8uaxS5b/ dQp4A78QQ5Pqh6AgLRgdfhKRttM7IyQHwSDAss1epNlIlZGoPUaoKaushXccMHfCDSLn 4IQA== X-Gm-Message-State: APjAAAWYS64a8RsD1Mgl7KM3Ds5JW1Mx040VMLduKxZSVdLuUYP+v0sU FOqM+V5VUmMq2qaS2ZCHP4MhEk81zslOpTkdO8IJGNBdnC9vdBcJbJHze3PQmn5XwN7gQW48Zhz Z9SApkhOiGoCK6pthswsZvMNP90s7 X-Received: by 2002:a2e:2c16:: with SMTP id s22mr2305751ljs.248.1579180936042; Thu, 16 Jan 2020 05:22:16 -0800 (PST) X-Google-Smtp-Source: APXvYqwFm8TdvoRQDWtY2lKrbQQl1O6xAPqlYnDABHlUDuyNgLz95SjjEtdQljJ8ty7d3yotxnb3Rg== X-Received: by 2002:a2e:2c16:: with SMTP id s22mr2305732ljs.248.1579180935891; Thu, 16 Jan 2020 05:22:15 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id n3sm10612990lfk.61.2020.01.16.05.22.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2020 05:22:15 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 03CC51804D8; Thu, 16 Jan 2020 14:22:14 +0100 (CET) Subject: [PATCH bpf-next v3 02/11] tools/bpf/runqslower: Fix override option for VMLINUX_BTF From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Alexei Starovoitov Cc: Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , Doug Ledford , Jason Gunthorpe , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Shuah Khan , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kselftest@vger.kernel.org, clang-built-linux@googlegroups.com Date: Thu, 16 Jan 2020 14:22:13 +0100 Message-ID: <157918093389.1357254.10041649215380772130.stgit@toke.dk> In-Reply-To: <157918093154.1357254.7616059374996162336.stgit@toke.dk> References: <157918093154.1357254.7616059374996162336.stgit@toke.dk> User-Agent: StGit/0.21 MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: Toke Høiland-Jørgensen The runqslower tool refuses to build without a file to read vmlinux BTF from. The build fails with an error message to override the location by setting the VMLINUX_BTF variable if autodetection fails. However, the Makefile doesn't actually work with that override - the error message is still emitted. Fix this by including the value of VMLINUX_BTF in the expansion, and only emitting the error message if the *result* is empty. Also permit running 'make clean' even though no VMLINUX_BTF is set. Fixes: 9c01546d26d2 ("tools/bpf: Add runqslower tool to tools/bpf") Signed-off-by: Toke Høiland-Jørgensen --- tools/bpf/runqslower/Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile index cff2fbcd29a8..89fb7cd30f1a 100644 --- a/tools/bpf/runqslower/Makefile +++ b/tools/bpf/runqslower/Makefile @@ -10,12 +10,14 @@ CFLAGS := -g -Wall # Try to detect best kernel BTF source KERNEL_REL := $(shell uname -r) -ifneq ("$(wildcard /sys/kernel/btf/vmlinux)","") -VMLINUX_BTF := /sys/kernel/btf/vmlinux -else ifneq ("$(wildcard /boot/vmlinux-$(KERNEL_REL))","") -VMLINUX_BTF := /boot/vmlinux-$(KERNEL_REL) -else -$(error "Can't detect kernel BTF, use VMLINUX_BTF to specify it explicitly") +VMLINUX_BTF_PATHS := $(VMLINUX_BTF) /sys/kernel/btf/vmlinux /boot/vmlinux-$(KERNEL_REL) +VMLINUX_BTF_PATH := $(firstword $(wildcard $(VMLINUX_BTF_PATHS))) + +ifeq ("$(VMLINUX_BTF_PATH)","") +ifneq ($(MAKECMDGOALS),clean) +$(error Could not find kernel BTF file (tried: $(VMLINUX_BTF_PATHS)). \ + Try setting $$VMLINUX_BTF) +endif endif abs_out := $(abspath $(OUTPUT)) @@ -67,9 +69,9 @@ $(OUTPUT): $(call msg,MKDIR,$@) $(Q)mkdir -p $(OUTPUT) -$(OUTPUT)/vmlinux.h: $(VMLINUX_BTF) | $(OUTPUT) $(BPFTOOL) +$(OUTPUT)/vmlinux.h: $(VMLINUX_BTF_PATH) | $(OUTPUT) $(BPFTOOL) $(call msg,GEN,$@) - $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF) format c > $@ + $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@ $(OUTPUT)/libbpf.a: | $(OUTPUT) $(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) \