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 v3 5/6] crash hp: kexec_file changes for crash hotplug support
Date:   Mon, 10 Jan 2022 14:57:26 -0500
Message-Id: <20220110195727.1682-6-eric.devolder@oracle.com>
In-Reply-To: <20220110195727.1682-1-eric.devolder@oracle.com>
References: <20220110195727.1682-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?ZeK0Z8AZz/3nJcY/iacB2Vu5UiItHNbkndi2bBMuRFylrOPKk5dNehk1ylb6?=
 =?us-ascii?Q?8xXzDAfFuf2Fz1c6SsVwxr1yRCp6h6WLwngZycccPeFMc2oQAyUwZ5d84+du?=
 =?us-ascii?Q?k2UIuBNTf7jkAM3xTw/JsyVF8Lfi41orXZwD/nTL9dsbUeWyPD+FzxZJegux?=
 =?us-ascii?Q?dWpmcu/ur1xr255nMZe10tjm0laloPim2wyKFiUIu2Atk5T0kokqXFrKRZBO?=
 =?us-ascii?Q?/HQYnUrlF3jvSlqsqNQMGz8kDs49C2O6AooOyillHGy33lEopTcAdE1QKdkF?=
 =?us-ascii?Q?Xtrhd8kBAs4n+KU4gSiWWFa5+4gYkmyzWS/aqvQwb0D69C/02VYGB2ftKf8M?=
 =?us-ascii?Q?QD3kwrrIhFHSCsMjzdNObSqEunuzcSP1vxZqDimQihtLUh/ztIZZxjYPJBRz?=
 =?us-ascii?Q?XdWsQsfDtOwXv5y+TGYH8E0ENtRlR/QdJv14wHxfVjdvMsjWG2y3Gfcr5kzI?=
 =?us-ascii?Q?rQfg1lI8vb9fc5pmaPY5EbcliSywuYNlyzkKuI9F1eEES2h1xGW0EefHNfli?=
 =?us-ascii?Q?5IZVXYTBffJ4pu4c6dOKfBv1aAYsV6cnDj66aAnVObgDci+uX7ZB+xi7PKoC?=
 =?us-ascii?Q?kVrEYvYTCFovEDcWFOuhRAtKWLeLy/5GxRI8JyYTclRLsjhzGfMuuXUvtTBm?=
 =?us-ascii?Q?9M2KpHbTy0F5W3Spwe7APrtnWudptkqd878CpGi8H5+t1XvJWrmXPfqnZHWf?=
 =?us-ascii?Q?hE16nexMcYXLowpEy3BP5rmHq/OYJ8uucUxsCjrYexuracwQGa/PWYJRHJGC?=
 =?us-ascii?Q?q4nifTS1G37zbIF0ULjhoT73+MzkrraQnVdClr6RvvHDv+cnrJvE3Eo4klY1?=
 =?us-ascii?Q?JmEgxmkQ7Kr2rejxjO5NibfJ6ehiTA283DiEYGAbDJ+pUJdesH4iebcf0/Uq?=
 =?us-ascii?Q?ZFDI19afTz5ZXK1v03nJFVU8adHSv3Ke00y+ebQsz5RYnD4/0SGnt6QwvHDj?=
 =?us-ascii?Q?USbFNG78ym6jpR+JehRgrnjtcWTha3gwO5Ec7HXGLfRN93QcJ+XnOqxHVQcH?=
 =?us-ascii?Q?hvEpEQ13Ot5S/UJ4uq66Yo6Mi/AvnsTR4uaU9MHXuYVwSPOUji2q41vX+BfQ?=
 =?us-ascii?Q?HL1HURKPApxnSthymuaotowQaMx7jhHo+wFYjtSh+rqjXUxnsR7JHD3v2dBF?=
 =?us-ascii?Q?klABG1Vwy1Z5S9ILtjKnjGP6v5S5ML69pAhA/o2pnDo+W/7v1rD8cLJWfjek?=
 =?us-ascii?Q?EjleR1dGhNGk5VKaqI79V74DBNaecMEGc+u/kp7hbLasOx0ER4r3Wngf++dN?=
 =?us-ascii?Q?PH/Bu9v1llBJgvGXejb+wbLpfHeCJqHKJYP3rgjkcORdCPHAOi6x6pXJIVqo?=
 =?us-ascii?Q?PUmBW+fJmhWVmu6c7qL6xV/6aHly9RTWIqD9SjytHbwN0tZ5EGdu4kUOIXl7?=
 =?us-ascii?Q?Gd2ma+uqUMmUbcYqiGHlMqymic+zrXwXJs/hKqKxPjGc9JlWKW5brnqKGMpu?=
 =?us-ascii?Q?eni/2xxHYYEOWgN/TFCJ4dLmNQW+9dxFIt2gkaJGCT+TsbiuI+NiCk7OL04U?=
 =?us-ascii?Q?uD7z/nymARp/2b0q/dRvIuvakBpbQ3oRU0vbI7rlapZkbwd88a9SDg0bb9Oo?=
 =?us-ascii?Q?Td8pH/hx30yAt21WBKV3E0WXwuZZDuUekIG1xmvZlkZQCHaXdYxFcsEbr9vf?=
 =?us-ascii?Q?5VZLeDQFTlnT10qKAyhl+W1Pb6WXscxHt1s69X64eGMfTSERyyVLq5+SheNQ?=
 =?us-ascii?Q?4rl5fw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9d25a1e9-7f36-42e9-0a57-08d9d4737f01
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 19:57:56.8925
 (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: /oochbNlnC78xit7DG91KpJ1MzPzjyevwFC+6BYnq5fvuz8Zk3amGX8p56FYajTR78pcDuHaI2chsqIN+mTG2hnkMuI0CZzbT0gHIYLMdSs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5701
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10223 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0
 mlxlogscore=999 spamscore=0 bulkscore=0 malwarescore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2201100136
X-Proofpoint-GUID: FnuLXuzcaT08lyDebYow9zsC58JHNlp6
X-Proofpoint-ORIG-GUID: FnuLXuzcaT08lyDebYow9zsC58JHNlp6
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Two important changes to note:

The kexec_calculate_store_digests() changed to specifically EXCLUDE
the elfcorehdr segment from its list of segments to check.
This is an important change as it allows, in a hotplug environment,
for the elfcorehdr segment (which contains the list of CPUs and
memory regions) to change dynamically without the need to update
purgatory (with the hash/digests of the segments it checks) as well.

The crash_prepare_elf64_headers() changed to look for the offline'd
CPU and exclude it. This due to the fact that the offline'd CPU is
still in the for_each_present_cpu() list at this point in time on
the cpu hotplug handler path.

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
---
 kernel/kexec_file.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 8347fc158d2b..339995d42169 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -765,6 +765,12 @@ static int kexec_calculate_store_digests(struct kimage *image)
 	for (j = i = 0; i < image->nr_segments; i++) {
 		struct kexec_segment *ksegment;
 
+#ifdef CONFIG_CRASH_HOTPLUG
+		/* This segment excluded to allow future changes via hotplug */
+		if (image->elf_index_valid && (j == image->elf_index))
+			continue;
+#endif
+
 		ksegment = &image->segment[i];
 		/*
 		 * Skip purgatory as it will be modified once we put digest
@@ -1260,8 +1266,8 @@ int crash_exclude_mem_range(struct crash_mem *mem,
 	return 0;
 }
 
-int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map,
-			  void **addr, unsigned long *sz)
+int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *mem,
+	int kernel_map, void **addr, unsigned long *sz)
 {
 	Elf64_Ehdr *ehdr;
 	Elf64_Phdr *phdr;
@@ -1308,6 +1314,11 @@ int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map,
 
 	/* Prepare one phdr of type PT_NOTE for each present CPU */
 	for_each_present_cpu(cpu) {
+#ifdef CONFIG_CRASH_HOTPLUG
+		/* Skip the soon-to-be offlined cpu */
+		if (image->hotplug_event && (cpu == image->offlinecpu))
+			continue;
+#endif
 		phdr->p_type = PT_NOTE;
 		notes_addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu));
 		phdr->p_offset = phdr->p_paddr = notes_addr;
-- 
2.27.0