Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
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 v8 6/7] x86/crash: Add x86 crash hotplug support for kexec_file_load
Date:   Thu,  5 May 2022 14:46:02 -0400
Message-Id: <20220505184603.1548-7-eric.devolder@oracle.com>
In-Reply-To: <20220505184603.1548-1-eric.devolder@oracle.com>
References: <20220505184603.1548-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?5wYFQpNsOw1Aa9LK/SmKQDcGOSsbTcQH5g1bmWnHMk4UBW7Kpq5s1RlIA8Gi?=
 =?us-ascii?Q?3y2qoZ0YFOoE26VH19yrkrBYHrvq/b93PzcJ9p5z4ZFzeTMi8tDure5GkTXj?=
 =?us-ascii?Q?6tdK8mwMceWEfAsn9h2htns965mkdOkhfpTUwrme+Aw6BsaHH+eKmEF8ENp8?=
 =?us-ascii?Q?tFsYC1ddJuK0Lp0QMPq0/sLPIuiMUlmAhZRI9sG25BsPUh+QLg/MCpweebrT?=
 =?us-ascii?Q?RD00eWL9PECZbGUBomF33TlFuEquQsbI1Pn+djhtG4+CpAJSHW2I1M4X5+xf?=
 =?us-ascii?Q?lK8ciDAd6jkAqXC8RzgF0F4LHNJmJQvEdUdoCUM9T5Kp97Ye4Qku3SzARNC/?=
 =?us-ascii?Q?vbVxG5RjOZU+MFXme57Yxr8VZk0wRyQvUSfrXuU7ZuZLufKzOLQre8JhfFBg?=
 =?us-ascii?Q?A0/ypBgpZJp5uCTnT+QIa+FSssHL4px0y7dMDK7KRD1reMRi6h8FhvSB4LHp?=
 =?us-ascii?Q?DTX7hOvSo7Jn/oUbXEZgLJ9VEZliYFNhAeaIcgVoO9K+hvKyIb/cIyOvRaBr?=
 =?us-ascii?Q?KP7suUgw40LwXjn6gkpADuft4IwAFgzznulmMiNEAo1Kk/p/puxJdbjeZp4L?=
 =?us-ascii?Q?6+pTLlp9Lv3C4E9GxIyL1D7jOw0RCObXGlJHAF6pjIG4lOoQbdG7M90Gshti?=
 =?us-ascii?Q?p6MwQvRpoSFMFB10ys+jQpibopRtG2Jz3/ZZoYLSjotime7zh0ho7vu6c2gT?=
 =?us-ascii?Q?E1JJkVF9h7odeMqS6LWgD9Yp/Qj1QFYNPr4ArFmwWWzhT7AZ1AHR6hgbSNng?=
 =?us-ascii?Q?zaUtkM5t/wM3QZqGqagO7ytyqLZYanx7qWvvtWiJ0UuLOGAm+Gwgvj+OMXhg?=
 =?us-ascii?Q?/PnqeeC27k6qHrs9NEAWkYyA4by+OvM3Q9NueoIUSBxF2z0gHNMrdVa9SomA?=
 =?us-ascii?Q?OFoFNgSpsuiXVjxpRrofBmE0eQZMrpQI0ptJnHifCynl+1TGkdWiXo9dy03A?=
 =?us-ascii?Q?up7woE7HTsVynT1KjgMCze3AJ0P9Nfy9S+1RsfYlXbOzARx4eaBDidGcDL6O?=
 =?us-ascii?Q?asy8U1JD8NWGZ6M4mng8kjw+2GjsaHwkB1uUuKtT05xq2MQKp4J7y89LbZcQ?=
 =?us-ascii?Q?T79fb1nzUPiywVVmk0m6PhOu/7jIX8GkEdA/UpS2ZczyEnd3oi0TuJopoUVx?=
 =?us-ascii?Q?vi37cUn1ZEWEBo1QQofo6GOy+B7mNl1tzE4Cm4ZOzA6OHLkHMGxLqBv4n5nB?=
 =?us-ascii?Q?FCSwevLapHGdKQJp2l6dTAVkx+n78PprGtJREOFPxpfOd8J08La6kogmgkmI?=
 =?us-ascii?Q?jdFaos4uTQioUGndWMm2hah6G2aWX9ym/5Mnr4mP6y+y9LOeFnR6dRSqUaFa?=
 =?us-ascii?Q?2tXndYvAOKb43vDY802iZSTzr7yj1QDr1Nlx+nbs4hwI9oCFOUYPH6S8YYbj?=
 =?us-ascii?Q?0xEAfE4X5WhbK4CiTb+EYlcut9d6bjur7yVRtXkji0aXLlN/OfAkWNgsZ/ZZ?=
 =?us-ascii?Q?t4MahEBjECXoDBTI2cWhQfY418TQewm+tmtFVxev4fOz1Z23ZEBjvaoI/z8L?=
 =?us-ascii?Q?ktyXq12oQbrVLLhDOio2oSEVW5yKrEB8hWTIFpz4nigwwe41GGW7ht5AiqbP?=
 =?us-ascii?Q?7f76VXYIEhcGA5BPalPcBpvG4PeRHTZzytolcNokIVxkg7E3bZSxJ2y2HGTb?=
 =?us-ascii?Q?m/5Y0BO95aZdQ1jdyRidPFNZDyDGH0yUZ2SUyaSCsvnagVV3/hW2o7MuRFUE?=
 =?us-ascii?Q?7yS5f9oqreE/ZsGvn+yQSxdIpD1F+Pbu5KVYXxlBdwGL2wDIdaY8xOnKDf6p?=
 =?us-ascii?Q?w1pDFgtXKbf88If+gp78ECerEvLzcsM=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ccd07c57-18d4-4c0c-9948-08da2ec796e3
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 18:46:39.2464
 (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: 3feqtw+PcEvtnRxWU6Hin27eAB4ffpRKPpnHjSWn2GdaOk7yvuWSL9rXSdbO18fkiOZ5IQz9ZJFPZqfKoYE19fL7UCZP2PK5N6YR9Msv/5c=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB2469
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-05-05_08:2022-05-05,2022-05-05 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0
 mlxlogscore=999 adultscore=0 mlxscore=0 spamscore=0 malwarescore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2202240000 definitions=main-2205050126
X-Proofpoint-GUID: nft_t-J2T20zOZs-UgGkdKHy2xGi5cLL
X-Proofpoint-ORIG-GUID: nft_t-J2T20zOZs-UgGkdKHy2xGi5cLL
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 then installed over the top of
the existing elfcorehdr.

In the patch 'kexec: 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_MAX_MEMORY_RANGES configure item.

With this change, crash hotplug for kexec_file_load syscall
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/Kconfig        |  11 ++++
 arch/x86/kernel/crash.c | 117 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4bed3abf444d..bf1201fe6981 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2072,6 +2072,17 @@ config CRASH_DUMP
 	  (CONFIG_RELOCATABLE=y).
 	  For more details see Documentation/admin-guide/kdump/kdump.rst
 
+config CRASH_MAX_MEMORY_RANGES
+	depends on CRASH_DUMP && KEXEC_FILE && (HOTPLUG_CPU || MEMORY_HOTPLUG)
+	int
+	default 32768
+	help
+	  For the kexec_file_load path, specify the maximum number of
+	  memory regions, eg. as represented by the 'System RAM' entries
+	  in /proc/iomem, that the elfcorehdr buffer/segment can accommodate.
+	  This value is combined with NR_CPUS and multiplied by Elf64_Phdr
+	  size to determine the final buffer size.
+
 config KEXEC_JUMP
 	bool "kexec jump"
 	depends on KEXEC && HIBERNATION
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 9db41cce8d97..951ef365f0a7 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;
 
+#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG)
+	/* Ensure elfcorehdr segment large enough for hotplug changes */
+	kbuf.memsz = (CONFIG_NR_CPUS_DEFAULT + CONFIG_CRASH_MAX_MEMORY_RANGES) * sizeof(Elf64_Phdr);
+	/* For marking as usable to crash kernel */
+	image->elf_headers_sz = kbuf.memsz;
+	/* Record the index of the elfcorehdr segment */
+	image->elfcorehdr_index = image->nr_segments;
+	image->elfcorehdr_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,109 @@ int crash_load_segments(struct kimage *image)
 	return ret;
 }
 #endif /* CONFIG_KEXEC_FILE */
