Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1020770ybt; Fri, 19 Jun 2020 21:52:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqZ1DdLgv8VnmkcvzDIMoqmgmVqyJL8nWWqoMGXhBD5MQP2j81utb/2iJ7nOXfgskfUkXF X-Received: by 2002:a17:906:3951:: with SMTP id g17mr6782561eje.414.1592628742953; Fri, 19 Jun 2020 21:52:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592628742; cv=none; d=google.com; s=arc-20160816; b=hXPzeagkHaw4GCps7A00LFLULwwi6tNRk3ZAZjZlDSceHWTGem5ZpiL7GudiyjxeTM 0vCny6cGFA4SYhEfZVtSMob0jCQIDv8aUOTNK5QPWw4Yyl74BOzf6r1TtPv58U1k2MXZ tthFU2NVOq+09EAdtLKB1rkCPxgkkLyxToaiXUE1PwfvykQxg8Gy6EMlEGwJ51tbxTbA 6bNiu9Ulg7UMyYw5Gx/9t3UibQbzvaB5Oltd2oYjTZQKWsgn/m4/maDogTYgoNT9yqA6 ZkB32CnYiMF3pD95QEOquBlmAsUCj7TammcrNUcxSEiIP+FlFlCYx//P3FatrM3JZWF+ 35eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=k7QoIugfRNYaJpI159ZReC8oMyxhpBcMD+UOjK/st/s=; b=hjLyp/pacZHMv3GfyVA8bMlrx6Hcl5bU3jVO2SZBAHPOzHdSvE4kGOaYq26ivxHzxL rn3RJRz10i6VgP6ewK67cgjbeqmojWmUny0/SUwyEWtkvwVqdgAy8hOerZ67I4aIvywk ls+Afr9UQ67lDCwj1P9decse5qlkYODpnJkiQZjfIv1jIBLNDncqzYR4zCeddHvoTjIg KoD6X38mGO/e/wMOmwaLLaFkCVjWkS/co4XbLIacABb7zPMSzsXVN3mjR7YJKWd4xQu8 YQNnhai/vuTIYucGMHBCu/3Elg0cyNi2anRt9BYlak8qcEgn/sDSnesFlkLbGstxJXwK XFJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=JoBibeym; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z3si4185476ejx.584.2020.06.19.21.52.00; Fri, 19 Jun 2020 21:52:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=JoBibeym; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728575AbgFSV6I (ORCPT + 99 others); Fri, 19 Jun 2020 17:58:08 -0400 Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:2238 "EHLO hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726220AbgFSV5K (ORCPT ); Fri, 19 Jun 2020 17:57:10 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Fri, 19 Jun 2020 14:56:54 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Fri, 19 Jun 2020 14:57:07 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Fri, 19 Jun 2020 14:57:07 -0700 Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 19 Jun 2020 21:56:59 +0000 Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Fri, 19 Jun 2020 21:57:00 +0000 Received: from rcampbell-dev.nvidia.com (Not Verified[10.110.48.66]) by hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Fri, 19 Jun 2020 14:56:59 -0700 From: Ralph Campbell To: , , , , CC: Jerome Glisse , John Hubbard , Christoph Hellwig , Jason Gunthorpe , "Ben Skeggs" , Andrew Morton , Shuah Khan , Ralph Campbell Subject: [PATCH 11/16] hmm: add tests for HMM_PFN_COMPOUND flag Date: Fri, 19 Jun 2020 14:56:44 -0700 Message-ID: <20200619215649.32297-12-rcampbell@nvidia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200619215649.32297-1-rcampbell@nvidia.com> References: <20200619215649.32297-1-rcampbell@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1592603814; bh=k7QoIugfRNYaJpI159ZReC8oMyxhpBcMD+UOjK/st/s=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:X-NVConfidentiality: Content-Transfer-Encoding:Content-Type; b=JoBibeymQXzrPrKebaE3+SEvRBN/askNVO/KJ6GszN1rte9sfO/OIeA9ZTJZwAdFt ywT8sec2lhJ4LUowpPuiTxX6BBK15xgalYDGhkTXe9P+xvvwWhymp6D1qv8ZnekmDd ZXp3zLyVZMS0FjVdckWgiZAQVTqqGRMmDAEQ6lrv47ItPu0Q37kFgT3Tw2NCOyiHQZ hceJe14NhYeaHM90a0E0IslsUDCoIeV3iXmaFlLYhbzebCzefgDtT9UHOu2OdT1Gbj kgRRLiO2LgQhxHPOdsA8s6Y5vqsTDKtdG7eDScN40tCe4whjSgu+hN7q1Lejf+riOv CBgfviawcsIeg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add some sanity tests for hmm_range_fault() returning the HMM_PFN_COMPOUND flag. Signed-off-by: Ralph Campbell --- lib/test_hmm.c | 2 + lib/test_hmm_uapi.h | 2 + tools/testing/selftests/vm/hmm-tests.c | 76 ++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/lib/test_hmm.c b/lib/test_hmm.c index 50bdf041770a..db5d2e8d7420 100644 --- a/lib/test_hmm.c +++ b/lib/test_hmm.c @@ -779,6 +779,8 @@ static void dmirror_mkentry(struct dmirror *dmirror, st= ruct hmm_range *range, *perm |=3D HMM_DMIRROR_PROT_WRITE; else *perm |=3D HMM_DMIRROR_PROT_READ; + if (entry & HMM_PFN_COMPOUND) + *perm |=3D HMM_DMIRROR_PROT_COMPOUND; } =20 static bool dmirror_snapshot_invalidate(struct mmu_interval_notifier *mni, diff --git a/lib/test_hmm_uapi.h b/lib/test_hmm_uapi.h index 67b3b2e6ff5d..21cf4da6f020 100644 --- a/lib/test_hmm_uapi.h +++ b/lib/test_hmm_uapi.h @@ -40,6 +40,7 @@ struct hmm_dmirror_cmd { * HMM_DMIRROR_PROT_NONE: unpopulated PTE or PTE with no access * HMM_DMIRROR_PROT_READ: read-only PTE * HMM_DMIRROR_PROT_WRITE: read/write PTE + * HMM_DMIRROR_PROT_COMPOUND: compound page is fully mapped by same permis= sions * HMM_DMIRROR_PROT_ZERO: special read-only zero page * HMM_DMIRROR_PROT_DEV_PRIVATE_LOCAL: Migrated device private page on the * device the ioctl() is made @@ -51,6 +52,7 @@ enum { HMM_DMIRROR_PROT_NONE =3D 0x00, HMM_DMIRROR_PROT_READ =3D 0x01, HMM_DMIRROR_PROT_WRITE =3D 0x02, + HMM_DMIRROR_PROT_COMPOUND =3D 0x04, HMM_DMIRROR_PROT_ZERO =3D 0x10, HMM_DMIRROR_PROT_DEV_PRIVATE_LOCAL =3D 0x20, HMM_DMIRROR_PROT_DEV_PRIVATE_REMOTE =3D 0x30, diff --git a/tools/testing/selftests/vm/hmm-tests.c b/tools/testing/selftes= ts/vm/hmm-tests.c index e2a36783e99d..e0fa864d03fa 100644 --- a/tools/testing/selftests/vm/hmm-tests.c +++ b/tools/testing/selftests/vm/hmm-tests.c @@ -1301,6 +1301,82 @@ TEST_F(hmm2, snapshot) hmm_buffer_free(buffer); } =20 +/* + * Test the hmm_range_fault() HMM_PFN_COMPOUND flag for large pages that + * should be mapped by a large page table entry. + */ +TEST_F(hmm, compound) +{ + struct hmm_buffer *buffer; + unsigned long npages; + unsigned long size; + int *ptr; + unsigned char *m; + int ret; + long pagesizes[4]; + int n, idx; + unsigned long i; + + /* Skip test if we can't allocate a hugetlbfs page. */ + + n =3D gethugepagesizes(pagesizes, 4); + if (n <=3D 0) + return; + for (idx =3D 0; --n > 0; ) { + if (pagesizes[n] < pagesizes[idx]) + idx =3D n; + } + size =3D ALIGN(TWOMEG, pagesizes[idx]); + npages =3D size >> self->page_shift; + + buffer =3D malloc(sizeof(*buffer)); + ASSERT_NE(buffer, NULL); + + buffer->ptr =3D get_hugepage_region(size, GHR_STRICT); + if (buffer->ptr =3D=3D NULL) { + free(buffer); + return; + } + + buffer->size =3D size; + buffer->mirror =3D malloc(npages); + ASSERT_NE(buffer->mirror, NULL); + + /* Initialize the pages the device will snapshot in buffer->ptr. */ + for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) + ptr[i] =3D i; + + /* Simulate a device snapshotting CPU pagetables. */ + ret =3D hmm_dmirror_cmd(self->fd, HMM_DMIRROR_SNAPSHOT, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Check what the device saw. */ + m =3D buffer->mirror; + for (i =3D 0; i < npages; ++i) + ASSERT_EQ(m[i], HMM_DMIRROR_PROT_WRITE | + HMM_DMIRROR_PROT_COMPOUND); + + /* Make the region read-only. */ + ret =3D mprotect(buffer->ptr, size, PROT_READ); + ASSERT_EQ(ret, 0); + + /* Simulate a device snapshotting CPU pagetables. */ + ret =3D hmm_dmirror_cmd(self->fd, HMM_DMIRROR_SNAPSHOT, buffer, npages); + ASSERT_EQ(ret, 0); + ASSERT_EQ(buffer->cpages, npages); + + /* Check what the device saw. */ + m =3D buffer->mirror; + for (i =3D 0; i < npages; ++i) + ASSERT_EQ(m[i], HMM_DMIRROR_PROT_READ | + HMM_DMIRROR_PROT_COMPOUND); + + free_hugepage_region(buffer->ptr); + buffer->ptr =3D NULL; + hmm_buffer_free(buffer); +} + /* * Test two devices reading the same memory (double mapped). */ --=20 2.20.1