From patchwork Fri Jan 27 13:57:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Desnoyers X-Patchwork-Id: 49428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp848655wrn; Fri, 27 Jan 2023 06:03:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXsfdEL43VUcAdTYhQLihA0OtJFBquFb7lO8cdBUoNOAMrMAFXi0E4oKnQvJNhYP/v5xVdFC X-Received: by 2002:a17:907:8b08:b0:838:9b81:1c98 with SMTP id sz8-20020a1709078b0800b008389b811c98mr46408238ejc.1.1674828186988; Fri, 27 Jan 2023 06:03:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674828186; cv=none; d=google.com; s=arc-20160816; b=gIGV2GEJy4XJtFQFNIaCaxbiyJibGWg2u7BYcTIK+gP5RABnkc55KmDiqzKnc+KhG3 fUImybbzkC2dHgR9B54vFAn1p7A9VwSzfmd1OJoUYo5+ZO7mgDshzLuUxNPXZ2Q/dpza QHChyu0sPdjofHZWghmE9nAASw41PH1WRmMRBa5haYby8Th6FrVGTy8SxEqfXV2sG8rv GzgvjdrE0Ew9C3pk3LPk0rd0VtjkynZp+ejfYaf13H5nR5EjWzaWINVYFt0dmWLwvTsO TWPxoXIcdruBqXBxDBbp/lLXWftcAW38+SMUdlgYOPdBeyQ3m+iTqvECilWvTusU5SqS 71bw== 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=LRVocivoJACqPcwVp5OZGha5MOnCFRkB+YmV2N3CXPw=; b=fGkNKG/8IBg7RbvS4tRi1Rs/J30xChxen8ikEAa/1LbEKDWCSW4C+PP7EauZ+taxXT y79Avqnf91idSM9a0E3ilQzH7byyQ9zmBIMjV4bnNtb3uSdP1iCs7Hl7NpswcFlbB6wU 9i5OdfoU0sqpgqWCQF/g/VTWkYTytj5rmDCEhQDgOyaZg+Q18btxyzqcts4ZSVA7mjXu HzgB0NDPCdL2SuMEKgun8x2qtVwRSX7YhhpQQQxmqURlV/bkVGDsVdzoIGAxinRmQuD+ rRfD5qj1pEPrPOYECfSaXdmyO/eJjhxHmcnlm8loNi5myXjk1GgktADaLGd33oGABt+n fGNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=l0DLJhDG; 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 d4-20020a17090692c400b0087bdb28557esi1443973ejx.736.2023.01.27.06.02.29; Fri, 27 Jan 2023 06:03:06 -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=l0DLJhDG; 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 S234898AbjA0N77 (ORCPT + 99 others); Fri, 27 Jan 2023 08:59:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233932AbjA0N62 (ORCPT ); Fri, 27 Jan 2023 08:58:28 -0500 Received: from smtpout.efficios.com (smtpout.efficios.com [167.114.26.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C954A22A3B; 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=hrehtAX3imUhugArusDqj/IhIz0SGwkElj5egzGruEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l0DLJhDGVpXa4+wan766F8yUwg+B3BGzYcLfXu6Mqi07WJVDi4uiGz6caLG9OGKk6 D8+4nU1CGAOUIEEbz3VmrOjJKUHVqXnlJi0TDA3YWqfPWvOWbtkYMbKxBkV6Vk0+FY Yf5c4phci9EENQXEqQXWDEK4PvjDHpxaoCpG/g65arCNeXSIbwyTL8H6NirI/ctoCe pjrUKFyOusxmUMLt2gy2ukJDn9fE3//u5R1Ic0UbOHLFR4hEIa/1SSMZeYcpg3HdCK 56kM0PCv5Tl4B6bPUz94f4yaaPUyW+q25gfiHtY9fQ+kieMq5eyPE2U2rsY+j8Q8t1 /5rc45MbZdKbQ== Received: from localhost.localdomain (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4P3K0b63kVzhd2; Fri, 27 Jan 2023 08:58:07 -0500 (EST) From: Mathieu Desnoyers To: Shuah Khan , linux-kselftest@vger.kernel.org, Ingo Molnar Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers Subject: [PATCH 32/34] selftests: memfd: Use installed kernel headers search path Date: Fri, 27 Jan 2023 08:57:53 -0500 Message-Id: <20230127135755.79929-33-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 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?1756184640953830350?= X-GMAIL-MSGID: =?utf-8?q?1756184640953830350?= 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 Cc: Shuah Khan Cc: linux-kselftest@vger.kernel.org Cc: Ingo Molnar --- tools/testing/selftests/memfd/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/testing/selftests/memfd/Makefile b/tools/testing/selftests/memfd/Makefile index 4da8b565fa32..163b6f68631c 100644 --- a/tools/testing/selftests/memfd/Makefile +++ b/tools/testing/selftests/memfd/Makefile @@ -1,8 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 CFLAGS += -D_FILE_OFFSET_BITS=64 -CFLAGS += -I../../../../include/uapi/ -CFLAGS += -I../../../../include/ -CFLAGS += -I../../../../usr/include/ +CFLAGS += $(KHDR_INCLUDES) TEST_GEN_PROGS := memfd_test TEST_PROGS := run_fuse_test.sh run_hugetlbfs_test.sh