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 8/8] x86/crash: Add x86 crash hotplug support for kexec_load
Date:   Wed, 13 Apr 2022 12:42:37 -0400
Message-Id: <20220413164237.20845-9-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?2Xa86XEnbOaiB3ogIwK5KLBZV9PsRvkLIliJ7f/dPyhzt2MGW2bQO1vTRjqI?=
 =?us-ascii?Q?6DE2i2QWOTrLiB3w4eJAwvl7sTsFVJXWzFDWyqVFWAl9v+IhNPJoSiv1PK2r?=
 =?us-ascii?Q?TfnZcWogwY393LGn5fujMuKZ7kGimRN3FoiiggbZ5wHQnnzs+46rQtUcNhxn?=
 =?us-ascii?Q?tawF41oj+0YnZxTC9froSGXpWHZvSOvK2uij9xelvKaMGvsq3WU+HqjE23Zr?=
 =?us-ascii?Q?axvYyPhhtCW3W++KjksBIw70sb31D0i+w+UhZ4eNIMbRZO8lce8LcE60qS1n?=
 =?us-ascii?Q?bJoOlTYdpK6H+DryCVg76LCV3nl1uguCkUPgwPccdyW6AYPqgSYSmgcUVid4?=
 =?us-ascii?Q?xjSQ2itLfsltkJ787aVDYNihe/DVGSf3GVTqK5BdGP1lGg1bDxHtkuRsLcv/?=
 =?us-ascii?Q?Rp2NFya3OiZcQ2G7XfUmSOVlnZ6HImnzfom+CLg4cmeYtqs2Fpywd2HEY5TZ?=
 =?us-ascii?Q?ELYmEwU9A7hmD45RPsiZoKUPC7wCIvnbn9HjUegEUN1n8OZoe+IrqSgRsEBE?=
 =?us-ascii?Q?yZeUsjRrykBwl4hjzhbk5OdypzQVe1aNc5R3scJ3wZyyOFf0ZNWcaRk7XJC9?=
 =?us-ascii?Q?o/va1AB4Op4AzEKYfeF9y19CpAFk0T+FOww+dehN5+UOlZWxywOobY2ZietX?=
 =?us-ascii?Q?xMQtZp//zbVmV53zMIousBplx9oizSoV9Pmn6mRqgDM/mRJ92qFh/eXHW9LM?=
 =?us-ascii?Q?nDwIUpnyipUnZPeIvw+PtES4Ek03FuliNkWWJj10LGGlBg9fXfwfuSvdKCYJ?=
 =?us-ascii?Q?mZsEVOhE7rIW1C2lWbStqIkozH9Fufr6/GHAJ7aigX+1SFqa4xXpEStFR+rp?=
 =?us-ascii?Q?4B6NGjOpEZwJwL//daIDsYj1LUdMTD9SacREHLT90rvL2kAlLMKaU3RT9mgV?=
 =?us-ascii?Q?aYHFZvALr594ExTKG3Fx+XLdoFycgI0sPgdw840CyB+B6+JsqWuLo55RnN1l?=
 =?us-ascii?Q?hVPmWgUQMCFrni8g1yYt6UIdbcSfVB53tDaHh45AxktoNQkX6rXgaKCyhqLr?=
 =?us-ascii?Q?bDY42RmGEnT1nVhR7ZzrkGotpOtD+WMZxXatA892pp6+ejTv8ASrtKAE9POV?=
 =?us-ascii?Q?k8+6YRM3QMIxQa6BXLjtepM91BZYM8QKODxoVIa0dA3kVVooXnqx+NBdtV4u?=
 =?us-ascii?Q?cN05C2jZDN+3oaCJ03Lnn1+OKRdyfwhoIdbt6ZSVTCQY+7UPggLh6YUXk34l?=
 =?us-ascii?Q?qXipQqEWq/1BBBmuyYBeQQGVAOvJXS1TCq4sND9h+YoHoPKFz3Hqr+AfxjQY?=
 =?us-ascii?Q?6BxVDiGusWIenDthufeQVPj/33mHBjSB7mTuE6N7ntoWcrq7/84Bzih/qND6?=
 =?us-ascii?Q?DFl/wDXdr7CUT5ag4gSfbo3vDEWPBrgQGA+xsErF7AZBug/hVoFig38dw1o8?=
 =?us-ascii?Q?5PSCqMfmZHE9TDRNQYOdPLuMwlCfs06/ESem+79qxH3G1f3RndWU9S2qx0g9?=
 =?us-ascii?Q?tVVNg8r8r19TUVJC0Bp1NdyRf8TyODNTI/ZIn8vcUFn6NLNcgqWFeKu/YayU?=
 =?us-ascii?Q?aNdr8qIwJVelGdV9SxAjw8q6i5QVHrRiEMetHASwWLl401IptCvpxZ4ftRSf?=
 =?us-ascii?Q?97HQfKmIoxU+WKFi79bz/8UX1kGzrDdmgi9Rm8bXRRGkyjxiuWnWAf592gv3?=
 =?us-ascii?Q?6fR/puzZ7LFBzGTuUjOCBZUPeRiGRDrq0Y55WTCphAeTAgOtPaWLVFLJiN9P?=
 =?us-ascii?Q?aLM9DwI1QLypQWaR3uPwzzsHpxC4ZLTekLiDTenMMEo96YFtBP4N4MVrV+6n?=
 =?us-ascii?Q?o43vkeglrrhMLi5uM0x2qM1blOpjVDw=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 738ad679-4d54-400f-c5e1-08da1d6cb445
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:14.6819
 (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: AKPVykerY6vNeflr24ZBzk7KRB4Wb70zNIk1nREXcLQFZpcOoGmEk3wyOjpksveh6r7ZdFb7jIVNTnvn5YgHmZaT0OD1FOLKY5NpqMHeQ98=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3562
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 suspectscore=0
 malwarescore=0 mlxlogscore=999 spamscore=0 adultscore=0 phishscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2204130085
X-Proofpoint-GUID: c4AKapGgLogrlKJYropA2lvGsNRnRDte
X-Proofpoint-ORIG-GUID: c4AKapGgLogrlKJYropA2lvGsNRnRDte
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

For kexec_file_load support, the loading of the crash kernel occurs
entirely within the kernel, and as such the elfcorehdr is readily
identified (so that it can be modified upon hotplug events).

This change enables support for kexec_load by identifying the
elfcorehdr segment in the arch_crash_hotplug_handler(), if it has
not already been identified.

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
Acked-by: Baoquan He <bhe@redhat.com>
---
 arch/x86/kernel/crash.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 47adf69c9f71..aa2d9680431a 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -485,6 +485,30 @@ void arch_crash_hotplug_handler(struct kimage *image,
 	void *elfbuf = NULL;
 	unsigned long mem, memsz;
 
+	/*
+	 * When the struct kimage is alloced, it is wiped to zero, so
+	 * the elfcorehdr_index_valid defaults to false. It is set on the
+	 * kexec_file_load path, or here for kexec_load, if not already
+	 * identified.
+	 */
+	if (!image->elfcorehdr_index_valid) {
+		unsigned int n;
+
+		for (n = 0; n < image->nr_segments; n++) {
+			mem = image->segment[n].mem;
+			memsz = image->segment[n].memsz;
+			ptr = map_crash_pages(mem, memsz);
+			if (ptr) {
+				/* The segment containing elfcorehdr */
+				if (memcmp(ptr, ELFMAG, SELFMAG) == 0) {
+					image->elfcorehdr_index = (int)n;
+					image->elfcorehdr_index_valid = true;
+				}
+			}
+			unmap_crash_pages((void **)&ptr);
+		}
+	}
+
 	if (!image->elfcorehdr_index_valid) {
 		pr_err("crash hp: unable to locate elfcorehdr segment");
 		goto out;
-- 
2.27.0