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,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com,
        eric.devolder@oracle.com
Subject: [PATCH v4 09/10] crash hp: Add x86 crash hotplug support for kexec_file_load
Date:   Wed,  9 Feb 2022 14:57:05 -0500
Message-Id: <20220209195706.51522-10-eric.devolder@oracle.com>
In-Reply-To: <20220209195706.51522-1-eric.devolder@oracle.com>
References: <20220209195706.51522-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?BOFet9NCVIQVPuEfLT8IWFLAkBamodr7jKy7HVonIo4j42jXfPKCB0mTacX4?=
 =?us-ascii?Q?DVT74Lu1bXc9YUmFrV9r/LH1gj2xtBeLwPQf3jrRXoMJn6KmjtMV+AiGonYn?=
 =?us-ascii?Q?ZpNlujNx44i6aSR/GsW4SOtmw27+SwQpQb2IKIe3v87MQBJ7QfOKO4IuDhAE?=
 =?us-ascii?Q?QJqPAqO1O0m0axDLpG7Gz36iFsucvdU7AJXBR0j2g2muQOGVhPHC17SmXZzh?=
 =?us-ascii?Q?so3f/I6gV/t2KJDkUrQGP/FgZ6g0gF/KzHHcrNH8cLgfqegATJTKCFxDJ94o?=
 =?us-ascii?Q?TJjUuPgLyIh2xi/WT+4Lm75mU+C2QRIesPgCe21I1C/dwpGB7RutsdsNIWuk?=
 =?us-ascii?Q?xHPKh8/CBqaeQtM8SBVrwz3OufooecRUWl30xpI5Qq7SjjqnkUwAljjtUsBF?=
 =?us-ascii?Q?q+UsygUftWBJDi5gW2P3+dxX10529ebDn/UVjzUOS5I0h1kWBSdo/mAr5XJn?=
 =?us-ascii?Q?nU2aawB5o1SOoQD6Ym9QoWHqUsrkQyjaAO4zpfrd4bdSNfL5efVJE0SYd8gp?=
 =?us-ascii?Q?4HyR/8s13eY/rRfKIus1SDWWmE6tR6+99mAUo4nOhwYbtv3ZU9HDtLUXNCQH?=
 =?us-ascii?Q?yx4s2Ay3nlF2Uie8t6SqdFoO1EO1yX/Sboo5lLimLP9fzWS52cfa3njjlCoJ?=
 =?us-ascii?Q?WU8k3Z0okM+4CevZVrU8t0fLaqVt9n8aKexfInR9GeeQV5mdRmme7KuTN2gD?=
 =?us-ascii?Q?Hyif8+dT8mcPQv9098SUbd7uYcGKQ22JYAA/bAqeMbR6bpaR3gkJMar58Ljd?=
 =?us-ascii?Q?g0LLoqsPFWNuNjoTtGGPPerGc14lgu0FVFlH7f8C1Q7sdua6Nl/wzGyGJbgU?=
 =?us-ascii?Q?KnZbhn60NPz2RrWaUGSwPzD1aIGT8vyS+zKIlXY9e+Qa0KmK//TTCFlAFPSl?=
 =?us-ascii?Q?R4Fw4s5awjYYq4+ik0auhP/utubqcmGWTnd3v3DsrEo34dETrRPLuBYiXMYu?=
 =?us-ascii?Q?ffZ7tQ5+Y0o7c3qUY0Zosx2y8tJMtZYOSxeA9nH4PgETUH+mP0tmVJ4No3U1?=
 =?us-ascii?Q?YJ3bk7gWKtvc7WgGVb94a82FxSR5OQfiPjIza++/p4QiyAoR5eP3Hjx1RCiL?=
 =?us-ascii?Q?aupik4Nez2DTcJiXO2uVhgM9AHqImm9UfP3R4u8K5a98AlZo6BhNl5E2Gk2A?=
 =?us-ascii?Q?N6tbFbMn8zhtzps9pGex5KyQf/1g9d/F/rOOfviBJuUQB2QbZIMLZHsUUeqB?=
 =?us-ascii?Q?Eyis4XQgYi8AKfOcq2rDL2DFyqyt88k7Z/bgq5pigrV0SzCqZ7NkTQITynGt?=
 =?us-ascii?Q?pbXYepwAIzfRHye47I3N3QlSNam5yuBlDfstrGrHmg5hH2kFg6CkP+7VWLyB?=
 =?us-ascii?Q?L17EHpSTdDGalr+eAUjnW9DK+xuSOWCyfOGpLFb1F6FtSlz/+VCHCIPuyLog?=
 =?us-ascii?Q?o4xNSLZnXSImOcwiegnCFgvGBbi4GwpwwQp7pz7VO/VYMTJFIqN+L35lYziX?=
 =?us-ascii?Q?g5da/6BTFQm1oIE/11NlbprVzlgjPFXA7dKHdkwd58cCgET7gDHOAc7LYveh?=
 =?us-ascii?Q?z7PBsO3zoHV5NMzzNJUFcN6e5ziKN31eH6wSJA/i36WO+OaR2JIqAx4KUMkV?=
 =?us-ascii?Q?rO/tGnvVuG4foDU+g2TQ2DXMZry2E6H/w0chFjwpzhAuL9e3uluXRAnMd3/q?=
 =?us-ascii?Q?Y06UgL+Z/mmGSgtR7pke4Z8nRxn7ju76mgDaNP0USppSbxkdZtOfRGcoANBv?=
 =?us-ascii?Q?/AVGSQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 44c4cf31-49d9-40a4-320d-08d9ec066dbc
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 19:57:40.6363
 (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: KJI0t086g86mRyOqKiGkQS8MIgBAPNgC6rZwJZqyj/0pnOCt5KhdWwdMSt+UIpZbNHgJc2opM7kow1gCK81d/dqTOL8loY/MVmGvzeidTbU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5701
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10253 signatures=673431
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 suspectscore=0
 mlxlogscore=999 mlxscore=0 adultscore=0 malwarescore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202090106
X-Proofpoint-ORIG-GUID: dbAX5WsMD-dfQtqAhjkRB693bolBEkpz
X-Proofpoint-GUID: dbAX5WsMD-dfQtqAhjkRB693bolBEkpz
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

For x86_64, when CPU or memory is hot un/plugged, the crash
elfcorehdr, which describes the CPUs and memory in the system,
must also be updated.

To update the elfcorehdr for x86_64, a new elfcorehdr must be
generated from the available CPUs and memory. The new elfcorehdr
is prepared into a buffer, and if no errors occur, it is
installed over the top of the existing elfcorehdr.

In the patch 'crash hp: exclude elfcorehdr from the segment digest'
the need to update purgatory due to the change in elfcorehdr was
eliminated.  As a result, no changes to purgatory or boot_params
(as the elfcorehdr= kernel command line parameter pointer
remains unchanged and correct) are needed, just elfcorehdr.

To accommodate a growing number of resources via hotplug, the
elfcorehdr segment must be sufficiently large enough to accommodate
changes, see the CRASH_HOTPLUG_ELFCOREHDR_SZ configure item.

With this change, the kexec_file_load syscall (not kexec_load)
is supported. When loading the crash kernel via kexec_file_load,
the elfcorehdr is identified at load time in crash_load_segments().

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

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 9db41cce8d97..6215c51919db 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/memblock.h>
+#include <linux/highmem.h>
 
 #include <asm/processor.h>
 #include <asm/hardirq.h>
@@ -398,7 +399,17 @@ int crash_load_segments(struct kimage *image)
 	image->elf_headers = kbuf.buffer;
 	image->elf_headers_sz = kbuf.bufsz;
 
+#ifdef CONFIG_CRASH_HOTPLUG
+	/* Ensure elfcorehdr segment large enough for hotplug changes */
+	kbuf.memsz = CONFIG_CRASH_HOTPLUG_ELFCOREHDR_SZ;
+	/* For marking as usable to crash kernel */
+	image->elf_headers_sz = kbuf.memsz;
+	/* Record the index of the elfcorehdr segment */
+	image->elf_index = image->nr_segments;
+	image->elf_index_valid = true;
+#else
 	kbuf.memsz = kbuf.bufsz;
+#endif
 	kbuf.buf_align = ELF_CORE_HEADER_ALIGN;
 	kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
 	ret = kexec_add_buffer(&kbuf);
@@ -413,3 +424,84 @@ int crash_load_segments(struct kimage *image)
 	return ret;
 }
 #endif /* CONFIG_KEXEC_FILE */
