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 v15 2/7] crash: prototype change for crash_prepare_elf64_headers()
Date:   Fri,  9 Dec 2022 10:36:51 -0500
Message-Id: <20221209153656.3284-3-eric.devolder@oracle.com>
In-Reply-To: <20221209153656.3284-1-eric.devolder@oracle.com>
References: <20221209153656.3284-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?4YAeUxyJHZ4DjD+947a3VY+Sm5Rc9vsL6o7IMUymn7FcZiBJh+6shiomKm+J?=
 =?us-ascii?Q?EnZOeRx6VV3Au5DKc5Vf2ZGKdc3Rq40paHrKXCFFkMNW1HPEEYPKhH/cL4VC?=
 =?us-ascii?Q?8iZ1lrVMyJzwyRQRy/ikNo3b3LwZGNwwXcNGVmFHJsLV5TXifwyqstnyK3E+?=
 =?us-ascii?Q?eTEmeFgHqI/fUxjwvlQp0EFtT00E7Ive4DM9kOC+3C8kXVbbQHp9QZRcTTeS?=
 =?us-ascii?Q?LCdxb6rkWyZCE5lU03lyG1fLzQOr6uBp6urORHrii2n2HBjTqzsTtGtn8qSJ?=
 =?us-ascii?Q?GAsXGlRUjhBNdKGsdMrgQYAYe82HVYcQVUv/jqb5OJrX+ZcIjxQ5NiadEKra?=
 =?us-ascii?Q?W67ECJiptPAPwDZu+vgWU9FiWdN4pxdELI6QaAYuxaR0X91Hi55hoWeM73In?=
 =?us-ascii?Q?K12YwUrNI1Z51xrD/uM9wBmM46Navwt9qUdK9FbyMInEKypA9quM4z9ewYhU?=
 =?us-ascii?Q?/MTeUiXqQebO80RN1D+RBNnMJSl8vx3+nImOQnAR5pf0D14ufDQR5fP13qyT?=
 =?us-ascii?Q?wyNBHxsj2mIMVX4KyavB0WtsP7e5/Ohga5ILRiUKQYQRU1w+6y/FLgUvPHx3?=
 =?us-ascii?Q?vikbcA/f5BrIDReB46breiGGBMvZJ/YmR+8BgVmlwDyTsR6cJtBJJ/pf7iPo?=
 =?us-ascii?Q?BY7HeoFVfSRIwAeCWBEASdZSFtqnoyKHR5VUS0tTdXE/tM/ZVJns8D8t9blO?=
 =?us-ascii?Q?i/Wl3hA0rHYiNmRVZVE7WL7Je2MoO02SdV/VYuQehasaz9QdFLcRjx4jN8fX?=
 =?us-ascii?Q?0Nu0TV4wRvBXdLdrPIcBLiujYhhyTrnvb2gxaUvfsUkOvPJp2R9o20EigsIK?=
 =?us-ascii?Q?XNaeeJCMCSp+k6gSDH2DBcoZzliIvvN0iLcpxH/GP1I6o2xh46wPK7OXuarY?=
 =?us-ascii?Q?KRi9KHQdpGJ7JqHx06VPGsaKfgzoTveh6hIcec0D/V78O7H0Ckpro9L1Goyp?=
 =?us-ascii?Q?Mh3gmsC2xYkfsKmWbbRdQuNwQkf8G0zuiTEMITrLKulrFwQGAbSk35BZ57qq?=
 =?us-ascii?Q?rQF0XvFiosSuBoXOGyXdggIkVMbfNP6pJw8+ylSNYNe2w/EwvXQ553l4n0c0?=
 =?us-ascii?Q?nrBH1pC/041fUU2DPx+r9toU1AkBGHmFdflqbRw6WaCWijM8uLj6p7fk2ZrR?=
 =?us-ascii?Q?DmebTVWoLe0fMtgBCZ2DJzCPjHroQWHbPwNnSv8IaQ4sh/uBqDpcOZH8DVK4?=
 =?us-ascii?Q?zVnBaMsVvewvTBpsNcqwIiB9E+wDtJKIPq0GMx2g+tO0dkIKIO+xV/Ba8M//?=
 =?us-ascii?Q?QjnxgfZMnsu1pp9wgxikXkibWvsYb/GYy+67bDjAp8XxA1jvBYweAloMoPan?=
 =?us-ascii?Q?Yh2OXQZ6VJm2ikblW/1wDtuB4KKNaAmyqpZ8cnX2y7QXFm34ACTJuEstEbii?=
 =?us-ascii?Q?FvbtonoEnmvazkUWeslPZPo1u3DJw9xkYlhGazbmVI9sh5L3mzYRF+jwhvYD?=
 =?us-ascii?Q?qKAvh3/WrnX2OaS+hqj2zgcTX7A/Xk9aF1C7uASAk9LiTjxu5NvJH0LevwCV?=
 =?us-ascii?Q?94TgYWoPlqaS2JX4MDI0k212BlaI18fArDZCmPeUdsVeBm49xxdW7GSc22sr?=
 =?us-ascii?Q?6U4f9+rkkWK/hs6mLAnQjUiFO6vdZhKJiNgedQKMy9SlVTWTu2P8jORhmnTV?=
 =?us-ascii?Q?Ng=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cb520380-ac98-4b9d-1c40-08dad9fb3c7a
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2022 15:37:10.3031
 (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: /+rIOzJQIcbsccTycOAYONuRbBajnGYjs79Ny7Q6Q2kx9okwj0PHZvaDYnGepVSgxxqyxR50MUFRyuQCuqr9CzHBca+DaVWixGee782xmn4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4666
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-12-09_08,2022-12-08_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 spamscore=0 adultscore=0
 suspectscore=0 mlxlogscore=999 malwarescore=0 phishscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000
 definitions=main-2212090066
X-Proofpoint-GUID: lGLKKh8MszDRzrsCY_bYSmD3Dajk3Hs7
X-Proofpoint-ORIG-GUID: lGLKKh8MszDRzrsCY_bYSmD3Dajk3Hs7
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