From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> To: Yanfei Xu <yanfei.xu@windriver.com> Cc: rppt@kernel.org, ardb@kernel.org, linus.walleij@linaro.org, akpm@linux-foundation.org, carver4lio@163.com, tiantao6@hisilicon.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] ARM: use a temporary variable to hold maximum vmalloc size Date: Tue, 18 May 2021 13:15:45 +0100 [thread overview] Message-ID: <E1liydV-0004rQ-Ed@rmk-PC.armlinux.org.uk> (raw) In-Reply-To: <20210518120633.GW12395@shell.armlinux.org.uk> We calculate the maximum size of the vmalloc space twice in early_vmalloc(). Use a temporary variable to hold this value. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- arch/arm/mm/mmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 206c345f063e..d932c46a02e0 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1134,6 +1134,7 @@ static unsigned long __initdata vmalloc_min = static int __init early_vmalloc(char *arg) { unsigned long vmalloc_reserve = memparse(arg, NULL); + unsigned long vmalloc_max; if (vmalloc_reserve < SZ_16M) { vmalloc_reserve = SZ_16M; @@ -1141,8 +1142,9 @@ static int __init early_vmalloc(char *arg) vmalloc_reserve >> 20); } - if (vmalloc_reserve > VMALLOC_END - (PAGE_OFFSET + SZ_32M)) { - vmalloc_reserve = VMALLOC_END - (PAGE_OFFSET + SZ_32M); + vmalloc_max = VMALLOC_END - (PAGE_OFFSET + SZ_32M); + if (vmalloc_reserve > vmalloc_max) { + vmalloc_reserve = vmalloc_max; pr_warn("vmalloc area is too big, limiting to %luMB\n", vmalloc_reserve >> 20); } -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> To: Yanfei Xu <yanfei.xu@windriver.com> Cc: rppt@kernel.org, ardb@kernel.org, linus.walleij@linaro.org, akpm@linux-foundation.org, carver4lio@163.com, tiantao6@hisilicon.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] ARM: use a temporary variable to hold maximum vmalloc size Date: Tue, 18 May 2021 13:15:45 +0100 [thread overview] Message-ID: <E1liydV-0004rQ-Ed@rmk-PC.armlinux.org.uk> (raw) In-Reply-To: <20210518120633.GW12395@shell.armlinux.org.uk> We calculate the maximum size of the vmalloc space twice in early_vmalloc(). Use a temporary variable to hold this value. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- arch/arm/mm/mmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 206c345f063e..d932c46a02e0 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1134,6 +1134,7 @@ static unsigned long __initdata vmalloc_min = static int __init early_vmalloc(char *arg) { unsigned long vmalloc_reserve = memparse(arg, NULL); + unsigned long vmalloc_max; if (vmalloc_reserve < SZ_16M) { vmalloc_reserve = SZ_16M; @@ -1141,8 +1142,9 @@ static int __init early_vmalloc(char *arg) vmalloc_reserve >> 20); } - if (vmalloc_reserve > VMALLOC_END - (PAGE_OFFSET + SZ_32M)) { - vmalloc_reserve = VMALLOC_END - (PAGE_OFFSET + SZ_32M); + vmalloc_max = VMALLOC_END - (PAGE_OFFSET + SZ_32M); + if (vmalloc_reserve > vmalloc_max) { + vmalloc_reserve = vmalloc_max; pr_warn("vmalloc area is too big, limiting to %luMB\n", vmalloc_reserve >> 20); } -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-05-18 12:15 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-18 11:12 [PATCH] arm: make the size of vmalloc in cmdline and meminfo uniform Yanfei Xu 2021-05-18 11:12 ` Yanfei Xu 2021-05-18 11:29 ` Russell King (Oracle) 2021-05-18 11:29 ` Russell King (Oracle) 2021-05-18 12:06 ` Russell King (Oracle) 2021-05-18 12:06 ` Russell King (Oracle) 2021-05-18 12:15 ` [PATCH 1/4] ARM: change vmalloc_min to be unsigned long Russell King (Oracle) 2021-05-18 12:15 ` Russell King (Oracle) 2021-05-18 22:09 ` Linus Walleij 2021-05-18 22:09 ` Linus Walleij 2021-05-18 12:15 ` Russell King (Oracle) [this message] 2021-05-18 12:15 ` [PATCH 2/4] ARM: use a temporary variable to hold maximum vmalloc size Russell King (Oracle) 2021-05-18 22:11 ` Linus Walleij 2021-05-18 22:11 ` Linus Walleij 2021-05-18 12:15 ` [PATCH 3/4] ARM: change vmalloc_min to vmalloc_start Russell King (Oracle) 2021-05-18 12:15 ` Russell King (Oracle) 2021-05-18 22:19 ` Linus Walleij 2021-05-18 22:19 ` Linus Walleij 2021-05-18 22:26 ` Nicolas Pitre 2021-05-18 22:26 ` Nicolas Pitre 2021-05-18 22:32 ` Nicolas Pitre 2021-05-18 22:32 ` Nicolas Pitre 2021-05-18 22:34 ` Linus Walleij 2021-05-18 22:34 ` Linus Walleij 2021-05-18 22:38 ` Nicolas Pitre 2021-05-18 22:38 ` Nicolas Pitre 2021-05-28 9:55 ` Russell King (Oracle) 2021-05-28 9:55 ` Russell King (Oracle) 2021-05-19 4:41 ` Xu, Yanfei 2021-05-19 4:41 ` Xu, Yanfei 2021-05-20 9:00 ` Russell King (Oracle) 2021-05-20 9:00 ` Russell King (Oracle) 2021-05-28 2:52 ` Xu, Yanfei 2021-05-28 2:52 ` Xu, Yanfei 2021-05-28 10:00 ` Russell King (Oracle) 2021-05-28 10:00 ` Russell King (Oracle) 2021-05-19 5:25 ` Xu, Yanfei 2021-05-19 5:25 ` Xu, Yanfei 2021-05-18 12:15 ` [PATCH 4/4] ARM: change vmalloc_start to vmalloc_size Russell King (Oracle) 2021-05-18 12:15 ` Russell King (Oracle) 2021-05-18 22:21 ` Linus Walleij 2021-05-18 22:21 ` Linus Walleij 2021-05-19 4:39 ` [PATCH] arm: make the size of vmalloc in cmdline and meminfo uniform Xu, Yanfei 2021-05-19 4:39 ` Xu, Yanfei 2021-05-19 5:32 ` Xu, Yanfei 2021-05-19 5:32 ` Xu, Yanfei 2021-05-20 4:52 ` Alexander Dahl 2021-05-20 4:52 ` Alexander Dahl 2021-05-20 6:50 ` Xu, Yanfei 2021-05-20 6:50 ` Xu, Yanfei 2021-05-28 10:11 ` [PATCH v2 1/6] ARM: change vmalloc_min to be unsigned long Russell King (Oracle) 2021-05-28 10:11 ` Russell King (Oracle) 2021-05-28 13:10 ` Xu, Yanfei 2021-05-28 13:10 ` Xu, Yanfei 2021-05-28 10:11 ` [PATCH v2 2/6] ARM: use a temporary variable to hold maximum vmalloc size Russell King (Oracle) 2021-05-28 10:11 ` Russell King (Oracle) 2021-05-28 13:11 ` Xu, Yanfei 2021-05-28 13:11 ` Xu, Yanfei 2021-05-28 10:11 ` [PATCH v2 3/6] ARM: change vmalloc_min to vmalloc_start Russell King (Oracle) 2021-05-28 10:11 ` Russell King (Oracle) 2021-05-28 12:21 ` Linus Walleij 2021-05-28 12:21 ` Linus Walleij 2021-05-28 13:05 ` Xu, Yanfei 2021-05-28 13:05 ` Xu, Yanfei 2021-05-28 10:11 ` [PATCH v2 4/6] ARM: change vmalloc_start to vmalloc_size Russell King (Oracle) 2021-05-28 10:11 ` Russell King (Oracle) 2021-05-28 12:22 ` Linus Walleij 2021-05-28 12:22 ` Linus Walleij 2021-05-28 13:15 ` Xu, Yanfei 2021-05-28 13:15 ` Xu, Yanfei 2021-05-28 10:11 ` [PATCH v2 5/6] ARM: use "* SZ_1M" rather than "<< 20" Russell King (Oracle) 2021-05-28 10:11 ` Russell King (Oracle) 2021-05-28 12:23 ` Linus Walleij 2021-05-28 12:23 ` Linus Walleij 2021-05-28 13:17 ` Xu, Yanfei 2021-05-28 13:17 ` Xu, Yanfei 2021-05-28 10:11 ` [PATCH v2 6/6] ARM: use MiB for vmalloc sizes Russell King (Oracle) 2021-05-28 10:11 ` Russell King (Oracle) 2021-05-28 12:24 ` Linus Walleij 2021-05-28 12:24 ` Linus Walleij 2021-05-28 13:20 ` Xu, Yanfei 2021-05-28 13:20 ` Xu, Yanfei
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=E1liydV-0004rQ-Ed@rmk-PC.armlinux.org.uk \ --to=rmk+kernel@armlinux.org.uk \ --cc=akpm@linux-foundation.org \ --cc=ardb@kernel.org \ --cc=carver4lio@163.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=rppt@kernel.org \ --cc=tiantao6@hisilicon.com \ --cc=yanfei.xu@windriver.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.