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: [RFC v1 5/8] crash hp: kexec_file changes for use by crash hotplug handler
Date:   Thu, 18 Nov 2021 12:49:45 -0500
Message-Id: <20211118174948.37435-6-eric.devolder@oracle.com>
In-Reply-To: <20211118174948.37435-1-eric.devolder@oracle.com>
References: <20211118174948.37435-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?+1ifCmjDaTwN9sVtSjy+8xGq4PSa38N1+BdtUuUAuYIltOG8m/waT91PArAy?=
 =?us-ascii?Q?Pcyg3qKv4BVohRvEZHMIyA1fHxdIFQpnz6ncHMUhNTK9kaQVaE9Jq+uoc2Fw?=
 =?us-ascii?Q?i5HeKzPjVvsxue1371w2HRY6UYkWOzy1WtiKiUgr8gbq9cBSTkNN4FvmiCwS?=
 =?us-ascii?Q?jbIPMu6QJaQ6/X/CpBh9QAiIJXF/RbrwwJKiiqQKJ9n6nO+QDTvLpWj22b7e?=
 =?us-ascii?Q?ws0RZMAjUbhgS1b47pBGSDNCspd9n49ouOcov9Poktekk0ScuqpuuQQ1v6Zb?=
 =?us-ascii?Q?ERCtNCL/wpYucgVlyS7r+0RS+Z/7P73O5sOtwz15LecE7qQjlNJ6YuaKN5RE?=
 =?us-ascii?Q?tzcAmN/yhNoVX6ASIPyI1vUWpKJoewd4E1+cPCwV1MBDQW9gScTbp8ZSkIFn?=
 =?us-ascii?Q?1TjEf1wA0Lx4HJLHlyLAZ6kzAMu24ZbiTpx8GriFnEjTLMeViokIJTygNlZC?=
 =?us-ascii?Q?y3jDwGceE84lF0ocLBbfeuzWh2O+PukxEexRj+vswihzXfLYbVmkb9jtW9ca?=
 =?us-ascii?Q?wC9BmXwek+CblHXbYBMtl/9+X7YUQL3P1rf+pTVvv6bUd1ph2+gEPIHdrDgg?=
 =?us-ascii?Q?yVkyVeNdl99bHzc2T/tqttlBYW+L7MggXJC8nPFCWgpccFe5Ap/WGpyMsrYD?=
 =?us-ascii?Q?IsyTShRYluU2JVVpL3mA3uvfK1rY24/h1iKbg65gDt8Ls80elRynDqSM7rvj?=
 =?us-ascii?Q?SKxNfb5vD5Zbeut9K6a2m1hPHMOLS78o8eYUNTVA/X3ZVb+FM1xIMdQHMdtH?=
 =?us-ascii?Q?JIFaIab3z5K2atMTBTytRBxPTmS1lblAdd7EFtS6ODtuTfCwWeXxT1j65N7t?=
 =?us-ascii?Q?xIk2awzCUD27kDWDlcB5s9Hcjn/ht2s/bz+Zdpq2YLCfP6zIuyxjDegBRJ4B?=
 =?us-ascii?Q?1C10zIDZVDXpUk6LFvsrVnA6jPoT0iWqPeXlLGpyE2oSimS3qrW8AwUvM5Rj?=
 =?us-ascii?Q?Rqsg1M7sq/IfMJdDp4UPwsCYYeMFc8phky6T6snIKGcHUSGHTYDl03igfaZK?=
 =?us-ascii?Q?9EX58PPRHfVmG06hmW7qVMmFJJHAp0KWyDl2r7nBbc/CWdrHaX3uyhmzfJ1e?=
 =?us-ascii?Q?oR/8Nc0TIyyp6Dj13TsWdkxuM64Pz+zo5YHp702oGnmwV3pYkPAPKFY064h5?=
 =?us-ascii?Q?DtMRmiYRGeskX6YzXYqcYlNNz+UT8KCUNhyXV0VORE/vwzwOiLsmG5KmLNTl?=
 =?us-ascii?Q?3vthVNyqYka0MH7XuEs0aZD1n/Au847AMTF2b/y4Siu8KzTk1nUeZpjDe2E1?=
 =?us-ascii?Q?4+dZjkZ6S5iMMFP4o/GAJnjvNJoJEkn8GbX4/GShvDrtQ38fo3CmTndbjkuw?=
 =?us-ascii?Q?UN+fNLWSwVeMl5/W4B2VlrG/+3MZ+MSGqchm2PX5Cu1uW8FBZSa0KjAyVF+C?=
 =?us-ascii?Q?Pm8r+SjDJB6WWjjivKBuDYfcM+/PLRhW8BsDqVaGa4c821i4ct1yjlRYTPjB?=
 =?us-ascii?Q?0aiXK+3JbKQOj/lzFMs3fAh4tWI3N46Or4gZsGul7my/2AeyXgGB4FmtVCet?=
 =?us-ascii?Q?xm145n1j5X4sgE0JiByEr/U+2837UiRSeG8Gd0SOGdOPwEvpafut/DXVlrFI?=
 =?us-ascii?Q?g8BPOktqw1wVh3vR4nizzFw8Xg2RCOLo68G9RFjnpHRWyvcA2bI6g8SuupXa?=
 =?us-ascii?Q?vceqIzDlHVejDbnC3Ym5jVTQaT4cEdUqpvhzvQ977AM5BITg6xu+tLEv7qJs?=
 =?us-ascii?Q?kEznHA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b903a3aa-07a8-460e-cf36-08d9aabbe203
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 17:50:17.8924
 (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: 7HCwPPiRkwE8owWEHd8UkUkQalcDfsDeC3UQlOuJGC9vVJ5wjPcb6JsFSE5K0imlAl4JdWOLiEw+F7KOmLjxe5aHzlRFHOqQdSrvkSGYjt0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB2045
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10172 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 bulkscore=0
 adultscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2111180093
X-Proofpoint-ORIG-GUID: 9TxzGJaxfALMGtXnfm_AA5DuS7KFKezB
X-Proofpoint-GUID: 9TxzGJaxfALMGtXnfm_AA5DuS7KFKezB
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Three minor changes are made to this file to facilitate re-using
the functions from within a crash hotplug handler.

The prototype for kexec_calculate_store_digests() was hoisted to
linux/kexec.h and the function made non-static.

The crash_prepare_elf64_headers() had the struct kimage parameter
added so that the check for the offlinecpu could be performed and
this routine re-used by the crash hotplug handler.

Finally, kexec_add_buffer() changed slightly so that it does not
attempt to add the buffer to the kimage when being called from
the crash hotplug handler.

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

diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 8347fc158d2b..c9e8e5b94382 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -29,8 +29,6 @@
 #include <linux/vmalloc.h>
 #include "kexec_internal.h"
 
-static int kexec_calculate_store_digests(struct kimage *image);
-
 /*
  * Currently this is the only default function that is exported as some
  * architectures need it to do additional handlings.
@@ -674,6 +672,12 @@ int kexec_add_buffer(struct kexec_buf *kbuf)
 	struct kexec_segment *ksegment;
 	int ret;
 
+#ifdef CONFIG_CRASH_HOTPLUG
+	/* When servicing a hotplug event, do not add buffers to the image */
+	if (kbuf->image->hotplug_event)
+		return 0;
+#endif
+
 	/* Currently adding segment this way is allowed only in file mode */
 	if (!kbuf->image->file_mode)
 		return -EINVAL;
@@ -713,7 +717,7 @@ int kexec_add_buffer(struct kexec_buf *kbuf)
 }
 
 /* Calculate and store the digest of segments */
-static int kexec_calculate_store_digests(struct kimage *image)
+int kexec_calculate_store_digests(struct kimage *image)
 {
 	struct crypto_shash *tfm;
 	struct shash_desc *desc;
@@ -1260,8 +1264,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 +1312,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