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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83E82C2FC04 for ; Thu, 17 Aug 2023 04:19:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CACFC28002E; Thu, 17 Aug 2023 00:19:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C5D0928002D; Thu, 17 Aug 2023 00:19:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AFDA928002E; Thu, 17 Aug 2023 00:19:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9D65928002D for ; Thu, 17 Aug 2023 00:19:16 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 666BEA1011 for ; Thu, 17 Aug 2023 04:19:16 +0000 (UTC) X-FDA: 81132291912.09.1A98A5A Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by imf29.hostedemail.com (Postfix) with ESMTP id 64A04120004 for ; Thu, 17 Aug 2023 04:19:14 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=ci1ITdOy; dmarc=none; spf=pass (imf29.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.218.54 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692245954; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jfkifynCzRafY3XbR1SksUBb+gadM/LILOU5DSScwMs=; b=2cXrhchcH0rjK6R0lSr53Y213Oq/+eaBtre14rnlOhsDuyZDsEyvsy63cn1Ed2qbKP4fiS zsyUc+9Vuv9I8mBVSEqleaO0m5zZ6txBXD36AB55Uj/ow0VjHRY4RkqVzV0EWMz34NBd70 O44+TVoIDwwhlO5ig2ANtBFLqmQi+e4= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=ci1ITdOy; dmarc=none; spf=pass (imf29.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.218.54 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692245954; a=rsa-sha256; cv=none; b=yv1fAZEVqUESyO1CYTnybCmShoOOLspiigNHUc5wfbZeLa+GV95o28Txr/RT6BzYEO7P1o bt6mSJLWuCqxCMe4KLxbmkWHb4jNOsRY8uwmdlY2PMrdG/ITLRVWp36GhqWbzptM3Nd52X gqRpH0Y7rhxRKOU7bcsC9UKvjY7YFzw= Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-99bcfe28909so936798566b.3 for ; Wed, 16 Aug 2023 21:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; t=1692245952; x=1692850752; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=jfkifynCzRafY3XbR1SksUBb+gadM/LILOU5DSScwMs=; b=ci1ITdOyF2+70QXsKhcoYkivVnYbjxlp5DNX5OBtzb+Q/NrKeNsfyDN1Wq6U8tcBfZ 3T2VThmo57EUg2Yq+Fm1Zq3+He/JnbTlMpJ5jmsu6UIEOThH2kmqV2/XyOYRzrebaMY7 /PdAl9rrEPqPZ1hfbTc+TBBaW4GDZGOa1XTec= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692245952; x=1692850752; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jfkifynCzRafY3XbR1SksUBb+gadM/LILOU5DSScwMs=; b=h2qjtrj3DgxvS9q1y9UhZdbaHScoX/8tyzcu7j4zaISyR+mymKHh1y6mziyvuQZXUm zLEiLynXbNJZ30qo2lRcv/0qK957SJ0OcJhbdnfIGuahaA0d+nBgmVcNKaxtJ2lC9jaL T02Q6U1ZxiyZvD6f6PNMJdR2P7DAWLcmYeIAZgYbznCQJaIL4oghW6HONFv8+i63IrWW MzUB2fdC0bSEmYy9UY/sKcCSSemG5lJ4Z5WiiVko0NwYMnK6ShTgInUt6jFZX546RZEz RpnSSSrvoRXhqPhObyNqdMRufnwWwvHCOgOPd39t4QG3SoI4GVs5D69oA32Z313Xmu72 H7Xg== X-Gm-Message-State: AOJu0YyCoMQWKu57isPCD+VHPmJx7PHjElaZCsWz443WGVdOaKlkHXNZ fW4J/qCdkcvrFG/kez5fn75KNw3Io8vVoKMxxvLethGz X-Google-Smtp-Source: AGHT+IF2pLcvuw+xKBu2CwLvkubNsYBj/Wtvq3hih7JImq3jkkOaJJSWPyMQrw12pjNdBF2bXKG6zg== X-Received: by 2002:a17:907:7716:b0:99b:6e54:bd6e with SMTP id kw22-20020a170907771600b0099b6e54bd6emr2813941ejc.56.1692245952368; Wed, 16 Aug 2023 21:19:12 -0700 (PDT) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com. [209.85.208.48]) by smtp.gmail.com with ESMTPSA id pj18-20020a170906d79200b009932337747esm9442494ejb.86.2023.08.16.21.19.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Aug 2023 21:19:10 -0700 (PDT) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-52164adea19so9415285a12.1 for ; Wed, 16 Aug 2023 21:19:10 -0700 (PDT) X-Received: by 2002:aa7:c505:0:b0:51d:9db8:8257 with SMTP id o5-20020aa7c505000000b0051d9db88257mr3222687edq.30.1692245950059; Wed, 16 Aug 2023 21:19:10 -0700 (PDT) MIME-Version: 1.0 References: <03730b50cebb4a349ad8667373bb8127@AcuMS.aculab.com> <20230816120741.534415-1-dhowells@redhat.com> <20230816120741.534415-3-dhowells@redhat.com> <608853.1692190847@warthog.procyon.org.uk> <3dabec5643b24534a1c1c51894798047@AcuMS.aculab.com> <665724.1692218114@warthog.procyon.org.uk> In-Reply-To: <665724.1692218114@warthog.procyon.org.uk> From: Linus Torvalds Date: Thu, 17 Aug 2023 06:18:53 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3 2/2] iov_iter: Don't deal with iter->copy_mc in memcpy_from_iter_mc() To: David Howells Cc: David Laight , Al Viro , Jens Axboe , Christoph Hellwig , Christian Brauner , Matthew Wilcox , Jeff Layton , "linux-fsdevel@vger.kernel.org" , "linux-block@vger.kernel.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Content-Type: multipart/mixed; boundary="000000000000ba4113060316b66b" X-Rspamd-Queue-Id: 64A04120004 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: b7bsksgighiem6wd4ogez3e3mjbw5gn5 X-HE-Tag: 1692245954-405462 X-HE-Meta: U2FsdGVkX1+eIG+3J37q3je3zcANz+TLq01uOmP3aQ4LEKV9V9S5jQIzB/ehZu4vC3iHnKFAXgLnGTfIb3sNx3T39K9m8vfQK0kLs9UC1OMhyiPArPbhkWFHv1d+xcmZ02qnxkFxdPDRDkqun2xKYzbNoZOJedL8PeuCF7qUAm3zRYwAV7OhBY5NmAWA59ahbLFFJP62D4/gXpe9rjOcot0f1uXSwmluuO0PxxU52Vhvx+czJ2WKXQyQywo4xGcL8Wk6+x7NDfhmzvCcCyLlbWrPY0LlL1qRe065MCec0qY46btVcbxZcueJsz1p7B9dQe+BXBLDsQD1adl/a/IoUgVtbeXV41WSCdRLv7V69P1vG/RfrWPkxZ/tC9an0T9uqMb9AaolhhBWa4K+aR+VbpF47bCUfIjTR7ubEmbKEpSnmNB6efOVvkVJMee+1uhDhUbfjOBqK6xZEcV3WFp5NglR2mCHrL/QUnqRqHfIronJFcCyiyCYALi/9COpFGRGPAoW0eEf9ng3l0evdgHFGoMD5z6opL6ghbnNSyie25A3TXeOxN5F3qoU3RVLtQlYNbmjbfBIKHCwGjNkcPJy3QwKkMN9yfynSUFFw3sccjOubu6yS+wZ6J0i5Kd6ltDW5o+pYheTPcGVDJHis3wHrWK02Iotsms7sXcbL7Uydlr3sEfJrx95glMhkY5J8kVBgERjWaW3tb2Yi4Ag2AW3MA4zf6sCY6apqHWrpLG7oDxdjsBbuyPxVa+GhrZKgzIoCq+wMYkudZtHbTr0ctEZtniaQxQ7eTf06lfGb6y9ZyW+N2KRyVM6A/4f33OKkd72HRgBkjfZ70KpASBZhdIcB/HeHYlHF+BaEU0qxPEAjvKVAF5hM2z43Vyars3jI+4HnwudCQE5Y8zQGi6Y3XH4VpCW7MOVgCS+AqmoPIN/zU3CfUVICyTL6XcVt0pa6RL6Dzka8xe4+reeaPFiHx7 aG1x/vIo qPhSuPZRnEXc5WPKybTBk4m/gPugTCTIvTuLZUt1PEZA3Rv6dYOSyhRoHYaaX2QX09iF5jRyh/ZuVCEVSAfauSJMCoKWS5sCzS7ue9fuWyGYVHLZuFrAVGmRs5zxkqahNPoGnRUgpKBRbGr6gk12LtCNrULwHLLqlbd/l5Ud1D213xurFpVGbzzqaKoEIB9X4xggqCmLHmJMQLV2o4is5dWHJu/c8/Z7NrnGovBA/KpYMNPFCRXlAXwVNXk2cqS4GMOLGF2/UV9VgE7+4ZrNDZUHHD77+Y+oV1DUl1s6yvFcbKlU8RTyKgvNsO4eK0Nj3pONDFZ4LJ8jaohilTHRIhWR9Ng6Wem53wVxUTr1l5he3AgwU1+Ued9+B/+XvndPQCb35qHDFWvMiKJ8glBLznUA69ldMxMp1KIiXnjwfq9ZlsLGQh5YgdHNtsbGdjntd0qbqHURtWbatpIEk4zF3dP1pxY0t0Rdme9GBSb2JIS8zn/d1hL4AqsVPUPW1pVsdRdZ+0zHCfmez+6tbfzUdbifraCPuzhXmztkZqY5J28qDYYZG6FNSevlNXQFqWzBx+AmpFhWeEC5GvXaIVP2xfcwE4gi3RYmYTdFQ2qB8B6jRMoJvD0O1yWYxpFE7OJDv9ii8SbKiyg2G9n8GfVLGBwO0ynhjAcAwsSX129G9a2IRlFio+MJivtxIJGGZQ2hKppqXSFua2cMW/xhbx4kTYHwdA0ODZAkv4/kufgzf0tt1AeatzT58zX0CEaeqKGQ+aXKOl8Wp4XVCurXYpX3K/uRwVu007UMWN4xnQhbskdTZrCJa8+lUc1rZg5r2huMiS5GQC0KvRs6+r5y1m5+gg/iHWw== 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: --000000000000ba4113060316b66b Content-Type: text/plain; charset="UTF-8" On Wed, 16 Aug 2023 at 22:35, David Howells wrote: > > I'm not sure that buys us anything. It would then require every call to > iov_iter_is_bvec()[*] to check for two values instead of one Well, that part is trivially fixable, and we should do that anyway for other reasons. See the attached patch. > The issue is that ITER_xyz changes the iteration function - but we don't > actually want to do that; rather, we need to change the step function. Yeah, that may be the fundamental issue. But making the ITER_xyz flags be bit masks would help - partly exactly because it makes it so trivial yo say "for this set of ITER_xyz, do this". This patch only does that for the 'user_backed' thing, which was a similar case. Hmm? Linus --000000000000ba4113060316b66b Content-Type: text/x-patch; charset="US-ASCII"; name="patch.diff" Content-Disposition: attachment; filename="patch.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_llenilwk0 IGRyaXZlcnMvaW5maW5pYmFuZC9ody9oZmkxL2ZpbGVfb3BzLmMgICAgfCAgMiArLQogZHJpdmVy cy9pbmZpbmliYW5kL2h3L3FpYi9xaWJfZmlsZV9vcHMuYyB8ICAyICstCiBpbmNsdWRlL2xpbnV4 L3Vpby5oICAgICAgICAgICAgICAgICAgICAgIHwgMzYgKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0KIGxpYi9pb3ZfaXRlci5jICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMSAt CiBzb3VuZC9jb3JlL3BjbV9uYXRpdmUuYyAgICAgICAgICAgICAgICAgIHwgIDQgKystLQogNSBm aWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2luZmluaWJhbmQvaHcvaGZpMS9maWxlX29wcy5jIGIvZHJpdmVycy9pbmZp bmliYW5kL2h3L2hmaTEvZmlsZV9vcHMuYwppbmRleCBhNWFiMjJjZWRkNDEuLjc4OGZjMjQ5MjM0 ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9pbmZpbmliYW5kL2h3L2hmaTEvZmlsZV9vcHMuYworKysg Yi9kcml2ZXJzL2luZmluaWJhbmQvaHcvaGZpMS9maWxlX29wcy5jCkBAIC0yNjcsNyArMjY3LDcg QEAgc3RhdGljIHNzaXplX3QgaGZpMV93cml0ZV9pdGVyKHN0cnVjdCBraW9jYiAqa2lvY2IsIHN0 cnVjdCBpb3ZfaXRlciAqZnJvbSkKIAogCWlmICghSEZJMV9DQVBfSVNfS1NFVChTRE1BKSkKIAkJ cmV0dXJuIC1FSU5WQUw7Ci0JaWYgKCFmcm9tLT51c2VyX2JhY2tlZCkKKwlpZiAoIXVzZXJfYmFj a2VkX2l0ZXIoZnJvbSkpCiAJCXJldHVybiAtRUlOVkFMOwogCWlkeCA9IHNyY3VfcmVhZF9sb2Nr KCZmZC0+cHFfc3JjdSk7CiAJcHEgPSBzcmN1X2RlcmVmZXJlbmNlKGZkLT5wcSwgJmZkLT5wcV9z cmN1KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW5maW5pYmFuZC9ody9xaWIvcWliX2ZpbGVfb3Bz LmMgYi9kcml2ZXJzL2luZmluaWJhbmQvaHcvcWliL3FpYl9maWxlX29wcy5jCmluZGV4IGVmODVi YzhkOTM4NC4uMDlhNmQ5MTIxYjNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2luZmluaWJhbmQvaHcv cWliL3FpYl9maWxlX29wcy5jCisrKyBiL2RyaXZlcnMvaW5maW5pYmFuZC9ody9xaWIvcWliX2Zp bGVfb3BzLmMKQEAgLTIyNDQsNyArMjI0NCw3IEBAIHN0YXRpYyBzc2l6ZV90IHFpYl93cml0ZV9p dGVyKHN0cnVjdCBraW9jYiAqaW9jYiwgc3RydWN0IGlvdl9pdGVyICpmcm9tKQogCXN0cnVjdCBx aWJfY3R4dGRhdGEgKnJjZCA9IGN0eHRfZnAoaW9jYi0+a2lfZmlscCk7CiAJc3RydWN0IHFpYl91 c2VyX3NkbWFfcXVldWUgKnBxID0gZnAtPnBxOwogCi0JaWYgKCFmcm9tLT51c2VyX2JhY2tlZCB8 fCAhZnJvbS0+bnJfc2VncyB8fCAhcHEpCisJaWYgKCF1c2VyX2JhY2tlZF9pdGVyKGZyb20pIHx8 ICFmcm9tLT5ucl9zZWdzIHx8ICFwcSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKIAlyZXR1cm4gcWli X3VzZXJfc2RtYV93cml0ZXYocmNkLCBwcSwgaXRlcl9pb3YoZnJvbSksIGZyb20tPm5yX3NlZ3Mp OwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC91aW8uaCBiL2luY2x1ZGUvbGludXgvdWlvLmgK aW5kZXggZmY4MWU1Y2NhZWYyLi4yMzBkYTk3YTQyZDUgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGlu dXgvdWlvLmgKKysrIGIvaW5jbHVkZS9saW51eC91aW8uaApAQCAtMjEsMTIgKzIxLDEyIEBAIHN0 cnVjdCBrdmVjIHsKIAogZW51bSBpdGVyX3R5cGUgewogCS8qIGl0ZXIgdHlwZXMgKi8KLQlJVEVS X0lPVkVDLAotCUlURVJfS1ZFQywKLQlJVEVSX0JWRUMsCi0JSVRFUl9YQVJSQVksCi0JSVRFUl9E SVNDQVJELAotCUlURVJfVUJVRiwKKwlJVEVSX0lPVkVDID0gMSwKKwlJVEVSX1VCVUYgPSAyLAor CUlURVJfS1ZFQyA9IDQsCisJSVRFUl9CVkVDID0gOCwKKwlJVEVSX1hBUlJBWSA9IDE2LAorCUlU RVJfRElTQ0FSRCA9IDMyLAogfTsKIAogI2RlZmluZSBJVEVSX1NPVVJDRQkxCS8vID09IFdSSVRF CkBAIC0zOSwxMSArMzksMTAgQEAgc3RydWN0IGlvdl9pdGVyX3N0YXRlIHsKIH07CiAKIHN0cnVj dCBpb3ZfaXRlciB7Ci0JdTggaXRlcl90eXBlOwotCWJvb2wgY29weV9tYzsKLQlib29sIG5vZmF1 bHQ7CisJdTgJaXRlcl90eXBlOjYsCisJCWNvcHlfbWM6MSwKKwkJbm9mYXVsdDoxOwogCWJvb2wg ZGF0YV9zb3VyY2U7Ci0JYm9vbCB1c2VyX2JhY2tlZDsKIAl1bmlvbiB7CiAJCXNpemVfdCBpb3Zf b2Zmc2V0OwogCQlpbnQgbGFzdF9vZmZzZXQ7CkBAIC04NSw3ICs4NCw3IEBAIHN0cnVjdCBpb3Zf aXRlciB7CiAKIHN0YXRpYyBpbmxpbmUgY29uc3Qgc3RydWN0IGlvdmVjICppdGVyX2lvdihjb25z dCBzdHJ1Y3QgaW92X2l0ZXIgKml0ZXIpCiB7Ci0JaWYgKGl0ZXItPml0ZXJfdHlwZSA9PSBJVEVS X1VCVUYpCisJaWYgKGl0ZXItPml0ZXJfdHlwZSAmIElURVJfVUJVRikKIAkJcmV0dXJuIChjb25z dCBzdHJ1Y3QgaW92ZWMgKikgJml0ZXItPl9fdWJ1Zl9pb3ZlYzsKIAlyZXR1cm4gaXRlci0+X19p b3Y7CiB9CkBAIC0xMDgsMzIgKzEwNywzMiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaW92X2l0ZXJf c2F2ZV9zdGF0ZShzdHJ1Y3QgaW92X2l0ZXIgKml0ZXIsCiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBp dGVyX2lzX3VidWYoY29uc3Qgc3RydWN0IGlvdl9pdGVyICppKQogewotCXJldHVybiBpb3ZfaXRl cl90eXBlKGkpID09IElURVJfVUJVRjsKKwlyZXR1cm4gaW92X2l0ZXJfdHlwZShpKSAmIElURVJf VUJVRjsKIH0KIAogc3RhdGljIGlubGluZSBib29sIGl0ZXJfaXNfaW92ZWMoY29uc3Qgc3RydWN0 IGlvdl9pdGVyICppKQogewotCXJldHVybiBpb3ZfaXRlcl90eXBlKGkpID09IElURVJfSU9WRUM7 CisJcmV0dXJuIGlvdl9pdGVyX3R5cGUoaSkgJiBJVEVSX0lPVkVDOwogfQogCiBzdGF0aWMgaW5s aW5lIGJvb2wgaW92X2l0ZXJfaXNfa3ZlYyhjb25zdCBzdHJ1Y3QgaW92X2l0ZXIgKmkpCiB7Ci0J cmV0dXJuIGlvdl9pdGVyX3R5cGUoaSkgPT0gSVRFUl9LVkVDOworCXJldHVybiBpb3ZfaXRlcl90 eXBlKGkpICYgSVRFUl9LVkVDOwogfQogCiBzdGF0aWMgaW5saW5lIGJvb2wgaW92X2l0ZXJfaXNf YnZlYyhjb25zdCBzdHJ1Y3QgaW92X2l0ZXIgKmkpCiB7Ci0JcmV0dXJuIGlvdl9pdGVyX3R5cGUo aSkgPT0gSVRFUl9CVkVDOworCXJldHVybiBpb3ZfaXRlcl90eXBlKGkpICYgSVRFUl9CVkVDOwog fQogCiBzdGF0aWMgaW5saW5lIGJvb2wgaW92X2l0ZXJfaXNfZGlzY2FyZChjb25zdCBzdHJ1Y3Qg aW92X2l0ZXIgKmkpCiB7Ci0JcmV0dXJuIGlvdl9pdGVyX3R5cGUoaSkgPT0gSVRFUl9ESVNDQVJE OworCXJldHVybiBpb3ZfaXRlcl90eXBlKGkpICYgSVRFUl9ESVNDQVJEOwogfQogCiBzdGF0aWMg aW5saW5lIGJvb2wgaW92X2l0ZXJfaXNfeGFycmF5KGNvbnN0IHN0cnVjdCBpb3ZfaXRlciAqaSkK IHsKLQlyZXR1cm4gaW92X2l0ZXJfdHlwZShpKSA9PSBJVEVSX1hBUlJBWTsKKwlyZXR1cm4gaW92 X2l0ZXJfdHlwZShpKSAmIElURVJfWEFSUkFZOwogfQogCiBzdGF0aWMgaW5saW5lIHVuc2lnbmVk IGNoYXIgaW92X2l0ZXJfcncoY29uc3Qgc3RydWN0IGlvdl9pdGVyICppKQpAQCAtMTQzLDcgKzE0 Miw3IEBAIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgY2hhciBpb3ZfaXRlcl9ydyhjb25zdCBzdHJ1 Y3QgaW92X2l0ZXIgKmkpCiAKIHN0YXRpYyBpbmxpbmUgYm9vbCB1c2VyX2JhY2tlZF9pdGVyKGNv bnN0IHN0cnVjdCBpb3ZfaXRlciAqaSkKIHsKLQlyZXR1cm4gaS0+dXNlcl9iYWNrZWQ7CisJcmV0 dXJuIGktPml0ZXJfdHlwZSAmIChJVEVSX0lPVkVDIHwgSVRFUl9VQlVGKTsKIH0KIAogLyoKQEAg LTM3Niw3ICszNzUsNiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaW92X2l0ZXJfdWJ1ZihzdHJ1Y3Qg aW92X2l0ZXIgKmksIHVuc2lnbmVkIGludCBkaXJlY3Rpb24sCiAJKmkgPSAoc3RydWN0IGlvdl9p dGVyKSB7CiAJCS5pdGVyX3R5cGUgPSBJVEVSX1VCVUYsCiAJCS5jb3B5X21jID0gZmFsc2UsCi0J CS51c2VyX2JhY2tlZCA9IHRydWUsCiAJCS5kYXRhX3NvdXJjZSA9IGRpcmVjdGlvbiwKIAkJLnVi dWYgPSBidWYsCiAJCS5jb3VudCA9IGNvdW50LApkaWZmIC0tZ2l0IGEvbGliL2lvdl9pdGVyLmMg Yi9saWIvaW92X2l0ZXIuYwppbmRleCBlNGRjODA5ZDEwNzUuLjg1N2U2NjFkMTU1NCAxMDA2NDQK LS0tIGEvbGliL2lvdl9pdGVyLmMKKysrIGIvbGliL2lvdl9pdGVyLmMKQEAgLTI5MCw3ICsyOTAs NiBAQCB2b2lkIGlvdl9pdGVyX2luaXQoc3RydWN0IGlvdl9pdGVyICppLCB1bnNpZ25lZCBpbnQg ZGlyZWN0aW9uLAogCQkuaXRlcl90eXBlID0gSVRFUl9JT1ZFQywKIAkJLmNvcHlfbWMgPSBmYWxz ZSwKIAkJLm5vZmF1bHQgPSBmYWxzZSwKLQkJLnVzZXJfYmFja2VkID0gdHJ1ZSwKIAkJLmRhdGFf c291cmNlID0gZGlyZWN0aW9uLAogCQkuX19pb3YgPSBpb3YsCiAJCS5ucl9zZWdzID0gbnJfc2Vn cywKZGlmZiAtLWdpdCBhL3NvdW5kL2NvcmUvcGNtX25hdGl2ZS5jIGIvc291bmQvY29yZS9wY21f bmF0aXZlLmMKaW5kZXggOTVmYzU2ZTQwM2IxLi42NDJkY2VlYjgwZWUgMTAwNjQ0Ci0tLSBhL3Nv dW5kL2NvcmUvcGNtX25hdGl2ZS5jCisrKyBiL3NvdW5kL2NvcmUvcGNtX25hdGl2ZS5jCkBAIC0z NTI3LDcgKzM1MjcsNyBAQCBzdGF0aWMgc3NpemVfdCBzbmRfcGNtX3JlYWR2KHN0cnVjdCBraW9j YiAqaW9jYiwgc3RydWN0IGlvdl9pdGVyICp0bykKIAlpZiAocnVudGltZS0+c3RhdGUgPT0gU05E UlZfUENNX1NUQVRFX09QRU4gfHwKIAkgICAgcnVudGltZS0+c3RhdGUgPT0gU05EUlZfUENNX1NU QVRFX0RJU0NPTk5FQ1RFRCkKIAkJcmV0dXJuIC1FQkFERkQ7Ci0JaWYgKCF0by0+dXNlcl9iYWNr ZWQpCisJaWYgKCF1c2VyX2JhY2tlZF9pdGVyKHRvKSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAJaWYg KHRvLT5ucl9zZWdzID4gMTAyNCB8fCB0by0+bnJfc2VncyAhPSBydW50aW1lLT5jaGFubmVscykK IAkJcmV0dXJuIC1FSU5WQUw7CkBAIC0zNTY3LDcgKzM1NjcsNyBAQCBzdGF0aWMgc3NpemVfdCBz bmRfcGNtX3dyaXRldihzdHJ1Y3Qga2lvY2IgKmlvY2IsIHN0cnVjdCBpb3ZfaXRlciAqZnJvbSkK IAlpZiAocnVudGltZS0+c3RhdGUgPT0gU05EUlZfUENNX1NUQVRFX09QRU4gfHwKIAkgICAgcnVu dGltZS0+c3RhdGUgPT0gU05EUlZfUENNX1NUQVRFX0RJU0NPTk5FQ1RFRCkKIAkJcmV0dXJuIC1F QkFERkQ7Ci0JaWYgKCFmcm9tLT51c2VyX2JhY2tlZCkKKwlpZiAoIXVzZXJfYmFja2VkX2l0ZXIo ZnJvbSkpCiAJCXJldHVybiAtRUlOVkFMOwogCWlmIChmcm9tLT5ucl9zZWdzID4gMTI4IHx8IGZy b20tPm5yX3NlZ3MgIT0gcnVudGltZS0+Y2hhbm5lbHMgfHwKIAkgICAgIWZyYW1lX2FsaWduZWQo cnVudGltZSwgaW92LT5pb3ZfbGVuKSkK --000000000000ba4113060316b66b--