Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp798399pxb; Thu, 25 Feb 2021 15:48:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJeE2D8VXXKHZTk6bzqf/NDE89hsmDlZeIbilrNRUxypQaTBK300OaZfhh+ol/gX7JN+7d X-Received: by 2002:a17:906:1d0f:: with SMTP id n15mr81991ejh.553.1614296923106; Thu, 25 Feb 2021 15:48:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614296923; cv=none; d=google.com; s=arc-20160816; b=XoZwTNGbOGIg/VrIN0B5MBNA5NK3BOMGR4q+M5ndaPaRfq/7x70+ONrh/zRT0b/Ajz vphjSSf6W0xp3XF2lhGan3WFmSJ442wHtb9qvZ5OAJ5IjNr69PY1FyzKmI1ZZBd8iYFr /5HjrJ0xKXUMpmkgS+r2a0qCOKdq3u4ra9havtVsxrvbxhPyJTGYsjQ1Y9bzf18oDqK1 V0xdZ6/RG+d+bC5c604+gZ05S3NrU/Bv1D98h2EZv/OayH04BWrd+f6kgkuB+QhwF6P4 7ODTO5Qbn7WIySsAunjpLImINecPjZsmHbOKquxPa7pS7rFdPdr0rdzRZvhLBbVBzS72 X0AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+q9icw4w72ZW+9dnDuoTVCwteqypUS3djmQoNnUrw1Q=; b=V7xr9ZDTGH4hGDuzRgQD24TPgaYDgvvk+HAn6IXZwlyuE8jiAw/gT7yl2pw0u/aRC1 9w5owENMXQAwRyOwEgLFHcg1w21LWcXJ1USWnypdV+baXV8V7PTz7c4Z7gO5HJQiYKV+ anqE9ay6HJmiZz91g17WN2075kJFBP6xaaLwlMUCepz7x8WRhTIwi4n7RekiSJbBbrn6 zyn5+T5MngKtHNdmR9lsqK2cTHve6HBklVU5lnCGpkKDvcMVmRprBqj4GeGMeJn7JPcw tdqsAGoFRd6ccPkgTri7KZV/U4srBeAfAe72U004DQdXeK6IXJNJogK1kEp0ecyMi+LV aY/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=FgJ2HeWM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fb.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r15si4504074ejj.134.2021.02.25.15.48.20; Thu, 25 Feb 2021 15:48:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=FgJ2HeWM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fb.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232982AbhBYXqR (ORCPT + 99 others); Thu, 25 Feb 2021 18:46:17 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:42230 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232763AbhBYXod (ORCPT ); Thu, 25 Feb 2021 18:44:33 -0500 Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.16.0.43/8.16.0.43) with SMTP id 11PNdcgX010649 for ; Thu, 25 Feb 2021 15:43:52 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=+q9icw4w72ZW+9dnDuoTVCwteqypUS3djmQoNnUrw1Q=; b=FgJ2HeWM1gbH6nBphvy8XnOGyjuVKkkbkNjI+cKQVSAM9L5c6G576cPQ07qhxqSx5KC8 +RsVkmRE+tt0UtMxnuWoexly4xtU1zlHFjKT2VraEpEsh3P8QS7NXsDtZO4afiNj4qkz HpjBzNFybqLBTpd6ubiYQeltU46meEsbTNk= Received: from maileast.thefacebook.com ([163.114.130.16]) by m0089730.ppops.net with ESMTP id 36wncftwdr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 25 Feb 2021 15:43:52 -0800 Received: from intmgw001.06.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 25 Feb 2021 15:43:51 -0800 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 0B16762E1BF5; Thu, 25 Feb 2021 15:43:47 -0800 (PST) From: Song Liu To: , , CC: , , , , Song Liu , Andrii Nakryiko Subject: [PATCH v6 bpf-next 5/6] bpf: runqslower: prefer using local vmlimux to generate vmlinux.h Date: Thu, 25 Feb 2021 15:43:18 -0800 Message-ID: <20210225234319.336131-6-songliubraving@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20210225234319.336131-1-songliubraving@fb.com> References: <20210225234319.336131-1-songliubraving@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.761 definitions=2021-02-25_15:2021-02-24,2021-02-25 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 suspectscore=0 bulkscore=0 mlxlogscore=569 priorityscore=1501 spamscore=0 phishscore=0 impostorscore=0 malwarescore=0 clxscore=1015 mlxscore=0 adultscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102250179 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update the Makefile to prefer using $(O)/vmlinux, $(KBUILD_OUTPUT)/vmlinu= x (for selftests) or ../../../vmlinux. These two files should have latest definitions for vmlinux.h. Acked-by: Andrii Nakryiko Signed-off-by: Song Liu --- tools/bpf/runqslower/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefil= e index 9d9fb6209be1b..c96ba90c6f018 100644 --- a/tools/bpf/runqslower/Makefile +++ b/tools/bpf/runqslower/Makefile @@ -16,7 +16,10 @@ CFLAGS :=3D -g -Wall =20 # Try to detect best kernel BTF source KERNEL_REL :=3D $(shell uname -r) -VMLINUX_BTF_PATHS :=3D /sys/kernel/btf/vmlinux /boot/vmlinux-$(KERNEL_RE= L) +VMLINUX_BTF_PATHS :=3D $(if $(O),$(O)/vmlinux) \ + $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ + ../../../vmlinux /sys/kernel/btf/vmlinux \ + /boot/vmlinux-$(KERNEL_REL) VMLINUX_BTF_PATH :=3D $(or $(VMLINUX_BTF),$(firstword \ $(wildcard $(VMLINUX_BTF_PATHS)))) =20 --=20 2.24.1