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 v5 8/8] x86/crash: Add x86 crash hotplug support for kexec_load
Date:   Thu,  3 Mar 2022 11:27:25 -0500
Message-Id: <20220303162725.49640-9-eric.devolder@oracle.com>
In-Reply-To: <20220303162725.49640-1-eric.devolder@oracle.com>
References: <20220303162725.49640-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?yK/lK0cnlYfrSu8dT4CYi1FLDQk7xqfV3Yctns1hD4qr74qFFvdFue2iltFT?=
 =?us-ascii?Q?7Ayin0EQah/6uYYjW8YrR5U4jjMggq2h/3AfVFFA7rX5BGMYHPa/osKluBzt?=
 =?us-ascii?Q?52cNZxXG3+FGLa37vkeeHkaLv3r85fmn/ZYxtYr8H5GtUQeMrwSPvFd1JVXI?=
 =?us-ascii?Q?B0DRqwgcKwBtHQVogO6aFQnvTaFCzWsFcdbgdgWoNZJk+iePCgN7vFzgCDzB?=
 =?us-ascii?Q?J68FlfHZYaAJ/MYfLc18Y6bJAYRvSsKoyK+OhKEae0Nt5L9d3TPU6npiycM/?=
 =?us-ascii?Q?/XYMK3gU7Oi01ZvWMP4ntSDkbVjgnTzXgdb5/XeqU+wIanu4rHVZvIH2rbZj?=
 =?us-ascii?Q?mYvKyia1OEb4JcZ4EJiqCyGDN1HGm+51BAkrq1k5DM2UAghEVYymO59Fv0/i?=
 =?us-ascii?Q?RqFhrpo+1dpU2ZqEL2ZrzZvj7sfA+fCLwZmiw+ilgg8OlJFiN5SxY6OR/Gon?=
 =?us-ascii?Q?a1CgIvupWIUq/GMLWbUbo5CRFhaLgrN6XywAXVj5jjqlvUMHGX3t+WhopgJC?=
 =?us-ascii?Q?z6hjKo53uXJVfpF6EL8NC2ofm1mKw/7iidb27tOnWmx53xhIynBIf9u/GHyF?=
 =?us-ascii?Q?PjV9PsrojOmQJUU9tm0vS+2YQp1E74i8BjHgAw94WZiWCgM43bxu2kIAAmXd?=
 =?us-ascii?Q?Zb+N9KImfYaaLRHrTyd6nt4eDbKjNMZyVoVEG5YndjrNtT2bZ6G6TTQt5v/d?=
 =?us-ascii?Q?xRNz/7aF0Sg7vaJCi4yYvZMSTnc2PLRjy52Z/aefW72Nl7ASPLRCtKHaUX1f?=
 =?us-ascii?Q?t6Rk1Xk+zv2Hgf1og/NbL8znn+M+8JxZglJOWLEDdW5c6n+cn2uHBuHuNPPB?=
 =?us-ascii?Q?+1OE49987OxAjWiCKYLgLKMeKeEbieKhp/W4JBIuUcFE3URuYkzestBuwiLp?=
 =?us-ascii?Q?jBDNsHRYZHX6hkT7cMS00GpMagtdReZsVE0ZviphKFBG+yn/aT+XAbyrE2nQ?=
 =?us-ascii?Q?KIfXFqEf7L54i9d4Ww2LCQY/2jHhtsNwyJevzPpnk89zVK/zZBF1lLvpNA29?=
 =?us-ascii?Q?ApYCU0VoWJhRY+8y7uZXe5xdBpKjTWga1XuVqQ68bFJYiXiLNu3HDElMyRBl?=
 =?us-ascii?Q?KXu0xr3b5dKxgsHR6FfKKQZKsQdbU3mDTIpbXnEZ9GFi1MvFmPt3K7b7/bko?=
 =?us-ascii?Q?2wMNh802f2cTRLcDjMo1JLmr/2B+jFX84AizTeikTYYSaqEwTykwnzaA9lFh?=
 =?us-ascii?Q?oh+h8W00zO/vdWAKQjdi3N8WpjJo8SyCjrnT6jliDirZdTC1M1WmdxX/s9k3?=
 =?us-ascii?Q?zeUn4Udo74lgDlN43dDOIRPBv48w5hkX4pVslqv6b6Jh6f2x21d7EcCgPK3B?=
 =?us-ascii?Q?Efr+S6pM6HSJ6lqo0M1gSegOkAv7UdxoTbPxXyw5UWMNLCSrrP10so3arRJe?=
 =?us-ascii?Q?rrKLOQn1mgDSvB/PFXdfRDS17C1s5uxmiL6a2Xj7Jjjc5b5fHXH7udE+WrSa?=
 =?us-ascii?Q?PPBQ7H8aULhguFxh0LtVeoCmiN34p9Uh/eibFTR1F3H92H+GqmGorpUuIyGD?=
 =?us-ascii?Q?tIPDz0ikAfvaA9EDQpByy9QMmPnnivTzHE7pZQjnhUfHnzh8+ee7/3mZhM6Z?=
 =?us-ascii?Q?e2W59zVCW/s2Pz+XrxQrFhdGK9NJulvqjxOh6jgBVMWutYd1rPhHPfxgdJ7k?=
 =?us-ascii?Q?2yjdayz2XCrf+7K0k12IzMekHEol497ViGBb59myG0p0u5xaaA6wzE2qfZW2?=
 =?us-ascii?Q?lc6fKgfVUhi+feMVfsKPPx0KThM=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8811de37-2786-4f56-4adf-08d9fd32c962
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 16:28:02.0364
 (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: fZc+KydFpBqhnku4YpAZzMhITwT+9BeHykzrlYeKdjUUthMH4p0oRksu/l/qMcmbH2V5YBZN+tesQvsnTE2Ua0UfGUhuh/KjZJacmJnnImQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4704
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10275 signatures=686983
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 phishscore=0
 malwarescore=0 mlxscore=0 suspectscore=0 spamscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2203030079
X-Proofpoint-ORIG-GUID: FCaT6qRjAZqhONaAn6WnjKYi3S5Bk581
X-Proofpoint-GUID: FCaT6qRjAZqhONaAn6WnjKYi3S5Bk581
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.

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 5da30e2bc780..45cc6e3af63e 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -486,6 +486,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