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 v18 2/7] crash: prototype change for crash_prepare_elf64_headers()
Date:   Tue, 31 Jan 2023 17:42:31 -0500
Message-Id: <20230131224236.122805-3-eric.devolder@oracle.com>
In-Reply-To: <20230131224236.122805-1-eric.devolder@oracle.com>
References: <20230131224236.122805-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?uPKpSU7H2rVOo1uvlpkgLtpjDfbSiIt/coQtMZ3XhYpy+JZJSUWvSsmD5Z81?=
 =?us-ascii?Q?5VQrXQJ87ScF/PAbhammcWGBxODGkVtY5ifwByboM6zGx7iPaa0hrMOiseYr?=
 =?us-ascii?Q?/LMVaZly3cYVzB/verVCngkacAHM+3C9LfSvCWp9GcebCnxH81zk7+dVYS8b?=
 =?us-ascii?Q?uqj60YCkC7EiuyXjQFK4nbddzbG8Hdbf86WBCQMr43h4Un9g1zRFt0VDCxtl?=
 =?us-ascii?Q?4/ogC9gpxrRHY3KMd2j9PO0mW65UwMnk+bGhdtYofhpm1ieRgbQXdutptE8l?=
 =?us-ascii?Q?1/ltQyUnQFX+2VV/TaX6/RJvx+YyC+tde+gDyc8VFaoR2/xYNxn6vII6XSx5?=
 =?us-ascii?Q?SU35ZWucuS3Z2MmZGVS/BsvfHqlGEd2YJssvAcy/avHuQicJz6CecoAA4b4j?=
 =?us-ascii?Q?DfRFYsluq7SxT0QNF4lFHMIgtBiSi4+vWLTOq08fvS1AsgQINLho3u/OqysC?=
 =?us-ascii?Q?/Ua9tojdeFg8UhRPtzRMxDtXfkTwTuQ5+nMrkk1ou8gdNGr9AK4ZDdDs+p5w?=
 =?us-ascii?Q?z2VnQbJNNwOcsAYvPGxnW6aIPm5W936trech6Yh2VWxFcIxjye9glQHRPomW?=
 =?us-ascii?Q?k6dATerLe9MUVy5paEi2PTRbmDqCRZ2CVtz1QRyEwHYXhnbwvt9N0wqUJrBk?=
 =?us-ascii?Q?sj0vXVWNq8eVmKXgcBK5gzJndj9Vp2TWRWMUATQZCFRhEfGApwcGQhzzRd9t?=
 =?us-ascii?Q?+wXZt0HGudUjwr987li+Q61NqoVpwX/JO12wY3Cma+WhYKnx3dG6xAeGwAMp?=
 =?us-ascii?Q?nPCmcIjKRuj4rmvHB1lzuWrGoCLrlJejokgA0R8CfA6v4QGDl0L8b0s0Obz9?=
 =?us-ascii?Q?YD/N4nbRdU6E4GeJMMSzvC44hLzfmWZfizJEc3m4BNGUYl2adhqM8ZtpKWbL?=
 =?us-ascii?Q?af3t3mSbbJo9gGTj1QC9xVXACu34Gzrw+aPAcPjmXVuqawMPIwZfPakkU7b7?=
 =?us-ascii?Q?4BKLS5C4M9xr6haU2046fD6BP4aoYFoKBVRj8n35gYuI3x4uRTtfR+IKmVYy?=
 =?us-ascii?Q?duXmye0JofUGhF8bXNKSg56pl+Qp/WCGIXWhYwqBV6JXfoJkAGisuCg39WXw?=
 =?us-ascii?Q?jqxXCLI0HszPZfpHFeA0pJ4QkND3Co9WBV9IEr1J9bk4AIi9vMXSRjemBaQX?=
 =?us-ascii?Q?kovouOWUWOUd3hf9SDWfUzlhJHoSA0UqRBt9sZXjbC/gNacRuTzYZ5eGUi49?=
 =?us-ascii?Q?vE9oEirF2u4uef3Ns9THvUlC47xty7VhIdT4z7wCM5yhZxfOWQ+JMtFvKqvg?=
 =?us-ascii?Q?c9EniZjzs4IAt40Cv9v6g4gaS9GWBS5MivAdMSjYzcaN4Ts9O9a+F330612Z?=
 =?us-ascii?Q?ntVB787OZavBBe0S8DEOD/9+MYHnrRMyOa0FlnLgSJMMwx/R8WGOwYC1LAxz?=
 =?us-ascii?Q?Vkk1ajnVfN2Tw62ukwU6n5fYb09EMX5p0KgZ05sAmSa8lqBggWPZO3XaNahV?=
 =?us-ascii?Q?aVbnSNHHfTKBQdMfKExR3nIqx+eY3CUwnSq3mV1HGsS9dK8iy+gZLErs59eK?=
 =?us-ascii?Q?Mttn8S4699AjJAMo8BhwNSTxDYymr5zcpodLDOMHsaYIcY/KedVUm3+JFYw5?=
 =?us-ascii?Q?SstdXUcVBOE49Z1tjdc00MNrlwLhdKrxA+Sosl3UdHpoY/5vEPBCjO1BKjt3?=
 =?us-ascii?Q?4A=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?DdqigBivX5ufQ9PkZUGVY15qb6v1nYlsYjLAInz5U/7owVvt1WbLep/2EE2Z?=
 =?us-ascii?Q?kBMNNJzHs+rBeBANo4myy7/gr5WYkTptB11971rxHSUUtC2CJz14zc7qjOIx?=
 =?us-ascii?Q?c6oJNKmSzMhR9uDea9cPYIfum37VeOloROwpO7CDAw4cawLHgZQnf8ZO25Cs?=
 =?us-ascii?Q?DjpCUEaidXR6O7RxaCjsDedgRrrlupfRbBVed8Jgl7nZU5HhGAZYxS3dyY/Z?=
 =?us-ascii?Q?rDOMwVjy7ycwS0QHW64IkZaOcUV5R7iGQB34i/0Z5QSUoMaMUQVdVJEflDzh?=
 =?us-ascii?Q?SiJ40/Z/PETsHQCYyogn7wl9zqbj2hUaXEyR6lAGwfLHPorPy4sVyXlqQq2r?=
 =?us-ascii?Q?Pvw0TqQQ9cbvY+QRAMPm6Q+08UHPPVm60puAQbdgaobxbKJ1OhYZvfk7G4zx?=
 =?us-ascii?Q?Xu4m00DgffpZI+PN5b0kM6WkU4VhGdmsRti03hCB3BRerYlBLLdBjBy7+I+Q?=
 =?us-ascii?Q?wUp9nhZguLdjNs4HRkioCdOZAL2lJgiIuVQ+d5uy14R7v7pb4rA0a22IpBVc?=
 =?us-ascii?Q?0/tFobSkTSpvTtOuPEVMO0Q+A8M27KE4FC4MjMU4T1RvSGv71fUlV+ZZtZ5B?=
 =?us-ascii?Q?rcrqPjBo2xbbF9cnxgNrFn/0RGZFrP1JbaEq9NJMtVmgTKiXp3mPiBHhCc4Y?=
 =?us-ascii?Q?cxYUcSaTYJcwkwOsYgUghc75cU/d/K5Ll+VM3IKlUNt4JmX3nNwQRKCY3JlH?=
 =?us-ascii?Q?uEh6+Yh+5dzok1uYvqni0k5AqwZBoNgpSe23bKAOw7IpDnQHMSMjlfxmDCBA?=
 =?us-ascii?Q?HgysMdfe63EYb3cyM2dD/Sl8CWB0p2Oe4ejEP1usKuh3kb8tpe7C4Vh2jkR9?=
 =?us-ascii?Q?bGzWz7u4WF7dLTZkMee6izkDa76R+92eQf0ZAJmX+B2F8ZXsv3PQoADY6BSI?=
 =?us-ascii?Q?0k/VzmHl11enIi9eK6Z9r77Cwde8BmgBmCWNw9Pcfpf3pNxr/7HHm+qq/FER?=
 =?us-ascii?Q?4WcQmkX192/PLVdONmKMqAu6C0KyrXhIEGvaSG+i/GGXkvTYDZAI3YPaFtjJ?=
 =?us-ascii?Q?WD7pmwhCbzrQRAJGIK8jkuG4cNPfJq3Xm0XpcLYHf09zsSuju6kivOfWbomD?=
 =?us-ascii?Q?+ID+N4z37ccurB3Uxw1dWc10Q4fCtoNwA6FVJ1RREorokSBfyoRdFyeEEHWi?=
 =?us-ascii?Q?PEzoUnJySprrUFB6c4HGVGJmEkhUhC2HxewsAEkUI7lxgGzKY0GUWgs=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ee4bc8a9-e643-4f0e-a8aa-08db03dc7bed
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 22:42:51.2275
 (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: 1ODkCwZPsBTnjne39WNOzvwSEDBnHF8Eg3Ls/lpzKRMBaM61aasE+TzbaGw2Dg8S4q1c1k6Xf1mWlUI5rco3+gGsxxZsNQz839UbDr/joC0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7241
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-31_08,2023-01-31_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0
 suspectscore=0 adultscore=0 mlxscore=0 phishscore=0 mlxlogscore=999
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301310196
X-Proofpoint-GUID: Q7UOU-skQM5SXjozUqOdBgWuImjq6zoT
X-Proofpoint-ORIG-GUID: Q7UOU-skQM5SXjozUqOdBgWuImjq6zoT
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 af8854f9eae3..e51d8059535b 100644
--- a/arch/powerpc/kexec/file_load_64.c
+++ b/arch/powerpc/kexec/file_load_64.c
@@ -799,7 +799,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 5372b708fae2..8bb2233bd5bb 100644
--- a/arch/riscv/kernel/elf_kexec.c
+++ b/arch/riscv/kernel/elf_kexec.c
@@ -130,7 +130,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;
@@ -152,7 +153,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);
@@ -224,7 +225,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 305514431f26..8a9bc9807813 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 582ea213467a..27ef420c7a45 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -117,8 +117,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);
 
 #ifdef CONFIG_KEXEC_FILE
 struct purgatory_info {
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 8a439b6d723b..a3b7b60b63f1 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