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;
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, david@redhat.com,
        sourabhjain@linux.ibm.com, konrad.wilk@oracle.com,
        boris.ostrovsky@oracle.com, eric.devolder@oracle.com
Subject: [PATCH v13 2/7] crash: prototype change for crash_prepare_elf64_headers()
Date:   Mon, 31 Oct 2022 15:35:59 -0400
Message-Id: <20221031193604.28779-3-eric.devolder@oracle.com>
In-Reply-To: <20221031193604.28779-1-eric.devolder@oracle.com>
References: <20221031193604.28779-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?6LQbwsjRXFbbyo8ON5SmZ6B9KkuEC8dNeYQQbsa2C2NqoYje7p5ESOoI9t9C?=
 =?us-ascii?Q?q7IzrEN49jqxDQVEBmTBWr7uu05jvk6Qo+mJakGhkHFEM+jifo23xjYFNHXB?=
 =?us-ascii?Q?7tipI5T2NnDgI2gAVhsT9r9JLBdlR4TtqNYiTUkRkZm+kWZqtilivrpjvWKp?=
 =?us-ascii?Q?MVzT2tt3j0MI4iLywtM/RYRUxJD8GfMSIIovsl7Jl/7rjPaR9ATlGOQ0wznG?=
 =?us-ascii?Q?BD+IxJY8bWtEwhK3FNIIHO5hrRJV73z8ZQv5hU/pZPMXboROExSwQZSgZ7nI?=
 =?us-ascii?Q?Jfl8mYqe+Cldi/Ox6bXlU06y+X/R7qJalLVpNaPp3jzSNAdwIvgg+2Q0AdLS?=
 =?us-ascii?Q?yi7/4++trgn0gkuKjYViaxTjTHBya1edhgnVX4KHUS/sv1xJVajJRqO01aY3?=
 =?us-ascii?Q?39qPUTXNDWGOT3IrDDqz6dGj84YY3Y746iNiEiaJJw/c7DL+Gpry0OfhRcAY?=
 =?us-ascii?Q?Cri8+AuyPnOVzEro16RilI7aXDYWWnmPTdnDkxLGeeGSeqj9dOPwpyq80BQL?=
 =?us-ascii?Q?s56Rgz85dg7wtDvVEKdBxn9FFVxEvCrUwXwtBIBiu4sQD1MJdDqIFJSlt+Gs?=
 =?us-ascii?Q?Q4no1fWTrWdCG7ZCsly+fKXNjT+dU/7jkidBIae6YAQHnCe1Jhgxt/rN/eJD?=
 =?us-ascii?Q?PjTr1mpFFaV3yEIoHR/CdmRITY7rQlwOgUbgz2o0Lwr4j1vfRvrJDWxav8/e?=
 =?us-ascii?Q?66mWvAvzIO+yTyLB7G2wEJOYlQ6i/vAvZXvW9KlnhSl8maRkD7gWUiZ50Uy9?=
 =?us-ascii?Q?SCXDDtFIYH+0CkDxFxzQHppnHbc043zO7fQmjzk2a7D7hnnkup7O9XmsQB+/?=
 =?us-ascii?Q?rkJrMLZZHssQiRg8aA7DtymlheE0eb/8CkIh2DCATDDydO5vyHhnO9AwoqMn?=
 =?us-ascii?Q?RY59XC+H83wytfJTZWSG9SYEozgfeHX3QRl5lrLnT0NfxuQKs/rI80Q6PZMA?=
 =?us-ascii?Q?RYv4DXmvsNHndLOWcgrB8LrhPLYwvDGwpPL5OHgHuIUMjbDiXt3HlRWij85S?=
 =?us-ascii?Q?pn+rVUNv8a8TxP+6EbCiSMZfSskPGOl9+hc4Tj05rm9H3Y9oJXHsQ+TojgzF?=
 =?us-ascii?Q?yx07j6l4QSaD51HnIjgwxOxPd26sDzoskGSUrKJI8BH7n/nDz7PD3kSOkNbv?=
 =?us-ascii?Q?TV2uW/wbuMcq3ZTO3zzW7AxoLp6nvmYjtqdNshhatdpuv+jAzjh3U/cgkBbr?=
 =?us-ascii?Q?dNvCl+BWsyHtflhMfRlLwt6E9vRGbysfwZW29pxU7rKXNKR/sKdUq8Q/oIrv?=
 =?us-ascii?Q?lmLJUijHL4gUOi86BJU7bk/Kuc2BipdlJhF8AbJohn7F0fXy4rB5AVIJeKYU?=
 =?us-ascii?Q?/gXIywPjLAc0pHduXs/uNlo+wLeTFbG2sYK9Q9FL6v8tMTERjFYyHoLV6TmR?=
 =?us-ascii?Q?rvrSZilBqQc16iFYDkOUE9/KGZWpFqwgLr303ZGGPeHmcPMtYioQ6RQOc75n?=
 =?us-ascii?Q?3Ze7rQrz4LdF7D7uEpXmXhgMiL9lfbu95cfEhu4aDGOTetWLFSKDLAtUTvrc?=
 =?us-ascii?Q?OWIAoRHnAbCPE5hibVg2YkoU1XvJyv7KcfjYUwo31JzKZ60WGUm3v86eFuMb?=
 =?us-ascii?Q?9DEs5pBrmUkGHHpjfb+MFDmmwW4z7pm/BDNUtnqs2bGZkxsekfAsuk1Ci4PG?=
 =?us-ascii?Q?JA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 917ebe1a-f296-46b2-b772-08dabb772e56
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2022 19:36:18.1002
 (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: DGP0WBtnsc3YmvkVBO36QM2EYY+Pl6zPr8j2sqjxP1WFbqIeY0x/qEw49oxr2Te5OpuW5AhcnIEHDFzdmhqFehDt90HZpGjsXm1zCpBiqmM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4228
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-10-31_20,2022-10-31_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 bulkscore=0
 suspectscore=0 phishscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000
 definitions=main-2210310121
X-Proofpoint-GUID: xDLo5f19KfEkRHxxD1Q_EuYP6ZAltvik
X-Proofpoint-ORIG-GUID: xDLo5f19KfEkRHxxD1Q_EuYP6ZAltvik
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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

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(). The hotplug members are added
in "crash: add generic infrastructure for crash hotplug support".

This is preparation for later patch, no functionality change.

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
Acked-by: Baoquan He <bhe@redhat.com>
Acked-by: David Hildenbrand <david@redhat.com>
---
 arch/arm64/kernel/machine_kexec_file.c | 6 +++---
 arch/powerpc/kexec/file_load_64.c      | 2 +-
 arch/riscv/kernel/elf_kexec.c          | 7 ++++---
 arch/x86/kernel/crash.c                | 2 +-
 include/linux/kexec.h                  | 7 +++++--
 kernel/crash_core.c                    | 4 ++--
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index a11a6e14ba89..2f7b773a83bb 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;
@@ -64,7 +64,7 @@ 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);
+	ret = crash_exclude_mem_range(image, cmem, crashk_res.start, crashk_res.end);
 	if (ret)
 		goto out;
 
