From patchwork Sat Sep 23 01:31:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13396498 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 95759CE7A81 for ; Sat, 23 Sep 2023 01:32:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 129706B02C2; Fri, 22 Sep 2023 21:32:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DB4B6B02C6; Fri, 22 Sep 2023 21:32:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E962F6B02C7; Fri, 22 Sep 2023 21:32:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D6FFD6B02C2 for ; Fri, 22 Sep 2023 21:32:03 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B78AEC032D for ; Sat, 23 Sep 2023 01:32:03 +0000 (UTC) X-FDA: 81266136126.28.8EF5BDC Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf30.hostedemail.com (Postfix) with ESMTP id DE6F680011 for ; Sat, 23 Sep 2023 01:32:00 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=2WeWnYOI; spf=pass (imf30.hostedemail.com: domain of 3D0AOZQYKCPYqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3D0AOZQYKCPYqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695432720; a=rsa-sha256; cv=none; b=WE1Fy7H2iKVq75SoAoZ+KnpNj4JdKPjR3HCBERwKBCUVGEeAotmFyYQRKxEto6OmKc92YE +JSKGwLUJTGAQHLoD9WjIY/b//wUqYslIYKlAC3Uam4ev9+3cKK+uX+4mo7Drsmt7P8UCo n9qHimu7aKtKagnpc0qkuOClPRP9DrE= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=2WeWnYOI; spf=pass (imf30.hostedemail.com: domain of 3D0AOZQYKCPYqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3D0AOZQYKCPYqspclZemmejc.amkjglsv-kkitYai.mpe@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=1695432720; 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=6sBdVMfMRjf51/A4FAmBdDBudgEJD7XIV0S+Rn1ebf8=; b=z1gpW7pU6Qg1KquCT4rhJX2FHoXOUJI7xzpSYcfQQFEMM8qqRF38/p400wFjtkoEbLuq2D eCyJ2frlUtqdCi7zEJB5M43/QobSjU+xZPBkLdjfW9U1pSuL1zPzVhxsBB0dmnq1QtoHjD qw8Wlg/eBrTMpFVd4CVcTf01iSSjK2o= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-d865f1447a2so602744276.2 for ; Fri, 22 Sep 2023 18:32:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695432720; x=1696037520; 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=6sBdVMfMRjf51/A4FAmBdDBudgEJD7XIV0S+Rn1ebf8=; b=2WeWnYOIrmaLvFWh+kNQdA1eMLD4IINAKL8Xmao6pN6r6GxJ96d/H/y60i8j5eHN18 y+MtkAq54vuJ3/xpysdQbmVypBV+TcaO70XCfLZn+OXl+GKcqi0ULv3vz6ERyumDVseE TqIhLMqizg9unfmA9lPqMy0m4u+t7uGj/T1wppOq+FcTTWvKy7sODHGH4z/PmQ5CzcyD 9w3QKWEaPMQcpNXGOIJA8CJktqegyGLDT3Hwo/+HIXQ5etchJjZAt5ON0RSFS6oGDdYs LnSdXsGVIZt/cOjgzRWHZEkt+XLYtaRnyfcBGVfzN4TtNywDqz6PZQy+OYNET+CLYouV nSBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695432720; x=1696037520; 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=6sBdVMfMRjf51/A4FAmBdDBudgEJD7XIV0S+Rn1ebf8=; b=CPjQuWp2xtjrK3yAOLNboWUPzOYUMXBmn4IA1cUbAh7WzN8/OoeGBOWIUAtr8GiJHp pjOX9vh7PEDoqIkWG9NX7dnTpiQpL9nZvzqFmE/6NFXDqPwzykFIEiuZKOMHX3fkgEF8 IfdFDPlsFOUuDogk2iEJxLzaS3oyp3rJLmoXpdK8zhzhJftRxdx9X/HxEwOZTZz6BUvr +Rt6MGsHFw705HsYKMuBA9Xn2jnuUU/Y1EnB6n0fRbkj8bjZ5FtIOp8ASboTuRXpa7wm eCKr5PSHD1tn13Va/H5bW4SHoX84RN6jS4Vp6JicwmG5zue/BWkZsUA/qJD8F8+33Q36 J3pw== X-Gm-Message-State: AOJu0YzrywzhtF9J5hKF4zf9pKq9atgYRfY7mPbfXzKtdx5au80MHSGl yg9o1IO+57V/B5KEqIVk200UX8aBb9Q= X-Google-Smtp-Source: AGHT+IE2yWzcwua2aqDzlLl0Y+Ymi3r6rJDilflyRWbYZnXXI88FhB4QNhRbeG/BF6XKbV1cknxCSUOXvog= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:3398:6644:ed7f:bec9]) (user=surenb job=sendgmr) by 2002:a25:d09:0:b0:d7b:9185:e23d with SMTP id 9-20020a250d09000000b00d7b9185e23dmr9469ybn.6.1695432719939; Fri, 22 Sep 2023 18:31:59 -0700 (PDT) Date: Fri, 22 Sep 2023 18:31:46 -0700 In-Reply-To: <20230923013148.1390521-1-surenb@google.com> Mime-Version: 1.0 References: <20230923013148.1390521-1-surenb@google.com> X-Mailer: git-send-email 2.42.0.515.g380fc7ccd1-goog Message-ID: <20230923013148.1390521-4-surenb@google.com> Subject: [PATCH v2 3/3] selftests/mm: add UFFDIO_REMAP ioctl test 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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: DE6F680011 X-Stat-Signature: fagowxx9o3k9dekexhnnt8keerxza3w7 X-Rspam-User: X-HE-Tag: 1695432720-532522 X-HE-Meta: U2FsdGVkX1+kymUWDkvlrdaLzaQR3D9sZRu/fS7vrbUX3z60GdMHFvD8Loc+y/U8HUuMTNpWLltZu5RFEL9TMhUZyVEOj9BqzXbQqpcspbtRYXIrSKyNDBf30GrHquXVlvBy2cQHJRa0d2QyAUEQgxNt14L6MIoOJ3neLR0KMwR6L+wpZFf97VBFmlVJ41CD4VGR62lwZgnp00T2U8a3qX7JOeFNToGvcKyzix47BF//6EWVg+VGusBdY/x9D2CvPoPmRPiLdTZCXN9pNJvTcN0xnLw42FzOGg6IBQxEJX6O7CZ4k6/4Qamjjj1rCv7q0IQMzIWxD63AuzjJyGMfCzL2zhp+yax6FMJxGsaHYUglfKGoM6M8ZKsbR/CQNHzAZMnauHiQ12KPEI0en36QzNutZcR8Skl+PQ1XsoGybDDT51iF4SDsMU/dRto/NeNVrQXfl60QHudF1qCmUF+7iJf4MWqxqREK7WaHNCChidAAIK+MNJAtiZfOLkK76DfpVmVOghUoT/1uc2ytjzs8AWx5IE8vU1llzo/AwtIBCynK6csozb25f9InW3S71EQXr6Pq57qcSsvbA7pjRoX+JnxBgcb96iMDzOJ/GnoWMV1cwrjklCzG6OCuwgDEDU2ojmdmWkpPwf6i2xbnXh6+NwHnLMPkiSGPUcSGscZ0IZa2svuzBmUPKaSN6bChlNhVfUr3qbteC3XFwKDpSxZpA8DIXo63sc5YMwKqEYk44vWNRRJUW2Ls+u58H5Q57inVwo571NEvqY5YIz2zqi4CFhftC94Y+jTnV1HzuT8opWrKMJRhvqrk+peA9s83ycnP/hCvoQkH0oSc70wRzA/KV80Pa0K3sqqZwQ6MHNHGeprSlp2MZu0KYv61kjxWo37/+rApNcOY0D/m8Mi4i7shFpU+9pWxjtcWTydtIr4qD7sAuDpQB2/lwNEZx0CdI9lflhxQRi6SX79ymi+rwu+ SomnTG56 /h7c3+HdV3XZ1de2M/DqyA5KkfymG4UsfNJKhSJ/Pff3pjSCrnIYy8bRuj3Qodya0DiWLBk4u6quvWD33WBPNcKxChk/JjnqACovkYRbT4S8AOD0rERrSsJad2LgI8kIN3Xkd5GimSXgX05dg0pwZPGpXwBIxauxF0XokHS4P5f7PttYrLO38QHIjmbwZ4zT/YH0nnZ+QZbpknuzxh18Redccbit4HomBY+JBVPmlx1/1E2kNxwnfrgkLvU3DkUirPdvta0Q0FAEs8lIJMYSy2iuOlDzvn2AvBc9muTlMSQaMz3PCt/Qh6ikmVVxw+/yLCn1i1uS6RF+tG/4e7BGpe1l7mjuuqHNY5emMcg8V+VEyrD+J6oKtVVHcE50ogwBoxYuV6dslQlJ2eJcTycZYRGbEBQYOB4yaU1oWBjz4DNeqqsdnxTznW8xCJi6ADYhwhmmiEgZOPFP50lhKscXAlbg91/M2XqE9rMRVryMDM8E/uOsSDvycdnV/L/DrUBVw68I4kOB1mLNLe+MkjXKk1gtm2ZYSWWWmLGoXT9SuPHUGMfz3teUvM2v1CBHPVu0cvNrn 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: Add a test for new UFFDIO_REMAP ioctl which uses uffd to remaps source into destination buffer while checking the contents of both after remapping. After the operation the content of the destination buffer should match the original source buffer's content while the source buffer should be zeroed. Signed-off-by: Suren Baghdasaryan --- tools/testing/selftests/mm/uffd-common.c | 41 ++++++++++++- tools/testing/selftests/mm/uffd-common.h | 1 + tools/testing/selftests/mm/uffd-unit-tests.c | 62 ++++++++++++++++++++ 3 files changed, 102 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c index 02b89860e193..2a3ffd0ce96e 100644 --- a/tools/testing/selftests/mm/uffd-common.c +++ b/tools/testing/selftests/mm/uffd-common.c @@ -52,6 +52,13 @@ static int anon_allocate_area(void **alloc_area, bool is_src) *alloc_area = NULL; return -errno; } + + /* Prevent source pages from collapsing into THPs */ + if (madvise(*alloc_area, nr_pages * page_size, MADV_NOHUGEPAGE)) { + *alloc_area = NULL; + return -errno; + } + return 0; } @@ -484,8 +491,14 @@ void uffd_handle_page_fault(struct uffd_msg *msg, struct uffd_args *args) offset = (char *)(unsigned long)msg->arg.pagefault.address - area_dst; offset &= ~(page_size-1); - if (copy_page(uffd, offset, args->apply_wp)) - args->missing_faults++; + /* UFFD_REMAP is supported for anon non-shared mappings. */ + if (uffd_test_ops == &anon_uffd_test_ops && !map_shared) { + if (remap_page(uffd, offset)) + args->missing_faults++; + } else { + if (copy_page(uffd, offset, args->apply_wp)) + args->missing_faults++; + } } } @@ -620,6 +633,30 @@ int copy_page(int ufd, unsigned long offset, bool wp) return __copy_page(ufd, offset, false, wp); } +int remap_page(int ufd, unsigned long offset) +{ + struct uffdio_remap uffdio_remap; + + if (offset >= nr_pages * page_size) + err("unexpected offset %lu\n", offset); + uffdio_remap.dst = (unsigned long) area_dst + offset; + uffdio_remap.src = (unsigned long) area_src + offset; + uffdio_remap.len = page_size; + uffdio_remap.mode = UFFDIO_REMAP_MODE_ALLOW_SRC_HOLES; + uffdio_remap.remap = 0; + if (ioctl(ufd, UFFDIO_REMAP, &uffdio_remap)) { + /* real retval in uffdio_remap.remap */ + if (uffdio_remap.remap != -EEXIST) + err("UFFDIO_REMAP error: %"PRId64, + (int64_t)uffdio_remap.remap); + wake_range(ufd, uffdio_remap.dst, page_size); + } else if (uffdio_remap.remap != page_size) { + err("UFFDIO_REMAP error: %"PRId64, (int64_t)uffdio_remap.remap); + } else + return 1; + return 0; +} + int uffd_open_dev(unsigned int flags) { int fd, uffd; diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h index 7c4fa964c3b0..2bbb15d1920c 100644 --- a/tools/testing/selftests/mm/uffd-common.h +++ b/tools/testing/selftests/mm/uffd-common.h @@ -111,6 +111,7 @@ void wp_range(int ufd, __u64 start, __u64 len, bool wp); void uffd_handle_page_fault(struct uffd_msg *msg, struct uffd_args *args); int __copy_page(int ufd, unsigned long offset, bool retry, bool wp); int copy_page(int ufd, unsigned long offset, bool wp); +int remap_page(int ufd, unsigned long offset); void *uffd_poll_thread(void *arg); int uffd_open_dev(unsigned int flags); diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c index 2709a34a39c5..a33819639187 100644 --- a/tools/testing/selftests/mm/uffd-unit-tests.c +++ b/tools/testing/selftests/mm/uffd-unit-tests.c @@ -824,6 +824,10 @@ static void uffd_events_test_common(bool wp) char c; struct uffd_args args = { 0 }; + /* Prevent source pages from being mapped more than once */ + if (madvise(area_src, nr_pages * page_size, MADV_DONTFORK)) + err("madvise(MADV_DONTFORK) failed"); + fcntl(uffd, F_SETFL, uffd_flags | O_NONBLOCK); if (uffd_register(uffd, area_dst, nr_pages * page_size, true, wp, false)) @@ -1062,6 +1066,58 @@ static void uffd_poison_test(uffd_test_args_t *targs) uffd_test_pass(); } +static void uffd_remap_test(uffd_test_args_t *targs) +{ + unsigned long nr; + pthread_t uffd_mon; + char c; + unsigned long long count; + struct uffd_args args = { 0 }; + + if (uffd_register(uffd, area_dst, nr_pages * page_size, + true, false, false)) + err("register failure"); + + if (pthread_create(&uffd_mon, NULL, uffd_poll_thread, &args)) + err("uffd_poll_thread create"); + + /* + * Read each of the pages back using the UFFD-registered mapping. We + * expect that the first time we touch a page, it will result in a missing + * fault. uffd_poll_thread will resolve the fault by remapping source + * page to destination. + */ + for (nr = 0; nr < nr_pages; nr++) { + /* Check area_src content */ + count = *area_count(area_src, nr); + if (count != count_verify[nr]) + err("nr %lu source memory invalid %llu %llu\n", + nr, count, count_verify[nr]); + + /* Faulting into area_dst should remap the page */ + count = *area_count(area_dst, nr); + if (count != count_verify[nr]) + err("nr %lu memory corruption %llu %llu\n", + nr, count, count_verify[nr]); + + /* Re-check area_src content which should be empty */ + count = *area_count(area_src, nr); + if (count != 0) + err("nr %lu remap failed %llu %llu\n", + nr, count, count_verify[nr]); + } + + if (write(pipefd[1], &c, sizeof(c)) != sizeof(c)) + err("pipe write"); + if (pthread_join(uffd_mon, NULL)) + err("join() failed"); + + if (args.missing_faults != nr_pages || args.minor_faults != 0) + uffd_test_fail("stats check error"); + else + uffd_test_pass(); +} + /* * Test the returned uffdio_register.ioctls with different register modes. * Note that _UFFDIO_ZEROPAGE is tested separately in the zeropage test. @@ -1139,6 +1195,12 @@ uffd_test_case_t uffd_tests[] = { .mem_targets = MEM_ALL, .uffd_feature_required = 0, }, + { + .name = "remap", + .uffd_fn = uffd_remap_test, + .mem_targets = MEM_ANON, + .uffd_feature_required = 0, + }, { .name = "wp-fork", .uffd_fn = uffd_wp_fork_test,