Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp16404pxb; Tue, 23 Feb 2021 16:37:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwhLArfphYjs1zt2fDV8d1vDwoWxr+EC8NrocPRo96gn+AeM7CWzwTzvd/BDibQdgvnscuy X-Received: by 2002:aa7:c95a:: with SMTP id h26mr30885614edt.166.1614127051048; Tue, 23 Feb 2021 16:37:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614127051; cv=none; d=google.com; s=arc-20160816; b=uKX0KHOLzdDEXx7IhJdbjEhkmlqyR0+si8OlbSYzvF3EFFKPpUVi7Bc57zrtI9pjdB bnLc0UgrwL84+iV8xjQaPvsoietiucSKKFuredbPfprkWfFvbWRvOC5HDibZwxLkI7JJ Zm0YbbID7yKX/mnkV1afF02HJE4RS5FV+yNAJhXKRYM8ef4eqdAw7bx4uu1u6whPjajz mnJqM/+PbU795aPTu0rcZF28Eql8+qv1TndtzlB+JqkX+/ltwivljdF27YB37/q1WpOn SL4CVLaWNSlSuPfY5eiAHg5tGGafH39SP+TMskubc2CC+UKdzZCKN5VvS/aUh/HC9V3n qoqA== 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=Y/YDIvLzn/N/X8VinCY7BVWBdYRtoVnjhPg4ULx6uwGY4as6xQ9uEfpRL4/v0k1TAw oKHnnJTCu5oabBN/D0nSkxu2X2Pf3Yd2HzE+xo/WATFS6zI7o857tCG8C7Fo6ErRDR/n aeOMgGZuQDSzGAXKN/809W6qWdDFqj5XQ/ns9EmWBe3u2o2oKTCAWyw3rgMPt4EzELze HyCzOfQhIhKmTlQ7LZS++3rt2t1SByic/WC5W+Z/myu9ZxRBOw0Yb0t9JQEuphGeC4Sk KKSohNVTZ7Ok1pqfNJYiP5hokWrXnAL9hzjhxhPzFKMVo5J88uOASSyc6CXfxK6MDvKY JM8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=Uwh+FOqT; 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 o17si270228ejg.615.2021.02.23.16.36.29; Tue, 23 Feb 2021 16:37:31 -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=Uwh+FOqT; 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 S233095AbhBWWjL (ORCPT + 99 others); Tue, 23 Feb 2021 17:39:11 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:12596 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232339AbhBWW3v (ORCPT ); Tue, 23 Feb 2021 17:29:51 -0500 Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.16.0.43/8.16.0.43) with SMTP id 11NMT42Z017694 for ; Tue, 23 Feb 2021 14:29:10 -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=Uwh+FOqTkGX8pTc8Py2iB8C+PKuoUmwYoU2fppokFXv1ZuKzyTRB5lTtFEjRpoWNgQ4/ +tV4JOamnfX0q/Oyo8KwNO1m/9DtBymiQ7Tuf/NLLYqp20x4sqNawxUeEJG0oeLuWFi5 0cwPWf5P/xzoL3UHROM0KUOXawrpSw1D3tE= Received: from mail.thefacebook.com ([163.114.132.120]) by m0001303.ppops.net with ESMTP id 36u03417qe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 23 Feb 2021 14:29:10 -0800 Received: from intmgw002.06.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:11d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 23 Feb 2021 14:29:08 -0800 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id B7CA962E093E; Tue, 23 Feb 2021 14:29:07 -0800 (PST) From: Song Liu To: , , CC: , , , , Song Liu , Andrii Nakryiko Subject: [PATCH v5 bpf-next 5/6] bpf: runqslower: prefer using local vmlimux to generate vmlinux.h Date: Tue, 23 Feb 2021 14:28:44 -0800 Message-ID: <20210223222845.2866124-6-songliubraving@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20210223222845.2866124-1-songliubraving@fb.com> References: <20210223222845.2866124-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-23_11:2021-02-23,2021-02-23 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 impostorscore=0 spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=560 clxscore=1015 lowpriorityscore=0 suspectscore=0 adultscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102230189 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