@@ -74,7 +74,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)
 			goto out;
 	}
 
-	ret = crash_prepare_elf64_headers(cmem, true, addr, sz);
+	ret = crash_prepare_elf64_headers(image, cmem, true, addr, sz);
 
 out:
 	kfree(cmem);
diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c
index 349a781cea0b..a0af9966a8f0 100644
--- a/arch/powerpc/kexec/file_load_64.c
+++ b/arch/powerpc/kexec/file_load_64.c
@@ -798,7 +798,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/riscv/kernel/elf_kexec.c b/arch/riscv/kernel/elf_kexec.c
index 0cb94992c15b..ffde73228108 100644
--- a/arch/riscv/kernel/elf_kexec.c
+++ b/arch/riscv/kernel/elf_kexec.c
@@ -118,7 +118,8 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)
 	return 0;
 }
 
-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;
@@ -140,7 +141,7 @@ 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)
-		ret = crash_prepare_elf64_headers(cmem, true, addr, sz);
+		ret = crash_prepare_elf64_headers(image, cmem, true, addr, sz);
 
 out:
 	kfree(cmem);
@@ -212,7 +213,7 @@ static void *elf_kexec_load(struct kimage *image, char *kernel_buf,
 
 	/* Add elfcorehdr */
 	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;
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 9730c88530fc..9ceb93c176a6 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -265,7 +265,7 @@ 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 41a686996aaa..ebf46c3b8f8b 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -253,8 +253,11 @@ 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 need_kernel_map,
-				       void **addr, unsigned long *sz);
+extern int crash_prepare_elf64_headers(struct kimage *image,
+				   struct crash_mem *mem,
+				   int need_kernel_map,
+				   void **addr,
+				   unsigned long *sz);
 
 #ifndef arch_kexec_apply_relocations_add
 /*
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 46c160d14045..8c648fd5897a 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -315,8 +315,8 @@ static int __init parse_crashkernel_dummy(char *arg)
 }
 early_param("crashkernel", parse_crashkernel_dummy);
 
-int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,
-			  void **addr, unsigned long *sz)
+int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *mem,
+			  int need_kernel_map, void **addr, unsigned long *sz)
 {
 	Elf64_Ehdr *ehdr;
 	Elf64_Phdr *phdr;
-- 
2.31.1