From patchwork Mon May 20 17:58:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oreoluwa Babatunde X-Patchwork-Id: 13668538 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5FDB13398E; Mon, 20 May 2024 17:58:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716227936; cv=none; b=mvSvlUb8PgPmkIP8nf++qf/lFe6nLZbQ8fcioY1NSUHMi6I1i/Xwz6kd0diBGmmZDA0LBSgQhbJD4o+Yl5IbwalFQgHpYeRAAyH0Ra3s5U4K238Xas4KG+Sf16HeLVXwvI1DSsnt/tPbHjShI8DFz+GfuYppBfovTNOJWlf4ojc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716227936; c=relaxed/simple; bh=Az6oPsSbddKjSIMd0ogzNPgJLStuBzGY4FR/SoElx8s=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=YlX22ctgEi25hapBAsobGCmW3rNg1iU8KGyRV121/WtxEQ0OXFZN8aI5fj+iJ/6oWU7BhWNo2rXMOaz44iJ8RJkZYsy+DajgV6LtVWr54nhW+f0M2k2QcKrW/Kw3bSJ741kmqN2qhSb5HdJM5jLRNYq/R2HHaAy3EvaqvVetHfo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=APV8fBxL; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="APV8fBxL" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44KBvvNA026154; Mon, 20 May 2024 17:58:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=qcppdkim1; bh=f7Et55Q dGx0KtAjxNrsmLToiOz3ap//IAyD25kq6tKE=; b=APV8fBxLP5hA6UdmAGSmvhd LgSouTCYDa16fDEtETZ3BDaPRmYNwxcMlv+oeAjPsFthlXyT0Y3cjAOebYygGUFk lgugJgDwK/iA1yuJta9Vbnz8uQwmRz98YwdCh7gEO/Wq9txSYhrVnAALu8ypRFC+ YYjTQTxm49aidYPflAOQus+VjiKhj7SxHtGE9jte72rKftR49UrmzvU8t9gM2Bwg pZxVmpsXjLT5yqg8h0bMaoUli/a2IBw7kJbIEAVpwnngk0RBmhrQ6aJJQ3fh6sxH r/ibTTGT6OECWa5Wn1J+hpVE5IAaTw1+7x8l8mfNbZTbMEBf8lFfBeSIDpwvWjQ= = Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3y6pqc44su-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 May 2024 17:58:32 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 44KHwVkZ032189 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 May 2024 17:58:31 GMT Received: from hu-obabatun-lv.qualcomm.com (10.49.16.6) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Mon, 20 May 2024 10:58:25 -0700 From: Oreoluwa Babatunde To: , , CC: , , , , Oreoluwa Babatunde Subject: [PATCH v3] sh: Restructure setup code to reserve memory regions earlier Date: Mon, 20 May 2024 10:58:02 -0700 Message-ID: <20240520175802.2002183-1-quic_obabatun@quicinc.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-sh@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: VQsE9DgVI4Kv9VcATw2jn3mQiSPwiHeJ X-Proofpoint-GUID: VQsE9DgVI4Kv9VcATw2jn3mQiSPwiHeJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-20_09,2024-05-17_03,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 phishscore=0 priorityscore=1501 bulkscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405200143 The unflatten_device_tree() function contains a call to memblock_alloc(). This is a problem because this allocation is done before any of the reserved memory regions are set aside in paging_init(). As a result, there is a possibility for memblock to unknowingly allocate from any of the memory regions that are meant to be reserved. Hence, restructure the setup code to set aside reserved memory regions before any allocations are done using memblock. Signed-off-by: Oreoluwa Babatunde --- v3: - Instead of moving all of paging_init(), move only the parts that are responsible for setting aside the reserved memory regions. v2: https://lore.kernel.org/all/20240423233150.74302-1-quic_obabatun@quicinc.com/ - Added Rob Herrings Reviewed-by. - cc Andrew Morton to assist with merging this for sh architecture. Similar change made for loongarch and openrisc in v1 have already been merged. v1: https://lore.kernel.org/all/1707524971-146908-4-git-send-email-quic_obabatun@quicinc.com/ arch/sh/include/asm/setup.h | 1 - arch/sh/kernel/setup.c | 43 +++++++++++++++++++++++++++++++++++- arch/sh/mm/init.c | 44 ------------------------------------- 3 files changed, 42 insertions(+), 46 deletions(-) diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h index fc807011187f..5feed99b9b7a 100644 --- a/arch/sh/include/asm/setup.h +++ b/arch/sh/include/asm/setup.h @@ -19,7 +19,6 @@ #define COMMAND_LINE ((char *) (PARAM+0x100)) void sh_mv_setup(void); -void check_for_initrd(void); void per_cpu_trap_init(void); #endif /* _SH_SETUP_H */ diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 620e5cf8ae1e..f5b6078173c9 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -114,7 +114,7 @@ static int __init early_parse_mem(char *p) } early_param("mem", early_parse_mem); -void __init check_for_initrd(void) +static void __init check_for_initrd(void) { #ifdef CONFIG_BLK_DEV_INITRD unsigned long start, end; @@ -172,6 +172,42 @@ void __init check_for_initrd(void) #endif } +static void __init early_reserve_mem(void) +{ + unsigned long start_pfn; + u32 zero_base = (u32)__MEMORY_START + (u32)PHYSICAL_OFFSET; + u32 start = zero_base + (u32)CONFIG_ZERO_PAGE_OFFSET; + + /* + * Partially used pages are not usable - thus + * we are rounding upwards: + */ + start_pfn = PFN_UP(__pa(_end)); + + /* + * Reserve the kernel text and Reserve the bootmem bitmap. We do + * this in two steps (first step was init_bootmem()), because + * this catches the (definitely buggy) case of us accidentally + * initializing the bootmem allocator with an invalid RAM area. + */ + memblock_reserve(start, (PFN_PHYS(start_pfn) + PAGE_SIZE - 1) - start); + + /* + * Reserve physical pages below CONFIG_ZERO_PAGE_OFFSET. + */ + if (CONFIG_ZERO_PAGE_OFFSET != 0) + memblock_reserve(zero_base, CONFIG_ZERO_PAGE_OFFSET); + + /* + * Handle additional early reservations + */ + check_for_initrd(); + reserve_crashkernel(); + + if (sh_mv.mv_mem_reserve) + sh_mv.mv_mem_reserve(); +} + #ifndef CONFIG_GENERIC_CALIBRATE_DELAY void calibrate_delay(void) { @@ -319,9 +355,14 @@ void __init setup_arch(char **cmdline_p) sh_mv_setup(); + sh_mv.mv_mem_init(); + /* Let earlyprintk output early console messages */ sh_early_platform_driver_probe("earlyprintk", 1, 1); + /* set aside reserved memory regions */ + early_reserve_mem(); + #ifdef CONFIG_OF_EARLY_FLATTREE #ifdef CONFIG_USE_BUILTIN_DTB unflatten_and_copy_device_tree(); diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index bf1b54055316..4559f5bea782 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -242,55 +242,11 @@ static void __init do_init_bootmem(void) sparse_init(); } -static void __init early_reserve_mem(void) -{ - unsigned long start_pfn; - u32 zero_base = (u32)__MEMORY_START + (u32)PHYSICAL_OFFSET; - u32 start = zero_base + (u32)CONFIG_ZERO_PAGE_OFFSET; - - /* - * Partially used pages are not usable - thus - * we are rounding upwards: - */ - start_pfn = PFN_UP(__pa(_end)); - - /* - * Reserve the kernel text and Reserve the bootmem bitmap. We do - * this in two steps (first step was init_bootmem()), because - * this catches the (definitely buggy) case of us accidentally - * initializing the bootmem allocator with an invalid RAM area. - */ - memblock_reserve(start, (PFN_PHYS(start_pfn) + PAGE_SIZE - 1) - start); - - /* - * Reserve physical pages below CONFIG_ZERO_PAGE_OFFSET. - */ - if (CONFIG_ZERO_PAGE_OFFSET != 0) - memblock_reserve(zero_base, CONFIG_ZERO_PAGE_OFFSET); - - /* - * Handle additional early reservations - */ - check_for_initrd(); - reserve_crashkernel(); -} - void __init paging_init(void) { unsigned long max_zone_pfns[MAX_NR_ZONES]; unsigned long vaddr, end; - sh_mv.mv_mem_init(); - - early_reserve_mem(); - - /* - * Once the early reservations are out of the way, give the - * platforms a chance to kick out some memory. - */ - if (sh_mv.mv_mem_reserve) - sh_mv.mv_mem_reserve(); - memblock_enforce_memory_limit(memory_limit); memblock_allow_resize();