From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Hubbard Subject: [PATCH v6 22/24] mm/gup_benchmark: support pin_user_pages() and related calls Date: Tue, 19 Nov 2019 00:16:41 -0800 Message-ID: <20191119081643.1866232-23-jhubbard@nvidia.com> References: <20191119081643.1866232-1-jhubbard@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20191119081643.1866232-1-jhubbard@nvidia.com> Sender: linux-kernel-owner@vger.kernel.org To: Andrew Morton Cc: Al Viro , Alex Williamson , Benjamin Herrenschmidt , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Christoph Hellwig , Dan Williams , Daniel Vetter , Dave Chinner , David Airlie , "David S . Miller" , Ira Weiny , Jan Kara , Jason Gunthorpe , Jens Axboe , Jonathan Corbet , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Magnus Karlsson , Mauro Carvalho Chehab , Michael Ellerman M List-Id: dri-devel@lists.freedesktop.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(): via the '-c' command line option * pin_user_pages_fast(): 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 put_user_pages(), check each page: if page_dma_pinned() returns false, then WARN and return. Do this outside of the benchmark timestamps, so that it doesn't affect reported times. Cc: Ira Weiny Signed-off-by: John Hubbard --- mm/gup_benchmark.c | 65 ++++++++++++++++++++-- tools/testing/selftests/vm/gup_benchmark.c | 15 ++++- 2 files changed, 74 insertions(+), 6 deletions(-) diff --git a/mm/gup_benchmark.c b/mm/gup_benchmark.c index 7fc44d25eca7..1ac089ad815f 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,42 @@ struct gup_benchmark { __u64 expansion[10]; /* For future use */ }; =20 +static void put_back_pages(int cmd, struct page **pages, unsigned long nr_= pages) +{ + int 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: + put_user_pages(pages, nr_pages); + break; + } +} + +static void verify_dma_pinned(int cmd, struct page **pages, + unsigned long nr_pages) +{ + int i; + + switch (cmd) { + case PIN_FAST_BENCHMARK: + case PIN_BENCHMARK: + for (i =3D 0; i < nr_pages; i++) { + if (WARN(!page_dma_pinned(pages[i]), + "pages[%d] is NOT dma-pinned\n", i)) + break; + } + break; + } +} + static int __gup_benchmark_ioctl(unsigned int cmd, struct gup_benchmark *gup) { @@ -65,6 +103,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: return -1; } @@ -75,15 +121,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 @@ -101,6 +154,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.24.0 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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D193CC33CAE for ; Tue, 19 Nov 2019 08:17:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B2F8B20878 for ; Tue, 19 Nov 2019 08:17:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2F8B20878 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 42E0E89D40; Tue, 19 Nov 2019 08:17:32 +0000 (UTC) Received: from hqemgate16.nvidia.com (hqemgate16.nvidia.com [216.228.121.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 115B06EC95 for ; Tue, 19 Nov 2019 08:17:14 +0000 (UTC) Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Tue, 19 Nov 2019 00:17:14 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Tue, 19 Nov 2019 00:17:13 -0800 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Tue, 19 Nov 2019 00:17:13 -0800 Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 19 Nov 2019 08:17:12 +0000 Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Tue, 19 Nov 2019 08:17:12 +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, 19 Nov 2019 00:17:11 -0800 From: John Hubbard To: Andrew Morton Subject: [PATCH v6 22/24] mm/gup_benchmark: support pin_user_pages() and related calls Date: Tue, 19 Nov 2019 00:16:41 -0800 Message-ID: <20191119081643.1866232-23-jhubbard@nvidia.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119081643.1866232-1-jhubbard@nvidia.com> References: <20191119081643.1866232-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1574151434; bh=2VikNfsXV53SqX6j47kop4rTtKhfcK4SlvrERtv5mQ4=; 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=mmwTrIbnDGPIpH+C+BnpdAQMYVKoBl89yScxFV8p+kYiaM9MuUEioxSr+DrDopa61 OCdMfzhMrLcxOZzc9GdaYJ4ne5XtIEKssPq1dihsk1HlQNfvmcVDnbgNfC+TxYpkrU P7wkuu9dYIQuR732BApZBTVnvgg1Zp0nAgHtS4PC1lE8TPn1fget6/JYnnSq/FvKXk pCkDrxxQmMvCYAb63op43OflWyFVxdfCzU7NJvKHGbnn858g80NXsXwPh4CAv97deh NGKmsJLvSn8y4az2vQbP+JpKbqVqcvTZroDtJAykfPU8xO4II1T20i7tI4xNWomiRn R7XmdYlGZarWQ== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , Jan Kara , kvm@vger.kernel.org, linux-doc@vger.kernel.org, David Airlie , Dave Chinner , dri-devel@lists.freedesktop.org, LKML , linux-mm@kvack.org, Paul Mackerras , linux-kselftest@vger.kernel.org, Ira Weiny , Jonathan Corbet , linux-rdma@vger.kernel.org, Michael Ellerman , Christoph Hellwig , Jason Gunthorpe , Vlastimil Babka , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , linux-media@vger.kernel.org, Shuah Khan , John Hubbard , linux-block@vger.kernel.org, =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Al Viro , Dan Williams , Mauro Carvalho Chehab , Magnus Karlsson , Jens Axboe , netdev@vger.kernel.org, Alex Williamson , linux-fsdevel@vger.kernel.org, bpf@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, "David S . Miller" , Mike Kravetz Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191119081641.oDr7YzCxrXvMS26UMNNJWotz6fCWKjv7dElodOe6dC8@z> VXAgdW50aWwgbm93LCBndXBfYmVuY2htYXJrIHN1cHBvcnRlZCB0ZXN0aW5nIG9mIHRoZQpmb2xs b3dpbmcga2VybmVsIGZ1bmN0aW9uczoKCiogZ2V0X3VzZXJfcGFnZXMoKTogdmlhIHRoZSAnLVUn IGNvbW1hbmQgbGluZSBvcHRpb24KKiBnZXRfdXNlcl9wYWdlc19sb25ndGVybSgpOiB2aWEgdGhl ICctTCcgY29tbWFuZCBsaW5lIG9wdGlvbgoqIGdldF91c2VyX3BhZ2VzX2Zhc3QoKTogYXMgdGhl IGRlZmF1bHQgKG5vIG9wdGlvbnMgcmVxdWlyZWQpCgpBZGQgdGVzdCBjb3ZlcmFnZSBmb3IgdGhl IG5ldyBjb3JyZXNwb25kaW5nIHBpbl8qKCkgZnVuY3Rpb25zOgoKKiBwaW5fdXNlcl9wYWdlcygp OiB2aWEgdGhlICctYycgY29tbWFuZCBsaW5lIG9wdGlvbgoqIHBpbl91c2VyX3BhZ2VzX2Zhc3Qo KTogdmlhIHRoZSAnLWInIGNvbW1hbmQgbGluZSBvcHRpb24KCkFsc28sIGFkZCBhbiBvcHRpb24g Zm9yIGNsYXJpdHk6ICctdScgZm9yIHdoYXQgaXMgbm93IChzdGlsbCkgdGhlCmRlZmF1bHQgY2hv aWNlOiBnZXRfdXNlcl9wYWdlc19mYXN0KCkuCgpBbHNvLCBmb3IgdGhlIGNvbW1hbmRzIHRoYXQg c2V0IEZPTExfUElOLCB2ZXJpZnkgdGhhdCB0aGUgcGFnZXMKcmVhbGx5IGFyZSBkbWEtcGlubmVk LCB2aWEgdGhlIG5ldyBpc19kbWFfcGlubmVkKCkgcm91dGluZS4KVGhvc2UgY29tbWFuZHMgYXJl OgoKICAgIFBJTl9GQVNUX0JFTkNITUFSSyAgICAgOiBjYWxscyBwaW5fdXNlcl9wYWdlc19mYXN0 KCkKICAgIFBJTl9CRU5DSE1BUksgICAgICAgICAgOiBjYWxscyBwaW5fdXNlcl9wYWdlcygpCgpJ biBiZXR3ZWVuIHRoZSBjYWxscyB0byBwaW5fKigpIGFuZCBwdXRfdXNlcl9wYWdlcygpLApjaGVj ayBlYWNoIHBhZ2U6IGlmIHBhZ2VfZG1hX3Bpbm5lZCgpIHJldHVybnMgZmFsc2UsIHRoZW4KV0FS TiBhbmQgcmV0dXJuLgoKRG8gdGhpcyBvdXRzaWRlIG9mIHRoZSBiZW5jaG1hcmsgdGltZXN0YW1w cywgc28gdGhhdCBpdCBkb2Vzbid0CmFmZmVjdCByZXBvcnRlZCB0aW1lcy4KCkNjOiBJcmEgV2Vp bnkgPGlyYS53ZWlueUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEpvaG4gSHViYmFyZCA8amh1 YmJhcmRAbnZpZGlhLmNvbT4KLS0tCiBtbS9ndXBfYmVuY2htYXJrLmMgICAgICAgICAgICAgICAg ICAgICAgICAgfCA2NSArKysrKysrKysrKysrKysrKysrKy0tCiB0b29scy90ZXN0aW5nL3NlbGZ0 ZXN0cy92bS9ndXBfYmVuY2htYXJrLmMgfCAxNSArKysrLQogMiBmaWxlcyBjaGFuZ2VkLCA3NCBp bnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL21tL2d1cF9iZW5jaG1h cmsuYyBiL21tL2d1cF9iZW5jaG1hcmsuYwppbmRleCA3ZmM0NGQyNWVjYTcuLjFhYzA4OWFkODE1 ZiAxMDA2NDQKLS0tIGEvbW0vZ3VwX2JlbmNobWFyay5jCisrKyBiL21tL2d1cF9iZW5jaG1hcmsu YwpAQCAtOCw2ICs4LDggQEAKICNkZWZpbmUgR1VQX0ZBU1RfQkVOQ0hNQVJLCV9JT1dSKCdnJywg MSwgc3RydWN0IGd1cF9iZW5jaG1hcmspCiAjZGVmaW5lIEdVUF9MT05HVEVSTV9CRU5DSE1BUksJ X0lPV1IoJ2cnLCAyLCBzdHJ1Y3QgZ3VwX2JlbmNobWFyaykKICNkZWZpbmUgR1VQX0JFTkNITUFS SwkJX0lPV1IoJ2cnLCAzLCBzdHJ1Y3QgZ3VwX2JlbmNobWFyaykKKyNkZWZpbmUgUElOX0ZBU1Rf QkVOQ0hNQVJLCV9JT1dSKCdnJywgNCwgc3RydWN0IGd1cF9iZW5jaG1hcmspCisjZGVmaW5lIFBJ Tl9CRU5DSE1BUksJCV9JT1dSKCdnJywgNSwgc3RydWN0IGd1cF9iZW5jaG1hcmspCiAKIHN0cnVj dCBndXBfYmVuY2htYXJrIHsKIAlfX3U2NCBnZXRfZGVsdGFfdXNlYzsKQEAgLTE5LDYgKzIxLDQy IEBAIHN0cnVjdCBndXBfYmVuY2htYXJrIHsKIAlfX3U2NCBleHBhbnNpb25bMTBdOwkvKiBGb3Ig ZnV0dXJlIHVzZSAqLwogfTsKIAorc3RhdGljIHZvaWQgcHV0X2JhY2tfcGFnZXMoaW50IGNtZCwg c3RydWN0IHBhZ2UgKipwYWdlcywgdW5zaWduZWQgbG9uZyBucl9wYWdlcykKK3sKKwlpbnQgaTsK KworCXN3aXRjaCAoY21kKSB7CisJY2FzZSBHVVBfRkFTVF9CRU5DSE1BUks6CisJY2FzZSBHVVBf TE9OR1RFUk1fQkVOQ0hNQVJLOgorCWNhc2UgR1VQX0JFTkNITUFSSzoKKwkJZm9yIChpID0gMDsg aSA8IG5yX3BhZ2VzOyBpKyspCisJCQlwdXRfcGFnZShwYWdlc1tpXSk7CisJCWJyZWFrOworCisJ Y2FzZSBQSU5fRkFTVF9CRU5DSE1BUks6CisJY2FzZSBQSU5fQkVOQ0hNQVJLOgorCQlwdXRfdXNl cl9wYWdlcyhwYWdlcywgbnJfcGFnZXMpOworCQlicmVhazsKKwl9Cit9CisKK3N0YXRpYyB2b2lk IHZlcmlmeV9kbWFfcGlubmVkKGludCBjbWQsIHN0cnVjdCBwYWdlICoqcGFnZXMsCisJCQkgICAg ICB1bnNpZ25lZCBsb25nIG5yX3BhZ2VzKQoreworCWludCBpOworCisJc3dpdGNoIChjbWQpIHsK KwljYXNlIFBJTl9GQVNUX0JFTkNITUFSSzoKKwljYXNlIFBJTl9CRU5DSE1BUks6CisJCWZvciAo aSA9IDA7IGkgPCBucl9wYWdlczsgaSsrKSB7CisJCQlpZiAoV0FSTighcGFnZV9kbWFfcGlubmVk KHBhZ2VzW2ldKSwKKwkJCQkgInBhZ2VzWyVkXSBpcyBOT1QgZG1hLXBpbm5lZFxuIiwgaSkpCisJ CQkJYnJlYWs7CisJCX0KKwkJYnJlYWs7CisJfQorfQorCiBzdGF0aWMgaW50IF9fZ3VwX2JlbmNo bWFya19pb2N0bCh1bnNpZ25lZCBpbnQgY21kLAogCQlzdHJ1Y3QgZ3VwX2JlbmNobWFyayAqZ3Vw KQogewpAQCAtNjUsNiArMTAzLDE0IEBAIHN0YXRpYyBpbnQgX19ndXBfYmVuY2htYXJrX2lvY3Rs KHVuc2lnbmVkIGludCBjbWQsCiAJCQluciA9IGdldF91c2VyX3BhZ2VzKGFkZHIsIG5yLCBndXAt PmZsYWdzLCBwYWdlcyArIGksCiAJCQkJCSAgICBOVUxMKTsKIAkJCWJyZWFrOworCQljYXNlIFBJ Tl9GQVNUX0JFTkNITUFSSzoKKwkJCW5yID0gcGluX3VzZXJfcGFnZXNfZmFzdChhZGRyLCBuciwg Z3VwLT5mbGFncywKKwkJCQkJCSBwYWdlcyArIGkpOworCQkJYnJlYWs7CisJCWNhc2UgUElOX0JF TkNITUFSSzoKKwkJCW5yID0gcGluX3VzZXJfcGFnZXMoYWRkciwgbnIsIGd1cC0+ZmxhZ3MsIHBh Z2VzICsgaSwKKwkJCQkJICAgIE5VTEwpOworCQkJYnJlYWs7CiAJCWRlZmF1bHQ6CiAJCQlyZXR1 cm4gLTE7CiAJCX0KQEAgLTc1LDE1ICsxMjEsMjIgQEAgc3RhdGljIGludCBfX2d1cF9iZW5jaG1h cmtfaW9jdGwodW5zaWduZWQgaW50IGNtZCwKIAl9CiAJZW5kX3RpbWUgPSBrdGltZV9nZXQoKTsK IAorCS8qIFNoaWZ0aW5nIHRoZSBtZWFuaW5nIG9mIG5yX3BhZ2VzOiBub3cgaXQgaXMgYWN0dWFs IG51bWJlciBwaW5uZWQ6ICovCisJbnJfcGFnZXMgPSBpOworCiAJZ3VwLT5nZXRfZGVsdGFfdXNl YyA9IGt0aW1lX3VzX2RlbHRhKGVuZF90aW1lLCBzdGFydF90aW1lKTsKIAlndXAtPnNpemUgPSBh ZGRyIC0gZ3VwLT5hZGRyOwogCisJLyoKKwkgKiBUYWtlIGFuIHVuLWJlbmNobWFyay10aW1lZCBt b21lbnQgdG8gdmVyaWZ5IERNQSBwaW5uZWQKKwkgKiBzdGF0ZTogcHJpbnQgYSB3YXJuaW5nIGlm IGFueSBub24tZG1hLXBpbm5lZCBwYWdlcyBhcmUgZm91bmQ6CisJICovCisJdmVyaWZ5X2RtYV9w aW5uZWQoY21kLCBwYWdlcywgbnJfcGFnZXMpOworCiAJc3RhcnRfdGltZSA9IGt0aW1lX2dldCgp OwotCWZvciAoaSA9IDA7IGkgPCBucl9wYWdlczsgaSsrKSB7Ci0JCWlmICghcGFnZXNbaV0pCi0J CQlicmVhazsKLQkJcHV0X3BhZ2UocGFnZXNbaV0pOwotCX0KKworCXB1dF9iYWNrX3BhZ2VzKGNt ZCwgcGFnZXMsIG5yX3BhZ2VzKTsKKwogCWVuZF90aW1lID0ga3RpbWVfZ2V0KCk7CiAJZ3VwLT5w dXRfZGVsdGFfdXNlYyA9IGt0aW1lX3VzX2RlbHRhKGVuZF90aW1lLCBzdGFydF90aW1lKTsKIApA QCAtMTAxLDYgKzE1NCw4IEBAIHN0YXRpYyBsb25nIGd1cF9iZW5jaG1hcmtfaW9jdGwoc3RydWN0 IGZpbGUgKmZpbGVwLCB1bnNpZ25lZCBpbnQgY21kLAogCWNhc2UgR1VQX0ZBU1RfQkVOQ0hNQVJL OgogCWNhc2UgR1VQX0xPTkdURVJNX0JFTkNITUFSSzoKIAljYXNlIEdVUF9CRU5DSE1BUks6CisJ Y2FzZSBQSU5fRkFTVF9CRU5DSE1BUks6CisJY2FzZSBQSU5fQkVOQ0hNQVJLOgogCQlicmVhazsK IAlkZWZhdWx0OgogCQlyZXR1cm4gLUVJTlZBTDsKZGlmZiAtLWdpdCBhL3Rvb2xzL3Rlc3Rpbmcv c2VsZnRlc3RzL3ZtL2d1cF9iZW5jaG1hcmsuYyBiL3Rvb2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL3Zt L2d1cF9iZW5jaG1hcmsuYwppbmRleCAzODkzMjdlOWIzMGEuLjQzYjRkZmUxNjFhMiAxMDA2NDQK LS0tIGEvdG9vbHMvdGVzdGluZy9zZWxmdGVzdHMvdm0vZ3VwX2JlbmNobWFyay5jCisrKyBiL3Rv b2xzL3Rlc3Rpbmcvc2VsZnRlc3RzL3ZtL2d1cF9iZW5jaG1hcmsuYwpAQCAtMTgsNiArMTgsMTAg QEAKICNkZWZpbmUgR1VQX0xPTkdURVJNX0JFTkNITUFSSwlfSU9XUignZycsIDIsIHN0cnVjdCBn dXBfYmVuY2htYXJrKQogI2RlZmluZSBHVVBfQkVOQ0hNQVJLCQlfSU9XUignZycsIDMsIHN0cnVj dCBndXBfYmVuY2htYXJrKQogCisvKiBTaW1pbGFyIHRvIGFib3ZlLCBidXQgdXNlIEZPTExfUElO IGluc3RlYWQgb2YgRk9MTF9HRVQuICovCisjZGVmaW5lIFBJTl9GQVNUX0JFTkNITUFSSwlfSU9X UignZycsIDQsIHN0cnVjdCBndXBfYmVuY2htYXJrKQorI2RlZmluZSBQSU5fQkVOQ0hNQVJLCQlf SU9XUignZycsIDUsIHN0cnVjdCBndXBfYmVuY2htYXJrKQorCiAvKiBKdXN0IHRoZSBmbGFncyB3 ZSBuZWVkLCBjb3BpZWQgZnJvbSBtbS5oOiAqLwogI2RlZmluZSBGT0xMX1dSSVRFCTB4MDEJLyog Y2hlY2sgcHRlIGlzIHdyaXRhYmxlICovCiAKQEAgLTQwLDggKzQ0LDE0IEBAIGludCBtYWluKGlu dCBhcmdjLCBjaGFyICoqYXJndikKIAljaGFyICpmaWxlID0gIi9kZXYvemVybyI7CiAJY2hhciAq cDsKIAotCXdoaWxlICgob3B0ID0gZ2V0b3B0KGFyZ2MsIGFyZ3YsICJtOnI6bjpmOnRUTFV3U0gi KSkgIT0gLTEpIHsKKwl3aGlsZSAoKG9wdCA9IGdldG9wdChhcmdjLCBhcmd2LCAibTpyOm46Zjph YnRUTFV1d1NIIikpICE9IC0xKSB7CiAJCXN3aXRjaCAob3B0KSB7CisJCWNhc2UgJ2EnOgorCQkJ Y21kID0gUElOX0ZBU1RfQkVOQ0hNQVJLOworCQkJYnJlYWs7CisJCWNhc2UgJ2InOgorCQkJY21k ID0gUElOX0JFTkNITUFSSzsKKwkJCWJyZWFrOwogCQljYXNlICdtJzoKIAkJCXNpemUgPSBhdG9p KG9wdGFyZykgKiBNQjsKIAkJCWJyZWFrOwpAQCAtNjMsNiArNzMsOSBAQCBpbnQgbWFpbihpbnQg YXJnYywgY2hhciAqKmFyZ3YpCiAJCWNhc2UgJ1UnOgogCQkJY21kID0gR1VQX0JFTkNITUFSSzsK IAkJCWJyZWFrOworCQljYXNlICd1JzoKKwkJCWNtZCA9IEdVUF9GQVNUX0JFTkNITUFSSzsKKwkJ CWJyZWFrOwogCQljYXNlICd3JzoKIAkJCXdyaXRlID0gMTsKIAkJCWJyZWFrOwotLSAKMi4yNC4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=