From nobody Tue Dec 30 08:09:11 2025 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 C813EC072A2 for ; Fri, 17 Nov 2023 18:11:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231488AbjKQSLf (ORCPT ); Fri, 17 Nov 2023 13:11:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229535AbjKQSLd (ORCPT ); Fri, 17 Nov 2023 13:11:33 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E7BDD5C for ; Fri, 17 Nov 2023 10:11:30 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5a7b9e83b70so17831037b3.0 for ; Fri, 17 Nov 2023 10:11:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700244690; x=1700849490; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=eB+R5KD8/irGc6HqCh9MWmXy3WjqKHp3pksL4FoiCDc=; b=moN0zigZTVumSNXN4CkeyIUVd/IQj6ia69lOzkj5zLvdxb6DK7jv6AuJP4iqrEMe/F 4xE23/z/CPrwjCFhv7I6zvVhUs40Rd6l7Am0zU3XudsRqyu+yf4QCFCS9MN1Z1lsofJ+ DuRxCQB/VprY+Ke4ovOLFxSEQKBjCKIsMI+3j7dXy3MtwKN3RydzIQwLqGTouH2ghcI/ ulcxE7cvUHKk3b+p7ZysgCcojjiOaCxQbi6WcnyLqR4aVAnyxgVXJiYJn0ZmAKbSMbaU XcOvMZQcHSLWGUuTtO6jDQA9PtN27GXnniIldJ3E6Z0+MriiCaNa7PcxmvjneZoPft24 pYWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700244690; x=1700849490; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=eB+R5KD8/irGc6HqCh9MWmXy3WjqKHp3pksL4FoiCDc=; b=aqhmQhGVeXRtDP1D5YpayHU0pyz0HL03JFm5fmNsxCyFynxl+eVjqamkqz+sqBB1bj talocS7TO8ojGmUX3eCPxyDgbLRJEn9dfjvZZ/zEEJoxPvlK0NZNzVK9FvnZHyVu8q00 7PHOzCwpqtODWRUzt8/zF8sUaQoCIQh3Jn6MFpkY7FxCVJ5s0JTtg0hBQoaA7bV9GLgR XQvGtO8Nbkgztg1kf0RkV75YnFj35bPunjktnQ4kJfUby8nl8MKpfhU+DW4ma+TUIBcr aup8wyQwGCTFf3buOA53QD9eUsELmJxCksZG6l82fCcS34EKsiGgiMOY1QegY2OP7+Ca JkjQ== X-Gm-Message-State: AOJu0YzqFm2+q99LDAwONNK8uhSrvGQm/BhE9EdcyuLI54pknp+MGIWy n4YNXmX/Up+Z3efnx8wLi5r2tT4hXZM= X-Google-Smtp-Source: AGHT+IFOyw76XMMuir4iCyAHifIi/yzgQfcxp9rLFqqXVNvF+ZX+sV5ABQd4m4M1e3iNHELoBkBfLe7W6uk= X-Received: from avagin.kir.corp.google.com ([2620:0:1008:10:3e6e:efaf:3809:5555]) (user=avagin job=sendgmr) by 2002:a81:5285:0:b0:5be:9a1e:5863 with SMTP id g127-20020a815285000000b005be9a1e5863mr183243ywb.4.1700244689855; Fri, 17 Nov 2023 10:11:29 -0800 (PST) Date: Fri, 17 Nov 2023 10:11:27 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.rc0.421.g78406f8d94-goog Message-ID: <20231117181127.2574897-1-avagin@google.com> Subject: [PATCH] selftests/mm: don't fail if pagemap_scan isn't supported From: Andrei Vagin To: Andrew Morton , Ryan Roberts Cc: linux-kernel@vger.kernel.org, Andrei Vagin Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This change allows to run tests on old kernels. Reported-by: Ryan Roberts Closes: https://lore.kernel.org/lkml/696a0a99-eb42-4e13-be14-58a88c9c33f7@a= rm.com/ Signed-off-by: Andrei Vagin --- tools/testing/selftests/mm/vm_util.c | 51 +++++++++++++++++++++------- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests= /mm/vm_util.c index ec3478b96e4c..4aeb8d5299ff 100644 --- a/tools/testing/selftests/mm/vm_util.c +++ b/tools/testing/selftests/mm/vm_util.c @@ -29,15 +29,13 @@ uint64_t pagemap_get_entry(int fd, char *start) return entry; } =20 -static uint64_t pagemap_scan_get_categories(int fd, char *start) +static uint64_t __pagemap_scan_get_categories(int fd, char *start, struct = page_region *r) { struct pm_scan_arg arg; - struct page_region r; - long ret; =20 arg.start =3D (uintptr_t)start; arg.end =3D (uintptr_t)(start + psize()); - arg.vec =3D (uintptr_t)&r; + arg.vec =3D (uintptr_t)r; arg.vec_len =3D 1; arg.flags =3D 0; arg.size =3D sizeof(struct pm_scan_arg); @@ -49,7 +47,15 @@ static uint64_t pagemap_scan_get_categories(int fd, char= *start) PAGE_IS_HUGE | PAGE_IS_SOFT_DIRTY; arg.return_mask =3D arg.category_anyof_mask; =20 - ret =3D ioctl(fd, PAGEMAP_SCAN, &arg); + return ioctl(fd, PAGEMAP_SCAN, &arg); +} + +static uint64_t pagemap_scan_get_categories(int fd, char *start) +{ + struct page_region r; + long ret; + + ret =3D __pagemap_scan_get_categories(fd, start, &r); if (ret < 0) ksft_exit_fail_msg("PAGEMAP_SCAN failed: %s\n", strerror(errno)); if (ret =3D=3D 0) @@ -57,18 +63,39 @@ static uint64_t pagemap_scan_get_categories(int fd, cha= r *start) return r.categories; } =20 +/* `start` is any valid address. */ +static bool pagemap_scan_supported(int fd, char *start) +{ + static int supported =3D -1; + int ret; + + if (supported !=3D -1) + return supported; + + /* Provide an invalid address in order to trigger EFAULT. */ + ret =3D __pagemap_scan_get_categories(fd, start, (struct page_region *) ~= 0UL); + if (ret =3D=3D 0) + ksft_exit_fail_msg("PAGEMAP_SCAN succedded unexpectedly\n"); + + supported =3D errno =3D=3D EFAULT; + + return supported; +} + static bool page_entry_is(int fd, char *start, char *desc, uint64_t pagemap_flags, uint64_t pagescan_flags) { - bool m, s; + bool m =3D pagemap_get_entry(fd, start) & pagemap_flags; =20 - m =3D pagemap_get_entry(fd, start) & pagemap_flags; - s =3D pagemap_scan_get_categories(fd, start) & pagescan_flags; - if (m =3D=3D s) - return m; + if (pagemap_scan_supported(fd, start)) { + bool s =3D pagemap_scan_get_categories(fd, start) & pagescan_flags; =20 - ksft_exit_fail_msg( - "read and ioctl return unmatched results for %s: %d %d", desc, m, s); + if (m =3D=3D s) + return m; + + ksft_exit_fail_msg( + "read and ioctl return unmatched results for %s: %d %d", desc, m, s); + } return m; } =20 --=20 2.43.0.rc0.421.g78406f8d94-goog