Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r4qgo-00AWl7-0M for pgsql-hackers@arkaria.postgresql.org; Sun, 19 Nov 2023 22:54:54 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1r4qgm-0057Xj-1r for pgsql-hackers@arkaria.postgresql.org; Sun, 19 Nov 2023 22:54:52 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r4qgl-0057Xb-GP for pgsql-hackers@lists.postgresql.org; Sun, 19 Nov 2023 22:54:51 +0000 Received: from mail-ot1-x332.google.com ([2607:f8b0:4864:20::332]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1r4qgh-007JpO-E6 for pgsql-hackers@postgresql.org; Sun, 19 Nov 2023 22:54:50 +0000 Received: by mail-ot1-x332.google.com with SMTP id 46e09a7af769-6ce2c5b2154so2359954a34.3 for ; Sun, 19 Nov 2023 14:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=j-davis-com.20230601.gappssmtp.com; s=20230601; t=1700434485; x=1701039285; darn=postgresql.org; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:from:to:cc:subject:date:message-id:reply-to; bh=2wCW1XI6BfqEuvF2brwh9E2/eH5EdRU0G+0iO+Ouxdo=; b=yD7ONJpIIpKjCvuQyC3COeQ+h/iNeAhqyEdQSwpOlIvLhWWla/byzU4iQDtbrWS5tK w4aybKR3lzSuUHldqDA+hZRdkUbNeoRakpbWOYvhxR6TGpyeR0TPUNDFq2eskd8sIN4A kkdQ0yrKDwfnrh4ubl4gQQruFI1Mbp9jFYVcswrkHtcbSNYyP9StSVM6atblHUH98TIp 353LEnzQUuu2lXOxcayJoFxyqvGq/H9CzFL8gQlYZcEusVnXGwOT2OwraN1wOiLoZGbu SB6Q7O1ylz0gLRd3SHieCbUMnmAR5AZ5Bx9k0Oi8g5suJ5+oR7IVexigfDOYCc8CqFeZ 8B8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700434485; x=1701039285; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2wCW1XI6BfqEuvF2brwh9E2/eH5EdRU0G+0iO+Ouxdo=; b=DDKxwBGlS0fINi6hC+PKn+cAcy1VucJ9nAe4nPEPTCuigg+uwbL6MVZ6CG4z1chEbJ bFwbMnrqutd8D5LA+J3NeQuLSEN/0ztgMXsNoZeMsk1M4/ABbehnB2UVEjorCg/+kt6m zNcWSJY472fEvDlpvDKdL1LRxNXnnkHLegfecyktoMMq3NmyiHtkIw7Pjf5+HTM/Sm1u 9ssxI0hHvso26K/zQsHUo5x1NinD08eaNlzujZX4dzC3t0ErnQ1tNXxyxjKLiGDhaAj3 owe1gii5CdS9viz99iDDJHcoFvisY2Vnw6/NP2LX2W6RRoObdpKaNV5xE+ihxqzKjw7x Txyg== X-Gm-Message-State: AOJu0YxDUtX+vCP1gyIQQmkLMe/NC8pIYIwHfFS6eMplMyhesqKpyaOZ ehY5ONiR2aZD6MKl3Inx94Ir8wYYN4g3tqZAuFY= X-Google-Smtp-Source: AGHT+IGTSIJHeL75CcyOGiKvBIiA5mDLE0ISFc7kL++ct4TDJ9C4lGW1Kddb4PpD8L6TeQtf1PzVeA== X-Received: by 2002:a05:6830:44a4:b0:6bc:8cd2:dd9c with SMTP id r36-20020a05683044a400b006bc8cd2dd9cmr6974605otv.36.1700434485159; Sun, 19 Nov 2023 14:54:45 -0800 (PST) Received: from jeff-laptop.lan (c-76-102-242-158.hsd1.ca.comcast.net. [76.102.242.158]) by smtp.gmail.com with ESMTPSA id n1-20020a6543c1000000b0058901200bbbsm4161490pgp.40.2023.11.19.14.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Nov 2023 14:54:43 -0800 (PST) Message-ID: <27a7a289d5b8f42e1b1e79b1bcaeef3a40583bd2.camel@j-davis.com> Subject: Re: Change GUC hashtable to use simplehash? From: Jeff Davis To: Andres Freund Cc: Tom Lane , Gurjeet Singh , pgsql-hackers@postgresql.org Date: Sun, 19 Nov 2023 14:54:41 -0800 In-Reply-To: <20231118001003.n2d7tvdgeckun2y6@awork3.anarazel.de> References: <92f69b1ecc8f49a5a6c961edbdfe53c80000f484.camel@j-davis.com> <804316.1700258644@sss.pgh.pa.us> <20231117232712.mpnzsho7ydssg2oc@awork3.anarazel.de> <7fee9f31c2e82948fa56fe57d68eecb0cce36f10.camel@j-davis.com> <20231118001003.n2d7tvdgeckun2y6@awork3.anarazel.de> Content-Type: multipart/mixed; boundary="=-fUt1TlCM+jEwaCUDBR4V" User-Agent: Evolution 3.44.4-0ubuntu2 MIME-Version: 1.0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --=-fUt1TlCM+jEwaCUDBR4V Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, On Fri, 2023-11-17 at 16:10 -0800, Andres Freund wrote: > > The requested name is already case-folded in most contexts. We can > > do a > > lookup first, and if that fails, case-fold and try again. I'll hack > > up > > a patch -- I believe that would be measurable for the proconfigs. >=20 > I'd just always case fold before lookups. The expensive bit of the > case > folding imo is that you need to do awkward things during hash > lookups. Attached are a bunch of tiny patches and some perf numbers based on simple test described here: https://www.postgresql.org/message-id/04c8592dbd694e4114a3ed87139a7a04e4363= 030.camel%40j-davis.com 0001: Use simplehash (without SH_STORE_HASH) 0002: fold before lookups 0003: have gen->name_key alias gen->name in typical case. Saves allocations in typical case where the name is already folded. 0004: second-chance lookup in hash table (avoids case-folding for already-folded names) 0005: Use SH_STORE_HASH (These are split out into tiny patches for perf measurement, some are pretty obvious but I wanted to see the impact, if any.) Numbers below are cumulative (i.e. 0003 includes 0002 and 0001): master: 7899ms 0001: 7850 0002: 7958 0003: 7942 0004: 7549 0005: 7411 I'm inclined toward all of these patches. I'll also look at adding SH_STORE_HASH for the search_path cache. Looks like we're on track to bring the overhead of SET search_path down to reasonable levels. Thank you! Regards, Jeff Davis --=-fUt1TlCM+jEwaCUDBR4V Content-Disposition: attachment; filename="v3-0005-Use-SH_STORE_HASH-for-GUC-hash-table.patch" Content-Type: text/x-patch; name="v3-0005-Use-SH_STORE_HASH-for-GUC-hash-table.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA3MTJjNDJmMTA2ZDZhMzYyYWQyMDFiNTY4ODFjNzA3YWY0NDEyZGM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIERhdmlzIDxqZWZmQGotZGF2aXMuY29tPgpEYXRlOiBT dW4sIDE5IE5vdiAyMDIzIDE0OjI0OjMxIC0wODAwClN1YmplY3Q6IFtQQVRDSCB2MyA1LzVdIFVz ZSBTSF9TVE9SRV9IQVNIIGZvciBHVUMgaGFzaCB0YWJsZS4KCi0tLQogc3JjL2JhY2tlbmQvdXRp bHMvbWlzYy9ndWMuYyB8IDMgKysrCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspCgpk aWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9ndWMuYyBiL3NyYy9iYWNrZW5kL3V0 aWxzL21pc2MvZ3VjLmMKaW5kZXggYmNhZGJmYWNlNi4uMTEwMmVhOTk1NCAxMDA2NDQKLS0tIGEv c3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9ndWMuYworKysgYi9zcmMvYmFja2VuZC91dGlscy9taXNj L2d1Yy5jCkBAIC0yMDUsNiArMjA1LDcgQEAgdHlwZWRlZiBzdHJ1Y3QKIAlzdHJ1Y3QgY29uZmln X2dlbmVyaWMgKmd1Y3ZhcjsJLyogLT4gR1VDJ3MgZGVmaW5pbmcgc3RydWN0dXJlICovCiAKIAkv KiBuZWVkZWQgYnkgc2ltcGxlaGFzaCAqLworCXVpbnQzMgloYXNoOwogCWNoYXIgc3RhdHVzOwog fSBHVUNIYXNoRW50cnk7CiAKQEAgLTI3Niw2ICsyNzcsOCBAQCBzdGF0aWMgY2hhciAqIGd1Y19u YW1lX2tleShpbnQgZWxldmVsLCBjb25zdCBjaGFyICpuYW1lKTsKICNkZWZpbmUgU0hfRVFVQUwo dGIsIGEsIGIpCQkoc3RyY21wKGEsIGIpID09IDApCiAjZGVmaW5lCVNIX1NDT1BFCQlzdGF0aWMg aW5saW5lCiAjZGVmaW5lIFNIX0RFQ0xBUkUKKyNkZWZpbmUgU0hfR0VUX0hBU0godGIsIGEpCQlh LT5oYXNoCisjZGVmaW5lIFNIX1NUT1JFX0hBU0gKICNkZWZpbmUgU0hfREVGSU5FCiAjaW5jbHVk ZSAibGliL3NpbXBsZWhhc2guaCIKIAotLSAKMi4zNC4xCgo= --=-fUt1TlCM+jEwaCUDBR4V Content-Disposition: attachment; filename="v3-0004-GUC-optimize-for-already-case-folded-names.patch" Content-Type: text/x-patch; name="v3-0004-GUC-optimize-for-already-case-folded-names.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA1YmE4OWY0YmRmYzZiMTA1NmQ2ZTdiNzhhNTU3N2M3MTFjZWJkMGFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIERhdmlzIDxqZWZmQGotZGF2aXMuY29tPgpEYXRlOiBT dW4sIDE5IE5vdiAyMDIzIDE0OjAwOjIzIC0wODAwClN1YmplY3Q6IFtQQVRDSCB2MyA0LzVdIEdV Qzogb3B0aW1pemUgZm9yIGFscmVhZHkgY2FzZS1mb2xkZWQgbmFtZXMuCgotLS0KIHNyYy9iYWNr ZW5kL3V0aWxzL21pc2MvZ3VjLmMgfCAyMyArKysrKysrKysrKysrKystLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv c3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9ndWMuYyBiL3NyYy9iYWNrZW5kL3V0aWxzL21pc2MvZ3Vj LmMKaW5kZXggNWUzYjk1ZTNmMi4uYmNhZGJmYWNlNiAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQv dXRpbHMvbWlzYy9ndWMuYworKysgYi9zcmMvYmFja2VuZC91dGlscy9taXNjL2d1Yy5jCkBAIC0x MzEwLDE3ICsxMzEwLDI0IEBAIGZpbmRfb3B0aW9uKGNvbnN0IGNoYXIgKm5hbWUsIGJvb2wgY3Jl YXRlX3BsYWNlaG9sZGVycywgYm9vbCBza2lwX2Vycm9ycywKIHsKIAlHVUNIYXNoRW50cnkgKmhl bnRyeTsKIAlpbnQJCQlpOwotCWNoYXIgKm5hbWVfa2V5OwogCiAJQXNzZXJ0KG5hbWUpOwogCi0J LyogTG9vayBpdCB1cCB1c2luZyB0aGUgaGFzaCB0YWJsZS4gKi8KLQluYW1lX2tleSA9IGd1Y19u YW1lX2tleShlbGV2ZWwsIG5hbWUpOwotCWlmIChuYW1lX2tleSA9PSBOVUxMKQotCQlyZXR1cm4g TlVMTDsKLQloZW50cnkgPSBHVUNIYXNoX2xvb2t1cChndWNfaGFzaHRhYiwgbmFtZV9rZXkpOwot CWd1Y19mcmVlKG5hbWVfa2V5KTsKLQluYW1lX2tleSA9IE5VTEw7CisJLyoKKwkgKiBMb29rIGl0 IHVwIHVzaW5nIHRoZSBoYXNoIHRhYmxlIHdpdGhvdXQgY2FzZS1mb2xkaW5nIGZpcnN0LCBhcyBh bgorCSAqIG9wdGltaXphdGlvbi4KKwkgKi8KKwloZW50cnkgPSBHVUNIYXNoX2xvb2t1cChndWNf aGFzaHRhYiwgbmFtZSk7CisKKwkvKiBUcnkgYWdhaW4gd2l0aCBjYXNlIGZvbGRpbmcuICovCisJ aWYgKCFoZW50cnkpCisJeworCQljaGFyICpuYW1lX2tleSA9IGd1Y19uYW1lX2tleShlbGV2ZWws IG5hbWUpOworCQlpZiAobmFtZV9rZXkgPT0gTlVMTCkKKwkJCXJldHVybiBOVUxMOworCQloZW50 cnkgPSBHVUNIYXNoX2xvb2t1cChndWNfaGFzaHRhYiwgbmFtZV9rZXkpOworCQlndWNfZnJlZShu YW1lX2tleSk7CisJfQogCiAJaWYgKGhlbnRyeSkKIAkJcmV0dXJuIGhlbnRyeS0+Z3VjdmFyOwot LSAKMi4zNC4xCgo= --=-fUt1TlCM+jEwaCUDBR4V Content-Disposition: attachment; filename*0=v3-0003-Avoid-duplicating-GUC-name-when-it-s-already-case.pat; filename*1=ch Content-Type: text/x-patch; name="v3-0003-Avoid-duplicating-GUC-name-when-it-s-already-case.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA0ODVkZDU2YTBhMmE1MGY3MjVmY2M5YWYyZDM3MGJmYTRhMTk3YzhiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIERhdmlzIDxqZWZmQGotZGF2aXMuY29tPgpEYXRlOiBT dW4sIDE5IE5vdiAyMDIzIDEzOjQxOjQ5IC0wODAwClN1YmplY3Q6IFtQQVRDSCB2MyAzLzVdIEF2 b2lkIGR1cGxpY2F0aW5nIEdVQyBuYW1lIHdoZW4gaXQncyBhbHJlYWR5CiBjYXNlLWZvbGRlZC4K Ci0tLQogc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9ndWMuYyAgIHwgNzAgKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLQogc3JjL2luY2x1ZGUvdXRpbHMvZ3VjX3RhYmxlcy5oIHwgIDMg Ky0KIDIgZmlsZXMgY2hhbmdlZCwgNjAgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9ndWMuYyBiL3NyYy9iYWNrZW5kL3V0 aWxzL21pc2MvZ3VjLmMKaW5kZXggYjUxZDEwZGJjMC4uNWUzYjk1ZTNmMiAxMDA2NDQKLS0tIGEv c3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9ndWMuYworKysgYi9zcmMvYmFja2VuZC91dGlscy9taXNj L2d1Yy5jCkBAIC0yNjUsNiArMjY1LDcgQEAgc3RhdGljIGJvb2wgY2FsbF9zdHJpbmdfY2hlY2tf aG9vayhzdHJ1Y3QgY29uZmlnX3N0cmluZyAqY29uZiwgY2hhciAqKm5ld3ZhbCwKIAkJCQkJCQkJ ICAgdm9pZCAqKmV4dHJhLCBHdWNTb3VyY2Ugc291cmNlLCBpbnQgZWxldmVsKTsKIHN0YXRpYyBi b29sIGNhbGxfZW51bV9jaGVja19ob29rKHN0cnVjdCBjb25maWdfZW51bSAqY29uZiwgaW50ICpu ZXd2YWwsCiAJCQkJCQkJCSB2b2lkICoqZXh0cmEsIEd1Y1NvdXJjZSBzb3VyY2UsIGludCBlbGV2 ZWwpOworc3RhdGljIGJvb2wgZ3VjX2lzX25hbWVfa2V5KGNvbnN0IGNoYXIgKm5hbWUpOwogc3Rh dGljIGNoYXIgKiBndWNfbmFtZV9rZXkoaW50IGVsZXZlbCwgY29uc3QgY2hhciAqbmFtZSk7CiAK ICNkZWZpbmUgU0hfUFJFRklYCQlHVUNIYXNoCkBAIC05MDMsNiArOTA0LDIyIEBAIGdldF9ndWNf dmFyaWFibGVzKGludCAqbnVtX3ZhcnMpCiB9CiAKIAorLyoKKyAqIENoZWNrIGlmIG5hbWUgaXMg YWxyZWFkeSBjYXNlLWZvbGRlZC4KKyAqLworc3RhdGljIGJvb2wKK2d1Y19pc19uYW1lX2tleShj b25zdCBjaGFyICpuYW1lKQoreworCWZvcihjb25zdCBjaGFyICpwID0gbmFtZTsgKnA7IHArKykK Kwl7CisJCWlmICgqcCA+PSAnQScgJiYgKnAgPD0gJ1onKQorCQkJcmV0dXJuIGZhbHNlOworCX0K KworCXJldHVybiB0cnVlOworfQorCisKIC8qCiAgKiBDb252ZXJ0IHRvIGtleSBieSBjYXNlIGZv bGRpbmcuCiAgKi8KQEAgLTk1Myw3ICs5NzAsMTEgQEAgYnVpbGRfZ3VjX3ZhcmlhYmxlcyh2b2lk KQogCQkvKiBSYXRoZXIgdGhhbiByZXF1aXJpbmcgdmFydHlwZSB0byBiZSBmaWxsZWQgaW4gYnkg aGFuZCwgZG8gdGhpczogKi8KIAkJY29uZi0+Z2VuLnZhcnR5cGUgPSBQR0NfQk9PTDsKIAotCQlj b25mLT5nZW4ubmFtZV9rZXkgPSBndWNfbmFtZV9rZXkoRVJST1IsIGNvbmYtPmdlbi5uYW1lKTsK KwkJaWYgKGd1Y19pc19uYW1lX2tleShjb25mLT5nZW4ubmFtZSkpCisJCQljb25mLT5nZW4ubmFt ZV9rZXkgPSBjb25mLT5nZW4ubmFtZTsKKwkJZWxzZQorCQkJY29uZi0+Z2VuLm5hbWVfa2V5ID0g Z3VjX25hbWVfa2V5KEVSUk9SLCBjb25mLT5nZW4ubmFtZSk7CisKIAkJbnVtX3ZhcnMrKzsKIAl9 CiAKQEAgLTk2Myw3ICs5ODQsMTEgQEAgYnVpbGRfZ3VjX3ZhcmlhYmxlcyh2b2lkKQogCiAJCWNv bmYtPmdlbi52YXJ0eXBlID0gUEdDX0lOVDsKIAotCQljb25mLT5nZW4ubmFtZV9rZXkgPSBndWNf bmFtZV9rZXkoRVJST1IsIGNvbmYtPmdlbi5uYW1lKTsKKwkJaWYgKGd1Y19pc19uYW1lX2tleShj b25mLT5nZW4ubmFtZSkpCisJCQljb25mLT5nZW4ubmFtZV9rZXkgPSBjb25mLT5nZW4ubmFtZTsK KwkJZWxzZQorCQkJY29uZi0+Z2VuLm5hbWVfa2V5ID0gZ3VjX25hbWVfa2V5KEVSUk9SLCBjb25m LT5nZW4ubmFtZSk7CisKIAkJbnVtX3ZhcnMrKzsKIAl9CiAKQEAgLTk3Myw3ICs5OTgsMTEgQEAg YnVpbGRfZ3VjX3ZhcmlhYmxlcyh2b2lkKQogCiAJCWNvbmYtPmdlbi52YXJ0eXBlID0gUEdDX1JF QUw7CiAKLQkJY29uZi0+Z2VuLm5hbWVfa2V5ID0gZ3VjX25hbWVfa2V5KEVSUk9SLCBjb25mLT5n ZW4ubmFtZSk7CisJCWlmIChndWNfaXNfbmFtZV9rZXkoY29uZi0+Z2VuLm5hbWUpKQorCQkJY29u Zi0+Z2VuLm5hbWVfa2V5ID0gY29uZi0+Z2VuLm5hbWU7CisJCWVsc2UKKwkJCWNvbmYtPmdlbi5u YW1lX2tleSA9IGd1Y19uYW1lX2tleShFUlJPUiwgY29uZi0+Z2VuLm5hbWUpOworCiAJCW51bV92 YXJzKys7CiAJfQogCkBAIC05ODMsNyArMTAxMiwxMSBAQCBidWlsZF9ndWNfdmFyaWFibGVzKHZv aWQpCiAKIAkJY29uZi0+Z2VuLnZhcnR5cGUgPSBQR0NfU1RSSU5HOwogCi0JCWNvbmYtPmdlbi5u YW1lX2tleSA9IGd1Y19uYW1lX2tleShFUlJPUiwgY29uZi0+Z2VuLm5hbWUpOworCQlpZiAoZ3Vj X2lzX25hbWVfa2V5KGNvbmYtPmdlbi5uYW1lKSkKKwkJCWNvbmYtPmdlbi5uYW1lX2tleSA9IGNv bmYtPmdlbi5uYW1lOworCQllbHNlCisJCQljb25mLT5nZW4ubmFtZV9rZXkgPSBndWNfbmFtZV9r ZXkoRVJST1IsIGNvbmYtPmdlbi5uYW1lKTsKKwogCQludW1fdmFycysrOwogCX0KIApAQCAtOTkz LDcgKzEwMjYsMTEgQEAgYnVpbGRfZ3VjX3ZhcmlhYmxlcyh2b2lkKQogCiAJCWNvbmYtPmdlbi52 YXJ0eXBlID0gUEdDX0VOVU07CiAKLQkJY29uZi0+Z2VuLm5hbWVfa2V5ID0gZ3VjX25hbWVfa2V5 KEVSUk9SLCBjb25mLT5nZW4ubmFtZSk7CisJCWlmIChndWNfaXNfbmFtZV9rZXkoY29uZi0+Z2Vu Lm5hbWUpKQorCQkJY29uZi0+Z2VuLm5hbWVfa2V5ID0gY29uZi0+Z2VuLm5hbWU7CisJCWVsc2UK KwkJCWNvbmYtPmdlbi5uYW1lX2tleSA9IGd1Y19uYW1lX2tleShFUlJPUiwgY29uZi0+Z2VuLm5h bWUpOworCiAJCW51bV92YXJzKys7CiAJfQogCkBAIC0xMjEyLDEzICsxMjQ5LDE4IEBAIGFkZF9w bGFjZWhvbGRlcl92YXJpYWJsZShjb25zdCBjaGFyICpjb25zdG5hbWUsIGludCBlbGV2ZWwpCiAJ CXJldHVybiBOVUxMOwogCX0KIAotCW5hbWVfa2V5ID0gZ3VjX25hbWVfa2V5KGVsZXZlbCwgbmFt ZSk7Ci0JaWYgKG5hbWVfa2V5ID09IE5VTEwpCisJaWYgKCFndWNfaXNfbmFtZV9rZXkobmFtZSkp CiAJewotCQlndWNfZnJlZShuYW1lKTsKLQkJZ3VjX2ZyZWUodmFyKTsKLQkJcmV0dXJuIE5VTEw7 CisJCW5hbWVfa2V5ID0gZ3VjX25hbWVfa2V5KGVsZXZlbCwgbmFtZSk7CisJCWlmIChuYW1lX2tl eSA9PSBOVUxMKQorCQl7CisJCQlndWNfZnJlZShuYW1lKTsKKwkJCWd1Y19mcmVlKHZhcik7CisJ CQlyZXR1cm4gTlVMTDsKKwkJfQogCX0KKwllbHNlCisJCW5hbWVfa2V5ID0gbmFtZTsKIAogCWdl bi0+bmFtZSA9IG5hbWU7CiAJZ2VuLT5jb250ZXh0ID0gUEdDX1VTRVJTRVQ7CkBAIC0xMjM3LDcg KzEyNzksOCBAQCBhZGRfcGxhY2Vob2xkZXJfdmFyaWFibGUoY29uc3QgY2hhciAqY29uc3RuYW1l LCBpbnQgZWxldmVsKQogCiAJaWYgKCFhZGRfZ3VjX3ZhcmlhYmxlKChzdHJ1Y3QgY29uZmlnX2dl bmVyaWMgKikgdmFyLCBlbGV2ZWwpKQogCXsKLQkJZ3VjX2ZyZWUobmFtZV9rZXkpOworCQlpZiAo bmFtZV9rZXkgIT0gbmFtZSkKKwkJCWd1Y19mcmVlKG5hbWVfa2V5KTsKIAkJZ3VjX2ZyZWUobmFt ZSk7CiAJCWd1Y19mcmVlKHZhcik7CiAJCXJldHVybiBOVUxMOwpAQCAtNDc5Niw3ICs0ODM5LDEw IEBAIGluaXRfY3VzdG9tX3ZhcmlhYmxlKGNvbnN0IGNoYXIgKm5hbWUsCiAJbWVtc2V0KGdlbiwg MCwgc3opOwogCiAJZ2VuLT5uYW1lID0gZ3VjX3N0cmR1cChFUlJPUiwgbmFtZSk7Ci0JZ2VuLT5u YW1lX2tleSA9IGd1Y19uYW1lX2tleShFUlJPUiwgbmFtZSk7CisJaWYgKGd1Y19pc19uYW1lX2tl eShuYW1lKSkKKwkJZ2VuLT5uYW1lX2tleSA9IG5hbWU7CisJZWxzZQorCQlnZW4tPm5hbWVfa2V5 ID0gZ3VjX25hbWVfa2V5KEVSUk9SLCBuYW1lKTsKIAlnZW4tPmNvbnRleHQgPSBjb250ZXh0Owog CWdlbi0+Z3JvdXAgPSBDVVNUT01fT1BUSU9OUzsKIAlnZW4tPnNob3J0X2Rlc2MgPSBzaG9ydF9k ZXNjOwpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUvdXRpbHMvZ3VjX3RhYmxlcy5oIGIvc3JjL2lu Y2x1ZGUvdXRpbHMvZ3VjX3RhYmxlcy5oCmluZGV4IDQxYjAzMTZjMGIuLjI2YmY3ZTA5NzggMTAw NjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL3V0aWxzL2d1Y190YWJsZXMuaAorKysgYi9zcmMvaW5jbHVk ZS91dGlscy9ndWNfdGFibGVzLmgKQEAgLTE2MCw3ICsxNjAsOCBAQCBzdHJ1Y3QgY29uZmlnX2dl bmVyaWMKIAlpbnQJCQlmbGFnczsJCQkvKiBmbGFnIGJpdHMsIHNlZSBndWMuaCAqLwogCS8qIHZh cmlhYmxlIGZpZWxkcywgaW5pdGlhbGl6ZWQgYXQgcnVudGltZTogKi8KIAllbnVtIGNvbmZpZ190 eXBlIHZhcnR5cGU7CS8qIHR5cGUgb2YgdmFyaWFibGUgKHNldCBvbmx5IGF0IHN0YXJ0dXApICov Ci0JY29uc3QgY2hhciAqbmFtZV9rZXk7CQkvKiBuYW1lIGZvbGRlZCB0byBsb3dlciBjYXNlICov CisJY29uc3QgY2hhciAqbmFtZV9rZXk7CQkvKiBuYW1lIGZvbGRlZCB0byBsb3dlciBjYXNlOyBh bGlhcyBvZiBuYW1lIGlmCisJCQkJCQkJCSAqIGVxdWFsICovCiAJaW50CQkJc3RhdHVzOwkJCS8q IHN0YXR1cyBiaXRzLCBzZWUgYmVsb3cgKi8KIAlHdWNTb3VyY2UJc291cmNlOwkJCS8qIHNvdXJj ZSBvZiB0aGUgY3VycmVudCBhY3R1YWwgdmFsdWUgKi8KIAlHdWNTb3VyY2UJcmVzZXRfc291cmNl OwkvKiBzb3VyY2Ugb2YgdGhlIHJlc2V0X3ZhbHVlICovCi0tIAoyLjM0LjEKCg== --=-fUt1TlCM+jEwaCUDBR4V Content-Disposition: attachment; filename="v3-0002-Case-fold-earlier.patch" Content-Type: text/x-patch; name="v3-0002-Case-fold-earlier.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBlODk2ZTMyNjY4OGJlZjI3ZjFmNjEyZWM2NGM1YTBjZThmYzhkNmIzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIERhdmlzIDxqZWZmQGotZGF2aXMuY29tPgpEYXRlOiBU aHUsIDE5IE9jdCAyMDIzIDIzOjQyOjU4IC0wNzAwClN1YmplY3Q6IFtQQVRDSCB2MyAyLzVdIENh c2UgZm9sZCBlYXJsaWVyLgoKLS0tCiBzcmMvYmFja2VuZC91dGlscy9taXNjL2d1Yy5jICAgfCAx MDIgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiBzcmMvaW5jbHVkZS91dGlscy9n dWNfdGFibGVzLmggfCAgIDEgKwogMiBmaWxlcyBjaGFuZ2VkLCA3MiBpbnNlcnRpb25zKCspLCAz MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC91dGlscy9taXNjL2d1Yy5j IGIvc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9ndWMuYwppbmRleCA3Mjk1YjBmMDBlLi5iNTFkMTBk YmMwIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC91dGlscy9taXNjL2d1Yy5jCisrKyBiL3NyYy9i YWNrZW5kL3V0aWxzL21pc2MvZ3VjLmMKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJjYXRh bG9nL29iamVjdGFjY2Vzcy5oIgogI2luY2x1ZGUgImNhdGFsb2cvcGdfYXV0aGlkLmgiCiAjaW5j bHVkZSAiY2F0YWxvZy9wZ19wYXJhbWV0ZXJfYWNsLmgiCisjaW5jbHVkZSAiY29tbW9uL2hhc2hm bi5oIgogI2luY2x1ZGUgImd1Y19pbnRlcm5hbC5oIgogI2luY2x1ZGUgImxpYnBxL3BxZm9ybWF0 LmgiCiAjaW5jbHVkZSAicGFyc2VyL3NjYW5zdXAuaCIKQEAgLTIwMCw3ICsyMDEsNyBAQCBzdGF0 aWMgTWVtb3J5Q29udGV4dCBHVUNNZW1vcnlDb250ZXh0OwogICovCiB0eXBlZGVmIHN0cnVjdAog ewotCWNvbnN0IGNoYXIgKmd1Y25hbWU7CQkvKiBoYXNoIGtleSAqLworCWNvbnN0IGNoYXIgKmd1 Y19oYXNoa2V5OwkJLyogY2FzZS1mb2xkZWQgR1VDIG5hbWUgKi8KIAlzdHJ1Y3QgY29uZmlnX2dl bmVyaWMgKmd1Y3ZhcjsJLyogLT4gR1VDJ3MgZGVmaW5pbmcgc3RydWN0dXJlICovCiAKIAkvKiBu ZWVkZWQgYnkgc2ltcGxlaGFzaCAqLwpAQCAtMjY0LDEzICsyNjUsMTQgQEAgc3RhdGljIGJvb2wg Y2FsbF9zdHJpbmdfY2hlY2tfaG9vayhzdHJ1Y3QgY29uZmlnX3N0cmluZyAqY29uZiwgY2hhciAq Km5ld3ZhbCwKIAkJCQkJCQkJICAgdm9pZCAqKmV4dHJhLCBHdWNTb3VyY2Ugc291cmNlLCBpbnQg ZWxldmVsKTsKIHN0YXRpYyBib29sIGNhbGxfZW51bV9jaGVja19ob29rKHN0cnVjdCBjb25maWdf ZW51bSAqY29uZiwgaW50ICpuZXd2YWwsCiAJCQkJCQkJCSB2b2lkICoqZXh0cmEsIEd1Y1NvdXJj ZSBzb3VyY2UsIGludCBlbGV2ZWwpOworc3RhdGljIGNoYXIgKiBndWNfbmFtZV9rZXkoaW50IGVs ZXZlbCwgY29uc3QgY2hhciAqbmFtZSk7CiAKICNkZWZpbmUgU0hfUFJFRklYCQlHVUNIYXNoCiAj ZGVmaW5lIFNIX0VMRU1FTlRfVFlQRQlHVUNIYXNoRW50cnkKICNkZWZpbmUgU0hfS0VZX1RZUEUJ CWNvbnN0IGNoYXIgKgotI2RlZmluZQlTSF9LRVkJCQlndWNuYW1lCisjZGVmaW5lCVNIX0tFWQkJ CWd1Y19oYXNoa2V5CiAjZGVmaW5lIFNIX0hBU0hfS0VZKHRiLCBrZXkpICAgCWd1Y19uYW1lX2hh c2goa2V5KQotI2RlZmluZSBTSF9FUVVBTCh0YiwgYSwgYikJCShndWNfbmFtZV9jb21wYXJlKGEs IGIpID09IDApCisjZGVmaW5lIFNIX0VRVUFMKHRiLCBhLCBiKQkJKHN0cmNtcChhLCBiKSA9PSAw KQogI2RlZmluZQlTSF9TQ09QRQkJc3RhdGljIGlubGluZQogI2RlZmluZSBTSF9ERUNMQVJFCiAj ZGVmaW5lIFNIX0RFRklORQpAQCAtOTAxLDYgKzkwMywyNCBAQCBnZXRfZ3VjX3ZhcmlhYmxlcyhp bnQgKm51bV92YXJzKQogfQogCiAKKy8qCisgKiBDb252ZXJ0IHRvIGtleSBieSBjYXNlIGZvbGRp bmcuCisgKi8KK3N0YXRpYyBjaGFyICoKK2d1Y19uYW1lX2tleShpbnQgZWxldmVsLCBjb25zdCBj aGFyICpuYW1lKQoreworCWNoYXIgKm5ld3N0ciA9IGd1Y19zdHJkdXAoZWxldmVsLCBuYW1lKTsK KworCWZvcihjaGFyICpwID0gbmV3c3RyOyAqcDsgcCsrKQorCXsKKwkJaWYgKCpwID49ICdBJyAm JiAqcCA8PSAnWicpCisJCQkqcCArPSAnYScgLSAnQSc7CisJfQorCisJcmV0dXJuIG5ld3N0cjsK K30KKworCiAvKgogICogQnVpbGQgdGhlIEdVQyBoYXNoIHRhYmxlLiAgVGhpcyBpcyBzcGxpdCBv dXQgc28gdGhhdCBoZWxwX2NvbmZpZy5jIGNhbgogICogZXh0cmFjdCBhbGwgdGhlIHZhcmlhYmxl cyB3aXRob3V0IHJ1bm5pbmcgYWxsIG9mIEluaXRpYWxpemVHVUNPcHRpb25zLgpAQCAtOTMyLDYg Kzk1Miw4IEBAIGJ1aWxkX2d1Y192YXJpYWJsZXModm9pZCkKIAogCQkvKiBSYXRoZXIgdGhhbiBy ZXF1aXJpbmcgdmFydHlwZSB0byBiZSBmaWxsZWQgaW4gYnkgaGFuZCwgZG8gdGhpczogKi8KIAkJ Y29uZi0+Z2VuLnZhcnR5cGUgPSBQR0NfQk9PTDsKKworCQljb25mLT5nZW4ubmFtZV9rZXkgPSBn dWNfbmFtZV9rZXkoRVJST1IsIGNvbmYtPmdlbi5uYW1lKTsKIAkJbnVtX3ZhcnMrKzsKIAl9CiAK QEAgLTk0MCw2ICs5NjIsOCBAQCBidWlsZF9ndWNfdmFyaWFibGVzKHZvaWQpCiAJCXN0cnVjdCBj b25maWdfaW50ICpjb25mID0gJkNvbmZpZ3VyZU5hbWVzSW50W2ldOwogCiAJCWNvbmYtPmdlbi52 YXJ0eXBlID0gUEdDX0lOVDsKKworCQljb25mLT5nZW4ubmFtZV9rZXkgPSBndWNfbmFtZV9rZXko RVJST1IsIGNvbmYtPmdlbi5uYW1lKTsKIAkJbnVtX3ZhcnMrKzsKIAl9CiAKQEAgLTk0OCw2ICs5 NzIsOCBAQCBidWlsZF9ndWNfdmFyaWFibGVzKHZvaWQpCiAJCXN0cnVjdCBjb25maWdfcmVhbCAq Y29uZiA9ICZDb25maWd1cmVOYW1lc1JlYWxbaV07CiAKIAkJY29uZi0+Z2VuLnZhcnR5cGUgPSBQ R0NfUkVBTDsKKworCQljb25mLT5nZW4ubmFtZV9rZXkgPSBndWNfbmFtZV9rZXkoRVJST1IsIGNv bmYtPmdlbi5uYW1lKTsKIAkJbnVtX3ZhcnMrKzsKIAl9CiAKQEAgLTk1Niw2ICs5ODIsOCBAQCBi dWlsZF9ndWNfdmFyaWFibGVzKHZvaWQpCiAJCXN0cnVjdCBjb25maWdfc3RyaW5nICpjb25mID0g JkNvbmZpZ3VyZU5hbWVzU3RyaW5nW2ldOwogCiAJCWNvbmYtPmdlbi52YXJ0eXBlID0gUEdDX1NU UklORzsKKworCQljb25mLT5nZW4ubmFtZV9rZXkgPSBndWNfbmFtZV9rZXkoRVJST1IsIGNvbmYt Pmdlbi5uYW1lKTsKIAkJbnVtX3ZhcnMrKzsKIAl9CiAKQEAgLTk2NCw2ICs5OTIsOCBAQCBidWls ZF9ndWNfdmFyaWFibGVzKHZvaWQpCiAJCXN0cnVjdCBjb25maWdfZW51bSAqY29uZiA9ICZDb25m aWd1cmVOYW1lc0VudW1baV07CiAKIAkJY29uZi0+Z2VuLnZhcnR5cGUgPSBQR0NfRU5VTTsKKwor CQljb25mLT5nZW4ubmFtZV9rZXkgPSBndWNfbmFtZV9rZXkoRVJST1IsIGNvbmYtPmdlbi5uYW1l KTsKIAkJbnVtX3ZhcnMrKzsKIAl9CiAKQEAgLTk3OCw3ICsxMDA4LDcgQEAgYnVpbGRfZ3VjX3Zh cmlhYmxlcyh2b2lkKQogCXsKIAkJc3RydWN0IGNvbmZpZ19nZW5lcmljICpndWN2YXIgPSAmQ29u ZmlndXJlTmFtZXNCb29sW2ldLmdlbjsKIAotCQloZW50cnkgPSBHVUNIYXNoX2luc2VydChndWNf aGFzaHRhYiwgZ3VjdmFyLT5uYW1lLCAmZm91bmQpOworCQloZW50cnkgPSBHVUNIYXNoX2luc2Vy dChndWNfaGFzaHRhYiwgZ3VjdmFyLT5uYW1lX2tleSwgJmZvdW5kKTsKIAogCQlBc3NlcnQoIWZv dW5kKTsKIAkJaGVudHJ5LT5ndWN2YXIgPSBndWN2YXI7CkBAIC05ODgsNyArMTAxOCw3IEBAIGJ1 aWxkX2d1Y192YXJpYWJsZXModm9pZCkKIAl7CiAJCXN0cnVjdCBjb25maWdfZ2VuZXJpYyAqZ3Vj dmFyID0gJkNvbmZpZ3VyZU5hbWVzSW50W2ldLmdlbjsKIAotCQloZW50cnkgPSBHVUNIYXNoX2lu c2VydChndWNfaGFzaHRhYiwgZ3VjdmFyLT5uYW1lLCAmZm91bmQpOworCQloZW50cnkgPSBHVUNI YXNoX2luc2VydChndWNfaGFzaHRhYiwgZ3VjdmFyLT5uYW1lX2tleSwgJmZvdW5kKTsKIAogCQlB c3NlcnQoIWZvdW5kKTsKIAkJaGVudHJ5LT5ndWN2YXIgPSBndWN2YXI7CkBAIC05OTgsNyArMTAy OCw3IEBAIGJ1aWxkX2d1Y192YXJpYWJsZXModm9pZCkKIAl7CiAJCXN0cnVjdCBjb25maWdfZ2Vu ZXJpYyAqZ3VjdmFyID0gJkNvbmZpZ3VyZU5hbWVzUmVhbFtpXS5nZW47CiAKLQkJaGVudHJ5ID0g R1VDSGFzaF9pbnNlcnQoZ3VjX2hhc2h0YWIsIGd1Y3Zhci0+bmFtZSwgJmZvdW5kKTsKKwkJaGVu dHJ5ID0gR1VDSGFzaF9pbnNlcnQoZ3VjX2hhc2h0YWIsIGd1Y3Zhci0+bmFtZV9rZXksICZmb3Vu ZCk7CiAKIAkJQXNzZXJ0KCFmb3VuZCk7CiAJCWhlbnRyeS0+Z3VjdmFyID0gZ3VjdmFyOwpAQCAt MTAwOCw3ICsxMDM4LDcgQEAgYnVpbGRfZ3VjX3ZhcmlhYmxlcyh2b2lkKQogCXsKIAkJc3RydWN0 IGNvbmZpZ19nZW5lcmljICpndWN2YXIgPSAmQ29uZmlndXJlTmFtZXNTdHJpbmdbaV0uZ2VuOwog Ci0JCWhlbnRyeSA9IEdVQ0hhc2hfaW5zZXJ0KGd1Y19oYXNodGFiLCBndWN2YXItPm5hbWUsICZm b3VuZCk7CisJCWhlbnRyeSA9IEdVQ0hhc2hfaW5zZXJ0KGd1Y19oYXNodGFiLCBndWN2YXItPm5h bWVfa2V5LCAmZm91bmQpOwogCiAJCUFzc2VydCghZm91bmQpOwogCQloZW50cnktPmd1Y3ZhciA9 IGd1Y3ZhcjsKQEAgLTEwMTgsNyArMTA0OCw3IEBAIGJ1aWxkX2d1Y192YXJpYWJsZXModm9pZCkK IAl7CiAJCXN0cnVjdCBjb25maWdfZ2VuZXJpYyAqZ3VjdmFyID0gJkNvbmZpZ3VyZU5hbWVzRW51 bVtpXS5nZW47CiAKLQkJaGVudHJ5ID0gR1VDSGFzaF9pbnNlcnQoZ3VjX2hhc2h0YWIsIGd1Y3Zh ci0+bmFtZSwgJmZvdW5kKTsKKwkJaGVudHJ5ID0gR1VDSGFzaF9pbnNlcnQoZ3VjX2hhc2h0YWIs IGd1Y3Zhci0+bmFtZV9rZXksICZmb3VuZCk7CiAKIAkJQXNzZXJ0KCFmb3VuZCk7CiAJCWhlbnRy eS0+Z3VjdmFyID0gZ3VjdmFyOwpAQCAtMTAzNyw3ICsxMDY3LDggQEAgYWRkX2d1Y192YXJpYWJs ZShzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKnZhciwgaW50IGVsZXZlbCkKIAlHVUNIYXNoRW50cnkg KmhlbnRyeTsKIAlib29sCQlmb3VuZDsKIAotCWhlbnRyeSA9IEdVQ0hhc2hfaW5zZXJ0KGd1Y19o YXNodGFiLCB2YXItPm5hbWUsICZmb3VuZCk7CisJQXNzZXJ0KHZhci0+bmFtZV9rZXkpOworCWhl bnRyeSA9IEdVQ0hhc2hfaW5zZXJ0KGd1Y19oYXNodGFiLCB2YXItPm5hbWVfa2V5LCAmZm91bmQp OwogCiAJaWYgKHVubGlrZWx5KGhlbnRyeSA9PSBOVUxMKSkKIAl7CkBAIC0xMTYwLDExICsxMTkx LDEzIEBAIGFzc2lnbmFibGVfY3VzdG9tX3ZhcmlhYmxlX25hbWUoY29uc3QgY2hhciAqbmFtZSwg Ym9vbCBza2lwX2Vycm9ycywgaW50IGVsZXZlbCkKICAqIENyZWF0ZSBhbmQgYWRkIGEgcGxhY2Vo b2xkZXIgdmFyaWFibGUgZm9yIGEgY3VzdG9tIHZhcmlhYmxlIG5hbWUuCiAgKi8KIHN0YXRpYyBz dHJ1Y3QgY29uZmlnX2dlbmVyaWMgKgotYWRkX3BsYWNlaG9sZGVyX3ZhcmlhYmxlKGNvbnN0IGNo YXIgKm5hbWUsIGludCBlbGV2ZWwpCithZGRfcGxhY2Vob2xkZXJfdmFyaWFibGUoY29uc3QgY2hh ciAqY29uc3RuYW1lLCBpbnQgZWxldmVsKQogewogCXNpemVfdAkJc3ogPSBzaXplb2Yoc3RydWN0 IGNvbmZpZ19zdHJpbmcpICsgc2l6ZW9mKGNoYXIgKik7CiAJc3RydWN0IGNvbmZpZ19zdHJpbmcg KnZhcjsKIAlzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKmdlbjsKKwljaGFyICpuYW1lOworCWNoYXIg Km5hbWVfa2V5OwogCiAJdmFyID0gKHN0cnVjdCBjb25maWdfc3RyaW5nICopIGd1Y19tYWxsb2Mo ZWxldmVsLCBzeik7CiAJaWYgKHZhciA9PSBOVUxMKQpAQCAtMTE3MiwxOCArMTIwNSwyOCBAQCBh ZGRfcGxhY2Vob2xkZXJfdmFyaWFibGUoY29uc3QgY2hhciAqbmFtZSwgaW50IGVsZXZlbCkKIAlt ZW1zZXQodmFyLCAwLCBzeik7CiAJZ2VuID0gJnZhci0+Z2VuOwogCi0JZ2VuLT5uYW1lID0gZ3Vj X3N0cmR1cChlbGV2ZWwsIG5hbWUpOwotCWlmIChnZW4tPm5hbWUgPT0gTlVMTCkKKwluYW1lID0g Z3VjX3N0cmR1cChlbGV2ZWwsIGNvbnN0bmFtZSk7CisJaWYgKG5hbWUgPT0gTlVMTCkKIAl7CiAJ CWd1Y19mcmVlKHZhcik7CiAJCXJldHVybiBOVUxMOwogCX0KIAorCW5hbWVfa2V5ID0gZ3VjX25h bWVfa2V5KGVsZXZlbCwgbmFtZSk7CisJaWYgKG5hbWVfa2V5ID09IE5VTEwpCisJeworCQlndWNf ZnJlZShuYW1lKTsKKwkJZ3VjX2ZyZWUodmFyKTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCisJZ2Vu LT5uYW1lID0gbmFtZTsKIAlnZW4tPmNvbnRleHQgPSBQR0NfVVNFUlNFVDsKIAlnZW4tPmdyb3Vw ID0gQ1VTVE9NX09QVElPTlM7CiAJZ2VuLT5zaG9ydF9kZXNjID0gIkdVQyBwbGFjZWhvbGRlciB2 YXJpYWJsZSI7CiAJZ2VuLT5mbGFncyA9IEdVQ19OT19TSE9XX0FMTCB8IEdVQ19OT1RfSU5fU0FN UExFIHwgR1VDX0NVU1RPTV9QTEFDRUhPTERFUjsKIAlnZW4tPnZhcnR5cGUgPSBQR0NfU1RSSU5H OworCWdlbi0+bmFtZV9rZXkgPSBuYW1lX2tleTsKIAogCS8qCiAJICogVGhlIGNoYXIqIGlzIGFs bG9jYXRlZCBhdCB0aGUgZW5kIG9mIHRoZSBzdHJ1Y3Qgc2luY2Ugd2UgaGF2ZSBubwpAQCAtMTE5 NCw3ICsxMjM3LDggQEAgYWRkX3BsYWNlaG9sZGVyX3ZhcmlhYmxlKGNvbnN0IGNoYXIgKm5hbWUs IGludCBlbGV2ZWwpCiAKIAlpZiAoIWFkZF9ndWNfdmFyaWFibGUoKHN0cnVjdCBjb25maWdfZ2Vu ZXJpYyAqKSB2YXIsIGVsZXZlbCkpCiAJewotCQlndWNfZnJlZSh1bmNvbnN0aWZ5KGNoYXIgKiwg Z2VuLT5uYW1lKSk7CisJCWd1Y19mcmVlKG5hbWVfa2V5KTsKKwkJZ3VjX2ZyZWUobmFtZSk7CiAJ CWd1Y19mcmVlKHZhcik7CiAJCXJldHVybiBOVUxMOwogCX0KQEAgLTEyMjMsMTEgKzEyNjcsMTcg QEAgZmluZF9vcHRpb24oY29uc3QgY2hhciAqbmFtZSwgYm9vbCBjcmVhdGVfcGxhY2Vob2xkZXJz LCBib29sIHNraXBfZXJyb3JzLAogewogCUdVQ0hhc2hFbnRyeSAqaGVudHJ5OwogCWludAkJCWk7 CisJY2hhciAqbmFtZV9rZXk7CiAKIAlBc3NlcnQobmFtZSk7CiAKIAkvKiBMb29rIGl0IHVwIHVz aW5nIHRoZSBoYXNoIHRhYmxlLiAqLwotCWhlbnRyeSA9IEdVQ0hhc2hfbG9va3VwKGd1Y19oYXNo dGFiLCBuYW1lKTsKKwluYW1lX2tleSA9IGd1Y19uYW1lX2tleShlbGV2ZWwsIG5hbWUpOworCWlm IChuYW1lX2tleSA9PSBOVUxMKQorCQlyZXR1cm4gTlVMTDsKKwloZW50cnkgPSBHVUNIYXNoX2xv b2t1cChndWNfaGFzaHRhYiwgbmFtZV9rZXkpOworCWd1Y19mcmVlKG5hbWVfa2V5KTsKKwluYW1l X2tleSA9IE5VTEw7CiAKIAlpZiAoaGVudHJ5KQogCQlyZXR1cm4gaGVudHJ5LT5ndWN2YXI7CkBA IC0xMzEzLDIxICsxMzYzLDEwIEBAIGd1Y19uYW1lX2NvbXBhcmUoY29uc3QgY2hhciAqbmFtZWEs IGNvbnN0IGNoYXIgKm5hbWViKQogc3RhdGljIHVpbnQzMgogZ3VjX25hbWVfaGFzaChjb25zdCBj aGFyICpuYW1lKQogewotCXVpbnQzMgkJcmVzdWx0ID0gMDsKKwljb25zdCB1bnNpZ25lZCBjaGFy ICpieXRlcyA9IChjb25zdCB1bnNpZ25lZCBjaGFyICopbmFtZTsKKwlpbnQgICAgICAgICAgICAg ICAgICBibGVuICA9IHN0cmxlbihuYW1lKTsKIAotCXdoaWxlICgqbmFtZSkKLQl7Ci0JCWNoYXIJ CWNoID0gKm5hbWUrKzsKLQotCQkvKiBDYXNlLWZvbGQgaW4gdGhlIHNhbWUgd2F5IGFzIGd1Y19u YW1lX2NvbXBhcmUgKi8KLQkJaWYgKGNoID49ICdBJyAmJiBjaCA8PSAnWicpCi0JCQljaCArPSAn YScgLSAnQSc7Ci0KLQkJLyogTWVyZ2UgaW50byBoYXNoIC4uLiBub3QgdmVyeSBicmlnaHQsIGJ1 dCBpdCBuZWVkbid0IGJlICovCi0JCXJlc3VsdCA9IHBnX3JvdGF0ZV9sZWZ0MzIocmVzdWx0LCA1 KTsKLQkJcmVzdWx0IF49ICh1aW50MzIpIGNoOwotCX0KLQlyZXR1cm4gcmVzdWx0OworCXJldHVy biBoYXNoX2J5dGVzKGJ5dGVzLCBibGVuKTsKIH0KIAogLyoKQEAgLTQ3NTcsNiArNDc5Niw3IEBA IGluaXRfY3VzdG9tX3ZhcmlhYmxlKGNvbnN0IGNoYXIgKm5hbWUsCiAJbWVtc2V0KGdlbiwgMCwg c3opOwogCiAJZ2VuLT5uYW1lID0gZ3VjX3N0cmR1cChFUlJPUiwgbmFtZSk7CisJZ2VuLT5uYW1l X2tleSA9IGd1Y19uYW1lX2tleShFUlJPUiwgbmFtZSk7CiAJZ2VuLT5jb250ZXh0ID0gY29udGV4 dDsKIAlnZW4tPmdyb3VwID0gQ1VTVE9NX09QVElPTlM7CiAJZ2VuLT5zaG9ydF9kZXNjID0gc2hv cnRfZGVzYzsKQEAgLTQ3ODQsNyArNDgyNCw3IEBAIGRlZmluZV9jdXN0b21fdmFyaWFibGUoc3Ry dWN0IGNvbmZpZ19nZW5lcmljICp2YXJpYWJsZSkKIAkvKgogCSAqIFNlZSBpZiB0aGVyZSdzIGEg cGxhY2Vob2xkZXIgYnkgdGhlIHNhbWUgbmFtZS4KIAkgKi8KLQloZW50cnkgPSBHVUNIYXNoX2xv b2t1cChndWNfaGFzaHRhYiwgbmFtZSk7CisJaGVudHJ5ID0gR1VDSGFzaF9sb29rdXAoZ3VjX2hh c2h0YWIsIHZhcmlhYmxlLT5uYW1lX2tleSk7CiAKIAlpZiAoaGVudHJ5ID09IE5VTEwpCiAJewpA QCAtNDgxOSw3ICs0ODU5LDcgQEAgZGVmaW5lX2N1c3RvbV92YXJpYWJsZShzdHJ1Y3QgY29uZmln X2dlbmVyaWMgKnZhcmlhYmxlKQogCSAqIFJlcGxhY2UgdGhlIHBsYWNlaG9sZGVyIGluIHRoZSBo YXNoIHRhYmxlLiAgV2UgYXJlbid0IGNoYW5naW5nIHRoZSBuYW1lCiAJICogKGF0IGxlYXN0IHVw IHRvIGNhc2UtZm9sZGluZyksIHNvIHRoZSBoYXNoIHZhbHVlIGlzIHVuY2hhbmdlZC4KIAkgKi8K LQloZW50cnktPmd1Y25hbWUgPSBuYW1lOworCWhlbnRyeS0+Z3VjX2hhc2hrZXkgPSB2YXJpYWJs ZS0+bmFtZV9rZXk7CiAJaGVudHJ5LT5ndWN2YXIgPSB2YXJpYWJsZTsKIAogCS8qCkBAIC01MTQ3 LDcgKzUxODcsNyBAQCBNYXJrR1VDUHJlZml4UmVzZXJ2ZWQoY29uc3QgY2hhciAqY2xhc3NOYW1l KQogCQkJCQkgZXJyZGV0YWlsKCJcIiVzXCIgaXMgbm93IGEgcmVzZXJ2ZWQgcHJlZml4LiIsCiAJ CQkJCQkJICAgY2xhc3NOYW1lKSkpOwogCQkJLyogUmVtb3ZlIGl0IGZyb20gdGhlIGhhc2ggdGFi bGUgKi8KLQkJCUdVQ0hhc2hfZGVsZXRlKGd1Y19oYXNodGFiLCB2YXItPm5hbWUpOworCQkJR1VD SGFzaF9kZWxldGUoZ3VjX2hhc2h0YWIsIHZhci0+bmFtZV9rZXkpOwogCiAJCQkvKiBSZW1vdmUg aXQgZnJvbSBhbnkgbGlzdHMgaXQncyBpbiwgdG9vICovCiAJCQlSZW1vdmVHVUNGcm9tTGlzdHMo dmFyKTsKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL3V0aWxzL2d1Y190YWJsZXMuaCBiL3NyYy9p bmNsdWRlL3V0aWxzL2d1Y190YWJsZXMuaAppbmRleCAwYzM4MjU1OTYxLi40MWIwMzE2YzBiIDEw MDY0NAotLS0gYS9zcmMvaW5jbHVkZS91dGlscy9ndWNfdGFibGVzLmgKKysrIGIvc3JjL2luY2x1 ZGUvdXRpbHMvZ3VjX3RhYmxlcy5oCkBAIC0xNjAsNiArMTYwLDcgQEAgc3RydWN0IGNvbmZpZ19n ZW5lcmljCiAJaW50CQkJZmxhZ3M7CQkJLyogZmxhZyBiaXRzLCBzZWUgZ3VjLmggKi8KIAkvKiB2 YXJpYWJsZSBmaWVsZHMsIGluaXRpYWxpemVkIGF0IHJ1bnRpbWU6ICovCiAJZW51bSBjb25maWdf dHlwZSB2YXJ0eXBlOwkvKiB0eXBlIG9mIHZhcmlhYmxlIChzZXQgb25seSBhdCBzdGFydHVwKSAq LworCWNvbnN0IGNoYXIgKm5hbWVfa2V5OwkJLyogbmFtZSBmb2xkZWQgdG8gbG93ZXIgY2FzZSAq LwogCWludAkJCXN0YXR1czsJCQkvKiBzdGF0dXMgYml0cywgc2VlIGJlbG93ICovCiAJR3VjU291 cmNlCXNvdXJjZTsJCQkvKiBzb3VyY2Ugb2YgdGhlIGN1cnJlbnQgYWN0dWFsIHZhbHVlICovCiAJ R3VjU291cmNlCXJlc2V0X3NvdXJjZTsJLyogc291cmNlIG9mIHRoZSByZXNldF92YWx1ZSAqLwot LSAKMi4zNC4xCgo= --=-fUt1TlCM+jEwaCUDBR4V Content-Disposition: attachment; filename="v3-0001-Convert-GUC-hashtable-to-use-simplehash.patch" Content-Type: text/x-patch; name="v3-0001-Convert-GUC-hashtable-to-use-simplehash.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBiMWRjNGJkMWE3MzJmYjY1NzJhMGU0ZDVhOTY2NzA5Y2EzMGRkZjc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIERhdmlzIDxqZWZmQGotZGF2aXMuY29tPgpEYXRlOiBX ZWQsIDIgQXVnIDIwMjMgMjM6MDQ6MDYgLTA3MDAKU3ViamVjdDogW1BBVENIIHYzIDEvNV0gQ29u dmVydCBHVUMgaGFzaHRhYmxlIHRvIHVzZSBzaW1wbGVoYXNoLgoKLS0tCiBzcmMvYmFja2VuZC91 dGlscy9taXNjL2d1Yy5jIHwgMTQxICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgNTYgaW5zZXJ0aW9ucygrKSwgODUgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9ndWMuYyBiL3NyYy9iYWNrZW5kL3V0aWxz L21pc2MvZ3VjLmMKaW5kZXggODJkOGVmYmM5Ni4uNzI5NWIwZjAwZSAxMDA2NDQKLS0tIGEvc3Jj L2JhY2tlbmQvdXRpbHMvbWlzYy9ndWMuYworKysgYi9zcmMvYmFja2VuZC91dGlscy9taXNjL2d1 Yy5jCkBAIC0yMDIsOSArMjAyLDEwIEBAIHR5cGVkZWYgc3RydWN0CiB7CiAJY29uc3QgY2hhciAq Z3VjbmFtZTsJCS8qIGhhc2gga2V5ICovCiAJc3RydWN0IGNvbmZpZ19nZW5lcmljICpndWN2YXI7 CS8qIC0+IEdVQydzIGRlZmluaW5nIHN0cnVjdHVyZSAqLwotfSBHVUNIYXNoRW50cnk7CiAKLXN0 YXRpYyBIVEFCICpndWNfaGFzaHRhYjsJCS8qIGVudHJpZXMgYXJlIEdVQ0hhc2hFbnRyeXMgKi8K KwkvKiBuZWVkZWQgYnkgc2ltcGxlaGFzaCAqLworCWNoYXIgc3RhdHVzOworfSBHVUNIYXNoRW50 cnk7CiAKIC8qCiAgKiBJbiBhZGRpdGlvbiB0byB0aGUgaGFzaCB0YWJsZSwgdmFyaWFibGVzIGhh dmluZyBjZXJ0YWluIHByb3BlcnRpZXMgYXJlCkBAIC0yMjcsOCArMjI4LDcgQEAgc3RhdGljIGlu dAlHVUNOZXN0TGV2ZWwgPSAwOwkvKiAxIHdoZW4gaW4gbWFpbiB0cmFuc2FjdGlvbiAqLwogCiAK IHN0YXRpYyBpbnQJZ3VjX3Zhcl9jb21wYXJlKGNvbnN0IHZvaWQgKmEsIGNvbnN0IHZvaWQgKmIp Owotc3RhdGljIHVpbnQzMiBndWNfbmFtZV9oYXNoKGNvbnN0IHZvaWQgKmtleSwgU2l6ZSBrZXlz aXplKTsKLXN0YXRpYyBpbnQJZ3VjX25hbWVfbWF0Y2goY29uc3Qgdm9pZCAqa2V5MSwgY29uc3Qg dm9pZCAqa2V5MiwgU2l6ZSBrZXlzaXplKTsKK3N0YXRpYyB1aW50MzIgZ3VjX25hbWVfaGFzaChj b25zdCBjaGFyICpuYW1lKTsKIHN0YXRpYyB2b2lkIEluaXRpYWxpemVHVUNPcHRpb25zRnJvbUVu dmlyb25tZW50KHZvaWQpOwogc3RhdGljIHZvaWQgSW5pdGlhbGl6ZU9uZUdVQ09wdGlvbihzdHJ1 Y3QgY29uZmlnX2dlbmVyaWMgKmdjb25mKTsKIHN0YXRpYyB2b2lkIFJlbW92ZUdVQ0Zyb21MaXN0 cyhzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKmdjb25mKTsKQEAgLTI2NSw2ICsyNjUsMTggQEAgc3Rh dGljIGJvb2wgY2FsbF9zdHJpbmdfY2hlY2tfaG9vayhzdHJ1Y3QgY29uZmlnX3N0cmluZyAqY29u ZiwgY2hhciAqKm5ld3ZhbCwKIHN0YXRpYyBib29sIGNhbGxfZW51bV9jaGVja19ob29rKHN0cnVj dCBjb25maWdfZW51bSAqY29uZiwgaW50ICpuZXd2YWwsCiAJCQkJCQkJCSB2b2lkICoqZXh0cmEs IEd1Y1NvdXJjZSBzb3VyY2UsIGludCBlbGV2ZWwpOwogCisjZGVmaW5lIFNIX1BSRUZJWAkJR1VD SGFzaAorI2RlZmluZSBTSF9FTEVNRU5UX1RZUEUJR1VDSGFzaEVudHJ5CisjZGVmaW5lIFNIX0tF WV9UWVBFCQljb25zdCBjaGFyICoKKyNkZWZpbmUJU0hfS0VZCQkJZ3VjbmFtZQorI2RlZmluZSBT SF9IQVNIX0tFWSh0Yiwga2V5KSAgIAlndWNfbmFtZV9oYXNoKGtleSkKKyNkZWZpbmUgU0hfRVFV QUwodGIsIGEsIGIpCQkoZ3VjX25hbWVfY29tcGFyZShhLCBiKSA9PSAwKQorI2RlZmluZQlTSF9T Q09QRQkJc3RhdGljIGlubGluZQorI2RlZmluZSBTSF9ERUNMQVJFCisjZGVmaW5lIFNIX0RFRklO RQorI2luY2x1ZGUgImxpYi9zaW1wbGVoYXNoLmgiCisKK3N0YXRpYyBHVUNIYXNoX2hhc2ggKmd1 Y19oYXNodGFiID0gTlVMTDsJLyogZW50cmllcyBhcmUgR1VDSGFzaEVudHJ5cyAqLwogCiAvKgog ICogVGhpcyBmdW5jdGlvbiBoYW5kbGVzIGJvdGggYWN0dWFsIGNvbmZpZyBmaWxlIChyZSlsb2Fk cyBhbmQgZXhlY3V0aW9uIG9mCkBAIC0yODIsNyArMjk0LDcgQEAgUHJvY2Vzc0NvbmZpZ0ZpbGVJ bnRlcm5hbChHdWNDb250ZXh0IGNvbnRleHQsIGJvb2wgYXBwbHlTZXR0aW5ncywgaW50IGVsZXZl bCkKIAlDb25maWdWYXJpYWJsZSAqaXRlbSwKIAkJCSAgICpoZWFkLAogCQkJICAgKnRhaWw7Ci0J SEFTSF9TRVFfU1RBVFVTIHN0YXR1czsKKwlHVUNIYXNoX2l0ZXJhdG9yIGl0ZXI7CiAJR1VDSGFz aEVudHJ5ICpoZW50cnk7CiAKIAkvKiBQYXJzZSB0aGUgbWFpbiBjb25maWcgZmlsZSBpbnRvIGEg bGlzdCBvZiBvcHRpb24gbmFtZXMgYW5kIHZhbHVlcyAqLwpAQCAtMzU4LDggKzM3MCw4IEBAIFBy b2Nlc3NDb25maWdGaWxlSW50ZXJuYWwoR3VjQ29udGV4dCBjb250ZXh0LCBib29sIGFwcGx5U2V0 dGluZ3MsIGludCBlbGV2ZWwpCiAJICogbmVlZCB0aGlzIHNvIHRoYXQgd2UgY2FuIHRlbGwgYmVs b3cgd2hpY2ggb25lcyBoYXZlIGJlZW4gcmVtb3ZlZCBmcm9tCiAJICogdGhlIGZpbGUgc2luY2Ug d2UgbGFzdCBwcm9jZXNzZWQgaXQuCiAJICovCi0JaGFzaF9zZXFfaW5pdCgmc3RhdHVzLCBndWNf aGFzaHRhYik7Ci0Jd2hpbGUgKChoZW50cnkgPSAoR1VDSGFzaEVudHJ5ICopIGhhc2hfc2VxX3Nl YXJjaCgmc3RhdHVzKSkgIT0gTlVMTCkKKwlHVUNIYXNoX3N0YXJ0X2l0ZXJhdGUoZ3VjX2hhc2h0 YWIsICZpdGVyKTsKKwl3aGlsZSAoKGhlbnRyeSA9IEdVQ0hhc2hfaXRlcmF0ZShndWNfaGFzaHRh YiwgJml0ZXIpKSAhPSBOVUxMKQogCXsKIAkJc3RydWN0IGNvbmZpZ19nZW5lcmljICpnY29uZiA9 IGhlbnRyeS0+Z3VjdmFyOwogCkBAIC00NDUsOCArNDU3LDggQEAgUHJvY2Vzc0NvbmZpZ0ZpbGVJ bnRlcm5hbChHdWNDb250ZXh0IGNvbnRleHQsIGJvb2wgYXBwbHlTZXR0aW5ncywgaW50IGVsZXZl bCkKIAkgKiBib290LXRpbWUgZGVmYXVsdHMuICBJZiBzdWNoIGEgdmFyaWFibGUgY2FuJ3QgYmUg Y2hhbmdlZCBhZnRlciBzdGFydHVwLAogCSAqIHJlcG9ydCB0aGF0IGFuZCBjb250aW51ZS4KIAkg Ki8KLQloYXNoX3NlcV9pbml0KCZzdGF0dXMsIGd1Y19oYXNodGFiKTsKLQl3aGlsZSAoKGhlbnRy eSA9IChHVUNIYXNoRW50cnkgKikgaGFzaF9zZXFfc2VhcmNoKCZzdGF0dXMpKSAhPSBOVUxMKQor CUdVQ0hhc2hfc3RhcnRfaXRlcmF0ZShndWNfaGFzaHRhYiwgJml0ZXIpOworCXdoaWxlICgoaGVu dHJ5ID0gR1VDSGFzaF9pdGVyYXRlKGd1Y19oYXNodGFiLCAmaXRlcikpICE9IE5VTEwpCiAJewog CQlzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKmdjb25mID0gaGVudHJ5LT5ndWN2YXI7CiAJCUd1Y1N0 YWNrICAgKnN0YWNrOwpAQCAtODY3LDE3ICs4NzksMTcgQEAgc3RydWN0IGNvbmZpZ19nZW5lcmlj ICoqCiBnZXRfZ3VjX3ZhcmlhYmxlcyhpbnQgKm51bV92YXJzKQogewogCXN0cnVjdCBjb25maWdf Z2VuZXJpYyAqKnJlc3VsdDsKLQlIQVNIX1NFUV9TVEFUVVMgc3RhdHVzOworCUdVQ0hhc2hfaXRl cmF0b3IgaXRlcjsKIAlHVUNIYXNoRW50cnkgKmhlbnRyeTsKIAlpbnQJCQlpOwogCi0JKm51bV92 YXJzID0gaGFzaF9nZXRfbnVtX2VudHJpZXMoZ3VjX2hhc2h0YWIpOworCSpudW1fdmFycyA9IGd1 Y19oYXNodGFiLT5tZW1iZXJzOwogCXJlc3VsdCA9IHBhbGxvYyhzaXplb2Yoc3RydWN0IGNvbmZp Z19nZW5lcmljICopICogKm51bV92YXJzKTsKIAogCS8qIEV4dHJhY3QgcG9pbnRlcnMgZnJvbSB0 aGUgaGFzaCB0YWJsZSAqLwogCWkgPSAwOwotCWhhc2hfc2VxX2luaXQoJnN0YXR1cywgZ3VjX2hh c2h0YWIpOwotCXdoaWxlICgoaGVudHJ5ID0gKEdVQ0hhc2hFbnRyeSAqKSBoYXNoX3NlcV9zZWFy Y2goJnN0YXR1cykpICE9IE5VTEwpCisJR1VDSGFzaF9zdGFydF9pdGVyYXRlKGd1Y19oYXNodGFi LCAmaXRlcik7CisJd2hpbGUgKChoZW50cnkgPSBHVUNIYXNoX2l0ZXJhdGUoZ3VjX2hhc2h0YWIs ICZpdGVyKSkgIT0gTlVMTCkKIAkJcmVzdWx0W2krK10gPSBoZW50cnktPmd1Y3ZhcjsKIAlBc3Nl cnQoaSA9PSAqbnVtX3ZhcnMpOwogCkBAIC04OTksNyArOTExLDYgQEAgYnVpbGRfZ3VjX3Zhcmlh Ymxlcyh2b2lkKQogewogCWludAkJCXNpemVfdmFyczsKIAlpbnQJCQludW1fdmFycyA9IDA7Ci0J SEFTSENUTAkJaGFzaF9jdGw7CiAJR1VDSGFzaEVudHJ5ICpoZW50cnk7CiAJYm9vbAkJZm91bmQ7 CiAJaW50CQkJaTsKQEAgLTk2MSwyNCArOTcyLDE0IEBAIGJ1aWxkX2d1Y192YXJpYWJsZXModm9p ZCkKIAkgKi8KIAlzaXplX3ZhcnMgPSBudW1fdmFycyArIG51bV92YXJzIC8gNDsKIAotCWhhc2hf Y3RsLmtleXNpemUgPSBzaXplb2YoY2hhciAqKTsKLQloYXNoX2N0bC5lbnRyeXNpemUgPSBzaXpl b2YoR1VDSGFzaEVudHJ5KTsKLQloYXNoX2N0bC5oYXNoID0gZ3VjX25hbWVfaGFzaDsKLQloYXNo X2N0bC5tYXRjaCA9IGd1Y19uYW1lX21hdGNoOwotCWhhc2hfY3RsLmhjeHQgPSBHVUNNZW1vcnlD b250ZXh0OwotCWd1Y19oYXNodGFiID0gaGFzaF9jcmVhdGUoIkdVQyBoYXNoIHRhYmxlIiwKLQkJ CQkJCQkgIHNpemVfdmFycywKLQkJCQkJCQkgICZoYXNoX2N0bCwKLQkJCQkJCQkgIEhBU0hfRUxF TSB8IEhBU0hfRlVOQ1RJT04gfCBIQVNIX0NPTVBBUkUgfCBIQVNIX0NPTlRFWFQpOworCWd1Y19o YXNodGFiID0gR1VDSGFzaF9jcmVhdGUoR1VDTWVtb3J5Q29udGV4dCwgc2l6ZV92YXJzLCBOVUxM KTsKIAogCWZvciAoaSA9IDA7IENvbmZpZ3VyZU5hbWVzQm9vbFtpXS5nZW4ubmFtZTsgaSsrKQog CXsKIAkJc3RydWN0IGNvbmZpZ19nZW5lcmljICpndWN2YXIgPSAmQ29uZmlndXJlTmFtZXNCb29s W2ldLmdlbjsKIAotCQloZW50cnkgPSAoR1VDSGFzaEVudHJ5ICopIGhhc2hfc2VhcmNoKGd1Y19o YXNodGFiLAotCQkJCQkJCQkJCQkgICZndWN2YXItPm5hbWUsCi0JCQkJCQkJCQkJCSAgSEFTSF9F TlRFUiwKLQkJCQkJCQkJCQkJICAmZm91bmQpOworCQloZW50cnkgPSBHVUNIYXNoX2luc2VydChn dWNfaGFzaHRhYiwgZ3VjdmFyLT5uYW1lLCAmZm91bmQpOworCiAJCUFzc2VydCghZm91bmQpOwog CQloZW50cnktPmd1Y3ZhciA9IGd1Y3ZhcjsKIAl9CkBAIC05ODcsMTAgKzk4OCw4IEBAIGJ1aWxk X2d1Y192YXJpYWJsZXModm9pZCkKIAl7CiAJCXN0cnVjdCBjb25maWdfZ2VuZXJpYyAqZ3VjdmFy ID0gJkNvbmZpZ3VyZU5hbWVzSW50W2ldLmdlbjsKIAotCQloZW50cnkgPSAoR1VDSGFzaEVudHJ5 ICopIGhhc2hfc2VhcmNoKGd1Y19oYXNodGFiLAotCQkJCQkJCQkJCQkgICZndWN2YXItPm5hbWUs Ci0JCQkJCQkJCQkJCSAgSEFTSF9FTlRFUiwKLQkJCQkJCQkJCQkJICAmZm91bmQpOworCQloZW50 cnkgPSBHVUNIYXNoX2luc2VydChndWNfaGFzaHRhYiwgZ3VjdmFyLT5uYW1lLCAmZm91bmQpOwor CiAJCUFzc2VydCghZm91bmQpOwogCQloZW50cnktPmd1Y3ZhciA9IGd1Y3ZhcjsKIAl9CkBAIC05 OTksMTAgKzk5OCw4IEBAIGJ1aWxkX2d1Y192YXJpYWJsZXModm9pZCkKIAl7CiAJCXN0cnVjdCBj b25maWdfZ2VuZXJpYyAqZ3VjdmFyID0gJkNvbmZpZ3VyZU5hbWVzUmVhbFtpXS5nZW47CiAKLQkJ aGVudHJ5ID0gKEdVQ0hhc2hFbnRyeSAqKSBoYXNoX3NlYXJjaChndWNfaGFzaHRhYiwKLQkJCQkJ CQkJCQkJICAmZ3VjdmFyLT5uYW1lLAotCQkJCQkJCQkJCQkgIEhBU0hfRU5URVIsCi0JCQkJCQkJ CQkJCSAgJmZvdW5kKTsKKwkJaGVudHJ5ID0gR1VDSGFzaF9pbnNlcnQoZ3VjX2hhc2h0YWIsIGd1 Y3Zhci0+bmFtZSwgJmZvdW5kKTsKKwogCQlBc3NlcnQoIWZvdW5kKTsKIAkJaGVudHJ5LT5ndWN2 YXIgPSBndWN2YXI7CiAJfQpAQCAtMTAxMSwxMCArMTAwOCw4IEBAIGJ1aWxkX2d1Y192YXJpYWJs ZXModm9pZCkKIAl7CiAJCXN0cnVjdCBjb25maWdfZ2VuZXJpYyAqZ3VjdmFyID0gJkNvbmZpZ3Vy ZU5hbWVzU3RyaW5nW2ldLmdlbjsKIAotCQloZW50cnkgPSAoR1VDSGFzaEVudHJ5ICopIGhhc2hf c2VhcmNoKGd1Y19oYXNodGFiLAotCQkJCQkJCQkJCQkgICZndWN2YXItPm5hbWUsCi0JCQkJCQkJ CQkJCSAgSEFTSF9FTlRFUiwKLQkJCQkJCQkJCQkJICAmZm91bmQpOworCQloZW50cnkgPSBHVUNI YXNoX2luc2VydChndWNfaGFzaHRhYiwgZ3VjdmFyLT5uYW1lLCAmZm91bmQpOworCiAJCUFzc2Vy dCghZm91bmQpOwogCQloZW50cnktPmd1Y3ZhciA9IGd1Y3ZhcjsKIAl9CkBAIC0xMDIzLDE1ICsx MDE4LDEzIEBAIGJ1aWxkX2d1Y192YXJpYWJsZXModm9pZCkKIAl7CiAJCXN0cnVjdCBjb25maWdf Z2VuZXJpYyAqZ3VjdmFyID0gJkNvbmZpZ3VyZU5hbWVzRW51bVtpXS5nZW47CiAKLQkJaGVudHJ5 ID0gKEdVQ0hhc2hFbnRyeSAqKSBoYXNoX3NlYXJjaChndWNfaGFzaHRhYiwKLQkJCQkJCQkJCQkJ ICAmZ3VjdmFyLT5uYW1lLAotCQkJCQkJCQkJCQkgIEhBU0hfRU5URVIsCi0JCQkJCQkJCQkJCSAg JmZvdW5kKTsKKwkJaGVudHJ5ID0gR1VDSGFzaF9pbnNlcnQoZ3VjX2hhc2h0YWIsIGd1Y3Zhci0+ bmFtZSwgJmZvdW5kKTsKKwogCQlBc3NlcnQoIWZvdW5kKTsKIAkJaGVudHJ5LT5ndWN2YXIgPSBn dWN2YXI7CiAJfQogCi0JQXNzZXJ0KG51bV92YXJzID09IGhhc2hfZ2V0X251bV9lbnRyaWVzKGd1 Y19oYXNodGFiKSk7CisJQXNzZXJ0KG51bV92YXJzID09IGd1Y19oYXNodGFiLT5tZW1iZXJzKTsK IH0KIAogLyoKQEAgLTEwNDQsMTAgKzEwMzcsOCBAQCBhZGRfZ3VjX3ZhcmlhYmxlKHN0cnVjdCBj b25maWdfZ2VuZXJpYyAqdmFyLCBpbnQgZWxldmVsKQogCUdVQ0hhc2hFbnRyeSAqaGVudHJ5Owog CWJvb2wJCWZvdW5kOwogCi0JaGVudHJ5ID0gKEdVQ0hhc2hFbnRyeSAqKSBoYXNoX3NlYXJjaChn dWNfaGFzaHRhYiwKLQkJCQkJCQkJCQkgICZ2YXItPm5hbWUsCi0JCQkJCQkJCQkJICBIQVNIX0VO VEVSX05VTEwsCi0JCQkJCQkJCQkJICAmZm91bmQpOworCWhlbnRyeSA9IEdVQ0hhc2hfaW5zZXJ0 KGd1Y19oYXNodGFiLCB2YXItPm5hbWUsICZmb3VuZCk7CisKIAlpZiAodW5saWtlbHkoaGVudHJ5 ID09IE5VTEwpKQogCXsKIAkJZXJlcG9ydChlbGV2ZWwsCkBAIC0xMjM2LDEwICsxMjI3LDggQEAg ZmluZF9vcHRpb24oY29uc3QgY2hhciAqbmFtZSwgYm9vbCBjcmVhdGVfcGxhY2Vob2xkZXJzLCBi b29sIHNraXBfZXJyb3JzLAogCUFzc2VydChuYW1lKTsKIAogCS8qIExvb2sgaXQgdXAgdXNpbmcg dGhlIGhhc2ggdGFibGUuICovCi0JaGVudHJ5ID0gKEdVQ0hhc2hFbnRyeSAqKSBoYXNoX3NlYXJj aChndWNfaGFzaHRhYiwKLQkJCQkJCQkJCQkgICZuYW1lLAotCQkJCQkJCQkJCSAgSEFTSF9GSU5E LAotCQkJCQkJCQkJCSAgTlVMTCk7CisJaGVudHJ5ID0gR1VDSGFzaF9sb29rdXAoZ3VjX2hhc2h0 YWIsIG5hbWUpOworCiAJaWYgKGhlbnRyeSkKIAkJcmV0dXJuIGhlbnRyeS0+Z3VjdmFyOwogCkBA IC0xMzIyLDEwICsxMzExLDkgQEAgZ3VjX25hbWVfY29tcGFyZShjb25zdCBjaGFyICpuYW1lYSwg Y29uc3QgY2hhciAqbmFtZWIpCiAgKiBIYXNoIGZ1bmN0aW9uIHRoYXQncyBjb21wYXRpYmxlIHdp dGggZ3VjX25hbWVfY29tcGFyZQogICovCiBzdGF0aWMgdWludDMyCi1ndWNfbmFtZV9oYXNoKGNv bnN0IHZvaWQgKmtleSwgU2l6ZSBrZXlzaXplKQorZ3VjX25hbWVfaGFzaChjb25zdCBjaGFyICpu YW1lKQogewogCXVpbnQzMgkJcmVzdWx0ID0gMDsKLQljb25zdCBjaGFyICpuYW1lID0gKihjb25z dCBjaGFyICpjb25zdCAqKSBrZXk7CiAKIAl3aGlsZSAoKm5hbWUpCiAJewpAQCAtMTM0MiwxOSAr MTMzMCw2IEBAIGd1Y19uYW1lX2hhc2goY29uc3Qgdm9pZCAqa2V5LCBTaXplIGtleXNpemUpCiAJ cmV0dXJuIHJlc3VsdDsKIH0KIAotLyoKLSAqIER5bmFoYXNoIG1hdGNoIGZ1bmN0aW9uIHRvIHVz ZSBpbiBndWNfaGFzaHRhYgotICovCi1zdGF0aWMgaW50Ci1ndWNfbmFtZV9tYXRjaChjb25zdCB2 b2lkICprZXkxLCBjb25zdCB2b2lkICprZXkyLCBTaXplIGtleXNpemUpCi17Ci0JY29uc3QgY2hh ciAqbmFtZTEgPSAqKGNvbnN0IGNoYXIgKmNvbnN0ICopIGtleTE7Ci0JY29uc3QgY2hhciAqbmFt ZTIgPSAqKGNvbnN0IGNoYXIgKmNvbnN0ICopIGtleTI7Ci0KLQlyZXR1cm4gZ3VjX25hbWVfY29t cGFyZShuYW1lMSwgbmFtZTIpOwotfQotCi0KIC8qCiAgKiBDb252ZXJ0IGEgR1VDIG5hbWUgdG8g dGhlIGZvcm0gdGhhdCBzaG91bGQgYmUgdXNlZCBpbiBwZ19wYXJhbWV0ZXJfYWNsLgogICoKQEAg LTE1MjQsNyArMTQ5OSw3IEBAIGNoZWNrX0dVQ19pbml0KHN0cnVjdCBjb25maWdfZ2VuZXJpYyAq Z2NvbmYpCiB2b2lkCiBJbml0aWFsaXplR1VDT3B0aW9ucyh2b2lkKQogewotCUhBU0hfU0VRX1NU QVRVUyBzdGF0dXM7CisJR1VDSGFzaF9pdGVyYXRvciBpdGVyOwogCUdVQ0hhc2hFbnRyeSAqaGVu dHJ5OwogCiAJLyoKQEAgLTE1NDIsOCArMTUxNyw4IEBAIEluaXRpYWxpemVHVUNPcHRpb25zKHZv aWQpCiAJICogTG9hZCBhbGwgdmFyaWFibGVzIHdpdGggdGhlaXIgY29tcGlsZWQtaW4gZGVmYXVs dHMsIGFuZCBpbml0aWFsaXplCiAJICogc3RhdHVzIGZpZWxkcyBhcyBuZWVkZWQuCiAJICovCi0J aGFzaF9zZXFfaW5pdCgmc3RhdHVzLCBndWNfaGFzaHRhYik7Ci0Jd2hpbGUgKChoZW50cnkgPSAo R1VDSGFzaEVudHJ5ICopIGhhc2hfc2VxX3NlYXJjaCgmc3RhdHVzKSkgIT0gTlVMTCkKKwlHVUNI YXNoX3N0YXJ0X2l0ZXJhdGUoZ3VjX2hhc2h0YWIsICZpdGVyKTsKKwl3aGlsZSAoKGhlbnRyeSA9 IEdVQ0hhc2hfaXRlcmF0ZShndWNfaGFzaHRhYiwgJml0ZXIpKSAhPSBOVUxMKQogCXsKIAkJLyog Q2hlY2sgbWFwcGluZyBiZXR3ZWVuIGluaXRpYWwgYW5kIGRlZmF1bHQgdmFsdWUgKi8KIAkJQXNz ZXJ0KGNoZWNrX0dVQ19pbml0KGhlbnRyeS0+Z3VjdmFyKSk7CkBAIC0yNTI4LDcgKzI1MDMsNyBA QCBBdEVPWGFjdF9HVUMoYm9vbCBpc0NvbW1pdCwgaW50IG5lc3RMZXZlbCkKIHZvaWQKIEJlZ2lu UmVwb3J0aW5nR1VDT3B0aW9ucyh2b2lkKQogewotCUhBU0hfU0VRX1NUQVRVUyBzdGF0dXM7CisJ R1VDSGFzaF9pdGVyYXRvciBpdGVyOwogCUdVQ0hhc2hFbnRyeSAqaGVudHJ5OwogCiAJLyoKQEAg LTI1NTIsOCArMjUyNyw4IEBAIEJlZ2luUmVwb3J0aW5nR1VDT3B0aW9ucyh2b2lkKQogCQkJCQkJ UEdDX0lOVEVSTkFMLCBQR0NfU19PVkVSUklERSk7CiAKIAkvKiBUcmFuc21pdCBpbml0aWFsIHZh bHVlcyBvZiBpbnRlcmVzdGluZyB2YXJpYWJsZXMgKi8KLQloYXNoX3NlcV9pbml0KCZzdGF0dXMs IGd1Y19oYXNodGFiKTsKLQl3aGlsZSAoKGhlbnRyeSA9IChHVUNIYXNoRW50cnkgKikgaGFzaF9z ZXFfc2VhcmNoKCZzdGF0dXMpKSAhPSBOVUxMKQorCUdVQ0hhc2hfc3RhcnRfaXRlcmF0ZShndWNf aGFzaHRhYiwgJml0ZXIpOworCXdoaWxlICgoaGVudHJ5ID0gR1VDSGFzaF9pdGVyYXRlKGd1Y19o YXNodGFiLCAmaXRlcikpICE9IE5VTEwpCiAJewogCQlzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKmNv bmYgPSBoZW50cnktPmd1Y3ZhcjsKIApAQCAtNDgwOSwxMCArNDc4NCw4IEBAIGRlZmluZV9jdXN0 b21fdmFyaWFibGUoc3RydWN0IGNvbmZpZ19nZW5lcmljICp2YXJpYWJsZSkKIAkvKgogCSAqIFNl ZSBpZiB0aGVyZSdzIGEgcGxhY2Vob2xkZXIgYnkgdGhlIHNhbWUgbmFtZS4KIAkgKi8KLQloZW50 cnkgPSAoR1VDSGFzaEVudHJ5ICopIGhhc2hfc2VhcmNoKGd1Y19oYXNodGFiLAotCQkJCQkJCQkJ CSAgJm5hbWUsCi0JCQkJCQkJCQkJICBIQVNIX0ZJTkQsCi0JCQkJCQkJCQkJICBOVUxMKTsKKwlo ZW50cnkgPSBHVUNIYXNoX2xvb2t1cChndWNfaGFzaHRhYiwgbmFtZSk7CisKIAlpZiAoaGVudHJ5 ID09IE5VTEwpCiAJewogCQkvKgpAQCAtNTE0OCw3ICs1MTIxLDcgQEAgdm9pZAogTWFya0dVQ1By ZWZpeFJlc2VydmVkKGNvbnN0IGNoYXIgKmNsYXNzTmFtZSkKIHsKIAlpbnQJCQljbGFzc0xlbiA9 IHN0cmxlbihjbGFzc05hbWUpOwotCUhBU0hfU0VRX1NUQVRVUyBzdGF0dXM7CisJR1VDSGFzaF9p dGVyYXRvciBpdGVyOwogCUdVQ0hhc2hFbnRyeSAqaGVudHJ5OwogCU1lbW9yeUNvbnRleHQgb2xk Y29udGV4dDsKIApAQCAtNTE1OCw4ICs1MTMxLDggQEAgTWFya0dVQ1ByZWZpeFJlc2VydmVkKGNv bnN0IGNoYXIgKmNsYXNzTmFtZSkKIAkgKiBkb24ndCBib3RoZXIgdHJ5aW5nIHRvIGZyZWUgYXNz b2NpYXRlZCBtZW1vcnksIHNpbmNlIHRoaXMgc2hvdWxkbid0CiAJICogaGFwcGVuIG9mdGVuLikK IAkgKi8KLQloYXNoX3NlcV9pbml0KCZzdGF0dXMsIGd1Y19oYXNodGFiKTsKLQl3aGlsZSAoKGhl bnRyeSA9IChHVUNIYXNoRW50cnkgKikgaGFzaF9zZXFfc2VhcmNoKCZzdGF0dXMpKSAhPSBOVUxM KQorCUdVQ0hhc2hfc3RhcnRfaXRlcmF0ZShndWNfaGFzaHRhYiwgJml0ZXIpOworCXdoaWxlICgo aGVudHJ5ID0gR1VDSGFzaF9pdGVyYXRlKGd1Y19oYXNodGFiLCAmaXRlcikpICE9IE5VTEwpCiAJ ewogCQlzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKnZhciA9IGhlbnRyeS0+Z3VjdmFyOwogCkBAIC01 MTc0LDEwICs1MTQ3LDggQEAgTWFya0dVQ1ByZWZpeFJlc2VydmVkKGNvbnN0IGNoYXIgKmNsYXNz TmFtZSkKIAkJCQkJIGVycmRldGFpbCgiXCIlc1wiIGlzIG5vdyBhIHJlc2VydmVkIHByZWZpeC4i LAogCQkJCQkJCSAgIGNsYXNzTmFtZSkpKTsKIAkJCS8qIFJlbW92ZSBpdCBmcm9tIHRoZSBoYXNo IHRhYmxlICovCi0JCQloYXNoX3NlYXJjaChndWNfaGFzaHRhYiwKLQkJCQkJCSZ2YXItPm5hbWUs Ci0JCQkJCQlIQVNIX1JFTU9WRSwKLQkJCQkJCU5VTEwpOworCQkJR1VDSGFzaF9kZWxldGUoZ3Vj X2hhc2h0YWIsIHZhci0+bmFtZSk7CisKIAkJCS8qIFJlbW92ZSBpdCBmcm9tIGFueSBsaXN0cyBp dCdzIGluLCB0b28gKi8KIAkJCVJlbW92ZUdVQ0Zyb21MaXN0cyh2YXIpOwogCQl9CkBAIC01MjA4 LDcgKzUxNzksNyBAQCBnZXRfZXhwbGFpbl9ndWNfb3B0aW9ucyhpbnQgKm51bSkKIAkgKiBXaGls ZSBvbmx5IGEgZnJhY3Rpb24gb2YgYWxsIHRoZSBHVUMgdmFyaWFibGVzIGFyZSBtYXJrZWQgR1VD X0VYUExBSU4sCiAJICogaXQgZG9lc24ndCBzZWVtIHdvcnRoIGR5bmFtaWNhbGx5IHJlc2l6aW5n IHRoaXMgYXJyYXkuCiAJICovCi0JcmVzdWx0ID0gcGFsbG9jKHNpemVvZihzdHJ1Y3QgY29uZmln X2dlbmVyaWMgKikgKiBoYXNoX2dldF9udW1fZW50cmllcyhndWNfaGFzaHRhYikpOworCXJlc3Vs dCA9IHBhbGxvYyhzaXplb2Yoc3RydWN0IGNvbmZpZ19nZW5lcmljICopICogZ3VjX2hhc2h0YWIt Pm1lbWJlcnMpOwogCiAJLyogV2UgbmVlZCBvbmx5IGNvbnNpZGVyIEdVQ3Mgd2l0aCBzb3VyY2Ug bm90IFBHQ19TX0RFRkFVTFQgKi8KIAlkbGlzdF9mb3JlYWNoKGl0ZXIsICZndWNfbm9uZGVmX2xp c3QpCi0tIAoyLjM0LjEKCg== --=-fUt1TlCM+jEwaCUDBR4V--