Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1884042ybz; Thu, 30 Apr 2020 07:11:25 -0700 (PDT) X-Google-Smtp-Source: APiQypKIJBlnAKKKBU1qQQmKNlkcXFQcuzSwvcQPmABZnARQ5HtnIOKBUn84bFXgL3gc2vQU0YVM X-Received: by 2002:a05:6402:1d09:: with SMTP id dg9mr2948106edb.118.1588255885389; Thu, 30 Apr 2020 07:11:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588255885; cv=none; d=google.com; s=arc-20160816; b=ZXY23hfxWmHgRIBWTpe072EkDukOLdFes69qDFmi96PGK7jdDu1VO035jhQ55PP+ec NRL8gyXR31pGY39SiQKU/S8Jm0fc8srpmIK4gquYNILkWqfmN/9ubgtF6JpRPc7Ege5M fDzhTNYtUhbNJ4ytjH7f8eKtjAjmDjf2aoUFyre05vnlp1LiK4UCbYusIiHL27swOn7y P0l9N2D0zBYX9BSlvS4PyK3QrlD/BR1x4Diki+x0uV02gme6JWfM/YElCvFObhJyMgMB BwlXqd/JntOf9fq6i47Pggx9REjxMZKi9hxminu1dezN8ChbqvhecgD0UCwMl6ThRhm6 vpJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cltNVUAnyNr5OttGyKxXVGtvI29MyJ1v15Ub8HUQK44=; b=CWMqKhI6TONNNeSFXcaRNl3t39uqiGIXhAiUxUnpMx6pWV1U7GIch5CVC/HmkXuD8N FRjIruyD6zdvxOhIr4kEs+QxEM3ik6DI53XbGojIwb7rWgFT4lHUIidbpayDJdm7Y7OU dAoQeELhFqAwFmlFxVxp1DQ10SQO1ScyURqnW9k5t/grO6+GwAT3BPablbNf8FZYEQiq tKziiqxcSQ+22tOKLpMekX4fg4MhtxfKib0dI1eCERsi5FmFBwbp2IUQucB1Acc4sxel +FZEezo3fWVNSLtnj1AZCiNmUDPGRu4Db9F0K7F0p+bWb0tLYTgBFFn2WruEjIcO4m73 4E8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rxfiwErW; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h11si5720715ejc.416.2020.04.30.07.11.01; Thu, 30 Apr 2020 07:11:25 -0700 (PDT) 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=@kernel.org header.s=default header.b=rxfiwErW; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727776AbgD3OIU (ORCPT + 99 others); Thu, 30 Apr 2020 10:08:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:33040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728228AbgD3NwM (ORCPT ); Thu, 30 Apr 2020 09:52:12 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1A64D24954; Thu, 30 Apr 2020 13:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254731; bh=bqh3cR6Ad/+7gmqpssqzNdx+uFpeI+3P5DF4UDCuYIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rxfiwErWsfyqy10FxWCmQx4E7tTxGMOhMHy+ELCA0rgmdCGz+2lMkE8O4aE0RNO3Q U/zifKadexXX1q+xpb6N5orJ58AB5faiIombcTYI4I7gauaRRI0ff5tfXLHtpjj0io GckwWb0p9RPhwlo2PW6/jG8A2xN/zYtYzgKOLNQg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrii Nakryiko , Alexei Starovoitov , Sasha Levin Subject: [PATCH AUTOSEL 5.6 78/79] tools/runqslower: Ensure own vmlinux.h is picked up first Date: Thu, 30 Apr 2020 09:50:42 -0400 Message-Id: <20200430135043.19851-78-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135043.19851-1-sashal@kernel.org> References: <20200430135043.19851-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrii Nakryiko [ Upstream commit dfc55ace9939e1e8703ad37ddbba41aaa31cc0cb ] Reorder include paths to ensure that runqslower sources are picking up vmlinux.h, generated by runqslower's own Makefile. When runqslower is built from selftests/bpf, due to current -I$(BPF_INCLUDE) -I$(OUTPUT) ordering, it might pick up not-yet-complete vmlinux.h, generated by selftests Makefile, which could lead to compilation errors like [0]. So ensure that -I$(OUTPUT) goes first and rely on runqslower's Makefile own dependency chain to ensure vmlinux.h is properly completed before source code relying on it is compiled. [0] https://travis-ci.org/github/libbpf/libbpf/jobs/677905925 Signed-off-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20200422012407.176303-1-andriin@fb.com Signed-off-by: Sasha Levin --- tools/bpf/runqslower/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile index 39edd68afa8e0..8a6f82e56a249 100644 --- a/tools/bpf/runqslower/Makefile +++ b/tools/bpf/runqslower/Makefile @@ -8,7 +8,7 @@ BPFTOOL ?= $(DEFAULT_BPFTOOL) LIBBPF_SRC := $(abspath ../../lib/bpf) BPFOBJ := $(OUTPUT)/libbpf.a BPF_INCLUDE := $(OUTPUT) -INCLUDES := -I$(BPF_INCLUDE) -I$(OUTPUT) -I$(abspath ../../lib) +INCLUDES := -I$(OUTPUT) -I$(BPF_INCLUDE) -I$(abspath ../../lib) CFLAGS := -g -Wall # Try to detect best kernel BTF source -- 2.20.1