From 177af4d07a51bac7b785dc02b2abea019d7395e4 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 10 Jun 2024 13:42:58 -0700 Subject: [PATCH v2.1 06/20] aio: Basic subsystem initialization This is just separate to make it easier to review the tendrils into various places. --- src/include/storage/aio.h | 41 +++++++++++++++++ src/include/storage/aio_init.h | 26 +++++++++++ src/backend/postmaster/postmaster.c | 8 ++++ src/backend/storage/aio/Makefile | 2 + src/backend/storage/aio/aio.c | 32 +++++++++++++ src/backend/storage/aio/aio_init.c | 46 +++++++++++++++++++ src/backend/storage/aio/meson.build | 2 + src/backend/storage/ipc/ipci.c | 3 ++ src/backend/tcop/postgres.c | 7 +++ src/backend/utils/init/miscinit.c | 3 ++ src/backend/utils/init/postinit.c | 3 ++ src/backend/utils/misc/guc_tables.c | 11 +++++ src/backend/utils/misc/postgresql.conf.sample | 7 +++ src/tools/pgindent/typedefs.list | 1 + 14 files changed, 192 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..1e4dfd07e89 --- /dev/null +++ b/src/include/storage/aio.h @@ -0,0 +1,41 @@ +/*------------------------------------------------------------------------- + * + * aio.h + * Main AIO interface + * + * + * Portions Copyright (c) 1996-2024, 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 + + +#include "utils/guc_tables.h" + + +/* GUC related */ +extern void assign_io_method(int newval, void *extra); + + +/* Enum for io_method GUC. */ +typedef enum IoMethod +{ + IOMETHOD_SYNC = 0, +} IoMethod; + + +/* We'll default to synchronous execution. */ +#define DEFAULT_IO_METHOD IOMETHOD_SYNC + + +/* GUCs */ +extern const struct config_enum_entry io_method_options[]; +extern int io_method; + + +#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..5bcfb8a9d58 --- /dev/null +++ b/src/include/storage/aio_init.h @@ -0,0 +1,26 @@ +/*------------------------------------------------------------------------- + * + * 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-2024, 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_postmaster_init(void); +extern void pgaio_postmaster_child_init_local(void); +extern void pgaio_postmaster_child_init(void); + +#endif /* AIO_INIT_H */ diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 96bc1d1cfed..70c5ce19f6e 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -111,6 +111,7 @@ #include "replication/logicallauncher.h" #include "replication/slotsync.h" #include "replication/walsender.h" +#include "storage/aio_init.h" #include "storage/fd.h" #include "storage/ipc.h" #include "storage/pmsignal.h" @@ -941,6 +942,13 @@ PostmasterMain(int argc, char *argv[]) ExitPostmaster(0); } + /* + * As AIO might create internal FDs, and will trigger shared memory + * allocations, need to do this before reset_shared() and + * set_max_safe_fds(). + */ + pgaio_postmaster_init(); + /* * Set up shared memory and semaphores. * 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..d831c772960 --- /dev/null +++ b/src/backend/storage/aio/aio.c @@ -0,0 +1,32 @@ +/*------------------------------------------------------------------------- + * + * aio.c + * Asynchronous I/O subsytem. + * + * Portions Copyright (c) 1996-2024, 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" + + +/* Options for io_method. */ +const struct config_enum_entry io_method_options[] = { + {"sync", IOMETHOD_SYNC, false}, + {NULL, 0, false} +}; + +int io_method = DEFAULT_IO_METHOD; + + +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..1c277a7eb3b --- /dev/null +++ b/src/backend/storage/aio/aio_init.c @@ -0,0 +1,46 @@ +/*------------------------------------------------------------------------- + * + * aio_init.c + * Asynchronous I/O subsytem - Initialization + * + * Portions Copyright (c) 1996-2024, 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_postmaster_init(void) +{ +} + +void +pgaio_postmaster_child_init(void) +{ +} + +void +pgaio_postmaster_child_init_local(void) +{ +} diff --git a/src/backend/storage/aio/meson.build b/src/backend/storage/aio/meson.build index 10e1aa3b20b..8d20759ebf8 100644 --- a/src/backend/storage/aio/meson.build +++ b/src/backend/storage/aio/meson.build @@ -1,5 +1,7 @@ # Copyright (c) 2024, 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 6caeca3a8e6..f0227a12a7d 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -39,6 +39,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" @@ -152,6 +153,7 @@ CalculateShmemSize(int *num_semaphores) size = add_size(size, InjectionPointShmemSize()); size = add_size(size, SlotSyncShmemSize()); size = add_size(size, WaitLSNShmemSize()); + size = add_size(size, AioShmemSize()); /* include additional requested shmem from preload libraries */ size = add_size(size, total_addin_request); @@ -339,6 +341,7 @@ CreateOrAttachShmemStructs(void) WaitEventCustomShmemInit(); InjectionPointShmemInit(); WaitLSNShmemInit(); + AioShmemInit(); } /* diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 8bc6bea1135..4dc46b17b41 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -61,6 +61,7 @@ #include "replication/slot.h" #include "replication/walsender.h" #include "rewrite/rewriteHandler.h" +#include "storage/aio_init.h" #include "storage/bufmgr.h" #include "storage/ipc.h" #include "storage/pmsignal.h" @@ -4198,6 +4199,12 @@ PostgresSingleUserMain(int argc, char *argv[], */ InitProcess(); + /* AIO is needed during InitPostgres() */ + pgaio_postmaster_init(); + pgaio_postmaster_child_init_local(); + + set_max_safe_fds(); + /* * Now that sufficient infrastructure has been initialized, PostgresMain() * can do the rest. diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 537d92c0cfd..b8fa2e64ffe 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -40,6 +40,7 @@ #include "postmaster/interrupt.h" #include "postmaster/postmaster.h" #include "replication/slotsync.h" +#include "storage/aio_init.h" #include "storage/fd.h" #include "storage/ipc.h" #include "storage/latch.h" @@ -137,6 +138,8 @@ InitPostmasterChild(void) InitProcessLocalLatch(); InitializeLatchWaitSet(); + pgaio_postmaster_child_init_local(); + /* * If possible, make this process a group leader, so that the postmaster * can signal any child processes too. Not all processes will have diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 11128ea461c..f1151645242 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" @@ -589,6 +590,8 @@ BaseInit(void) */ pgstat_initialize(); + pgaio_postmaster_child_init(); + /* 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 686309db58b..a4b3c7c62bd 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" @@ -5196,6 +5197,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 667e0dc40a2..3a5e307c9dc 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -835,6 +835,13 @@ #include = '...' # include file +#------------------------------------------------------------------------------ +# WIP AIO GUC docs +#------------------------------------------------------------------------------ + +#io_method = sync # (change requires restart) + + #------------------------------------------------------------------------------ # CUSTOMIZED OPTIONS #------------------------------------------------------------------------------ diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index df3f336bec0..2681dd51bb7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -1258,6 +1258,7 @@ IntervalAggState IntoClause InvalMessageArray InvalidationMsgsGroup +IoMethod IpcMemoryId IpcMemoryKey IpcMemoryState -- 2.45.2.827.g557ae147e6