From patchwork Fri Jan 17 13:36:39 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: 11339047 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 F3C8314B7 for ; Fri, 17 Jan 2020 13:37:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D284B214AF for ; Fri, 17 Jan 2020 13:37:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Xa98whPm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728951AbgAQNhG (ORCPT ); Fri, 17 Jan 2020 08:37:06 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:21472 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728682AbgAQNgv (ORCPT ); Fri, 17 Jan 2020 08:36:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579268210; 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=VosVvChz478iuqQd8mY3MBbU9kJ6mOJCPMFLJtpQS9A=; b=Xa98whPmSGvl3BnNn17NSJz3uSnf/J2JO8pC1hN/sC5jgZsdDAYV5zhjFp99cIciNwub3E 9vtUc7tTjqDQmd4RXqvV/kf6ZVZPbG+K3qLZ0X8ojG639BRe4P6+tF4yKT7SP5RnhJ9Y4V kT3abVlEdHvOxv5chQM/ySYlSk5p8qU= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-371-O54dYli_NzOidlXTICSbLA-1; Fri, 17 Jan 2020 08:36:43 -0500 X-MC-Unique: O54dYli_NzOidlXTICSbLA-1 Received: by mail-lf1-f70.google.com with SMTP id t74so4371472lff.8 for ; Fri, 17 Jan 2020 05:36:42 -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=VosVvChz478iuqQd8mY3MBbU9kJ6mOJCPMFLJtpQS9A=; b=daZ56tCrjoGQfGwL5OltHTJmZ3j8XamsaAt/Wc/mwJHlWSDnep05zM/C4LXrH5+wxy 5t/t2wbBy93DNR8ykgv++zOOlGvBWoJQcAyI9CNNe+PaXdh6OBpwbeRhkhvL22sFyM0Z xtvfPGIpU2uyfNFcFxRgONSUMyF2vtrKV64+93AC0uSasBImwrHbSWwmHjKxqijW6CzY 6Sc7T76FX15QRo3DVolrJWplsUh9Xa9W9tGsFs5JjBiYsLx+WSHJNnROmDJ05ZTV+mTf WujqnaaUlLMJtMvswHcAPkDIE7TffVMCuSNqcE1+uBzrixZKtbnYxDa+YEMop8hxExx/ 2cGw== X-Gm-Message-State: APjAAAUuLapNgR5e0tfgprbIkkdwPbqjHl19KusAU4fRj9+rGXXielA/ 0Qn05whIPg7IYoazMQ1Ho/RoN5xPU5iRVMghki2+Ygqwb+sX7Z2npCiYonDNcCxfAorwpNhe7aK KPWeW1PdeLJSqW6ddGRmZrA== X-Received: by 2002:a2e:7a07:: with SMTP id v7mr5832278ljc.271.1579268201645; Fri, 17 Jan 2020 05:36:41 -0800 (PST) X-Google-Smtp-Source: APXvYqzDzc22CsFKb/cLaKxHhC/rP5bXs/6Q5mMm+BqErB5PbFxN/F3ojSRACUfTIl5DJKT9rUlTrA== X-Received: by 2002:a2e:7a07:: with SMTP id v7mr5832239ljc.271.1579268201264; Fri, 17 Jan 2020 05:36:41 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id s1sm12420064ljc.3.2020.01.17.05.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2020 05:36:40 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 3EFB41804D8; Fri, 17 Jan 2020 14:36:39 +0100 (CET) Subject: [PATCH bpf-next v4 02/10] 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: Fri, 17 Jan 2020 14:36:39 +0100 Message-ID: <157926819920.1555735.13051810516683828343.stgit@toke.dk> In-Reply-To: <157926819690.1555735.10756593211671752826.stgit@toke.dk> References: <157926819690.1555735.10756593211671752826.stgit@toke.dk> User-Agent: StGit/0.21 MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@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, 9 insertions(+), 9 deletions(-) diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile index cff2fbcd29a8..b62fc9646c39 100644 --- a/tools/bpf/runqslower/Makefile +++ b/tools/bpf/runqslower/Makefile @@ -10,13 +10,9 @@ 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") -endif +VMLINUX_BTF_PATHS := /sys/kernel/btf/vmlinux /boot/vmlinux-$(KERNEL_REL) +VMLINUX_BTF_PATH := $(abspath $(or $(VMLINUX_BTF),$(firstword \ + $(wildcard $(VMLINUX_BTF_PATHS))))) abs_out := $(abspath $(OUTPUT)) ifeq ($(V),1) @@ -67,9 +63,13 @@ $(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 > $@ + @if [ ! -e "$(VMLINUX_BTF_PATH)" ] ; then \ + echo "Couldn't find kernel BTF; set VMLINUX_BTF to specify its location."; \ + exit 1;\ + fi + $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@ $(OUTPUT)/libbpf.a: | $(OUTPUT) $(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) \