Commit 3b5be16c authored Aug 20, 2019 by He Zhe Committed by Jessica Yu Aug 21, 2019

modules: page-align module section allocations only for arches supporting strict module rwx



We should keep the case of "#define debug_align(X) (X)" for all arches
without CONFIG_HAS_STRICT_MODULE_RWX ability, which would save people, who
are sensitive to system size, a lot of memory when using modules,
especially for embedded systems. This is also the intention of the
original #ifdef... statement and still valid for now.

Note that this still keeps the effect of the fix of the following commit,
38f054d5 ("modules: always page-align module section allocations"),
since when CONFIG_ARCH_HAS_STRICT_MODULE_RWX is enabled, module pages are
aligned.

Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Jessica Yu <jeyu@kernel.org>

parent 38f054d5

kernel/module.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -64,9 +64,14 @@

		/*
		* Modules' sections will be aligned on page boundaries
		* to ensure complete separation of code and data
		* to ensure complete separation of code and data, but
		* only when CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
		*/
		#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX
		# define debug_align(X) ALIGN(X, PAGE_SIZE)
		#else
		# define debug_align(X) (X)
		#endif

		/* If this is set, the section belongs in the init part of the module */
		#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))

Admin message