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,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com,
        eric.devolder@oracle.com
Subject: [PATCH v4 10/10] crash hp: Add x86 crash hotplug support for kexec_load
Date:   Wed,  9 Feb 2022 14:57:06 -0500
Message-Id: <20220209195706.51522-11-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?E1BGOwbVOPqqZ9/xwpLIYz8n+ex6YyrHE3yys15a149nDW3ATv+wry6lH0HR?=
 =?us-ascii?Q?/tBmc+WVRAAgyoCcKmPs8xtXmJMKO/QipPC16LAlIEePrVeJYUuNlW5zLJ0F?=
 =?us-ascii?Q?5PU2wVVFGbfUa4SVEEtwiAHRP9RqQjQn2uTtEtL31M9l1Zq4Q9c7Y+kmWoBw?=
 =?us-ascii?Q?+Hy3BwG1n5s3yhWNeyjZKsN+eFOOvrzAh3LAyH4DCEMCnZLE3Rt27hIQWgEt?=
 =?us-ascii?Q?IiMrkZtAqW6zLMadOIOzBtEZU8djHkGgIXdw84ugaQMF4oejMO/z8xWOPSwZ?=
 =?us-ascii?Q?98CxRPJBq7Kg+Pm8F7qby+pYbQyOorlx91tdWDJcBFEaKl4qmVy83gyyHpG9?=
 =?us-ascii?Q?aGYMrKhrX+41lCfEUx7YZyscaOl7ZOLUf6mryk/lIArRQrShsYUM28UVj03V?=
 =?us-ascii?Q?sQe+8qNhs/jWoLsb0kz+zwradJtDs5NazQeCZCl+fC5LyuDP04C/ckzxfLNS?=
 =?us-ascii?Q?8cqRvyMKQ+fiTyRndu3A+Oj1YCIqmdEGP4scYj2FY1n3n5l9YUXzCfWY9zgs?=
 =?us-ascii?Q?ngCsbB0AKwmc8x6mmO6BoZOKJtxt+Vj24M5dtkApwB2nD10nhuqKv6Rx2ev3?=
 =?us-ascii?Q?k1VsiFmTPObPh5lnWwyrH4laUehPlM5yEC+gFLj8u1Qnh9VtBjtV866KAViK?=
 =?us-ascii?Q?gv+PxTqjKu2O7KboHNpP0sk8BMWtXt+yUVUGB2nerlSEUNtErowfvIAVpo8w?=
 =?us-ascii?Q?gK4khh0ensGW+WA7lfaefDLUEnWnW5kP+fKWME2jsCUIVt4jfMDgzMPPbl4/?=
 =?us-ascii?Q?PtLX4BCLalghyJbZXZz93GdZaODKHX6q/L7445Z9hGC4kGZXrfveJJvzTOR3?=
 =?us-ascii?Q?of+hD3VtysGEZmvZS/eg43OjJu9qU2OILDAGV2t3ht+8rDWm8MTk93Zt5GSn?=
 =?us-ascii?Q?Lzk8D5FGE42qlZ7yi3VqnWsJ2stiHtYp9rDUnCNl56YL/wK8c6VdZTRDtrCq?=
 =?us-ascii?Q?BNHIuUO/N32AOZRdqEheMjiy6T7LaohrDunJLQqqfaYZSoNHsChXFc4yqjtY?=
 =?us-ascii?Q?Ee6iK7vo6Sh8vTHmtX1YsYQTN6kTzevlVj3ZimMtaliKmz0sE12bLFn1WrVU?=
 =?us-ascii?Q?bO6zelL8cBU+fsI6Ca4uU5jaHvTg1LWGfLPI9EHJuYsInZyrARwvAJEJTncR?=
 =?us-ascii?Q?HkideLNUfqgj8D19o1MUQlUzFAhyaX4jCFVFDTrOJsn6+4pPQuV8gphcVtmM?=
 =?us-ascii?Q?8QceYm0F6W9eMGDLJPJhVmM2TRLsLfLStdH/NYpPxva5d/ATjFn2t5MXgIzd?=
 =?us-ascii?Q?9mAMaC35RbW6n6E7ljJY4qkO5A9z07IuvnUgaRORMxJ8JSBhz2/+ylOgfOHf?=
 =?us-ascii?Q?2aNdzbQnvBGRdE0C7obxhlsKOA9eBC9Bjr9ug2XEU8ynRcP9Jkl6LttRH8wf?=
 =?us-ascii?Q?y55kHg/2IleNCtJc8pd2Mpt+V5PtZlaB8ZrToWSLuwZhhsmj6mhcFz4nOplv?=
 =?us-ascii?Q?YHfR03evlb9os3fbPR6WVYLhpqsCJZCvW7qLArz9QXPY+4PYBiH5JDjDdXjJ?=
 =?us-ascii?Q?7w8K5i9rG9t/7WHfNKsykz8Xd1KF8/l3peqUVD+RUEEMDYVT6MywpbkA88em?=
 =?us-ascii?Q?WYLYc1sbPtZoegYHUqoXsBmmb12ESV6WfCbFl1J0LLcbiytAmNKhCWuCNnuI?=
 =?us-ascii?Q?9D/+BE/zrtK41+aRhSC1Ts96T++C0T5LmVaIvT1ew95yFgcyaH8ku6XW6NU0?=
 =?us-ascii?Q?oryA5w=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 67d13670-768a-4443-2cc8-08d9ec066f1c
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:42.9743
 (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: CaJljvaj9JC/geCeu8tzFPCTHtrgUNC1ouVazchicPe4G2IN1XeUty3qBaC2JdCxLBkFKryQPJqbVPzv0BqTd6ThE/G7vGsQZbTK3Ark+r4=
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: upeg15oOpP-cvAN8ySc-CaRv6vRL2928
X-Proofpoint-GUID: upeg15oOpP-cvAN8ySc-CaRv6vRL2928
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 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.

In general, support for kexec_load requires corresponding changes
to the userspace kexec-tools utility. It is the responsibility of
the userspace kexec utility to ensure that:
 - the elfcorehdr segment is sufficiently large enough to accommodate
   hotplug changes, ala CRASH_HOTPLUG_ELFCOREHDR_SZ.
 - provides a purgatory that excludes the elfcorehdr from its list of
   run-time segments to check.
These changes to the userspace kexec utility are available, but not
yet accepted upstream.

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

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 6215c51919db..1b3e5e4fb965 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -458,6 +458,32 @@ 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 elf_index_valid defaults to false. It is set on the
+	 * kexec_file_load path, or here for kexec_load.
+	 */
+	if (!image->elf_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 ((ptr[0] == 0x7F) &&
+					(ptr[1] == 'E') &&
+					(ptr[2] == 'L') &&
+					(ptr[3] == 'F')) {
+					image->elf_index = (int)n;
+					image->elf_index_valid = true;
+				}
+			}
+			unmap_crash_pages((void **)&ptr);
+		}
+	}
+
 	/* Must have valid elfcorehdr index */
 	if (!image->elf_index_valid) {
 		pr_err("crash hp: unable to locate elfcorehdr segment");
-- 
2.27.0