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,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com,
        eric.devolder@oracle.com
Subject: [PATCH v7 3/8] crash: prototype change for crash_prepare_elf64_headers
Date:   Wed, 13 Apr 2022 12:42:32 -0400
Message-Id: <20220413164237.20845-4-eric.devolder@oracle.com>
In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com>
References: <20220413164237.20845-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?19dBkwTkvalPJsQALyAkqo95FncDxXeBkJIxY1MvK2QrUcUYbioIE/975ihR?=
 =?us-ascii?Q?3OVWxjCfJNqnDkykoD82ZLw8p18aFCfv8749AtkJGeiBwpo+DHrRchKp43iI?=
 =?us-ascii?Q?wmq6yZz28AzupTfC7JNwEoQdVIdOcDCi+fSvhxqZbvX1BMXavOxc6u4DFC5D?=
 =?us-ascii?Q?ns4rMxmGmXXN+7h2O7eJROEladGhpUIlnhzhBkuk1Wd/9J2FCQTUKdatEQlh?=
 =?us-ascii?Q?dPZUvL2qWI0pqswMl6WBD7JUFVKqU8g44vU1hOlIHgu1e5Rku9XYrn6/jsaA?=
 =?us-ascii?Q?qkNB6qDqpggPt9ooVdRTaNo0U7VT7Rcvf5qomKot7saTnj53nIEPzHG3SdBZ?=
 =?us-ascii?Q?MCSIPe+nXhnsA78TNzNKQLSDbQzVtxksR28BQxLRlCklFSE8Nxk3Lb4+VJEb?=
 =?us-ascii?Q?oK0NY3nBqj9XaEGawqPHlbzC6+CFwLIB8hWTQWfKI2gaeTJ2lcR3OKi+1cm3?=
 =?us-ascii?Q?JmKqjP9SW39uYHdSaLlhYIcTYjJiab/u6IhAYqWa6ZfwSDzqH2UGd8gCDCaW?=
 =?us-ascii?Q?rZai09KHgzESwiYHKIF9zqwOzIzjEG6y7PCRwiUfCqFbX6NYyPMwnZIORlef?=
 =?us-ascii?Q?UrfpAoBRL5Fq6j5ifUDPcE5mUX1OeIPX8lOWo4JV2U0RyefgpptpbpJpTGsx?=
 =?us-ascii?Q?V0fH/nZQFr3/9imVG558EuKdoDS2VHTeRS3YuQvFY4y1O0826RflSTd434qY?=
 =?us-ascii?Q?iWoyHiolOxQMRjyHDL8muH4FDU4Cx91GgXW7CNFcJx1s8J83j7N/+OP1e6b+?=
 =?us-ascii?Q?+zPr2N8png680KZrsGJl5V3TIJozZDSXLX/61lZJHhquPIaTw56XrdJGJ01X?=
 =?us-ascii?Q?6EaauhW1Mmgaz0H/4efcMLMKxuH39tVLldZy1BqKysrmlVJUkgmO6jSWMmZ1?=
 =?us-ascii?Q?GddT19TGQ7mJQKs3o4aAFwoxlol8UPXEw+yxnUUWX0Esfvs2U39jxArQnzeL?=
 =?us-ascii?Q?EXU3RghPu1dGF/5Lm9vBxojOzI5b96krohfMrCWDFgt8qtOqHge23izf90yY?=
 =?us-ascii?Q?rAyX9wn2SmHvJNqAdtYCjBSNGdgmCKh0iNoz6T799bOiizZBmnf1yC6+3JX+?=
 =?us-ascii?Q?R03xS0/gVp1PCrb4eGushhDo21F+hgoXvoCnu1CakPRp2XUOzjG76yPkn7Ft?=
 =?us-ascii?Q?u6UQTNrDkmgPmmz5JP9O59sCfN6S2p4GdOK3eZd+e3V/Q6lIB6c5CZjKzlWL?=
 =?us-ascii?Q?gjOpMIRA3acFfqPND6j5OfOm4snj2iPi1CszDpdMYWZ7EmPlaxHbq2Z5Mjl3?=
 =?us-ascii?Q?h0DXydO7xaHJIEwgG9vEIpLI0MLVocBnA1fc4Q4Tmj9GlDIkSXE3m1Ddvqz5?=
 =?us-ascii?Q?2KvLvSM8kQUkYWM90SZdl67sp/G/B/2uinTBdi7K3jpzkNkVCS+f4mnXaDEf?=
 =?us-ascii?Q?/IVig3Xvxq5Vaaa6xVtgGtNGLWueBIKiy2LsL2xJpxSr5dsGU07yPmIMIiqQ?=
 =?us-ascii?Q?m6ij3PlyrrDTLb+7HQ5momEMR1+m7GDJtpUsrJ+v6tNgh0YQvxflifdcuDlX?=
 =?us-ascii?Q?17qhMjxXEHC1WjQWI89iRY6+rbur1Gfi9seUDHhQvcwFRe1JwAr25MrHAbJV?=
 =?us-ascii?Q?ET4o3kgZXIIpkZsLK4gZCn0pYbNc+7yMU88chIGYsGpK167Xi9z+uR9PvZTm?=
 =?us-ascii?Q?hne2Hl3oJnPISiTztMHHMghd3ppCCGmB9osiBu8Wq9UJIy8QZ+bu3l4FyQXt?=
 =?us-ascii?Q?hmQm5RAsvYClx79e4C/wpa2lfQ9qVlfVxyXaImSbpTOcqoh6WRK6736gdEOy?=
 =?us-ascii?Q?UAWo0kzi92H9zKzAvhcriDGV+lt+zQQ=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 615bc69f-5047-4646-e485-08da1d6caba8
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 16:43:00.1710
 (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: r5+N0BpiIDT0qEQNGkdMkn/BkGJRHc7HS9W8VFfld3bjdiGuaG/58UEVwh5XyDpyKetYQnXphT52ZEi00d9+Ak6Gcza9wUPohUPY7nxK82k=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3560
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-04-13_03:2022-04-13,2022-04-13 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0
 phishscore=0 mlxscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2204130085
X-Proofpoint-ORIG-GUID: Rmjzp0uMTWQV8wKoTXupa56wqbeGW8mx
X-Proofpoint-GUID: Rmjzp0uMTWQV8wKoTXupa56wqbeGW8mx
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_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE 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().

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