Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <daf2cc47-4cad-4b6f-fdf2-f75e1f3e3cb3@oracle.com>
Date:   Tue, 1 Mar 2022 14:05:14 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.1
Subject: Re: [PATCH v4 04/10] crash hp: prototype change for
 crash_prepare_elf64_headers
Content-Language: en-US
To:     Baoquan He <bhe@redhat.com>
Cc:     linux-kernel@vger.kernel.org, x86@kernel.org,
        kexec@lists.infradead.org, ebiederm@xmission.com,
        dyoung@redhat.com, vgoyal@redhat.com, tglx@linutronix.de,
        mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com,
        hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com,
        robh@kernel.org, efault@gmx.de, rppt@kernel.org,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com
References: <20220209195706.51522-1-eric.devolder@oracle.com>
 <20220209195706.51522-5-eric.devolder@oracle.com>
 <YhWuElhbF4GslSfq@MiWiFi-R3L-srv>
From:   Eric DeVolder <eric.devolder@oracle.com>
In-Reply-To: <YhWuElhbF4GslSfq@MiWiFi-R3L-srv>
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?VmJRR3ZyVjF4U2FyUjN3V0J0YitEZFVsbE5DT1lFUlQrL0IwcTNacWlraW5Q?=
 =?utf-8?B?dWtybnd5VW4wS3JTcVBzc3ZveTM4YThVWW5UT2NvS2lnYjUwTkNyMDM3MDRK?=
 =?utf-8?B?Sk1PaktrTnRZRlhISG9TU0dWcFg3eFBsQUsrbkVDMmo1UlhZOG4rNktrVzgx?=
 =?utf-8?B?TVhaM3lvRU5KZXU4YkZpeGcxbGpIZVFpNlYwTE1CVnAvMVhFcm83NWZ1ek1P?=
 =?utf-8?B?bnZ2dXVOTjNWU294UVZiSkpQYVZaTHozVktxUTBMYUFDOElpLzBPbGZxc3hY?=
 =?utf-8?B?V0JsZjYxVGhiam53UXlySGF5YjlPVExlNExycS8wdm1SMGRMaTA5UStNRytj?=
 =?utf-8?B?WHZpSDR6cUpPdFhsdytRU3M1TkVEVkRMQk5aZ05Rb2kyOXA4akgva2d6TmZ3?=
 =?utf-8?B?SldyaUErbDQyTndXdzV6NmlaRHdGRzZyQVZUTlFEcUtOK2lKbEJYVEJnOWNs?=
 =?utf-8?B?V1UyVHNXbVFFT09lN2hMWjh1M0xDdkNxMlV0UkFsRjRMV0h3SnF2RVhKUzFJ?=
 =?utf-8?B?ZEhtbHg4R1NUajE3NExFYnp2a0plODBLTmZucjY5NTgwWWcwVVZwZzFMOXk4?=
 =?utf-8?B?WU8zYTZLalVicWRTZlFNMVk3cVhtRkZPNGMycDhiamtwUmU0TmFZUXc4Mmt3?=
 =?utf-8?B?by9iU1BJVlRXZVNEWmdjWkliSHBaL3I0UmFEWWhGaEV0emE5Zy9hcnlVb3RI?=
 =?utf-8?B?KzUrR2V5dWI4QllaTE5JQUttVGdvdFJqSC9VeEMxaXo2bWR5aXU5Q0kyaHRH?=
 =?utf-8?B?bTF3VUF4WVVHdHM5YXZSQlJJRTUxYnpZL2ZtQjVkVkxvcHNzL2NPN3VtL1pn?=
 =?utf-8?B?V3IyenFLOThMcEpjMnNFRGg1TzBkZlhwaHA2ZHk2Y1kzZ2hwT1RJdnhXRGNS?=
 =?utf-8?B?Qmd1Znc5d1I3Q0VYVlhhMTZQbjVJVWVxTHVwQ3lXQSt0RVRPYlkvNzBCY1Zq?=
 =?utf-8?B?dzJRdm9SUnB4cmE2cmZpV2MxaDlsaEltakdnTWpSMldLSHZUVytWd2FPbUor?=
 =?utf-8?B?Q2NzUmJzVDlSRTJ6R09yS0ZGaEhvYWtOditQRnJXa2VCOW5nVzhyYnRxOSsz?=
 =?utf-8?B?N3JjMXk1WUZiNmpWODZxUW8zMkFybmJiVngyNy9WZjV2Uk9QdHVjOVc2L1Js?=
 =?utf-8?B?MXdSRlJBb1hTRmRRd1Z4RW9IejJwUGlhUitqOVlRTzJraE4wZ3JWN3h6TUVF?=
 =?utf-8?B?QzdMVmhhR0FPRDlXeHZBK3FFdTlSaldUYnk2Q1F0ZExwQU1jNEI1Q1R5SE9P?=
 =?utf-8?B?eFZlZm9lTHBBSDViWXl2c0sxR3JtaEVwZ2t3THdlcUFsc3JXeTNNYnZQd1Yv?=
 =?utf-8?B?ajlUMFVNUTNwR1U3T1owMVFXc1RWVzM0ZUJNYkZnVUF0N29yYTh4V0EvSkVG?=
 =?utf-8?B?OWp5ZldOdzJGaC82TDVuaXlVVjlrQnc5cDZxdnh1eVZnNXFXUUpuOGJaV3hk?=
 =?utf-8?B?V0phdzZ5VzhrdzJVQkU3TU8wWFNOZUtKN2tUMnl2TWFFVzBiR3pWY0VCRlNv?=
 =?utf-8?B?ekxQVXlIVWlhL20wODNXYlVJa3NpZXkrSTA4b011bzVlRjRNR3ZRNkNnM1lP?=
 =?utf-8?B?dk85Q0FGWWlqT0ZYRWVXdG40R2lnUE5UWlluOEMwM3dDQUdlbGtnTERqYVA2?=
 =?utf-8?B?ZFRydzNQalhvVWg5SzBRakZpZ1l1OUU2RCsvNDMrZENGQTBrRk1rNWMwbEJD?=
 =?utf-8?B?bHdjOXpkZ2VvSVp2SHMrVUlhTmFTRkVXcS8yM2ZENEFuYjM0S1JrSUw5M2Rj?=
 =?utf-8?B?ak5FaHJZZnZYKzRORFdiakQyS1VKMVk2WHM0bVg5eTVRSjR3MW1kZERkTTY1?=
 =?utf-8?B?ZG04MG51VnhxYzI5bGc1bU1sVkRBMExrYVV4Ny9YMDE1U2JKSW1GMm1qQkNP?=
 =?utf-8?B?eFAycU9aR1J0ZmdUaXBpZHZHN1l2ekxxUUc3ZUp0eFdPRElreGZ0SWJLdXBZ?=
 =?utf-8?B?VCt4OHhLbjh0ZlltM3dtcVhoRmJlM0VyMDZhVGZxYzlzUnlLRE1vdnFybExu?=
 =?utf-8?B?ZmxvU1RhY2UyTVRaRG1aRGEzM1R2YmJjaHhKRHA0ckFYaDd6eDYwbEhFdkpR?=
 =?utf-8?B?WWxYWmVCcVZVSnJvYmQybm1WQmhZTThRUG1hcG5HdVY2MFhNTWZkblUremZC?=
 =?utf-8?B?WndFOWhUc3JJRkhxTWwyeEEyc3pmMEtsVFNSR1FXRzFWdTVSQm9acHhJR1Rk?=
 =?utf-8?B?TDlmNGFmbVRzNnpPNE1EK3BtZzM4UUE2T1ZvSUxUZFRiYnFqU09oS0lDdXh2?=
 =?utf-8?B?c2Y4UlovRWdyNURabTBFelpQcUNueXFLUkZaOVZ6V3d0d3dma3M4V2I0a0xI?=
 =?utf-8?Q?CWb7eubTxhDnVGDx9D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 28182408-f2e9-42e9-2d25-08d9fbbed010
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2022 20:05:20.9119
 (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: Pd6lDfhgr8YQ36WuA64I9aj+2Dv7wVBJCT/G8RxsO3YyGgppJP4bmRwQnxqz0WT/gBSDJtgcWnwdd7O9Rxf7tU/SBdL4p1MEyML8CVjVwX0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3875
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10273 signatures=685966
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 phishscore=0
 malwarescore=0 mlxscore=0 suspectscore=0 spamscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2203010100
X-Proofpoint-ORIG-GUID: VF68498RNUGgB9mBlEw6ykUZp8i9XdwE
X-Proofpoint-GUID: VF68498RNUGgB9mBlEw6ykUZp8i9XdwE
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham 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/22/22 21:46, Baoquan He wrote:
> On 02/09/22 at 02:57pm, Eric DeVolder wrote:
>>  From within crash_prepare_elf64_headers() there is a need to
>> reference the struct kimage hotplug members. As such, this
>> change passes the struct kimage as a parameter to the
>> crash_prepare_elf64_headers().
> 
> One more sentence can be added"
> 
> "This is preparation for later patch, no functionality change."
OK, done!

> 
> Otherwise, this patch looks good to me.
> 
> Acked-by: Baoquan He <bhe@redhat.com>

Thank you!
eric

> 
>>
>> Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
>> ---
>>   arch/arm64/kernel/machine_kexec_file.c | 6 +++---
>>   arch/powerpc/kexec/file_load_64.c      | 2 +-
>>   arch/x86/kernel/crash.c                | 3 ++-
>>   include/linux/kexec.h                  | 5 +++--
>>   kernel/kexec_file.c                    | 4 ++--
>>   5 files changed, 11 insertions(+), 9 deletions(-)
>>
>> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
>> index 59c648d51848..7dbafb42ecf2 100644
>> --- a/arch/arm64/kernel/machine_kexec_file.c
>> +++ b/arch/arm64/kernel/machine_kexec_file.c
>> @@ -39,7 +39,7 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)
>>   	return kexec_image_post_load_cleanup_default(image);
>>   }
>>   
>> -static int prepare_elf_headers(void **addr, unsigned long *sz)
>> +static int prepare_elf_headers(struct kimage *image, void **addr, unsigned long *sz)
>>   {
>>   	struct crash_mem *cmem;
>>   	unsigned int nr_ranges;
>> @@ -67,7 +67,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)
>>   	ret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
>>   
>>   	if (!ret)
>> -		ret =  crash_prepare_elf64_headers(cmem, true, addr, sz);
>> +		ret =  crash_prepare_elf64_headers(image, cmem, true, addr, sz);
>>   
>>   	kfree(cmem);
>>   	return ret;
>> @@ -96,7 +96,7 @@ int load_other_segments(struct kimage *image,
>>   
>>   	/* load elf core header */
>>   	if (image->type == KEXEC_TYPE_CRASH) {
>> -		ret = prepare_elf_headers(&headers, &headers_sz);
>> +		ret = prepare_elf_headers(image, &headers, &headers_sz);
>>   		if (ret) {
>>   			pr_err("Preparing elf core header failed\n");
>>   			goto out_err;
>> diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
>> index b4981b651d9a..07da6bf1cf24 100644
>> --- a/arch/powerpc/kexec/file_load_64.c
>> +++ b/arch/powerpc/kexec/file_load_64.c
>> @@ -797,7 +797,7 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)
>>   		goto out;
>>   
>>   	/* Setup elfcorehdr segment */
>> -	ret = crash_prepare_elf64_headers(cmem, false, &headers, &headers_sz);
>> +	ret = crash_prepare_elf64_headers(image, cmem, false, &headers, &headers_sz);
>>   	if (ret) {
>>   		pr_err("Failed to prepare elf headers for the core\n");
>>   		goto out;
>> diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
>> index 9730c88530fc..9db41cce8d97 100644
>> --- a/arch/x86/kernel/crash.c
>> +++ b/arch/x86/kernel/crash.c
>> @@ -265,7 +265,8 @@ static int prepare_elf_headers(struct kimage *image, void **addr,
>>   		goto out;
>>   
>>   	/* By default prepare 64bit headers */
>> -	ret =  crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), addr, sz);
>> +	ret =  crash_prepare_elf64_headers(image, cmem,
>> +				IS_ENABLED(CONFIG_X86_64), addr, sz);
>>   
>>   out:
>>   	vfree(cmem);
>> diff --git a/include/linux/kexec.h b/include/linux/kexec.h
>> index 13c238c2da48..b11d75a6b2bc 100644
>> --- a/include/linux/kexec.h
>> +++ b/include/linux/kexec.h
>> @@ -221,8 +221,9 @@ struct crash_mem {
>>   extern int crash_exclude_mem_range(struct crash_mem *mem,
>>   				   unsigned long long mstart,
>>   				   unsigned long long mend);
>> -extern int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map,
>> -				       void **addr, unsigned long *sz);
>> +extern int crash_prepare_elf64_headers(struct kimage *image,
>> +	struct crash_mem *mem, int kernel_map,
>> +	void **addr, unsigned long *sz);
>>   #endif /* CONFIG_KEXEC_FILE */
>>   
>>   #ifdef CONFIG_KEXEC_ELF
>> diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
>> index 8347fc158d2b..801d0d0a5012 100644
>> --- a/kernel/kexec_file.c
>> +++ b/kernel/kexec_file.c
>> @@ -1260,8 +1260,8 @@ int crash_exclude_mem_range(struct crash_mem *mem,
>>   	return 0;
>>   }
>>   
>> -int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map,
>> -			  void **addr, unsigned long *sz)
>> +int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *mem,
>> +	int kernel_map, void **addr, unsigned long *sz)
>>   {
>>   	Elf64_Ehdr *ehdr;
>>   	Elf64_Phdr *phdr;
>> -- 
>> 2.27.0
>>
>