Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mOJui-0005Jj-16 for pgsql-hackers@arkaria.postgresql.org; Thu, 09 Sep 2021 13:16:24 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1mOJug-0005eh-UV for pgsql-hackers@arkaria.postgresql.org; Thu, 09 Sep 2021 13:16:22 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mOJug-0005eY-JJ for pgsql-hackers@lists.postgresql.org; Thu, 09 Sep 2021 13:16:22 +0000 Received: from smtp-fw-9102.amazon.com ([207.171.184.29]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mOJud-0001gD-4R for pgsql-hackers@lists.postgresql.org; Thu, 09 Sep 2021 13:16:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1631193380; x=1662729380; h=subject:to:cc:references:from:message-id:date: mime-version:in-reply-to; bh=jl9o0X5TLXcXmebkTEfq0bezH29kBuLzN8kmrBIPAzI=; b=LKV4qEudENexqShyMxRzMzmUNGeBsgHifDjJG4ogdRqwB/R9BpK4jEa1 DzudAMjTDra4wZ+6D87fqtON4bPuvE38kna+2C8myKafkKk5cTv3EbTUr yyYtp+L4291HfKnijbk6fh4yAnqFI2v0prl3ZkShhrqDymVu3TnQLDanV c=; X-Amazon-filename: v3-0001-Fix-reorder-buffer-memory-accounting-for-toast-ch-13_STABLE.patch X-IronPort-AV: E=Sophos;i="5.85,280,1624320000"; d="scan'208,223";a="158736159" Received: from pdx4-co-svc-p1-lb2-vlan3.amazon.com (HELO email-inbound-relay-1a-7d76a15f.us-east-1.amazon.com) ([10.25.36.214]) by smtp-border-fw-9102.sea19.amazon.com with ESMTP; 09 Sep 2021 13:16:09 +0000 Received: from EX13D03EUC003.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan3.iad.amazon.com [10.40.163.38]) by email-inbound-relay-1a-7d76a15f.us-east-1.amazon.com (Postfix) with ESMTPS id 0C780A1AC6; Thu, 9 Sep 2021 13:16:06 +0000 (UTC) Received: from 38f9d36c4abb.ant.amazon.com (10.43.162.216) by EX13D03EUC003.ant.amazon.com (10.43.164.192) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Thu, 9 Sep 2021 13:16:04 +0000 Subject: Re: [BUG] Failed Assertion in ReorderBufferChangeMemoryUpdate() To: Amit Kapila CC: Dilip Kumar , PostgreSQL Hackers References: <92b0ee65-b8bd-e42d-c082-4f3f4bf12d34@amazon.com> <73dcd904-cfee-21f2-d363-317cd517cb00@amazon.com> <51babafd-4c0c-9b69-ec5c-5e4740d2606b@amazon.com> <7e2a1da1-80e1-64c4-1512-78e47a6711d4@amazon.com> <36ed78a0-5781-11d8-4842-afce849fb0c7@amazon.com> From: "Drouvot, Bertrand" Message-ID: Date: Thu, 9 Sep 2021 15:16:00 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------D4945AB7F71C0857A42FD593" Content-Language: en-US X-Originating-IP: [10.43.162.216] X-ClientProxiedBy: EX13D48UWB001.ant.amazon.com (10.43.163.80) To EX13D03EUC003.ant.amazon.com (10.43.164.192) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --------------D4945AB7F71C0857A42FD593 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Hi, On 9/9/21 1:16 PM, Amit Kapila wrote: > On Tue, Sep 7, 2021 at 2:02 PM Drouvot, Bertrand wrote: >> On 9/7/21 9:11 AM, Drouvot, Bertrand wrote: >> Please find enclosed patch v2 (for the master branch) implementing the >> modified approach of option 2) proposed by Amit. >> > The patch looks good to me. I have made a minor modification in the > comment to make it explicit why we are not subtracting the size > immediately Thanks! Indeed, good point to also mention in the comment why it has been done that way. > Kindly prepare back-branch patches and > test the same. Please find enclosed the modified (and tested) version for the REL_13_STABLE branch (the master patch version also applied on REL_14_STABLE). Thanks Bertrand --------------D4945AB7F71C0857A42FD593 Content-Type: text/plain; charset="UTF-8"; x-mac-type=0; x-mac-creator=0; name="v3-0001-Fix-reorder-buffer-memory-accounting-for-toast-ch-13_STABLE.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="v3-0001-Fix-reorder-buffer-memory-accounting-for-toast-ch-13"; filename*1="_STABLE.patch" RnJvbSA3MWYwMzViOWYzNGU5ODI1MWI5MWJjYmEzMDMwZDhiMzMxNzkwNGM2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBBbWl0IEthcGlsYSA8YWthcGlsYUBwb3N0Z3Jlc3Fs Lm9yZz4KRGF0ZTogVGh1LCA5IFNlcCAyMDIxIDE2OjIxOjQ0ICswNTMwClN1YmplY3Q6IFtQ QVRDSCB2M10gRml4IHJlb3JkZXIgYnVmZmVyIG1lbW9yeSBhY2NvdW50aW5nIGZvciB0b2Fz dCBjaGFuZ2VzLgoKV2hpbGUgcHJvY2Vzc2luZyB0b2FzdCBjaGFuZ2VzIGluIGxvZ2ljYWwg ZGVjb2RpbmcsIHdlIHJlamlnZ2VyIHRoZQp0dXBsZSBjaGFuZ2UgdG8gcG9pbnQgdG8gaW4t bWVtb3J5IHRvYXN0IHR1cGxlcyBpbnN0ZWFkIHRvIG9uLWRpc2sgdG9hc3QKdHVwbGVzLiBB bmQsIHRvIG1ha2Ugc3VyZSB0aGUgbWVtb3J5IGFjY291bnRpbmcgaXMgY29ycmVjdCwgd2Ug d2VyZQpzdWJ0cmFjdGluZyB0aGUgb2xkIGNoYW5nZSBzaXplIGFuZCB0aGVuIGFmdGVyIHJl LWNvbXB1dGluZyB0aGUgbmV3IHR1cGxlLApyZS1hZGRpbmcgaXRzIHNpemUgYXQgdGhlIGVu ZC4gTm93LCBpZiB0aGVyZSBpcyBhbnkgZXJyb3IgYmVmb3JlIHdlIGFkZAp0aGUgbmV3IHNp emUsIHdlIHdpbGwgcmVsZWFzZSB0aGUgY2hhbmdlcyBhbmQgdGhhdCB3aWxsIHVwZGF0ZSB0 aGUKYWNjb3VudGluZyBpbmZvIChzdWJ0cmFjdGluZyB0aGUgc2l6ZSBmcm9tIHRoZSBjb3Vu dGVycykuIEFuZCB3ZSB3ZXJlCnVuZGVyZmxvd2luZyB0aGVyZSB3aGljaCBsZWFkcyB0byBh biBhc3NlcnRpb24gZmFpbHVyZSBpbiBhc3NlcnQgZW5hYmxlZApidWlsZHMgYW5kIHdyb25n IG1lbW9yeSBhY2NvdW50aW5nIGluIHJlb3JkZXIgYnVmZmVyIG90aGVyd2lzZS4KCkF1dGhv cjogQmVydHJhbmQgRHJvdXZvdApSZXZpZXdlZC1ieTogQW1pdCBLYXBpbGEKQmFja3BhdGNo LXRocm91Z2g6IDEzLCB3aGVyZSBtZW1vcnkgYWNjb3VudGluZyB3YXMgaW50cm9kdWNlZApE aXNjdXNzaW9uOiBodHRwczovL3Bvc3Rnci5lcy9tLzkyYjBlZTY1LWI4YmQtZTQyZC1jMDgy LTRmM2Y0YmYxMmQzNEBhbWF6b24uY29tCi0tLQogc3JjL2JhY2tlbmQvcmVwbGljYXRpb24v bG9naWNhbC9yZW9yZGVyYnVmZmVyLmMgfCAzNyArKysrKysrKysrKysrKystLS0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCiAx MDAuMCUgc3JjL2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC8KCmRpZmYgLS1naXQgYS9z cmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL3Jlb3JkZXJidWZmZXIuYyBiL3NyYy9i YWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvcmVvcmRlcmJ1ZmZlci5jCmluZGV4IGI5MDQ2 OTdmMTguLjkyNjRkYzI0N2EgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9u L2xvZ2ljYWwvcmVvcmRlcmJ1ZmZlci5jCisrKyBiL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9u L2xvZ2ljYWwvcmVvcmRlcmJ1ZmZlci5jCkBAIC0yNjIsNyArMjYyLDggQEAgc3RhdGljIHZv aWQgUmVvcmRlckJ1ZmZlclRvYXN0QXBwZW5kQ2h1bmsoUmVvcmRlckJ1ZmZlciAqcmIsIFJl b3JkZXJCdWZmZXJUWE4gKnQKICAqLwogc3RhdGljIFNpemUgUmVvcmRlckJ1ZmZlckNoYW5n ZVNpemUoUmVvcmRlckJ1ZmZlckNoYW5nZSAqY2hhbmdlKTsKIHN0YXRpYyB2b2lkIFJlb3Jk ZXJCdWZmZXJDaGFuZ2VNZW1vcnlVcGRhdGUoUmVvcmRlckJ1ZmZlciAqcmIsCi0JCQkJCQkJ CQkJCVJlb3JkZXJCdWZmZXJDaGFuZ2UgKmNoYW5nZSwgYm9vbCBhZGRpdGlvbik7CisJCQkJ CQkJCQkJCVJlb3JkZXJCdWZmZXJDaGFuZ2UgKmNoYW5nZSwKKwkJCQkJCQkJCQkJYm9vbCBh ZGRpdGlvbiwgU2l6ZSBzeik7CiAKIC8qCiAgKiBBbGxvY2F0ZSBhIG5ldyBSZW9yZGVyQnVm ZmVyIGFuZCBjbGVhbiBvdXQgYW55IG9sZCBzZXJpYWxpemVkIHN0YXRlIGZyb20KQEAgLTQy NSw3ICs0MjYsOCBAQCB2b2lkCiBSZW9yZGVyQnVmZmVyUmV0dXJuQ2hhbmdlKFJlb3JkZXJC dWZmZXIgKnJiLCBSZW9yZGVyQnVmZmVyQ2hhbmdlICpjaGFuZ2UpCiB7CiAJLyogdXBkYXRl IG1lbW9yeSBhY2NvdW50aW5nIGluZm8gKi8KLQlSZW9yZGVyQnVmZmVyQ2hhbmdlTWVtb3J5 VXBkYXRlKHJiLCBjaGFuZ2UsIGZhbHNlKTsKKwlSZW9yZGVyQnVmZmVyQ2hhbmdlTWVtb3J5 VXBkYXRlKHJiLCBjaGFuZ2UsIGZhbHNlLAorCQkJCQkJCQkJUmVvcmRlckJ1ZmZlckNoYW5n ZVNpemUoY2hhbmdlKSk7CiAKIAkvKiBmcmVlIGNvbnRhaW5lZCBkYXRhICovCiAJc3dpdGNo IChjaGFuZ2UtPmFjdGlvbikKQEAgLTY0Nyw3ICs2NDksOCBAQCBSZW9yZGVyQnVmZmVyUXVl dWVDaGFuZ2UoUmVvcmRlckJ1ZmZlciAqcmIsIFRyYW5zYWN0aW9uSWQgeGlkLCBYTG9nUmVj UHRyIGxzbiwKIAl0eG4tPm5lbnRyaWVzX21lbSsrOwogCiAJLyogdXBkYXRlIG1lbW9yeSBh Y2NvdW50aW5nIGluZm9ybWF0aW9uICovCi0JUmVvcmRlckJ1ZmZlckNoYW5nZU1lbW9yeVVw ZGF0ZShyYiwgY2hhbmdlLCB0cnVlKTsKKwlSZW9yZGVyQnVmZmVyQ2hhbmdlTWVtb3J5VXBk YXRlKHJiLCBjaGFuZ2UsIHRydWUsCisJCQkJCQkJCQlSZW9yZGVyQnVmZmVyQ2hhbmdlU2l6 ZShjaGFuZ2UpKTsKIAogCS8qIGNoZWNrIHRoZSBtZW1vcnkgbGltaXRzIGFuZCBldmljdCBz b21ldGhpbmcgaWYgbmVlZGVkICovCiAJUmVvcmRlckJ1ZmZlckNoZWNrTWVtb3J5TGltaXQo cmIpOwpAQCAtMjE2MCwxMCArMjE2Myw4IEBAIFJlb3JkZXJCdWZmZXJBZGROZXdDb21tYW5k SWQoUmVvcmRlckJ1ZmZlciAqcmIsIFRyYW5zYWN0aW9uSWQgeGlkLAogc3RhdGljIHZvaWQK IFJlb3JkZXJCdWZmZXJDaGFuZ2VNZW1vcnlVcGRhdGUoUmVvcmRlckJ1ZmZlciAqcmIsCiAJ CQkJCQkJCVJlb3JkZXJCdWZmZXJDaGFuZ2UgKmNoYW5nZSwKLQkJCQkJCQkJYm9vbCBhZGRp dGlvbikKKwkJCQkJCQkJYm9vbCBhZGRpdGlvbiwgU2l6ZSBzeikKIHsKLQlTaXplCQlzejsK LQogCUFzc2VydChjaGFuZ2UtPnR4bik7CiAKIAkvKgpAQCAtMjE3NCw4ICsyMTc1LDYgQEAg UmVvcmRlckJ1ZmZlckNoYW5nZU1lbW9yeVVwZGF0ZShSZW9yZGVyQnVmZmVyICpyYiwKIAlp ZiAoY2hhbmdlLT5hY3Rpb24gPT0gUkVPUkRFUl9CVUZGRVJfQ0hBTkdFX0lOVEVSTkFMX1RV UExFQ0lEKQogCQlyZXR1cm47CiAKLQlzeiA9IFJlb3JkZXJCdWZmZXJDaGFuZ2VTaXplKGNo YW5nZSk7Ci0KIAlpZiAoYWRkaXRpb24pCiAJewogCQljaGFuZ2UtPnR4bi0+c2l6ZSArPSBz ejsKQEAgLTMwNzMsNyArMzA3Miw4IEBAIFJlb3JkZXJCdWZmZXJSZXN0b3JlQ2hhbmdlKFJl b3JkZXJCdWZmZXIgKnJiLCBSZW9yZGVyQnVmZmVyVFhOICp0eG4sCiAJICogdXBkYXRlIHRo ZSBhY2NvdW50aW5nIHRvbyAoc3VidHJhY3RpbmcgdGhlIHNpemUgZnJvbSB0aGUgY291bnRl cnMpLiBBbmQKIAkgKiB3ZSBkb24ndCB3YW50IHRvIHVuZGVyZmxvdyB0aGVyZS4KIAkgKi8K LQlSZW9yZGVyQnVmZmVyQ2hhbmdlTWVtb3J5VXBkYXRlKHJiLCBjaGFuZ2UsIHRydWUpOwor CVJlb3JkZXJCdWZmZXJDaGFuZ2VNZW1vcnlVcGRhdGUocmIsIGNoYW5nZSwgdHJ1ZSwKKwkJ CQkJCQkJCVJlb3JkZXJCdWZmZXJDaGFuZ2VTaXplKGNoYW5nZSkpOwogfQogCiAvKgpAQCAt MzMyMSwxNyArMzMyMSwyMyBAQCBSZW9yZGVyQnVmZmVyVG9hc3RSZXBsYWNlKFJlb3JkZXJC dWZmZXIgKnJiLCBSZW9yZGVyQnVmZmVyVFhOICp0eG4sCiAJVHVwbGVEZXNjCXRvYXN0X2Rl c2M7CiAJTWVtb3J5Q29udGV4dCBvbGRjb250ZXh0OwogCVJlb3JkZXJCdWZmZXJUdXBsZUJ1 ZiAqbmV3dHVwOworCVNpemUJCW9sZF9zaXplOwogCiAJLyogbm8gdG9hc3QgdHVwbGVzIGNo YW5nZWQgKi8KIAlpZiAodHhuLT50b2FzdF9oYXNoID09IE5VTEwpCiAJCXJldHVybjsKIAog CS8qCi0JICogV2UncmUgZ29pbmcgdG8gbW9kaWZ5IHRoZSBzaXplIG9mIHRoZSBjaGFuZ2Us IHNvIHRvIG1ha2Ugc3VyZSB0aGUKLQkgKiBhY2NvdW50aW5nIGlzIGNvcnJlY3Qgd2UnbGwg bWFrZSBpdCBsb29rIGxpa2Ugd2UncmUgcmVtb3ZpbmcgdGhlIGNoYW5nZQotCSAqIG5vdyAo d2l0aCB0aGUgb2xkIHNpemUpLCBhbmQgdGhlbiByZS1hZGQgaXQgYXQgdGhlIGVuZC4KKwkg KiBXZSdyZSBnb2luZyB0byBtb2RpZnkgdGhlIHNpemUgb2YgdGhlIGNoYW5nZS4gU28sIHRv IG1ha2Ugc3VyZSB0aGUKKwkgKiBhY2NvdW50aW5nIGlzIGNvcnJlY3Qgd2UgcmVjb3JkIHRo ZSBjdXJyZW50IGNoYW5nZSBzaXplIGFuZCB0aGVuIGFmdGVyCisJICogcmUtY29tcHV0aW5n IHRoZSBjaGFuZ2Ugd2UnbGwgc3VidHJhY3QgdGhlIHJlY29yZGVkIHNpemUgYW5kIHRoZW4K KwkgKiByZS1hZGQgdGhlIG5ldyBjaGFuZ2Ugc2l6ZSBhdCB0aGUgZW5kLiBXZSBkb24ndCBp bW1lZGlhdGVseSBzdWJ0cmFjdAorCSAqIHRoZSBvbGQgc2l6ZSBiZWNhdXNlIGlmIHRoZXJl IGlzIGFueSBlcnJvciBiZWZvcmUgd2UgYWRkIHRoZSBuZXcgc2l6ZSwKKwkgKiB3ZSB3aWxs IHJlbGVhc2UgdGhlIGNoYW5nZXMgYW5kIHRoYXQgd2lsbCB1cGRhdGUgdGhlIGFjY291bnRp bmcgaW5mbworCSAqIChzdWJ0cmFjdGluZyB0aGUgc2l6ZSBmcm9tIHRoZSBjb3VudGVycyku IEFuZCB3ZSBkb24ndCB3YW50IHRvCisJICogdW5kZXJmbG93IHRoZXJlLgogCSAqLwotCVJl b3JkZXJCdWZmZXJDaGFuZ2VNZW1vcnlVcGRhdGUocmIsIGNoYW5nZSwgZmFsc2UpOworCW9s ZF9zaXplID0gUmVvcmRlckJ1ZmZlckNoYW5nZVNpemUoY2hhbmdlKTsKIAogCW9sZGNvbnRl eHQgPSBNZW1vcnlDb250ZXh0U3dpdGNoVG8ocmItPmNvbnRleHQpOwogCkBAIC0zNDgyLDgg KzM0ODgsMTEgQEAgUmVvcmRlckJ1ZmZlclRvYXN0UmVwbGFjZShSZW9yZGVyQnVmZmVyICpy YiwgUmVvcmRlckJ1ZmZlclRYTiAqdHhuLAogCiAJTWVtb3J5Q29udGV4dFN3aXRjaFRvKG9s ZGNvbnRleHQpOwogCisJLyogc3Vic3RyYWN0IHRoZSBvbGQgY2hhbmdlIHNpemUgKi8KKwlS ZW9yZGVyQnVmZmVyQ2hhbmdlTWVtb3J5VXBkYXRlKHJiLCBjaGFuZ2UsIGZhbHNlLCBvbGRf c2l6ZSk7CiAJLyogbm93IGFkZCB0aGUgY2hhbmdlIGJhY2ssIHdpdGggdGhlIGNvcnJlY3Qg c2l6ZSAqLwotCVJlb3JkZXJCdWZmZXJDaGFuZ2VNZW1vcnlVcGRhdGUocmIsIGNoYW5nZSwg dHJ1ZSk7CisJUmVvcmRlckJ1ZmZlckNoYW5nZU1lbW9yeVVwZGF0ZShyYiwgY2hhbmdlLCB0 cnVlLAorCQkJCQkJCQkJUmVvcmRlckJ1ZmZlckNoYW5nZVNpemUoY2hhbmdlKSk7CiB9CiAK IC8qCi0tIAoyLjE2LjYKCg== --------------D4945AB7F71C0857A42FD593--