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 1r4471-007DBE-2W for pgsql-hackers@arkaria.postgresql.org; Fri, 17 Nov 2023 19:02:43 +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 1r446z-00FJhx-KU for pgsql-hackers@arkaria.postgresql.org; Fri, 17 Nov 2023 19:02:41 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r446z-00FJhp-2E for pgsql-hackers@lists.postgresql.org; Fri, 17 Nov 2023 19:02:41 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1r446r-0063cY-Me for pgsql-hackers@postgresql.org; Fri, 17 Nov 2023 19:02:39 +0000 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1cc0d0a0355so19064115ad.3 for ; Fri, 17 Nov 2023 11:02:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=j-davis-com.20230601.gappssmtp.com; s=20230601; t=1700247752; x=1700852552; darn=postgresql.org; h=mime-version:user-agent:date:to:from:subject:message-id:from:to:cc :subject:date:message-id:reply-to; bh=oUEDpsHybxZurHU+Thj0DYu7ylNstiVguElpHQwUJRk=; b=uL3WxpgqT2oL1fqH7zkPH9hW8wmS8r7FGh/MpOj0H0LzP69iDOY7zsit5oAAirrSzS J9X7JfF8g172Lr2UYjFWrPnYR5Ui9U/r3xO7ifHSBURSdzHiJLa6uW5cFWodjzKyW40b yR90Shtw2wXIKYfguzth0xCGPkD6rgQRdBzg5bVTS0+cOjRtk/ofww6q94dv7YeLGyev NRm8ZG2VrU0JmXVhr0g++6s3FUXPIs2pVCWi5r+UO8ZgFdfDo/DtkTRHc6+G8rQlOjKa F61RfebInLPsPyAn3lWIk3URIzxf08tLvuJwI50Q4pTHYt5pIfasfOC40ldjAr8XmgYw tU/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700247752; x=1700852552; h=mime-version:user-agent:date:to:from:subject:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oUEDpsHybxZurHU+Thj0DYu7ylNstiVguElpHQwUJRk=; b=IDd1uIXBAR0D4yB99rIjbLxlHzAkOd9fdEfMIjssbhz0sYgK5nW9Y0AJ2zYdqr6xhT k/RaJ161u18WHMa8+Ag0oYnJ/pCx5H8Si4fFY17zCsrQhsm1/f9KlW0qYOcR/l0KDdTM nkupftEIygoWoXzcrku04gsi85jxNhxZNAS60ljD/UBKH76iaA5occy5/eEUuu8sQojo UqZusXkEIMffHwmFDpfBtbdLMBWjBKbrwFZGMnUDRqVz3f2du2JjjJGRCZmR5YW6wK/n fZ4Uv/lBJmDE6f/tCN2hkpWZ7wb33GkuY3EP0gWjVVumSRKNLEiupTytRhdXoMYBBTSN 5Zng== X-Gm-Message-State: AOJu0YzLBKfv9oE4HfNsrder498VPOaSwVFu9m8gQT0668woQXxrQWg+ wr+nKh7cqtjSSWaSfBXxlE245JNUANCMT5oMeus= X-Google-Smtp-Source: AGHT+IEJNJ4Tk70hHtcDI/tX+D+t38qJP5zNrEjS6ZoHdWEsx5pUoluRntO+NAfHp4MuupYDqraUnA== X-Received: by 2002:a17:902:d885:b0:1ce:5bb1:4e19 with SMTP id b5-20020a170902d88500b001ce5bb14e19mr454220plz.66.1700247752270; Fri, 17 Nov 2023 11:02:32 -0800 (PST) Received: from [172.18.10.36] ([12.126.244.130]) by smtp.gmail.com with ESMTPSA id h6-20020a170902eec600b001bb1f0605b2sm1692139plb.214.2023.11.17.11.02.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 11:02:31 -0800 (PST) Message-ID: Subject: Change GUC hashtable to use simplehash? From: Jeff Davis To: pgsql-hackers@postgresql.org Date: Fri, 17 Nov 2023 11:02:31 -0800 Content-Type: multipart/mixed; boundary="=-Z06sQkJbo5JBDDD6I4Fq" 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 --=-Z06sQkJbo5JBDDD6I4Fq Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable I had briefly experimented changing the hash table in guc.c to use simplehash. It didn't offer any measurable speedup, but the API is slightly nicer. I thought I'd post the patch in case others thought this was a good direction or nice cleanup. --=20 Jeff Davis PostgreSQL Contributor Team - AWS --=-Z06sQkJbo5JBDDD6I4Fq Content-Disposition: attachment; filename="v2-0001-Convert-GUC-hashtable-to-use-simplehash.patch" Content-Type: text/x-patch; name="v2-0001-Convert-GUC-hashtable-to-use-simplehash.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSA1NGYwODIyODhmNDNiMTRiYjBkMGNjYTIwYzk2MGM4NjJkYjFmM2Q5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZWZmIERhdmlzIDxqZWZmQGotZGF2aXMuY29tPgpEYXRlOiBX ZWQsIDIgQXVnIDIwMjMgMjM6MDQ6MDYgLTA3MDAKU3ViamVjdDogW1BBVENIIHYyXSBDb252ZXJ0 IEdVQyBoYXNodGFibGUgdG8gdXNlIHNpbXBsZWhhc2guCgotLS0KIHNyYy9iYWNrZW5kL3V0aWxz L21pc2MvZ3VjLmMgfCAxNDEgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCA4NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9zcmMvYmFja2VuZC91dGlscy9taXNjL2d1Yy5jIGIvc3JjL2JhY2tlbmQvdXRpbHMvbWlz Yy9ndWMuYwppbmRleCA4MmQ4ZWZiYzk2Li43Mjk1YjBmMDBlIDEwMDY0NAotLS0gYS9zcmMvYmFj a2VuZC91dGlscy9taXNjL2d1Yy5jCisrKyBiL3NyYy9iYWNrZW5kL3V0aWxzL21pc2MvZ3VjLmMK QEAgLTIwMiw5ICsyMDIsMTAgQEAgdHlwZWRlZiBzdHJ1Y3QKIHsKIAljb25zdCBjaGFyICpndWNu YW1lOwkJLyogaGFzaCBrZXkgKi8KIAlzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKmd1Y3ZhcjsJLyog LT4gR1VDJ3MgZGVmaW5pbmcgc3RydWN0dXJlICovCi19IEdVQ0hhc2hFbnRyeTsKIAotc3RhdGlj IEhUQUIgKmd1Y19oYXNodGFiOwkJLyogZW50cmllcyBhcmUgR1VDSGFzaEVudHJ5cyAqLworCS8q IG5lZWRlZCBieSBzaW1wbGVoYXNoICovCisJY2hhciBzdGF0dXM7Cit9IEdVQ0hhc2hFbnRyeTsK IAogLyoKICAqIEluIGFkZGl0aW9uIHRvIHRoZSBoYXNoIHRhYmxlLCB2YXJpYWJsZXMgaGF2aW5n IGNlcnRhaW4gcHJvcGVydGllcyBhcmUKQEAgLTIyNyw4ICsyMjgsNyBAQCBzdGF0aWMgaW50CUdV Q05lc3RMZXZlbCA9IDA7CS8qIDEgd2hlbiBpbiBtYWluIHRyYW5zYWN0aW9uICovCiAKIAogc3Rh dGljIGludAlndWNfdmFyX2NvbXBhcmUoY29uc3Qgdm9pZCAqYSwgY29uc3Qgdm9pZCAqYik7Ci1z dGF0aWMgdWludDMyIGd1Y19uYW1lX2hhc2goY29uc3Qgdm9pZCAqa2V5LCBTaXplIGtleXNpemUp Owotc3RhdGljIGludAlndWNfbmFtZV9tYXRjaChjb25zdCB2b2lkICprZXkxLCBjb25zdCB2b2lk ICprZXkyLCBTaXplIGtleXNpemUpOworc3RhdGljIHVpbnQzMiBndWNfbmFtZV9oYXNoKGNvbnN0 IGNoYXIgKm5hbWUpOwogc3RhdGljIHZvaWQgSW5pdGlhbGl6ZUdVQ09wdGlvbnNGcm9tRW52aXJv bm1lbnQodm9pZCk7CiBzdGF0aWMgdm9pZCBJbml0aWFsaXplT25lR1VDT3B0aW9uKHN0cnVjdCBj b25maWdfZ2VuZXJpYyAqZ2NvbmYpOwogc3RhdGljIHZvaWQgUmVtb3ZlR1VDRnJvbUxpc3RzKHN0 cnVjdCBjb25maWdfZ2VuZXJpYyAqZ2NvbmYpOwpAQCAtMjY1LDYgKzI2NSwxOCBAQCBzdGF0aWMg Ym9vbCBjYWxsX3N0cmluZ19jaGVja19ob29rKHN0cnVjdCBjb25maWdfc3RyaW5nICpjb25mLCBj aGFyICoqbmV3dmFsLAogc3RhdGljIGJvb2wgY2FsbF9lbnVtX2NoZWNrX2hvb2soc3RydWN0IGNv bmZpZ19lbnVtICpjb25mLCBpbnQgKm5ld3ZhbCwKIAkJCQkJCQkJIHZvaWQgKipleHRyYSwgR3Vj U291cmNlIHNvdXJjZSwgaW50IGVsZXZlbCk7CiAKKyNkZWZpbmUgU0hfUFJFRklYCQlHVUNIYXNo CisjZGVmaW5lIFNIX0VMRU1FTlRfVFlQRQlHVUNIYXNoRW50cnkKKyNkZWZpbmUgU0hfS0VZX1RZ UEUJCWNvbnN0IGNoYXIgKgorI2RlZmluZQlTSF9LRVkJCQlndWNuYW1lCisjZGVmaW5lIFNIX0hB U0hfS0VZKHRiLCBrZXkpICAgCWd1Y19uYW1lX2hhc2goa2V5KQorI2RlZmluZSBTSF9FUVVBTCh0 YiwgYSwgYikJCShndWNfbmFtZV9jb21wYXJlKGEsIGIpID09IDApCisjZGVmaW5lCVNIX1NDT1BF CQlzdGF0aWMgaW5saW5lCisjZGVmaW5lIFNIX0RFQ0xBUkUKKyNkZWZpbmUgU0hfREVGSU5FCisj aW5jbHVkZSAibGliL3NpbXBsZWhhc2guaCIKKworc3RhdGljIEdVQ0hhc2hfaGFzaCAqZ3VjX2hh c2h0YWIgPSBOVUxMOwkvKiBlbnRyaWVzIGFyZSBHVUNIYXNoRW50cnlzICovCiAKIC8qCiAgKiBU aGlzIGZ1bmN0aW9uIGhhbmRsZXMgYm90aCBhY3R1YWwgY29uZmlnIGZpbGUgKHJlKWxvYWRzIGFu ZCBleGVjdXRpb24gb2YKQEAgLTI4Miw3ICsyOTQsNyBAQCBQcm9jZXNzQ29uZmlnRmlsZUludGVy bmFsKEd1Y0NvbnRleHQgY29udGV4dCwgYm9vbCBhcHBseVNldHRpbmdzLCBpbnQgZWxldmVsKQog CUNvbmZpZ1ZhcmlhYmxlICppdGVtLAogCQkJICAgKmhlYWQsCiAJCQkgICAqdGFpbDsKLQlIQVNI X1NFUV9TVEFUVVMgc3RhdHVzOworCUdVQ0hhc2hfaXRlcmF0b3IgaXRlcjsKIAlHVUNIYXNoRW50 cnkgKmhlbnRyeTsKIAogCS8qIFBhcnNlIHRoZSBtYWluIGNvbmZpZyBmaWxlIGludG8gYSBsaXN0 IG9mIG9wdGlvbiBuYW1lcyBhbmQgdmFsdWVzICovCkBAIC0zNTgsOCArMzcwLDggQEAgUHJvY2Vz c0NvbmZpZ0ZpbGVJbnRlcm5hbChHdWNDb250ZXh0IGNvbnRleHQsIGJvb2wgYXBwbHlTZXR0aW5n cywgaW50IGVsZXZlbCkKIAkgKiBuZWVkIHRoaXMgc28gdGhhdCB3ZSBjYW4gdGVsbCBiZWxvdyB3 aGljaCBvbmVzIGhhdmUgYmVlbiByZW1vdmVkIGZyb20KIAkgKiB0aGUgZmlsZSBzaW5jZSB3ZSBs YXN0IHByb2Nlc3NlZCBpdC4KIAkgKi8KLQloYXNoX3NlcV9pbml0KCZzdGF0dXMsIGd1Y19oYXNo dGFiKTsKLQl3aGlsZSAoKGhlbnRyeSA9IChHVUNIYXNoRW50cnkgKikgaGFzaF9zZXFfc2VhcmNo KCZzdGF0dXMpKSAhPSBOVUxMKQorCUdVQ0hhc2hfc3RhcnRfaXRlcmF0ZShndWNfaGFzaHRhYiwg Jml0ZXIpOworCXdoaWxlICgoaGVudHJ5ID0gR1VDSGFzaF9pdGVyYXRlKGd1Y19oYXNodGFiLCAm aXRlcikpICE9IE5VTEwpCiAJewogCQlzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKmdjb25mID0gaGVu dHJ5LT5ndWN2YXI7CiAKQEAgLTQ0NSw4ICs0NTcsOCBAQCBQcm9jZXNzQ29uZmlnRmlsZUludGVy bmFsKEd1Y0NvbnRleHQgY29udGV4dCwgYm9vbCBhcHBseVNldHRpbmdzLCBpbnQgZWxldmVsKQog CSAqIGJvb3QtdGltZSBkZWZhdWx0cy4gIElmIHN1Y2ggYSB2YXJpYWJsZSBjYW4ndCBiZSBjaGFu Z2VkIGFmdGVyIHN0YXJ0dXAsCiAJICogcmVwb3J0IHRoYXQgYW5kIGNvbnRpbnVlLgogCSAqLwot CWhhc2hfc2VxX2luaXQoJnN0YXR1cywgZ3VjX2hhc2h0YWIpOwotCXdoaWxlICgoaGVudHJ5ID0g KEdVQ0hhc2hFbnRyeSAqKSBoYXNoX3NlcV9zZWFyY2goJnN0YXR1cykpICE9IE5VTEwpCisJR1VD SGFzaF9zdGFydF9pdGVyYXRlKGd1Y19oYXNodGFiLCAmaXRlcik7CisJd2hpbGUgKChoZW50cnkg PSBHVUNIYXNoX2l0ZXJhdGUoZ3VjX2hhc2h0YWIsICZpdGVyKSkgIT0gTlVMTCkKIAl7CiAJCXN0 cnVjdCBjb25maWdfZ2VuZXJpYyAqZ2NvbmYgPSBoZW50cnktPmd1Y3ZhcjsKIAkJR3VjU3RhY2sg ICAqc3RhY2s7CkBAIC04NjcsMTcgKzg3OSwxNyBAQCBzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKioK IGdldF9ndWNfdmFyaWFibGVzKGludCAqbnVtX3ZhcnMpCiB7CiAJc3RydWN0IGNvbmZpZ19nZW5l cmljICoqcmVzdWx0OwotCUhBU0hfU0VRX1NUQVRVUyBzdGF0dXM7CisJR1VDSGFzaF9pdGVyYXRv ciBpdGVyOwogCUdVQ0hhc2hFbnRyeSAqaGVudHJ5OwogCWludAkJCWk7CiAKLQkqbnVtX3ZhcnMg PSBoYXNoX2dldF9udW1fZW50cmllcyhndWNfaGFzaHRhYik7CisJKm51bV92YXJzID0gZ3VjX2hh c2h0YWItPm1lbWJlcnM7CiAJcmVzdWx0ID0gcGFsbG9jKHNpemVvZihzdHJ1Y3QgY29uZmlnX2dl bmVyaWMgKikgKiAqbnVtX3ZhcnMpOwogCiAJLyogRXh0cmFjdCBwb2ludGVycyBmcm9tIHRoZSBo YXNoIHRhYmxlICovCiAJaSA9IDA7Ci0JaGFzaF9zZXFfaW5pdCgmc3RhdHVzLCBndWNfaGFzaHRh Yik7Ci0Jd2hpbGUgKChoZW50cnkgPSAoR1VDSGFzaEVudHJ5ICopIGhhc2hfc2VxX3NlYXJjaCgm c3RhdHVzKSkgIT0gTlVMTCkKKwlHVUNIYXNoX3N0YXJ0X2l0ZXJhdGUoZ3VjX2hhc2h0YWIsICZp dGVyKTsKKwl3aGlsZSAoKGhlbnRyeSA9IEdVQ0hhc2hfaXRlcmF0ZShndWNfaGFzaHRhYiwgJml0 ZXIpKSAhPSBOVUxMKQogCQlyZXN1bHRbaSsrXSA9IGhlbnRyeS0+Z3VjdmFyOwogCUFzc2VydChp ID09ICpudW1fdmFycyk7CiAKQEAgLTg5OSw3ICs5MTEsNiBAQCBidWlsZF9ndWNfdmFyaWFibGVz KHZvaWQpCiB7CiAJaW50CQkJc2l6ZV92YXJzOwogCWludAkJCW51bV92YXJzID0gMDsKLQlIQVNI Q1RMCQloYXNoX2N0bDsKIAlHVUNIYXNoRW50cnkgKmhlbnRyeTsKIAlib29sCQlmb3VuZDsKIAlp bnQJCQlpOwpAQCAtOTYxLDI0ICs5NzIsMTQgQEAgYnVpbGRfZ3VjX3ZhcmlhYmxlcyh2b2lkKQog CSAqLwogCXNpemVfdmFycyA9IG51bV92YXJzICsgbnVtX3ZhcnMgLyA0OwogCi0JaGFzaF9jdGwu a2V5c2l6ZSA9IHNpemVvZihjaGFyICopOwotCWhhc2hfY3RsLmVudHJ5c2l6ZSA9IHNpemVvZihH VUNIYXNoRW50cnkpOwotCWhhc2hfY3RsLmhhc2ggPSBndWNfbmFtZV9oYXNoOwotCWhhc2hfY3Rs Lm1hdGNoID0gZ3VjX25hbWVfbWF0Y2g7Ci0JaGFzaF9jdGwuaGN4dCA9IEdVQ01lbW9yeUNvbnRl eHQ7Ci0JZ3VjX2hhc2h0YWIgPSBoYXNoX2NyZWF0ZSgiR1VDIGhhc2ggdGFibGUiLAotCQkJCQkJ CSAgc2l6ZV92YXJzLAotCQkJCQkJCSAgJmhhc2hfY3RsLAotCQkJCQkJCSAgSEFTSF9FTEVNIHwg SEFTSF9GVU5DVElPTiB8IEhBU0hfQ09NUEFSRSB8IEhBU0hfQ09OVEVYVCk7CisJZ3VjX2hhc2h0 YWIgPSBHVUNIYXNoX2NyZWF0ZShHVUNNZW1vcnlDb250ZXh0LCBzaXplX3ZhcnMsIE5VTEwpOwog CiAJZm9yIChpID0gMDsgQ29uZmlndXJlTmFtZXNCb29sW2ldLmdlbi5uYW1lOyBpKyspCiAJewog CQlzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKmd1Y3ZhciA9ICZDb25maWd1cmVOYW1lc0Jvb2xbaV0u Z2VuOwogCi0JCWhlbnRyeSA9IChHVUNIYXNoRW50cnkgKikgaGFzaF9zZWFyY2goZ3VjX2hhc2h0 YWIsCi0JCQkJCQkJCQkJCSAgJmd1Y3Zhci0+bmFtZSwKLQkJCQkJCQkJCQkJICBIQVNIX0VOVEVS LAotCQkJCQkJCQkJCQkgICZmb3VuZCk7CisJCWhlbnRyeSA9IEdVQ0hhc2hfaW5zZXJ0KGd1Y19o YXNodGFiLCBndWN2YXItPm5hbWUsICZmb3VuZCk7CisKIAkJQXNzZXJ0KCFmb3VuZCk7CiAJCWhl bnRyeS0+Z3VjdmFyID0gZ3VjdmFyOwogCX0KQEAgLTk4NywxMCArOTg4LDggQEAgYnVpbGRfZ3Vj X3ZhcmlhYmxlcyh2b2lkKQogCXsKIAkJc3RydWN0IGNvbmZpZ19nZW5lcmljICpndWN2YXIgPSAm Q29uZmlndXJlTmFtZXNJbnRbaV0uZ2VuOwogCi0JCWhlbnRyeSA9IChHVUNIYXNoRW50cnkgKikg aGFzaF9zZWFyY2goZ3VjX2hhc2h0YWIsCi0JCQkJCQkJCQkJCSAgJmd1Y3Zhci0+bmFtZSwKLQkJ CQkJCQkJCQkJICBIQVNIX0VOVEVSLAotCQkJCQkJCQkJCQkgICZmb3VuZCk7CisJCWhlbnRyeSA9 IEdVQ0hhc2hfaW5zZXJ0KGd1Y19oYXNodGFiLCBndWN2YXItPm5hbWUsICZmb3VuZCk7CisKIAkJ QXNzZXJ0KCFmb3VuZCk7CiAJCWhlbnRyeS0+Z3VjdmFyID0gZ3VjdmFyOwogCX0KQEAgLTk5OSwx MCArOTk4LDggQEAgYnVpbGRfZ3VjX3ZhcmlhYmxlcyh2b2lkKQogCXsKIAkJc3RydWN0IGNvbmZp Z19nZW5lcmljICpndWN2YXIgPSAmQ29uZmlndXJlTmFtZXNSZWFsW2ldLmdlbjsKIAotCQloZW50 cnkgPSAoR1VDSGFzaEVudHJ5ICopIGhhc2hfc2VhcmNoKGd1Y19oYXNodGFiLAotCQkJCQkJCQkJ CQkgICZndWN2YXItPm5hbWUsCi0JCQkJCQkJCQkJCSAgSEFTSF9FTlRFUiwKLQkJCQkJCQkJCQkJ ICAmZm91bmQpOworCQloZW50cnkgPSBHVUNIYXNoX2luc2VydChndWNfaGFzaHRhYiwgZ3VjdmFy LT5uYW1lLCAmZm91bmQpOworCiAJCUFzc2VydCghZm91bmQpOwogCQloZW50cnktPmd1Y3ZhciA9 IGd1Y3ZhcjsKIAl9CkBAIC0xMDExLDEwICsxMDA4LDggQEAgYnVpbGRfZ3VjX3ZhcmlhYmxlcyh2 b2lkKQogCXsKIAkJc3RydWN0IGNvbmZpZ19nZW5lcmljICpndWN2YXIgPSAmQ29uZmlndXJlTmFt ZXNTdHJpbmdbaV0uZ2VuOwogCi0JCWhlbnRyeSA9IChHVUNIYXNoRW50cnkgKikgaGFzaF9zZWFy Y2goZ3VjX2hhc2h0YWIsCi0JCQkJCQkJCQkJCSAgJmd1Y3Zhci0+bmFtZSwKLQkJCQkJCQkJCQkJ ICBIQVNIX0VOVEVSLAotCQkJCQkJCQkJCQkgICZmb3VuZCk7CisJCWhlbnRyeSA9IEdVQ0hhc2hf aW5zZXJ0KGd1Y19oYXNodGFiLCBndWN2YXItPm5hbWUsICZmb3VuZCk7CisKIAkJQXNzZXJ0KCFm b3VuZCk7CiAJCWhlbnRyeS0+Z3VjdmFyID0gZ3VjdmFyOwogCX0KQEAgLTEwMjMsMTUgKzEwMTgs MTMgQEAgYnVpbGRfZ3VjX3ZhcmlhYmxlcyh2b2lkKQogCXsKIAkJc3RydWN0IGNvbmZpZ19nZW5l cmljICpndWN2YXIgPSAmQ29uZmlndXJlTmFtZXNFbnVtW2ldLmdlbjsKIAotCQloZW50cnkgPSAo R1VDSGFzaEVudHJ5ICopIGhhc2hfc2VhcmNoKGd1Y19oYXNodGFiLAotCQkJCQkJCQkJCQkgICZn dWN2YXItPm5hbWUsCi0JCQkJCQkJCQkJCSAgSEFTSF9FTlRFUiwKLQkJCQkJCQkJCQkJICAmZm91 bmQpOworCQloZW50cnkgPSBHVUNIYXNoX2luc2VydChndWNfaGFzaHRhYiwgZ3VjdmFyLT5uYW1l LCAmZm91bmQpOworCiAJCUFzc2VydCghZm91bmQpOwogCQloZW50cnktPmd1Y3ZhciA9IGd1Y3Zh cjsKIAl9CiAKLQlBc3NlcnQobnVtX3ZhcnMgPT0gaGFzaF9nZXRfbnVtX2VudHJpZXMoZ3VjX2hh c2h0YWIpKTsKKwlBc3NlcnQobnVtX3ZhcnMgPT0gZ3VjX2hhc2h0YWItPm1lbWJlcnMpOwogfQog CiAvKgpAQCAtMTA0NCwxMCArMTAzNyw4IEBAIGFkZF9ndWNfdmFyaWFibGUoc3RydWN0IGNvbmZp Z19nZW5lcmljICp2YXIsIGludCBlbGV2ZWwpCiAJR1VDSGFzaEVudHJ5ICpoZW50cnk7CiAJYm9v bAkJZm91bmQ7CiAKLQloZW50cnkgPSAoR1VDSGFzaEVudHJ5ICopIGhhc2hfc2VhcmNoKGd1Y19o YXNodGFiLAotCQkJCQkJCQkJCSAgJnZhci0+bmFtZSwKLQkJCQkJCQkJCQkgIEhBU0hfRU5URVJf TlVMTCwKLQkJCQkJCQkJCQkgICZmb3VuZCk7CisJaGVudHJ5ID0gR1VDSGFzaF9pbnNlcnQoZ3Vj X2hhc2h0YWIsIHZhci0+bmFtZSwgJmZvdW5kKTsKKwogCWlmICh1bmxpa2VseShoZW50cnkgPT0g TlVMTCkpCiAJewogCQllcmVwb3J0KGVsZXZlbCwKQEAgLTEyMzYsMTAgKzEyMjcsOCBAQCBmaW5k X29wdGlvbihjb25zdCBjaGFyICpuYW1lLCBib29sIGNyZWF0ZV9wbGFjZWhvbGRlcnMsIGJvb2wg c2tpcF9lcnJvcnMsCiAJQXNzZXJ0KG5hbWUpOwogCiAJLyogTG9vayBpdCB1cCB1c2luZyB0aGUg aGFzaCB0YWJsZS4gKi8KLQloZW50cnkgPSAoR1VDSGFzaEVudHJ5ICopIGhhc2hfc2VhcmNoKGd1 Y19oYXNodGFiLAotCQkJCQkJCQkJCSAgJm5hbWUsCi0JCQkJCQkJCQkJICBIQVNIX0ZJTkQsCi0J CQkJCQkJCQkJICBOVUxMKTsKKwloZW50cnkgPSBHVUNIYXNoX2xvb2t1cChndWNfaGFzaHRhYiwg bmFtZSk7CisKIAlpZiAoaGVudHJ5KQogCQlyZXR1cm4gaGVudHJ5LT5ndWN2YXI7CiAKQEAgLTEz MjIsMTAgKzEzMTEsOSBAQCBndWNfbmFtZV9jb21wYXJlKGNvbnN0IGNoYXIgKm5hbWVhLCBjb25z dCBjaGFyICpuYW1lYikKICAqIEhhc2ggZnVuY3Rpb24gdGhhdCdzIGNvbXBhdGlibGUgd2l0aCBn dWNfbmFtZV9jb21wYXJlCiAgKi8KIHN0YXRpYyB1aW50MzIKLWd1Y19uYW1lX2hhc2goY29uc3Qg dm9pZCAqa2V5LCBTaXplIGtleXNpemUpCitndWNfbmFtZV9oYXNoKGNvbnN0IGNoYXIgKm5hbWUp CiB7CiAJdWludDMyCQlyZXN1bHQgPSAwOwotCWNvbnN0IGNoYXIgKm5hbWUgPSAqKGNvbnN0IGNo YXIgKmNvbnN0ICopIGtleTsKIAogCXdoaWxlICgqbmFtZSkKIAl7CkBAIC0xMzQyLDE5ICsxMzMw LDYgQEAgZ3VjX25hbWVfaGFzaChjb25zdCB2b2lkICprZXksIFNpemUga2V5c2l6ZSkKIAlyZXR1 cm4gcmVzdWx0OwogfQogCi0vKgotICogRHluYWhhc2ggbWF0Y2ggZnVuY3Rpb24gdG8gdXNlIGlu IGd1Y19oYXNodGFiCi0gKi8KLXN0YXRpYyBpbnQKLWd1Y19uYW1lX21hdGNoKGNvbnN0IHZvaWQg KmtleTEsIGNvbnN0IHZvaWQgKmtleTIsIFNpemUga2V5c2l6ZSkKLXsKLQljb25zdCBjaGFyICpu YW1lMSA9ICooY29uc3QgY2hhciAqY29uc3QgKikga2V5MTsKLQljb25zdCBjaGFyICpuYW1lMiA9 ICooY29uc3QgY2hhciAqY29uc3QgKikga2V5MjsKLQotCXJldHVybiBndWNfbmFtZV9jb21wYXJl KG5hbWUxLCBuYW1lMik7Ci19Ci0KLQogLyoKICAqIENvbnZlcnQgYSBHVUMgbmFtZSB0byB0aGUg Zm9ybSB0aGF0IHNob3VsZCBiZSB1c2VkIGluIHBnX3BhcmFtZXRlcl9hY2wuCiAgKgpAQCAtMTUy NCw3ICsxNDk5LDcgQEAgY2hlY2tfR1VDX2luaXQoc3RydWN0IGNvbmZpZ19nZW5lcmljICpnY29u ZikKIHZvaWQKIEluaXRpYWxpemVHVUNPcHRpb25zKHZvaWQpCiB7Ci0JSEFTSF9TRVFfU1RBVFVT IHN0YXR1czsKKwlHVUNIYXNoX2l0ZXJhdG9yIGl0ZXI7CiAJR1VDSGFzaEVudHJ5ICpoZW50cnk7 CiAKIAkvKgpAQCAtMTU0Miw4ICsxNTE3LDggQEAgSW5pdGlhbGl6ZUdVQ09wdGlvbnModm9pZCkK IAkgKiBMb2FkIGFsbCB2YXJpYWJsZXMgd2l0aCB0aGVpciBjb21waWxlZC1pbiBkZWZhdWx0cywg YW5kIGluaXRpYWxpemUKIAkgKiBzdGF0dXMgZmllbGRzIGFzIG5lZWRlZC4KIAkgKi8KLQloYXNo X3NlcV9pbml0KCZzdGF0dXMsIGd1Y19oYXNodGFiKTsKLQl3aGlsZSAoKGhlbnRyeSA9IChHVUNI YXNoRW50cnkgKikgaGFzaF9zZXFfc2VhcmNoKCZzdGF0dXMpKSAhPSBOVUxMKQorCUdVQ0hhc2hf c3RhcnRfaXRlcmF0ZShndWNfaGFzaHRhYiwgJml0ZXIpOworCXdoaWxlICgoaGVudHJ5ID0gR1VD SGFzaF9pdGVyYXRlKGd1Y19oYXNodGFiLCAmaXRlcikpICE9IE5VTEwpCiAJewogCQkvKiBDaGVj ayBtYXBwaW5nIGJldHdlZW4gaW5pdGlhbCBhbmQgZGVmYXVsdCB2YWx1ZSAqLwogCQlBc3NlcnQo Y2hlY2tfR1VDX2luaXQoaGVudHJ5LT5ndWN2YXIpKTsKQEAgLTI1MjgsNyArMjUwMyw3IEBAIEF0 RU9YYWN0X0dVQyhib29sIGlzQ29tbWl0LCBpbnQgbmVzdExldmVsKQogdm9pZAogQmVnaW5SZXBv cnRpbmdHVUNPcHRpb25zKHZvaWQpCiB7Ci0JSEFTSF9TRVFfU1RBVFVTIHN0YXR1czsKKwlHVUNI YXNoX2l0ZXJhdG9yIGl0ZXI7CiAJR1VDSGFzaEVudHJ5ICpoZW50cnk7CiAKIAkvKgpAQCAtMjU1 Miw4ICsyNTI3LDggQEAgQmVnaW5SZXBvcnRpbmdHVUNPcHRpb25zKHZvaWQpCiAJCQkJCQlQR0Nf SU5URVJOQUwsIFBHQ19TX09WRVJSSURFKTsKIAogCS8qIFRyYW5zbWl0IGluaXRpYWwgdmFsdWVz IG9mIGludGVyZXN0aW5nIHZhcmlhYmxlcyAqLwotCWhhc2hfc2VxX2luaXQoJnN0YXR1cywgZ3Vj X2hhc2h0YWIpOwotCXdoaWxlICgoaGVudHJ5ID0gKEdVQ0hhc2hFbnRyeSAqKSBoYXNoX3NlcV9z ZWFyY2goJnN0YXR1cykpICE9IE5VTEwpCisJR1VDSGFzaF9zdGFydF9pdGVyYXRlKGd1Y19oYXNo dGFiLCAmaXRlcik7CisJd2hpbGUgKChoZW50cnkgPSBHVUNIYXNoX2l0ZXJhdGUoZ3VjX2hhc2h0 YWIsICZpdGVyKSkgIT0gTlVMTCkKIAl7CiAJCXN0cnVjdCBjb25maWdfZ2VuZXJpYyAqY29uZiA9 IGhlbnRyeS0+Z3VjdmFyOwogCkBAIC00ODA5LDEwICs0Nzg0LDggQEAgZGVmaW5lX2N1c3RvbV92 YXJpYWJsZShzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKnZhcmlhYmxlKQogCS8qCiAJICogU2VlIGlm IHRoZXJlJ3MgYSBwbGFjZWhvbGRlciBieSB0aGUgc2FtZSBuYW1lLgogCSAqLwotCWhlbnRyeSA9 IChHVUNIYXNoRW50cnkgKikgaGFzaF9zZWFyY2goZ3VjX2hhc2h0YWIsCi0JCQkJCQkJCQkJICAm bmFtZSwKLQkJCQkJCQkJCQkgIEhBU0hfRklORCwKLQkJCQkJCQkJCQkgIE5VTEwpOworCWhlbnRy eSA9IEdVQ0hhc2hfbG9va3VwKGd1Y19oYXNodGFiLCBuYW1lKTsKKwogCWlmIChoZW50cnkgPT0g TlVMTCkKIAl7CiAJCS8qCkBAIC01MTQ4LDcgKzUxMjEsNyBAQCB2b2lkCiBNYXJrR1VDUHJlZml4 UmVzZXJ2ZWQoY29uc3QgY2hhciAqY2xhc3NOYW1lKQogewogCWludAkJCWNsYXNzTGVuID0gc3Ry bGVuKGNsYXNzTmFtZSk7Ci0JSEFTSF9TRVFfU1RBVFVTIHN0YXR1czsKKwlHVUNIYXNoX2l0ZXJh dG9yIGl0ZXI7CiAJR1VDSGFzaEVudHJ5ICpoZW50cnk7CiAJTWVtb3J5Q29udGV4dCBvbGRjb250 ZXh0OwogCkBAIC01MTU4LDggKzUxMzEsOCBAQCBNYXJrR1VDUHJlZml4UmVzZXJ2ZWQoY29uc3Qg Y2hhciAqY2xhc3NOYW1lKQogCSAqIGRvbid0IGJvdGhlciB0cnlpbmcgdG8gZnJlZSBhc3NvY2lh dGVkIG1lbW9yeSwgc2luY2UgdGhpcyBzaG91bGRuJ3QKIAkgKiBoYXBwZW4gb2Z0ZW4uKQogCSAq LwotCWhhc2hfc2VxX2luaXQoJnN0YXR1cywgZ3VjX2hhc2h0YWIpOwotCXdoaWxlICgoaGVudHJ5 ID0gKEdVQ0hhc2hFbnRyeSAqKSBoYXNoX3NlcV9zZWFyY2goJnN0YXR1cykpICE9IE5VTEwpCisJ R1VDSGFzaF9zdGFydF9pdGVyYXRlKGd1Y19oYXNodGFiLCAmaXRlcik7CisJd2hpbGUgKChoZW50 cnkgPSBHVUNIYXNoX2l0ZXJhdGUoZ3VjX2hhc2h0YWIsICZpdGVyKSkgIT0gTlVMTCkKIAl7CiAJ CXN0cnVjdCBjb25maWdfZ2VuZXJpYyAqdmFyID0gaGVudHJ5LT5ndWN2YXI7CiAKQEAgLTUxNzQs MTAgKzUxNDcsOCBAQCBNYXJrR1VDUHJlZml4UmVzZXJ2ZWQoY29uc3QgY2hhciAqY2xhc3NOYW1l KQogCQkJCQkgZXJyZGV0YWlsKCJcIiVzXCIgaXMgbm93IGEgcmVzZXJ2ZWQgcHJlZml4LiIsCiAJ CQkJCQkJICAgY2xhc3NOYW1lKSkpOwogCQkJLyogUmVtb3ZlIGl0IGZyb20gdGhlIGhhc2ggdGFi bGUgKi8KLQkJCWhhc2hfc2VhcmNoKGd1Y19oYXNodGFiLAotCQkJCQkJJnZhci0+bmFtZSwKLQkJ CQkJCUhBU0hfUkVNT1ZFLAotCQkJCQkJTlVMTCk7CisJCQlHVUNIYXNoX2RlbGV0ZShndWNfaGFz aHRhYiwgdmFyLT5uYW1lKTsKKwogCQkJLyogUmVtb3ZlIGl0IGZyb20gYW55IGxpc3RzIGl0J3Mg aW4sIHRvbyAqLwogCQkJUmVtb3ZlR1VDRnJvbUxpc3RzKHZhcik7CiAJCX0KQEAgLTUyMDgsNyAr NTE3OSw3IEBAIGdldF9leHBsYWluX2d1Y19vcHRpb25zKGludCAqbnVtKQogCSAqIFdoaWxlIG9u bHkgYSBmcmFjdGlvbiBvZiBhbGwgdGhlIEdVQyB2YXJpYWJsZXMgYXJlIG1hcmtlZCBHVUNfRVhQ TEFJTiwKIAkgKiBpdCBkb2Vzbid0IHNlZW0gd29ydGggZHluYW1pY2FsbHkgcmVzaXppbmcgdGhp cyBhcnJheS4KIAkgKi8KLQlyZXN1bHQgPSBwYWxsb2Moc2l6ZW9mKHN0cnVjdCBjb25maWdfZ2Vu ZXJpYyAqKSAqIGhhc2hfZ2V0X251bV9lbnRyaWVzKGd1Y19oYXNodGFiKSk7CisJcmVzdWx0ID0g cGFsbG9jKHNpemVvZihzdHJ1Y3QgY29uZmlnX2dlbmVyaWMgKikgKiBndWNfaGFzaHRhYi0+bWVt YmVycyk7CiAKIAkvKiBXZSBuZWVkIG9ubHkgY29uc2lkZXIgR1VDcyB3aXRoIHNvdXJjZSBub3Qg UEdDX1NfREVGQVVMVCAqLwogCWRsaXN0X2ZvcmVhY2goaXRlciwgJmd1Y19ub25kZWZfbGlzdCkK LS0gCjIuMzQuMQoK --=-Z06sQkJbo5JBDDD6I4Fq--