From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E403C2D0DB for ; Mon, 20 Jan 2020 11:04:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E92722087E for ; Mon, 20 Jan 2020 11:04:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UlzPZXXk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727066AbgATLEV (ORCPT ); Mon, 20 Jan 2020 06:04:21 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:40797 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726974AbgATLER (ORCPT ); Mon, 20 Jan 2020 06:04:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579518255; 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=0D2NV9EyT8+bRJWlmQx32SvVPgUYttr3IYvJpCG0gTo=; b=UlzPZXXkfStwOUTOhlmhLUgn8H1x/D1EM04ioleX1smxggN/QOfkA4IFvQnk1Ysf4my3F/ sDhm8lZNLzJMUFGBiuRL6tAaQelttCOy7LH1BePcqNiuQ2Gm1hi5d2FK76AB0y/CPJGVyO v9foDTcMzfQjZeR4udPm7juF1/+8JkU= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-279-onXE4Qo4PNy_JKXJtoohdg-1; Mon, 20 Jan 2020 06:04:14 -0500 X-MC-Unique: onXE4Qo4PNy_JKXJtoohdg-1 Received: by mail-lj1-f198.google.com with SMTP id j23so7446797lji.23 for ; Mon, 20 Jan 2020 03:04:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=0D2NV9EyT8+bRJWlmQx32SvVPgUYttr3IYvJpCG0gTo=; b=UKI8WgmK7uR551He7oKQfanrjNDX+77bUtEvIejhS+qskj7VjejM3wWAvWrfcUlO1Z KghzcFVADgoLnd1xadLoN8A8lBMbO1QvjGc1pMnK/sn7D9Xck9OmehiwzQNrV7cz8hwl ci/Nr6Nwnr+fmLEIxtbwgzGVDOy8Qgk7ABpqNv2LzlUOmufNm9ehUDDSX6ecjL0p6vHR FoCo7ZOYRWjOT6H+I/aJXx4mCh280QIlX/q+uDDz3ZUqWo0Pm9e1vvakVgEqvi7OlJ8O G9I4BFGV25uBhAJ7lqnXnrZoFJ1fnAzesBCHZ5dyDJvNiKQE7tnZYs8+mUYoZ247eHAU 9fdw== X-Gm-Message-State: APjAAAUqpM2RDwiDWgyq4nlGh7YbPUFGYd/MU75ckUQh4N0EdWDHQlcQ lNx0SE6qaA2UjgcByQ9dCmBIJAg5ZkBiPw9oEHbVsoVa7gE9+nXOEcg41ZUUTIav3xoe9ig2d3l 6RBS97BYamEKO+qxeDGBQDgF8LbeX X-Received: by 2002:a2e:2c16:: with SMTP id s22mr13113877ljs.248.1579518252328; Mon, 20 Jan 2020 03:04:12 -0800 (PST) X-Google-Smtp-Source: APXvYqzXI2yd2Oi5VKXpLVh9lATHnVWtfkEINyqNvSzJ0CGsMQ8EPIgo05xlthJ7jXSiWSfn+eDmEA== X-Received: by 2002:a2e:2c16:: with SMTP id s22mr13113829ljs.248.1579518251933; Mon, 20 Jan 2020 03:04:11 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([85.204.121.218]) by smtp.gmail.com with ESMTPSA id z5sm16616586lji.40.2020.01.20.03.04.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 03:04:11 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 50B871804D6; Mon, 20 Jan 2020 12:04:09 +0100 (CET) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Andrii Nakryiko Cc: Alexei Starovoitov , 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 , Networking , bpf , open list , linux-rdma@vger.kernel.org, "open list\:KERNEL SELFTEST FRAMEWORK" , clang-built-linux@googlegroups.com Subject: Re: [PATCH bpf-next v4 02/10] tools/bpf/runqslower: Fix override option for VMLINUX_BTF In-Reply-To: References: <157926819690.1555735.10756593211671752826.stgit@toke.dk> <157926819920.1555735.13051810516683828343.stgit@toke.dk> X-Clacks-Overhead: GNU Terry Pratchett Date: Mon, 20 Jan 2020 12:04:09 +0100 Message-ID: <87blqypexi.fsf@toke.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Andrii Nakryiko writes: > On Fri, Jan 17, 2020 at 5:37 AM Toke H=C3=B8iland-J=C3=B8rgensen wrote: >> >> From: Toke H=C3=B8iland-J=C3=B8rgensen >> >> 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=C3=B8iland-J=C3=B8rgensen >> --- > > approach looks good, thanks, few nits below > >> tools/bpf/runqslower/Makefile | 18 +++++++++--------- >> 1 file changed, 9 insertions(+), 9 deletions(-) >> >> diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefi= le >> index cff2fbcd29a8..b62fc9646c39 100644 >> --- a/tools/bpf/runqslower/Makefile >> +++ b/tools/bpf/runqslower/Makefile >> @@ -10,13 +10,9 @@ CFLAGS :=3D -g -Wall >> >> # Try to detect best kernel BTF source >> KERNEL_REL :=3D $(shell uname -r) >> -ifneq ("$(wildcard /sys/kernel/btf/vmlinux)","") >> -VMLINUX_BTF :=3D /sys/kernel/btf/vmlinux >> -else ifneq ("$(wildcard /boot/vmlinux-$(KERNEL_REL))","") >> -VMLINUX_BTF :=3D /boot/vmlinux-$(KERNEL_REL) >> -else >> -$(error "Can't detect kernel BTF, use VMLINUX_BTF to specify it explici= tly") >> -endif >> +VMLINUX_BTF_PATHS :=3D /sys/kernel/btf/vmlinux /boot/vmlinux-$(KERNEL_R= EL) >> +VMLINUX_BTF_PATH :=3D $(abspath $(or $(VMLINUX_BTF),$(firstword \ >> + $(wildcard $(VMLINUX_BTF_PATHS))))) > > you can drop abspath, relative path for VMLINUX_BTF would work just fine OK. >> >> abs_out :=3D $(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 \ > > $(Q), not @ This was actually deliberate, since I was replacing an $(error) (which doesn't show up in V=3D1 output). But OK, I guess we can output the whole if statement as well on verbose builds... >> + echo "Couldn't find kernel BTF; set VMLINUX_BTF to speci= fy its location."; \ >> + exit 1;\ > > nit: please align \'s (same above for VMLONUX_BTF_PATH) at the right > edge as it's done everywhere in this Makefile Right, I'll try to fix those up (for the whole series). My emacs is being a bit weird with displaying tabstops, so some of these look aligned when I'm editing. I'll see if I can figure out how to fix this so it becomes obvious while I'm making changes... -Toke