Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
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,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com,
        eric.devolder@oracle.com
Subject: [PATCH v6 3/8] crash: prototype change for crash_prepare_elf64_headers
Date:   Fri,  1 Apr 2022 14:30:35 -0400
Message-Id: <20220401183040.1624-4-eric.devolder@oracle.com>
In-Reply-To: <20220401183040.1624-1-eric.devolder@oracle.com>
References: <20220401183040.1624-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?SVWkSlDCdrxLSiyFc+DdkPpQLJda00idIiG8MGS7JtBSGBQSNu7dNASu0vyC?=
 =?us-ascii?Q?Chrjv1pvA4IYy+awVMRnQ2Pj19CH/n2qB79Ch1CJvEwzacKnqrohytKGnrxt?=
 =?us-ascii?Q?R/uXpggFhbNr/ACnZUeece/pUsXmvgM4eSuLffXuIEXTCbGFQmKiaRZgQuue?=
 =?us-ascii?Q?16y+KzlpOLaFhYxds1R+AwfXdUxJqjlC2dkkq306DNezEt6YvgzgNSW9191M?=
 =?us-ascii?Q?cJdWkj6AeOwRMMksUW+k0EGMhXvTvjdB4deUbRcWURlFqtO0g9Kda6QMPg9q?=
 =?us-ascii?Q?w+i2hFjft+dDwETPNT6IZhmAbm2pKfHI11MrnTg3ZXGlwwx2Qjn8WqidGKzg?=
 =?us-ascii?Q?i5oAH/XPjmitGwfyMheG8yKzZJ3l757oV1cYW1vM5kFm8p83O/pI4S9RPZF1?=
 =?us-ascii?Q?Nz2LOMncFWSie60qv+xDGRPfj4flGKEXhXntlRy2oDqjef62Ig/BBtv9RwB+?=
 =?us-ascii?Q?c7TZZZzgTvXsZFVgP8LeOZtQzdzbG7SoT/u6N+Q1IbugGXB21j43vbqiHRsx?=
 =?us-ascii?Q?zdb4u39hIZwO6OAMbIjnl2VGvS3asMbzHCnRHRXWTkwO8uycYu3NwSaPmJO+?=
 =?us-ascii?Q?IqnXBT5PzqGUzjznaxQPD/XSDBj7j2QdifwX+4ntq31nIBOZfvTrfAR0rT81?=
 =?us-ascii?Q?z2VyimL7ey5+SvTLzQVt4d3S9EGDYOOqj3X7NnGuZcdoaz5yS7UMpvDRteJv?=
 =?us-ascii?Q?LHo3WlBTB56hoeXjf+n1NOzK9IgcrNfAnh/74f+L5RSHCLcUjop5yd/S9gcy?=
 =?us-ascii?Q?KAiFlJO1NPI+IKbqlLHmP2jHrkTllly8CfFKdvsHWA8sglP9sk2XNZosCZQ+?=
 =?us-ascii?Q?gapmEdiuNOds/TlOhpnmYEzHqWKTK0asH1RHEWgQjwu5yKH2MH9uG/DTDXD6?=
 =?us-ascii?Q?wJRfZ1Uo25bLExUGmIS0Rc+0zzSlrBWYVo/rZOV8cADdMhTLZ8cD/ewu67kC?=
 =?us-ascii?Q?pOUXBkoba5MfTLrwLCEHaGAszp1KTfZGOzjYGgN3VN8DKXwIx0QqSFpCbiMf?=
 =?us-ascii?Q?EWSBqqPORBSdrJDQxwAyJQG50Ifi9oUNn8vuXLgAm2qGUsnhCTgfuvLPcZ0y?=
 =?us-ascii?Q?odnOIoBO0z+8OeYgh7KcjlvhXcneg57y7r3fkAlUWGpb4J5iec3exwf4HOr4?=
 =?us-ascii?Q?pKmUjPyuv7khv9cq3nZaPu+lOGI3te1Ic9Wsrd2sKQYmcETRBxZm3vSEVcgE?=
 =?us-ascii?Q?O/TlUoWWbK+/GKj80z67jw65hadav3Qg+/7/juURRaj7zAY9zJGGj11N+WLP?=
 =?us-ascii?Q?uyCzOrgmTB+NQNi4+gqlIIY/kDz3qCRKpDCGnFZs0InPVjawCiO7AXDvn2Hn?=
 =?us-ascii?Q?BlaFjOuQIPnE8Mpz+PFlvyNwm725/QqyTfPF+efS1yDfpFbnGGciQnb0xltx?=
 =?us-ascii?Q?W3mU9x4ZuyV6DuCYTcMQha9Pu5tlkHzNQMeHf1CDN/c4W6rwR0/EddLMmy9k?=
 =?us-ascii?Q?8wy2p6ElXD3YAfUEBtziGprLUMemxm5TVUthE2Mj++58VOqKaIR/7hQ6UspR?=
 =?us-ascii?Q?NUr4VpbwdaKVcbbRIVS5YQZE7tdOenPge42BPXpduUXFhYZhvQj8ptRssnu+?=
 =?us-ascii?Q?TNv11S2FyHhZq94oM5MOqxmske8f88GrRKU7kxkgmDJGiDiaHWgVFGRjY8+X?=
 =?us-ascii?Q?DPvAE1Je36ir8lIwZa/kl2I+LOfZJ9fu5YyZzvmjEk5O0QhhF5656KF1xJK7?=
 =?us-ascii?Q?fko4cy88uqLlgHwx6eYlqHxYcuJq0at2Cke0aC/nTPDqI/e1zHrPdLmqTWQu?=
 =?us-ascii?Q?wW92ajizN6gEL31jwons8RsQgGHzS6I=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 521b4647-0fe8-44d5-95da-08da140dc7e2
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2022 18:31:04.8536
 (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: 8jiv7Tz1Xepaw1XE9vz6TMVgtVoV23ApxINhbcvhUwa6eRmydzBPFLY2My9uMHuzSmJ5dJNh500EtlMkjDOXcvHXvB0nnbvaskpRdDPv9b0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5502
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.425,18.0.850
 definitions=2022-04-01_05:2022-03-30,2022-04-01 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999
 phishscore=0 malwarescore=0 bulkscore=0 suspectscore=0 adultscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2204010087
X-Proofpoint-ORIG-GUID: vzfPOf5-87HqRVTQUHINmE-SzZ1tWF5S
X-Proofpoint-GUID: vzfPOf5-87HqRVTQUHINmE-SzZ1tWF5S
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().

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>
---
 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 58d1b58a971e..f93f2591fc1e 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -227,8 +227,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