From a6f1745cefdfb932be393f0374765e60563ab23d Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 10 Jun 2024 13:42:58 -0700 Subject: [PATCH v2.3 10/30] aio: Basic subsystem initialization This is just separate to make it easier to review the tendrils into various places. --- src/include/storage/aio.h | 37 +++++++++++++++++++ src/include/storage/aio_init.h | 24 ++++++++++++ src/include/utils/guc.h | 1 + src/backend/storage/aio/Makefile | 2 + src/backend/storage/aio/aio.c | 36 ++++++++++++++++++ src/backend/storage/aio/aio_init.c | 37 +++++++++++++++++++ src/backend/storage/aio/meson.build | 2 + src/backend/storage/ipc/ipci.c | 3 ++ src/backend/utils/init/postinit.c | 7 ++++ src/backend/utils/misc/guc_tables.c | 23 ++++++++++++ src/backend/utils/misc/postgresql.conf.sample | 11 ++++++ src/tools/pgindent/typedefs.list | 1 + 12 files changed, 184 insertions(+) create mode 100644 src/include/storage/aio.h create mode 100644 src/include/storage/aio_init.h create mode 100644 src/backend/storage/aio/aio.c create mode 100644 src/backend/storage/aio/aio_init.c diff --git a/src/include/storage/aio.h b/src/include/storage/aio.h new file mode 100644 index 00000000000..0e3fadac543 --- /dev/null +++ b/src/include/storage/aio.h @@ -0,0 +1,37 @@ +/*------------------------------------------------------------------------- + * + * aio.h + * Main AIO interface + * + * + * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * src/include/storage/aio.h + * + *------------------------------------------------------------------------- + */ +#ifndef AIO_H +#define AIO_H + + + +/* Enum for io_method GUC. */ +typedef enum IoMethod +{ + IOMETHOD_SYNC = 0, +} IoMethod; + +/* We'll default to synchronous execution. */ +#define DEFAULT_IO_METHOD IOMETHOD_SYNC + + +extern void assign_io_method(int newval, void *extra); + + +/* GUCs */ +extern PGDLLIMPORT int io_method; +extern PGDLLIMPORT int io_max_concurrency; + + +#endif /* AIO_H */ diff --git a/src/include/storage/aio_init.h b/src/include/storage/aio_init.h new file mode 100644 index 00000000000..44151ef55bf --- /dev/null +++ b/src/include/storage/aio_init.h @@ -0,0 +1,24 @@ +/*------------------------------------------------------------------------- + * + * aio_init.h + * AIO initialization - kept separate as initialization sites don't need to + * know about AIO itself and AIO users don't need to know about initialization. + * + * + * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * src/include/storage/aio_init.h + * + *------------------------------------------------------------------------- + */ +#ifndef AIO_INIT_H +#define AIO_INIT_H + + +extern Size AioShmemSize(void); +extern void AioShmemInit(void); + +extern void pgaio_init_backend(void); + +#endif /* AIO_INIT_H */ diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 532d6642bb4..aa859c92085 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -314,6 +314,7 @@ extern PGDLLIMPORT bool optimize_bounded_sort; */ extern PGDLLIMPORT const struct config_enum_entry archive_mode_options[]; extern PGDLLIMPORT const struct config_enum_entry dynamic_shared_memory_options[]; +extern PGDLLIMPORT const struct config_enum_entry io_method_options[]; extern PGDLLIMPORT const struct config_enum_entry recovery_target_action_options[]; extern PGDLLIMPORT const struct config_enum_entry wal_level_options[]; extern PGDLLIMPORT const struct config_enum_entry wal_sync_method_options[]; diff --git a/src/backend/storage/aio/Makefile b/src/backend/storage/aio/Makefile index 2f29a9ec4d1..eaeaeeee8e3 100644 --- a/src/backend/storage/aio/Makefile +++ b/src/backend/storage/aio/Makefile @@ -9,6 +9,8 @@ top_builddir = ../../../.. include $(top_builddir)/src/Makefile.global OBJS = \ + aio.o \ + aio_init.o \ read_stream.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/storage/aio/aio.c b/src/backend/storage/aio/aio.c new file mode 100644 index 00000000000..f68cbc2b3f4 --- /dev/null +++ b/src/backend/storage/aio/aio.c @@ -0,0 +1,36 @@ +/*------------------------------------------------------------------------- + * + * aio.c + * AIO - Core Logic + * + * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * IDENTIFICATION + * src/backend/storage/aio/aio.c + * + *------------------------------------------------------------------------- + */ + +#include "postgres.h" + +#include "storage/aio.h" +#include "utils/guc.h" + + +/* Options for io_method. */ +const struct config_enum_entry io_method_options[] = { + {"sync", IOMETHOD_SYNC, false}, + {NULL, 0, false} +}; + +/* GUCs */ +int io_method = DEFAULT_IO_METHOD; +int io_max_concurrency = -1; + + + +void +assign_io_method(int newval, void *extra) +{ +} diff --git a/src/backend/storage/aio/aio_init.c b/src/backend/storage/aio/aio_init.c new file mode 100644 index 00000000000..f7ee8270756 --- /dev/null +++ b/src/backend/storage/aio/aio_init.c @@ -0,0 +1,37 @@ +/*------------------------------------------------------------------------- + * + * aio_init.c + * AIO - Subsystem Initialization + * + * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * IDENTIFICATION + * src/backend/storage/aio/aio_init.c + * + *------------------------------------------------------------------------- + */ + +#include "postgres.h" + +#include "storage/aio_init.h" + + + +Size +AioShmemSize(void) +{ + Size sz = 0; + + return sz; +} + +void +AioShmemInit(void) +{ +} + +void +pgaio_init_backend(void) +{ +} diff --git a/src/backend/storage/aio/meson.build b/src/backend/storage/aio/meson.build index 8abe0eb4863..c822fd4ddf7 100644 --- a/src/backend/storage/aio/meson.build +++ b/src/backend/storage/aio/meson.build @@ -1,5 +1,7 @@ # Copyright (c) 2024-2025, PostgreSQL Global Development Group backend_sources += files( + 'aio.c', + 'aio_init.c', 'read_stream.c', ) diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 174eed70367..e11e82fc897 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -37,6 +37,7 @@ #include "replication/slotsync.h" #include "replication/walreceiver.h" #include "replication/walsender.h" +#include "storage/aio_init.h" #include "storage/bufmgr.h" #include "storage/dsm.h" #include "storage/dsm_registry.h" @@ -148,6 +149,7 @@ CalculateShmemSize(int *num_semaphores) size = add_size(size, WaitEventCustomShmemSize()); size = add_size(size, InjectionPointShmemSize()); size = add_size(size, SlotSyncShmemSize()); + size = add_size(size, AioShmemSize()); /* include additional requested shmem from preload libraries */ size = add_size(size, total_addin_request); @@ -340,6 +342,7 @@ CreateOrAttachShmemStructs(void) StatsShmemInit(); WaitEventCustomShmemInit(); InjectionPointShmemInit(); + AioShmemInit(); } /* diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index b491d04de58..8ea50314a4e 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -43,6 +43,7 @@ #include "replication/slot.h" #include "replication/slotsync.h" #include "replication/walsender.h" +#include "storage/aio_init.h" #include "storage/bufmgr.h" #include "storage/fd.h" #include "storage/ipc.h" @@ -626,6 +627,12 @@ BaseInit(void) */ pgstat_initialize(); + /* + * Initialize AIO before infrastructure that might need to actually + * execute AIO. + */ + pgaio_init_backend(); + /* Do local initialization of storage and buffer managers */ InitSync(); smgrinit(); diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index 38cb9e970d5..de524eccad5 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -71,6 +71,7 @@ #include "replication/slot.h" #include "replication/slotsync.h" #include "replication/syncrep.h" +#include "storage/aio.h" #include "storage/bufmgr.h" #include "storage/bufpage.h" #include "storage/large_object.h" @@ -3220,6 +3221,18 @@ struct config_int ConfigureNamesInt[] = NULL, NULL, NULL }, + { + {"io_max_concurrency", + PGC_POSTMASTER, + RESOURCES_ASYNCHRONOUS, + gettext_noop("Number of IOs that may be in flight in one backend."), + NULL, + }, + &io_max_concurrency, + -1, -1, 1024, + NULL, NULL, NULL + }, + { {"backend_flush_after", PGC_USERSET, RESOURCES_ASYNCHRONOUS, gettext_noop("Number of pages after which previously performed writes are flushed to disk."), @@ -5236,6 +5249,16 @@ struct config_enum ConfigureNamesEnum[] = NULL, NULL, NULL }, + { + {"io_method", PGC_POSTMASTER, RESOURCES_MEM, + gettext_noop("Selects the method of asynchronous I/O to use."), + NULL + }, + &io_method, + DEFAULT_IO_METHOD, io_method_options, + NULL, assign_io_method, NULL + }, + /* End-of-list marker */ { {NULL, 0, 0, NULL, NULL}, NULL, 0, NULL, NULL, NULL, NULL diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 079efa1baa7..fba0ad4b624 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -843,6 +843,17 @@ autovacuum_worker_slots = 16 # autovacuum worker slots to allocate #include = '...' # include file +#------------------------------------------------------------------------------ +# WIP AIO GUC docs +#------------------------------------------------------------------------------ + +#io_method = sync # (change requires restart) + +#io_max_concurrency = 32 # Max number of IOs that may be in + # flight at the same time in one backend + # (change requires restart) + + #------------------------------------------------------------------------------ # CUSTOMIZED OPTIONS #------------------------------------------------------------------------------ diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index d5aa5c295ae..3bec090428d 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -1266,6 +1266,7 @@ IntoClause InvalMessageArray InvalidationInfo InvalidationMsgsGroup +IoMethod IpcMemoryId IpcMemoryKey IpcMemoryState -- 2.48.1.76.g4e746b1a31.dirty