Message-ID: <c99abca7-8c3f-94da-3f0e-e4b9872d2db0@oracle.com>
Date:   Mon, 13 Dec 2021 08:34:03 -0600
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0)
 Gecko/20100101 Thunderbird/91.4.0
Subject: Re: [PATCH v17 08/10] of: fdt: Aggregate the processing of
 "linux,usable-memory-range"
Content-Language: en-US
To:     Zhen Lei <thunder.leizhen@huawei.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        x86@kernel.org, "H . Peter Anvin" <hpa@zytor.com>,
        linux-kernel@vger.kernel.org, Dave Young <dyoung@redhat.com>,
        Baoquan He <bhe@redhat.com>, Vivek Goyal <vgoyal@redhat.com>,
        Eric Biederman <ebiederm@xmission.com>,
        kexec@lists.infradead.org,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>,
        linux-arm-kernel@lists.infradead.org,
        Rob Herring <robh+dt@kernel.org>,
        Frank Rowand <frowand.list@gmail.com>,
        devicetree@vger.kernel.org, Jonathan Corbet <corbet@lwn.net>,
        linux-doc@vger.kernel.org
Cc:     Randy Dunlap <rdunlap@infradead.org>,
        Feng Zhou <zhoufeng.zf@bytedance.com>,
        Kefeng Wang <wangkefeng.wang@huawei.com>,
        Chen Zhou <dingguo.cz@antgroup.com>
References: <20211210065533.2023-1-thunder.leizhen@huawei.com>
 <20211210065533.2023-9-thunder.leizhen@huawei.com>