+
+#ifdef CONFIG_CRASH_HOTPLUG
+/**
+ * arch_crash_hotplug_handler() - Handle hotplug elfcorehdr changes
+ * @image: the active struct kimage
+ * @hp_action: the hot un/plug action being handled
+ * @a: first parameter dependent upon hp_action
+ * @b: first parameter dependent upon hp_action
+ *
+ * To accurately reflect hot un/plug changes, the elfcorehdr (which
+ * is passed to the crash kernel via the elfcorehdr= parameter)
+ * must be updated with the new list of CPUs and memories. The new
+ * elfcorehdr is prepared in a kernel buffer, and if no errors,
+ * then it is written on top of the existing/old elfcorehdr.
+ *
+ * For hotplug changes to elfcorehdr to work, two conditions are
+ * needed:
+ * First, the segment containing the elfcorehdr must be large enough
+ * to permit a growing number of resources. See
+ * CONFIG_CRASH_HOTPLUG_ELFCOREHDR_SZ.
+ * Second, purgatory must explicitly exclude the elfcorehdr from the
+ * list of segments it checks (since the elfcorehdr changes and thus
+ * would require an update to purgatory itself to update the digest).
+ *
+ */
+void arch_crash_hotplug_handler(struct kimage *image,
+	unsigned int hp_action, unsigned long a, unsigned long b)
+{
+	struct kexec_segment *ksegment;
+	unsigned char *ptr = NULL;
+	unsigned long elfsz = 0;
+	void *elfbuf = NULL;
+	unsigned long mem, memsz;
+
+	/* Must have valid elfcorehdr index */
+	if (!image->elf_index_valid) {
+		pr_err("crash hp: unable to locate elfcorehdr segment");
+		goto out;
+	}
+
+	ksegment = &image->segment[image->elf_index];
+	mem = ksegment->mem;
+	memsz = ksegment->memsz;
+
+	/*
+	 * Create the new elfcorehdr reflecting the changes to CPU and/or
+	 * memory resources. The elfcorehdr segment memsz must be
+	 * sufficiently large to accommodate increases due to hotplug
+	 * activity. See CRASH_HOTPLUG_ELFCOREHDR_SZ.
+	 */
+	if (prepare_elf_headers(image, &elfbuf, &elfsz)) {
+		pr_err("crash hp: unable to prepare elfcore headers");
+		goto out;
+	}
+	if (elfsz > memsz) {
+		pr_err("crash hp: update elfcorehdr elfsz %lu > memsz %lu",
+			elfsz, memsz);
+		goto out;
+	}
+
+	/*
+	 * At this point, we are all but assured of success.
+	 * Copy new elfcorehdr into destination.
+	 */
+	ptr = map_crash_pages(mem, memsz);
+	if (ptr) {
+		/* Temporarily invalidate the crash image while it is replaced */
+		xchg(&kexec_crash_image, NULL);
+		/* Write the new elfcorehdr into memory */
+		memcpy_flushcache((void *)ptr, elfbuf, elfsz);
+		/* The crash image is now valid once again */
+		xchg(&kexec_crash_image, image);
+	}
+	unmap_crash_pages((void **)&ptr);
+	pr_debug("crash hp: re-loaded elfcorehdr at 0x%lx\n", mem);
+
+out:
+	if (elfbuf)
+		vfree(elfbuf);
+}
+#endif /* CONFIG_CRASH_HOTPLUG */
-- 
2.27.0