MIME-Version: 1.0
References: 
 <CA+HiwqF4C0ws3cO+z5cLkPuvwnAwkSp7sfvgGj3yQ=Li6KNMqA@mail.gmail.com>
 <CA+HiwqGM6nvAV5O+=Nr+BXMPWOma0oeCRVzVP0XiLE8zX5TVAg@mail.gmail.com>
 <CA+HiwqGMaovCUgDbGxVGnK0Mrivr+ph3YE2Ws+47-ugyPb4f7g@mail.gmail.com>
 <CAFj8pRDaiBe_GOLk_yyYHTtPiDAAaLOM8u1-=Q3ZgXBTH+1igg@mail.gmail.com>
 <CA+HiwqGA5Ay_MR0eJEEbt4j6WrVh4F+AasTp8yCbs5aJLOJn6Q@mail.gmail.com>
 <CAEG8a3JM=NoqiTK0V6S9FNxZPvy1+C5F7rfafTtPKBVWnunL-g@mail.gmail.com>
 <CA+HiwqEyiLCY6MTLbOJXDdLNNQLaURYHvdW797MQgbjEK9od4Q@mail.gmail.com>
 <CAEG8a3+VBpwPf1Rm-ECD90whM9b3YnGhux5CVXdsL6khiBfzRQ@mail.gmail.com>
 <CA+HiwqF2UHzF0sKCp-F2a-U29rqh_9ZPy=f1h+Fh_=M8efj3pg@mail.gmail.com>
 <CAEG8a3L9Ew-WL8sxLROVOcypeaENPmd8qCmMvz4geoGL1TDGCA@mail.gmail.com>
 <CAEG8a3+nUFQo4sdPQF9xy0J73J8RFJ5U9A5+_kMosGDaZ+1sXA@mail.gmail.com>
 <2BE661BA-D909-4093-BF78-DB9B0C099337@gmail.com>
 <CAEG8a3JyKdizWvYsF+z_mA1BKy=dpW11iKVMOG=bk6Tbz6M1Bw@mail.gmail.com>
 <CAEG8a3+Hf4tvvbts29_k_AFhWQmRYfEo_SW4C5FY_140iKghBw@mail.gmail.com>
 <CA+HiwqFV-PY-3BxM6j5TaAiC3AwedDxo-6vwRSbvygg3zF+xAQ@mail.gmail.com>
In-Reply-To: 
 <CA+HiwqFV-PY-3BxM6j5TaAiC3AwedDxo-6vwRSbvygg3zF+xAQ@mail.gmail.com>
From: Amit Langote <amitlangote09@gmail.com>
Date: Tue, 24 Mar 2026 22:56:18 +0900
Message-ID: 
 <CA+HiwqHpaisS-e+0gAgzh92qZAFxncAJMmmTRZZN=efoeTPgOg@mail.gmail.com>
Subject: Re: Eliminating SPI / SQL from some RI triggers - take 3
To: Junwang Zhao <zhjwpku@gmail.com>
Cc: Haibo Yan <tristan.yim@gmail.com>,
 Pavel Stehule <pavel.stehule@gmail.com>,
	PostgreSQL-development <pgsql-hackers@postgresql.org>,
 Tomas Vondra <tomas@vondra.me>
Content-Type: multipart/mixed; boundary="000000000000067c2b064dc585a8"
Archived-At: 
 <https://www.postgresql.org/message-id/CA%2BHiwqHpaisS-e%2B0gAgzh92qZAFxncAJMmmTRZZN%3DefoeTPgOg%40mail.gmail.com>
Precedence: bulk

--000000000000067c2b064dc585a8
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Mar 24, 2026 at 8:47=E2=80=AFPM Amit Langote <amitlangote09@gmail.c=
om> wrote:
>
> Hi Junwang,
>
> On Fri, Mar 20, 2026 at 1:20=E2=80=AFAM Junwang Zhao <zhjwpku@gmail.com> =
wrote:
> > I squashed 0004 into 0003 so that each file can be committed independen=
tly.
> > I also runned pgindent for each file.
>
> Thanks for that.
>
> Here's another version.
>
> In 0001, I noticed that the condition change in ri_HashCompareOp could
> be simplified further.  Also improved the commentary surrounding that.
> I also updated the commit message to clarify parity with the SPI path.
>
> Updated the commit message of 0002 to talk about why caching the
> snapshot for the entire trigger firing cycle of a given constraint
> makes a trade off compared to the SPI path which retakes the snapshot
> for every row checked and could in principle avoid failure for FK rows
> whose corresponding PK row was added by a concurrently committed
> transaction, at least in the READ COMMITTED case.
>
> Updated the commit message of 0003 to clarify that it replaces
> ri_FastPathCheckCached() from 0002 with the BatchAdd/BatchFlush pair,
> and that the cached resources are used unchanged -- only the probing
> cadence changes from per-row to per-flush.  Per-flush CCI is safe
> because all AFTER triggers for the buffered rows have already fired
> by flush time; a new test case is added to show that.

