Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Message-ID: <cc0186d9-29a3-8eff-e38a-95fd4dd9c46f@oracle.com>
Date:   Mon, 21 Mar 2022 08:29:19 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH v21 3/5] arm64: kdump: reimplement crashkernel=X
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,
        John Donnelly <john.p.donnelly@oracle.com>
Cc:     Randy Dunlap <rdunlap@infradead.org>,
        Feng Zhou <zhoufeng.zf@bytedance.com>,
        Kefeng Wang <wangkefeng.wang@huawei.com>,
        Chen Zhou <dingguo.cz@antgroup.com>,
        Dave Kleikamp <dave.kleikamp@oracle.com>
References: <20220227030717.1464-1-thunder.leizhen@huawei.com>
 <20220227030717.1464-4-thunder.leizhen@huawei.com>
From:   John Donnelly <John.p.donnelly@oracle.com>
In-Reply-To: <20220227030717.1464-4-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?V1lmZW9QbmxhY2JHbUNzdHhwbkpRTklLNFdWRjV0K094emFkYzBQMnZHd1dp?=
 =?utf-8?B?QWRnN3Jkb1RCVGF4dFl3N3BMbVpuUW1kemRUTnUvalpscis2Sm5RVDNXTzg4?=
 =?utf-8?B?R3MydzJoM29KTHo0THNuc05VWFFmY3JuaEw3Wk9pNGFKLy9lUEM5dG1NVUdu?=
 =?utf-8?B?cUxHbXBDdFI2MWdaRkJ0eDRuVWlTUHVXNTVSbEU0MW5YMENRQ3poYisyd1hB?=
 =?utf-8?B?REZJZFF1enYvcmR6c05SYlFpaEd6T0h0VWRwN0ZVUjd4ZWY0U3pqOUVDL2ZB?=
 =?utf-8?B?RlNPMjk0a1hNRDBnQ1YrSVV2d1BpaHpHY2FCTnZWaXZXVWNpZFpESTNrZGp2?=
 =?utf-8?B?QWYrbkhPSG9GVnZUdGwxMExEaC9ZblVhK1cyeE1xNTBoVXZyejlLMlUvV3c3?=
 =?utf-8?B?eFdSZjY0WGFhVXdnZm1OU2UxQWdZbTZVRkxLSjJXMXA5d2dYQWRuZE5pMy9X?=
 =?utf-8?B?eDhqajUxL1hzKzNWY2xpUjY4M0o3SDdaZEMvVitzdFZ2UFF0RWZrRGk4bmZs?=
 =?utf-8?B?R1o5cTczQzVNQzQ3ak5pUDZDWXhxNmw5RVFXU1NkTnBhWW5IZXhhamNiRUNB?=
 =?utf-8?B?MXJibzZlOExlM0oxYXRkby9DUExMSlJQU1FNdGdLY0gyTEdCVnlsY0oycko4?=
 =?utf-8?B?QjNDSkE3Rm85MFRLT1dZQjF4RnpvMFdheXpWZDlTRTRsQjRia0xqUUJlOXEx?=
 =?utf-8?B?OEg2aE5YSjZJTS9nWUdmNlVtTnRZZGcyZyt6Qyt2MXZJRjFBRWV6S05OdEFl?=
 =?utf-8?B?eEJiZjJtQ240ZDJqeW9OQ0RhMnBhNHdUN3FJYjdZQ1VlZDE5SjNVREVud0lj?=
 =?utf-8?B?QWkyTzkzbUtTWkdhUUd5RnRCNldSNFNmQWQyNnRpeTBEcENwUm9lRDA5UnpW?=
 =?utf-8?B?cXZKQzhrTXRYMDlzaktWdi8wTW5BTkd6OUNPaXdqV0dkRER3bDIyZSs4c3cr?=
 =?utf-8?B?SkdtZmgrUytROFZJL3ZvdjRjcXVMWFhpRnFGb3drMXJhRXFIakVMcU8ydHpV?=
 =?utf-8?B?dkdVd1UzczZ5bHVKVnBxZVo4WmJzZmZ0bGtyZ21sd1VHK3hDaFJqcXpjVmRM?=
 =?utf-8?B?cUgzMVhLZ0g4U290VENvaTNnYjcrcGI3NFhkdXNKT3Y5ek5NWVF0ZllsRDZs?=
 =?utf-8?B?d1JvVnRXOU9lYWorRWk1WXVxaFYwZk1tZ2NlMW5ad2pmeFUrTHBNK21sdUtU?=
 =?utf-8?B?eUpaNVJ5bHh4ajhWZ3R1L2xYZ0lQWkRxbDYzaE5IOGhrbklPUWI1TkNvbXI2?=
 =?utf-8?B?UTZyMEswNFNiT2xydlp3VXlVQXNUN3JjZzFiOVpVNml5aXZkT056UDcrU2Jo?=
 =?utf-8?B?bjBxYzUweHdLTDlHR05lQmZlYXFsaXA0QXljT3lGOUJGVGJiWm5CVlliYzYv?=
 =?utf-8?B?cWQ1MHhveWdKbWpGUFd2MHQ0VDUyS2FFaGRaQ0hmR2pVYXkvdDNYWmNtQzdO?=
 =?utf-8?B?N09PTEx1N3o1MTJQYUllTFlGbWc3NjBpVUFUWmhRSE0rZk1JbFhqcUxmd2Vr?=
 =?utf-8?B?SzNQNFdlbHJDczlBckVLMTExTU55OWpqU2ozZmh0ZmxHL2o4YzJTbEw0S2Vk?=
 =?utf-8?B?bmRvU1VuOXlKYXptQlN1SkJ3ajZGaTRiTTRBVjhCRTFjaW04YzEzWGV2S3cz?=
 =?utf-8?B?VEtYRnZmSFlqYWNBTmhxbkVuNnMrK29nKzUxc1Q1N1BFckJyejEzenJXZGR5?=
 =?utf-8?B?Q3RVbzN0RXA3elB6emhKazA1eGNkYkF2a2IzYnE4ZXdmakVyeEl0TFZLQU5K?=
 =?utf-8?B?cEcrc0dCZkpGTTF2MVNvVWFaM0lMMzE1UmtEQkd5RWQrZHJSekxPRU1hc2lP?=
 =?utf-8?B?dnFkN0Z2Ukt1ZWQxcm52OEhlMnFLWVpxazFYNE9CbzhhWGdBMm8rbzN0MlFK?=
 =?utf-8?B?bExxa3JWYjBpWXdyYnpVbTJHZEdYdFNYT3NxSlNJbENVMm9OUkZvVWp1cFpP?=
 =?utf-8?B?VDVPbFg1TXdFT2VZYnR2bXB2eEFMa3RKeDdsbkJtUVordi9MdmtEUElMdjlq?=
 =?utf-8?B?MkY0c0I3RWRRPT0=?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c93303f3-6a90-478f-cad5-08da0b3f18b5
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4722.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2022 13:31:25.3633
 (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: 39trBCSxAH0DnpNuSqO47abbEiFYcX5a05kHiP1lXrz66VcGK1Et8yfbGY1oqf5XZ/UzhZFrBU3KcqJ0Xed3MH3ezNDB/1fDWVy/3xiYYnI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2825
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10292 signatures=694221
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0
 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 spamscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2203210086
X-Proofpoint-GUID: nj20mAKan2Xqz3PCvj3kklqNpCPyd3qo
X-Proofpoint-ORIG-GUID: nj20mAKan2Xqz3PCvj3kklqNpCPyd3qo
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE,
	T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2/26/22 9:07 PM, Zhen Lei wrote:
> From: Chen Zhou <chenzhou10@huawei.com>
> 
> There are following issues in arm64 kdump:
> 1. We use crashkernel=X to reserve crashkernel below 4G, which
> will fail when there is no enough low memory.

                         " Not enough "
> 2. If reserving crashkernel above 4G, in this case, crash dump
> kernel will boot failure because there is no low memory available
> for allocation.

  We can't have a "boot failure". If the requested reservation
  can not be met,  the kdump  configuration is not setup.
> 
> To solve these issues, change the behavior of crashkernel=X and
> introduce crashkernel=X,[high,low]. crashkernel=X tries low allocation
> in DMA zone, and fall back to high allocation if it fails.
> We can also use "crashkernel=X,high" to select a region above DMA zone,
> which also tries to allocate at least 256M in DMA zone automatically.
> "crashkernel=Y,low" can be used to allocate specified size low memory.

Is there going to be documentation on what values certain Arm platforms 
are going to use this on ?

> 
> Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
> Co-developed-by: Zhen Lei <thunder.leizhen@huawei.com>
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> ---
>   arch/arm64/kernel/machine_kexec.c      |   9 ++-
>   arch/arm64/kernel/machine_kexec_file.c |  12 ++-
>   arch/arm64/mm/init.c                   | 106 +++++++++++++++++++++++--
>   3 files changed, 115 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
> index e16b248699d5c3c..19c2d487cb08feb 100644
> --- a/arch/arm64/kernel/machine_kexec.c
> +++ b/arch/arm64/kernel/machine_kexec.c
> @@ -329,8 +329,13 @@ bool crash_is_nosave(unsigned long pfn)
>   
>   	/* in reserved memory? */
>   	addr = __pfn_to_phys(pfn);
> -	if ((addr < crashk_res.start) || (crashk_res.end < addr))
> -		return false;
> +	if ((addr < crashk_res.start) || (crashk_res.end < addr)) {
> +		if (!crashk_low_res.end)
> +			return false;
> +
> +		if ((addr < crashk_low_res.start) || (crashk_low_res.end < addr))
> +			return false;
> +	}
>   
>   	if (!kexec_crash_image)
>   		return true;
> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
> index 59c648d51848886..889951291cc0f9c 100644
> --- a/arch/arm64/kernel/machine_kexec_file.c
> +++ b/arch/arm64/kernel/machine_kexec_file.c
> @@ -65,10 +65,18 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)
>   
>   	/* Exclude crashkernel region */
>   	ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
> +	if (ret)
> +		goto out;
> +
> +	if (crashk_low_res.end) {
> +		ret = crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end);
> +		if (ret)
> +			goto out;
> +	}
>   
> -	if (!ret)
> -		ret =  crash_prepare_elf64_headers(cmem, true, addr, sz);
> +	ret = crash_prepare_elf64_headers(cmem, true, addr, sz);
>   
> +out:
>   	kfree(cmem);
>   	return ret;
>   }
> diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
> index 90f276d46b93bc6..30ae6638ff54c47 100644
> --- a/arch/arm64/mm/init.c
> +++ b/arch/arm64/mm/init.c
> @@ -65,6 +65,44 @@ EXPORT_SYMBOL(memstart_addr);
>   phys_addr_t arm64_dma_phys_limit __ro_after_init;
>   
>   #ifdef CONFIG_KEXEC_CORE
> +/* Current arm64 boot protocol requires 2MB alignment */
> +#define CRASH_ALIGN			SZ_2M
> +
> +#define CRASH_ADDR_LOW_MAX		arm64_dma_phys_limit
> +#define CRASH_ADDR_HIGH_MAX		memblock.current_limit
> +
> +/*
> + * This is an empirical value in x86_64 and taken here directly. Please
> + * refer to the code comment in reserve_crashkernel_low() of x86_64 for more
> + * details.
> + */
> +#define DEFAULT_CRASH_KERNEL_LOW_SIZE	\
> +	max(swiotlb_size_or_default() + (8UL << 20), 256UL << 20)
> +
> +static int __init reserve_crashkernel_low(unsigned long long low_size)
> +{
> +	unsigned long long low_base;
> +
> +	/* passed with crashkernel=0,low ? */
> +	if (!low_size)
> +		return 0;
> +
> +	low_base = memblock_phys_alloc_range(low_size, CRASH_ALIGN, 0, CRASH_ADDR_LOW_MAX);
> +	if (!low_base) {
> +		pr_err("cannot allocate crashkernel low memory (size:0x%llx).\n", low_size);
> +		return -ENOMEM;
> +	}
> +
> +	pr_info("crashkernel low memory reserved: 0x%08llx - 0x%08llx (%lld MB)\n",
> +		low_base, low_base + low_size, low_size >> 20);
> +
> +	crashk_low_res.start = low_base;
> +	crashk_low_res.end   = low_base + low_size - 1;
> +	insert_resource(&iomem_resource, &crashk_low_res);
> +
> +	return 0;
> +}
> +
>   /*
>    * reserve_crashkernel() - reserves memory for crash kernel
>    *
> @@ -75,30 +113,79 @@ phys_addr_t arm64_dma_phys_limit __ro_after_init;
>   static void __init reserve_crashkernel(void)
>   {
>   	unsigned long long crash_base, crash_size;
> -	unsigned long long crash_max = arm64_dma_phys_limit;
> +	unsigned long long crash_low_size;
> +	unsigned long long crash_max = CRASH_ADDR_LOW_MAX;
>   	int ret;
> +	bool fixed_base, high = false;
> +	char *cmdline = boot_command_line;
>   
> -	ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
> +	/* crashkernel=X[@offset] */
> +	ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
>   				&crash_size, &crash_base);
> -	/* no crashkernel= or invalid value specified */
> -	if (ret || !crash_size)
> -		return;
> +	if (ret || !crash_size) {
> +		/* crashkernel=X,high */
> +		ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);
> +		if (ret || !crash_size)
> +			return;
> +
> +		/* crashkernel=Y,low */
> +		ret = parse_crashkernel_low(cmdline, 0, &crash_low_size, &crash_base);
> +		if (ret == -ENOENT)
> +			/*
> +			 * crashkernel=Y,low is not specified explicitly, use
> +			 * default size automatically.
> +			 */
> +			crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE;
> +		else if (ret)
> +			/* crashkernel=Y,low is specified but Y is invalid */
> +			return;
> +
> +		/* Mark crashkernel=X,high is specified */
> +		high = true;
> +		crash_max = CRASH_ADDR_HIGH_MAX;
> +	}
>   
> +	fixed_base = !!crash_base;
>   	crash_size = PAGE_ALIGN(crash_size);
>   
>   	/* User specifies base address explicitly. */
> -	if (crash_base)
> +	if (fixed_base)
>   		crash_max = crash_base + crash_size;
>   
> -	/* Current arm64 boot protocol requires 2MB alignment */
> -	crash_base = memblock_phys_alloc_range(crash_size, SZ_2M,
> +retry:
> +	crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN,
>   					       crash_base, crash_max);
>   	if (!crash_base) {
> +		/*
> +		 * Attempt to fully allocate low memory failed, fall back
> +		 * to high memory, the minimum required low memory will be
> +		 * reserved later.
> +		 */
> +		if (!fixed_base && (crash_max == CRASH_ADDR_LOW_MAX)) {
> +			crash_max = CRASH_ADDR_HIGH_MAX;
> +			goto retry;
> +		}
> +
>   		pr_warn("cannot allocate crashkernel (size:0x%llx)\n",
>   			crash_size);
>   		return;
>   	}
>   
> +	if (crash_base >= SZ_4G) {
> +		/*
> +		 * For case crashkernel=X, low memory is not enough and fall
> +		 * back to reserve specified size of memory above 4G, try to
> +		 * allocate minimum required memory below 4G again.
> +		 */
> +		if (!high)
> +			crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE;
> +
> +		if (reserve_crashkernel_low(crash_low_size)) {
> +			memblock_phys_free(crash_base, crash_size);
> +			return;
> +		}
> +	}
> +
>   	pr_info("crashkernel reserved: 0x%016llx - 0x%016llx (%lld MB)\n",
>   		crash_base, crash_base + crash_size, crash_size >> 20);
>   
> @@ -107,6 +194,9 @@ static void __init reserve_crashkernel(void)
>   	 * map. Inform kmemleak so that it won't try to access it.
>   	 */
>   	kmemleak_ignore_phys(crash_base);
> +	if (crashk_low_res.end)
> +		kmemleak_ignore_phys(crashk_low_res.start);
> +
>   	crashk_res.start = crash_base;
>   	crashk_res.end = crash_base + crash_size - 1;
>   	insert_resource(&iomem_resource, &crashk_res);