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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47248C27C47 for ; Sat, 28 Oct 2023 00:38:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235233AbjJ1Aix (ORCPT ); Fri, 27 Oct 2023 20:38:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346758AbjJ1Aie (ORCPT ); Fri, 27 Oct 2023 20:38:34 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 713D01BF for ; Fri, 27 Oct 2023 17:38:32 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5a90d6ab944so26888807b3.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=vger.kernel.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=MoGenRuyo4nfv3eG/+W2TGVWy3LqwicSEKy2wXR/9lXKmOqWVxFcjjzXvspsM1tASD k6RBuyAZ9R99YE/B3j6vrNdwKX2g3WvJhCM/0rORbZt64i3CF+pjbrXNdqjsiKxGyhP4 4LGCzBrMpVyUAisxqFtwCm7gfWGLTdoMos3BwWnFNlqyC2lPzzz9Gv9HxGtVZh4pUAEg z+gprFp78wOpuY9rwMBnhMOxfQSGGSwgr7kZRSh9jUV0BWVKQe8J9y0BElTwvTFOfhas WoJbbYmBXt6HAzCEfs6A+jK1hGoOq3cRGUysCFHpwOSP1FxQkkVwcKn5bkHr4H4uXMS0 YRsA== 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=B7ufdEptq0Pu6fsWVJJ9CEYvWYqsX2hZW38f4LsJ3r2MiCQjwGZhTir0cm55EFhqyV /CcJQgW9D1JQd2NNTJXBIN9UkvsdHGekxsofCAxwkI1Oohg2FiPBphsZJliecwEhyz+A hs+ervtLUvIo2CdjT8fDtwbXgQBjh0eUKzXjtNqHtBrwIHhNQFDJXvv4dh5VNZO2NXx5 6b+O1UyidGoWuI641IPfFSGkjLDsVqi55W3sDzaaDCYcRy1myo9iUGjeTMWXvJncy7+y JzMD/4sIl9A5Nxqv4uzMcgp3bvlPV07c1polI60jJ0Q+NabGYXCjTvS7DMyh88Rhdxso M5PA== X-Gm-Message-State: AOJu0YwH6rK0ctCDmJ5uaqDSc9O6aq6hQBa2XjUxpWPkiSOxc/ZfnQ1f vbrjXYpw9nD63IYJx/REfTMjwtK0HgQ= 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(); -- 2.42.0.820.g83a721a137-goog