Kept thinking about this on a walk after I sent this and came to the
conclusion that it might be better to just not cache the snapshot with
only the above argument in its favor.  If repeated GetSnapshotData()
is expensive, the solution should be to fix that instead of simply
side-stepping it.

By taking a snapshot per-batch without caching it, and so likewise the
IndexScanDesc, I'm seeing the same ~3x speedup in the batched
SK_SEARCHARRAY case, so I don't see much point in being very stubborn
about snapshot caching.  Like in the attached (there's an unrelated
memory context switch thinko fix).  Note that relations (pk_rel,
idx_rel) and the slot remain cached across the batch; only the
snapshot and scandesc are taken fresh per flush.

I'll post an updated version tomorrow morning.  I think it might be
better to just merge 0003 into 0002, because without snapshot and
scandesc caching the standalone value of 0002 is mostly just relation
and slot caching -- the interesting parts (batch callbacks, lifecycle
management) are all scaffolding for the batching.  So v10 will be two
patches: 0001 core fast path, 0002 everything else.

--=20
Thanks, Amit Langote

--000000000000067c2b064dc585a8
Content-Type: text/plain; charset="US-ASCII"; name="v9_delta.patch.txt"
Content-Disposition: attachment; filename="v9_delta.patch.txt"
Content-Transfer-Encoding: base64
Content-ID: <f_mn4o2voh0>
X-Attachment-Id: f_mn4o2voh0

ZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3V0aWxzL2FkdC9yaV90cmlnZ2Vycy5jIGIvc3JjL2Jh
Y2tlbmQvdXRpbHMvYWR0L3JpX3RyaWdnZXJzLmMKaW5kZXggOTkzYzNhYzQ5YTMuLmYyNzFmZmNj
YzAwIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC91dGlscy9hZHQvcmlfdHJpZ2dlcnMuYworKysg
Yi9zcmMvYmFja2VuZC91dGlscy9hZHQvcmlfdHJpZ2dlcnMuYwpAQCAtMjI0LDEwICsyMjQsOCBA
QCB0eXBlZGVmIHN0cnVjdCBSSV9GYXN0UGF0aEVudHJ5CiAJT2lkCQkJY29ub2lkOwkJCS8qIGhh
c2gga2V5OiBwZ19jb25zdHJhaW50IE9JRCAqLwogCVJlbGF0aW9uCXBrX3JlbDsKIAlSZWxhdGlv
bglpZHhfcmVsOwotCUluZGV4U2NhbkRlc2Mgc2NhbmRlc2M7CiAJVHVwbGVUYWJsZVNsb3QgKnBr
X3Nsb3Q7CiAJVHVwbGVUYWJsZVNsb3QgKmZrX3Nsb3Q7Ci0JU25hcHNob3QJc25hcHNob3Q7CQkv
KiByZWdpc3RlcmVkIHNuYXBzaG90IGZvciB0aGUgc2NhbiAqLwogCU1lbW9yeUNvbnRleHQgc2Nh
bl9jeHQ7CQkvKiBpbmRleCBzY2FuIGFsbG9jYXRpb25zICovCiAJTWVtb3J5Q29udGV4dCBmbHVz
aF9jeHQ7CS8qIHNob3J0LWxpdmVkIGNvbnRleHQgZm9yIHBlci1mbHVzaCB3b3JrICovCiAKQEAg
LTMwMSw5ICsyOTksMTEgQEAgc3RhdGljIHZvaWQgcmlfRmFzdFBhdGhDaGVjayhjb25zdCBSSV9D
b25zdHJhaW50SW5mbyAqcmlpbmZvLAogc3RhdGljIHZvaWQgcmlfRmFzdFBhdGhCYXRjaEFkZChj
b25zdCBSSV9Db25zdHJhaW50SW5mbyAqcmlpbmZvLAogCQkJCQkJCQlSZWxhdGlvbiBma19yZWws
IFR1cGxlVGFibGVTbG90ICpuZXdzbG90KTsKIHN0YXRpYyB2b2lkIHJpX0Zhc3RQYXRoRmx1c2hB
cnJheShSSV9GYXN0UGF0aEVudHJ5ICpmcGVudHJ5LCBUdXBsZVRhYmxlU2xvdCAqZmtfc2xvdCwK
LQkJCQkJCQkJICBjb25zdCBSSV9Db25zdHJhaW50SW5mbyAqcmlpbmZvLCBSZWxhdGlvbiBma19y
ZWwpOworCQkJCQkJCQkgIGNvbnN0IFJJX0NvbnN0cmFpbnRJbmZvICpyaWluZm8sIFJlbGF0aW9u
IGZrX3JlbCwKKwkJCQkJCQkJICBTbmFwc2hvdCBzbmFwc2hvdCk7CiBzdGF0aWMgdm9pZCByaV9G
YXN0UGF0aEZsdXNoTG9vcChSSV9GYXN0UGF0aEVudHJ5ICpmcGVudHJ5LCBUdXBsZVRhYmxlU2xv
dCAqZmtfc2xvdCwKLQkJCQkJCQkJIGNvbnN0IFJJX0NvbnN0cmFpbnRJbmZvICpyaWluZm8sIFJl
bGF0aW9uIGZrX3JlbCk7CisJCQkJCQkJCSBjb25zdCBSSV9Db25zdHJhaW50SW5mbyAqcmlpbmZv
LCBSZWxhdGlvbiBma19yZWwsCisJCQkJCQkJCSBTbmFwc2hvdCBzbmFwc2hvdCk7CiBzdGF0aWMg
dm9pZCByaV9GYXN0UGF0aEJhdGNoRmx1c2goUklfRmFzdFBhdGhFbnRyeSAqZnBlbnRyeSwKIAkJ
CQkJCQkJICBSZWxhdGlvbiBma19yZWwpOwogc3RhdGljIGJvb2wgcmlfRmFzdFBhdGhQcm9iZU9u
ZShSZWxhdGlvbiBwa19yZWwsIFJlbGF0aW9uIGlkeF9yZWwsCkBAIC0yODU3LDggKzI4NTcsOCBA
QCByaV9GYXN0UGF0aEJhdGNoRmx1c2goUklfRmFzdFBhdGhFbnRyeSAqZnBlbnRyeSwgUmVsYXRp
b24gZmtfcmVsKQogCWNvbnN0IFJJX0NvbnN0cmFpbnRJbmZvICpyaWluZm8gPSBmcGVudHJ5LT5y
aWluZm87CiAJUmVsYXRpb24JcGtfcmVsID0gZnBlbnRyeS0+cGtfcmVsOwogCVJlbGF0aW9uCWlk
eF9yZWwgPSBmcGVudHJ5LT5pZHhfcmVsOwotCVNuYXBzaG90CXNuYXBzaG90ID0gZnBlbnRyeS0+
c25hcHNob3Q7CiAJVHVwbGVUYWJsZVNsb3QgKmZrX3Nsb3QgPSBmcGVudHJ5LT5ma19zbG90Owor
CVNuYXBzaG90CXNuYXBzaG90OwogCU9pZAkJCXNhdmVkX3VzZXJpZDsKIAlpbnQJCQlzYXZlZF9z
ZWNfY29udGV4dDsKIAlNZW1vcnlDb250ZXh0IG9sZGN4dCA9IEN1cnJlbnRNZW1vcnlDb250ZXh0
OwpAQCAtMjg4Miw3ICsyODgyLDcgQEAgcmlfRmFzdFBhdGhCYXRjaEZsdXNoKFJJX0Zhc3RQYXRo
RW50cnkgKmZwZW50cnksIFJlbGF0aW9uIGZrX3JlbCkKIAkgKiBjb250ZXh0IHBlciByb3cgd2hl
cmVhcyB3ZSBkbyBpdCBvbmNlIGFyb3VuZCB0aGUgd2hvbGUgYmF0Y2guCiAJICovCiAJQ29tbWFu
ZENvdW50ZXJJbmNyZW1lbnQoKTsKLQlzbmFwc2hvdC0+Y3VyY2lkID0gR2V0Q3VycmVudENvbW1h
bmRJZChmYWxzZSk7CisJc25hcHNob3QgPSBSZWdpc3RlclNuYXBzaG90KEdldFRyYW5zYWN0aW9u
U25hcHNob3QoKSk7CiAKIAlHZXRVc2VySWRBbmRTZWNDb250ZXh0KCZzYXZlZF91c2VyaWQsICZz
YXZlZF9zZWNfY29udGV4dCk7CiAJU2V0VXNlcklkQW5kU2VjQ29udGV4dChSZWxhdGlvbkdldEZv
cm0ocGtfcmVsKS0+cmVsb3duZXIsCkBAIC0yODkxLDExICsyODkxLDEyIEBAIHJpX0Zhc3RQYXRo
QmF0Y2hGbHVzaChSSV9GYXN0UGF0aEVudHJ5ICpmcGVudHJ5LCBSZWxhdGlvbiBma19yZWwpCiAJ
CQkJCQkgICBTRUNVUklUWV9OT0ZPUkNFX1JMUyk7CiAKIAlpZiAocmlpbmZvLT5ua2V5cyA9PSAx
KQotCQlyaV9GYXN0UGF0aEZsdXNoQXJyYXkoZnBlbnRyeSwgZmtfc2xvdCwgcmlpbmZvLCBma19y
ZWwpOworCQlyaV9GYXN0UGF0aEZsdXNoQXJyYXkoZnBlbnRyeSwgZmtfc2xvdCwgcmlpbmZvLCBm
a19yZWwsIHNuYXBzaG90KTsKIAllbHNlCi0JCXJpX0Zhc3RQYXRoRmx1c2hMb29wKGZwZW50cnks
IGZrX3Nsb3QsIHJpaW5mbywgZmtfcmVsKTsKKwkJcmlfRmFzdFBhdGhGbHVzaExvb3AoZnBlbnRy
eSwgZmtfc2xvdCwgcmlpbmZvLCBma19yZWwsIHNuYXBzaG90KTsKIAlNZW1vcnlDb250ZXh0U3dp
dGNoVG8ob2xkY3h0KTsKIAlTZXRVc2VySWRBbmRTZWNDb250ZXh0KHNhdmVkX3VzZXJpZCwgc2F2
ZWRfc2VjX2NvbnRleHQpOworCVVucmVnaXN0ZXJTbmFwc2hvdChzbmFwc2hvdCk7CiAKIAkvKiBG
cmVlIG1hdGVyaWFsaXplZCB0dXBsZXMgYW5kIHJlc2V0ICovCiAJZm9yIChpbnQgaSA9IDA7IGkg
PCBmcGVudHJ5LT5iYXRjaF9jb3VudDsgaSsrKQpAQCAtMjkxMiwyOSArMjkxMywzMCBAQCByaV9G
YXN0UGF0aEJhdGNoRmx1c2goUklfRmFzdFBhdGhFbnRyeSAqZnBlbnRyeSwgUmVsYXRpb24gZmtf
cmVsKQogICovCiBzdGF0aWMgdm9pZAogcmlfRmFzdFBhdGhGbHVzaExvb3AoUklfRmFzdFBhdGhF
bnRyeSAqZnBlbnRyeSwgVHVwbGVUYWJsZVNsb3QgKmZrX3Nsb3QsCi0JCQkJCSBjb25zdCBSSV9D
b25zdHJhaW50SW5mbyAqcmlpbmZvLCBSZWxhdGlvbiBma19yZWwpCisJCQkJCSBjb25zdCBSSV9D
b25zdHJhaW50SW5mbyAqcmlpbmZvLCBSZWxhdGlvbiBma19yZWwsCisJCQkJCSBTbmFwc2hvdCBz
bmFwc2hvdCkKIHsKIAlSZWxhdGlvbglwa19yZWwgPSBmcGVudHJ5LT5wa19yZWw7CiAJUmVsYXRp
b24JaWR4X3JlbCA9IGZwZW50cnktPmlkeF9yZWw7Ci0JSW5kZXhTY2FuRGVzYyBzY2FuZGVzYyA9
IGZwZW50cnktPnNjYW5kZXNjOwogCVR1cGxlVGFibGVTbG90ICpwa19zbG90ID0gZnBlbnRyeS0+
cGtfc2xvdDsKLQlTbmFwc2hvdAlzbmFwc2hvdCA9IGZwZW50cnktPnNuYXBzaG90OworCUluZGV4
U2NhbkRlc2Mgc2NhbmRlc2M7CiAJRGF0dW0JCXBrX3ZhbHNbSU5ERVhfTUFYX0tFWVNdOwogCWNo
YXIJCXBrX251bGxzW0lOREVYX01BWF9LRVlTXTsKIAlTY2FuS2V5RGF0YSBza2V5W0lOREVYX01B
WF9LRVlTXTsKKwlib29sCQlmb3VuZCA9IHRydWU7CisJLyoKKwkgKiBidWlsZF9pbmRleF9zY2Fu
a2V5cygpIG1heSBwYWxsb2MgY2FzdCByZXN1bHRzIGZvciBjcm9zcy10eXBlIEZLcy4KKwkgKiBV
c2UgdGhlIGVudHJ5J3Mgc2hvcnQtbGl2ZWQgZmx1c2ggY29udGV4dCBzbyB0aGVzZSBkb24ndCBh
Y2N1bXVsYXRlCisJICogYWNyb3NzIGJhdGNoZXMuCisJICovCisJTWVtb3J5Q29udGV4dCBvbGRj
eHQgPSBNZW1vcnlDb250ZXh0U3dpdGNoVG8oZnBlbnRyeS0+Zmx1c2hfY3h0KTsKIAorCXNjYW5k
ZXNjID0gaW5kZXhfYmVnaW5zY2FuKHBrX3JlbCwgaWR4X3JlbCwgc25hcHNob3QsIE5VTEwsCisJ
CQkJCQkJICAgcmlpbmZvLT5ua2V5cywgMCk7CiAJZm9yIChpbnQgaSA9IDA7IGkgPCBmcGVudHJ5
LT5iYXRjaF9jb3VudDsgaSsrKQogCXsKLQkJYm9vbAkJZm91bmQgPSBmYWxzZTsKIAogCQlFeGVj
U3RvcmVIZWFwVHVwbGUoZnBlbnRyeS0+YmF0Y2hbaV0sIGZrX3Nsb3QsIGZhbHNlKTsKLQotCQkv
KgotCQkgKiBidWlsZF9pbmRleF9zY2Fua2V5cygpIG1heSBwYWxsb2MgY2FzdCByZXN1bHRzIGZv
ciBjcm9zcy10eXBlIEZLcy4KLQkJICogVXNlIHRoZSBlbnRyeSdzIHNob3J0LWxpdmVkIGZsdXNo
IGNvbnRleHQgc28gdGhlc2UgZG9uJ3QgYWNjdW11bGF0ZQotCQkgKiBhY3Jvc3MgYmF0Y2hlcy4K
LQkJICovCi0JCU1lbW9yeUNvbnRleHRTd2l0Y2hUbyhmcGVudHJ5LT5mbHVzaF9jeHQpOwogCQly
aV9FeHRyYWN0VmFsdWVzKGZrX3JlbCwgZmtfc2xvdCwgcmlpbmZvLCBmYWxzZSwgcGtfdmFscywg
cGtfbnVsbHMpOwogCQlidWlsZF9pbmRleF9zY2Fua2V5cyhyaWluZm8sIGlkeF9yZWwsIHBrX3Zh
bHMsIHBrX251bGxzLCBza2V5KTsKIAkJTWVtb3J5Q29udGV4dFN3aXRjaFRvKGZwZW50cnktPnNj
YW5fY3h0KTsKQEAgLTI5NDMsMTEgKzI5NDUsMTUgQEAgcmlfRmFzdFBhdGhGbHVzaExvb3AoUklf
RmFzdFBhdGhFbnRyeSAqZnBlbnRyeSwgVHVwbGVUYWJsZVNsb3QgKmZrX3Nsb3QsCiAJCQkJCQkJ
CQlzbmFwc2hvdCwgcmlpbmZvLCBza2V5LCByaWluZm8tPm5rZXlzKTsKIAogCQlpZiAoIWZvdW5k
KQotCQkJcmlfUmVwb3J0VmlvbGF0aW9uKHJpaW5mbywgcGtfcmVsLCBma19yZWwsCi0JCQkJCQkJ
ICAgZmtfc2xvdCwgTlVMTCwKLQkJCQkJCQkgICBSSV9QTEFOX0NIRUNLX0xPT0tVUFBLLCBmYWxz
ZSwgZmFsc2UpOworCQkJYnJlYWs7CiAJfQorCWluZGV4X2VuZHNjYW4oc2NhbmRlc2MpOwogCU1l
bW9yeUNvbnRleHRSZXNldChmcGVudHJ5LT5mbHVzaF9jeHQpOworCU1lbW9yeUNvbnRleHRTd2l0
Y2hUbyhvbGRjeHQpOworCWlmICghZm91bmQpCisJCXJpX1JlcG9ydFZpb2xhdGlvbihyaWluZm8s
IHBrX3JlbCwgZmtfcmVsLAorCQkJCQkJICAgZmtfc2xvdCwgTlVMTCwKKwkJCQkJCSAgIFJJX1BM
QU5fQ0hFQ0tfTE9PS1VQUEssIGZhbHNlLCBmYWxzZSk7CiB9CiAKIC8qCkBAIC0yOTYyLDE0ICsy
OTY4LDE0IEBAIHJpX0Zhc3RQYXRoRmx1c2hMb29wKFJJX0Zhc3RQYXRoRW50cnkgKmZwZW50cnks
IFR1cGxlVGFibGVTbG90ICpma19zbG90LAogICovCiBzdGF0aWMgdm9pZAogcmlfRmFzdFBhdGhG
bHVzaEFycmF5KFJJX0Zhc3RQYXRoRW50cnkgKmZwZW50cnksIFR1cGxlVGFibGVTbG90ICpma19z
bG90LAotCQkJCQkgIGNvbnN0IFJJX0NvbnN0cmFpbnRJbmZvICpyaWluZm8sIFJlbGF0aW9uIGZr
X3JlbCkKKwkJCQkJICBjb25zdCBSSV9Db25zdHJhaW50SW5mbyAqcmlpbmZvLCBSZWxhdGlvbiBm
a19yZWwsCisJCQkJCSAgU25hcHNob3Qgc25hcHNob3QpCiB7CiAJRmFzdFBhdGhNZXRhICpmcG1l
dGEgPSByaWluZm8tPmZwbWV0YTsKIAlSZWxhdGlvbglwa19yZWwgPSBmcGVudHJ5LT5wa19yZWw7
CiAJUmVsYXRpb24JaWR4X3JlbCA9IGZwZW50cnktPmlkeF9yZWw7Ci0JSW5kZXhTY2FuRGVzYyBz
Y2FuZGVzYyA9IGZwZW50cnktPnNjYW5kZXNjOwogCVR1cGxlVGFibGVTbG90ICpwa19zbG90ID0g
ZnBlbnRyeS0+cGtfc2xvdDsKLQlTbmFwc2hvdAlzbmFwc2hvdCA9IGZwZW50cnktPnNuYXBzaG90
OworCUluZGV4U2NhbkRlc2Mgc2NhbmRlc2M7CiAJRGF0dW0JCXNlYXJjaF92YWxzW1JJX0ZBU1RQ
QVRIX0JBVENIX1NJWkVdOwogCWJvb2wJCW1hdGNoZWRbUklfRkFTVFBBVEhfQkFUQ0hfU0laRV07
CiAJaW50CQkJbnZhbHMgPSBmcGVudHJ5LT5iYXRjaF9jb3VudDsKQEAgLTI5ODMsMTYgKzI5ODks
MTkgQEAgcmlfRmFzdFBhdGhGbHVzaEFycmF5KFJJX0Zhc3RQYXRoRW50cnkgKmZwZW50cnksIFR1
cGxlVGFibGVTbG90ICpma19zbG90LAogCWNoYXIJCWVsZW1fYWxpZ247CiAJQXJyYXlUeXBlICAq
YXJyOwogCi0JQXNzZXJ0KGZwbWV0YSk7Ci0KLQltZW1zZXQobWF0Y2hlZCwgMCwgbnZhbHMgKiBz
aXplb2YoYm9vbCkpOwotCiAJLyoKIAkgKiBUcmFuc2llbnQgcGVyLWZsdXNoIGFsbG9jYXRpb25z
IChjYXN0IHJlc3VsdHMsIHRoZSBzZWFyY2ggYXJyYXkpIG11c3QKIAkgKiBub3QgYWNjdW11bGF0
ZSBhY3Jvc3MgcmVwZWF0ZWQgZmx1c2hlcy4gIFVzZSB0aGUgZW50cnkncyBzaG9ydC1saXZlZAog
CSAqIGZsdXNoIGNvbnRleHQsIHJlc2V0IGFmdGVyIGVhY2ggZmx1c2guCiAJICovCi0JTWVtb3J5
Q29udGV4dFN3aXRjaFRvKGZwZW50cnktPmZsdXNoX2N4dCk7CisJTWVtb3J5Q29udGV4dCBvbGRj
eHQgPSBNZW1vcnlDb250ZXh0U3dpdGNoVG8oZnBlbnRyeS0+Zmx1c2hfY3h0KTsKKworCUFzc2Vy
dChmcG1ldGEpOworCisJbWVtc2V0KG1hdGNoZWQsIDAsIG52YWxzICogc2l6ZW9mKGJvb2wpKTsK
KworCXNjYW5kZXNjID0gaW5kZXhfYmVnaW5zY2FuKHBrX3JlbCwgaWR4X3JlbCwgc25hcHNob3Qs
IE5VTEwsCisJCQkJCQkJICAgcmlpbmZvLT5ua2V5cywgMCk7CiAKIAkvKgogCSAqIEV4dHJhY3Qg
RksgdmFsdWVzLCBjYXN0aW5nIHRvIHRoZSBvcGVyYXRvcidzIGV4cGVjdGVkIGlucHV0IHR5cGUg
aWYKQEAgLTMxMDMsNiArMzExMiwxMSBAQCByaV9GYXN0UGF0aEZsdXNoQXJyYXkoUklfRmFzdFBh
dGhFbnRyeSAqZnBlbnRyeSwgVHVwbGVUYWJsZVNsb3QgKmZrX3Nsb3QsCiAJCX0KIAl9CiAKKwlp
bmRleF9lbmRzY2FuKHNjYW5kZXNjKTsKKworCU1lbW9yeUNvbnRleHRSZXNldChmcGVudHJ5LT5m
bHVzaF9jeHQpOworCU1lbW9yeUNvbnRleHRTd2l0Y2hUbyhvbGRjeHQpOworCiAJLyogUmVwb3J0
IGZpcnN0IHVubWF0Y2hlZCByb3cgKi8KIAlmb3IgKGludCBpID0gMDsgaSA8IG52YWxzOyBpKysp
CiAJewpAQCAtMzExNCw4ICszMTI4LDYgQEAgcmlfRmFzdFBhdGhGbHVzaEFycmF5KFJJX0Zhc3RQ
YXRoRW50cnkgKmZwZW50cnksIFR1cGxlVGFibGVTbG90ICpma19zbG90LAogCQkJCQkJCSAgIFJJ
X1BMQU5fQ0hFQ0tfTE9PS1VQUEssIGZhbHNlLCBmYWxzZSk7CiAJCX0KIAl9Ci0KLQlNZW1vcnlD
b250ZXh0UmVzZXQoZnBlbnRyeS0+Zmx1c2hfY3h0KTsKIH0KIAogLyoKQEAgLTQxMDYsOSArNDEx
OCw2IEBAIHJpX0Zhc3RQYXRoVGVhcmRvd24odm9pZCkKIAloYXNoX3NlcV9pbml0KCZzdGF0dXMs
IHJpX2Zhc3RwYXRoX2NhY2hlKTsKIAl3aGlsZSAoKGVudHJ5ID0gaGFzaF9zZXFfc2VhcmNoKCZz
dGF0dXMpKSAhPSBOVUxMKQogCXsKLQkJLyogQ2xvc2UgYm90aCBzY2FucyBiZWZvcmUgY2xvc2lu
ZyBpZHhfcmVsLiAqLwotCQlpZiAoZW50cnktPnNjYW5kZXNjKQotCQkJaW5kZXhfZW5kc2Nhbihl
bnRyeS0+c2NhbmRlc2MpOwogCQlpZiAoZW50cnktPmlkeF9yZWwpCiAJCQlpbmRleF9jbG9zZShl
bnRyeS0+aWR4X3JlbCwgTm9Mb2NrKTsKIAkJaWYgKGVudHJ5LT5wa19yZWwpCkBAIC00MTE3LDgg
KzQxMjYsNiBAQCByaV9GYXN0UGF0aFRlYXJkb3duKHZvaWQpCiAJCQlFeGVjRHJvcFNpbmdsZVR1
cGxlVGFibGVTbG90KGVudHJ5LT5wa19zbG90KTsKIAkJaWYgKGVudHJ5LT5ma19zbG90KQogCQkJ
RXhlY0Ryb3BTaW5nbGVUdXBsZVRhYmxlU2xvdChlbnRyeS0+Zmtfc2xvdCk7Ci0JCWlmIChlbnRy
eS0+c25hcHNob3QpCi0JCQlVbnJlZ2lzdGVyU25hcHNob3QoZW50cnktPnNuYXBzaG90KTsKIAkJ
aWYgKGVudHJ5LT5zY2FuX2N4dCkKIAkJCU1lbW9yeUNvbnRleHREZWxldGUoZW50cnktPnNjYW5f
Y3h0KTsKIAl9CkBAIC00MjMyLDIxICs0MjM5LDEwIEBAIHJpX0Zhc3RQYXRoR2V0RW50cnkoY29u
c3QgUklfQ29uc3RyYWludEluZm8gKnJpaW5mbywgUmVsYXRpb24gZmtfcmVsKQogCQllbnRyeS0+
cGtfcmVsID0gdGFibGVfb3BlbihyaWluZm8tPnBrX3JlbGlkLCBSb3dTaGFyZUxvY2spOwogCQll
bnRyeS0+aWR4X3JlbCA9IGluZGV4X29wZW4ocmlpbmZvLT5jb25pbmRpZCwgQWNjZXNzU2hhcmVM
b2NrKTsKIAotCQkvKgotCQkgKiBSZWdpc3RlciBhbiBpbml0aWFsIHNuYXBzaG90LiAgSXRzIGN1
cmNpZCB3aWxsIGJlIHBhdGNoZWQgaW4gcGxhY2UKLQkJICogb24gZWFjaCBzdWJzZXF1ZW50IHJv
dyAoc2VlIHJpX0Zhc3RQYXRoQmF0Y2hGbHVzaCgpKSwgYXZvaWRpbmcKLQkJICogcGVyLXJvdyBH
ZXRTbmFwc2hvdERhdGEoKSBvdmVyaGVhZC4KLQkJICovCi0JCWVudHJ5LT5zbmFwc2hvdCA9IFJl
Z2lzdGVyU25hcHNob3QoR2V0VHJhbnNhY3Rpb25TbmFwc2hvdCgpKTsKLQogCQllbnRyeS0+cGtf
c2xvdCA9IHRhYmxlX3Nsb3RfY3JlYXRlKGVudHJ5LT5wa19yZWwsIE5VTEwpOwogCQllbnRyeS0+
Zmtfc2xvdCA9IE1ha2VTaW5nbGVUdXBsZVRhYmxlU2xvdChSZWxhdGlvbkdldERlc2NyKGZrX3Jl
bCksCiAJCQkJCQkJCQkJCQkgICZUVFNPcHNIZWFwVHVwbGUpOwogCi0JCWVudHJ5LT5zY2FuZGVz
YyA9IGluZGV4X2JlZ2luc2NhbihlbnRyeS0+cGtfcmVsLCBlbnRyeS0+aWR4X3JlbCwKLQkJCQkJ
CQkJCQkgIGVudHJ5LT5zbmFwc2hvdCwgTlVMTCwKLQkJCQkJCQkJCQkgIHJpaW5mby0+bmtleXMs
IDApOwotCiAJCWVudHJ5LT5zY2FuX2N4dCA9IEFsbG9jU2V0Q29udGV4dENyZWF0ZShUb3BUcmFu
c2FjdGlvbkNvbnRleHQsCiAJCQkJCQkJCQkJCQkiUkkgZmFzdCBwYXRoIHNjYW4gY29udGV4dCIs
CiAJCQkJCQkJCQkJCQlBTExPQ1NFVF9ERUZBVUxUX1NJWkVTKTsK
--000000000000067c2b064dc585a8--