+
+#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG)
+static void *map_crash_pages(unsigned long paddr, unsigned long size)
+{
+	/*
+	 * NOTE: The addresses and sizes passed to this routine have
+	 * already been fully aligned on page boundaries. There is no
+	 * need for massaging the address or size.
+	 */
+	void *ptr = NULL;
+
+	/* NOTE: requires arch_kexec_[un]protect_crashkres() for write access */
+	if (size > 0) {
+		struct page *page = pfn_to_page(paddr >> PAGE_SHIFT);
+
+		ptr = kmap(page);
+	}
+
+	return ptr;
+}
+
+static void unmap_crash_pages(void **ptr)
+{
+	if (ptr) {
+		if (*ptr)
+			kunmap(*ptr);
+		*ptr = NULL;
+	}
+}
+
+/**
+ * arch_crash_handle_hotplug_event() - Handle hotplug elfcorehdr changes
+ * @image: the active struct kimage
+ * @hp_action: the hot un/plug action being handled
+ * @cpu: when KEXEC_CRASH_HP_ADD/REMOVE_CPU, the cpu affected
+ *
+ * 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 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 the
+ * CONFIG_CRASH_MAX_MEMORY_RANGES description.
+ * 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_handle_hotplug_event(struct kimage *image,
+	unsigned int hp_action, unsigned int cpu)
+{
+	struct kexec_segment *ksegment;
+	unsigned char *ptr = NULL;
+	unsigned long elfsz = 0;
+	void *elfbuf = NULL;
+	unsigned long mem, memsz;
+
+	if (!image->elfcorehdr_index_valid) {
+		pr_err("crash hp: unable to locate elfcorehdr segment");
+		goto out;
+	}
+
+	ksegment = &image->segment[image->elfcorehdr_index];
+	mem = ksegment->mem;
+	memsz = ksegment->memsz;
+
+	/*
+	 * Create the new elfcorehdr reflecting the changes to CPU and/or
+	 * memory resources.
+	 */
+	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 the
+		 * elfcorehdr is updated.
+		 */
+		xchg(&kexec_crash_image, NULL);
+		memcpy_flushcache((void *)ptr, elfbuf, elfsz);
+		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
-- 
2.27.0