From:   john.p.donnelly@oracle.com
In-Reply-To: <20211210065533.2023-9-thunder.leizhen@huawei.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UE1oc1hVRHI0Vm5aK2h6WER1cG5CWGE5NnNJS1UrY3NOOXlFN3ZIZ3NySnNG?=
 =?utf-8?B?L2pSMVZLSk9zTTlrdy9kQ1B1YU1hYysyNVBGQlRqMitTZnNmRlMwS1ErM2E2?=
 =?utf-8?B?VkRQNzNHYkhQWVllUVo3UE1hZVdoZWRZN2Z6Y2VNbytOQUpmdUE5aS9yMUdD?=
 =?utf-8?B?c3EwQ3k1UzZNNU9MZXQxeDNJY095M2JIL1lSRWlVeEQ3RGt5aTFBOTBvSFlk?=
 =?utf-8?B?SU1XQVpNUUdQOFNlMFR6bmxaVlBBb3hSZFF3NGxZQ3p6UnBlN2MrWUl2RmhD?=
 =?utf-8?B?bXVVRzJ1SzVzTEVLUWZBb2FZK2dzRlc5aXZFNzVIMk9iS2tRUGV4MmdLZGg3?=
 =?utf-8?B?N1VlUmNGcDA4amNvL3lDQUVsUUtnSGpHNU9wQ0xTNStKb2l0VjhBQTJuTEpl?=
 =?utf-8?B?a1IzYng1K3NuWkpUTEFiVlNuQ0ZEYS9TWjBhQWV0QThBcllrWlAwNy9Nb2x0?=
 =?utf-8?B?bytKeDd5ZVh3UTY4Z2hzWlFBZDVpUUcxWWlzVUUvWkhPTm9HcXpsWFE4ZU1C?=
 =?utf-8?B?eGJ3N0l0ZHpYcjFVcjE0SUY0OFlDS28zYkRldXdBdVgvZnhacktOQit2NnJn?=
 =?utf-8?B?SS9vQlNSOHBXSUtzYTJ1T0ZBam94eGN6TGJYK1AxczlHUTNBeVU0NHV4ZVRx?=
 =?utf-8?B?NFhNSE8rZGVPUFRXaE1BMm16TUhhemVKaU11dVBzdGQyUVN0Q29aUzEvZUsx?=
 =?utf-8?B?bzVYQzI3RDdDa2FpdGhFWlNPdWpsVHhEUys1eGNiTzV6ZDhRMHlDZzJjZXZO?=
 =?utf-8?B?WWw2YVFsVFdOZWlaZXN5d3RHR2dmZzRjWkIwM3JaOS9MYzBZWXhzLzdKS0Js?=
 =?utf-8?B?bkpHUnVTVTAreFY3OHBxTEtOQ3U0SWxwSG5CcmxjckQ2cjdNYlIwamJCYXZE?=
 =?utf-8?B?T1FOZUpXeGNRbWs1b0dYb1MrdzJwWGR0OXRpc2dyb0VzbzdSaDl2MXZYWHE3?=
 =?utf-8?B?M2xCVjZqeFYzS2hrcEI2WXptSGxQUTdYYTkrWHdNOTNUaHpUWUxLSVBGK05G?=
 =?utf-8?B?Qm5wV0ZSQ3ZvRmdaOXMrNlFwWHk3eFhMTktGbFh2MGdRSXNCeFZuWDVENlJo?=
 =?utf-8?B?K1owdTc0dnVrMDgzRmJjUG5BRTR3bU1GTEdqeEZVNFV1Q1J0UzU5RXJnYW9v?=
 =?utf-8?B?YnNFOGRNRHFyQ2RSYWpoWHlsc0cvcHlFSjg5SjVlVzFNTVc4Rk1xZHBrOXli?=
 =?utf-8?B?bE1OcjgvTlRGMHZIc1VuZExSUS95eWZ2ZGUrS2QzQ0QwMjlVUmFwb3VtWDE3?=
 =?utf-8?B?NlB5N0R0QVpHM3BnRVFmOThYVXJDNWZVQ0FMVExqVDBFdXczbmN0cnM5MWs2?=
 =?utf-8?B?ZWkwVGl6MW5nOGFJcWpxdXhCSyt6MmpxWlRlbURMWFR1azIyWkJWbDE2UUNZ?=
 =?utf-8?B?eGk5MjFVQjVZVlo1YWhKeXZmd1dJSHRmOXI0dVdNU3gzY2EzNlBDUWs1Wm4x?=
 =?utf-8?B?WnViS0x3M3cyQkZPM2Z6ajVUQm9Ic04wVVN3TWFqVzNXai9RMmU5UEJQRTNl?=
 =?utf-8?B?KzVkNjJMWVE5VldzU0FPZUlsQklrdWI1UENSNnBtRUFCZlJlcHpWOSswWlN6?=
 =?utf-8?B?UjU1aWpSOFZlUURRMnA5UVJMSlhWQ3J0RlF6akdWUjh5WFVBVXErK2FLVGNt?=
 =?utf-8?B?MWQ4NkNGdnpMSXNlUGVKYWxXdDlhSjFyL3pkZ3gway92bENEUUE5QUEvTnU1?=
 =?utf-8?B?OWo4MTkzN0EyQ1Y5R29HVUc3VlMvSkU5ZkdSMThnQUg2YzVmdmNEaWd5dmZT?=
 =?utf-8?B?VXRheU54OVZyaDFKT05qTzdWYTVPSWhGMW9keUM4QXFyTEUwMm1uQzRFUHN5?=
 =?utf-8?B?Zm5CbWRzR21Id3QvdnU3dG1KU05pWmdjaHJjbVkrbGtvYVRPaDBLc2ZoWFJE?=
 =?utf-8?B?OG1oU0xvd0FQa29rNm9TK25JMzAxbEhLalArUGRUQmh3KzBDSFNyc25YYWI4?=
 =?utf-8?B?bGNXbFN0OWZCVVpENzJXRzJIUStaVGFISy9pTHIyVEhyOGpoZmY2NDVFamdz?=
 =?utf-8?B?d1lpWkdnbk1qWlN4YXYreGk4YzI3QWdvWmUrcHk2ZmlPM1NaSm43U0oyYzZs?=
 =?utf-8?B?b0NiMU8yeC9LQTN4cjVjYXh4cllZVzg2TW5PN3BMQnlIbU9BcnVhc21vRlJs?=
 =?utf-8?B?M3Z2NGxxQ21DdHZNdVR5cFg5TWtWd0FUbXNseDg2bnMrWm4weXovOGlGRW1k?=
 =?utf-8?B?aURFYkQ5VVowbWlkQkc1dk5qNTc1S3lYbkFGSklrdlgzRnhLZS9GaEJVR29k?=
 =?utf-8?B?SHNlWlgzemQ1U1kvbVg1a2tnQW93PT0=?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5a79451d-1786-4bb0-23f1-08d9be45a074
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4722.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 14:34:10.6122
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oPUWLw48VmxANDrW6MleWqttB5d2yAS36zPQd7wqrHdQXluLygGxLarbQeaI3iCHRPyQSScsj99BT3+1B9tuxz6cJPF+tdi+vlGVBaj5TG0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1629
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10196 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 suspectscore=0
 malwarescore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2112130092
