mirror of
https://github.com/postgres/postgres.git
synced 2025-05-13 01:13:08 -04:00
aio: Make AIO more compatible with valgrind
In some edge cases valgrind flags issues with the memory referenced by IOs. All of the cases addressed in this change are false positives. Most of the false positives are caused by UnpinBuffer[NoOwner] marking buffer data as inaccessible. This happens even though the AIO subsystem still holds a pin. That's good, there shouldn't be accesses to the buffer outside of AIO related code until it is pinned by "user" code again. But it requires some explicit work - if the buffer is not pinned by the current backend, we need to explicitly mark the buffer data accessible/inaccessible while executing completion callbacks. That however causes a cascading issue in IO workers: After the completion callbacks for a buffer is executed, the page is marked as inaccessible. If subsequently the same worker is executing IO targeting the same buffer, we would get an error, as the memory is still marked inaccessible. To avoid that, we need to explicitly mark the memory as accessible in IO workers. Another issue is that IO executed in workers or via io_uring will not mark memory as DEFINED. In the case of workers that is because valgrind does not track memory definedness across processes. For io_uring that is because valgrind does not understand io_uring, and therefore its IOs never mark memory as defined, whether the completions are processed in the defining process or in another context. It's not entirely clear how to best solve that. The current user of AIO is not affected, as it explicitly marks buffers as DEFINED & NOACCESS anyway. Defer solving this issue until we have a user with different needs. Per buildfarm animal skink. Reviewed-by: Noah Misch <noah@leadboat.com> Co-authored-by: Noah Misch <noah@leadboat.com> Discussion: https://postgr.es/m/3pd4322mogfmdd5nln3zphdwhtmq3rzdldqjwb2sfqzcgs22lf@ok2gletdaoe6
This commit is contained in:
parent
8ab4241b9f
commit
8e293e689b
@ -210,3 +210,26 @@ pgaio_io_uses_fd(PgAioHandle *ioh, int fd)
|
||||
|
||||
return false; /* silence compiler */
|
||||
}
|
||||
|
||||
/*
|
||||
* Return the iovec and its length. Currently only expected to be used by
|
||||
* debugging infrastructure
|
||||
*/
|
||||
int
|
||||
pgaio_io_get_iovec_length(PgAioHandle *ioh, struct iovec **iov)
|
||||
{
|
||||
Assert(ioh->state >= PGAIO_HS_DEFINED);
|
||||
|
||||
*iov = &pgaio_ctl->iovecs[ioh->iovec_off];
|
||||
|
||||
switch (ioh->op)
|
||||
{
|
||||
case PGAIO_OP_READV:
|
||||
return ioh->op_data.read.iov_length;
|
||||
case PGAIO_OP_WRITEV:
|
||||
return ioh->op_data.write.iov_length;
|
||||
default:
|
||||
pg_unreachable();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
@ -42,6 +42,7 @@
|
||||
#include "storage/latch.h"
|
||||
#include "storage/proc.h"
|
||||
#include "tcop/tcopprot.h"
|
||||
#include "utils/memdebug.h"
|
||||
#include "utils/ps_status.h"
|
||||
#include "utils/wait_event.h"
|
||||
|
||||
@ -529,6 +530,24 @@ IoWorkerMain(const void *startup_data, size_t startup_data_len)
|
||||
error_errno = 0;
|
||||
error_ioh = NULL;
|
||||
|
||||
/*
|
||||
* As part of IO completion the buffer will be marked as NOACCESS,
|
||||
* until the buffer is pinned again - which never happens in io
|
||||
* workers. Therefore the next time there is IO for the same
|
||||
* buffer, the memory will be considered inaccessible. To avoid
|
||||
* that, explicitly allow access to the memory before reading data
|
||||
* into it.
|
||||
*/
|
||||
#ifdef USE_VALGRIND
|
||||
{
|
||||
struct iovec *iov;
|
||||
uint16 iov_length = pgaio_io_get_iovec_length(ioh, &iov);
|
||||
|
||||
for (int i = 0; i < iov_length; i++)
|
||||
VALGRIND_MAKE_MEM_UNDEFINED(iov[i].iov_base, iov[i].iov_len);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* We don't expect this to ever fail with ERROR or FATAL, no need
|
||||
* to keep error_ioh set to the IO.
|
||||
|
@ -6881,6 +6881,19 @@ buffer_readv_complete_one(PgAioTargetData *td, uint8 buf_off, Buffer buffer,
|
||||
/* Check for garbage data. */
|
||||
if (!failed)
|
||||
{
|
||||
/*
|
||||
* If the buffer is not currently pinned by this backend, e.g. because
|
||||
* we're completing this IO after an error, the buffer data will have
|
||||
* been marked as inaccessible when the buffer was unpinned. The AIO
|
||||
* subsystem holds a pin, but that doesn't prevent the buffer from
|
||||
* having been marked as inaccessible. The completion might also be
|
||||
* executed in a different process.
|
||||
*/
|
||||
#ifdef USE_VALGRIND
|
||||
if (!BufferIsPinned(buffer))
|
||||
VALGRIND_MAKE_MEM_DEFINED(bufdata, BLCKSZ);
|
||||
#endif
|
||||
|
||||
if (!PageIsVerified((Page) bufdata, tag.blockNum, piv_flags,
|
||||
failed_checksum))
|
||||
{
|
||||
@ -6899,6 +6912,12 @@ buffer_readv_complete_one(PgAioTargetData *td, uint8 buf_off, Buffer buffer,
|
||||
else if (*failed_checksum)
|
||||
*ignored_checksum = true;
|
||||
|
||||
/* undo what we did above */
|
||||
#ifdef USE_VALGRIND
|
||||
if (!BufferIsPinned(buffer))
|
||||
VALGRIND_MAKE_MEM_NOACCESS(bufdata, BLCKSZ);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Immediately log a message about the invalid page, but only to the
|
||||
* server log. The reason to do so immediately is that this may be
|
||||
|
@ -746,6 +746,8 @@ smgrreadv(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
|
||||
* responsible for pgaio_result_report() to mirror that news to the user (if
|
||||
* the IO results in PGAIO_RS_WARNING) or abort the (sub)transaction (if
|
||||
* PGAIO_RS_ERROR).
|
||||
* - Under Valgrind, the "buffers" memory may or may not change status to
|
||||
* DEFINED, depending on io_method and concurrent activity.
|
||||
*/
|
||||
void
|
||||
smgrstartreadv(PgAioHandle *ioh,
|
||||
|
@ -344,6 +344,7 @@ extern PgAioResult pgaio_io_call_complete_local(PgAioHandle *ioh);
|
||||
extern void pgaio_io_perform_synchronously(PgAioHandle *ioh);
|
||||
extern const char *pgaio_io_get_op_name(PgAioHandle *ioh);
|
||||
extern bool pgaio_io_uses_fd(PgAioHandle *ioh, int fd);
|
||||
extern int pgaio_io_get_iovec_length(PgAioHandle *ioh, struct iovec **iov);
|
||||
|
||||
/* aio_target.c */
|
||||
extern bool pgaio_io_can_reopen(PgAioHandle *ioh);
|
||||
|
Loading…
x
Reference in New Issue
Block a user