Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp25711ybv; Tue, 4 Feb 2020 15:42:44 -0800 (PST) X-Google-Smtp-Source: APXvYqx76VaQIoSwKa/dLc+ZwOPCrg/Tn6qPwNH0MSPBrNQXdYVVypn6WQ23vMuk4WSAsWdpaUlK X-Received: by 2002:aca:5d57:: with SMTP id r84mr1088101oib.42.1580859764062; Tue, 04 Feb 2020 15:42:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580859764; cv=none; d=google.com; s=arc-20160816; b=Ev0HROtXyu6iKTWmBz+6vDu+wUZvwtsPu+plWvL16ZY4BRHfbGBtSyOo9Y4kidiojZ 7fVsL9KS5l8iOmjXyre3Brj/MeMKPSXxC4R9UmUhd87lEfOP2ilsnEhiUmhufGvfjD6X 0qz+l5x8qq1bds11w80mqvRHZPELt6ej3LYfoiZVIMvXeugIb1ATGG8fqYMg+aPzbpQT 6H0FnPSkoyQaYT96/fjrAMKITzmTy5Gw6H+THuiiTV5wv63gKyoTfun6BzoifjcZNP8y wBjwtcYsBaRRMrQTs9ksE/2bn1dJGZrwek2gyZobhDyvaQhM0i5dxmDc0ShAJizHOo8S msPQ== 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=p8jVMXkU/AOD6CgGXpT+qSuB3Zba1P74wymVIHxrBWs=; b=a8iH0yoSG8Xi1jLRTBRyBu5QoPkzUKWJCaRLCr6wWWCpLw7B7/bnNbgqG+Bmo3i2KU nENNw45lrOTVLv0ZQQXiJI+QqjAb6TXC1MKnDSOcIA/R0X+f9aw33QOkTqjyuLS+a1Rs cpV+mSYi8iPBsjkHPCIrE4m1ykKVdF4X4mxthQ9pkNlygir711I+B9ZLRCLWtZD3VDqn 8ddNHktpdor/Jo2+VwnJxmkzlcmo/GW6Ndg4Yxfsiv1KKm+ZJRuhIDURz5mHj9Z2nuQX mGK6x3dwmR/NSAK5CnmnkiuSmbhF2uYEsffvYmcp9XySr0a9pDm5Cdrknw00OXTMxdrB lJ4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=Nk0Ow+Q0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id s7si12481940otd.280.2020.02.04.15.42.32; Tue, 04 Feb 2020 15:42:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=Nk0Ow+Q0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1727824AbgBDXle (ORCPT + 99 others); Tue, 4 Feb 2020 18:41:34 -0500 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:8831 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727757AbgBDXl0 (ORCPT ); Tue, 4 Feb 2020 18:41:26 -0500 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Tue, 04 Feb 2020 15:40:58 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Tue, 04 Feb 2020 15:41:22 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Tue, 04 Feb 2020 15:41:22 -0800 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 4 Feb 2020 23:41:22 +0000 Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Tue, 4 Feb 2020 23:41:21 +0000 Received: from blueforge.nvidia.com (Not Verified[10.110.48.28]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Tue, 04 Feb 2020 15:41:21 -0800 From: John Hubbard To: Andrew Morton CC: Al Viro , Christoph Hellwig , Dan Williams , Dave Chinner , Ira Weiny , Jan Kara , Jason Gunthorpe , Jonathan Corbet , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , "Kirill A . Shutemov" , Michal Hocko , Mike Kravetz , Shuah Khan , Vlastimil Babka , Matthew Wilcox , , , , , , LKML , John Hubbard Subject: [PATCH v4 11/12] mm/gup_benchmark: support pin_user_pages() and related calls Date: Tue, 4 Feb 2020 15:41:16 -0800 Message-ID: <20200204234117.2974687-12-jhubbard@nvidia.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200204234117.2974687-1-jhubbard@nvidia.com> References: <20200204234117.2974687-1-jhubbard@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=1580859659; bh=p8jVMXkU/AOD6CgGXpT+qSuB3Zba1P74wymVIHxrBWs=; 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=Nk0Ow+Q0RCg7KxuCkZ/ixtOr5VK7cRAJuJrO5FiBhT7Kl9fAqHcD+cQ3SgaUCL1lP ur1nMVC+NStRUveeaAuNMV/bmJae3Etbwyp3fGJCn9z9lzRjtKWDfwaxadpzfvuyyo MsNEl4J6ccF/8m2xq6xRETC+0dF+ffmOEn5ZJlEICjNuGVqfO8N/OFsYPJ61yIjpzI Wva+38vAabpvKLvEWwSS09W0kC7gm1F7QM1MCL77lhX127uhdErGujVbpG7YQbOii1 AMp6RoUTP72WYycek0n3PlvW42/NAsEbe9pJ1JcPL4V8ROkCd7PZZznC7jIKvrVl4I +/NPa3xNHgG7g== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Up until now, gup_benchmark supported testing of the following kernel functions: * get_user_pages(): via the '-U' command line option * get_user_pages_longterm(): via the '-L' command line option * get_user_pages_fast(): as the default (no options required) Add test coverage for the new corresponding pin_*() functions: * pin_user_pages_fast(): via the '-a' command line option * pin_user_pages(): via the '-b' command line option Also, add an option for clarity: '-u' for what is now (still) the default choice: get_user_pages_fast(). Also, for the commands that set FOLL_PIN, verify that the pages really are dma-pinned, via the new is_dma_pinned() routine. Those commands are: PIN_FAST_BENCHMARK : calls pin_user_pages_fast() PIN_BENCHMARK : calls pin_user_pages() In between the calls to pin_*() and unpin_user_pages(), check each page: if page_maybe_dma_pinned() returns false, then WARN and return. Do this outside of the benchmark timestamps, so that it doesn't affect reported times. Reviewed-by: Ira Weiny Signed-off-by: John Hubbard --- mm/gup_benchmark.c | 71 ++++++++++++++++++++-- tools/testing/selftests/vm/gup_benchmark.c | 15 ++++- 2 files changed, 80 insertions(+), 6 deletions(-) diff --git a/mm/gup_benchmark.c b/mm/gup_benchmark.c index 8dba38e79a9f..be690fa66a46 100644 --- a/mm/gup_benchmark.c +++ b/mm/gup_benchmark.c @@ -8,6 +8,8 @@ #define GUP_FAST_BENCHMARK _IOWR('g', 1, struct gup_benchmark) #define GUP_LONGTERM_BENCHMARK _IOWR('g', 2, struct gup_benchmark) #define GUP_BENCHMARK _IOWR('g', 3, struct gup_benchmark) +#define PIN_FAST_BENCHMARK _IOWR('g', 4, struct gup_benchmark) +#define PIN_BENCHMARK _IOWR('g', 5, struct gup_benchmark) =20 struct gup_benchmark { __u64 get_delta_usec; @@ -19,6 +21,48 @@ struct gup_benchmark { __u64 expansion[10]; /* For future use */ }; =20 +static void put_back_pages(unsigned int cmd, struct page **pages, + unsigned long nr_pages) +{ + unsigned long i; + + switch (cmd) { + case GUP_FAST_BENCHMARK: + case GUP_LONGTERM_BENCHMARK: + case GUP_BENCHMARK: + for (i =3D 0; i < nr_pages; i++) + put_page(pages[i]); + break; + + case PIN_FAST_BENCHMARK: + case PIN_BENCHMARK: + unpin_user_pages(pages, nr_pages); + break; + } +} + +static void verify_dma_pinned(unsigned int cmd, struct page **pages, + unsigned long nr_pages) +{ + unsigned long i; + struct page *page; + + switch (cmd) { + case PIN_FAST_BENCHMARK: + case PIN_BENCHMARK: + for (i =3D 0; i < nr_pages; i++) { + page =3D pages[i]; + if (WARN(!page_maybe_dma_pinned(page), + "pages[%lu] is NOT dma-pinned\n", i)) { + + dump_page(page, "gup_benchmark failure"); + break; + } + } + break; + } +} + static int __gup_benchmark_ioctl(unsigned int cmd, struct gup_benchmark *gup) { @@ -66,6 +110,14 @@ static int __gup_benchmark_ioctl(unsigned int cmd, nr =3D get_user_pages(addr, nr, gup->flags, pages + i, NULL); break; + case PIN_FAST_BENCHMARK: + nr =3D pin_user_pages_fast(addr, nr, gup->flags, + pages + i); + break; + case PIN_BENCHMARK: + nr =3D pin_user_pages(addr, nr, gup->flags, pages + i, + NULL); + break; default: kvfree(pages); ret =3D -EINVAL; @@ -78,15 +130,22 @@ static int __gup_benchmark_ioctl(unsigned int cmd, } end_time =3D ktime_get(); =20 + /* Shifting the meaning of nr_pages: now it is actual number pinned: */ + nr_pages =3D i; + gup->get_delta_usec =3D ktime_us_delta(end_time, start_time); gup->size =3D addr - gup->addr; =20 + /* + * Take an un-benchmark-timed moment to verify DMA pinned + * state: print a warning if any non-dma-pinned pages are found: + */ + verify_dma_pinned(cmd, pages, nr_pages); + start_time =3D ktime_get(); - for (i =3D 0; i < nr_pages; i++) { - if (!pages[i]) - break; - put_page(pages[i]); - } + + put_back_pages(cmd, pages, nr_pages); + end_time =3D ktime_get(); gup->put_delta_usec =3D ktime_us_delta(end_time, start_time); =20 @@ -105,6 +164,8 @@ static long gup_benchmark_ioctl(struct file *filep, uns= igned int cmd, case GUP_FAST_BENCHMARK: case GUP_LONGTERM_BENCHMARK: case GUP_BENCHMARK: + case PIN_FAST_BENCHMARK: + case PIN_BENCHMARK: break; default: return -EINVAL; diff --git a/tools/testing/selftests/vm/gup_benchmark.c b/tools/testing/sel= ftests/vm/gup_benchmark.c index 389327e9b30a..43b4dfe161a2 100644 --- a/tools/testing/selftests/vm/gup_benchmark.c +++ b/tools/testing/selftests/vm/gup_benchmark.c @@ -18,6 +18,10 @@ #define GUP_LONGTERM_BENCHMARK _IOWR('g', 2, struct gup_benchmark) #define GUP_BENCHMARK _IOWR('g', 3, struct gup_benchmark) =20 +/* Similar to above, but use FOLL_PIN instead of FOLL_GET. */ +#define PIN_FAST_BENCHMARK _IOWR('g', 4, struct gup_benchmark) +#define PIN_BENCHMARK _IOWR('g', 5, struct gup_benchmark) + /* Just the flags we need, copied from mm.h: */ #define FOLL_WRITE 0x01 /* check pte is writable */ =20 @@ -40,8 +44,14 @@ int main(int argc, char **argv) char *file =3D "/dev/zero"; char *p; =20 - while ((opt =3D getopt(argc, argv, "m:r:n:f:tTLUwSH")) !=3D -1) { + while ((opt =3D getopt(argc, argv, "m:r:n:f:abtTLUuwSH")) !=3D -1) { switch (opt) { + case 'a': + cmd =3D PIN_FAST_BENCHMARK; + break; + case 'b': + cmd =3D PIN_BENCHMARK; + break; case 'm': size =3D atoi(optarg) * MB; break; @@ -63,6 +73,9 @@ int main(int argc, char **argv) case 'U': cmd =3D GUP_BENCHMARK; break; + case 'u': + cmd =3D GUP_FAST_BENCHMARK; + break; case 'w': write =3D 1; break; --=20 2.25.0