X-Proofpoint-ORIG-GUID: ZoEADiMSX3wXTsbe8dEkzjoNLlUVhksL
X-Proofpoint-GUID: ZoEADiMSX3wXTsbe8dEkzjoNLlUVhksL
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 12/10/21 12:55 AM, Zhen Lei wrote:
> Currently, we parse the "linux,usable-memory-range" property in
> early_init_dt_scan_chosen(), to obtain the specified memory range of the
> crash kernel. We then reserve the required memory after
> early_init_dt_scan_memory() has identified all available physical memory.
> Because the two pieces of code are separated far, the readability and
> maintainability are reduced. So bring them together.
> 
> Suggested-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> Tested-by: Dave Kleikamp <dave.kleikamp@oracle.com>

  Acked-by: John Donnelly <john.p.donnelly@oracle.com>

> ---
>   drivers/of/fdt.c | 15 +++++++++++----
>   1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> index bdca35284cebd56..37b477a51175359 100644
> --- a/drivers/of/fdt.c
> +++ b/drivers/of/fdt.c
> @@ -965,8 +965,7 @@ static void __init early_init_dt_check_for_elfcorehdr(unsigned long node)
>   		 elfcorehdr_addr, elfcorehdr_size);
>   }
>   
> -static phys_addr_t cap_mem_addr;
> -static phys_addr_t cap_mem_size;
> +static unsigned long chosen_node_offset = -FDT_ERR_NOTFOUND;
>   
>   /**
>    * early_init_dt_check_for_usable_mem_range - Decode usable memory range
> @@ -977,6 +976,11 @@ static void __init early_init_dt_check_for_usable_mem_range(unsigned long node)
>   {
>   	const __be32 *prop;
>   	int len;
> +	phys_addr_t cap_mem_addr;
> +	phys_addr_t cap_mem_size;
> +
> +	if ((long)node < 0)
> +		return;
>   
>   	pr_debug("Looking for usable-memory-range property... ");
>   
> @@ -989,6 +993,8 @@ static void __init early_init_dt_check_for_usable_mem_range(unsigned long node)
>   
>   	pr_debug("cap_mem_start=%pa cap_mem_size=%pa\n", &cap_mem_addr,
>   		 &cap_mem_size);
> +
> +	memblock_cap_memory_range(cap_mem_addr, cap_mem_size);
>   }
>   
>   #ifdef CONFIG_SERIAL_EARLYCON
> @@ -1137,9 +1143,10 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
>   	    (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
>   		return 0;
>   
> +	chosen_node_offset = node;
> +
>   	early_init_dt_check_for_initrd(node);
>   	early_init_dt_check_for_elfcorehdr(node);
> -	early_init_dt_check_for_usable_mem_range(node);
>   
>   	/* Retrieve command line */
>   	p = of_get_flat_dt_prop(node, "bootargs", &l);
> @@ -1275,7 +1282,7 @@ void __init early_init_dt_scan_nodes(void)
>   	of_scan_flat_dt(early_init_dt_scan_memory, NULL);
>   
>   	/* Handle linux,usable-memory-range property */
> -	memblock_cap_memory_range(cap_mem_addr, cap_mem_size);
> +	early_init_dt_check_for_usable_mem_range(chosen_node_offset);
>   }
>   
>   bool __init early_init_dt_scan(void *params)