From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753776AbbJaNSK (ORCPT ); Sat, 31 Oct 2015 09:18:10 -0400 Received: from mail-am1on0063.outbound.protection.outlook.com ([157.56.112.63]:37952 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753732AbbJaNSG (ORCPT ); Sat, 31 Oct 2015 09:18:06 -0400 Authentication-Results: spf=fail (sender IP is 212.179.42.66) smtp.mailfrom=ezchip.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=ezchip.com; From: Noam Camus To: CC: , , , , Noam Camus Subject: [PATCH v1 04/20] ARC: Set vmalloc size from configuration Date: Sat, 31 Oct 2015 15:15:11 +0200 Message-ID: <1446297327-16298-5-git-send-email-noamc@ezchip.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1446297327-16298-1-git-send-email-noamc@ezchip.com> References: <1446297327-16298-1-git-send-email-noamc@ezchip.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-11.0.0.1191-8.000.1202-21912.007 X-TM-AS-Result: No--9.768900-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;DB3FFO11FD056;1:r+8oo3XWlkkIEsx4GvFCYvq2ezNeKQo/XQR+PeMSaB7+KXiA8mLc/49dMJ2Ekr2QmoX8f+VkpRHXgjl/V5bX80n8Y845WInDCFxFbwZQ6JIWf2aje7Lvw1oOPrx779/MHZOrwS8e+1D5lFwHoxITPnwoo3ZkYSGHlbtc3qdAroUDozZxZmqHVCqmDpyJDsb6rp0C1vcJUI5BdZudVDWPXUooMd4zfQ5kwZEicw1SVuOX4ZBXCoGmcjTxi+Gxc9s4X0OuwostyLqHjmOnKVSCyiIJ/0XqWDsj4zX8rXsGymhXEs0aTCKNu1Pcm4pvvWos1Cg+wtv6+tFrfDkeHbVQh9v9HZ83PIB0sPzLELsqvhjL0qLPVGT3ZFeK0z23J2IOYMJU6q++AV+z2MkTqL10CQ== X-Forefront-Antispam-Report: CIP:212.179.42.66;CTRY:IL;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(5001970100001)(5007970100001)(85426001)(77096005)(47776003)(86362001)(50226001)(107886002)(87936001)(19580405001)(50466002)(48376002)(33646002)(19580395003)(49486002)(189998001)(2950100001)(2351001)(5003940100001)(11100500001)(5008740100001)(110136002)(229853001)(36756003)(106466001)(4001430100002)(50986999)(104016004)(92566002)(6806005)(76176999)(105606002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM3PR02MB179;H:ezex10.ezchip.com;FPR:;SPF:Fail;PTR:ezmail.ezchip.com;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB179;2:KuYWt7NK6aK/hU7DSnINeebdkA0VS15Ysh4uQXtr8LcQLQw9rxQl9vZ3776gqync7ZjrceUX1XdNPNk5nyE2wSZPy4ZtFWpIK/PdhwXw2l1/A4OCxX4nHiFNwLvEYSqLz0NmwEi1oAZqKTVkQyAvgciKqekQBped42EUg+un6hg=;3:nSBmwnXR6B1lz0+y3Upyh8dY6prmY7iQbwAFA/NLgS1AIptDPq7A6Sp8dR25VhqH60fA8pwJeRR0Qd0kON8B2AxNyqo20y08uG+4FA8mV8rIZyVPc+7YVJPTR+Ic3zNsWfyPXROiqG0ZECoyE2vwtnXvhelA6Vb0YOr6fjgpTIcVcZsFvKRE6pT97ROrLB4PuQNAN5fmejSP/9s1Cogjr9bqKZaorjKDkigp2yRFY10=;25:nAfK+EP08nJa2VBL8nCHuUPp9VL2CObCGHqTgdJIHZxPdcmg5WCu68mRtPOCLAB7zypDCN/uIOaSdSDrgs/APSwjNTdWLyk/ijMKLO9cnyTx8XSe23i5tCcW7WY5sbDrcqihCge/0gAuLTXnhjPueKSYN+fN6dGah/ZH6j4ZixaXVGtYdPRJgy/tsHuD1oUjD/dvdhAHg9As6IjMQJlvdzt4HKukvUaM3kPIY8AlBsNJl5ZUxD0aVBy/8VxgvYzRV4XcVq00Lgzv4JRKwFeLIw==;20:2l2CLvCddi7JzgXtKkNraCNNlqcTT5AdyM6yuFbKnZGNUOet8eMokpLn5Up+kC32iMoe1iiltCQl5dWnxZK+8Abq8wXnCx2Bus94o5XbQO8J0sZbdAyTKbrvv5qnmsSLAP/4sj7DuRX96S0hYDC+NmVbFTBMH+SwAk7fSqo9+3c= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM3PR02MB179; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(121898900299872); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(10201501046)(3002001);SRVR:AM3PR02MB179;BCL:0;PCL:0;RULEID:;SRVR:AM3PR02MB179; X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB179;4:5AtWCv/qHGyJ2TPtkqn/mP+Bm0pgc3P/M5oXBxo3nz7SECE9CBW/voUFWDN+xTwDEdvBITTi3uT0HUuw8Nfmpx5f0oGTtQMjxmIl/RPsBC8Qw1urTn2/06m8b3nyinbZZinAjODBYaXJQ794VKMcwUuYDjOCXOLIkQwk6tPUY0YGMNYkgN2fCsDRMGeNpTUZcIVhABF7pnN6BqY5SL/gxctwddc+Hd7GApsyWGmTIB6k+rlYt/3XnLCY6aNQlZroEBwecC7ofjN3PdWOi3s9bD5DhU/nmqa2/Mskk4JMsdiC5wyhbQ49W2n/15Ym59RRyM2XhaW91MZ2QfQsyAuEuMiqqqUdyo79857ozIY5mnPEOrk30g1OUuxRmiSgtZvI X-Forefront-PRVS: 07467C4D33 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM3PR02MB179;23:lU8tdDfCk67pizB0Dac7FwLf1g1VKfGnvcDkCirUdk?= =?us-ascii?Q?NcyroyBbXSGT11Nc5w9qtxB3MiFGnW4JLahS7b7Vh40qCrHSoJfAEc3PMLZI?= =?us-ascii?Q?95b1gRGVClULK/MEUgWvbF7DUCS0GMHSh6hl8E3KW/+inMkCmaaH9nAQQfRe?= =?us-ascii?Q?OcuIERMwtvGdz1IBAY6k71xF6UzK9OVRgXQeAT7+9UgQdYfMTqtvL/csZ1Nu?= =?us-ascii?Q?h/NH4pE6kAyNKAZ+TzrAWiyh8ESIJtd2Ll8RvP0Po1aMo+qbeTpYPMGrt50e?= =?us-ascii?Q?Jvtoj2/VIvVjcvC0PVJJ5XZ7sT7p4ai0zNdaqRq+RO4eg2A2qRenCx07l3yu?= =?us-ascii?Q?ogjwCGoMPMyNmH4GfG9BoBd7+2HVkCmKcUS9uM24sDmzGGMWlOgcmcXR7/xW?= =?us-ascii?Q?uO0rTWvEJGVyCVy2XDGaXLpPMo6DNdXg5RXEoTlCdxSrlaTK5jLjvDCy7Qn9?= =?us-ascii?Q?Nh20sf6m46FNWdDppDZUNSV/Mon2gBqcLGXdFbDC/vxVGY6oPnvi+gMhduWE?= =?us-ascii?Q?FrsE5MvkXh/BSv71TI8QSE+6AVMZzNQlCfzS1uf2PWCadbgDL3hlM+RVDULc?= =?us-ascii?Q?1pRycBcZaxsiajpprDGDh4NDP8P/jx4LXDIJbSabZHSBkLNXKNH+ee3XgZFZ?= =?us-ascii?Q?dY6Z7oGY8TmTBZKmtamIpLwQxMbalbnw0uom19UlEHggdnzg2y5PQOTJJQU2?= =?us-ascii?Q?xSFQQYsvRwPY2iscSjOnYyBR2C9LmiYtRVP0pqsN1idKCnSl1u/kCs7Ltb/A?= =?us-ascii?Q?tULin+ewi2W2ujiVuHbj+21OlRrBdZW0cEpGg/EVwscqjIRQ4jWQpDS/31Fk?= =?us-ascii?Q?Ta8gcW9mMs7H/LKEsWgPC1QMv+SBChlsT77cXRKOTSPMrWNKouxqfUO12P+H?= =?us-ascii?Q?uaXOIbF/LSWww4uW24afFkyn5nm8e8KqVoseBr+8ehCZgAoYk1l3y1Xel28Q?= =?us-ascii?Q?fuaOy1EeWO49GmZHMd8BNLbaRAgt8szBk+Uq6EJz1mP2KCpQHCApw78aj73r?= =?us-ascii?Q?Oqin3k5Ua8mEU1VK/6mchbQnqLg+wQNgu+YFrsZuEK7Cp2x5Lx6Th1FqJJH4?= =?us-ascii?Q?VeN6bu9Ycd5dFTRSPprRfDypEy?= X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB179;5:pRxaXZQGsgot3t+JxLgRVQDMH8khpaKHlsZx+7ZoZ+A/styQvEuamKfoqvCIxdflYovvB7SqnegUMiXgcXK8whdxyGPQ09io81azEVQWSZYOxfCs6ebC/8D44vFdvif2C/pIN8OkXBgbg6d9NgKreg==;24:vu7H7io3RL6+H6dfUpK9ZWDFUnqxxT5l6WG6+cLupDT6KPD7UplA6nPm8pbtlHEI24pUB9SzzwpNK7QvlTkoY8WxZixUHuRN8ad4YkHlTRk=;20:fUd4yU7uFEKfJeraWtBqoFUHv4TmJTIiPAiWxpC9R66uJeUOBA2Ehx6/tYI+XJRoxCTcHaflPlC/ktMDzrxLFg== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: ezchip.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2015 13:18:01.9657 (UTC) X-MS-Exchange-CrossTenant-Id: 0fc16e0a-3cd3-4092-8b2f-0a42cff122c3 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0fc16e0a-3cd3-4092-8b2f-0a42cff122c3;Ip=[212.179.42.66];Helo=[ezex10.ezchip.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR02MB179 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Noam Camus User space use lower 2G of the virtual address space. However kernel steals upper 512M of this space. This stolen space is used partially for vmalloc and the rest serves as gutter between kernel and user space. The vmalloc size is depend on NR_CPUS since "per cpu" mechanism use vmalloc to allocate chunks for its use. Historically vmalloc size was 256M however it is not enough in case of many CPUs e.g. 4K CPUs. For such case an extra 192M is allocated. We are setting default vmalloc size to be 256M, any addtional space will be taken from kernel/user gutter. Signed-off-by: Noam Camus Acked-by: Vineet Gupta --- arch/arc/Kconfig | 8 ++++++++ arch/arc/include/asm/processor.h | 10 +++++----- arch/arc/mm/tlb.c | 6 ++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 2c2ac3f..689ccb3 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -468,6 +468,14 @@ config ARCH_PHYS_ADDR_T_64BIT config ARCH_DMA_ADDR_T_64BIT bool +config ARC_VMALLOC_SIZE + hex "Vmalloc size (MB)" + range 0 512 + default "256" + help + By default equals to 256MB and the rest of 512MB is + left for gutter between kernel and user space. + config ARC_CURR_IN_REG bool "Dedicate Register r25 for current_task pointer" default y diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h index 4454535..a603301 100644 --- a/arch/arc/include/asm/processor.h +++ b/arch/arc/include/asm/processor.h @@ -113,18 +113,18 @@ extern unsigned int get_wchan(struct task_struct *p); * 0xC000_0000 0xFFFF_FFFF (peripheral uncached space) * ----------------------------------------------------------------------------- */ -#define VMALLOC_START 0x70000000 /* * 1 PGDIR_SIZE each for fixmap/pkmap, 2 PGDIR_SIZE gutter * See asm/highmem.h for details */ -#define VMALLOC_SIZE (PAGE_OFFSET - VMALLOC_START - PGDIR_SIZE * 4) -#define VMALLOC_END (VMALLOC_START + VMALLOC_SIZE) +#define VMALLOC_END (PAGE_OFFSET - PGDIR_SIZE * 4) +#define VMALLOC_SIZE (CONFIG_ARC_VMALLOC_SIZE << 20) +#define VMALLOC_START (VMALLOC_END - VMALLOC_SIZE) -#define USER_KERNEL_GUTTER 0x10000000 +#define TASK_SIZE 0x60000000 -#define TASK_SIZE (VMALLOC_START - USER_KERNEL_GUTTER) +#define USER_KERNEL_GUTTER (VMALLOC_START - TASK_SIZE) #define STACK_TOP TASK_SIZE #define STACK_TOP_MAX STACK_TOP diff --git a/arch/arc/mm/tlb.c b/arch/arc/mm/tlb.c index 0ee7398..0c75a27 100644 --- a/arch/arc/mm/tlb.c +++ b/arch/arc/mm/tlb.c @@ -814,6 +814,12 @@ void arc_mmu_init(void) printk(arc_mmu_mumbojumbo(0, str, sizeof(str))); + /* + * vmalloc size (in MB) sanity check, + * Can't be done in processor.h due to header include depenedencies + */ + BUILD_BUG_ON(!IS_ALIGNED((CONFIG_ARC_VMALLOC_SIZE << 20), PMD_SIZE)); + /* For efficiency sake, kernel is compile time built for a MMU ver * This must match the hardware it is running on. * Linux built for MMU V2, if run on MMU V1 will break down because V1 -- 1.7.1