Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Eric DeVolder <eric.devolder@oracle.com>
To:     linux-kernel@vger.kernel.org, x86@kernel.org,
        kexec@lists.infradead.org, ebiederm@xmission.com,
        dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com
Cc:     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,
        eric.devolder@oracle.com
Subject: [PATCH v4 04/10] crash hp: prototype change for crash_prepare_elf64_headers
Date:   Wed,  9 Feb 2022 14:57:00 -0500
Message-Id: <20220209195706.51522-5-eric.devolder@oracle.com>
In-Reply-To: <20220209195706.51522-1-eric.devolder@oracle.com>
References: <20220209195706.51522-1-eric.devolder@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rj7xD5mfFcCKlQ245DC9VOiyvhzbiiAy9PMBmIx2JRKMAScw2kmXQXTsFqUf?=
 =?us-ascii?Q?mGbkbOma4VQhxJnPf66aeSRetpzpvsBKbOTsJ68SWE8AAlVEKXtSOioMjwxh?=
 =?us-ascii?Q?Jx/awA2WMdFLFDGk2TqBpFTDnj94vbHRsZ0VQTAKD2IUgqC+iTyq3pYpVnaJ?=
 =?us-ascii?Q?dq2QftGjF58gkfGAadH0s6HuqKSvp+Uhli2zh9cFaObP96LtZhJV5KE2Lr2u?=
 =?us-ascii?Q?xcznnpMtgYkzFk5B5IKMnohwY/4H3OjZz7ZW/DT4LC1Jg3d/2YNSKY3XqcqR?=
 =?us-ascii?Q?5BhzHBq6R1sPObSb0AcmxBm8GVXGvI2d8uvnXTupNTq6gGNeXIvd+WRWXjkR?=
 =?us-ascii?Q?LfbtBklWJ4nPHlVp66eNb5GKxmZDwrNlo6TWQ/NqJRWaYuK00Z0mjWevYB4M?=
 =?us-ascii?Q?S8HTdB+2mQLJrLcMHG6lGhaKKgw7ZKLKSZhYUmYV9pJ84pPanxhm/1kZVxtD?=
 =?us-ascii?Q?vlOgI7JG/dnLCOTv4tXtKMe8U6rBZJrtjya85laR5qwIrOjMti7cyFST3lYn?=
 =?us-ascii?Q?PQrIj8mMSm3lc3ndA9alCzPeglB6KnSR0+7HH53x6BcalMH83YVMu0C1ajA/?=
 =?us-ascii?Q?gjLvbHC267MBzdjpq7ljBfVCmjdx4ooOMT3C0GTKuAl7UJMuaMMhICLSPWmg?=
 =?us-ascii?Q?DiLzO3Gc5wJ+Szeflo3P2KmKO77C+dXuJbjCGJjZTILRmE+czWPHQk17xOFB?=
 =?us-ascii?Q?QKu3CfIzs7r6+OXHmtGNHz7OUrZ9NoZEq+iIlnWsSWY2pTWZT4B1FH+ncid8?=
 =?us-ascii?Q?5e/TjEKQPtyDZbaDVKtBUeHtrzV+ZShaSRUzj1kqOHEhEg23Gfzd7OsgV+AT?=
 =?us-ascii?Q?cE52+4+5MIdOxSXpwRFc1O+lIGiko+70bhDb1zV5wvWvGasOigTEAd7gfhCu?=
 =?us-ascii?Q?fMXhPUvzNHUmum1ol/za48e8iYcPM8dfj8Rai59InTco3wdVt4F5BsVJsbVs?=
 =?us-ascii?Q?RZKSx81MO412bU8fE/jUZBX5RZZb2bZ92NdJONt71+BO5vV8vwC8vBZSOvIz?=
 =?us-ascii?Q?C5baRZjJrRbjfxGxXq0e2zG/2DwCJaIOrQ8Cm/nCkQiH4KoIuteI0XJ+FByS?=
 =?us-ascii?Q?s4ymedIJ0w+hFEag119Wp0l5FThhceJi0RnjXEWLpa764do/8JJkIkewjZx4?=
 =?us-ascii?Q?FFeo1p5/ZqJFPtF0KRnbVHVbav154rGDurb6Vaa8hsJRWSkV32b5CcAVoMcy?=
 =?us-ascii?Q?cjMK4KT3nFdsz8zmAv+IDr3BWjsWJO1C2rR1ZR4tm0AI1QF3Osl4gU9kiFK+?=
 =?us-ascii?Q?CB8HYzmVgOxdEZHVhfEKI483Aq4cCh7CiT5KVLEksHUltU9Ko2v+C6z15wcS?=
 =?us-ascii?Q?Kl/dir1Mn5YDL+LlQ5V75/5YglHYPQ9sCsEE4PhIGtbMct10xpr/019X+1FF?=
 =?us-ascii?Q?CaLQjtl37FiOp1ANah267CJALbX755K/HA4SoRXnGrSF8WpkX1GUMxO2FWxH?=
 =?us-ascii?Q?4MQyf2mfSfAcbMZ9lh4g0dRvwdAcLNMS5Zshy5ZtPw5STU86VeC+YR2QMDx+?=
 =?us-ascii?Q?uSvtVEMml0G43+RakJ3RyRNxPAelkG9uXk00VI97zjSWw/NjvivmLgxBXaRV?=
 =?us-ascii?Q?qejHSKbjWfjL4oeBKNj+fms1hipEO56oFE3ci2dqhsRfhGYxIxgkh34Cfg0f?=
 =?us-ascii?Q?tJg223C/x3jtQ5FsIhDPz+UTgUita00ukXn3cdyk65BVphIlmewvjH1hj7L9?=
 =?us-ascii?Q?6m0XJg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7f27f7fe-7330-40a2-9f0e-08d9ec0666ba
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 19:57:29.0850
 (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: 7mEyHUM0T095I5bl9S8HpF9qJbrRgAkIZ66LovnwqSXA/xG8G1+tLn9jn4Z9VCzAC2AW4OUBk6KjZzu/m8uL6SrIMa9EQl8sIazRaeaeEC4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5701
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10253 signatures=673431
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 suspectscore=0
 mlxlogscore=999 mlxscore=0 adultscore=0 malwarescore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202090106
X-Proofpoint-GUID: vUXE5iohOFkzPRCGi7WbH4qmkQEywj8o
X-Proofpoint-ORIG-GUID: vUXE5iohOFkzPRCGi7WbH4qmkQEywj8o
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,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

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().

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