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, david@redhat.com,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com,
        eric.devolder@oracle.com
Subject: [PATCH v8 2/7] crash: prototype change for crash_prepare_elf64_headers
Date:   Thu,  5 May 2022 14:45:58 -0400
Message-Id: <20220505184603.1548-3-eric.devolder@oracle.com>
In-Reply-To: <20220505184603.1548-1-eric.devolder@oracle.com>
References: <20220505184603.1548-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?xlKiwDM9gF3EYDWoh0iLMV1tsLwHKT0d9nxJyHf3Iduf6GL5sQbDR8j6t5qs?=
 =?us-ascii?Q?Vs37BQKPvdBOn1Uco9s5tJBwf4PSOAIuN3wZ81kk75RvmRzmPHhPb2zu49F6?=
 =?us-ascii?Q?JHQ+gcZ3jbp3pv76SMBHCXUZtkNgVNjpgFh41DFRgsw5tl7khXSl/5sUifn6?=
 =?us-ascii?Q?TydMai1QQJNZJUPybnD6OFmZ8DHT28KG57YZxIJq3BnbY7c1Xj5OEUp2FcXF?=
 =?us-ascii?Q?2kCZeG0CijJ45xi5b+jH0AXN6EfPTPzEpNo6b/73rulNDM7g24H2QOZJ5abB?=
 =?us-ascii?Q?zSaRpOhgODrim7jMS55gSdklGQpWFYVnRwjsmUJ1Dz8pDbRpA8HR3cKbvAo1?=
 =?us-ascii?Q?YDyNqukv4RYzNW9Qr1UXjyxQGJeG4dI3muaVcAv7ZN0uKEYZCkd93HbnAExv?=
 =?us-ascii?Q?fgqYB/qo0jCE37CUAD1nkQIcNwoT1igb/yjEX6g/vhK+239IRazk0qzkpIWU?=
 =?us-ascii?Q?UkIMWvu5jXbNQqak5sRdEjBSOcnysq3JGgZkGXCIu6RMWCEYcDKeU6mHptyL?=
 =?us-ascii?Q?v5MyVdGQHLy+zJ8S4vZ6LLzvbR9xpUSzJmNjjzgGCBc/i6jcQFiYX1oKeNlX?=
 =?us-ascii?Q?62Qy1sII5vkDyvtIq0lGcMMpdXxl5U2RdcMWPCE+XB7F7f+hY4LfS5BUgZ7B?=
 =?us-ascii?Q?yBjAtNtjddnfoDCdfPpt+xt/TptehtEJDq10m0sA8SKTEE8XOePqyrlqij6H?=
 =?us-ascii?Q?Y5XqQccz2A/Aw5UnVuWc98T97EjdLRA6pG420J1h3th1jv3SyBg66TFMPW/+?=
 =?us-ascii?Q?WLVSLAi024V1j80I8oQCV2fw0WY3p9YaLlHVCemC1IGpaO0llGPtlLJj6xcB?=
 =?us-ascii?Q?TQez8nO5blbX7ABUuZ3D+aIqyotnInTjc1fEhZdorNBSfBxhlNpqB/mvzxrV?=
 =?us-ascii?Q?C2PhEbFuuAcHiNZnieh9Jle/+j5KOy9RPxHm1F7ItNygXxVnyMLHiqQz+F8P?=
 =?us-ascii?Q?BgT4jMmZCWqlVopwbKtGt98bUxTinsRV7VMgLbaDpCqreYe9wUprKP5ERhwC?=
 =?us-ascii?Q?+Ilw6uSYV/i4j1y4D4TW/qs8oIokVeZxfXxL5DNXTrwjW9MGM5uRM5R47D04?=
 =?us-ascii?Q?1osqo3S41SvAIAfIw0p0S4cnE/5757ocfAQodSM7HpSfaL8/MF3mOJBWe+7e?=
 =?us-ascii?Q?mUcKWnoknnuDlJA3bjF7ueIeKrqn5lYCSIoLWw0HXYua1/fXXrywJ0Y/nB6B?=
 =?us-ascii?Q?V/Fz4AS6zBIouu7mNT7ismQs6YKK+0dtHZImXMGTQ1G6nk4uuGfUSe+GdUu4?=
 =?us-ascii?Q?qFHEJLaxkkNs/BS5wTo/93UTvBFS2XOqA63G5HOxQUA9fc4Vg0vgAmW70sxs?=
 =?us-ascii?Q?68dLFbfPLkDYftQCMpHa1fu/gZwFhb4PtHzR5kry5aF8uRlEQO8QyWfMoHAD?=
 =?us-ascii?Q?9WxQgWfqy0QsTrJT4HcYqLw5WD7poILddbwniRms9oWp6Rs046ANQ0pAvPir?=
 =?us-ascii?Q?Moq9ja6AE7IRwP0QctUJoCVsVCp3ctZQQ74Fb6Ciy03qaNtuUzen016wMszl?=
 =?us-ascii?Q?TJ8wG4j5U9kiPzDlrRkOCtz9G5nd5KhwkF1fT+BJb8PSRQa+CxcCgURfozVb?=
 =?us-ascii?Q?Jq4ia51CpILPKfI1xq5l8nLvmp3UQDwsEq1DMlAwIneajL1gC+Ydq83yHtWi?=
 =?us-ascii?Q?jLuhZgSLxwujmAa/oFUc9fMYefGz4+G/196Px+OdbBmQI33eAxv1SqwMQ1IQ?=
 =?us-ascii?Q?b1U1bdsLJGKfmVOMUk0be/bMGWsfr/FJp+wXOtUq0h/mKEx++mmJ1PRYcz+g?=
 =?us-ascii?Q?Cfded+u2VocMGFhYy5GHUqC5zVCJgm4=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f5f4dc83-191f-49ef-31e1-08da2ec79116
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 18:46:29.6054
 (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: cIonltKX+gzMKKwpnz/oSGQml4/k/3BT7bl+OIi3qIEiIC6TT6/MIChPjrQ/g/+kN1qIwU5XRBFPlXl8cD9cKhT6SwQXIcL/B8y8nUKms8A=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR10MB1875
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-05-05_08:2022-05-05,2022-05-05 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 adultscore=0
 bulkscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2205050126
X-Proofpoint-GUID: 1YiBT9c9wmfh0SoH4pI9qxQOaohbyLsb
X-Proofpoint-ORIG-GUID: 1YiBT9c9wmfh0SoH4pI9qxQOaohbyLsb
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