From patchwork Mon Jan 30 18:35:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Desnoyers X-Patchwork-Id: 50423 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2339675wrn; Mon, 30 Jan 2023 10:48:33 -0800 (PST) X-Google-Smtp-Source: AK7set913ceY8rXZhrhSjZorjzsy8Nc7nnHoun5VbGLmQGrrRna9TljtzQewqLliNotdw68uypO+ X-Received: by 2002:a17:906:8444:b0:879:ab3:2864 with SMTP id e4-20020a170906844400b008790ab32864mr11835730ejy.24.1675104513472; Mon, 30 Jan 2023 10:48:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675104513; cv=none; d=google.com; s=arc-20160816; b=aAqP5ZvOvak2TJXtS4JXrVzEfmn46CeKa+YNcY3dgnwEFj4rMTKaergSIr2whoqukS BS6ZF2Sk7T+3zEMdNKLi+LenuEuusI9bbOjY68CV9WAe6DywZij2KKhRI8y4fnA8aqFG Rl1J4E3Xt0Hu7+Z6qgNTJ0TWxxdoJZ3Ae5Q2QgmnCOm2ApQ8Tt7x9kwqDXi0iVoRcvZo U6w/3fzditmXnjjZ0ku3xDF8suvDBJRcazNGSMavXLzJCplvBRfk4SWCUpDxPL8rvJHA t7B0CZvKsgxiJwrqDye4fAaA/3Vc6D/mYeGgUxEgO83t6Ivuu1x/+JCqiY+r42BteX1q itlw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Jd8BXtd0ZhXaaw6+RrTJSnhbdzlvW/uHPpxfL7wg5N4=; b=d8GR3ck+rB16I7uSTAR2CmKRkV/vKCB5uUv0o3CuKmy7FpfB769ijsGWeQfccFYPvQ 1dNl3xX1r3ofVhSOkF1gqON3LAuEHvLuXNSg542C+Eg5IpBTRN0REOzyvoMOk5c7/B2Y mUn5+huR3ibHN2XC885T1RV1vc8WzdzFZC2nhJsJMg+TwYDnBWGeatx5ZMq+GQsocVBM xacBEqGILCZQ39Zh+1RENfanrhG+Cl+ZyDJ3setMNbLM1a+HUPJ5rzilgUCsf1Z/Cn22 nf0EVeUN1uVfUtj62b1m9+MiB3gbXmwZj0JPyJ27+SmMk8/FO4iTU4toTtEnRo/8HiDU LVig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=NgUHyCRB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=efficios.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y2-20020a170906518200b008775fc0de22si16569530ejk.246.2023.01.30.10.48.10; Mon, 30 Jan 2023 10:48:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=NgUHyCRB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=efficios.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238102AbjA3SgJ (ORCPT + 99 others); Mon, 30 Jan 2023 13:36:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237895AbjA3SgI (ORCPT ); Mon, 30 Jan 2023 13:36:08 -0500 Received: from smtpout.efficios.com (unknown [IPv6:2607:5300:203:b2ee::31e5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A0CE26AD; Mon, 30 Jan 2023 10:35:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1675103755; bh=AYGBgN50Jr1DUDnzCE+Pzynb8j9uxfAHOfkP82pWKaU=; h=From:To:Cc:Subject:Date:From; b=NgUHyCRBAip4aOgELlG0MTM/tlyiZ0/5JnsMFENUMRIaoj7CahT30UZ4Fne4We8lK iFcxEqINtnPr9hTS3Q7Ctu3WOTEdYwhyULhXSEKoiXjZ2kXrZf5AhHa+E5NEqJzrX7 X1ogrYuSABJt/4dPrtleVeNSuWQ5ZPkR2bQXnk8JHjmkUB4NXTiCSIR6fs+le0Hkl1 XgqWCwi+uWMLjx3BehePK63VNjwgXqFDywMK1bWHxeCiIhwqumXuXH3jv9ndpFwE70 mC4fnML9NV+ydck5aVL3LqXK1MV9g9OjwMGyCppV4OHHVDszwDtzIVqRwCtMrTRU9c 9RD27jZG1QrPQ== Received: from localhost.localdomain (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4P5H1k6F44zhmX; Mon, 30 Jan 2023 13:35:54 -0500 (EST) From: Mathieu Desnoyers To: Alexei Starovoitov Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers , Shuah Khan , bpf@vger.kernel.org, Shuah Khan , linux-kselftest@vger.kernel.org, Ingo Molnar , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , stable@vger.kernel.org Subject: [PATCH bpf-next 1/2] selftests: bpf: Fix incorrect kernel headers search path Date: Mon, 30 Jan 2023 13:35:48 -0500 Message-Id: <20230130183549.85471-1-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756474390383459955?= X-GMAIL-MSGID: =?utf-8?q?1756474390383459955?= Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents building against kernel headers from the build environment in scenarios where kernel headers are installed into a specific output directory (O=...). Signed-off-by: Mathieu Desnoyers Acked-by: Shuah Khan Cc: Cc: Shuah Khan Cc: linux-kselftest@vger.kernel.org Cc: Ingo Molnar Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Andrii Nakryiko Cc: Martin KaFai Lau Cc: Song Liu Cc: Yonghong Song Cc: John Fastabend Cc: KP Singh Cc: Stanislav Fomichev Cc: Hao Luo Cc: Jiri Olsa Cc: Mykola Lysenko Cc: [5.18+] --- tools/testing/selftests/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index c22c43bbee19..6998c816afef 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -327,7 +327,7 @@ endif CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH)) BPF_CFLAGS = -g -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) \ -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR) \ - -I$(abspath $(OUTPUT)/../usr/include) + $(KHDR_INCLUDES) CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \ -Wno-compare-distinct-pointer-types From patchwork Mon Jan 30 18:35:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Desnoyers X-Patchwork-Id: 50424 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2341440wrn; Mon, 30 Jan 2023 10:53:47 -0800 (PST) X-Google-Smtp-Source: AK7set96dWBQt9oB95vauuKWdjyeuJVQl7eYrsUolproKXrTQ79AonGIz5RxHDC7Dx+9j1sj+4p6 X-Received: by 2002:a17:907:c282:b0:878:509f:798d with SMTP id tk2-20020a170907c28200b00878509f798dmr22253223ejc.0.1675104827194; Mon, 30 Jan 2023 10:53:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675104827; cv=none; d=google.com; s=arc-20160816; b=aIjsrIrd9SND0MYB79RA0OWlpobomOuQx1HR9zm7DawhsEqxG8+sPZLvrWQAERbmBd 76GRkQG21FMyUQECA16YHdSNxagZSuta6QIK8T0kWpggZCd50pFUJkM4PJJBNo+dF5jB YZG+/cOHjSqBgv2qJ7l1jEDt3r5OVT1/F0TFGbtO+FJO9WPwrZOpApGy3VuGDNxmMmMN +EmTlM207rDZZHYLvqi/SY6H7bXn1T3DXtUUcpP+cVT6UZ8EBCyv9RGtpiRQi6L1XBXS IEYCyjAW0q24UU2wTHYUIuZ1VVM70J+B2eAydLz2cc0AfIM+czVPZ6qTaMo4t154aTWf tY+w== 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=vK627BKul+6kItuIbRbozeYfo4cN4dwHse+0hW1VEjs=; b=pov95k9TmvrBGu6XYhfD39b3+t9rDMYp2tWqsKka0bDe9Gi5xNqZzUCKsGEyK5geKh fUBMu+5Es2Uvo+cSu39Y+ql4Exs7NzoVSP+yTsb0B7lZahimfIF1QtF7Qd/ytWLI6Avc UVfc+HqkaRoVrgsB95koLdPNRGzFSFKaMVfQWaSW5eiC/2LzMT3IDabNKIfpLoK8htQx 2kdrCuCL7bVt5KulGMkQM9p50CBuEy/+4gQBGYorhieL7oLFk9XNmQxV71xDvT74io0U M7oLGPVqYbz/o1feQUMmY61vlprk9UNhv5ysIaiKbchT4n0BtGzun+o95lBmUMIGSrnM E4UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=X2eDQDq1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=efficios.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 15-20020a170906024f00b00864aa239277si17331539ejl.896.2023.01.30.10.53.23; Mon, 30 Jan 2023 10:53:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=X2eDQDq1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=efficios.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236501AbjA3SgO (ORCPT + 99 others); Mon, 30 Jan 2023 13:36:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238010AbjA3SgI (ORCPT ); Mon, 30 Jan 2023 13:36:08 -0500 Received: from smtpout.efficios.com (smtpout.efficios.com [167.114.26.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A60A34C33; Mon, 30 Jan 2023 10:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1675103755; bh=MvodwzQDiD9u4tU1mzZzSTt7WoVE7au7QH14YGe8X4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X2eDQDq1Br5CuoXxwGvcKHghIEOZa5ltoXKyrlJYa+ijydZX0c3MdwiMxAAuRau3A 0Ehm/wz8wFuiLL4EjcbgMT1P9Dp0IS3tLnnJjv8Thrm2LObJ6c4PoVOZ3PK4UVD06d wvjV3lhfsQoE945Rvi06IkBM3kVpdyDIJ9natyRFLj9YxONZJl/zJ2iUfkoPm9PcXQ QBbvzhbJyullgCGI7PrDLifV+XjvV3pQzJiVIbry4dShhTSwMzJMv505Q/CikIyodd 46kJWz3qHi+fr/bt8ZvrS/2XwU3Tk+TkRzANBYy0zGLnn8w7uaCugmGwL+5qWVLOgT bra/PP4VDYkLg== Received: from localhost.localdomain (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4P5H1l264mzhmY; Mon, 30 Jan 2023 13:35:55 -0500 (EST) From: Mathieu Desnoyers To: Alexei Starovoitov Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers , Shuah Khan , bpf@vger.kernel.org, Shuah Khan , linux-kselftest@vger.kernel.org, Ingo Molnar , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko Subject: [PATCH bpf-next 2/2] selftests: bpf docs: Use installed kernel headers search path Date: Mon, 30 Jan 2023 13:35:49 -0500 Message-Id: <20230130183549.85471-2-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230130183549.85471-1-mathieu.desnoyers@efficios.com> References: <20230130183549.85471-1-mathieu.desnoyers@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756474719326094251?= X-GMAIL-MSGID: =?utf-8?q?1756474719326094251?= Use $(KHDR_INCLUDES) as lookup path for installed kernel headers rather than using kernel headers in include/uapi from the source kernel tree kernel headers. Signed-off-by: Mathieu Desnoyers Acked-by: Shuah Khan Cc: Cc: Shuah Khan Cc: linux-kselftest@vger.kernel.org Cc: Ingo Molnar Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Andrii Nakryiko Cc: Martin KaFai Lau Cc: Song Liu Cc: Yonghong Song Cc: John Fastabend Cc: KP Singh Cc: Stanislav Fomichev Cc: Hao Luo Cc: Jiri Olsa Cc: Mykola Lysenko --- tools/testing/selftests/bpf/Makefile.docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/Makefile.docs b/tools/testing/selftests/bpf/Makefile.docs index eb6a4fea8c79..0a538d873def 100644 --- a/tools/testing/selftests/bpf/Makefile.docs +++ b/tools/testing/selftests/bpf/Makefile.docs @@ -44,7 +44,7 @@ RST2MAN_DEP := $(shell command -v rst2man 2>/dev/null) # $1 - target for scripts/bpf_doc.py # $2 - man page section to generate the troff file define DOCS_RULES = -$(OUTPUT)bpf-$1.rst: ../../../../include/uapi/linux/bpf.h +$(OUTPUT)bpf-$1.rst: $(KHDR_INCLUDES)/linux/bpf.h $$(QUIET_GEN)../../../../scripts/bpf_doc.py $1 \ --filename $$< > $$@