From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Hubbard Subject: [PATCH v2 07/18] infiniband: set FOLL_PIN, FOLL_LONGTERM via pin_longterm_pages*() Date: Sun, 3 Nov 2019 13:18:02 -0800 Message-ID: <20191103211813.213227-8-jhubbard@nvidia.com> References: <20191103211813.213227-1-jhubbard@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20191103211813.213227-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 Convert infiniband to use the new wrapper calls, and stop explicitly setting FOLL_LONGTERM at the call sites. The new pin_longterm_*() calls replace get_user_pages*() calls, and set both FOLL_LONGTERM and a new FOLL_PIN flag. The FOLL_PIN flag requires that the caller must return the pages via put_user_page*() calls, but infiniband was already doing that as part of an earlier commit. Reviewed-by: Ira Weiny Signed-off-by: John Hubbard --- drivers/infiniband/core/umem.c | 5 ++--- drivers/infiniband/core/umem_odp.c | 10 +++++----- drivers/infiniband/hw/hfi1/user_pages.c | 4 ++-- drivers/infiniband/hw/mthca/mthca_memfree.c | 3 +-- drivers/infiniband/hw/qib/qib_user_pages.c | 8 ++++---- drivers/infiniband/hw/qib/qib_user_sdma.c | 2 +- drivers/infiniband/hw/usnic/usnic_uiom.c | 9 ++++----- drivers/infiniband/sw/siw/siw_mem.c | 5 ++--- 8 files changed, 21 insertions(+), 25 deletions(-) diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.= c index 24244a2f68cc..c5a78d3e674b 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -272,11 +272,10 @@ struct ib_umem *ib_umem_get(struct ib_udata *udata, u= nsigned long addr, =20 while (npages) { down_read(&mm->mmap_sem); - ret =3D get_user_pages(cur_base, + ret =3D pin_longterm_pages(cur_base, min_t(unsigned long, npages, PAGE_SIZE / sizeof (struct page *)), - gup_flags | FOLL_LONGTERM, - page_list, NULL); + gup_flags, page_list, NULL); if (ret < 0) { up_read(&mm->mmap_sem); goto umem_release; diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/u= mem_odp.c index 163ff7ba92b7..a38b67b83db5 100644 --- a/drivers/infiniband/core/umem_odp.c +++ b/drivers/infiniband/core/umem_odp.c @@ -534,7 +534,7 @@ static int ib_umem_odp_map_dma_single_page( } else if (umem_odp->page_list[page_index] =3D=3D page) { umem_odp->dma_list[page_index] |=3D access_mask; } else { - pr_err("error: got different pages in IB device and from get_user_pages.= IB device page: %p, gup page: %p\n", + pr_err("error: got different pages in IB device and from pin_longterm_pa= ges. IB device page: %p, gup page: %p\n", umem_odp->page_list[page_index], page); /* Better remove the mapping now, to prevent any further * damage. */ @@ -639,11 +639,11 @@ int ib_umem_odp_map_dma_pages(struct ib_umem_odp *ume= m_odp, u64 user_virt, /* * Note: this might result in redundent page getting. We can * avoid this by checking dma_list to be 0 before calling - * get_user_pages. However, this make the code much more - * complex (and doesn't gain us much performance in most use - * cases). + * pin_longterm_pages. However, this makes the code much + * more complex (and doesn't gain us much performance in most + * use cases). */ - npages =3D get_user_pages_remote(owning_process, owning_mm, + npages =3D pin_longterm_pages_remote(owning_process, owning_mm, user_virt, gup_num_pages, flags, local_page_list, NULL, NULL); up_read(&owning_mm->mmap_sem); diff --git a/drivers/infiniband/hw/hfi1/user_pages.c b/drivers/infiniband/h= w/hfi1/user_pages.c index 469acb961fbd..9b55b0a73e29 100644 --- a/drivers/infiniband/hw/hfi1/user_pages.c +++ b/drivers/infiniband/hw/hfi1/user_pages.c @@ -104,9 +104,9 @@ int hfi1_acquire_user_pages(struct mm_struct *mm, unsig= ned long vaddr, size_t np bool writable, struct page **pages) { int ret; - unsigned int gup_flags =3D FOLL_LONGTERM | (writable ? FOLL_WRITE : 0); + unsigned int gup_flags =3D (writable ? FOLL_WRITE : 0); =20 - ret =3D get_user_pages_fast(vaddr, npages, gup_flags, pages); + ret =3D pin_longterm_pages_fast(vaddr, npages, gup_flags, pages); if (ret < 0) return ret; =20 diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniba= nd/hw/mthca/mthca_memfree.c index edccfd6e178f..beec7e4b8a96 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.c +++ b/drivers/infiniband/hw/mthca/mthca_memfree.c @@ -472,8 +472,7 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mth= ca_uar *uar, goto out; } =20 - ret =3D get_user_pages_fast(uaddr & PAGE_MASK, 1, - FOLL_WRITE | FOLL_LONGTERM, pages); + ret =3D pin_longterm_pages_fast(uaddr & PAGE_MASK, 1, FOLL_WRITE, pages); if (ret < 0) goto out; =20 diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniban= d/hw/qib/qib_user_pages.c index 6bf764e41891..684a14e14d9b 100644 --- a/drivers/infiniband/hw/qib/qib_user_pages.c +++ b/drivers/infiniband/hw/qib/qib_user_pages.c @@ -108,10 +108,10 @@ int qib_get_user_pages(unsigned long start_page, size= _t num_pages, =20 down_read(¤t->mm->mmap_sem); for (got =3D 0; got < num_pages; got +=3D ret) { - ret =3D get_user_pages(start_page + got * PAGE_SIZE, - num_pages - got, - FOLL_LONGTERM | FOLL_WRITE | FOLL_FORCE, - p + got, NULL); + ret =3D pin_longterm_pages(start_page + got * PAGE_SIZE, + num_pages - got, + FOLL_WRITE | FOLL_FORCE, + p + got, NULL); if (ret < 0) { up_read(¤t->mm->mmap_sem); goto bail_release; diff --git a/drivers/infiniband/hw/qib/qib_user_sdma.c b/drivers/infiniband= /hw/qib/qib_user_sdma.c index 05190edc2611..fd86a9d19370 100644 --- a/drivers/infiniband/hw/qib/qib_user_sdma.c +++ b/drivers/infiniband/hw/qib/qib_user_sdma.c @@ -670,7 +670,7 @@ static int qib_user_sdma_pin_pages(const struct qib_dev= data *dd, else j =3D npages; =20 - ret =3D get_user_pages_fast(addr, j, FOLL_LONGTERM, pages); + ret =3D pin_longterm_pages_fast(addr, j, 0, pages); if (ret !=3D j) { i =3D 0; j =3D ret; diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/= hw/usnic/usnic_uiom.c index 62e6ffa9ad78..6b90ca1c3771 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -141,11 +141,10 @@ static int usnic_uiom_get_pages(unsigned long addr, s= ize_t size, int writable, ret =3D 0; =20 while (npages) { - ret =3D get_user_pages(cur_base, - min_t(unsigned long, npages, - PAGE_SIZE / sizeof(struct page *)), - gup_flags | FOLL_LONGTERM, - page_list, NULL); + ret =3D pin_longterm_pages(cur_base, + min_t(unsigned long, npages, + PAGE_SIZE / sizeof(struct page *)), + gup_flags, page_list, NULL); =20 if (ret < 0) goto out; diff --git a/drivers/infiniband/sw/siw/siw_mem.c b/drivers/infiniband/sw/si= w/siw_mem.c index e99983f07663..20e663d7ada8 100644 --- a/drivers/infiniband/sw/siw/siw_mem.c +++ b/drivers/infiniband/sw/siw/siw_mem.c @@ -426,9 +426,8 @@ struct siw_umem *siw_umem_get(u64 start, u64 len, bool = writable) while (nents) { struct page **plist =3D &umem->page_chunk[i].plist[got]; =20 - rv =3D get_user_pages(first_page_va, nents, - foll_flags | FOLL_LONGTERM, - plist, NULL); + rv =3D pin_longterm_pages(first_page_va, nents, + foll_flags, plist, NULL); if (rv < 0) goto out_sem_up; =20 --=20 2.23.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 D4423CA9ED2 for ; Mon, 4 Nov 2019 07:54:36 +0000 (UTC) Received: from gabe.freedesktop.org (unknown [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 8F790218BA for ; Mon, 4 Nov 2019 07:54:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F790218BA 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 116CB6E153; Mon, 4 Nov 2019 07:54:25 +0000 (UTC) Received: from hqemgate16.nvidia.com (hqemgate16.nvidia.com [216.228.121.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF82D6E112 for ; Mon, 4 Nov 2019 00:40:12 +0000 (UTC) Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Sun, 03 Nov 2019 13:18:23 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Sun, 03 Nov 2019 13:18:16 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Sun, 03 Nov 2019 13:18:16 -0800 Received: from HQMAIL101.nvidia.com (172.20.187.10) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Sun, 3 Nov 2019 21:18:16 +0000 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Sun, 3 Nov 2019 21:18:16 +0000 Received: from blueforge.nvidia.com (Not Verified[10.110.48.28]) by hqnvemgw01.nvidia.com with Trustwave SEG (v7, 5, 8, 10121) id ; Sun, 03 Nov 2019 13:18:16 -0800 From: John Hubbard To: Andrew Morton Subject: [PATCH v2 07/18] infiniband: set FOLL_PIN, FOLL_LONGTERM via pin_longterm_pages*() Date: Sun, 3 Nov 2019 13:18:02 -0800 Message-ID: <20191103211813.213227-8-jhubbard@nvidia.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191103211813.213227-1-jhubbard@nvidia.com> References: <20191103211813.213227-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Mailman-Approved-At: Mon, 04 Nov 2019 07:54:21 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1572815903; bh=q5eBvxC1C1PTwlbM8+ph/cSmourLvxGkHvyzzyTytVY=; 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=QLZo4I75fQbU6x5SpUwhO8h8SsKUtRLOKJdI3V62uxuAy7pO1Gkel03ilx+XywV3X ybgfMhso8zS2aRMAjtEFwz9dJ40E4oBvysR+G/BLQmgdbObHUJXOpsOaqImlrMrSz+ ukshjiVbipqCRRpMLuDIzBTwP3RtehQ9A2/CyH+hgI+iVATGuCJHES45noXAL8Bpcu VwgVjDjvndiTfNRlscSQCEU5nHRTxK75HTjFkX9AinkIpPIR96OHlrYN1CIAR3SWUd qE90/gKvqZfbQ8tzggAUGZbY/gfVoeYGzuVKirkUme8A3ATMCc8HzWuB/nk83/Qfqk jSXtqtn+h9KFA== 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: <20191103211802.h98sNlckpFEvZtWsvvwwk7Mqt0WhJw_iDVo8FzpzeEE@z> Q29udmVydCBpbmZpbmliYW5kIHRvIHVzZSB0aGUgbmV3IHdyYXBwZXIgY2FsbHMsIGFuZCBzdG9w CmV4cGxpY2l0bHkgc2V0dGluZyBGT0xMX0xPTkdURVJNIGF0IHRoZSBjYWxsIHNpdGVzLgoKVGhl IG5ldyBwaW5fbG9uZ3Rlcm1fKigpIGNhbGxzIHJlcGxhY2UgZ2V0X3VzZXJfcGFnZXMqKCkKY2Fs bHMsIGFuZCBzZXQgYm90aCBGT0xMX0xPTkdURVJNIGFuZCBhIG5ldyBGT0xMX1BJTgpmbGFnLiBU aGUgRk9MTF9QSU4gZmxhZyByZXF1aXJlcyB0aGF0IHRoZSBjYWxsZXIgbXVzdApyZXR1cm4gdGhl IHBhZ2VzIHZpYSBwdXRfdXNlcl9wYWdlKigpIGNhbGxzLCBidXQKaW5maW5pYmFuZCB3YXMgYWxy ZWFkeSBkb2luZyB0aGF0IGFzIHBhcnQgb2YgYW4gZWFybGllcgpjb21taXQuCgpSZXZpZXdlZC1i eTogSXJhIFdlaW55IDxpcmEud2VpbnlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKb2huIEh1 YmJhcmQgPGpodWJiYXJkQG52aWRpYS5jb20+Ci0tLQogZHJpdmVycy9pbmZpbmliYW5kL2NvcmUv dW1lbS5jICAgICAgICAgICAgICB8ICA1ICsrLS0tCiBkcml2ZXJzL2luZmluaWJhbmQvY29yZS91 bWVtX29kcC5jICAgICAgICAgIHwgMTAgKysrKystLS0tLQogZHJpdmVycy9pbmZpbmliYW5kL2h3 L2hmaTEvdXNlcl9wYWdlcy5jICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvaW5maW5pYmFuZC9ody9t dGhjYS9tdGhjYV9tZW1mcmVlLmMgfCAgMyArLS0KIGRyaXZlcnMvaW5maW5pYmFuZC9ody9xaWIv cWliX3VzZXJfcGFnZXMuYyAgfCAgOCArKysrLS0tLQogZHJpdmVycy9pbmZpbmliYW5kL2h3L3Fp Yi9xaWJfdXNlcl9zZG1hLmMgICB8ICAyICstCiBkcml2ZXJzL2luZmluaWJhbmQvaHcvdXNuaWMv dXNuaWNfdWlvbS5jICAgIHwgIDkgKysrKy0tLS0tCiBkcml2ZXJzL2luZmluaWJhbmQvc3cvc2l3 L3Npd19tZW0uYyAgICAgICAgIHwgIDUgKystLS0KIDggZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0 aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pbmZpbmliYW5k L2NvcmUvdW1lbS5jIGIvZHJpdmVycy9pbmZpbmliYW5kL2NvcmUvdW1lbS5jCmluZGV4IDI0MjQ0 YTJmNjhjYy4uYzVhNzhkM2U2NzRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2luZmluaWJhbmQvY29y ZS91bWVtLmMKKysrIGIvZHJpdmVycy9pbmZpbmliYW5kL2NvcmUvdW1lbS5jCkBAIC0yNzIsMTEg KzI3MiwxMCBAQCBzdHJ1Y3QgaWJfdW1lbSAqaWJfdW1lbV9nZXQoc3RydWN0IGliX3VkYXRhICp1 ZGF0YSwgdW5zaWduZWQgbG9uZyBhZGRyLAogCiAJd2hpbGUgKG5wYWdlcykgewogCQlkb3duX3Jl YWQoJm1tLT5tbWFwX3NlbSk7Ci0JCXJldCA9IGdldF91c2VyX3BhZ2VzKGN1cl9iYXNlLAorCQly ZXQgPSBwaW5fbG9uZ3Rlcm1fcGFnZXMoY3VyX2Jhc2UsCiAJCQkJICAgICBtaW5fdCh1bnNpZ25l ZCBsb25nLCBucGFnZXMsCiAJCQkJCSAgIFBBR0VfU0laRSAvIHNpemVvZiAoc3RydWN0IHBhZ2Ug KikpLAotCQkJCSAgICAgZ3VwX2ZsYWdzIHwgRk9MTF9MT05HVEVSTSwKLQkJCQkgICAgIHBhZ2Vf bGlzdCwgTlVMTCk7CisJCQkJICAgICBndXBfZmxhZ3MsIHBhZ2VfbGlzdCwgTlVMTCk7CiAJCWlm IChyZXQgPCAwKSB7CiAJCQl1cF9yZWFkKCZtbS0+bW1hcF9zZW0pOwogCQkJZ290byB1bWVtX3Jl bGVhc2U7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2luZmluaWJhbmQvY29yZS91bWVtX29kcC5jIGIv ZHJpdmVycy9pbmZpbmliYW5kL2NvcmUvdW1lbV9vZHAuYwppbmRleCAxNjNmZjdiYTkyYjcuLmEz OGI2N2I4M2RiNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9pbmZpbmliYW5kL2NvcmUvdW1lbV9vZHAu YworKysgYi9kcml2ZXJzL2luZmluaWJhbmQvY29yZS91bWVtX29kcC5jCkBAIC01MzQsNyArNTM0 LDcgQEAgc3RhdGljIGludCBpYl91bWVtX29kcF9tYXBfZG1hX3NpbmdsZV9wYWdlKAogCX0gZWxz ZSBpZiAodW1lbV9vZHAtPnBhZ2VfbGlzdFtwYWdlX2luZGV4XSA9PSBwYWdlKSB7CiAJCXVtZW1f b2RwLT5kbWFfbGlzdFtwYWdlX2luZGV4XSB8PSBhY2Nlc3NfbWFzazsKIAl9IGVsc2UgewotCQlw cl9lcnIoImVycm9yOiBnb3QgZGlmZmVyZW50IHBhZ2VzIGluIElCIGRldmljZSBhbmQgZnJvbSBn ZXRfdXNlcl9wYWdlcy4gSUIgZGV2aWNlIHBhZ2U6ICVwLCBndXAgcGFnZTogJXBcbiIsCisJCXBy X2VycigiZXJyb3I6IGdvdCBkaWZmZXJlbnQgcGFnZXMgaW4gSUIgZGV2aWNlIGFuZCBmcm9tIHBp bl9sb25ndGVybV9wYWdlcy4gSUIgZGV2aWNlIHBhZ2U6ICVwLCBndXAgcGFnZTogJXBcbiIsCiAJ CSAgICAgICB1bWVtX29kcC0+cGFnZV9saXN0W3BhZ2VfaW5kZXhdLCBwYWdlKTsKIAkJLyogQmV0 dGVyIHJlbW92ZSB0aGUgbWFwcGluZyBub3csIHRvIHByZXZlbnQgYW55IGZ1cnRoZXIKIAkJICog ZGFtYWdlLiAqLwpAQCAtNjM5LDExICs2MzksMTEgQEAgaW50IGliX3VtZW1fb2RwX21hcF9kbWFf cGFnZXMoc3RydWN0IGliX3VtZW1fb2RwICp1bWVtX29kcCwgdTY0IHVzZXJfdmlydCwKIAkJLyoK IAkJICogTm90ZTogdGhpcyBtaWdodCByZXN1bHQgaW4gcmVkdW5kZW50IHBhZ2UgZ2V0dGluZy4g V2UgY2FuCiAJCSAqIGF2b2lkIHRoaXMgYnkgY2hlY2tpbmcgZG1hX2xpc3QgdG8gYmUgMCBiZWZv cmUgY2FsbGluZwotCQkgKiBnZXRfdXNlcl9wYWdlcy4gSG93ZXZlciwgdGhpcyBtYWtlIHRoZSBj b2RlIG11Y2ggbW9yZQotCQkgKiBjb21wbGV4IChhbmQgZG9lc24ndCBnYWluIHVzIG11Y2ggcGVy Zm9ybWFuY2UgaW4gbW9zdCB1c2UKLQkJICogY2FzZXMpLgorCQkgKiBwaW5fbG9uZ3Rlcm1fcGFn ZXMuIEhvd2V2ZXIsIHRoaXMgbWFrZXMgdGhlIGNvZGUgbXVjaAorCQkgKiBtb3JlIGNvbXBsZXgg KGFuZCBkb2Vzbid0IGdhaW4gdXMgbXVjaCBwZXJmb3JtYW5jZSBpbiBtb3N0CisJCSAqIHVzZSBj YXNlcykuCiAJCSAqLwotCQlucGFnZXMgPSBnZXRfdXNlcl9wYWdlc19yZW1vdGUob3duaW5nX3By b2Nlc3MsIG93bmluZ19tbSwKKwkJbnBhZ2VzID0gcGluX2xvbmd0ZXJtX3BhZ2VzX3JlbW90ZShv d25pbmdfcHJvY2Vzcywgb3duaW5nX21tLAogCQkJCXVzZXJfdmlydCwgZ3VwX251bV9wYWdlcywK IAkJCQlmbGFncywgbG9jYWxfcGFnZV9saXN0LCBOVUxMLCBOVUxMKTsKIAkJdXBfcmVhZCgmb3du aW5nX21tLT5tbWFwX3NlbSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2luZmluaWJhbmQvaHcvaGZp MS91c2VyX3BhZ2VzLmMgYi9kcml2ZXJzL2luZmluaWJhbmQvaHcvaGZpMS91c2VyX3BhZ2VzLmMK aW5kZXggNDY5YWNiOTYxZmJkLi45YjU1YjBhNzNlMjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvaW5m aW5pYmFuZC9ody9oZmkxL3VzZXJfcGFnZXMuYworKysgYi9kcml2ZXJzL2luZmluaWJhbmQvaHcv aGZpMS91c2VyX3BhZ2VzLmMKQEAgLTEwNCw5ICsxMDQsOSBAQCBpbnQgaGZpMV9hY3F1aXJlX3Vz ZXJfcGFnZXMoc3RydWN0IG1tX3N0cnVjdCAqbW0sIHVuc2lnbmVkIGxvbmcgdmFkZHIsIHNpemVf dCBucAogCQkJICAgIGJvb2wgd3JpdGFibGUsIHN0cnVjdCBwYWdlICoqcGFnZXMpCiB7CiAJaW50 IHJldDsKLQl1bnNpZ25lZCBpbnQgZ3VwX2ZsYWdzID0gRk9MTF9MT05HVEVSTSB8ICh3cml0YWJs ZSA/IEZPTExfV1JJVEUgOiAwKTsKKwl1bnNpZ25lZCBpbnQgZ3VwX2ZsYWdzID0gKHdyaXRhYmxl ID8gRk9MTF9XUklURSA6IDApOwogCi0JcmV0ID0gZ2V0X3VzZXJfcGFnZXNfZmFzdCh2YWRkciwg bnBhZ2VzLCBndXBfZmxhZ3MsIHBhZ2VzKTsKKwlyZXQgPSBwaW5fbG9uZ3Rlcm1fcGFnZXNfZmFz dCh2YWRkciwgbnBhZ2VzLCBndXBfZmxhZ3MsIHBhZ2VzKTsKIAlpZiAocmV0IDwgMCkKIAkJcmV0 dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9pbmZpbmliYW5kL2h3L210aGNhL210aGNh X21lbWZyZWUuYyBiL2RyaXZlcnMvaW5maW5pYmFuZC9ody9tdGhjYS9tdGhjYV9tZW1mcmVlLmMK aW5kZXggZWRjY2ZkNmUxNzhmLi5iZWVjN2U0YjhhOTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvaW5m aW5pYmFuZC9ody9tdGhjYS9tdGhjYV9tZW1mcmVlLmMKKysrIGIvZHJpdmVycy9pbmZpbmliYW5k L2h3L210aGNhL210aGNhX21lbWZyZWUuYwpAQCAtNDcyLDggKzQ3Miw3IEBAIGludCBtdGhjYV9t YXBfdXNlcl9kYihzdHJ1Y3QgbXRoY2FfZGV2ICpkZXYsIHN0cnVjdCBtdGhjYV91YXIgKnVhciwK IAkJZ290byBvdXQ7CiAJfQogCi0JcmV0ID0gZ2V0X3VzZXJfcGFnZXNfZmFzdCh1YWRkciAmIFBB R0VfTUFTSywgMSwKLQkJCQkgIEZPTExfV1JJVEUgfCBGT0xMX0xPTkdURVJNLCBwYWdlcyk7CisJ cmV0ID0gcGluX2xvbmd0ZXJtX3BhZ2VzX2Zhc3QodWFkZHIgJiBQQUdFX01BU0ssIDEsIEZPTExf V1JJVEUsIHBhZ2VzKTsKIAlpZiAocmV0IDwgMCkKIAkJZ290byBvdXQ7CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvaW5maW5pYmFuZC9ody9xaWIvcWliX3VzZXJfcGFnZXMuYyBiL2RyaXZlcnMvaW5m aW5pYmFuZC9ody9xaWIvcWliX3VzZXJfcGFnZXMuYwppbmRleCA2YmY3NjRlNDE4OTEuLjY4NGEx NGUxNGQ5YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9pbmZpbmliYW5kL2h3L3FpYi9xaWJfdXNlcl9w YWdlcy5jCisrKyBiL2RyaXZlcnMvaW5maW5pYmFuZC9ody9xaWIvcWliX3VzZXJfcGFnZXMuYwpA QCAtMTA4LDEwICsxMDgsMTAgQEAgaW50IHFpYl9nZXRfdXNlcl9wYWdlcyh1bnNpZ25lZCBsb25n IHN0YXJ0X3BhZ2UsIHNpemVfdCBudW1fcGFnZXMsCiAKIAlkb3duX3JlYWQoJmN1cnJlbnQtPm1t LT5tbWFwX3NlbSk7CiAJZm9yIChnb3QgPSAwOyBnb3QgPCBudW1fcGFnZXM7IGdvdCArPSByZXQp IHsKLQkJcmV0ID0gZ2V0X3VzZXJfcGFnZXMoc3RhcnRfcGFnZSArIGdvdCAqIFBBR0VfU0laRSwK LQkJCQkgICAgIG51bV9wYWdlcyAtIGdvdCwKLQkJCQkgICAgIEZPTExfTE9OR1RFUk0gfCBGT0xM X1dSSVRFIHwgRk9MTF9GT1JDRSwKLQkJCQkgICAgIHAgKyBnb3QsIE5VTEwpOworCQlyZXQgPSBw aW5fbG9uZ3Rlcm1fcGFnZXMoc3RhcnRfcGFnZSArIGdvdCAqIFBBR0VfU0laRSwKKwkJCQkJIG51 bV9wYWdlcyAtIGdvdCwKKwkJCQkJIEZPTExfV1JJVEUgfCBGT0xMX0ZPUkNFLAorCQkJCQkgcCAr IGdvdCwgTlVMTCk7CiAJCWlmIChyZXQgPCAwKSB7CiAJCQl1cF9yZWFkKCZjdXJyZW50LT5tbS0+ bW1hcF9zZW0pOwogCQkJZ290byBiYWlsX3JlbGVhc2U7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2lu ZmluaWJhbmQvaHcvcWliL3FpYl91c2VyX3NkbWEuYyBiL2RyaXZlcnMvaW5maW5pYmFuZC9ody9x aWIvcWliX3VzZXJfc2RtYS5jCmluZGV4IDA1MTkwZWRjMjYxMS4uZmQ4NmE5ZDE5MzcwIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2luZmluaWJhbmQvaHcvcWliL3FpYl91c2VyX3NkbWEuYworKysgYi9k cml2ZXJzL2luZmluaWJhbmQvaHcvcWliL3FpYl91c2VyX3NkbWEuYwpAQCAtNjcwLDcgKzY3MCw3 IEBAIHN0YXRpYyBpbnQgcWliX3VzZXJfc2RtYV9waW5fcGFnZXMoY29uc3Qgc3RydWN0IHFpYl9k ZXZkYXRhICpkZCwKIAkJZWxzZQogCQkJaiA9IG5wYWdlczsKIAotCQlyZXQgPSBnZXRfdXNlcl9w YWdlc19mYXN0KGFkZHIsIGosIEZPTExfTE9OR1RFUk0sIHBhZ2VzKTsKKwkJcmV0ID0gcGluX2xv bmd0ZXJtX3BhZ2VzX2Zhc3QoYWRkciwgaiwgMCwgcGFnZXMpOwogCQlpZiAocmV0ICE9IGopIHsK IAkJCWkgPSAwOwogCQkJaiA9IHJldDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW5maW5pYmFuZC9o dy91c25pYy91c25pY191aW9tLmMgYi9kcml2ZXJzL2luZmluaWJhbmQvaHcvdXNuaWMvdXNuaWNf dWlvbS5jCmluZGV4IDYyZTZmZmE5YWQ3OC4uNmI5MGNhMWMzNzcxIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2luZmluaWJhbmQvaHcvdXNuaWMvdXNuaWNfdWlvbS5jCisrKyBiL2RyaXZlcnMvaW5maW5p YmFuZC9ody91c25pYy91c25pY191aW9tLmMKQEAgLTE0MSwxMSArMTQxLDEwIEBAIHN0YXRpYyBp bnQgdXNuaWNfdWlvbV9nZXRfcGFnZXModW5zaWduZWQgbG9uZyBhZGRyLCBzaXplX3Qgc2l6ZSwg aW50IHdyaXRhYmxlLAogCXJldCA9IDA7CiAKIAl3aGlsZSAobnBhZ2VzKSB7Ci0JCXJldCA9IGdl dF91c2VyX3BhZ2VzKGN1cl9iYXNlLAotCQkJCSAgICAgbWluX3QodW5zaWduZWQgbG9uZywgbnBh Z2VzLAotCQkJCSAgICAgUEFHRV9TSVpFIC8gc2l6ZW9mKHN0cnVjdCBwYWdlICopKSwKLQkJCQkg ICAgIGd1cF9mbGFncyB8IEZPTExfTE9OR1RFUk0sCi0JCQkJICAgICBwYWdlX2xpc3QsIE5VTEwp OworCQlyZXQgPSBwaW5fbG9uZ3Rlcm1fcGFnZXMoY3VyX2Jhc2UsCisJCQkJCSBtaW5fdCh1bnNp Z25lZCBsb25nLCBucGFnZXMsCisJCQkJCSAgICAgUEFHRV9TSVpFIC8gc2l6ZW9mKHN0cnVjdCBw YWdlICopKSwKKwkJCQkJIGd1cF9mbGFncywgcGFnZV9saXN0LCBOVUxMKTsKIAogCQlpZiAocmV0 IDwgMCkKIAkJCWdvdG8gb3V0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pbmZpbmliYW5kL3N3L3Np dy9zaXdfbWVtLmMgYi9kcml2ZXJzL2luZmluaWJhbmQvc3cvc2l3L3Npd19tZW0uYwppbmRleCBl OTk5ODNmMDc2NjMuLjIwZTY2M2Q3YWRhOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9pbmZpbmliYW5k L3N3L3Npdy9zaXdfbWVtLmMKKysrIGIvZHJpdmVycy9pbmZpbmliYW5kL3N3L3Npdy9zaXdfbWVt LmMKQEAgLTQyNiw5ICs0MjYsOCBAQCBzdHJ1Y3Qgc2l3X3VtZW0gKnNpd191bWVtX2dldCh1NjQg c3RhcnQsIHU2NCBsZW4sIGJvb2wgd3JpdGFibGUpCiAJCXdoaWxlIChuZW50cykgewogCQkJc3Ry dWN0IHBhZ2UgKipwbGlzdCA9ICZ1bWVtLT5wYWdlX2NodW5rW2ldLnBsaXN0W2dvdF07CiAKLQkJ CXJ2ID0gZ2V0X3VzZXJfcGFnZXMoZmlyc3RfcGFnZV92YSwgbmVudHMsCi0JCQkJCSAgICBmb2xs X2ZsYWdzIHwgRk9MTF9MT05HVEVSTSwKLQkJCQkJICAgIHBsaXN0LCBOVUxMKTsKKwkJCXJ2ID0g cGluX2xvbmd0ZXJtX3BhZ2VzKGZpcnN0X3BhZ2VfdmEsIG5lbnRzLAorCQkJCQkJZm9sbF9mbGFn cywgcGxpc3QsIE5VTEwpOwogCQkJaWYgKHJ2IDwgMCkKIAkJCQlnb3RvIG91dF9zZW1fdXA7CiAK LS0gCjIuMjMuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs