From patchwork Sat Oct 28 00:38:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13439342 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 D6785C27C47 for ; Sat, 28 Oct 2023 00:38:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 786E36B0405; Fri, 27 Oct 2023 20:38:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 70A786B0406; Fri, 27 Oct 2023 20:38:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5ACA86B0407; Fri, 27 Oct 2023 20:38:34 -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 477546B0405 for ; Fri, 27 Oct 2023 20:38:34 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2CED31A0F49 for ; Sat, 28 Oct 2023 00:38:34 +0000 (UTC) X-FDA: 81393009348.30.88950C5 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf13.hostedemail.com (Postfix) with ESMTP id 75CFB20003 for ; Sat, 28 Oct 2023 00:38:32 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="QO/fL+YY"; spf=pass (imf13.hostedemail.com: domain of 3B1g8ZQYKCNgMOL8H5AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3B1g8ZQYKCNgMOL8H5AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698453512; 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=s1R+gkPO6QWaqP2nXLyUZQJ5I/za0dgAKVF5I8CkZ8w=; b=usbGO5GiyX76Tf4MHDfZKVlsdvump3eb8Xy9xbsQLJytAJq3xK4zLebxZMQW3r5GpzGUTd YR8BhwuM14mxp0FhuTz68/wB1OHAA03/yrgM4BdlJAnqdVRMGwKkXKnXR9K1Nw23KsTqJ9 G3gOf2FesjPTL7hBEbxZwDlPKYH9XDk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698453512; a=rsa-sha256; cv=none; b=H+qELhXuex3c2WXk5pgMDqXa168lSIm/h5RMDup+vEjVMwpnx7nTHIziCKRY8huNLzWwAr fHdokd1eiz+UQvZ+to7GNUT/9FEPcJ4RsJdj2FN9ZhR6Nb2sTX/F024eH/Zp2C5a4B7CI9 C5yFGA53RthgvMZZ6sULDJ2mQqO1Ngk= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="QO/fL+YY"; spf=pass (imf13.hostedemail.com: domain of 3B1g8ZQYKCNgMOL8H5AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3B1g8ZQYKCNgMOL8H5AIIAF8.6IGFCHOR-GGEP46E.ILA@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-5a90d6ab944so26888797b3.2 for ; Fri, 27 Oct 2023 17:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698453511; x=1699058311; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=s1R+gkPO6QWaqP2nXLyUZQJ5I/za0dgAKVF5I8CkZ8w=; b=QO/fL+YYPzX/2KpvV90aw7uYRg4744WvDDwF6eMGyZ3+KKu+tZ72BBwgIx4pvNlwpH IAzc5+GpdVpNz4q+KtEzqD5MraVW/e6vB31IiJrUr+SFEthNzOmNOPeYXwhk0gYjzhFr YyBx0pJcFFcPyHfON2gw9lsWY3UqpNDGBEW+80GKGuCENZHsppArXKRjoT7jymWdBOGJ QQ+wGuo/CTCD5J2wyFTEiQKOLKfiUEuuK+Vb+uJeBMKFCMboVNQkTbtmPLuoFvuXx5eE fw2aExOtBqqKrOJ9jISSt2Nrf/YJxZae5T6lRt7SQjV6Mm69l5BzgffwksBbd1BXyFai uG8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698453511; x=1699058311; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=s1R+gkPO6QWaqP2nXLyUZQJ5I/za0dgAKVF5I8CkZ8w=; b=G2RD3b9nvKJYtJ+oZPLBVi56lpOerEQBbgZu/wkbgTLddLfZlEEMSVCeY+23svKBaI z1cRh81hEXXxkHEiCMLQDI+XPkgdN1wuwIe9YwvQ8d9zvsM7IiQT6JboqUBfIXkaEVuk VPC/oBGRsfxAjgpN2P04lie1GnpgwIwFmxFwW6WgjH8bzsHbRswS0bXwrSPbvi2ss9DE qQoQltdha1Hxfb9BC7jECAzJd0SijmsjwrBApgG46Z4nrfArOEebiM9tTs0CNGIOdZVR IXG6lRD9nRbeGdB2zSR/ixyjfbKy+ZWinC4c4enmJWkXGHamY9hJLzcae35ExzpLWU6P /oog== X-Gm-Message-State: AOJu0YwVyCj9DHRYj/ZEJFx0u52FKToO4ddOlpCC+yhZHCTrGqGrRI3t EuZwg07IqsCrsGYTVZD7FCrdbEOoLYA= X-Google-Smtp-Source: AGHT+IH6BjNAe/I3oWPFyDFCzaaFiNnvB+GO/X2zJTyzdisgvbx30Yvihy8swuf1y6CJmKyolAmFsT8binI= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:cba3:7e7f:79e4:fa57]) (user=surenb job=sendgmr) by 2002:a81:4895:0:b0:5af:6717:1c52 with SMTP id v143-20020a814895000000b005af67171c52mr94902ywa.0.1698453511616; Fri, 27 Oct 2023 17:38:31 -0700 (PDT) Date: Fri, 27 Oct 2023 17:38:14 -0700 In-Reply-To: <20231028003819.652322-1-surenb@google.com> Mime-Version: 1.0 References: <20231028003819.652322-1-surenb@google.com> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog Message-ID: <20231028003819.652322-5-surenb@google.com> Subject: [PATCH v4 4/5] selftests/mm: add uffd_test_case_ops to allow test case-specific operations From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: viro@zeniv.linux.org.uk, brauner@kernel.org, shuah@kernel.org, aarcange@redhat.com, lokeshgidra@google.com, peterx@redhat.com, david@redhat.com, hughd@google.com, mhocko@suse.com, axelrasmussen@google.com, rppt@kernel.org, willy@infradead.org, Liam.Howlett@oracle.com, jannh@google.com, zhangpeng362@huawei.com, bgeffon@google.com, kaleshsingh@google.com, ngeoffray@google.com, jdduke@google.com, surenb@google.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-team@android.com X-Stat-Signature: 3ej343g1titq14jizzpehcuw5wskzpsk X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 75CFB20003 X-Rspam-User: X-HE-Tag: 1698453512-185458 X-HE-Meta: U2FsdGVkX18UL1Y045bniw7BRFEXqCEE7CuYqXhqDsV7VhAHtXev2SwVXaXGZ4IcllDvuYpqZhDTI+fXdmuV9hVdBuos+/ZXWygk/UwmooGAf+2BSbscUWuYR4lM5azhn6QAlAkYODIUiFy3pMh1fEIH4BqeQkYAOJehc+o3rjIXHWUcu42gzTdaYvvNu3UUPN4eXNXC1GU2RiOEbIUYxmRvBVaad+ayfC5157Se9ilZdUxtzfRK8Ez5iw2Sz2PYz7BP3BJV0dDUsflURENWO+b+6ifeY0guyvEigTh5qy13PJo+w9vlNEI1yqFS3qzwhNj3fDkNeyNypcUBzUmZTnJh1+j38+uVL7P+EJCltiC5LywMvU++vKVR3I8cGuwvW6Dj+ka1LPca0ZUSPn+tuoAWd9et2hiW3uiPvPUmfej8xp7bkZK6O6pSpWCUMrt4obz7z+JZA3h10ar4TiGRLpWp5CqZR7OkxaOWoRK16LKfhfnds/+L2FW+UHozycfgc52gCU9cVojOBbTDwIpLwyFaQf6LCkKX2Nrv/pjtUBi0AojnJUc/88Kt6FPMaBKD/RVeTTD4VmfQgLIcF1e4TfinnoMYPuktr/FTBQDR6mhSNJI85MC5qKMMDcRNSj/bQa+kHq/bpYb5vyIyYFGisDFiZufObVZwxxe4SR+vVZQ+um4wcDlBNSEnknLoyc4A+LipGhaOkOUbK7oU7G05mzsB/ryQuioczxv4aZdj5JvfYTG2upbm/MWFtr9Vh49CSUjDhBn48vGLTg5R/7a0MQ74yqRqx+bu14QdKunqR+GOSbRwq54OUwJWlM/xInMIQ9mBgzI5h462YiqRrzGO16i8Ut+MAwXnrLDnVWOhlEpkHWZoYI98b6cxcUwelKIOt7lLsDbNv8ymD5lVYfXAmfVOppumO799L6ew+YsDlt+YC92gvxjBqTkGTvWxIYads0Cxb8rARKxeJBf0Aqt SIqxFxWB lz20QZPT3C5Ml22hl4KEWO74W/I/GmrXsyScmSEQzNDH/+oG9H/fSt+vAHYfiIiNObWmUnuZ6BxeIWk1dLuG6ZYK5elJYLL46MG2eZ18rOJ/MM3LuTwYOeso+04TXhOGj0T79HxcrGloZbY2N61fWOeWEA4pcFCFmWBrNLkGThCq6BDwwyqVyUCtAZ4f6kYxsbPpwrckUCDUxTKnfwNY/Q9kMARWQ90tP30jaPKkfXoCzEWakT/WCaTEWINFjRGBQRYuySEzYK9hcADpgEM6cMPXPJD3MhkKIUDFFM8JYyCbVeRqCE2WUf5XuhueMr2DS80pSNT0hH4EyaMj+mTGM7BTGOtFwpl255Cq2Gdiy2cCtskxm9hXFjjdeG8POMqGkK0mokV/8WnRBnxQ0dwVRjhpPPxmZsWl6wFAAICJM/zj6JXnuhdEF4wNBMuugweT4nVsJlV2yxt5fGMpZLtKUv2m0NET6tAxu9B9ExAvnWZwytiTzgjk8+rOEQTJSEkqdqsWDpmqf3Z4VGAL7tZAhvYm/HCDU9ZrMTbeBWz0Nwpi2JA4jRLUWg5tQq1XtOMMQ0rtcb2PZF74+xC/Kflke1JWEe6wUD2GqzBqe1bIrBbkoS77VsUrpkBi5nz1QBJ7YNHGEYiMnxKkzoM6RmSYnBKmuFA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000833, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Currently each test can specify unique operations using uffd_test_ops, however these operations are per-memory type and not per-test. Add uffd_test_case_ops which each test case can customize for its own needs regardless of the memory type being used. Post- and pre- allocation and release operations are added, some of which will be used in the next patch to implement test-specific customizations like area re-alignment, page size overrides and madvise after memory allocations but before memory is accessed. Signed-off-by: Suren Baghdasaryan --- tools/testing/selftests/mm/uffd-common.c | 25 ++++++++++++++++++++ tools/testing/selftests/mm/uffd-common.h | 9 +++++++ tools/testing/selftests/mm/uffd-unit-tests.c | 2 ++ 3 files changed, 36 insertions(+) diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c index 583e5a4cc0fd..69e6653ad255 100644 --- a/tools/testing/selftests/mm/uffd-common.c +++ b/tools/testing/selftests/mm/uffd-common.c @@ -17,6 +17,7 @@ bool map_shared; bool test_uffdio_wp = true; unsigned long long *count_verify; uffd_test_ops_t *uffd_test_ops; +uffd_test_case_ops_t *uffd_test_case_ops; static int uffd_mem_fd_create(off_t mem_size, bool hugetlb) { @@ -286,11 +287,17 @@ void uffd_test_ctx_clear(void) uffd = -1; } + if (uffd_test_case_ops && uffd_test_case_ops->pre_release) + uffd_test_case_ops->pre_release(); + munmap_area((void **)&area_src); munmap_area((void **)&area_src_alias); munmap_area((void **)&area_dst); munmap_area((void **)&area_dst_alias); munmap_area((void **)&area_remap); + + if (uffd_test_case_ops && uffd_test_case_ops->post_release) + uffd_test_case_ops->post_release(); } int uffd_test_ctx_init(uint64_t features, const char **errmsg) @@ -298,6 +305,15 @@ int uffd_test_ctx_init(uint64_t features, const char **errmsg) unsigned long nr, cpu; int ret; + if (uffd_test_case_ops && uffd_test_case_ops->pre_alloc) { + ret = uffd_test_case_ops->pre_alloc(); + if (ret) { + if (errmsg) + *errmsg = "pre-allocation operation failed"; + return ret; + } + } + ret = uffd_test_ops->allocate_area((void **)&area_src, true); ret |= uffd_test_ops->allocate_area((void **)&area_dst, false); if (ret) { @@ -306,6 +322,15 @@ int uffd_test_ctx_init(uint64_t features, const char **errmsg) return ret; } + if (uffd_test_case_ops && uffd_test_case_ops->post_alloc) { + ret = uffd_test_case_ops->post_alloc(); + if (ret) { + if (errmsg) + *errmsg = "post-allocation operation failed"; + return ret; + } + } + ret = userfaultfd_open(&features); if (ret) { if (errmsg) diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h index 870776b5a323..19930fd6682b 100644 --- a/tools/testing/selftests/mm/uffd-common.h +++ b/tools/testing/selftests/mm/uffd-common.h @@ -90,6 +90,14 @@ struct uffd_test_ops { }; typedef struct uffd_test_ops uffd_test_ops_t; +struct uffd_test_case_ops { + int (*pre_alloc)(void); + int (*post_alloc)(void); + void (*pre_release)(void); + void (*post_release)(void); +}; +typedef struct uffd_test_case_ops uffd_test_case_ops_t; + extern unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size; extern char *area_src, *area_src_alias, *area_dst, *area_dst_alias, *area_remap; extern int uffd, uffd_flags, finished, *pipefd, test_type; @@ -102,6 +110,7 @@ extern uffd_test_ops_t anon_uffd_test_ops; extern uffd_test_ops_t shmem_uffd_test_ops; extern uffd_test_ops_t hugetlb_uffd_test_ops; extern uffd_test_ops_t *uffd_test_ops; +extern uffd_test_case_ops_t *uffd_test_case_ops; void uffd_stats_report(struct uffd_args *args, int n_cpus); int uffd_test_ctx_init(uint64_t features, const char **errmsg); diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c index e7d43c198041..debc423bdbf4 100644 --- a/tools/testing/selftests/mm/uffd-unit-tests.c +++ b/tools/testing/selftests/mm/uffd-unit-tests.c @@ -78,6 +78,7 @@ typedef struct { uffd_test_fn uffd_fn; unsigned int mem_targets; uint64_t uffd_feature_required; + uffd_test_case_ops_t *test_case_ops; } uffd_test_case_t; static void uffd_test_report(void) @@ -185,6 +186,7 @@ uffd_setup_environment(uffd_test_args_t *args, uffd_test_case_t *test, { map_shared = mem_type->shared; uffd_test_ops = mem_type->mem_ops; + uffd_test_case_ops = test->test_case_ops; if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE | MEM_HUGETLB)) page_size = default_huge_page_size();