Message ID | 20230127135755.79929-32-mathieu.desnoyers@efficios.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp847597wrn; Fri, 27 Jan 2023 06:01:41 -0800 (PST) X-Google-Smtp-Source: AK7set9l/o+wItxe12dwZZXcsDzxmdD+1sy39k2PTFRXm1+X5lkfip6bNUHK+HrrE12w2Tq/4xkP X-Received: by 2002:aa7:c391:0:b0:4a0:b658:e583 with SMTP id k17-20020aa7c391000000b004a0b658e583mr8415390edq.15.1674828100974; Fri, 27 Jan 2023 06:01:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674828100; cv=none; d=google.com; s=arc-20160816; b=mxDBCJSAYdMDz+RuQ4fxyOSiM6UmoRoX2A2bhlNpcjbmG3s2bQwPnSIU+5BsN08S+f rA0v7zbLm3NdS5dOYoX8QlQw2jhjbouhKhnFpbhAeT/SuzITFqyZwnYIdh/0fyto7h1k bpzcVRO0A1rMpMBndhE1yesjJiCDDX4oQc5ledPNh+rXJcp+hAUO5qD4JUv94HW3J1tX CCFggcUvLX2w/Uo/bHybbbrjNYUxR4GZ8eL6yMNxnWlSWW3dYFsr0RBV4MehkRYdqbQD dVTXhujjoB2keHGb2J+DMqC/e2EzJh7M46f+IQFbGfYxHcgzI1lH6PHNNBkyspYh6ffz ag1A== 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=uSkIkSI7+qw0/f1WiDKk4foCgk0z+085yEe1gvtvWTc=; b=PncOngV69mjyKqhlEA3QX2tZSL6+IUSb5Jh7Z4/gUU4SZECQ72hfNc/2Vx1yWe3Ww3 Yz0f32pzhfexY50GkkehnGzoC7nBIO6eYJWK/la37w4i8AiVEX8fSXIichMHhZW5Gvtu 4RE3yKf3vZucF+YP8svUjfYicF7pVzVZjbAJkeht39SjV3xRwhFI2mHR4g8/CJyfNXDd PC523+37My+FGDMeS8ME+xvQOfzYp2KgB95Dpvgb7eveVHYeQ58i/Z/4cxYQG2owoA4Z j5kDb8VDhXGqG7SaSdJJ+7c1GfdUFEf5zoWlRFd8Xc/jpt9qQd8dUXJGBTmCD0ZEETRq pzNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=nADncNqO; 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 i8-20020a50fc08000000b004a08f43bb56si5247366edr.527.2023.01.27.06.01.07; Fri, 27 Jan 2023 06:01:40 -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=nADncNqO; 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 S233958AbjA0N7d (ORCPT <rfc822;lekhanya01809@gmail.com> + 99 others); Fri, 27 Jan 2023 08:59:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233874AbjA0N61 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 27 Jan 2023 08:58:27 -0500 Received: from smtpout.efficios.com (unknown [IPv6:2607:5300:203:b2ee::31e5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C971622DEA; Fri, 27 Jan 2023 05:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1674827887; bh=A2b8o6oty9GzpUi8zjhclZWoYQFpT6qjrpjYSARikkE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nADncNqO72Pn1/py5FqzMU1ONtDv0Gri7IE2mo+VJzkkPO2S8tRlNSeSyf2qu4mjF px+5NyL8XWOeGearzT52XYVz1dIqjcvn2qyJQWoHeCXMeETDJQUuKlnmLOmNCPVr8q TuUUJinRk1T8jYIW2J5q9IIXhN+3sH+OCrrapr4oHHB6Wy5lGdPOHn2cBuDDBe4nrI nnSG1+GwoJyChQKoo2NW366BUhawaizfNr46+U4iD937YdfKX3vjFmi/4K7b7PUMn3 57e+g7rEaxjUo3uCYH6psRVc3b5Ud+SWmj95bxNOEn0JFCY8Q+LOKLj3xdV4mgcX4h mdw6q/tR0j1Aw== Received: from localhost.localdomain (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4P3K0b4lCwzhd1; Fri, 27 Jan 2023 08:58:07 -0500 (EST) From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> To: Shuah Khan <shuah@kernel.org>, linux-kselftest@vger.kernel.org, Ingo Molnar <mingo@redhat.com> Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Subject: [PATCH 31/34] selftests: iommu: Use installed kernel headers search path Date: Fri, 27 Jan 2023 08:57:52 -0500 Message-Id: <20230127135755.79929-32-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127135755.79929-1-mathieu.desnoyers@efficios.com> References: <20230127135755.79929-1-mathieu.desnoyers@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756184550737927260?= X-GMAIL-MSGID: =?utf-8?q?1756184550737927260?= |
Series |
selftests: Fix incorrect kernel headers search path
|
|
Commit Message
Mathieu Desnoyers
Jan. 27, 2023, 1:57 p.m. UTC
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.
Remove bogus ../../../../include/ from the search path, because
kernel source headers are not needed by those user-space selftests, and
it causes issues because -I paths are searched before -isystem paths,
and conflicts for files appearing both in kernel sources and in uapi
headers with incompatible semantics (e.g. types.h).
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: linux-kselftest@vger.kernel.org
Cc: Ingo Molnar <mingo@redhat.com>
---
tools/testing/selftests/iommu/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Comments
On 1/27/23 06:57, Mathieu Desnoyers wrote: > 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. > > Remove bogus ../../../../include/ from the search path, because > kernel source headers are not needed by those user-space selftests, and > it causes issues because -I paths are searched before -isystem paths, > and conflicts for files appearing both in kernel sources and in uapi > headers with incompatible semantics (e.g. types.h). > > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> > Cc: Shuah Khan <shuah@kernel.org> > Cc: linux-kselftest@vger.kernel.org > Cc: Ingo Molnar <mingo@redhat.com> > --- > tools/testing/selftests/iommu/Makefile | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/iommu/Makefile b/tools/testing/selftests/iommu/Makefile > index 7cb74d26f141..32c5fdfd0eef 100644 > --- a/tools/testing/selftests/iommu/Makefile > +++ b/tools/testing/selftests/iommu/Makefile > @@ -1,7 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0-only > CFLAGS += -Wall -O2 -Wno-unused-function > -CFLAGS += -I../../../../include/uapi/ > -CFLAGS += -I../../../../include/ > +CFLAGS += $(KHDR_INCLUDES) > > CFLAGS += -D_GNU_SOURCE > Adding iommu test maintainers: I plan to take this through kselftest unless there are conflicts. In case there are conflicts and you want to take this through yours Acked-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
On Mon, Jan 30, 2023 at 10:01:23AM -0700, Shuah Khan wrote: > On 1/27/23 06:57, Mathieu Desnoyers wrote: > > 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. > > > > Remove bogus ../../../../include/ from the search path, because > > kernel source headers are not needed by those user-space selftests, and > > it causes issues because -I paths are searched before -isystem paths, > > and conflicts for files appearing both in kernel sources and in uapi > > headers with incompatible semantics (e.g. types.h). > > > > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> > > Cc: Shuah Khan <shuah@kernel.org> > > Cc: linux-kselftest@vger.kernel.org > > Cc: Ingo Molnar <mingo@redhat.com> > > --- > > tools/testing/selftests/iommu/Makefile | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/tools/testing/selftests/iommu/Makefile b/tools/testing/selftests/iommu/Makefile > > index 7cb74d26f141..32c5fdfd0eef 100644 > > --- a/tools/testing/selftests/iommu/Makefile > > +++ b/tools/testing/selftests/iommu/Makefile > > @@ -1,7 +1,6 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > CFLAGS += -Wall -O2 -Wno-unused-function > > -CFLAGS += -I../../../../include/uapi/ > > -CFLAGS += -I../../../../include/ > > +CFLAGS += $(KHDR_INCLUDES) > > CFLAGS += -D_GNU_SOURCE > > Adding iommu test maintainers: > > I plan to take this through kselftest unless there are conflicts. > In case there are conflicts and you want to take this through yours > > Acked-by: Shuah Khan <skhan@linuxfoundation.org> Go ahead please Jason
diff --git a/tools/testing/selftests/iommu/Makefile b/tools/testing/selftests/iommu/Makefile index 7cb74d26f141..32c5fdfd0eef 100644 --- a/tools/testing/selftests/iommu/Makefile +++ b/tools/testing/selftests/iommu/Makefile @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only CFLAGS += -Wall -O2 -Wno-unused-function -CFLAGS += -I../../../../include/uapi/ -CFLAGS += -I../../../../include/ +CFLAGS += $(KHDR_INCLUDES) CFLAGS += -D_GNU_SOURCE