Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753147AbcLFIpr (ORCPT ); Tue, 6 Dec 2016 03:45:47 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:46284 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751471AbcLFIpp (ORCPT ); Tue, 6 Dec 2016 03:45:45 -0500 X-AuditID: cbfee61a-f79916d0000062de-e3-584678253274 From: Maninder Singh To: linux@armlinux.org.uk, nicolas.pitre@linaro.org, ssantosh@kernel.org, panand@redhat.com, arnd@arndb.de, chris.brandt@renesas.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, pankaj.m@samsung.com, ajeet.y@samsung.com, Maninder Singh , Vaneet Narang Subject: [PATCH 1/1] arm/module: maximum utilization of module area. Date: Tue, 06 Dec 2016 13:59:35 +0530 Message-id: <1481012975-44478-1-git-send-email-maninder1.s@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeLIzCtJLcpLzFFi42I5/e+xgK5qhVuEwbz3ohYvXk1gsfg76Ri7 xfzpvSwWmx5fY7W4vGsOm8WhqXsZLQ7Pb2Ox+PTsH7vFnNUvGC3uvdnKZHFn82ZWi0Mn5zI6 8HhcvnaR2eP3r0mMHptWdbJ53Lm2h81j85J6j/f7rrJ5fDszkcWjb8sqRo/Pm+QCOKPcbDJS E1NSixRS85LzUzLz0m2VQkPcdC2UFPISc1NtlSJ0fUOClBTKEnNKgTwjAzTg4BzgHqykb5fg lrFu5haWgsXCFf3vDzM2MD7n72Lk5JAQMJFonNXJCGGLSVy4t56ti5GLQ0hgKaPEhCv7WCGc n4wSj7+0sIJUsQnoSazatYcFJCEi0MYoceD9D3YQh1ngKFDLm0ssIFXCAi4Sb2c8ZAOxWQRU JT4uPsIOYvMKuEs8+byFDWKfnMTJY5NZJzByL2BkWMUokVqQXFCclJ5rmJdarlecmFtcmpeu l5yfu4kRHAHPpHYwHtzlfohRgINRiYf3Q4NrhBBrYllxZe4hRgkOZiURXoZstwgh3pTEyqrU ovz4otKc1OJDjKZAB0xklhJNzgdGZ15JvKGJuYm5sYGFuaWliZGSOG/j7GfhQgLpiSWp2amp BalFMH1MHJxSDYzzQ2TO7JlzfW/+W7uvl+JlymYxXK3O33two/OazJnOxcxnIv+3WVzhvL8j olS3XLjgw1/Gn4szP2j3KcdXnMjwsZNii3RdMVU7y/SnRV7ow9eSlyTn/Ts++9q1JbtFE2bz f7d+WiOZsNXi+hPOlPwNoS2prPc7GvY8Yf2i/nmG7k6PpZE9sQVKLMUZiYZazEXFiQDuGMWS lgIAAA== X-MTR: 20000000000000000@CPGS Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2388 Lines: 77 This patch defines new macro MODULE_START to ensure kernel text and module remains within 32 MB of address range. Tried this patch by inserting 20 MB size module on 4.1 kernel:- Earlier:- ========== sh# insmod size.ko .... insmod: ERROR: could not insert module size.ko: Cannot allocate memory sh# With this patch =============== sh# insmod size.ko ... sh# lsmod Module Size Used by size 20972425 0 Signed-off-by: Vaneet Narang Signed-off-by: Maninder Singh Reviewed-by: Ajeet Yadav --- arch/arm/include/asm/memory.h | 4 ++-- arch/arm/kernel/module.c | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 76cbd9c..1a0a6e5 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -37,7 +37,7 @@ * TASK_SIZE - the maximum size of a user space task. * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area */ -#define TASK_SIZE (UL(CONFIG_PAGE_OFFSET) - UL(SZ_16M)) +#define TASK_SIZE (UL(CONFIG_PAGE_OFFSET) - UL(SZ_32M)) #define TASK_UNMAPPED_BASE ALIGN(TASK_SIZE / 3, SZ_16M) /* @@ -50,7 +50,7 @@ * and PAGE_OFFSET - it must be within 32MB of the kernel text. */ #ifndef CONFIG_THUMB2_KERNEL -#define MODULES_VADDR (PAGE_OFFSET - SZ_16M) +#define MODULES_VADDR (PAGE_OFFSET - SZ_32M) #else /* smaller range for Thumb-2 symbols relocation (2^24)*/ #define MODULES_VADDR (PAGE_OFFSET - SZ_8M) diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 4f14b5c..b8e1f9c 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c @@ -35,12 +35,19 @@ */ #undef MODULES_VADDR #define MODULES_VADDR (((unsigned long)_exiprom + ~PMD_MASK) & PMD_MASK) +#define MODULES_START MODULES_VADDR +#else +#ifndef CONFIG_THUMB2_KERNEL +#define MODULES_START ALIGN((unsigned long)_etext - SZ_32M, PAGE_SIZE) +#else +#define MODULES_START MODULES_VADDR +#endif #endif #ifdef CONFIG_MMU void *module_alloc(unsigned long size) { - void *p = __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, + void *p = __vmalloc_node_range(size, 1, MODULES_START, MODULES_END, GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE, __builtin_return_address(0)); if (!IS_ENABLED(CONFIG_ARM_MODULE_PLTS) || p) -- 1.9.1