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,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com,
        eric.devolder@oracle.com
Subject: [RFC v1 8/8] crash hp: Add x86 crash hotplug support for bzImage
Date:   Thu, 18 Nov 2021 12:49:48 -0500
Message-Id: <20211118174948.37435-9-eric.devolder@oracle.com>
In-Reply-To: <20211118174948.37435-1-eric.devolder@oracle.com>
References: <20211118174948.37435-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?13+n5gAplpZuhFV/Z1Tmo9x11zIaXJtVeShSfWCXea9BucAZ2AHh6yUVYNi6?=
 =?us-ascii?Q?Rj7q7Y5ne0slH4pXXzYxFltUpu0GlQoS0oLI9G6ypPlTccNCscl4+bls5oOu?=
 =?us-ascii?Q?Y8s0uRCulzPJLpP05brRnuUk1ZMmnSxGCzTT+PSwnAt5S35HwbIDIJJ9/3nh?=
 =?us-ascii?Q?VG9cGo1dttYaA902ss78zwD2FECwQMbtZ+NL4HcLTIbvbvQ5t00NJA4rZT8T?=
 =?us-ascii?Q?n+DXZf8VSQM8pPbhivoa/KTDvN4AWzi0OT3axlaXkl24SN3SQ6yp62yVR92g?=
 =?us-ascii?Q?aLDgocK6TPoQtm72yJQ5YMWxGZiBw/WMzsOigwaYqeKOzCbMB1buGuCfF9Zw?=
 =?us-ascii?Q?hRwoI2nvoi64Rwl24Kpww94FYMQ+kq2nqKeQMMK15WLSHClv6+W8fZp1xS0Y?=
 =?us-ascii?Q?II33b37FpQDjAtjL82zIvzC9R4H2nFG1vAwQ9Szr6GKaauVskPDVqeNsXz+d?=
 =?us-ascii?Q?jgZb3ZXf1OwMZK46qcEh+H2DP3ahj+laPSRnTOcGaJgDxH+bl5mAqt8mQtBN?=
 =?us-ascii?Q?CjTbLcFsQQ8mYHM6C1RuNI9k2PtEUJrCchFJh4jhaq1K541hDsQLDQrQQQXF?=
 =?us-ascii?Q?odQbBu9Pw2ZU+p1j/TPRq1PufbqIUUQFJ3IhxBkm0FyXTGODrRo9Z6w30o4i?=
 =?us-ascii?Q?AQRXHR3IAHru5YdldLCw9fEb2rh2zf+IfkkdoaehIxi/0Et141fFt2FdtJX+?=
 =?us-ascii?Q?fvqI6vJ92WouGAWiZS1koGs++UPm/A5VWi54/kusQjqp7pXlzMwPB/S5g7+o?=
 =?us-ascii?Q?sm+nBHo9c+h/EHmYqNQOBFK4Ld5A9T9vBbT2FgWGsSrz/FUb0RoaBG3HtMSb?=
 =?us-ascii?Q?4TlDYQNucNNmm1y4/ozIKdYtf2gC/8vxMqxgjBzaIU3GT4eQiLgeyjs9SWGU?=
 =?us-ascii?Q?pUa/XFbhvV9ko8djdCfNZCKcDCmNsSRMJVqSmf8pDtu0YZwdbu930JUJ8Idm?=
 =?us-ascii?Q?x0iJ44Y3JLDIXXGIWRtP7Uwv+oq5w8bSDppmSASL3C1jRaOC9mByDVno0X/n?=
 =?us-ascii?Q?6fllewYRkJfEDCvnLWKvKbKgNULRBgh5MTlT5RADajQOO4WrWYZpe5zeINIY?=
 =?us-ascii?Q?Y0CVWZgpyGBqosf2S2AxUBIxL9uy2lTUjFdymB8eY+4lW7j0nZza08/K6VJ1?=
 =?us-ascii?Q?FgnwxtryJfOP8+2kwDwHBbA9locNWgatDKf51uCluF0SNK5ZCmFi6sslTbC/?=
 =?us-ascii?Q?M1jHZYWxZLJsDJko+0wOkaoa1I3mL64zaM95uTjc/qat5qu1nRNWtT8yOXCJ?=
 =?us-ascii?Q?5Pk+Ymx67o912gIoS3uWVFlhLjOIzYSv0vWlf0obRnuHvNL0SXIQLN8kZ6SV?=
 =?us-ascii?Q?nj1gFe6fiRsYYxtW+i/ToWh2CAerKmDlSZxkmFPlnJZKXeeaXhsHDeDDymz5?=
 =?us-ascii?Q?pBABBRw6Tk1OeSyF6YJWD3Z5vPNLGfDjGu2NwJTyOWE3NA3B8JLP6685QJzg?=
 =?us-ascii?Q?IOjXlZmDbW8/YMTzWreLLLLXUmOHP4EV/hDC04vdtjz6xO1OQIlCfk2iq/s0?=
 =?us-ascii?Q?RyaKATKOPFfjpZ/oi+Ll+kGoyoulTBge7MOmpOu9+l8c0d41cl5P8AdEY5bB?=
 =?us-ascii?Q?UGSU4CC82Z7w6Cp+qod9OpopGBznKMbmvPQ14xw2CgQNOTG00gh3Zs4mEVOW?=
 =?us-ascii?Q?5mDps5+IRwsyvBBTRdST/+MnCbXNXL8INtn4tJWUIJ45d2Gl44vxjGkl8DBh?=
 =?us-ascii?Q?Zy0AbA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cbf354a7-53ca-4ef4-642d-08d9aabbe699
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 17:50:25.5786
 (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: cQYc65zfe7v+vra0iR2PDNDNBELzhnwYRPGgIKiNYba5pAIQIjJgVwi2ibuzwUmLXGSpgAmrvEFzc06h29mhSOluX63fbqpKGemsxqCvf7E=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5652
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10172 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 bulkscore=0
 adultscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2111180093
X-Proofpoint-ORIG-GUID: z3dj9EEbTwmex8fSsaaJc67LlXLfonqZ
X-Proofpoint-GUID: z3dj9EEbTwmex8fSsaaJc67LlXLfonqZ
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The few changes to kexec-bzimage64.c are to record information needed
in advance of when a hotplug event occurs. This information is recorded
when the crash/capture kernel is loaded.

In particular, the index of the purgatory segment, and the handful of
register context values needed by purgatory, are recorded.

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
---
 arch/x86/kernel/kexec-bzimage64.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
index 170d0fd68b1f..1886c215215d 100644
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -378,6 +378,10 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
 	 * Load purgatory. For 64bit entry point, purgatory  code can be
 	 * anywhere.
 	 */
+#ifdef CONFIG_CRASH_HOTPLUG
+	/* Record the index of the purgatory segment */
+	image->arch.hp.purg_index = image->nr_segments;
+#endif
 	ret = kexec_load_purgatory(image, &pbuf);
 	if (ret) {
 		pr_err("Loading purgatory failed\n");
@@ -488,6 +492,14 @@ static void *bzImage64_load(struct kimage *image, char *kernel,
 	if (ret)
 		goto out_free_params;
 
+#ifdef CONFIG_CRASH_HOTPLUG
+	/* Save for use on hotplug to patch up purgatory context */
+	image->arch.hp.rbx = regs64.rbx;
+	image->arch.hp.rsi = regs64.rsi;
+	image->arch.hp.rip = regs64.rip;
+	image->arch.hp.rsp = regs64.rsp;
+#endif
+
 	ret = setup_boot_parameters(image, params, bootparam_load_addr,
 				    efi_map_offset, efi_map_sz,
 				    efi_setup_data_offset);
-- 
2.27.0