diff options
| author | Peter Geoghegan | 2020-07-21 22:50:58 +0000 |
|---|---|---|
| committer | Peter Geoghegan | 2020-07-21 22:50:58 +0000 |
| commit | 4a70f829d86cb8dbd68f561720e6329f5e818c94 (patch) | |
| tree | 50c2720e1591c314ef145bc6ab4d81881f2c053f /src/backend/access/nbtree/nbtree.c | |
| parent | 670c0a1d474bf296dbcc1d6de912d4841f2ed643 (diff) | |
Add nbtree Valgrind buffer lock checks.
Holding just a buffer pin (with no buffer lock) on an nbtree buffer/page
provides very weak guarantees, especially compared to heapam, where it's
often safe to read a page while only holding a buffer pin. This commit
has Valgrind enforce the following rule: it is never okay to access an
nbtree buffer without holding both a pin and a lock on the buffer.
A draft version of this patch detected questionable code that was
cleaned up by commits fa7ff642 and 7154aa16. The code in question used
to access an nbtree buffer page's special/opaque area with no buffer
lock (only a buffer pin). This practice (which isn't obviously unsafe)
is hereby formally disallowed in nbtree. There doesn't seem to be any
reason to allow it, and banning it keeps things simple for Valgrind.
The new checks are implemented by adding custom nbtree client requests
(located in LockBuffer() wrapper functions); these requests are
"superimposed" on top of the generic bufmgr.c Valgrind client requests
added by commit 1e0dfd16. No custom resource management cleanup code is
needed to undo the effects of marking buffers as non-accessible under
this scheme.
Author: Peter Geoghegan
Reviewed-By: Anastasia Lubennikova, Georgios Kokolatos
Discussion: https://postgr.es/m/CAH2-WzkLgyN3zBvRZ1pkNJThC=xi_0gpWRUb_45eexLH1+k2_Q@mail.gmail.com
Diffstat (limited to 'src/backend/access/nbtree/nbtree.c')
| -rw-r--r-- | src/backend/access/nbtree/nbtree.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index e947addef6b..d65f4357cc8 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -1115,7 +1115,7 @@ backtrack: */ buf = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_NORMAL, info->strategy); - LockBuffer(buf, BT_READ); + _bt_lockbuf(rel, buf, BT_READ); page = BufferGetPage(buf); opaque = NULL; if (!PageIsNew(page)) @@ -1222,8 +1222,7 @@ backtrack: * course of the vacuum scan, whether or not it actually contains any * deletable tuples --- see nbtree/README. */ - LockBuffer(buf, BUFFER_LOCK_UNLOCK); - LockBufferForCleanup(buf); + _bt_upgradelockbufcleanup(rel, buf); /* * Check whether we need to backtrack to earlier pages. What we are |