From patchwork Sun Jun 19 23:34:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nadav Amit X-Patchwork-Id: 12887053 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 D6FB1C43334 for ; Mon, 20 Jun 2022 07:09:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77C1C6B0074; Mon, 20 Jun 2022 03:09:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6DA838E0006; Mon, 20 Jun 2022 03:09:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4BB188E0005; Mon, 20 Jun 2022 03:09:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2D5306B0074 for ; Mon, 20 Jun 2022 03:09:09 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E8E8220CD5 for ; Mon, 20 Jun 2022 07:09:08 +0000 (UTC) X-FDA: 79597737576.29.777B09C Received: from relay3.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by imf01.hostedemail.com (Postfix) with ESMTP id 6DA1440010 for ; Mon, 20 Jun 2022 07:09:08 +0000 (UTC) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 29B4C120A28 for ; Mon, 20 Jun 2022 07:09:08 +0000 (UTC) X-FDA: 79597737576.17.CC666E6 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf28.hostedemail.com (Postfix) with ESMTP id C66B4C00B2 for ; Mon, 20 Jun 2022 07:09:07 +0000 (UTC) Received: by mail-pj1-f51.google.com with SMTP id x1-20020a17090abc8100b001ec7f8a51f5so5880269pjr.0 for ; Mon, 20 Jun 2022 00:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G4PEtPnEHe98X1Yl7BPl8PbpqJ52DPzGWNZy0Kq4zsI=; b=jtMJWL4H+5SaK1T37BskSqqDGgIiCGbCpyD39uy0yc7DVbHjco8DxisH9/Wze/z5ic GyBW9slf4RjkoGsIv/BXDr1YNS25lO+ZFuJ8wpoMF5XMC2CeCQEdKembserR2V4e/Dmy saimbHSx7meOrit3VNyZ3IBqvmFbND1/TRt3r0PvYMiwwJB0Q/WlhvF7HqUSKSZzKFA9 IhWDpIuOpRHunQ5S3ECzESXQ5DCjOrrtWSnp7Gm0oY9+PeHVFCxBhL85QqgWwS3aXEtG piGgJRIT8UBg3fflXmzsHmnIKzZKgG9BurtmxHLuPWK51NtwYIA1k22bXtO3Z2rvC5mF TUvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G4PEtPnEHe98X1Yl7BPl8PbpqJ52DPzGWNZy0Kq4zsI=; b=bdEjK237ji3bU9UXCU+W9DygIdYlEMlyJJLeZyZZNePku0AUsM737LUb0IG9E5ARnK SCRb01ruE2PqnP0ogZn9Sxv+Ps91saNu1my7sJcNvcgp9Uw89tpJcp8lExZqlE126M/8 grkk+m9YWOy6GLWlFXZgghPNpuRquatJ55ti0r00aKkZQF8zexeBLfxsp7elslrq8v8E opMiroY+wPbBYAt195kODXRIsPKwXMEc5MI5VjFoadT9rd8h2bdkXCyQO17+ynP13Tr7 3XW9FnZpCB9bMN2C0SRBREtI96s42bKQXxMMz6nIVo8J3BQbL40kdQy5uTbMLTaIfjXi yw2w== X-Gm-Message-State: AJIora/atyo7OOLYzGsEaIR5OjZAvYctAN8+gKvsVc6s9XDTW2LRb81s gvFB7B6b94sw489wxU3CsuQ/WTdfnCBXmw== X-Google-Smtp-Source: AGRyM1uapjbpFjTbuQhIIT1nwZoRi6loEQVWroK6cutY8NkkLHV+TQ/nyOl6SpDLBw1I5Asw9aJJgA== X-Received: by 2002:a17:90a:ac05:b0:1ec:aabf:e13d with SMTP id o5-20020a17090aac0500b001ecaabfe13dmr3454952pjq.96.1655708946540; Mon, 20 Jun 2022 00:09:06 -0700 (PDT) Received: from sc2-haas01-esx0118.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id a8-20020a17090a6d8800b001e2ee0a9ac6sm9639773pjk.44.2022.06.20.00.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jun 2022 00:09:06 -0700 (PDT) From: Nadav Amit X-Google-Original-From: Nadav Amit To: linux-mm@kvack.org Cc: Nadav Amit , Mike Kravetz , Hugh Dickins , Andrew Morton , Axel Rasmussen , Peter Xu , David Hildenbrand , Mike Rapoport Subject: [RFC PATCH v2 5/5] selftest/userfaultfd: test read/write hints Date: Sun, 19 Jun 2022 16:34:49 -0700 Message-Id: <20220619233449.181323-6-namit@vmware.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220619233449.181323-1-namit@vmware.com> References: <20220619233449.181323-1-namit@vmware.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655708948; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=G4PEtPnEHe98X1Yl7BPl8PbpqJ52DPzGWNZy0Kq4zsI=; b=qfSdTDskZrSb46Bw5irmzQsM3iuEx7IaW8AN7lsKH/UDucAU4RvEYB2TJVJ6gtKQkJg5Pa MoIiCzaWTjFmkFbLnSF4hTJeDfn42DWBE6JB8wRRfhOnTvce+vCtEY5EeEDy2038UgTUJm oBc9X5mYIk+RHJBh+7+D4k7MkA+DqgY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655708948; a=rsa-sha256; cv=none; b=jVZrYE2fO4iD6sn1ehPGmn4CEBnCd+/tfxx8jEnz6OmGQ3rLEi/osZFY/A40oHL9nqpw/C KdURbXpRRHRBI4bMvQimdDo//WWal7nOOmC8BI8clHS7akL45y9o3CwuDEpJURcglyZXO8 0OcOfvqo2i8VWltOp/DK68GqRaLYpz8= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=jtMJWL4H; dmarc=pass (policy=none) header.from=gmail.com; spf=none (imf01.hostedemail.com: domain of MAILER-DAEMON@hostedemail.com has no SPF policy when checking 216.40.44.17) smtp.mailfrom=MAILER-DAEMON@hostedemail.com X-HE-Tag-Orig: 1655708947-929320 Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=jtMJWL4H; dmarc=pass (policy=none) header.from=gmail.com; spf=none (imf01.hostedemail.com: domain of MAILER-DAEMON@hostedemail.com has no SPF policy when checking 216.40.44.17) smtp.mailfrom=MAILER-DAEMON@hostedemail.com X-Rspamd-Server: rspam12 X-Rspam-User: X-Stat-Signature: aiqms5uszg1abmrxkdg1ir1ppje8wwaq X-Rspamd-Queue-Id: 6DA1440010 X-HE-Tag: 1655708948-793671 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: From: Nadav Amit Test UFFDIO_*_MODE_ACCESS_LIKELY and UFFDIO_*_MODE_WRITE_LIKELY. Introduce a modifier to trigger the use of the hints. Cc: Mike Kravetz Cc: Hugh Dickins Cc: Andrew Morton Cc: Axel Rasmussen Cc: Peter Xu Cc: David Hildenbrand Cc: Mike Rapoport Signed-off-by: Nadav Amit --- tools/testing/selftests/vm/userfaultfd.c | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index 28b881523d15..01680a7d1cdd 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -88,6 +88,8 @@ static volatile bool test_uffdio_zeropage_eexist = true; static bool test_uffdio_wp = true; /* Whether to test uffd minor faults */ static bool test_uffdio_minor = false; +static bool test_access_likely; +static bool test_write_likely; static bool map_shared; static int shm_fd; @@ -550,6 +552,12 @@ static void wp_range(int ufd, __u64 start, __u64 len, bool wp) /* Undo write-protect, do wakeup after that */ prms.mode = wp ? UFFDIO_WRITEPROTECT_MODE_WP : 0; + if (test_access_likely) + prms.mode |= UFFDIO_WRITEPROTECT_MODE_ACCESS_LIKELY; + + if (test_write_likely) + prms.mode |= UFFDIO_WRITEPROTECT_MODE_WRITE_LIKELY; + if (ioctl(ufd, UFFDIO_WRITEPROTECT, &prms)) err("clear WP failed: address=0x%"PRIx64, (uint64_t)start); } @@ -653,6 +661,13 @@ static int __copy_page(int ufd, unsigned long offset, bool retry) uffdio_copy.mode = UFFDIO_COPY_MODE_WP; else uffdio_copy.mode = 0; + + if (test_access_likely) + uffdio_copy.mode |= UFFDIO_COPY_MODE_ACCESS_LIKELY; + + if (test_write_likely) + uffdio_copy.mode |= UFFDIO_COPY_MODE_WRITE_LIKELY; + uffdio_copy.copy = 0; if (ioctl(ufd, UFFDIO_COPY, &uffdio_copy)) { /* real retval in ufdio_copy.copy */ @@ -1080,6 +1095,13 @@ static int __uffdio_zeropage(int ufd, unsigned long offset, bool retry) uffdio_zeropage.range.start = (unsigned long) area_dst + offset; uffdio_zeropage.range.len = page_size; uffdio_zeropage.mode = 0; + + if (test_access_likely) + uffdio_zeropage.mode |= UFFDIO_ZEROPAGE_MODE_ACCESS_LIKELY; + + if (test_write_likely) + uffdio_zeropage.mode |= UFFDIO_ZEROPAGE_MODE_WRITE_LIKELY; + ret = ioctl(ufd, UFFDIO_ZEROPAGE, &uffdio_zeropage); res = uffdio_zeropage.zeropage; if (ret) { @@ -1648,6 +1670,10 @@ static void parse_test_type_arg(const char *raw_type) set_test_type(token); else if (!strcmp(token, "dev")) test_dev_userfaultfd = true; + else if (!strcmp(token, "access_likely")) + test_access_likely = true; + else if (!strcmp(token, "write_likely")) + test_write_likely = true; else err("unrecognized test mod '%s'", token); }