From patchwork Mon Nov 28 11:18:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 1709667 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ILbz2z7r; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NLNJV4sMmz23nT for ; Mon, 28 Nov 2022 22:18:50 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A86713CC657 for ; Mon, 28 Nov 2022 12:18:46 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 2636A3C288D for ; Mon, 28 Nov 2022 12:18:44 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 20773200075 for ; Mon, 28 Nov 2022 12:18:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669634321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NtN7Ebw9gCY2fUA5nR6xMoZSc8DPvcb/v5vWL3BIUeQ=; b=ILbz2z7r1LLrqCCSjW9ZfVIUH/+G8m6cYIzYGjDI5nnkieCz1OHhalHwYOCpUYM6o4n8Rz 3hmTYyGN6w2MBDt4z+utofXZg7lXromwNg2kqb4dcdQgGXMuGu3Oiha+GbvTxOpM4DNKe4 hs12szKRe5fsfnP/WvReVTNSkzWTKf4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-97-o0Jn0fPnOsO3OYps7j2Kfg-1; Mon, 28 Nov 2022 06:18:40 -0500 X-MC-Unique: o0Jn0fPnOsO3OYps7j2Kfg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CCF3F101A528; Mon, 28 Nov 2022 11:18:39 +0000 (UTC) Received: from t480s.redhat.com (unknown [10.39.192.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90EC6C15BA4; Mon, 28 Nov 2022 11:18:38 +0000 (UTC) From: David Hildenbrand To: ltp@lists.linux.it Date: Mon, 28 Nov 2022 12:18:31 +0100 Message-Id: <20221128111833.98937-2-david@redhat.com> In-Reply-To: <20221128111833.98937-1-david@redhat.com> References: <20221128111833.98937-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Virus-Scanned: clamav-milter 0.102.4 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v1 1/3] lapi/userfaultfd.h: Preparation for removing compile-time TCONF handling from userfaultfd testcases X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Let's provide a minimal include/lapi/userfaultfd.h that contains the initial userfaultfd uabi from v4.1, plus selected additions from other releases relevant for the two testcases we have for now. We can extend this header later as required, for example, once testcases want to test userfaultfd-wp support. Note that some dead code (#ifdef 0) and unnecessary definitions that keep changing (UFFD_API_IOCTLS) were dropped from the v4.1 version. Suggested-by: Martin Doucha Signed-off-by: David Hildenbrand --- include/lapi/userfaultfd.h | 190 +++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 include/lapi/userfaultfd.h diff --git a/include/lapi/userfaultfd.h b/include/lapi/userfaultfd.h new file mode 100644 index 000000000..4d52b7c4b --- /dev/null +++ b/include/lapi/userfaultfd.h @@ -0,0 +1,190 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2007 Davide Libenzi + * Copyright (C) 2015,2022 Red Hat, Inc. + * + * Mostly copied/adapted from + */ + +#ifndef LAPI_USERFAULTFD_H__ +#define LAPI_USERFAULTFD_H__ + +#include +#include +#include "lapi/syscalls.h" + +#ifdef HAVE_LINUX_USERFAULTFD_H +#include +#endif + +/* userfaultfd support was added in v4.1 */ +#ifndef UFFD_API +#define UFFD_API ((__u64)0xAA) + +/* + * Valid ioctl command number range with this API is from 0x00 to + * 0x3F. UFFDIO_API is the fixed number, everything else can be + * changed by implementing a different UFFD_API. If sticking to the + * same UFFD_API more ioctl can be added and userland will be aware of + * which ioctl the running kernel implements through the ioctl command + * bitmask written by the UFFDIO_API. + */ +#define _UFFDIO_REGISTER (0x00) +#define _UFFDIO_UNREGISTER (0x01) +#define _UFFDIO_WAKE (0x02) +#define _UFFDIO_COPY (0x03) +#define _UFFDIO_ZEROPAGE (0x04) +#define _UFFDIO_API (0x3F) + +/* userfaultfd ioctl ids */ +#define UFFDIO 0xAA +#define UFFDIO_API _IOWR(UFFDIO, _UFFDIO_API, \ + struct uffdio_api) +#define UFFDIO_REGISTER _IOWR(UFFDIO, _UFFDIO_REGISTER, \ + struct uffdio_register) +#define UFFDIO_UNREGISTER _IOR(UFFDIO, _UFFDIO_UNREGISTER, \ + struct uffdio_range) +#define UFFDIO_WAKE _IOR(UFFDIO, _UFFDIO_WAKE, \ + struct uffdio_range) +#define UFFDIO_COPY _IOWR(UFFDIO, _UFFDIO_COPY, \ + struct uffdio_copy) +#define UFFDIO_ZEROPAGE _IOWR(UFFDIO, _UFFDIO_ZEROPAGE, \ + struct uffdio_zeropage) + +/* read() structure */ +struct uffd_msg { + __u8 event; + + __u8 reserved1; + __u16 reserved2; + __u32 reserved3; + + union { + struct { + __u64 flags; + __u64 address; + } pagefault; + + struct { + /* unused reserved fields */ + __u64 reserved1; + __u64 reserved2; + __u64 reserved3; + } reserved; + } arg; +} __packed; + +/* + * Start at 0x12 and not at 0 to be more strict against bugs. + */ +#define UFFD_EVENT_PAGEFAULT 0x12 + +/* flags for UFFD_EVENT_PAGEFAULT */ +#define UFFD_PAGEFAULT_FLAG_WRITE (1<<0) /* If this was a write fault */ +#define UFFD_PAGEFAULT_FLAG_WP (1<<1) /* If reason is VM_UFFD_WP */ + +struct uffdio_api { + /* userland asks for an API number and the features to enable */ + __u64 api; + /* + * Kernel answers below with the all available features for + * the API, this notifies userland of which events and/or + * which flags for each event are enabled in the current + * kernel. + * + * Note: UFFD_EVENT_PAGEFAULT and UFFD_PAGEFAULT_FLAG_WRITE + * are to be considered implicitly always enabled in all kernels as + * long as the uffdio_api.api requested matches UFFD_API. + */ + __u64 features; + + __u64 ioctls; +}; + +struct uffdio_range { + __u64 start; + __u64 len; +}; + +struct uffdio_register { + struct uffdio_range range; +#define UFFDIO_REGISTER_MODE_MISSING ((__u64)1<<0) +#define UFFDIO_REGISTER_MODE_WP ((__u64)1<<1) + __u64 mode; + + /* + * kernel answers which ioctl commands are available for the + * range, keep at the end as the last 8 bytes aren't read. + */ + __u64 ioctls; +}; + +struct uffdio_copy { + __u64 dst; + __u64 src; + __u64 len; + /* + * There will be a wrprotection flag later that allows to map + * pages wrprotected on the fly. And such a flag will be + * available if the wrprotection ioctl are implemented for the + * range according to the uffdio_register.ioctls. + */ +#define UFFDIO_COPY_MODE_DONTWAKE ((__u64)1<<0) + __u64 mode; + + /* + * "copy" is written by the ioctl and must be at the end: the + * copy_from_user will not read the last 8 bytes. + */ + __s64 copy; +}; + +struct uffdio_zeropage { + struct uffdio_range range; +#define UFFDIO_ZEROPAGE_MODE_DONTWAKE ((__u64)1<<0) + __u64 mode; + + /* + * "zeropage" is written by the ioctl and must be at the end: + * the copy_from_user will not read the last 8 bytes. + */ + __s64 zeropage; +}; +#endif /* UFFD_API */ + + +/* UFFD_USER_MODE_ONLY was added in v5.11 */ +#ifndef UFFD_USER_MODE_ONLY +#define UFFD_USER_MODE_ONLY 1 +#endif /* UFFD_USER_MODE_ONLY */ + + +/* UFFD_PAGEFAULT_FLAG_MINOR and UFFDIO_CONTINUE were added in v5.13 */ +#ifndef UFFD_PAGEFAULT_FLAG_MINOR +#define UFFD_FEATURE_MINOR_HUGETLBFS (1<<9) +#define UFFDIO_REGISTER_MODE_MINOR ((__u64)1<<2) + +#define _UFFDIO_CONTINUE (0x07) +#define UFFDIO_CONTINUE _IOWR(UFFDIO, _UFFDIO_CONTINUE, \ + struct uffdio_continue) + +struct uffdio_continue { + struct uffdio_range range; +#define UFFDIO_CONTINUE_MODE_DONTWAKE ((__u64)1<<0) + __u64 mode; + + /* + * Fields below here are written by the ioctl and must be at the end: + * the copy_from_user will not read past here. + */ + __s64 mapped; +}; +#endif /* UFFD_PAGEFAULT_FLAG_MINOR */ + + +/* UFFD_FEATURE_MINOR_SHMEM was added in v5.14 */ +#ifndef UFFD_FEATURE_MINOR_SHMEM +#define UFFD_FEATURE_MINOR_SHMEM (1<<10) +#endif /* UFFD_FEATURE_MINOR_SHMEM */ + +#endif /* LAPI_USERFAULTFD_H__ */ From patchwork Mon Nov 28 11:18:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 1709669 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=G9TpKNKm; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NLNJs100Vz23nT for ; Mon, 28 Nov 2022 22:19:09 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 21E243CC659 for ; Mon, 28 Nov 2022 12:19:07 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id BFEF83CC66B for ; Mon, 28 Nov 2022 12:18:47 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id A7AED14001EB for ; Mon, 28 Nov 2022 12:18:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669634325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4ZK9aDW5xPVA35fVgnvuUX9snELpNn+P7w27uwudXcs=; b=G9TpKNKmYGBuumlX7En3b0fjio1nYwoyHSbMe3CLMYPq4J37rPxcd2yMsqFAiJUA8yuBFo q+Q5raXUKvtcwhwA7m5TW6+wWnAyWypLSvEMDWIKZczm3OKMyUhiwYlJiWmS7tWYCOOnxv tphv4QyrVtJjxM+NeV3E5geAP7AjvGc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-164-IoLJT-8RN3mhS_4dFiXTEQ-1; Mon, 28 Nov 2022 06:18:41 -0500 X-MC-Unique: IoLJT-8RN3mhS_4dFiXTEQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7FB94801585; Mon, 28 Nov 2022 11:18:41 +0000 (UTC) Received: from t480s.redhat.com (unknown [10.39.192.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BFC4C15BA4; Mon, 28 Nov 2022 11:18:40 +0000 (UTC) From: David Hildenbrand To: ltp@lists.linux.it Date: Mon, 28 Nov 2022 12:18:32 +0100 Message-Id: <20221128111833.98937-3-david@redhat.com> In-Reply-To: <20221128111833.98937-1-david@redhat.com> References: <20221128111833.98937-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Virus-Scanned: clamav-milter 0.102.4 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH v1 2/3] security/dirtyc0w_shmem: Fix compile-time absence of UFFD_FEATURE_MINOR_SHMEM X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Without UFFD_FEATURE_MINOR_SHMEM, we'd currently let the parent run into a timeout because we don't make the checkpoint happy, failing the testcase instead of skipping it as TCONF. Let's make compilation always work by including include/lapi/userfaultfd.h. Reported-by: Martin Doucha Fixes: a46f8956f ("security/dirtyc0w_shmem: Add new test for CVE-2022-2590") Signed-off-by: David Hildenbrand --- .../security/dirtyc0w_shmem/dirtyc0w_shmem_child.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/testcases/kernel/security/dirtyc0w_shmem/dirtyc0w_shmem_child.c b/testcases/kernel/security/dirtyc0w_shmem/dirtyc0w_shmem_child.c index 61799a504..9c2b03994 100644 --- a/testcases/kernel/security/dirtyc0w_shmem/dirtyc0w_shmem_child.c +++ b/testcases/kernel/security/dirtyc0w_shmem/dirtyc0w_shmem_child.c @@ -20,17 +20,11 @@ #include #include -#ifdef HAVE_LINUX_USERFAULTFD_H -#include -#endif - -#ifdef UFFD_FEATURE_MINOR_SHMEM - #define TST_NO_DEFAULT_MAIN #include "tst_test.h" #include "tst_safe_macros.h" #include "tst_safe_pthread.h" -#include "lapi/syscalls.h" +#include "lapi/userfaultfd.h" #define TMP_DIR "tmp_dirtyc0w_shmem" #define TEST_FILE TMP_DIR"/testfile" @@ -238,7 +232,3 @@ int main(void) return 0; } -#else /* UFFD_FEATURE_MINOR_SHMEM */ -#include "tst_test.h" -TST_TEST_TCONF("System does not have userfaultfd minor fault support for shmem"); -#endif /* UFFD_FEATURE_MINOR_SHMEM */ From patchwork Mon Nov 28 11:18:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 1709671 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=aevgQN4E; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NLNK25q8kz23nT for ; Mon, 28 Nov 2022 22:19:18 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id BAFA13CC64D for ; Mon, 28 Nov 2022 12:19:16 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [IPv6:2001:4b78:1:20::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id A81A23CC679 for ; Mon, 28 Nov 2022 12:18:51 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id 215781A000B1 for ; Mon, 28 Nov 2022 12:18:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669634328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pr5HIMR0w6QdoiesNOI2D9bXykl6OmQdFpvycEZjmoA=; b=aevgQN4EsmS9ohVgiQtDncJGTgCUYBlYoHsBYZEk4unCYRaryuR0XAYMm3xHMr3QfMT0sA sSysg3Y/+Mi8Btmf+MsrKYSiCZ8mhRu5iepxRksraSF7SbihYfWy+Vx+V1IRjTm4ZvoFa3 brtBB8xoH5XSsMcRMMV7l7uFCobPoe8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-219-40PWllMFOj-TYVP2CHoCIw-1; Mon, 28 Nov 2022 06:18:43 -0500 X-MC-Unique: 40PWllMFOj-TYVP2CHoCIw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED7D31C0514A; Mon, 28 Nov 2022 11:18:42 +0000 (UTC) Received: from t480s.redhat.com (unknown [10.39.192.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC553C15BA4; Mon, 28 Nov 2022 11:18:41 +0000 (UTC) From: David Hildenbrand To: ltp@lists.linux.it Date: Mon, 28 Nov 2022 12:18:33 +0100 Message-Id: <20221128111833.98937-4-david@redhat.com> In-Reply-To: <20221128111833.98937-1-david@redhat.com> References: <20221128111833.98937-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Virus-Scanned: clamav-milter 0.102.4 at in-3.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-3.smtp.seeweb.it Subject: [LTP] [PATCH v1 3/3] syscalls/userfaultfd01: Remove compile-time TCONF handling X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Let's remove the conditional compile-time TCONF handling by including include/lapi/userfaultfd.h . Signed-off-by: David Hildenbrand --- testcases/kernel/syscalls/userfaultfd/userfaultfd01.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c index 2dae2ec78..c2c684d2b 100644 --- a/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c @@ -12,13 +12,11 @@ #include "config.h" #include "tst_test.h" -#ifdef HAVE_LINUX_USERFAULTFD_H -#include #include #include "tst_safe_macros.h" #include "tst_safe_pthread.h" -#include "lapi/syscalls.h" +#include "lapi/userfaultfd.h" static int page_size; static char *page; @@ -122,7 +120,3 @@ static struct tst_test test = { .test_all = run, .min_kver = "4.3", }; - -#else - TST_TEST_TCONF("This system does not provide userfaultfd support"); -#endif