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 3978EC369D5 for ; Thu, 24 Apr 2025 21:57:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 83E886B00BA; Thu, 24 Apr 2025 17:57:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 79A136B00BB; Thu, 24 Apr 2025 17:57:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C2C76B00BC; Thu, 24 Apr 2025 17:57:40 -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 3A92E6B00BA for ; Thu, 24 Apr 2025 17:57:40 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2DD7AC1354 for ; Thu, 24 Apr 2025 21:57:41 +0000 (UTC) X-FDA: 83370299922.07.864BC3D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id EBD5D40005 for ; Thu, 24 Apr 2025 21:57:38 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Mo9fH7w6; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745531859; a=rsa-sha256; cv=none; b=yyWFiUQ85rBoldBWsR5s3rWJ2YYDMU7TUQPHa1+hThwFW6W4lw+q3uVHcpS8brSdGvqz15 Rv4nMHi5LrxS6PJK90jx/f7Le3/yY//n7iLCAq8CRNeZSSFi5Y0+jGGS3Y5CKObRFBuWuD j+AHiRErvo4VNtTMwcFwkiry9Rbsvyg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Mo9fH7w6; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745531859; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=iJVQONz8RalzktWn+rmlputUFr7g2nVHb4F9h9nA5CU=; b=DphT9YA0dbLCSOOR6l+kGX/Shijc1D8dpuA5dKOOg9VoW41sFkaBnH8o1UEkt4f6CMEE4D Vq4atoo/XwwUlYRxM1MD6zVtD6FCfxrIKlDGMJ4f6wJSTsSERyGIHKMvBJFnoAUp/QoNIp GV91NT/AZIUGnXGzpn1ecmqwCDZDlVw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745531858; 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=iJVQONz8RalzktWn+rmlputUFr7g2nVHb4F9h9nA5CU=; b=Mo9fH7w6Mb8OigSAdTrhJTZ1hwlpHcZ4i/hmWMai1XMESgxWnsXGLlPPewsrLjcg1jurfE 2SonORJB3kpZ1Y5kUB0cWY/qiTCAIuvzfuP6je0W74G8YDNP2qFhShj6qafOymR7Z+77OU CJJiYs30B3jQF2Rz3Y7vhHjAl/SYO+0= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-302-iau1Hpc4PAWdVy5nTfMdoA-1; Thu, 24 Apr 2025 17:57:37 -0400 X-MC-Unique: iau1Hpc4PAWdVy5nTfMdoA-1 X-Mimecast-MFC-AGG-ID: iau1Hpc4PAWdVy5nTfMdoA_1745531856 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5c77aff55so383376985a.3 for ; Thu, 24 Apr 2025 14:57:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745531856; x=1746136656; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iJVQONz8RalzktWn+rmlputUFr7g2nVHb4F9h9nA5CU=; b=Jb7wJ+Un1fu13ZHTXTPJZCIvYadu6QJhjQPjANZoDtJAmDkhcis7nCpI2NWhSdbcJL /z0xXAMso2AIYSAZoeokQA//19pYczy1NtaGyxDPckk03KIs+d6FWpT1pPTD0oYAxtCW vsvBQHpc9UcJ7NI/NZdGP8EybVgIuCkR2L8h1SL1jeDfBcdJPLTP8Wk5GzOP5ZodCDMn eyIeOm3u5bsca1EcL5ysGnh6454/zsI1xKpEJY5plvg9KMDvjXO2nY/swDQrjaMz33ZM BlJCVlcjReNKpzAc1bLqvDDs3aViQDwYM0dyBqBDUU1bl8itNvO6L99Xia+Vsgz2hhe1 Rsaw== X-Forwarded-Encrypted: i=1; AJvYcCWLN+XWK950UO91SFuRpQkXx12iNqfPPga4eXulKspq4XWR1HR9mgGi8i2FMFZtT3NA2c1W4oAp7w==@kvack.org X-Gm-Message-State: AOJu0Yza9xCxJP4hQZQ4psXqYa24/HXp54YIsWnfqe5LUjUnMDkM9dm9 MmUbN6NHh2mADp9nygIrfOliNKZkJnQKFumE8wpl2KcYSEDQZg4HbKUal09cdpzPmu0C9s89IPo MArg4DL9Dcocdub198gfOKr9xhT0XxcsYhOoCNz9SNTQjIFt0 X-Gm-Gg: ASbGncvIIkCTWOvAbOMwBSKIiPtMTmXWBsDX9DPspX+3doYYsOjNbichGZbylsEEEVw semrMbpxTrOXmTD16u6TAkWvqf2GIu4CFs/VqW7jwthdK+19rasGUZz2ZtPs27JVzLHaK4hzsZ6 6KonBBS5vCHyYwEHlYPDHATyg5dhGSpoMI1ePBx+f+/qonP84j7TSTdmIwOwuvJ/56dMrwsqY+c eY1+Z1VTGR/DpIgzC7n630S3/VzHw0OOliV7qMcHHG8ubOkIqdZBTUQZP1sPlEnCZORlRv+iYVt X-Received: by 2002:a05:620a:c4c:b0:7c5:3c0a:ab77 with SMTP id af79cd13be357-7c9606a4affmr28580185a.4.1745531855978; Thu, 24 Apr 2025 14:57:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2Y9XhFTnDyTbHiC5mLGsvkfzojqkj8TFGkaG5R4n7ccDP3PjSRu3wEBOL6ANA7kOXImrsxw== X-Received: by 2002:a05:620a:c4c:b0:7c5:3c0a:ab77 with SMTP id af79cd13be357-7c9606a4affmr28577685a.4.1745531855658; Thu, 24 Apr 2025 14:57:35 -0700 (PDT) Received: from x1.com ([85.131.185.92]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c958ea2a6dsm138737085a.106.2025.04.24.14.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 14:57:34 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , James Houghton , David Hildenbrand , Suren Baghdasaryan , Axel Rasmussen , Andrew Morton , peterx@redhat.com Subject: [PATCH 2/2] mm/selftests: Add a test to verify mmap_changing race with -EAGAIN Date: Thu, 24 Apr 2025 17:57:29 -0400 Message-ID: <20250424215729.194656-3-peterx@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250424215729.194656-1-peterx@redhat.com> References: <20250424215729.194656-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hyql6DWCTihA1j-CTUJFqOtAMM9XGDcotk4Yj5kx54U_1745531856 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: EBD5D40005 X-Stat-Signature: jgs53haicrrjnrf9nx44953muxzz3hdi X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1745531858-150993 X-HE-Meta: U2FsdGVkX1+HjVavon+6pSZRxIsXcAw0vCIgL6ggEMCJK/nFCRaIb0w1TotmJkWmZY+F1MY3m/C3XAyLEGTygDuF/JqitxKcTyYvuZ7AQWp/g6J4ScL7EGVneNN/xSXVeR6CVDNYAjihaHB3wFLkobjqmk5pu+ngZTppbphsSEhGmmflXXtkUrnHRnAFRIMMtMBwucNGrAmQHWmVyuoU+EcwDzwZjgfIZsTM0jrKvQ90jVpdjMdcCY0Xjxq0SzXg5W5KEXMFSMWxGMXceG+Bhd4BacdxGasUBz+OFI8CvelOFoAJa4sG603iOKFXst0JKkbWXq4Owr4mXwS4s/r+jXpvz+yvEJ1ywUKXhhky+jXtg6XdoQ6H3Q9jrEhd01bOcRbMmoQD7gZSRJbKxw1AZxUzeL/ouy084BxWiHfMDtVLXp4/vL+xA8Ub7RFxGKvLMhESjohvu1riFQsSTI5TzrckO03OuaQV1l4eC4QttGA0FJlBgfh3ePytKFhQc96kKucr7FJR21Vy3sXwLhBh4LznMJbT3xZyiZo1Q2DJLfvrsRvoROrAXTt+WZx+odgm8vdUcFhALgSNGJol7qHbNUlfAxbJ+BBiwvLpqdTPfi9Lgx2P8AmDFfRWZ9pjQeD+1N5qejf8I+36QNnqc6xZ8d13ZFHneazEPNfd/PVV62RNzOMhsgIyOjJ1EvCPaMj3M4u0knAuS5uNxYJCwUVhJoEtTshFLitnOrzXMz/EkOiFitFe12n21Zv+qMi0UIyQ0TF+faxXfv8TVx0E5/09W9J93gIfa9nJ8b5+4k2otGgIuifXLC3svr+8ONCNWaAQs/up/t9zzPEgROR1cy9BaAMUoYmPiEvsA8EclU5ZgHskokMRyZC3Ag7WDyqCk+hRsxgpWcRJRYfz/rNe4IYfNljkkMjCSM5G6UNUoHtDXbA7BbR3KqoHhYOeO0l1aD9jszf82K9gVf1cD3fvKL6 /BepB7Fg bg5aoxCtjvFqPZmVif1JUxX46IulqcdAIiej1dUeBL/W+hmZxQcSL65KCxkudkkbX6QC0rNJBR5WqdeCReuZy5ZvmhOq08HZNJ59DdvBQ9NUEd9cjQe2qn6I2+rY3aQLotOBH9AjSJwyrJgnToAUhux9Bgv7KYp5mABEfU+uHhlaiw6Xi+5ONOkVeRJYNMBLB5/1wsYEyp2qgXPFWN5jSurczFw9QO/RvxlzZFS/hJpbd6MAth8pPpjdU/s1Wl1qBR4XbQ/cnCI33CDer1pB9eXubAsAKfRIlan6LYluucJDGlHmOetqVUsG/tes0DfkvZTo4FkllkIU0H2xJu5GiVG2XPMuv8vctBx4WzESLXVpbTNC3hO0fAeJfAWTkYnchexhON9of6nXvAtWDPoE404adlbEfG6ccf0Z/tXVKFLG4L3rYiQ91oSv/NpK+J3pGYUKN 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: List-Subscribe: List-Unsubscribe: Add an unit test to verify the recent mmap_changing ABI breakage. Note that I used some tricks here and there to make the test simple, e.g. I abused UFFDIO_MOVE on top of shmem with the fact that I know what I want to test will be even earlier than the vma type check. Rich comments were added to explain trivial details. Before that fix, -EAGAIN would have been written to the copy field most of the time but not always; the test should be able to reliably trigger the outlier case. After the fix, it's written always, the test verifies that making sure corresponding field (e.g. copy.copy for UFFDIO_COPY) is updated. Signed-off-by: Peter Xu --- tools/testing/selftests/mm/uffd-unit-tests.c | 203 +++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c index e8fd9011c2a3..e3b5046d02d8 100644 --- a/tools/testing/selftests/mm/uffd-unit-tests.c +++ b/tools/testing/selftests/mm/uffd-unit-tests.c @@ -1231,6 +1231,183 @@ static void uffd_move_pmd_split_test(uffd_test_args_t *targs) uffd_move_pmd_handle_fault); } +static bool +uffdio_verify_results(const char *name, int ret, int error, long result) +{ + /* + * Should always return -1 with errno=EAGAIN, with corresponding + * result field updated in ioctl() args to be -EAGAIN too + * (e.g. copy.copy field for UFFDIO_COPY). + */ + if (ret != -1) { + uffd_test_fail("%s should have returned -1", name); + return false; + } + + if (error != EAGAIN) { + uffd_test_fail("%s should have errno==EAGAIN", name); + return false; + } + + if (result != -EAGAIN) { + uffd_test_fail("%s should have been updated for -EAGAIN", + name); + return false; + } + + return true; +} + +/* + * This defines a function to test one ioctl. Note that here "field" can + * be 1 or anything not -EAGAIN. With that initial value set, we can + * verify later that it should be updated by kernel (when -EAGAIN + * returned), by checking whether it is also updated to -EAGAIN. + */ +#define DEFINE_MMAP_CHANGING_TEST(name, ioctl_name, field) \ + static bool uffdio_mmap_changing_test_##name(int fd) \ + { \ + int ret; \ + struct uffdio_##name args = { \ + .field = 1, \ + }; \ + ret = ioctl(fd, ioctl_name, &args); \ + return uffdio_verify_results(#ioctl_name, ret, errno, args.field); \ + } + +DEFINE_MMAP_CHANGING_TEST(zeropage, UFFDIO_ZEROPAGE, zeropage) +DEFINE_MMAP_CHANGING_TEST(copy, UFFDIO_COPY, copy) +DEFINE_MMAP_CHANGING_TEST(move, UFFDIO_MOVE, move) +DEFINE_MMAP_CHANGING_TEST(poison, UFFDIO_POISON, updated) +DEFINE_MMAP_CHANGING_TEST(continue, UFFDIO_CONTINUE, mapped) + +typedef enum { + /* We actually do not care about any state except UNINTERRUPTIBLE.. */ + THR_STATE_UNKNOWN = 0, + THR_STATE_UNINTERRUPTIBLE, +} thread_state; + +static void sleep_short(void) +{ + usleep(1000); +} + +static thread_state thread_state_get(pid_t tid) +{ + const char *header = "State:\t"; + char tmp[256], *p, c; + FILE *fp; + + snprintf(tmp, sizeof(tmp), "/proc/%d/status", tid); + fp = fopen(tmp, "r"); + + if (!fp) { + return THR_STATE_UNKNOWN; + } + + while (fgets(tmp, sizeof(tmp), fp)) { + p = strstr(tmp, header); + if (p) { + /* For example, "State:\tD (disk sleep)" */ + c = *(p + sizeof(header) - 1); + return c == 'D' ? + THR_STATE_UNINTERRUPTIBLE : THR_STATE_UNKNOWN; + } + } + + return THR_STATE_UNKNOWN; +} + +static void thread_state_until(pid_t tid, thread_state state) +{ + thread_state s; + + do { + s = thread_state_get(tid); + sleep_short(); + } while (s != state); +} + +static void *uffd_mmap_changing_thread(void *opaque) +{ + volatile pid_t *pid = opaque; + int ret; + + /* Unfortunately, it's only fetch-able from the thread itself.. */ + assert(*pid == 0); + *pid = syscall(SYS_gettid); + + /* Inject an event, this will hang solid until the event read */ + ret = madvise(area_dst, page_size, MADV_REMOVE); + if (ret) + err("madvise(MADV_REMOVE) failed"); + + return NULL; +} + +static void uffd_consume_message(int fd) +{ + struct uffd_msg msg = { 0 }; + + while (uffd_read_msg(fd, &msg)); +} + +static void uffd_mmap_changing_test(uffd_test_args_t *targs) +{ + /* + * This stores the real PID (which can be different from how tid is + * defined..) for the child thread, 0 means not initialized. + */ + pid_t pid = 0; + pthread_t tid; + int ret; + + if (uffd_register(uffd, area_dst, nr_pages * page_size, + true, false, false)) + err("uffd_register() failed"); + + /* Create a thread to generate the racy event */ + ret = pthread_create(&tid, NULL, uffd_mmap_changing_thread, &pid); + if (ret) + err("pthread_create() failed"); + + /* + * Wait until the thread setup the pid. Use volatile to make sure + * it reads from RAM not regs. + */ + while (!(volatile pid_t)pid) + sleep_short(); + + /* Wait until the thread hangs at REMOVE event */ + thread_state_until(pid, THR_STATE_UNINTERRUPTIBLE); + + if (!uffdio_mmap_changing_test_copy(uffd)) + return; + + if (!uffdio_mmap_changing_test_zeropage(uffd)) + return; + + if (!uffdio_mmap_changing_test_move(uffd)) + return; + + if (!uffdio_mmap_changing_test_poison(uffd)) + return; + + if (!uffdio_mmap_changing_test_continue(uffd)) + return; + + /* + * All succeeded above! Recycle everything. Start by reading the + * event so as to kick the thread roll again.. + */ + uffd_consume_message(uffd); + + ret = pthread_join(tid, NULL); + assert(ret == 0); + + uffd_test_pass(); +} + static int prevent_hugepages(const char **errmsg) { /* This should be done before source area is populated */ @@ -1470,6 +1647,32 @@ uffd_test_case_t uffd_tests[] = { .mem_targets = MEM_ALL, .uffd_feature_required = UFFD_FEATURE_POISON, }, + { + .name = "mmap-changing", + .uffd_fn = uffd_mmap_changing_test, + /* + * There's no point running this test over all mem types as + * they share the same code paths. + * + * Choose shmem for simplicity, because (1) shmem supports + * MINOR mode to cover UFFDIO_CONTINUE, and (2) shmem is + * almost always available (unlike hugetlb). Here we + * abused SHMEM for UFFDIO_MOVE, but the test we want to + * cover doesn't yet need the correct memory type.. + */ + .mem_targets = MEM_SHMEM, + /* + * Any UFFD_FEATURE_EVENT_* should work to trigger the + * race logically, but choose the simplest (REMOVE). + * + * Meanwhile, since we'll cover quite a few new ioctl()s + * (CONTINUE, POISON, MOVE), skip this test for old kernels + * by choosing all of them. + */ + .uffd_feature_required = UFFD_FEATURE_EVENT_REMOVE | + UFFD_FEATURE_MOVE | UFFD_FEATURE_POISON | + UFFD_FEATURE_MINOR_SHMEM, + }, }; static void usage(const char *prog) -- 2.48.1