Message-ID: <a9070375-e4d0-d17f-6749-a7701c1a9bf3@oracle.com>
Date:   Mon, 13 Dec 2021 08:29:07 -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 04/10] x86: kdump: move xen_pv_domain() check and
 insert_resource() to setup_arch()
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-5-thunder.leizhen@huawei.com>
From:   john.p.donnelly@oracle.com
In-Reply-To: <20211210065533.2023-5-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?ZXF1OVpMY29ZekVrOHh1N3hHS2ZMUWNSUHhQbDQ0bTQyZG9Ja3U5NFBDYUFS?=
 =?utf-8?B?YWExRTdlU0xudDNKbWpGV0pkdWluNUVkZnRZOHFxN0dTbm81U3hzQnB6czEr?=
 =?utf-8?B?akkvMHpCSW1udlBBeDM1YWhoci9lQXorYWx1dE5uTmJLSUFrNmlaS3pPbnNz?=
 =?utf-8?B?US93YzRsaHJldmxJTHR5bTBvQTZtZWJMQXM4UWovdVgzem41KzF2Z0kyY25V?=
 =?utf-8?B?RGtCaHRVdjJ2dUV0czdZYjdwanM3UXdUZ2pFSjZKMk5Gci8xNjFTVEtBU0M3?=
 =?utf-8?B?N3ZsSEd6UVlXSGhlNG9mUzVNai9Zb0ppak04R0N6MGF6eEFyeHhUUGhnOEJp?=
 =?utf-8?B?bTdqdXdqZHFhU2I3aExXcGExYVZ1UGpNWlBhZGNZWkxYWUdrY1hkN0VtOVV2?=
 =?utf-8?B?cWxCWVozKytiNEJMN1FrSkNxa2xIbnFsN3lySk5sYXBuRkRCU05RdnFhOGdQ?=
 =?utf-8?B?dkg1aFIvWWJrSFBCWjFLMGRNRGFqQWhzQVljUWx1TW4ySjZDd0pxVERMb0FT?=
 =?utf-8?B?alFnT1A4OWJGM0pIcmlPZVNkTWY1cTd6QjVlbGdTaXBmME56SHlmTE16RkF0?=
 =?utf-8?B?cHVJRjJWV3hYY1FHazB3K2pNMGtzMFY2Zi9JeDBrLzhnL2tEVXUzSzlZZ2Jj?=
 =?utf-8?B?eTc3OWpnMjUyM0xreVBNV1pSNzhJa2N5NWdnbzJUOHJwTUVIVlJVVk9YWTVW?=
 =?utf-8?B?eERCZWdiRFZXUklveCtmaFZXUzcrSXlTOTE1emcrbzZpeGFHQUNjTW5JT1dn?=
 =?utf-8?B?YW5YVE04T1M4bGpBR0Y2K3llc240dWxac0M4U04rTkQzbWp4OGtxTWlHVm1C?=
 =?utf-8?B?c05zdC93RVNPL0dUNmVNY3gxclRDd3p2eVhKVjhlSlRTa1ZYSm4vZjNwa1Rp?=
 =?utf-8?B?NHg1N0ZsTHl3cVk3RXlFZ2dlTVY4WnliT01BakoybkJBSTFXNFBaZWh1WmF1?=
 =?utf-8?B?MHhIV0pvSHNQRkxOcG5tQlQwL1RMbnNKaUpGNkc3dXZiMkRKVUpRM3VSUzVJ?=
 =?utf-8?B?Sk05dEFWdzZDM0pZY2Vud0xERXFYTWJPRWduR1FDOWNpYkVTRXdBVDQwZ0lT?=
 =?utf-8?B?RGk1amR2d3dwb1JxYlFjWEw1QXVCODZldERlZURaZE02R3ZrVDZrZFJFQytN?=
 =?utf-8?B?TmRQcmRubWNBTHR6K1VKOVIzNFFzYS9ZMjFvTnAxN013Z2FnWElNemNZbzVU?=
 =?utf-8?B?QWVaM1VLQW93em9hZ2JPRkNJQjRmekZsV0RFQlhWLzNLN0NYWVMxdk52YTlH?=
 =?utf-8?B?cGpEdzR5L2pYcXNPWFI0VnloT2Y0UzdvdWhYZk5xcitqQUx6Nng5VFdORmF3?=
 =?utf-8?B?RUFqeFdycGdjUDRlZHZGeURqUmNYNjhSaldKOTFYcFVuN2NvbXBOb3RRemdh?=
 =?utf-8?B?Z0tRNkswbmtCVFd5UFBzSm5vY3VDZ2E2RnhpWTBGY1F6UjcrRnN0elVBdzZk?=
 =?utf-8?B?Z1J5RDJ2U3hBWDBYKzc0M0JXTUZGSXRGQmZiOXNYSVdUYnpnMVRJMEhnbndM?=
 =?utf-8?B?VzdHRDRiZkY0UjVPRi9JWHVpUG9FZjhZOHZWaWpUV1F5NGdpMk1ZS0hzaFhD?=
 =?utf-8?B?U3Rwdmo1VjVZdFNYT3cySWRHaUx2LzNnelVsWnV0NjRsYlhDbmJnWUgzT251?=
 =?utf-8?B?NTB1MzhwOGJ0aTBIUTBvYlJ4Zlh5aGNiejJnMWhuVGNhK3FTL0FxZUFlSm9v?=
 =?utf-8?B?VXlKL0Z2TDBuTXRrd3doaGwremRxeVdYTDVkTjNuNGNCZXpBZzlCaHRPdzRl?=
 =?utf-8?B?NE96aUloamQ4SFprd1p1VkROQU42M2UrWjZOVmVoMUdSSW84WjgweW5DdXNr?=
 =?utf-8?B?eFZFdWUxcmdyWTE1b2pVNTFDSnNrV2pibTM3YUg2K2xpL2lrd0ExM0sybm5v?=
 =?utf-8?B?Z3Rmc0U5R3RoaVMrYWVPZXhhZkpxV2FOV2loWEtoeERvazlSRlFIeU43eWUw?=
 =?utf-8?B?dGlwRXJvTGxIWWU0aFJRNURkZFM3Zi84L1hpV1VLMXBuYmk5UVF1SGZSZlRz?=
 =?utf-8?B?cnF5VnV6Y2ZHMjJ3MXJtNEUvL0JSUUNHb1RkOUgrVUJWTGFrWDMwZTNLYVRz?=
 =?utf-8?B?dEQ2WTRnMmlWS09sRVhoUXNXMXEwa0NmZUcwQU5rcC9PSWlIclBsNHVLdVZs?=
 =?utf-8?B?YWpuV2tGOFNMU1VBUG5RTGNza05neGpWVG1zaTZxVlEyamdPblpwY2pBZDA4?=
 =?utf-8?B?WFFxcEh2ZlV5dFhPbEFXV0RjSlFQRkY4ZjlUU3NEaGJWcllVUHVXQkxjRkE4?=
 =?utf-8?B?MGRYN0VWTDhqMnRzOWloZ05pcTZ3PT0=?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0166150c-ec5a-43be-8126-08d9be44eff4
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:29:14.4979
 (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: 5EKgVKlMldDJTW8BNUAk1j8O9eALAMraECOsAMVL0HOo2HrFIncp+XRNivc8Qo9m9Heqs/oMQ/zOZNoW3+R7JAGIrOE9a89xfl6bla7IRBY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB2047
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10196 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 suspectscore=0
 mlxlogscore=999 phishscore=0 malwarescore=0 bulkscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2112130092
X-Proofpoint-ORIG-GUID: kuwDngmIusN6Z8Xq1JJA6-zv49i0Ux_V
X-Proofpoint-GUID: kuwDngmIusN6Z8Xq1JJA6-zv49i0Ux_V
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:
> From: Chen Zhou <chenzhou10@huawei.com>
> 
> We will make the functions reserve_crashkernel() as generic, the
> xen_pv_domain() check in reserve_crashkernel() is relevant only to
> x86, the same as insert_resource() in reserve_crashkernel[_low]().
> So move xen_pv_domain() check and insert_resource() to setup_arch()
> to keep them in x86.
> 
> Suggested-by: Mike Rapoport <rppt@kernel.org>
> Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> Tested-by: John Donnelly <John.p.donnelly@oracle.com>
> Tested-by: Dave Kleikamp <dave.kleikamp@oracle.com>
> Acked-by: Baoquan He <bhe@redhat.com>

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

> ---
>   arch/x86/kernel/setup.c | 19 +++++++++++--------
>   1 file changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index bb2a0973b98059e..7ae00716a208f82 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -456,7 +456,6 @@ static int __init reserve_crashkernel_low(void)
>   
>   	crashk_low_res.start = low_base;
>   	crashk_low_res.end   = low_base + low_size - 1;
> -	insert_resource(&iomem_resource, &crashk_low_res);
>   #endif
>   	return 0;
>   }
> @@ -480,11 +479,6 @@ static void __init reserve_crashkernel(void)
>   		high = true;
>   	}
>   
> -	if (xen_pv_domain()) {
> -		pr_info("Ignoring crashkernel for a Xen PV domain\n");
> -		return;
> -	}
> -
>   	/* 0 means: find the address automatically */
>   	if (!crash_base) {
>   		/*
> @@ -531,7 +525,6 @@ static void __init reserve_crashkernel(void)
>   
>   	crashk_res.start = crash_base;
>   	crashk_res.end   = crash_base + crash_size - 1;
> -	insert_resource(&iomem_resource, &crashk_res);
>   }
>   #else
>   static void __init reserve_crashkernel(void)
> @@ -1143,7 +1136,17 @@ void __init setup_arch(char **cmdline_p)
>   	 * Reserve memory for crash kernel after SRAT is parsed so that it
>   	 * won't consume hotpluggable memory.
>   	 */
> -	reserve_crashkernel();
> +	if (xen_pv_domain())
> +		pr_info("Ignoring crashkernel for a Xen PV domain\n");
> +	else {
> +		reserve_crashkernel();
> +#ifdef CONFIG_KEXEC_CORE
> +		if (crashk_res.end > crashk_res.start)
> +			insert_resource(&iomem_resource, &crashk_res);
> +		if (crashk_low_res.end > crashk_low_res.start)
> +			insert_resource(&iomem_resource, &crashk_low_res);
> +#endif
> +	}
>   
>   	memblock_find_dma_reserve();
>