From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6F96C76196 for ; Tue, 11 Apr 2023 11:10:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 464626B0072; Tue, 11 Apr 2023 07:10:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 414E66B0074; Tue, 11 Apr 2023 07:10:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B4D4900002; Tue, 11 Apr 2023 07:10:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 1B1456B0072 for ; Tue, 11 Apr 2023 07:10:04 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D1B941605DC for ; Tue, 11 Apr 2023 11:10:03 +0000 (UTC) X-FDA: 80668840686.16.C4E25B7 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf10.hostedemail.com (Postfix) with ESMTP id 8F597C000D for ; Tue, 11 Apr 2023 11:10:01 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=QnXDLpzx; spf=pass (imf10.hostedemail.com: domain of rppt@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681211401; a=rsa-sha256; cv=none; b=W4ByUQPlh90Rq1WWdreIDd+5VtY0tXMNBZGny7PkaGP+F2LeXUMT2trahsV5gcHlw7cdmd B53ndbfiMKGz5HpoHLFVQPEWzSJe8ckvK13ZuAvXRAPaNiG8yS2zVx6iJ3RGxasKbbCGE8 Pyzve/kppHb00b9lzIKE+Ro9KpBz15o= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=QnXDLpzx; spf=pass (imf10.hostedemail.com: domain of rppt@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681211401; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vBHDB7m++mbZMTOfrpP8ZAjfcwZw4HuNlspOvW0JJb4=; b=mWov+YMs9SkvJg16QvQCm80roT5hJz1PL/5hlbU35h/JMdmHVnfrrXabhQJjd4Mtp/eZdx DtU+xVFIjFslT+thAnUoTDy3Hs2LE90R/Oh9w/HNtbmUP5ZNfiNY3RalP1imOVw3RR1Pog O6IQNttS3iZJ8jhOQHB3oORoNp1YEvY= Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33B8pDWd001345; Tue, 11 Apr 2023 11:10:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=pp1; bh=vBHDB7m++mbZMTOfrpP8ZAjfcwZw4HuNlspOvW0JJb4=; b=QnXDLpzxQQGNsfBEOyRDCGF/3lmZR/oSq3CT6ZvD9f1WCsYgp054M8I+8HiF127F8cVG jOwFexEu9+ht3reri47NbTK2RDayqjIuueqpZGQCeX08fcyHBqYObcXIebv+Bg4ryRyw yC1cIK7IQewSvMwFQF99yuRD6k9tH9FX8KuHYI03w4WbjRNtQ7FOotpltGKnwgmuUU6F LOY431jvSKV3G888R/jwXWsLmE81/9Qn1kJbFHv1RxXZVtpRJPDCVS3tuKU4Ol1mJwBI ate0q07s0KCGVffSizG+8HBLjTZr7UJUWy6YLd2sHaS2jjvq4RnS5KMNnk+pP9pG6agm CA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3puj76wmf9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Apr 2023 11:10:00 +0000 Received: from m0098420.ppops.net (m0098420.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 33BAOD3A027909; Tue, 11 Apr 2023 11:10:00 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3puj76wmec-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Apr 2023 11:09:59 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 33B1OP2f007878; Tue, 11 Apr 2023 11:09:58 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma03fra.de.ibm.com (PPS) with ESMTPS id 3pu0mkhdjn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Apr 2023 11:09:57 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 33BB9tbf19399226 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Apr 2023 11:09:55 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 257472004B; Tue, 11 Apr 2023 11:09:55 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AB09B20063; Tue, 11 Apr 2023 11:09:53 +0000 (GMT) Received: from linux.ibm.com (unknown [9.179.16.229]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTPS; Tue, 11 Apr 2023 11:09:53 +0000 (GMT) Date: Tue, 11 Apr 2023 14:09:51 +0300 From: Mike Rapoport To: Peter Xu Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Mike Kravetz , Mike Rapoport , Andrea Arcangeli , Leonardo Bras Soares Passos , Andrew Morton , David Hildenbrand , Axel Rasmussen , Nadav Amit Subject: Re: [PATCH 21/29] selftests/mm: Add framework for uffd-unit-test Message-ID: References: <20230330155707.3106228-1-peterx@redhat.com> <20230330160818.3107545-1-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230330160818.3107545-1-peterx@redhat.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: kSFOURbIqGOe1ew2gag54SJCESCVnEWJ X-Proofpoint-ORIG-GUID: zX6om6PvPyaB-EZgHYAR4EH4wsMeRE2Y X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-11_06,2023-04-11_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 adultscore=0 spamscore=0 impostorscore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304110099 X-Rspam-User: X-Rspamd-Queue-Id: 8F597C000D X-Rspamd-Server: rspam01 X-Stat-Signature: thrfsxzfxorwgpaybbo4owe475czu6as X-HE-Tag: 1681211401-191448 X-HE-Meta: U2FsdGVkX19P47lbhTlGg6v5xqoPG+2GefRMW6Zqe9sTlr+q3B0Hbe4q/EfmvGsjWvO3sFisdC7TK2CvfsoQMbLzyDnuOZC8KGv6OaYRgLctlRIrThmV1u34z2PfeVQSKZEl5qn69pWIr3yfbgE16A5oxrIOqGo7F5xKYH3j6XNPVKiv85wJ3XDH4tylu+aa6vYtlCcUU8VmG3ZK6GuvMrUsuntVo6HX2GYG76D4oVLCai41x2rxvturNgkNCJ/j+Zf2kfZTwJkh/jc3097YFbOhQ9DTP/luRcm8Smox7qvx1PWazCIBWCCkuhdGyEGITtz1gD73WZhFRxYKz6eJo5Mp1wiNqZNx/D9riMZvK0hx4BEp1kLljxgVlAW0pqKE8cr8CM0enYro4+iKM3c/U+iDY8/3sfp82aVaXoprLYbHX0NGAu+xS+CWriIayUYCk0OUKC9pqm3EAguHBtK5p2HoQ9A8D65D6PIJGz+KnRRY71OjLCSeQvPHpi+PCaMotxu4ElI3brXmhAB/6rqfcau7uj4AjkMCS90NCMMufc5o1NlwxG4hM2Qtz8jfeYsdXI4sUU2mHHMB1YiUiKn9CGrZYYs+U0bIZRtsrKtkeqKpoqrn0L1Y9ghcS50alhb7bqSjil6VeAF3A3HsthuZTk1TMdaGiKv70fw/aBDr/MA7givZHqSlOcKvUoCFF7xRfXDMpZr6WUQAaahacVzeCIjYHACv3Ly2Fl9RI1um08qQSMqIQ26aPEMpsThlNLyCrb7SzoHBilrVU0HtsvC1HsPcKd/nVZF3TPZWIswv/22Pt22KEiUK8V/sJvpnTXeEarDzXpZCAQBufDeDseXTRJALjUhyEOSfTMtlpFXby2ns/qByxBLv8UfnM1yGVsGzDML8VmPFAKuAqGxmc455aNsx7KG7t51mMlXZWc0OGNpFTdXODaTME8H7VnJd7WYPalgjJbTgtzV/ZouPGRY YJ5+wGB7 L1oNl01WlCpncCSFTIEhwkDnV8P/3SGhjUR0WSA9kmhq0p/JooPGNuY9HkLhterEoSt7c8YYHZpE1hS16qCb42ibdo2Qf1N/JqP3yQwE6eMcPhY0U9qasNPeQnYLYpqhCTUvnptm7wpwn+BAkigN8DkxUXgL1/wD7Zkj6/wS1GNaDiG6At8FTPzdPhtO58Te6nco8I4eOuqg7k+zb3FruFUqiQSY81uvf8qeF9FgtymdPknnx+iwQ+3REUw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Mar 30, 2023 at 12:08:18PM -0400, Peter Xu wrote: > Add a framework to be prepared to move unit tests from uffd-stress.c into > uffd-unit-tests.c. The goal is to allow detection of uffd features for > each test, and also loop over specified types of memory that a test support. > > Signed-off-by: Peter Xu > --- > tools/testing/selftests/mm/uffd-unit-tests.c | 125 +++++++++++++++++++ > tools/testing/selftests/mm/vm_util.c | 27 ++++ > tools/testing/selftests/mm/vm_util.h | 1 + > 3 files changed, 153 insertions(+) > > diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c > index dfb44ffad5f5..007145063363 100644 > --- a/tools/testing/selftests/mm/uffd-unit-tests.c > +++ b/tools/testing/selftests/mm/uffd-unit-tests.c > @@ -9,6 +9,66 @@ > > #ifdef __NR_userfaultfd > > +/* The unit test doesn't need a large or random size, make it 32MB for now */ > +#define UFFD_TEST_MEM_SIZE (32UL << 20) > + > +#define MEM_ANON BIT_ULL(0) > +#define MEM_SHMEM BIT_ULL(1) > +#define MEM_SHMEM_PRIVATE BIT_ULL(2) > +#define MEM_HUGETLB BIT_ULL(3) > +#define MEM_HUGETLB_PRIVATE BIT_ULL(4) > + > +struct mem_type { > + const char *name; > + unsigned int mem_flag; > + uffd_test_ops_t *mem_ops; > + bool shared; > +}; > +typedef struct mem_type mem_type_t; > + > +mem_type_t mem_types[] = { > + { > + .name = "anon", > + .mem_flag = MEM_ANON, > + .mem_ops = &anon_uffd_test_ops, > + .shared = false, > + }, > + { > + .name = "shmem", > + .mem_flag = MEM_SHMEM, > + .mem_ops = &shmem_uffd_test_ops, > + .shared = true, > + }, > + { > + .name = "shmem-private", > + .mem_flag = MEM_SHMEM_PRIVATE, > + .mem_ops = &shmem_uffd_test_ops, > + .shared = false, > + }, > + { > + .name = "hugetlb", > + .mem_flag = MEM_HUGETLB, > + .mem_ops = &hugetlb_uffd_test_ops, > + .shared = true, > + }, > + { > + .name = "hugetlb-private", > + .mem_flag = MEM_HUGETLB_PRIVATE, > + .mem_ops = &hugetlb_uffd_test_ops, > + .shared = false, > + }, > +}; > + > +/* Returns: UFFD_TEST_* */ > +typedef void (*uffd_test_fn)(void); > + > +typedef struct { > + const char *name; > + uffd_test_fn uffd_fn; > + unsigned int mem_targets; > + uint64_t uffd_feature_required; > +} uffd_test_case_t; > + > struct { > unsigned int pass, skip, fail, total; > } uffd_test_acct; > @@ -108,9 +168,50 @@ static int test_uffd_api(bool use_dev) > return 1; > } > > +/* > + * This function initializes the global variables. TODO: remove global > + * vars and then remove this. > + */ > +static int uffd_setup_environment(uffd_test_case_t *test, mem_type_t *mem_type) > +{ > + map_shared = mem_type->shared; > + uffd_test_ops = mem_type->mem_ops; > + > + if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE | MEM_HUGETLB)) > + page_size = default_huge_page_size(); > + else > + page_size = psize(); > + > + nr_pages = UFFD_TEST_MEM_SIZE / page_size; > + /* TODO: remove this global var.. it's so ugly */ > + nr_cpus = 1; > + > + return uffd_test_ctx_init(test->uffd_feature_required); > +} > + > +static bool uffd_feature_supported(uffd_test_case_t *test) > +{ > + uint64_t features; > + > + if (uffd_get_features(&features)) > + return false; > + > + return (features & test->uffd_feature_required) == > + test->uffd_feature_required; > +} > + > +uffd_test_case_t uffd_tests[] = { > +}; > + > int main(int argc, char *argv[]) > { > + int n_tests = sizeof(uffd_tests) / sizeof(uffd_test_case_t); > + int n_mems = sizeof(mem_types) / sizeof(mem_type_t); > + uffd_test_case_t *test; > + mem_type_t *mem_type; > + char test_name[128]; > int has_uffd; > + int i, j; > > has_uffd = test_uffd_api(false); > has_uffd |= test_uffd_api(true); > @@ -119,7 +220,31 @@ int main(int argc, char *argv[]) > printf("Userfaultfd not supported or unprivileged, skip all tests\n"); > exit(KSFT_SKIP); > } > + > + for (i = 0; i < n_tests; i++) { > + test = &uffd_tests[i]; > + for (j = 0; j < n_mems; j++) { > + mem_type = &mem_types[j]; > + if (!(test->mem_targets & mem_type->mem_flag)) > + continue; > + snprintf(test_name, sizeof(test_name), > + "%s on %s", test->name, mem_type->name); > + > + uffd_test_start(test_name); > + if (!uffd_feature_supported(test)) { > + uffd_test_skip("feature missing"); > + continue; > + } > + if (uffd_setup_environment(test, mem_type)) { > + uffd_test_skip("memory allocation failed"); Maybe uffd_test_skip("environment setup failed")? > + continue; > + } > + test->uffd_fn(); > + } > + } > + > uffd_test_report(); > + > return uffd_test_acct.fail ? KSFT_FAIL : KSFT_PASS; > } > > diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests/mm/vm_util.c > index 62fcf039d6b7..dad1f62a7ecd 100644 > --- a/tools/testing/selftests/mm/vm_util.c > +++ b/tools/testing/selftests/mm/vm_util.c > @@ -264,3 +264,30 @@ int uffd_open(unsigned int flags) > > return uffd; > } > + > +int uffd_get_features(uint64_t *features) > +{ > + struct uffdio_api uffdio_api = { .api = UFFD_API, .features = 0 }; > + /* > + * This should by default work in most kernels; the feature list > + * will be the same no matter what we pass in here. > + */ > + int fd = uffd_open(UFFD_USER_MODE_ONLY); > + > + if (fd < 0) > + /* Maybe the kernel is older than user-only mode? */ > + fd = uffd_open(0); > + > + if (fd < 0) > + return fd; > + > + if (ioctl(fd, UFFDIO_API, &uffdio_api)) { > + close(fd); > + return -errno; > + } > + > + *features = uffdio_api.features; > + close(fd); > + > + return 0; > +} > diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests/mm/vm_util.h > index a67db8432855..2edad3256271 100644 > --- a/tools/testing/selftests/mm/vm_util.h > +++ b/tools/testing/selftests/mm/vm_util.h > @@ -51,6 +51,7 @@ int uffd_open(unsigned int flags); > int uffd_register(int uffd, void *addr, uint64_t len, > bool miss, bool wp, bool minor); > int uffd_unregister(int uffd, void *addr, uint64_t len); > +int uffd_get_features(uint64_t *features); > > /* > * On ppc64 this will only work with radix 2M hugepage size > -- > 2.39.1 > -- Sincerely yours, Mike.