From nobody Tue Dec 16 08:39:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB862CCA47B for ; Mon, 13 Jun 2022 22:43:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230385AbiFMWnp (ORCPT ); Mon, 13 Jun 2022 18:43:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233221AbiFMWnn (ORCPT ); Mon, 13 Jun 2022 18:43:43 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45F8E3120B for ; Mon, 13 Jun 2022 15:43:41 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25DJdgFY014531; Mon, 13 Jun 2022 22:43:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=mh1fG8/n+xNyI4tlLEwqNvilXyMdCwrUYP8VBQjGBKM=; b=HSNvMIedX0Sx1GUngSQV3OD2Z5j+zV8owC8GGbkKvR6NlYbiV+n1Em0C+WmHGFFk4RvG nnJR/qxxZpsEmJ8v8bQgA9nu/K85rt8ccpVwPcdH2yscMcLWjjsPrwNfEr4cBGbgXpjV u4VER/iIF+LqLd4pqYUDJQep6gnZR0VYm2ZLdkp/OpkoOrVAEH4mO+6BxCFUcE5yECP2 g0cviZJXCVswd17ZLY9g4NDeSDkYfUE5wb+tq9gfVK4hucBOKT+8I+BZaoeodmJzKyUo O1Yj/ri/HsJ6sXEZTz+rxP4yl6nIi3j16kRRwpHX/0Q7ZZViCGkScfQx+bm7Eg6u9ORg lA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmkktcaef-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:08 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25DMeh0c014916; Mon, 13 Jun 2022 22:43:06 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2046.outbound.protection.outlook.com [104.47.66.46]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3gpe88r3yg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QGCF4Xk+DIMpIvezRgOvc/Z7YsqYgcZnyimFt/AEAZ2BBTxtenEXO1QZzPjpVcn/+IWXZDh6++6nhqaqLaIuXxucV3ccTrUbXeVhA5gft4QY9oSRpYWtuAo14HBuUe3jU7/i4GDWEyhqLHh/6GYQ6UtqUcuTgZjQLe6L1zXt+IsCaScOE2IOF0YCpIVKaoxDu9V4MarEJsGtwB/NMNjmGA/OFeuXza1zXTlKcExfqCSu74xzIaRbq1j5Z7lZ7eqwlt2uPA+7feI9dyqHw0MIeYhkocg8jwf6lRBiiQ0W/CWJWj55xlD3EubxiEI8bUNo+mSOoXk+HKtcnR9YkA2yog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mh1fG8/n+xNyI4tlLEwqNvilXyMdCwrUYP8VBQjGBKM=; b=RV4/s65jItAI0XIbr3L6A+3bOOerPSDPfV8Qoo8Rj2jdE1Tol3RhHsrKbGy9CZZS9BLapA2v0XOhSgAML2g/iE1RkhkRSLvU10gMiy4I14xio5z0cikWbMhh+odbeJGE9Gojy1DH54vPSoiALbFJssjn8uFTR8bxeK38O0J/owY0eVVzBNtEdUnT03lKra2dwhDi8e3H+QHV9lQcRcFXziKbNKz7oDWkf1rn/pXso9Bw3mZJMIz7sD9NxeQeuSou1Wj7vvav4bNsqYPDijy9GEbGdqbdScfNrKUbQSeqPNI+7u20feYUXxhgG2eZqrNOKadnRuqMYIf8TWbLLDNVyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mh1fG8/n+xNyI4tlLEwqNvilXyMdCwrUYP8VBQjGBKM=; b=ROLReazxo6arBsvM9xdTW/91xR7T2v06vyGyscNJ/EWZYanJGna/0H/j8hXa48PU06atdyMQvh/jU+ohgjjz/0UwwUrQEi3lmN917Sa5C0IIIeN5TxSpXZwvWyfkHrA/tvxDXxFNj5bZRfnIH9ajqvI9P7JCyitTvLNVGiV40OQ= Received: from SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) by MN2PR10MB3824.namprd10.prod.outlook.com (2603:10b6:208:1b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.16; Mon, 13 Jun 2022 22:43:03 +0000 Received: from SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f]) by SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f%9]) with mapi id 15.20.5332.021; Mon, 13 Jun 2022 22:43:03 +0000 From: Eric DeVolder 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, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v9 1/7] crash: move crash_prepare_elf64_headers Date: Mon, 13 Jun 2022 18:42:34 -0400 Message-Id: <20220613224240.79400-2-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220613224240.79400-1-eric.devolder@oracle.com> References: <20220613224240.79400-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM5PR15CA0041.namprd15.prod.outlook.com (2603:10b6:4:4b::27) To SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3134a9ef-71f1-41a5-fe6f-08da4d8e1381 X-MS-TrafficTypeDiagnostic: MN2PR10MB3824:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PEyE8L9URV4phGAEq5cUpRUrZ6hRwp1o+SBSIVsSMoonyB4amp6bs/rIUjgKZSyyjoh4CY9iIZiU7xIIvyEXfm/FxB/8uemjaKsYCp6hqm8iXMxTpHsCy9jGct/zsDTVTb3fn1Kq4xsOR9BFWbDW1ojC7gjV7OpgPA62tjzFcJyAklLYmHHWo2qEE6R/LgaU/fVTRl9RonSXTn3EgmIlzGO7IY6ERUyE7646IvIYQHA6MeV3E3zcL8UhVDfXlgJ7DTOKW0PMF0r9ifQJjZDTe/R+3WKCVoouMrrfVUP2l7iuHMGSHdmBIoEKm5vHRbkkEG/omDzd2VxoxDjs3QxHtSX+dqhj578GVIcocLvEX81duJWETrh1mOKeb/VGbnxPVbrNZLysnWfYB92b2wZy0rk5lmyqTMZmwmhaxyVVGLkU2SQUvRh9/uz9+PWl8qRx6Tho0Ap2tL3fgME/LbqXkfPQNMiHGFpbX2jUw14evk5vD06tTtLnIQ2FIjS6YivYhQT+yHfbUhvcNVvpTZcoanh8O4xLwA+lp0Uj9daDxLFMCyklHMi2CW50Ri2tKauxCtwmr7Q1HhYjEqir+6H9JCxyd6uon42KurWeLHPCXEdThKTvnUoOUzjmQZJBUW9z2ec2z5zNTmj9WLwV2jrmeW1sPM7hnps6x4qV+B4NCdiUK0VslB1c7mJb3oSqLWyUMezcN8dIDPkrLkdYwC8H9Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB4542.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(1076003)(83380400001)(186003)(107886003)(2616005)(38100700002)(38350700002)(36756003)(8936002)(7416002)(5660300002)(66556008)(2906002)(508600001)(66946007)(6486002)(6666004)(6512007)(26005)(6506007)(52116002)(4326008)(66476007)(86362001)(8676002)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iUiVbBYLvQqokSrSs9yZ9qsx4lActIos67tXLKwI9vnNDSfKh7Ylw2qJb9r0?= =?us-ascii?Q?MoLut2eSjskY4yfQTywB9m7zREq+cKGjkMpWsKjSqP8uDaGDdzYrRCFP/wdy?= =?us-ascii?Q?1Qfg0LDaawpZxfr1FplXRNeeUgb8wepX2onIZcJBA9XB/YmjzNtirOjd6u7D?= =?us-ascii?Q?LxnoFgGboDtqJRCwDoDKYRqnvpd7NGEQIHxHvilSlZPf/Tj8kZtxxjc7xqvF?= =?us-ascii?Q?4kIZCLuoTRH/mhk4b1CWqyhfsNbagt+BcatZCcra7LpiK7xUzJydaJSc9u+b?= =?us-ascii?Q?5dDY/OVQ0RVgUM7jt2mEoIqMMwgUB7fiejeqZjP0ZLluMvUKp7SSL7LWMvwb?= =?us-ascii?Q?jVJc+N8H88l60ohglyM9Vf5T7BXXvJ0O0fZWH5VI42hmkZU+DrlmIyu35gga?= =?us-ascii?Q?ZbQJF9YKboz/rsXS0gW0bVx7J0RTOlv2KuAXOaUfoEAxi2RijAZlXlqFUjmk?= =?us-ascii?Q?MEos+50kKncD2oXNo91iZdqgH96vBoX6EpB6YPksOZ+geeD501/eYrQ9IrYP?= =?us-ascii?Q?v8aWfB4noOIQNZRNMgKWHda9KTeLfpHEMmtCT6y+Sh31sqa3+CrRaQF729wq?= =?us-ascii?Q?HEvbwab87nID9EkhS9nw4+MR/a6zXPPHCOm8UrYQsvSqOOC9QGCTeH1a427q?= =?us-ascii?Q?5z1/nTHxGNSHHRm4xeTlf8/XyxwVBWy7Q8+rSz9l5lq208PMDfqgkR5cNHWs?= =?us-ascii?Q?utmItPJKfrIeWkSHRTaSUFaOb6gJJuma052jSoIZjBJp084hM0Kq9uMcWdYa?= =?us-ascii?Q?2bWfeVfJgDrhz/E2GeurBrHFss2b12SSkA6LxrjopTvRJwSVGkOdmDXMdtYm?= =?us-ascii?Q?71/4nmPLdvU8VDQH6yQ3oJ4wi1BFV5BakGg5YpmULBbB4yduzX9Q12wDyhJd?= =?us-ascii?Q?BYNH3VPDDoMrPaDIGake/BcyeXoCLry9XsUQ0a6mkCCkV3AoBebbb7NNr0dT?= =?us-ascii?Q?t10B8zdLwHgGrlASkneJMYhABthFznxgqLLuSlfdBTWuZmqehEaVxslP0WdW?= =?us-ascii?Q?/LBj8TWgAXyMAw4TfHMsPQo5FwaTYFRi7R8M6uRmyXIc4L3QyNRfQ2YEZjDL?= =?us-ascii?Q?LMXwjMKd76HIACJs/UBCKBw62k6RzuFN5GblPV8Jgyqzdw0YSiZKbFb43p9D?= =?us-ascii?Q?oXFXoBVCAPPX0lZx4Yc25kzgskBBwSLTYajFUUCSrtwhtEzHnsZUCPBfuy2q?= =?us-ascii?Q?ci4pUwg8jg31FLHqkVbYbgCJTVcrHPhjnz0i9jBFIFNKrfcFqu6NlG/mnL61?= =?us-ascii?Q?Z44VqNoVnNKpZRsSmPh6Pafk5Gm7W9BDImSm9DJGaahSSe3ix0JtlogVxXWI?= =?us-ascii?Q?1bqHXtVeU/UrLKfb05ZXOzyyQ208zxT2P45Jmo0C04hvbCMVp6WI/URrzQ6e?= =?us-ascii?Q?OVcGaTLoczOmCl3jgm1T9vrXphlThKpiK0wk8SnEsEeI4S+nT973gJyLTHD4?= =?us-ascii?Q?tdxwmNqcu3CPe1SyIPd6a99yqt4NzYwYu7xfGBZjWQ/m75AHn3m3VGckq6b4?= =?us-ascii?Q?6H347vrWqfDBUrRMaj9GqLNScQaa9R2pIm96P4Pzx2wHg2NdYELNzpz5BJJ8?= =?us-ascii?Q?B/jdQCjbW+EzY11f/sQ7QD6Ah/lH/YLDFCVsy2/k7MB1oqEouVncEL9Pfix1?= =?us-ascii?Q?Y0yWJk1ObDyzAk3ron88h8ntaerY8YCF1zb1znucw1FOvaphdeh2LDQpnKQq?= =?us-ascii?Q?xynSF1xH+Dna7Zsh/QJJqKUhfVRhHMRI3ZM1+WEis55fw19kCuUcurwZXb0v?= =?us-ascii?Q?spo/XwQ0e9lvNqeTDph73uBOQm/PJaE=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3134a9ef-71f1-41a5-fe6f-08da4d8e1381 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 22:43:03.6514 (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: qENCZXkS8PMFpWxWzGDJHQc5d7p7x+EzhyteqQ2QGyIGmzjWNkivJsgGaZ09bIpGAoNz59+ljbsMKC7eLzdM/XdlZEExKIidzSFnXXYatrU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3824 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-13_09:2022-06-13,2022-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206130087 X-Proofpoint-GUID: OKd8yVE59zDVfx-Y837P-waPArmwaCIT X-Proofpoint-ORIG-GUID: OKd8yVE59zDVfx-Y837P-waPArmwaCIT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" At the outcome of this patch set, the crash_prepare_elf64_headers() is utilized on both the kexec_file_load and kexec_load paths. As such, need to move this function out of kexec_file.c and into a common location crash_core.c. No functionality change. Signed-off-by: Eric DeVolder --- kernel/crash_core.c | 100 ++++++++++++++++++++++++++++++++++++++++++++ kernel/kexec_file.c | 99 ------------------------------------------- 2 files changed, 100 insertions(+), 99 deletions(-) diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 4d57c03714f4..85058fdce308 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -9,6 +9,7 @@ #include #include #include +#include =20 #include #include @@ -305,6 +306,105 @@ static int __init parse_crashkernel_dummy(char *arg) } early_param("crashkernel", parse_crashkernel_dummy); =20 +int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map, + void **addr, unsigned long *sz) +{ + Elf64_Ehdr *ehdr; + Elf64_Phdr *phdr; + unsigned long nr_cpus =3D num_possible_cpus(), nr_phdr, elf_sz; + unsigned char *buf; + unsigned int cpu, i; + unsigned long long notes_addr; + unsigned long mstart, mend; + + /* extra phdr for vmcoreinfo ELF note */ + nr_phdr =3D nr_cpus + 1; + nr_phdr +=3D mem->nr_ranges; + + /* + * kexec-tools creates an extra PT_LOAD phdr for kernel text mapping + * area (for example, ffffffff80000000 - ffffffffa0000000 on x86_64). + * I think this is required by tools like gdb. So same physical + * memory will be mapped in two ELF headers. One will contain kernel + * text virtual addresses and other will have __va(physical) addresses. + */ + + nr_phdr++; + elf_sz =3D sizeof(Elf64_Ehdr) + nr_phdr * sizeof(Elf64_Phdr); + elf_sz =3D ALIGN(elf_sz, ELF_CORE_HEADER_ALIGN); + + buf =3D vzalloc(elf_sz); + if (!buf) + return -ENOMEM; + + ehdr =3D (Elf64_Ehdr *)buf; + phdr =3D (Elf64_Phdr *)(ehdr + 1); + memcpy(ehdr->e_ident, ELFMAG, SELFMAG); + ehdr->e_ident[EI_CLASS] =3D ELFCLASS64; + ehdr->e_ident[EI_DATA] =3D ELFDATA2LSB; + ehdr->e_ident[EI_VERSION] =3D EV_CURRENT; + ehdr->e_ident[EI_OSABI] =3D ELF_OSABI; + memset(ehdr->e_ident + EI_PAD, 0, EI_NIDENT - EI_PAD); + ehdr->e_type =3D ET_CORE; + ehdr->e_machine =3D ELF_ARCH; + ehdr->e_version =3D EV_CURRENT; + ehdr->e_phoff =3D sizeof(Elf64_Ehdr); + ehdr->e_ehsize =3D sizeof(Elf64_Ehdr); + ehdr->e_phentsize =3D sizeof(Elf64_Phdr); + + /* Prepare one phdr of type PT_NOTE for each present CPU */ + for_each_present_cpu(cpu) { + phdr->p_type =3D PT_NOTE; + notes_addr =3D per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu)); + phdr->p_offset =3D phdr->p_paddr =3D notes_addr; + phdr->p_filesz =3D phdr->p_memsz =3D sizeof(note_buf_t); + (ehdr->e_phnum)++; + phdr++; + } + + /* Prepare one PT_NOTE header for vmcoreinfo */ + phdr->p_type =3D PT_NOTE; + phdr->p_offset =3D phdr->p_paddr =3D paddr_vmcoreinfo_note(); + phdr->p_filesz =3D phdr->p_memsz =3D VMCOREINFO_NOTE_SIZE; + (ehdr->e_phnum)++; + phdr++; + + /* Prepare PT_LOAD type program header for kernel text region */ + if (kernel_map) { + phdr->p_type =3D PT_LOAD; + phdr->p_flags =3D PF_R|PF_W|PF_X; + phdr->p_vaddr =3D (unsigned long) _text; + phdr->p_filesz =3D phdr->p_memsz =3D _end - _text; + phdr->p_offset =3D phdr->p_paddr =3D __pa_symbol(_text); + ehdr->e_phnum++; + phdr++; + } + + /* Go through all the ranges in mem->ranges[] and prepare phdr */ + for (i =3D 0; i < mem->nr_ranges; i++) { + mstart =3D mem->ranges[i].start; + mend =3D mem->ranges[i].end; + + phdr->p_type =3D PT_LOAD; + phdr->p_flags =3D PF_R|PF_W|PF_X; + phdr->p_offset =3D mstart; + + phdr->p_paddr =3D mstart; + phdr->p_vaddr =3D (unsigned long) __va(mstart); + phdr->p_filesz =3D phdr->p_memsz =3D mend - mstart + 1; + phdr->p_align =3D 0; + ehdr->e_phnum++; + pr_debug("Crash PT_LOAD ELF header. phdr=3D%p vaddr=3D0x%llx, paddr=3D0x= %llx, sz=3D0x%llx e_phnum=3D%d p_offset=3D0x%llx\n", + phdr, phdr->p_vaddr, phdr->p_paddr, phdr->p_filesz, + ehdr->e_phnum, phdr->p_offset); + phdr++; + } + + *addr =3D buf; + *sz =3D elf_sz; + return 0; +} + Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type, void *data, size_t data_len) { diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 8347fc158d2b..7adf883c091c 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -1259,102 +1259,3 @@ int crash_exclude_mem_range(struct crash_mem *mem, mem->nr_ranges++; return 0; } - -int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map, - void **addr, unsigned long *sz) -{ - Elf64_Ehdr *ehdr; - Elf64_Phdr *phdr; - unsigned long nr_cpus =3D num_possible_cpus(), nr_phdr, elf_sz; - unsigned char *buf; - unsigned int cpu, i; - unsigned long long notes_addr; - unsigned long mstart, mend; - - /* extra phdr for vmcoreinfo ELF note */ - nr_phdr =3D nr_cpus + 1; - nr_phdr +=3D mem->nr_ranges; - - /* - * kexec-tools creates an extra PT_LOAD phdr for kernel text mapping - * area (for example, ffffffff80000000 - ffffffffa0000000 on x86_64). - * I think this is required by tools like gdb. So same physical - * memory will be mapped in two ELF headers. One will contain kernel - * text virtual addresses and other will have __va(physical) addresses. - */ - - nr_phdr++; - elf_sz =3D sizeof(Elf64_Ehdr) + nr_phdr * sizeof(Elf64_Phdr); - elf_sz =3D ALIGN(elf_sz, ELF_CORE_HEADER_ALIGN); - - buf =3D vzalloc(elf_sz); - if (!buf) - return -ENOMEM; - - ehdr =3D (Elf64_Ehdr *)buf; - phdr =3D (Elf64_Phdr *)(ehdr + 1); - memcpy(ehdr->e_ident, ELFMAG, SELFMAG); - ehdr->e_ident[EI_CLASS] =3D ELFCLASS64; - ehdr->e_ident[EI_DATA] =3D ELFDATA2LSB; - ehdr->e_ident[EI_VERSION] =3D EV_CURRENT; - ehdr->e_ident[EI_OSABI] =3D ELF_OSABI; - memset(ehdr->e_ident + EI_PAD, 0, EI_NIDENT - EI_PAD); - ehdr->e_type =3D ET_CORE; - ehdr->e_machine =3D ELF_ARCH; - ehdr->e_version =3D EV_CURRENT; - ehdr->e_phoff =3D sizeof(Elf64_Ehdr); - ehdr->e_ehsize =3D sizeof(Elf64_Ehdr); - ehdr->e_phentsize =3D sizeof(Elf64_Phdr); - - /* Prepare one phdr of type PT_NOTE for each present CPU */ - for_each_present_cpu(cpu) { - phdr->p_type =3D PT_NOTE; - notes_addr =3D per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu)); - phdr->p_offset =3D phdr->p_paddr =3D notes_addr; - phdr->p_filesz =3D phdr->p_memsz =3D sizeof(note_buf_t); - (ehdr->e_phnum)++; - phdr++; - } - - /* Prepare one PT_NOTE header for vmcoreinfo */ - phdr->p_type =3D PT_NOTE; - phdr->p_offset =3D phdr->p_paddr =3D paddr_vmcoreinfo_note(); - phdr->p_filesz =3D phdr->p_memsz =3D VMCOREINFO_NOTE_SIZE; - (ehdr->e_phnum)++; - phdr++; - - /* Prepare PT_LOAD type program header for kernel text region */ - if (kernel_map) { - phdr->p_type =3D PT_LOAD; - phdr->p_flags =3D PF_R|PF_W|PF_X; - phdr->p_vaddr =3D (unsigned long) _text; - phdr->p_filesz =3D phdr->p_memsz =3D _end - _text; - phdr->p_offset =3D phdr->p_paddr =3D __pa_symbol(_text); - ehdr->e_phnum++; - phdr++; - } - - /* Go through all the ranges in mem->ranges[] and prepare phdr */ - for (i =3D 0; i < mem->nr_ranges; i++) { - mstart =3D mem->ranges[i].start; - mend =3D mem->ranges[i].end; - - phdr->p_type =3D PT_LOAD; - phdr->p_flags =3D PF_R|PF_W|PF_X; - phdr->p_offset =3D mstart; - - phdr->p_paddr =3D mstart; - phdr->p_vaddr =3D (unsigned long) __va(mstart); - phdr->p_filesz =3D phdr->p_memsz =3D mend - mstart + 1; - phdr->p_align =3D 0; - ehdr->e_phnum++; - pr_debug("Crash PT_LOAD ELF header. phdr=3D%p vaddr=3D0x%llx, paddr=3D0x= %llx, sz=3D0x%llx e_phnum=3D%d p_offset=3D0x%llx\n", - phdr, phdr->p_vaddr, phdr->p_paddr, phdr->p_filesz, - ehdr->e_phnum, phdr->p_offset); - phdr++; - } - - *addr =3D buf; - *sz =3D elf_sz; - return 0; -} --=20 2.31.1 From nobody Tue Dec 16 08:39:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F7BEC43334 for ; Mon, 13 Jun 2022 22:43:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241765AbiFMWnx (ORCPT ); Mon, 13 Jun 2022 18:43:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231865AbiFMWns (ORCPT ); Mon, 13 Jun 2022 18:43:48 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37AB93121C for ; Mon, 13 Jun 2022 15:43:47 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25DJXYhR025664; Mon, 13 Jun 2022 22:43:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=X9I8kryINiy2LtWp/c8XSUkBZpc4d7TKO7XvQEr60C8=; b=0CfNHdrev8Gc0kG3f6Y1jlOELGwTfXSNZm01OA/MmLmTtLBfJBQBC6Ou59w6Km0Gm5gz NhJeOFG81VgIdiPq6Ra3Ll8Yu/zAnEn/V1tyvF62VjIulwAqGWl2L4J+yvWvzmmDqQNV speCiZyDVTSK78gN2vn4ECXiZTHt3ayh0vAy9BBi9j3P3hxHotp9EfqmsivP2xXa6QHH qGSBOL23d5ZS+QOs1Z0qym0KM7JhmgPEjraHRY+WsaaepuTHLauMz6YVi/JoSt7a3VFN EbXy6z67Oxft9kbmFs/ikPqzKRZdAVcJfFl27PzCOahniUX/t3fGUy5O46AHFChQbWcO dA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmjx9c8n8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:24 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25DMehqf014918; Mon, 13 Jun 2022 22:43:22 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3gpe88r47h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h+OodkQdpcyD0i52vQD04aAbVc8OSBhhUd4g+ja81Co6A3dlFh4vnQKOVhwnl4x3TpmwePc6b9Btjg13ruqKubq6vZTUrmZW+/690p0Cj8DWoRuV+92Z2qCgElTldTqvqlkMEoYj+cUngfH99etwsG4C9QGvxeux5IX1eo6eBfhuGb2YLWcAQGx3sd72UMOLvxh84aV3EI9tFpwJCtZFBeDo63zgNXI5uvDxHg7h55VLhXH/9r7TOtFq5qyjryq+r54QEY3GjJoRdGXN9C1ZOM0LWPfgAkYmGnj6p1MhU6DzAJSV4E3pBMX8azL5ylm+oR11Mdoa1BTWx/GC8A3gqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=X9I8kryINiy2LtWp/c8XSUkBZpc4d7TKO7XvQEr60C8=; b=beqXd+i7/o9igEadmY9AB99H7AiWZ7GbRgDDjBpbGBXlYEk0Qv7xIIjYhOxkSVVQnzIxlISqXRTmZRqKp22sENTYR5BqlYPVhICdDy4FOmdP6nOtljU6ya8+9qLd7nCmgZ6Wum2uIzoFm8G4gUE4VMBHd6jxN96X7fxJ7LMFe8r+3+CvsC0oORbxclmPsX6hLqF61GL8DmYWLHwO4jV89qoyg7cCiA3JcM7ix62GF19qryag7ggrYb07BK2KdHpDV/CaA3Go729fjwA2E0US2/ZTbiJH0WGtoDm+//rmDRSgAo1Zk4v5ApURAz47gLlh203ZHTTFAhacrUDXXEfOqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X9I8kryINiy2LtWp/c8XSUkBZpc4d7TKO7XvQEr60C8=; b=yintKHH8eC7XnIdBMFgGzW+7NIw6BFQ0wuzja03zqppfZYLLy0A9928BJ0db/ncH0AqG9aSxrhtHmyiNuZvbwVLNzzEeJh/ihHnaXGLQwcYEvuR1TsJAZr2L5ys/4TGU+rArE1nu4QgYj9RZEwAZ3uiCCcgqSMTe0M0CsfmQcls= Received: from SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) by MN2PR10MB3824.namprd10.prod.outlook.com (2603:10b6:208:1b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.16; Mon, 13 Jun 2022 22:43:06 +0000 Received: from SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f]) by SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f%9]) with mapi id 15.20.5332.021; Mon, 13 Jun 2022 22:43:06 +0000 From: Eric DeVolder 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, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v9 2/7] crash: prototype change for crash_prepare_elf64_headers Date: Mon, 13 Jun 2022 18:42:35 -0400 Message-Id: <20220613224240.79400-3-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220613224240.79400-1-eric.devolder@oracle.com> References: <20220613224240.79400-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM5PR15CA0041.namprd15.prod.outlook.com (2603:10b6:4:4b::27) To SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 896f3da1-f309-483d-53cc-08da4d8e14e0 X-MS-TrafficTypeDiagnostic: MN2PR10MB3824:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cmd7Tsh3WmNgSfGaF5CDxYMEnK1slaWC9bSeAJ9KiBiy81ByYoZfCD13gDO/P5zEewLQe0n103lupyj6PlnqOKfKwdeYd1F9nJuY+idUp/o9LCT25FSoQSOGJJb9t3a4dV+vEj0+rQ4PWW3U9TOaAc7OIRZBsSArdqO4IW+a/16mGw3Pox7cfo+A8r3Hpao7Ywm+pA1sHQCOlKxhW6s//8GFLyAgQhItfsTL3v+efrvlFq5H26j7JPwCrYjigHj2m5wbKTgnF0wc+arIABYSNt+T+VQOgMoKuH3CWdQ3t7xaMzCIZbK9z8uIs7jMvhIdrX6t45v9ddOg1rLOy+8H0HTd2ycXiqum1vg8Z8st6AgerceNeXmxRrbJRrhH5mnZe2pE8c/t0sE8FwTvpydUheZbRv9F8qt9hL1LvuPML2FCwQRXjM+uEmk2x0T0nqUAkPEOxK3aris7atmMy3aYRHXKID0gzM7zTP9ihDR2S26NutgKkSAZI1ckc4JTtqGiNioU30lguSRfPsJHXpoTjRuweCEo/qztKHrJ66HjA2cuGu0+Do0PJU0FY9Qur4cz2alVMdusJO7jiXghDXmmeQyo4DHCf7m27j/bniWq3ES39ZSBGGUSqUTyX1udSfChWx61lq5hvJlBwrAE3twxLAVZuw6ad9eaZ5TzTmxZWxnwSid2F1Djw7lpas8vHWInwGgrfDhcStCTUp5gtdutFQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB4542.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(1076003)(83380400001)(186003)(107886003)(2616005)(38100700002)(38350700002)(36756003)(8936002)(7416002)(5660300002)(66556008)(2906002)(508600001)(66946007)(6486002)(6666004)(6512007)(26005)(6506007)(52116002)(4326008)(66476007)(86362001)(8676002)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6v2RUkUXwZupB60QdO4MlKmk7QtT0NgPb0Bh3AnPn88Zzxj9dZCSOpH+U1jr?= =?us-ascii?Q?zqkIVNLtZgJ5TaKieiPYX8iM6b7F8DlT70KOqRtloCF3CuKTF9Ts1pY0JEL1?= =?us-ascii?Q?szDW9rcQYpAk/mOiPilG7tsZIMNPChKivTLZnYGLqIaHdwbyAsSSSvFDjEoU?= =?us-ascii?Q?Hy4cQs0rBdihnL9qiTVHWE6fLXs4dGrH5HseBisphLT6X1U7iOh6kpjY+rOB?= =?us-ascii?Q?Nmr2nemMGBj9R3h5NJanKklHn07U4TCzfR0eJ+AUk3gpuik6wpe+2OcK/RMG?= =?us-ascii?Q?DIW0oYm7ZEzHVPfXQC5z0bvGV5HVEn+At7Us7iPPni8zAdhIPd0XuPwaOENC?= =?us-ascii?Q?moD1zTkmphZTSO7691Imv+xCrrWI/jHz0fGWftO/X4zowJbuM5Xon9jxkuyj?= =?us-ascii?Q?uEAvxeWXk2VTo3fbHcIcVwcbhnuU3JqZxX3yHDnsT0Z8HNOwkb3u4QDoCrKB?= =?us-ascii?Q?90rryWh0i25uT7GOaomF5CaAKMzzZvVgogp8BTfcwbA6qnqNNMZPc/gmRVoA?= =?us-ascii?Q?mRRbdbqEnGEYN+d1iesldnjMvTfVJXV8k8lKy4PvA+3XyiIVr6usFae02zl6?= =?us-ascii?Q?uyrguVbvhU93nc0qtrxfR0FRvTEylVpf5b7zfatABdePrtnDyWB7qeb0/p6z?= =?us-ascii?Q?4A/ZOa4/ifajFLIyBQww3A1HfuS/FFmz08vbNlWoOVDtww86GZuzo5HdNNc0?= =?us-ascii?Q?0HoV/Q9selTh7D42nGgfYFgTdFKlwhUs6yqATlAnlPAOsYbItOgcgno2tySO?= =?us-ascii?Q?xGrAUZ3nk3IpyrIRwjSSVDNUmjzrnheCSIZEpCd6nrQoQAQ+SEM52Az432qZ?= =?us-ascii?Q?AnOs8OHI7wUACdEdAtal9DjMe2N6VbDNwUWhcscX265qlCZrhZEYM3QeZsYT?= =?us-ascii?Q?JNsKAm792bobaoch/qa6rtJdbSvDeYRJvkKqtBtntG3dASdjP3q9vDeEnpBD?= =?us-ascii?Q?f3ky0jOR6kd7lrJSezpfnzjk9zr1C4vR6igPyafHwi8+G/q6RmHy3kBVDZx5?= =?us-ascii?Q?SSVD6X6jAtdyWWooEbPTkpk6q8SeEWBFPQoGLNGC3IvSrMKwqlj32ctMScIA?= =?us-ascii?Q?Fy33W22gJ0FzqAxkGQJeEjy/4TwH/rsqFlxXA3BkhrjQVSIehthD+gojyBjv?= =?us-ascii?Q?Bi9h5WU4spQRDTFtYTCw9eDlxHEph00gZ3EReT1ja9vmnpipITnpB2Xa9RBr?= =?us-ascii?Q?qE9CeG/qKX3f2YRJBP0iS9mm+DYcbd2Qruw7kFbEBEuIql3dNLWnqSIpqAtZ?= =?us-ascii?Q?akvnFcL7+umz8BmdvjmLzPqgr3g7sDhpmVW7HKsnJR7ka+R6eo2ZuEv68J1v?= =?us-ascii?Q?9b+EF5GbkV46yykVUeXXrWg6uKBAAVpM71Z6HNNAoslcSkHL62r7d5pXr6m3?= =?us-ascii?Q?9E5OAuzgxDxibziNtWURpxjbvW0wC/JpyKI996cVTnWKEMTclWAbC5J+oAR+?= =?us-ascii?Q?6vz9CEILydYht+EnoiqOL36Im9iiFxQfm+LYSy/Gt3vC2odUqubP78ehqZ09?= =?us-ascii?Q?PWo8oGk5/YojSBJuSrolM1al0TrTdcl9BvwX9pvIUl9s1z5FBG6qTvcvfCxR?= =?us-ascii?Q?IyhPAgI3hyYkislONhVbVF2y9M5k8bul5yP1MxHEOKCFl3rcPlsTOtBrfyh2?= =?us-ascii?Q?EhKS2ULo1bkeHzINf0X2wkMsWvzkvmniu4AtqjxrTSVNMLIwm1JEgbuPV/GL?= =?us-ascii?Q?dKpEwo6q/nOL3fAalSXi8d8DnsL7GPYx7UgohdZNX1OoNeJex1F5vZcWBr/2?= =?us-ascii?Q?UWHPnpaD5RRYOooCjefG3BGyvwMo5HY=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 896f3da1-f309-483d-53cc-08da4d8e14e0 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 22:43:06.3067 (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: NloxSlP5Zy1vMTkejBGWIpi97kUQVZz1eQefJaWEvoyOgU4JSCMFZfaWhdMUULLk3+bB8pje+OpH4dy/JwEIT/QOOl1I/lYZj3WD8VyaKzo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3824 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-13_09:2022-06-13,2022-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206130087 X-Proofpoint-ORIG-GUID: VNj1w7_-sELr9N-DfzpLPya2UdmjZGI2 X-Proofpoint-GUID: VNj1w7_-sELr9N-DfzpLPya2UdmjZGI2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From within crash_prepare_elf64_headers() there is a need to reference the struct kimage hotplug members. As such, this change passes the struct kimage as a parameter to the crash_prepare_elf64_headers(). The hotplug members are added in "crash: add generic infrastructure for crash hotplug support". This is preparation for later patch, no functionality change. Signed-off-by: Eric DeVolder Acked-by: Baoquan He Acked-by: David Hildenbrand --- arch/arm64/kernel/machine_kexec_file.c | 6 +++--- arch/powerpc/kexec/file_load_64.c | 2 +- arch/x86/kernel/crash.c | 3 ++- include/linux/kexec.h | 5 +++-- kernel/crash_core.c | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/mac= hine_kexec_file.c index 889951291cc0..421d42c338c1 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -39,7 +39,7 @@ int arch_kimage_file_post_load_cleanup(struct kimage *ima= ge) return kexec_image_post_load_cleanup_default(image); } =20 -static int prepare_elf_headers(void **addr, unsigned long *sz) +static int prepare_elf_headers(struct kimage *image, void **addr, unsigned= long *sz) { struct crash_mem *cmem; unsigned int nr_ranges; @@ -74,7 +74,7 @@ static int prepare_elf_headers(void **addr, unsigned long= *sz) goto out; } =20 - ret =3D crash_prepare_elf64_headers(cmem, true, addr, sz); + ret =3D crash_prepare_elf64_headers(image, cmem, true, addr, sz); =20 out: kfree(cmem); @@ -104,7 +104,7 @@ int load_other_segments(struct kimage *image, =20 /* load elf core header */ if (image->type =3D=3D KEXEC_TYPE_CRASH) { - ret =3D prepare_elf_headers(&headers, &headers_sz); + ret =3D prepare_elf_headers(image, &headers, &headers_sz); if (ret) { pr_err("Preparing elf core header failed\n"); goto out_err; diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_lo= ad_64.c index b4981b651d9a..07da6bf1cf24 100644 --- a/arch/powerpc/kexec/file_load_64.c +++ b/arch/powerpc/kexec/file_load_64.c @@ -797,7 +797,7 @@ static int load_elfcorehdr_segment(struct kimage *image= , struct kexec_buf *kbuf) goto out; =20 /* Setup elfcorehdr segment */ - ret =3D crash_prepare_elf64_headers(cmem, false, &headers, &headers_sz); + ret =3D crash_prepare_elf64_headers(image, cmem, false, &headers, &header= s_sz); if (ret) { pr_err("Failed to prepare elf headers for the core\n"); goto out; diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 9730c88530fc..9db41cce8d97 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -265,7 +265,8 @@ static int prepare_elf_headers(struct kimage *image, vo= id **addr, goto out; =20 /* By default prepare 64bit headers */ - ret =3D crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), add= r, sz); + ret =3D crash_prepare_elf64_headers(image, cmem, + IS_ENABLED(CONFIG_X86_64), addr, sz); =20 out: vfree(cmem); diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 58d1b58a971e..f93f2591fc1e 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -227,8 +227,9 @@ struct crash_mem { extern int crash_exclude_mem_range(struct crash_mem *mem, unsigned long long mstart, unsigned long long mend); -extern int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_m= ap, - void **addr, unsigned long *sz); +extern int crash_prepare_elf64_headers(struct kimage *image, + struct crash_mem *mem, int kernel_map, + void **addr, unsigned long *sz); #endif /* CONFIG_KEXEC_FILE */ =20 #ifdef CONFIG_KEXEC_ELF diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 85058fdce308..59ad87a7e40d 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -306,8 +306,8 @@ static int __init parse_crashkernel_dummy(char *arg) } early_param("crashkernel", parse_crashkernel_dummy); =20 -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 *me= m, + int kernel_map, void **addr, unsigned long *sz) { Elf64_Ehdr *ehdr; Elf64_Phdr *phdr; --=20 2.31.1 From nobody Tue Dec 16 08:39:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E26DC433EF for ; Mon, 13 Jun 2022 22:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244364AbiFMWoK (ORCPT ); Mon, 13 Jun 2022 18:44:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243468AbiFMWoC (ORCPT ); Mon, 13 Jun 2022 18:44:02 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8403931239 for ; Mon, 13 Jun 2022 15:44:01 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25DJdWY9004212; Mon, 13 Jun 2022 22:43:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=IqYiYFqLO7HqMHooEsPe+Omg0Dk22wn+Y3xfUWyr+pU=; b=FV+7aNdPGQ0/+iwfuo+gZGEhDsLPZ9WlPsQL9n+nQpQu8w2hjmvcgJ6SL3p6vzTPVGRA CcQT/UMoRf1JdI9GSb71tMPYux9xdCkUdsRY3X1LzyxE8Ow7W/0sdrVG2O1ArUPxfjm4 NqLGAtWFAdmE7a+mr7j2F7ledw9EuBFLRTpl+xMLyFyHmhytX0ypElSwImK9dqmYSUVt uOgaAh2HRT+WJ16Flt9eo3XCMxNdRdqEBkmLjI3LJjjx0sd2QevELg0euKy95hMan2gF gzv686Rgrx4Fw37Ghqsj/1es3iQX4tq8bHkTXRdRjCvB7jT3H7yIxnaoY9FgzI2hsDsH 8A== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmhu2mcsa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:37 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25DMeY3M035873; Mon, 13 Jun 2022 22:43:37 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2043.outbound.protection.outlook.com [104.47.66.43]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3gpe86g4w2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PMcdK1FNLZRtiVEEIjFmmUfLXDaFiiF22mjhu7/pdPeyRrAYKof8ZXTQIAc2MTIDN99SRRcBhZ/iG4Mr45cVPkAnsfuaaOloMtnyBFRSVq8E9/BEyvzSrIf347sgcy9aaTaDes4znFdulNAgs3cI62EbquDg1Ej37O5/1ADQlRcFEYl4uZOK+Lt2zBQkH3rU0PehaSfx3B7RzVp62UmeohGyMmUBQpINHFVVqbWX/YzjJv4xhCsd234Z3ZTyAN8UHpcdI98f/9WjGjxquVCIy+cB/rnrRnqMhK8oG6Sfh7naQUqfkxdgVkmcuW0ewPuwJVLODpVxi+0vI3zRssMmig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IqYiYFqLO7HqMHooEsPe+Omg0Dk22wn+Y3xfUWyr+pU=; b=fgTATUk/1SdHs7J9m1GqItLVY1UeHEx4eXSx9FQ8hUVVw63wNVpV+4f8LVG7mzj4WRfgGQJ25Mf/RCaxteLeBKpET15Ean9I7g7Vu+EiiUPBAp1yQDzfggHgxFKfiBF7u+/ZhxsAHTSkb/BUqYhqc8OObZYI2hlXR3/tGpesViTNfi8yFJsq8XnaM7n0+2ApW2iGGozPmUrHR75k/RshC05L07vX/2ejVyCYqGi6HQ1+9jdSmnl+TzRI8RzeNeiBYAZMGL6CRq3Li7Z/c+byp/u2O/xJ11N0LlhFdsHKcnfD3+y6CA3yJS3So2vIZbKeE8VMDJTNAUdwrgjA4uaW7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IqYiYFqLO7HqMHooEsPe+Omg0Dk22wn+Y3xfUWyr+pU=; b=D87YGynoIvoqHVWCF8/RMT747vVmWvlrtvUV90CWwj5v6hMy43MfuGEPfNhdaAUNl/fCJmD6dU5Iyqig3yfNHZ/HeiO8WCGudCGG+bCM3ZjqWk+9p5cGYiv7ntwfBpL2AT286HAVMSR5U8ZMuBGyuuKzBCZP8jshtI2wPXUEFCg= Received: from SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) by MN2PR10MB3824.namprd10.prod.outlook.com (2603:10b6:208:1b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.16; Mon, 13 Jun 2022 22:43:08 +0000 Received: from SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f]) by SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f%9]) with mapi id 15.20.5332.021; Mon, 13 Jun 2022 22:43:08 +0000 From: Eric DeVolder 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, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v9 3/7] crash: add generic infrastructure for crash hotplug support Date: Mon, 13 Jun 2022 18:42:36 -0400 Message-Id: <20220613224240.79400-4-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220613224240.79400-1-eric.devolder@oracle.com> References: <20220613224240.79400-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM5PR15CA0041.namprd15.prod.outlook.com (2603:10b6:4:4b::27) To SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85cc932f-a0a9-4784-2197-08da4d8e1678 X-MS-TrafficTypeDiagnostic: MN2PR10MB3824:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BXJs5FndtmCTu3EOzJeyuZPEsa6wG5/WRiGMXxFJBTOF9Eh3d0J+seVnvM5Xq8mtI1tEo1XnGIgAWLGsK43NR23TgZZD2R42RtGKRyy+aIGLJX/ywsIV61KQVYzYKsOC5bfERR4nIXxtbm8whoZ6ZGvWPwox6IlTp43ezDMnvz+08pJF+afxLIhCLk96hCcqj9Hzm8yslLr+SN8FNhfhemyaZNvR4veYnvavK8p9Pju5w1obseObXxKDQzd5CaY6b4w2aeWM5ze0279elG3U6ux+JWRdxfoGJxbT1hXkTwrcAxuzTsZjyKSlkF0+EIqE0XpkgJfPYOIW/UMbFYOIP+dsSkP4Z6ghkumF5Wv/B4NRbJthTGZd0qRbkD3O1Ly+0kQP0ZA5syUACHwF+eLBDShW2a6UlJlJTHtc20xGxsddxauunthNbrAGjXF7HYDP99xYvUgYgI3wLMGhRtL9s3azFkY4pZ0drc0JaZs7JvQP56Rd9dkQbuDzN5pNhQ37+jo0gp6087xoHTW41/LXF2rp1WLdqTCukxAQXuSLnoFUyiI0MSVaZdgVChAba5z4z3rbNLvgaGHbBH/tppXkqR5hkLlr9siVufrWkCDpizCYpxGiidFzpRROcL9R3kgcpiiYZpkbQtH7b2H+UlcQ56UtFJFdoJEGYtbu9r7Ceo7ueu6PImC1YQcCKBQZH/q4c5XJmSxDhX+RdkLqpkOHhg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB4542.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(1076003)(83380400001)(186003)(107886003)(2616005)(38100700002)(38350700002)(36756003)(8936002)(7416002)(5660300002)(66556008)(2906002)(508600001)(66946007)(6486002)(6666004)(6512007)(26005)(6506007)(52116002)(4326008)(66476007)(86362001)(8676002)(316002)(41533002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ip6FUCAvsLTT7iE3y6WK2Z5OCy0Ky2Kwccj6ztxQkz5Ffzzx4mTIoJ5z9tYK?= =?us-ascii?Q?1B1sUCtf4N1ezHCu4RZ7nOxtoaEol0RyvZH5pF0jh3pB0I1+2DI0Ej0F6/MU?= =?us-ascii?Q?GMp3nDqQihD7gMA8DKllQcdm+GgTt66xPTC5VcicNFoK0PjkgdnZJ8KX+GG6?= =?us-ascii?Q?gZPHnciwGbW7K+lgSwm+tGO3+yyY2P1kwNzBGqoRvbuNkQ51RofPqsNuNmfg?= =?us-ascii?Q?YfdE84kvi3X+dFgkN8OOkEoOEmcL8e5xiQLTL8ATiXxOe617N415R9nCi2Hb?= =?us-ascii?Q?0oRLehfVphkh9AyyPohbD7Dw/OMYev53KBsuR82iOUpIA26LDMjGYBlNCjRJ?= =?us-ascii?Q?yShx1zwa5sD6IeaadWAKiZDCdh2sjpG+FdMXjX0zfAKVfIDnGn2MFhsNeB3a?= =?us-ascii?Q?z6J2ZczGc6xO0wMcHZLDwrLm2MVFf3Of7UnLwXmAvSg1hbuIwtxs/2YhQQik?= =?us-ascii?Q?rX89IZUKs24mCRJ2A3OkoM1rcYfXV+WTqT2CvbSIhl7h8zph1kwVrB6/9gAu?= =?us-ascii?Q?byWF6RPyQWYIGr33aVx1u+vLtpFtVQgFbDNXNFeOKrVu2lVXMuC61baeyKC+?= =?us-ascii?Q?KJnq0i3R6hopGOJFqJoUWzyGi7BAZVh3v8jJCQUYKdLlRUaLWHzgmJRf3/5u?= =?us-ascii?Q?M47CCSrUZE28ICAnVim4UfPwBVU0yl4owJ0tWucMAQ0ubTSP1MpeRdHVEb0G?= =?us-ascii?Q?1unY6Q9spWvsVBEG5tV7Xo8DBIzlrVIrHL0X2BcGAru4kXv8C4ct29DPvTKj?= =?us-ascii?Q?HZoMPFwT/AHxpjkXeyOYJ2TwTig/JGuWwgB3X9Ys2OBsgjTLc1XkRX3PTD2s?= =?us-ascii?Q?nAVj7x8dAeMhuxgOQXjsCBIr4QZUuAredlaZr0WVZUMTDzg9VKYPm8wLx/3S?= =?us-ascii?Q?F8y3DIt9T5MwTDzzABWKdsi9xJ3tKtjFBSX3NlgdY78AwUibGkMklTd+vXrF?= =?us-ascii?Q?6/aZu4OZuMXxjsJ5ppaVRPyfAprrSRh/X0A3vTPWcbaMVJ8yBDW+1hnx/gGv?= =?us-ascii?Q?hXKjROPPwHD4yF038VosKncBdPGH9ctuFbfrtuu4yRC1bRFLQBFvVSWPbl/H?= =?us-ascii?Q?RRLGT3GBGbudQeHLGrulKL85F1ratFd8lDICKnrJJWpeacZgyPbWiwY40eJu?= =?us-ascii?Q?4ocFEzkq+l9Gjo/owqoUXo2aB8SnC7TGHQWGJ+BqTqFsvEY5Hc1fFot0Wa1R?= =?us-ascii?Q?mnQnniM+O30QkJ0rvegTr8qtQIakan7Uiz7Tate0OPlO0OOsaZ16VP2PPkN6?= =?us-ascii?Q?U0nzwHinRh+E/VhhK49Zle5cnSe9SvCIDPwJHLGOO/UyL7gEM83u7kaWVm3A?= =?us-ascii?Q?t78UPdliOid/UwGo6Xl6WatbNeI/TTAAC8RZ7vVlLGRqtPZ09FRaaCCOvKtX?= =?us-ascii?Q?c5bZSGSC9wVwKcfGWTHWQKvosowGhqHfhQxhgEx3uduanpsY+OPRbO8zjR/x?= =?us-ascii?Q?T0QQwAWHJTW3eLaQknQQ28jePSKEuBkXPXHMjEYvytt5JLdp8qLm5tb/rE7Z?= =?us-ascii?Q?HavNwe7fSN9uldEWbzF+wALwPzCXZDX8odFobhtcKKNADMm+yfPSNilrJ6rj?= =?us-ascii?Q?3DKJQF/Yf6Tg+qO79GEuLZwQU3eBdQ2243GFqF4Cvk3FQkLYWAeu5SrUuWNb?= =?us-ascii?Q?gF42fVmZF0Nj5+T+uPus2rNuPWsDTJMpb04XKux1nhq07H4LeDiVN5hvxMln?= =?us-ascii?Q?1lByn2PWqbEWwZw/tYXgncmV9Ma+tqz6eF7Fa7zzuBTpg7sp/UiTFR84D1XW?= =?us-ascii?Q?IzOuulhCV5mAxq9InrhOTKZ5xneYLMc=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85cc932f-a0a9-4784-2197-08da4d8e1678 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 22:43:08.6512 (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: roQ2NzgMz09hg5SycjLmduLNFyoR9DA28uUSgGSC1ovsnSfmEdZMoEtHcDwQDYuGqWs/lp2YwsNhW4Kjo/vTmUaNWNGvUeBhaSTWBr9Vd/Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3824 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-13_09:2022-06-13,2022-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206130087 X-Proofpoint-GUID: v0aYDuCkWYOV7mZMZfAyLQjvFhZjnmP0 X-Proofpoint-ORIG-GUID: v0aYDuCkWYOV7mZMZfAyLQjvFhZjnmP0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" CPU and memory change notifications are received in order to regenerate the elfcorehdr. To support cpu hotplug, a callback is registered to capture the CPUHP_AP_ONLINE_DYN online and offline events via cpuhp_setup_state_nocalls(). To support memory hotplug, a notifier is registered to capture the MEM_ONLINE and MEM_OFFLINE events via register_memory_notifier(). The cpu callback and memory notifiers call handle_hotplug_event() to handle the hot plug/unplug event. Then handle_hotplug_event() dispatches the event to the architecture specific arch_crash_handle_hotplug_event(). During the process, the kexec_mutex is held. Signed-off-by: Eric DeVolder --- include/linux/crash_core.h | 12 ++++ include/linux/kexec.h | 7 +++ kernel/crash_core.c | 124 +++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h index de62a722431e..564534820db9 100644 --- a/include/linux/crash_core.h +++ b/include/linux/crash_core.h @@ -84,4 +84,16 @@ int parse_crashkernel_high(char *cmdline, unsigned long = long system_ram, int parse_crashkernel_low(char *cmdline, unsigned long long system_ram, unsigned long long *crash_size, unsigned long long *crash_base); =20 +#define KEXEC_CRASH_HP_REMOVE_CPU 0 +#define KEXEC_CRASH_HP_ADD_CPU 1 +#define KEXEC_CRASH_HP_REMOVE_MEMORY 2 +#define KEXEC_CRASH_HP_ADD_MEMORY 3 +#define KEXEC_CRASH_HP_INVALID_CPU -1U + +struct kimage; +void *arch_map_crash_pages(unsigned long paddr, unsigned long size); +void arch_unmap_crash_pages(void **ptr); +void arch_crash_handle_hotplug_event(struct kimage *image, unsigned int hp= _action, + unsigned int cpu); + #endif /* LINUX_CRASH_CORE_H */ diff --git a/include/linux/kexec.h b/include/linux/kexec.h index f93f2591fc1e..f9b13882debf 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -308,6 +308,13 @@ struct kimage { struct purgatory_info purgatory_info; #endif =20 +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG) + bool hotplug_event; + unsigned int offlinecpu; + bool elfcorehdr_index_valid; + int elfcorehdr_index; +#endif + #ifdef CONFIG_IMA_KEXEC /* Virtual address of IMA measurement buffer for kexec syscall */ void *ima_buffer; diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 59ad87a7e40d..84eb10a4241f 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -10,12 +10,16 @@ #include #include #include +#include +#include =20 #include #include =20 #include =20 +#include "kexec_internal.h" + /* vmcoreinfo stuff */ unsigned char *vmcoreinfo_data; size_t vmcoreinfo_size; @@ -590,3 +594,123 @@ static int __init crash_save_vmcoreinfo_init(void) } =20 subsys_initcall(crash_save_vmcoreinfo_init); + +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG) +void __weak arch_crash_handle_hotplug_event(struct kimage *image, + unsigned int hp_action, unsigned int cpu) +{ + WARN_ONCE(1, "crash hotplug handler not implemented"); +} + +static void handle_hotplug_event(unsigned int hp_action, unsigned int cpu) +{ + /* Obtain lock while changing crash information */ + mutex_lock(&kexec_mutex); + + /* Check kdump is loaded */ + if (kexec_crash_image) { + struct kimage *image =3D kexec_crash_image; + + pr_debug("crash hp: hp_action %u, cpu %u", hp_action, cpu); + + /* + * When the struct kimage is alloced, it is wiped to zero, so + * the elfcorehdr_index_valid defaults to false. Find the + * segment containing the elfcorehdr, if not already found. + * This works for both the kexec_load and kexec_file_load paths. + */ + if (!image->elfcorehdr_index_valid) { + unsigned char *ptr; + unsigned long mem, memsz; + unsigned int n; + + for (n =3D 0; n < image->nr_segments; n++) { + mem =3D image->segment[n].mem; + memsz =3D image->segment[n].memsz; + ptr =3D arch_map_crash_pages(mem, memsz); + if (ptr) { + /* The segment containing elfcorehdr */ + if (memcmp(ptr, ELFMAG, SELFMAG) =3D=3D 0) { + image->elfcorehdr_index =3D (int)n; + image->elfcorehdr_index_valid =3D true; + } + } + arch_unmap_crash_pages((void **)&ptr); + } + } + + if (!image->elfcorehdr_index_valid) { + pr_err("crash hp: unable to locate elfcorehdr segment"); + goto out; + } + + /* Needed in order for the segments to be updated */ + arch_kexec_unprotect_crashkres(); + + /* Flag to differentiate between normal load and hotplug */ + image->hotplug_event =3D true; + + /* Now invoke arch-specific update handler */ + arch_crash_handle_hotplug_event(image, hp_action, cpu); + + /* No longer handling a hotplug event */ + image->hotplug_event =3D false; + + /* Change back to read-only */ + arch_kexec_protect_crashkres(); + } + +out: + /* Release lock now that update complete */ + mutex_unlock(&kexec_mutex); +} + +static int crash_memhp_notifier(struct notifier_block *nb, unsigned long v= al, void *v) +{ + switch (val) { + case MEM_ONLINE: + handle_hotplug_event(KEXEC_CRASH_HP_ADD_MEMORY, 0); + break; + + case MEM_OFFLINE: + handle_hotplug_event(KEXEC_CRASH_HP_REMOVE_MEMORY, 0); + break; + } + return NOTIFY_OK; +} + +static struct notifier_block crash_memhp_nb =3D { + .notifier_call =3D crash_memhp_notifier, + .priority =3D 0 +}; + +static int crash_cpuhp_online(unsigned int cpu) +{ + handle_hotplug_event(KEXEC_CRASH_HP_ADD_CPU, cpu); + return 0; +} + +static int crash_cpuhp_offline(unsigned int cpu) +{ + handle_hotplug_event(KEXEC_CRASH_HP_REMOVE_CPU, cpu); + return 0; +} + +static int __init crash_hotplug_init(void) +{ + int result =3D 0; + + if (IS_ENABLED(CONFIG_MEMORY_HOTPLUG)) + register_memory_notifier(&crash_memhp_nb); + + if (IS_ENABLED(CONFIG_HOTPLUG_CPU)) + result =3D cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, + "crash/cpuhp", + crash_cpuhp_online, + crash_cpuhp_offline); + + return result; +} + +subsys_initcall(crash_hotplug_init); +#endif --=20 2.31.1 From nobody Tue Dec 16 08:39:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2242C433EF for ; Mon, 13 Jun 2022 22:43:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242471AbiFMWn4 (ORCPT ); Mon, 13 Jun 2022 18:43:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231982AbiFMWnv (ORCPT ); Mon, 13 Jun 2022 18:43:51 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5932831229 for ; Mon, 13 Jun 2022 15:43:50 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25DJdhir014557; Mon, 13 Jun 2022 22:43:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=i1Eh9Pai4GhkXhcUKGCA2nx6hmrUlauJAcefAWwohhA=; b=kcw4Tv+mC/yRw1byk7nC9d906yiquiw09+AY5SJV0nG+oJ5RJQsbzWYqZHsRAHYQy119 Mnz1mgSGPIfLipAimc5y9yFo/dcFrvhGa0TFirEPvqipvCnCCljWgcZ+pBUr/AuOXtCP KXaay2AZ2vD2s+m15HSHGrUjIOj3XvxQ+ZDn8mTQCWXBJoj1DZ5kOEMCCydlBK6sdlXx u+jq8puLfhSewv6FsPjXq8FMHX3YeYsQGoi6m6EVwD6560E5PK7Zng64zA/UXIvYcxmJ B4ju4d/KnWIDwXRO5+av38BTkjunzHsS9SrlWVPRi7iLeh0SKvI/Rw2nC2XwYLHDc4ts Pw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmkktcaf4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:25 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25DMehqh014918; Mon, 13 Jun 2022 22:43:23 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3gpe88r47h-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f+vAbQxtJNXfTf5cEIMxh7IW7VSrHrIj8FRjyk8AmJATPJ58+iln8WmYcdplkq8vMT6fsx7T2hKDFnjUoz8aqxXWdcSWYpSFx2MrOyrKgPZhEX6tpWDkfn3YgpKk6e22akoNzJN4MReHeLS73rXyYBJwrLkQUfbB3k0mMSKqMfWsim5E3ID6LIdk3s3Fraibf74S8ofoym1UsoBmCGAb/A7hd/yyggsuYEvi6+ytjcNKSKdGzthj3Y/c/hubrDVhArQMaW85BvfTjXKqnRpq87kj7F97WVtffrxk+ZAmq+sJkbmlZnlODmmkHMg2OWGJWQPycuELT1Xxflx9rEKWPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=i1Eh9Pai4GhkXhcUKGCA2nx6hmrUlauJAcefAWwohhA=; b=Eqcbz5VV/l4PWAcJGCTmre5hs73tQyndk6JKHU6ICVjc1603/RcQMh9PZ15ylrNyvqxVprIwbSGDux5HpfzXq+c+VVs0HCX/Ff1jE5NmZlF4288Ajg7pNJqRbFmtoou3Jk2o7K0eFIPlwZfrXmIKbd9IuNSV2NsZm1ecPV9ekRwv2L6Q2m/F5JOco6rP2n+dLDC8YyASubYRh2RVRT6RYG994w2XG7fKGo3k214ny04K63aUU4CAmoXpBOD0VRSpP0hQuHP0sN2MY1lZg/BmdXNo3MBbhdODQht/5vnXPQ5xYZu5/xTFJ4whankQK6nvij3Syhc5uAoqeod0PvzP5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=i1Eh9Pai4GhkXhcUKGCA2nx6hmrUlauJAcefAWwohhA=; b=dI8IFc9M1aPTwNHNYU2Q2O1rJ8QCMYsvPLOyJw+eWjjtCYky7x5sFh4LesLYBsXb0TJtBar2b3i6nuvUD6WpEM5/30aUlmJdTTlUS83DIFOpzlM0RPhbGQtA20VwqhuE9CeMKFTC+8jIL5EVhFUBYCdhr3JZoaa19/NPLfxoFu0= Received: from SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) by MN2PR10MB3824.namprd10.prod.outlook.com (2603:10b6:208:1b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.16; Mon, 13 Jun 2022 22:43:11 +0000 Received: from SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f]) by SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f%9]) with mapi id 15.20.5332.021; Mon, 13 Jun 2022 22:43:11 +0000 From: Eric DeVolder 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, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v9 4/7] kexec: exclude elfcorehdr from the segment digest Date: Mon, 13 Jun 2022 18:42:37 -0400 Message-Id: <20220613224240.79400-5-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220613224240.79400-1-eric.devolder@oracle.com> References: <20220613224240.79400-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM5PR15CA0041.namprd15.prod.outlook.com (2603:10b6:4:4b::27) To SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b094af7e-d3fa-464b-8d33-08da4d8e17df X-MS-TrafficTypeDiagnostic: MN2PR10MB3824:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jxXihZ1OmdX1S+iwr9a7hqI3PpiWSIdEFXZyXV1TENXR6bx/1jd3FmV9apwuLW0TPc1uSmOseH8Zvr/ui41VyjRewxqBGjGQaRoR6zO+yKHl/ctGqZZ/dliqnVm71HIcDttjuBGLX7gqrRocFouVcyDqHx6Jj2wDTSKyDAz3U0/Dd/czJhvu9+OAFjs4T68+K/+OsN01DC4g4agrgR4LGaLaX/RWf1rbv+XGW0PZbczcOVjdlpTm15N09BfqtPYpEfEQe1hE74dwRLHn2FWb2AWj4MdolekmQt6a0s+DNn+CXW6Ja9VkV6O8S2JfOSulZowLxHtad2lXZfsdlmSq1/7/o3HBa+sVILs8gj2SMc3MjChF+GpejYR79UknvAl/MHZUCpNjoGFWRskjtsbqggxfwt8hQ+kLxYiHkgBwJb4k4cGhSqnRMcJuP//7KPCvg4dai0jvIppz35SjJbbF0HYgEMSW4K6sha6LUTixVU0VO12jSekq1ynE5osX/YgPWbjBIeYW/rK4ljYenKV+Mpa58iPKcfgtgGCX8SkZAXKXRR8DAZv6pW5KahB1zKX3GjaKqyZZ3bGJv/rlx8y+WdlOpFrHjiQhETeRtzIbI7SZunsU7HtqvSQJzhb3nUeuEoUqMYsEZBIfk+BcKKsMLgKtKnG4VAUETLzbC9T0+KOLtccRFrGXPkUO8fFK0T3T+0pTpO2zdxVXjV3nfhgQqg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB4542.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(1076003)(186003)(107886003)(2616005)(38100700002)(38350700002)(36756003)(8936002)(7416002)(5660300002)(66556008)(2906002)(508600001)(66946007)(6486002)(6666004)(6512007)(26005)(6506007)(52116002)(4326008)(66476007)(86362001)(8676002)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VPTFCfSlvggYFJR/ySaFDhCnu9PSrXuG2aaFjces6z4Vzpproh3MuTYG5Jd8?= =?us-ascii?Q?S9fPNelhowGfZ+JWTOG5Ldsl2ISEptCFfxRPWvZlB5vpnygIbW3HqSs7cjb4?= =?us-ascii?Q?4U0J08xPfJYui0k0FBfMg3jb8WAL9vRSQgXfU8ITDgVJHQlE/raG/pMwk/4D?= =?us-ascii?Q?yyCiI/gdFYFq1EcWxQlC7/0VxNvJomJNZBOOFd1XxanG7FNkVHdw960uVwhM?= =?us-ascii?Q?IWh14JzODl/ndDVuTIDt/PY9DuUDDCQkiPxS8PYHBxyIGl3EgC6Qi7NQMoy5?= =?us-ascii?Q?wqBQRN4eLAeZpd2Zzjs9QE0qaxqrDNNh2atHf3rKER5QIqcXgLbbf/V/cIu2?= =?us-ascii?Q?m9s8CajmBabkqYWv0L+IsypZ3csXtQKOA7dV+aRTvt2e1vis/RpIJgR1flJi?= =?us-ascii?Q?thqBqLmuiP8bVppgPD3hwvF+jNYzYsBROMGbLoVsZ2xR0+dv3mle7r1s6Tyu?= =?us-ascii?Q?FWKRvoBjIXuxqL/9xcDEBnXvIeRVLo8oxp6XnloLQ1ARND+xGGu5xzYvaudo?= =?us-ascii?Q?jsH4vV6sakOCfE2sDuSJVwjqrMxq7FsyK0IILEGCInouFCwfd9n7NFWFbqJy?= =?us-ascii?Q?WP1AUolzdeLaUXvUBvWR8Y+HaII4eTkNHuTb+4LRniiS+pvmbrBLth9b6lzg?= =?us-ascii?Q?e0AdRCBz4XSAqVgBKsU4PPeS2FCFpVr5USA6CuSqohe5FmuDZUcoAdOhfssi?= =?us-ascii?Q?lmIUD1C1YLyhlrj20xagymtCIodDlHtYrwYh6xe8VyBgyp0WFxwVe9C8BByR?= =?us-ascii?Q?L1P9gHvW70TIwIkYioZ3pubH2M3W+nxHfjxymYpFT6tzCL4wZg9lSGy49Bhu?= =?us-ascii?Q?9eAxu/UVnCPg4X5G3sC1pAieKV/CBpnxnJ8G167yoC7rEBGel0qUc+yFmwXC?= =?us-ascii?Q?RYqQSz8GSVzOEXKz/af7yTR8F3GGuW6LNxTwIHDBqy7ETa0K+Z/OHOvYpjn0?= =?us-ascii?Q?RJtJLIjTH0PHjtK0vlBPe9VKkV9ReciCLxkWTMwt7aZatLKX+LRhSzvNmrkq?= =?us-ascii?Q?6GU8NQRv1DwK26hm2F0ZQ5NG+T8+M6S6nkoWiT8Rriggw2DLTw86+ltYkQk0?= =?us-ascii?Q?RGOrIjRjAT5M8zn4AhGYmYz/1u5NtyxXTUP/CZ5Ep/N7NPQGr/RcAhLLjmZp?= =?us-ascii?Q?j2jJAHbFVA0dMc1Lfj0NIAdIPEPIc0PhZ0BTu4LQ73JV375cGqcmluSrh1v9?= =?us-ascii?Q?xzeiu9cFMir9AdTh/hGChq6dBe3wqpLLspnoyN0ijobDl7diwarC1nGjxg3s?= =?us-ascii?Q?cVtFlggzQE3CVZQ93a4s/nRGhnOKZ1UWxoZi9v/uqUky3nZRuz0dp2SSc8s8?= =?us-ascii?Q?APsnANEWow5CCTMUw2oGbhFtyRIFvjFbzKgJbCQPhJ4/EjnJTNHxGw7K97eP?= =?us-ascii?Q?CHeeNSXesDa9fhpQEeYzQ5OGWr+ed7Lx9aPAKuXycqmuMQKrW58/fbBmOmr/?= =?us-ascii?Q?E2U6vRrtuL7ChwHsBNYryHVwmsP95odV8UhzRjx8AtJctTykj8reWRSCLGo6?= =?us-ascii?Q?twUMwVV1i8MOJc7uiFddcGSL9j2RD7/9YoNFjuBpg1q2U+17aDaMdUCfKuaa?= =?us-ascii?Q?Yvg5Vo6ohLmLhbz6QFx40Uy0rXaIF9nXYMtqvN94zPYA4zY4NZczgT2hpPGP?= =?us-ascii?Q?J1pN7l0DhJa4yKrI+JN542Gj4BsdxE1uKWOvTeNECncSxXyuSf+qWIF5mqH3?= =?us-ascii?Q?6a+EbXmrRcdR6Q6wwTTAw3nRjPwfdd+S84jmMFxKjq4FOam3Si+qlNEBMl6u?= =?us-ascii?Q?4CRzln1KPsWUuthYs27sbNaLHVYnLEQ=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b094af7e-d3fa-464b-8d33-08da4d8e17df X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 22:43:11.1004 (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: 8gTxH1AnZwgthPbuW5UwcRd/M1UY3B5W4amqHRq8ozRb8nHWpSUXD/6kfhbWlBIuijgaYWjEt+10U1oGJfUq3Fw9sUSGmaG79/vnyqktG9s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3824 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-13_09:2022-06-13,2022-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206130087 X-Proofpoint-GUID: oT7Vo6f5xgsY0xUQ_bS5sHMroCuL6fxc X-Proofpoint-ORIG-GUID: oT7Vo6f5xgsY0xUQ_bS5sHMroCuL6fxc Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When a crash kernel is loaded via the kexec_file_load syscall, the kernel places the various segments (ie crash kernel, crash initrd, boot_params, elfcorehdr, purgatory, etc) in memory. For those architectures that utilize purgatory, a hash digest of the segments is calculated for integrity checking. This digest is embedded into the purgatory image prior to placing purgatory in memory. Since hotplug events cause changes to the elfcorehdr, purgatory integrity checking fails (at crash time, and no kdump created). As a result, this change explicitly excludes the elfcorehdr segment from the list of segments used to create the digest. By doing so, this permits changes to the elfcorehdr in response to hotplug events, without having to also reload purgatory due to the change to the digest. Signed-off-by: Eric DeVolder Acked-by: Baoquan He --- kernel/kexec_file.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 7adf883c091c..ae1d3295dfdd 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 =3D i =3D 0; i < image->nr_segments; i++) { struct kexec_segment *ksegment; =20 +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG) + /* This segment excluded to allow future changes via hotplug */ + if (image->elfcorehdr_index_valid && (j =3D=3D image->elfcorehdr_index)) + continue; +#endif + ksegment =3D &image->segment[i]; /* * Skip purgatory as it will be modified once we put digest --=20 2.31.1 From nobody Tue Dec 16 08:39:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EE3ECCA47B for ; Mon, 13 Jun 2022 22:44:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242497AbiFMWn5 (ORCPT ); Mon, 13 Jun 2022 18:43:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241380AbiFMWnu (ORCPT ); Mon, 13 Jun 2022 18:43:50 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41EBA31224 for ; Mon, 13 Jun 2022 15:43:50 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25DJdqfH014673; Mon, 13 Jun 2022 22:43:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=eldiZxD5iK/c5XtJJkV7T43bOH4j8yUJOeHQn9yX7IE=; b=wBUkhAmfaACoGKIA7T1D6xz8BAPT/yrAo+dpHneB0lVqXm0Hu6UcLzCu2S7LrKy0AaJz SwcMq7h4RGBK14F0Eir6QwW+DaLkaIEmFlKkLhZ4r0M/bwBBy7cs8zYC8BXFmXfbvDp2 iaS1JVWNDpZpOvXAEbZvPNyjIXq8bvyzukQcbHGG2jARFdrKJqN4vAHedl77te4QBJPe XuQR50VcywVIWL9l+bX40O4/2wV+yhTMurWxJ9J6kpMOApl5cW6vpZYmipGgRwY6KJHE Q5YLVHeE4gHQG4jwG7CIyr0vYqlfiQbjTMY3FJsYpH7ipmMS/AfFmDBkYb/Q+eHcuYRC Kw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmkktcaf6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:25 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25DMehqi014918; Mon, 13 Jun 2022 22:43:24 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3gpe88r47h-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RNzcaLSjOtXEtdSXGbyK5HnFVI++8vkN11DPFqj2JCVGKwxW+BnNZdgvjXWy1Sk4DRhxm5zeOHRFReEV7W/zExwP4Ib6CF8x2oeT5ILufvTL751jEgNrsvPixv6taCK5BdP6lIxR9PrmJI0uBwpsVjchA0e/R6aR1FWoQzVHVi8mVlTmgak14IrirSnynJoiGAXQnljJejL0dPaYBk3Zs5zdoGHfXET2vqIKsAjAgejIRUsLTaAeIo9iCLC/eyHDdSgDCxeZTuizkyFTdEcffnBZ/bfeSZf/Q2u1IU395mk41h73Graoxkv6otazGPaLkzxAtyQPWwClUpfoBLzuPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eldiZxD5iK/c5XtJJkV7T43bOH4j8yUJOeHQn9yX7IE=; b=lq846ivK/YgyYFEdcYcIAfwj3EZ/62E214FkVgrxWn2am0IcuIqCTMAoV3BmjsdCLT3gt2ybfXc8tA+Eio8jkoiNReWdmMBxXpKkVlIjl9tkfF1khrZ4asT8lV+GqclKNgHvQCakOF1hIMy/Ao4/qkHqVgFjnkmDj30VK81GhzIL5yALlJZ3jfomwYIAcWmhxOE+Auqh/L/aGyaa0baLlRP24OXwql6nsNUc26Gh3bFrB1Uf8kE2KYLLGfcS4ehbvYGmdcx61hajtcIC5W1ZZxHHVDC00BxHRMCwSG4Me6uX1IcRDIaFP9mjB5VjuZgnb7KMeCUmPV3YVjvOo/5l4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eldiZxD5iK/c5XtJJkV7T43bOH4j8yUJOeHQn9yX7IE=; b=CQ11LUUUPmiF6VqZ24ZSePW8GxOd1jR9MSW7bbyPsylFo2bK7bO0TZODD15G1Xom7SbaCRlqEFB8f+y/8D2yNuHhN2YsMmZU59rmTe4ktbXcVg+OGz08azJq5tmfocK0MST1CUaBbuijO2cw3NDwgah4SB35Iu2snUcV36e/f0U= Received: from SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) by MN2PR10MB3824.namprd10.prod.outlook.com (2603:10b6:208:1b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.16; Mon, 13 Jun 2022 22:43:13 +0000 Received: from SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f]) by SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f%9]) with mapi id 15.20.5332.021; Mon, 13 Jun 2022 22:43:13 +0000 From: Eric DeVolder 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, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v9 5/7] kexec: exclude hot remove cpu from elfcorehdr notes Date: Mon, 13 Jun 2022 18:42:38 -0400 Message-Id: <20220613224240.79400-6-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220613224240.79400-1-eric.devolder@oracle.com> References: <20220613224240.79400-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM5PR15CA0041.namprd15.prod.outlook.com (2603:10b6:4:4b::27) To SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ca56f55-7b91-4fc8-7669-08da4d8e1953 X-MS-TrafficTypeDiagnostic: MN2PR10MB3824:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WmwOCdqKSqUDFntgG/Rtw3NB5WT0zoXE5+XSw/a/CP7HU++bdZ5Cj8kM9kL6e8KA0CdXfIizks4lza2Y2IaHRUk0QsQHndTHXcy9mSMx+oADfOo/gB2IltM7Eg/uivw+zo/WAOkADVlWdOvLcSrQF6CLkJ11MM8LDQViX+tSgzWabCY7spUclrexuhKb7EkfOSfGKD3Yfj9cCelfQEDC8zlZpXvHIMnNQkSmsD3L+glgUBU86SVkoFi6c4rPP1IsTeJoSbuM0t69JtWPxl5EzTlGTDp2OvO04Q5ZMT7qJ9tmbg4zAQQCi39WTATYuDwXTCiJnQ47Mpdg2I+HNSdYCgYZKSah95n/WWOuh8NVgB466aXUhpLvc2sia7GC8JVR7x44rTc/q/ke78n6dLFcq7nrsSF+enhjNpTUST7GrTuDBvbrobLE90qsQkv8N10MmOdEmvAt7T4LI3ETQ4lvGaIwFKlqlF0bXf36wLPWIcQBY62rEquQXOxk7yY8S1TBEH6q0SMJI5OdMmuLaFfn8sZLeA9rkTJx+mNweT1Z0sqzoWvSJAflWsVnKNxPwjn6UuwO4bwgvEGxaxQ6FPqWlgeC6IyEkEp5hIGVF/vQuLNRB9gjkizpbyCsjpSd0oOVIa+3wRlHBkJPdvDH1H/tv1Z9LHifiQKjT8aX3BDzU974ltM83jTT2XDyos2A93L8yUUXArA5L1VpdM943DRNKg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB4542.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(1076003)(83380400001)(186003)(107886003)(2616005)(38100700002)(38350700002)(36756003)(8936002)(7416002)(5660300002)(66556008)(2906002)(508600001)(66946007)(6486002)(6666004)(6512007)(26005)(6506007)(52116002)(4326008)(66476007)(86362001)(8676002)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9nNUs+QHRE3S7ZLt63TTp4l2pYFe+buAFj6DYKlZtyh+FE1NLh6hhUF+ag/U?= =?us-ascii?Q?lKn0JxwMz/3lNjrMvob4YZRTS1Rzj7kgCGD0IrofMdysQr5uFsTpl+BCiC6a?= =?us-ascii?Q?qyzmbBWtZdA9iBelMETRPkI9fZm4tiZw9k2H9tCXT8AWFjAauhdSg0JtVRwP?= =?us-ascii?Q?sOW2m9pN0HwdY1dKKyzo5I5WYvOX0WMbpWzMJYFxaQ3Ptc9UYH1dNWsUUBN6?= =?us-ascii?Q?asdrAhp7b4Xndg+ZWZBEbO2eP+DehpSivOyZm8ZdbcDsWdoJFvxXEq5ksXPg?= =?us-ascii?Q?VSf9wrD+46hQJlhcC39TUxPmFnyeXoSzW3JgRLeiup6anGPS573aTiYv77ub?= =?us-ascii?Q?k7vFvkGwPYBT4TyOoTxj0w3u9tnFxwTk0iXhD8nDk3CTLbi5eQRE/U4WkVdx?= =?us-ascii?Q?LV5q/M5/6fORjWoBrHf/2jRz6HEcXfp+cEyLEO4/9nVZaQx8clZDoZrbTIek?= =?us-ascii?Q?gJMr94ZfMBdZ/BNeq+OUHtGIQEeZQGGcUK9SEuFTN6zAp/KryZVA08GLGfuj?= =?us-ascii?Q?1do2a6Z3tXPXv0weDHrxJ7a/p0L+Rlc+lKhP5M+Fs5JEbW302z8eZR2NPq98?= =?us-ascii?Q?1SfsfoYLpVRXy5T9yTNVtWdFoExonl2dRHCnWXz5SDKyb9Rh+wg61i0EY1rJ?= =?us-ascii?Q?Hq39V0TpwIclt/VdvtD1O9BPFwlXgfm1alxwu68pkgIS3LSkCtBQMvKZNJQ9?= =?us-ascii?Q?c2A9sOsMJYLAaGK+KPWmYp2db6AJmmT6jDUHfAXVSLG5cW6DK7srLm9ZyFGd?= =?us-ascii?Q?wGbv2BwmE33VDPlqK1FgtQdnJbiiceS4J6KPDLkigZuQ25+msoCXz2qhoP1y?= =?us-ascii?Q?DHjJ7a1AmosTt6rePHLkH73XHFn6w7s50nLDLAb4LRSn55gvFbScQGq8/c2R?= =?us-ascii?Q?fLW5bfZ/10XRsPQlwQL9yv/HKCWD+xGWKi+yhqSSgaMblEgPco4KsbkbSFY4?= =?us-ascii?Q?lG/TDIrBk2p6ePwA6aSvASN3XXI7tLLEnVyu7HU4tzu/3ukroNlI74wrJRj4?= =?us-ascii?Q?FRBksjRMQPQcUR8bSv+B3fAVhITQREfAyksjw1sxzGfjNit6rguoxGiZ/U7o?= =?us-ascii?Q?9NlS7xM+0pcHDW4XUEIQ+a2C0CRwuKGTnkLEKs5JFHBjWISX2QPvXQicZtX/?= =?us-ascii?Q?Jcz3ZKTDCjmmBkIQdfNhO0P1STyRjV/ph13k7wh92xNFXrcI2fVjPYQVXjsM?= =?us-ascii?Q?LoIAuHMa5qx+exz/stl6//D+y8L2aeWmV+QThf2/FiZxboNyNUm+CHsJ5024?= =?us-ascii?Q?rPkrpj3zEgA2wzWi7CqcVpetzEz/oY0l/oN37LZKAVvJ0VfSCrP4e2w8SCid?= =?us-ascii?Q?ubD3rTLpRYX4des7pJuppKU8W/1CWbd46ehU+ubAed10Nn11BxXI4ajQSw12?= =?us-ascii?Q?Sr6G2gVlFyO+zGHTqb1joywS8VQbppnIPl50ojvKalpN9y8X7i2QzQnLChmI?= =?us-ascii?Q?Iagq5ptOb8hCFDVzpxPkQLHfCvruAUXWOjsqXjQ7VR3fCeGcKCaBJsvwu7X6?= =?us-ascii?Q?bu4ri/xjouTozBhkbbrqPUZfG7Lh6GVW0QQwvomR5/zl/SHIrRue2UM+LlNW?= =?us-ascii?Q?bXODGnNqzkSHz8UL08R6vtx1ybu2Z44uZGGDVRsrfJY7lPbZ5Y1NnPiLDjSQ?= =?us-ascii?Q?5KER60zZSzmb9famk/wvmgkPzrmK//oWDBGUYuv6UBVAXuGrhdi4CSjeRqzx?= =?us-ascii?Q?45AXOvP2tYXD2ki7MIWpU2RhaCuglnLaOL00xuIny1w4MkZ2qCNXl64k1C0r?= =?us-ascii?Q?DGYGOkaEaXh2lsuuyqKTU8jqLOsPvKk=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ca56f55-7b91-4fc8-7669-08da4d8e1953 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 22:43:13.3659 (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: gsF0vr46DbnA2CwtsgMOTqJRWy1m3KIwyCsPrFKmE3gkG6MX0voolhe1yWZz2EYkt/VYDAC2TFKDEpE1fehlMGQPjOKO7NqYDF77ojj9GF4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3824 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-13_09:2022-06-13,2022-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206130087 X-Proofpoint-GUID: Nh9CzpBbS7gl9ybmdFMu7syof4hQFDDH X-Proofpoint-ORIG-GUID: Nh9CzpBbS7gl9ybmdFMu7syof4hQFDDH Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Due to use of CPUHP_AP_ONLINE_DYN, upon CPU unplug, the CPU is still in the for_each_present_cpu() list when within the handle_hotplug_event(). Thus the CPU must be explicitly excluded when building the new list of CPUs. This change identifies in handle_hotplug_event() the CPU to be excluded, and the check for excluding the CPU in crash_prepare_elf64_headers(). Signed-off-by: Eric DeVolder Acked-by: Baoquan He --- kernel/crash_core.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 84eb10a4241f..47f667df1c0b 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -358,6 +358,11 @@ int crash_prepare_elf64_headers(struct kimage *image, = struct crash_mem *mem, =20 /* Prepare one phdr of type PT_NOTE for each present CPU */ for_each_present_cpu(cpu) { +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG) + /* Skip the soon-to-be offlined cpu */ + if (image->hotplug_event && (cpu =3D=3D image->offlinecpu)) + continue; +#endif phdr->p_type =3D PT_NOTE; notes_addr =3D per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu)); phdr->p_offset =3D phdr->p_paddr =3D notes_addr; @@ -650,6 +655,16 @@ static void handle_hotplug_event(unsigned int hp_actio= n, unsigned int cpu) /* Flag to differentiate between normal load and hotplug */ image->hotplug_event =3D true; =20 + /* + * Due to use of CPUHP_AP_ONLINE_DYN, upon unplug and during + * this callback, the CPU is still in the for_each_present_cpu() + * list. Must explicitly look to exclude this CPU when building + * new list. + */ + image->offlinecpu =3D + (hp_action =3D=3D KEXEC_CRASH_HP_REMOVE_CPU) ? + cpu : KEXEC_CRASH_HP_INVALID_CPU; + /* Now invoke arch-specific update handler */ arch_crash_handle_hotplug_event(image, hp_action, cpu); =20 --=20 2.31.1 From nobody Tue Dec 16 08:39:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CA0BC433EF for ; Mon, 13 Jun 2022 22:44:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243530AbiFMWoC (ORCPT ); Mon, 13 Jun 2022 18:44:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241406AbiFMWnv (ORCPT ); Mon, 13 Jun 2022 18:43:51 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 583AE31228 for ; Mon, 13 Jun 2022 15:43:50 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25DJdgFf014531; Mon, 13 Jun 2022 22:43:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=zFIMLTnVIQRuVkB06MnFRzYEoodCE0aGsG178kISBpw=; b=m0+JBL17bcHMqTqSLRHg3cT3GUecjkr6JEdUxZ4rpGcTVE/KrqoWDeQperpULAzuIUgX KHmE2QcQjCuzMp3y79zfw2/d0FvDTRguS6+dy2wAS8wGGkbKEAdXPlOAbJlITS8ZTPdk JfPQfpUMiZEri3YN6NiLlQWj59KkB7JCulDyC5Iw5/ioPNW2UVObU4VYRr6FdtCwEdCr HL5fRm3voRLN6FEBsGkymdeeuB+4CBvuZ9FZuFilVUrUyNwka5Rj3KLsBY7/oXNE64M7 +bZJg90IBt/38l4UfozQRvYUkHUwq6O12l63Yd5Jyb8wwRnz1PhXjEXyFXXd6c3Pvuth LQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmkktcaf9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:26 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25DMehqj014918; Mon, 13 Jun 2022 22:43:25 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3gpe88r47h-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bp5IsMF+qHIhH5RL0/5lSc/FWv3lW7bI9MbzPXUMOjfEGdB5GaFlnFkL7nPz/BOjGxHOWyychfB+RkjgcOtAp5KBrrS0qU+mqtoKy4wfVbAoG77nYuRFPeqKOC0GVtWWcjAAxrFyF2o+PoYhIpA/m7aNlu6Yv3pSQgoaObrFZTiouWjqcP5FSTnC9GpAFsE+8aDhrmSU64XmM+evEswqVnQ4ZUucC419c13WVj0O5Qq4GOulbxrNbJI+FdFuHLbMLkVGhZ9TLDc1LO3mfJU7WKBwI5rZJzVc/3BRAQSXBahG07PLv0q/YSGGKHA2rH1angMBpAz4e/PInuZwrOymcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zFIMLTnVIQRuVkB06MnFRzYEoodCE0aGsG178kISBpw=; b=HISIC9J6fHD6rGLfs8YI8PSYoMfZY7SjbTVc4AvRbvZTfBPMhvoxrTzFzi4BhhElIJmY8XzkICvNxWBIsA+aZFkvbihX67lBgSTNzu/Y6+QLJnIVyKkmnumV3Vj0z9yh9Yv0lmdPU/trobNNsc4qluXDO8/zXNcPU0TRMWGEu8hjwZRAG+2UwqrbIae8qkJ3hwNvOEgOqbESMVMIB6Lk+snaUlIfLPl/vSLN/kLBgrLLkw2fZFo8/Eb4TSiFSkeuHNwvYJBSpfMOhs3oiyxiLFfvx30llzsSOYGH4LVTH8LQgYvIHE3pEwPEiZd+Xi3UgjuyGiX39tTlIjhG1iTRWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zFIMLTnVIQRuVkB06MnFRzYEoodCE0aGsG178kISBpw=; b=GxlbQP6yU6ggW28YT9+DZV8JWPxogJ4DBGuEIQyRrzn/sMrsiEWvnOJoQGs7wSLm1giLXTAQ1FrHjHlUSAS+0tpKQgqWWOGKkF5Fx7rY+P7pI5hJ9ZNP26jNpwh5rAsOEEhR0ZLLIWiMHmYRqWJMp79TyvJH3tttLdU0kyXDV4Q= Received: from SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) by MN2PR10MB3824.namprd10.prod.outlook.com (2603:10b6:208:1b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.16; Mon, 13 Jun 2022 22:43:16 +0000 Received: from SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f]) by SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f%9]) with mapi id 15.20.5332.021; Mon, 13 Jun 2022 22:43:15 +0000 From: Eric DeVolder 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, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v9 6/7] crash: memory and cpu hotplug sysfs attributes Date: Mon, 13 Jun 2022 18:42:39 -0400 Message-Id: <20220613224240.79400-7-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220613224240.79400-1-eric.devolder@oracle.com> References: <20220613224240.79400-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM5PR15CA0041.namprd15.prod.outlook.com (2603:10b6:4:4b::27) To SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89e2ca3e-6500-4cfc-bda7-08da4d8e1abd X-MS-TrafficTypeDiagnostic: MN2PR10MB3824:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y+TS9IRcRGC/7F32Q36QSCCIHJD/3UE50+Pj+bgaTR6aposucv2kLp4zJG/Z6eDVG1v6Tp5DEPbMtnCrL65q2VVIbh06gHrzDL9dHVhZcCr12wmpkt3Gn6fo4AD8F7Cqgu39DOkx80Wpi42jxUIWUaBvR1x/ZLWKvyaXDtEyiYjvKJzjPd04wEfnwUmLY10Q3TJfW4PntiPtuQ333+BazH7vWUjFKrbsL4uQ/rxwqj9JOQTKQkX+WjLE3dml6zbeWHNqtLkQHk1RhESzKLWbDYUzupjoDAhy/4vGs1pCFxpZYt8gkHcPlGvpoiT7L6Q2orOna5XlqKBTN1j3Is6WKHK3XLx3wQmFlSEPqDbZI+Av8uJo9th4+fFZXJL8suoSdWsgRbuGkuFCAdF6QaQd/R5hjw1S7paJooZG9oqJU0wxn9zl7Zr7GyA4EtLtP0wjpFdAuFoQvEe7X59WHpnQDD77BOcBOSW8lCUcDMJKJN5IbCAzuULMjWNtUAZnypDg0mtEySoQ8JeAJ8/meWcvK4MOpCLj4atZrmP0cv4ob7bFChBq5lFLqqzT7xL1W0qyRrg+HY/la0yrHYUD2LPvv0Y1qTXK8hxz2kMNNvJc2XozhbTe4VpLXUHg1Cd9YY31q7BJT92yUWsAjAt2zoEqMSdy2yAkW4DGf2YoaAvMBLGd2LZZzB+lqgBcX74pWLBw7X5NuaZ7sXgSBMBZHFs0qw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB4542.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(1076003)(83380400001)(186003)(107886003)(2616005)(38100700002)(38350700002)(36756003)(8936002)(7416002)(5660300002)(66556008)(2906002)(508600001)(66946007)(6486002)(6666004)(6512007)(26005)(6506007)(52116002)(4326008)(66476007)(86362001)(8676002)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IrQKnTvMNdaCvI2006IW1XCf0k8plQOGw7FL+rv99xNAM170mhDWNl9FlEmj?= =?us-ascii?Q?XBGDdse+w+uMgDyAaiL5hbkUAElIQ+0/K7cGZVa5twdAKfkdduzkHnA+vxpd?= =?us-ascii?Q?CpYqBqz5eOlqB7HWKkWnjREveIUXvjySFB4mJzRkd+jSNacOo2eRUZMQRu/X?= =?us-ascii?Q?Gdw6F1xn1+OljmvupuOVh29rhSMS2GJANpW5jtlcmFUY5dY0Htmk/vH3+IXW?= =?us-ascii?Q?TqKip46BIofegvn+BhoU+AeBYNwyq+bvRzkvExSvH6xLfntVxBX3AVFD/zbG?= =?us-ascii?Q?R8dnqU4jeWt4AL6WGPXAZaf4iWVHw+R3oSd5Ex71I9GilupBBO8pM3MboQ/K?= =?us-ascii?Q?wMVTreSgyF4wDuX3ZXz1T+ihy+jAq5ftqNyKHbg0Bk0pJXb6YDC7kGFcBRmM?= =?us-ascii?Q?ZAN+JVuiMux4JBD7tbRDJJc3+B1oTa4jS+npLzSsOpYIrIHgeK5uTNNcpfEU?= =?us-ascii?Q?twr4+lEnv99VGSYONmNOXoW+d8xZLCMsazyawSTmS5/UBwYJOe8LH6ipMjTf?= =?us-ascii?Q?aEShBgG1a3MB1GUEdr1qO0AgwsbNtM/o9ZukYzBk8xhUqFoS/ysIV/V3oRrH?= =?us-ascii?Q?iMdZc3aVvGGxj9Vcec8uX1pIc2eNUCTB50W0Hh6pdAJ/HdjbUH1i33B30F6s?= =?us-ascii?Q?JDxEUbWZsMwHBnTq1DkEQXX0zselnH3N5JrrkbJQtGAo1KRIkXIOI6QUt26L?= =?us-ascii?Q?TiNd+0MDsAFiRemwy603OZy+YLkCXkRDjws8uChRWm3WyZjad3HRKPR7hgBQ?= =?us-ascii?Q?AsnZAeLz4UnbgBH+UlbjVJdeedm4AGIAkH9fUzSwgNU7HMU6rHfmSd429Pbv?= =?us-ascii?Q?e0isjUwYF2pliUGgp1Z9UxWQydkoX1KaGZknjqTRAq3wZ7phvFGVYZMeaYXT?= =?us-ascii?Q?3mWeH96Xh8AAU9tWMw8JOE/cbOHhzolru1p/scSoXbXpjrymJMwWSMyl0ti9?= =?us-ascii?Q?q16dT/JoRmAL6Be/Dd3T+0e6py1OVKlcMroUjjk2uahFjY6M8mxYLhJWqWll?= =?us-ascii?Q?XWgc+VMvGHN50h8ONJ9uCVL/GNubJjPnteACBU1s90Rua4luN+dn9AiYEr66?= =?us-ascii?Q?LAOol4ffZ/VYySQ2uujOsD8GEMPub+Erd+rBVnTs4rFcRlRETlV83vAmIxlC?= =?us-ascii?Q?1jmI5TfHKWocOD6M6cELx4P6anRPtyl31UnvsKksQO3D15xZFLiPegTXRlfA?= =?us-ascii?Q?5uzpL8vWlXsHCjquJ29ujW5Ap1i0YD1EYVBBejx2Q9J7/yu+jwRWMEiaGFMd?= =?us-ascii?Q?nTeDK7p3tbz9yBJLogK22lr6RsnZQH/RhG1QkqLeOaNyQpVDLR28hszyCWwe?= =?us-ascii?Q?UGalXv4a4k2lSkKMV4oGPVk7VwOhNcyEMxiUkgmoadluhXbn2RTmckBZuuci?= =?us-ascii?Q?q9w11BTHK+MRNHARu/MAKvjPpUgneF6rsnX1yAB9SGAIcY6HpfqoQF96QfzY?= =?us-ascii?Q?eHHHGJrHb8V0ziO3+yhOkziPCLLZk44MekeG3Kmd2bWgcs4QTPsaDQXvb48V?= =?us-ascii?Q?sJwFwGb8w+MnTMKKPQqtuQpEYt9/txOnfk4JV9QdnCK3R+40ViTKmtLt1pUx?= =?us-ascii?Q?uVbFhtbtr0zedXiKm4JCr2IDjKtf0av77m0IlDLUIZcjNpqsSgh03R4F7yPI?= =?us-ascii?Q?pkWTfa5u/jgPbOo0YK7B6vJTIn1Ak/Fv1K7Ue7m0JKPuFRt2JHeU1yHCoEv7?= =?us-ascii?Q?gLJ3LDyPf0Pn+rzHP51yd5pYVlpySe7aU3QFen6xpg3gOHYb/Fcpxmul89Vp?= =?us-ascii?Q?Di/a7JsU6UwqJyu11cvoWdrflu3kVpE=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89e2ca3e-6500-4cfc-bda7-08da4d8e1abd X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 22:43:15.8027 (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: Y7bni28WvbCIc6JoXDWUcpfq9BIl0rzw+Acp04S8ElFIjiSKGJZbw0DOCkoJnCFicIMvAakJiYecqx/eQGGv01RJReTodHBBMIkWRHMGdEM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3824 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-13_09:2022-06-13,2022-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 mlxlogscore=966 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206130087 X-Proofpoint-GUID: r8h7o0bYVu4OlZjxjOPs9i02cXRGFW73 X-Proofpoint-ORIG-GUID: r8h7o0bYVu4OlZjxjOPs9i02cXRGFW73 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This introduces the crash_hotplug attribute for memory and CPUs for use by userspace. This change directly facilitates the udev rule for managing userspace re-loading of the crash kernel upon hot un/plug changes. For memory, this changeset introduces the crash_hotplug attribute to the /sys/devices/system/memory directory. For example: # udevadm info --attribute-walk /sys/devices/system/memory/memory81 looking at device '/devices/system/memory/memory81': KERNEL=3D=3D"memory81" SUBSYSTEM=3D=3D"memory" DRIVER=3D=3D"" ATTR{online}=3D=3D"1" ATTR{phys_device}=3D=3D"0" ATTR{phys_index}=3D=3D"00000051" ATTR{removable}=3D=3D"1" ATTR{state}=3D=3D"online" ATTR{valid_zones}=3D=3D"Movable" looking at parent device '/devices/system/memory': KERNELS=3D=3D"memory" SUBSYSTEMS=3D=3D"" DRIVERS=3D=3D"" ATTRS{auto_online_blocks}=3D=3D"offline" ATTRS{block_size_bytes}=3D=3D"8000000" ATTRS{crash_hotplug}=3D=3D"1" For CPUs, this changeset introduces the crash_hotplug attribute to the /sys/devices/system/cpu directory. For example: # udevadm info --attribute-walk /sys/devices/system/cpu/cpu0 looking at device '/devices/system/cpu/cpu0': KERNEL=3D=3D"cpu0" SUBSYSTEM=3D=3D"cpu" DRIVER=3D=3D"processor" ATTR{crash_notes}=3D=3D"277c38600" ATTR{crash_notes_size}=3D=3D"368" ATTR{online}=3D=3D"1" looking at parent device '/devices/system/cpu': KERNELS=3D=3D"cpu" SUBSYSTEMS=3D=3D"" DRIVERS=3D=3D"" ATTRS{crash_hotplug}=3D=3D"1" ATTRS{isolated}=3D=3D"" ATTRS{kernel_max}=3D=3D"8191" ATTRS{nohz_full}=3D=3D" (null)" ATTRS{offline}=3D=3D"4-7" ATTRS{online}=3D=3D"0-3" ATTRS{possible}=3D=3D"0-7" ATTRS{present}=3D=3D"0-3" With these sysfs attributes in place, it is possible to efficiently instruct the udev rule to skip crash kernel reloading. For example, the following is the proposed udev rule change for RHEL system 98-kexec.rules (as the first lines of the rule file): # The kernel handles updates to crash elfcorehdr for cpu and memory changes SUBSYSTEM=3D=3D"cpu", ATTRS{crash_hotplug}=3D=3D"1", GOTO=3D"kdump_reload_= end" SUBSYSTEM=3D=3D"memory", ATTRS{crash_hotplug}=3D=3D"1", GOTO=3D"kdump_relo= ad_end" When examined in the context of 98-kexec.rules, the above change tests if crash_hotplug is set, and if so, it skips the userspace initiated unload-then-reload of the crash kernel. Cpu and memory checks are separated in accordance with CONFIG_HOTPLUG_CPU and CONFIG_MEMORY_HOTPLUG kernel config options. If an architecture supports, for example, memory hotplug but not CPU hotplug, then the /sys/devices/system/memory/crash_hotplug attribute file is present, but the /sys/devices/system/cpu/crash_hotplug attribute file will NOT be present. Thus the udev rule will skip userspace processing of memory hot un/plug events, but the udev rule will fail for CPU events, thus allowing userspace to process cpu hot un/plug events (ie the unload-then-reload of the kdump capture kernel). Signed-off-by: Eric DeVolder --- .../admin-guide/mm/memory-hotplug.rst | 8 ++++++++ Documentation/core-api/cpu_hotplug.rst | 18 ++++++++++++++++++ drivers/base/cpu.c | 13 +++++++++++++ drivers/base/memory.c | 13 +++++++++++++ include/linux/kexec.h | 2 ++ kernel/crash_core.c | 2 ++ 6 files changed, 56 insertions(+) diff --git a/Documentation/admin-guide/mm/memory-hotplug.rst b/Documentatio= n/admin-guide/mm/memory-hotplug.rst index 0f56ecd8ac05..494d7a63c543 100644 --- a/Documentation/admin-guide/mm/memory-hotplug.rst +++ b/Documentation/admin-guide/mm/memory-hotplug.rst @@ -293,6 +293,14 @@ The following files are currently defined: Availability depends on the CONFIG_ARCH_MEMORY_PROBE kernel configuration option. ``uevent`` read-write: generic udev file for device subsystems. +``crash_hotplug`` read-only: when changes to the system memory map + occur due to hot un/plug of memory, this file contains + '1' if the kernel updates the kdump capture kernel memory + map itself (via elfcorehdr), or '0' if userspace must update + the kdump capture kernel memory map. + + Availability depends on the CONFIG_MEMORY_HOTPLUG kernel + configuration option. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =20 .. note:: diff --git a/Documentation/core-api/cpu_hotplug.rst b/Documentation/core-ap= i/cpu_hotplug.rst index c6f4ba2fb32d..13e33d098645 100644 --- a/Documentation/core-api/cpu_hotplug.rst +++ b/Documentation/core-api/cpu_hotplug.rst @@ -750,6 +750,24 @@ will receive all events. A script like:: =20 can process the event further. =20 +When changes to the CPUs in the system occur, the sysfs file +/sys/devices/system/cpu/crash_hotplug contains '1' if the kernel +updates the kdump capture kernel list of CPUs itself (via elfcorehdr), +or '0' if userspace must update the kdump capture kernel list of CPUs. + +The availability depends on the CONFIG_HOTPLUG_CPU kernel configuration +option. + +To skip userspace processing of CPU hot un/plug events for kdump +(ie the unload-then-reload to obtain a current list of CPUs), this sysfs +file can be used in a udev rule as follows: + + SUBSYSTEM=3D=3D"cpu", ATTRS{crash_hotplug}=3D=3D"1", GOTO=3D"kdump_reload= _end" + +For a cpu hot un/plug event, if the architecture supports kernel updates +of the elfcorehdr (which contains the list of CPUs), then the rule skips +the unload-then-reload of the kdump capture kernel. + Kernel Inline Documentations Reference =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 2ef23fce0860..2afea3d2c60c 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -293,6 +293,16 @@ static ssize_t print_cpus_nohz_full(struct device *dev, static DEVICE_ATTR(nohz_full, 0444, print_cpus_nohz_full, NULL); #endif =20 +#ifdef CONFIG_HOTPLUG_CPU +static ssize_t crash_hotplug_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sprintf(buf, "%d\n", crash_hotplug_support()); +} +static DEVICE_ATTR_ADMIN_RO(crash_hotplug); +#endif + static void cpu_device_release(struct device *dev) { /* @@ -469,6 +479,9 @@ static struct attribute *cpu_root_attrs[] =3D { #ifdef CONFIG_NO_HZ_FULL &dev_attr_nohz_full.attr, #endif +#ifdef CONFIG_HOTPLUG_CPU + &dev_attr_crash_hotplug.attr, +#endif #ifdef CONFIG_GENERIC_CPU_AUTOPROBE &dev_attr_modalias.attr, #endif diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 7222ff9b5e05..12fb9106ab4f 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -483,6 +483,16 @@ static ssize_t auto_online_blocks_store(struct device = *dev, =20 static DEVICE_ATTR_RW(auto_online_blocks); =20 +#ifdef CONFIG_MEMORY_HOTPLUG +#include +static ssize_t crash_hotplug_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "%d\n", crash_hotplug_support()); +} +static DEVICE_ATTR_RO(crash_hotplug); +#endif + /* * Some architectures will have custom drivers to do this, and * will not need to do it from userspace. The fake hot-add code @@ -888,6 +898,9 @@ static struct attribute *memory_root_attrs[] =3D { =20 &dev_attr_block_size_bytes.attr, &dev_attr_auto_online_blocks.attr, +#ifdef CONFIG_MEMORY_HOTPLUG + &dev_attr_crash_hotplug.attr, +#endif NULL }; =20 diff --git a/include/linux/kexec.h b/include/linux/kexec.h index f9b13882debf..9aca8bc26c13 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -342,6 +342,7 @@ extern void __crash_kexec(struct pt_regs *); extern void crash_kexec(struct pt_regs *); int kexec_should_crash(struct task_struct *); int kexec_crash_loaded(void); +int crash_hotplug_support(void); void crash_save_cpu(struct pt_regs *regs, int cpu); extern int kimage_crash_copy_vmcoreinfo(struct kimage *image); =20 @@ -427,6 +428,7 @@ static inline void __crash_kexec(struct pt_regs *regs) = { } static inline void crash_kexec(struct pt_regs *regs) { } static inline int kexec_should_crash(struct task_struct *p) { return 0; } static inline int kexec_crash_loaded(void) { return 0; } +static inline int crash_hotplug_support(void) { return 0; } #define kexec_in_progress false #endif /* CONFIG_KEXEC_CORE */ =20 diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 47f667df1c0b..b003857ea85d 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -601,6 +601,8 @@ static int __init crash_save_vmcoreinfo_init(void) subsys_initcall(crash_save_vmcoreinfo_init); =20 #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG) +int __weak crash_hotplug_support(void) { return 0; } + void __weak arch_crash_handle_hotplug_event(struct kimage *image, unsigned int hp_action, unsigned int cpu) { --=20 2.31.1 From nobody Tue Dec 16 08:39:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DC16C433EF for ; Mon, 13 Jun 2022 22:44:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244172AbiFMWoE (ORCPT ); Mon, 13 Jun 2022 18:44:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241810AbiFMWny (ORCPT ); Mon, 13 Jun 2022 18:43:54 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB32C3122B for ; Mon, 13 Jun 2022 15:43:50 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25DJXYDl025660; Mon, 13 Jun 2022 22:43:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=G0OcVmMSaT2dR+Q1YyNrKHdWYIMKTxgfk8cCM8JGyz0=; b=WdJokZxNz/ztkwUuG2Vkk+n+s5ZPaNMhV3AWIJgLrkIEO5fOH9kgnt3vURbwWfLN0Qmw OkvgxT1AtVg2HapHm/HeIZdDB88ZPTNoC4LTm4bNQFdKweAfGvjQIyrUnZxy+vapz9d/ fIwk/+j0hXiDMJDm0I9AZlBXvtQ3B2XS8F+lczb9NwwwRGjk4czvlntK3JFuaD+MUcRa KoZ5qjmwlbW40XdxNq5Pmr9jVpDxcGXivbrp/KUMz2/qL24yjFLEWkYDXK7LprQ94ha2 gFvd1EiSlxMPva1Ert31KHwINXs/WHHLu73jsulkzB8QVwnTaeAZcbWggbdy2dbsydad nQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmjx9c8ne-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:27 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25DMehql014918; Mon, 13 Jun 2022 22:43:26 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3gpe88r47h-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jun 2022 22:43:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GEFBU/KQtBq6mXtPXbCk2i7JRvuAENd0EgVTThKXg9Qt5TSXWMIwFAPTW4V1IoyPW9m337cjd7kEnP2BUiBkfL5g3lF2OQWGuvG2R54mIgLbxYhGS9x5jptIz9/Ge+pKjIHfUkA0wuBSm42vVqafvwx4RIcuz2tSH5SC9iZdbRQNZ05qP3eOeGeX2xd41C5RmCYyq5f3eEo8l4F1O7ypSW+lbFuLYXnzLCQmYcBpwYZuS0vrHvVA9iX5CAXP7RL4FmeSZdCzLlpcSNWTqYzVllszb1RF/GEHQWp36b/j3z5LxxhJcezf8Xba+lr9lhxu8wsS47Mg+ajFlW1V0OmUCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=G0OcVmMSaT2dR+Q1YyNrKHdWYIMKTxgfk8cCM8JGyz0=; b=Do2PbZLpWFgSJh3e6Hg8KXC2Xnipyd6UjywvD5wMOwvEYAfsre9NLTz5SKD4OKzBYQeg7HDzXZZ/Ih7L7o6qM/c6YpzlIeyX5/jsjOLTqfU0QcvYRML2C3wPqOxGwFmV70khy+Wr3645ppjXYnEWDd6jmAqMLKULnXEPlepLnG8NeH/dktZ41E9cHCkw6Xg4p4dhtqleMgnMcixGwZCnCYgyXkZ7OX1fkJHFdcoWGj5XEu7//+bRW62AFHTXIqo1UvGYD7K1Esg888usENkJIrvHRv/Tww+LlVt+8cDD5YsIEfW+xGG7b3WEKN5UX0KlGBqMD7bbWfOnn8d/fBA/WA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G0OcVmMSaT2dR+Q1YyNrKHdWYIMKTxgfk8cCM8JGyz0=; b=UEXZECzlLHvgJNVDLu2wwN2Wsr5FRhKbiSTQHwEW+fOJOolJnQOWVEtF5K9alx102XNhF+xCPKcKn6fDOTYkQu3EIDwqx7ZmlIxbMf3KQIkE2nLggz8tyuxifAV1RHq9zJxB45tSwTh7UrBYt57uQclCtQgDZN/bOzHuKYcabRw= Received: from SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) by MN2PR10MB3824.namprd10.prod.outlook.com (2603:10b6:208:1b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.16; Mon, 13 Jun 2022 22:43:18 +0000 Received: from SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f]) by SJ0PR10MB4542.namprd10.prod.outlook.com ([fe80::2cca:c83a:81cc:18f%9]) with mapi id 15.20.5332.021; Mon, 13 Jun 2022 22:43:18 +0000 From: Eric DeVolder 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, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v9 7/7] x86/crash: Add x86 crash hotplug support Date: Mon, 13 Jun 2022 18:42:40 -0400 Message-Id: <20220613224240.79400-8-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220613224240.79400-1-eric.devolder@oracle.com> References: <20220613224240.79400-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM5PR15CA0041.namprd15.prod.outlook.com (2603:10b6:4:4b::27) To SJ0PR10MB4542.namprd10.prod.outlook.com (2603:10b6:a03:2da::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85c859f9-0256-4027-a1f7-08da4d8e1c38 X-MS-TrafficTypeDiagnostic: MN2PR10MB3824:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AzIzap8uXrQ5DK32avHDJVeHGI7jq+XnV3HUjnzvIIuT4zHD6QwlNpYDAjXd7wkrnuaNolCl7zg6i3CWJGnlpa45cOtRibU7jSDhFlI18HRH02iXqlg8m3wjyjLpOfPaKVzYceuXQQs97h9/YkkSSaKiZ5xO0HGbd7S0PBr3WJH1ZQdvxGKtFA7v5l+XgMF8l+k6ZgMIv3AwlLevf4Mu+iYTLKDeKXRePRgdtNVdIys2HA0Wr0Tw/hI5tUS+2TxJByp5nZ5xkPndfymWJ7iTDKFtwycT4Z4dbf72ipcBezOdxdT3qxWOikUgSYQGRhtSjmdLIkKp0bo9wmpRnroNZ1+XIksQpkjLy9Ri5sMcqwGXZ79Eag2tCrsAQbQ9uOzrBWRlNIR7MYdOFZFFRqKdF3EaTejMs6yExNv1O1DEo6aPVVmvPhNCq3N6nE0eD9eqdp/Yng+hmVtcO+Twp93SRp9sMITej401A+yrq0w+5golwHIPDsg8DO8uFMeSLkjEskeY33Fy2wX+/AZ6p1TYH4Rp+3Ob56FM8/NI30KgkzbNe8YDjaa/FA5ya1vFmHEI5nAmzz4hJTU9nUBIZWma+w9yqf4Gfh2dRQwYOBLjCGjeohhFTmjHmv4OJZXdg5QKET1FVGn245jYPIcN2GTbLbnwVrMvriyms06fJYDoCs4a2CsRk5p491ujIBDCujnS9D3YpKTKhU3cf7UHJWYBJg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB4542.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(1076003)(83380400001)(186003)(107886003)(2616005)(38100700002)(38350700002)(36756003)(8936002)(7416002)(5660300002)(66556008)(2906002)(508600001)(66946007)(6486002)(6666004)(6512007)(26005)(6506007)(52116002)(4326008)(66476007)(86362001)(8676002)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4iKs6xJI867Cnxc1K2EOszhmp2B2Q5/8NJOz0rb6PHKZipQSXLSFtSkAvSkN?= =?us-ascii?Q?mMbFbi+bWGglqnL6qzhHTSkIaQ7jKzhcU+NLQd7qNErtqacfksoE/4jy5RGp?= =?us-ascii?Q?HGk0bxXPwy8QNBTl8f3rykMU/D8gI5FSZK6cqqst1rcGADHrdvVgKiNIV1bs?= =?us-ascii?Q?sF2nN2JLuDKbLJskxl2qskbb2xvCtRMbl1nz9VClazJgYSxI61x1yoxYqrZM?= =?us-ascii?Q?G1TjyzYV7Csx/ilkl7XIKD+pq8bFq6nvw4sBagumYa9Y52S8ueRgd5ZvGF7p?= =?us-ascii?Q?n8MwtR3bUCwDU+fo7OtDy23bxI0dBv1bG6I+wRVhxErsGs+B/UVaRQoYL2PE?= =?us-ascii?Q?wWc+xuAzyVdR9W+j8q142yNX9TxUgYPqt0VJ7EOiJEMHu8g3fN8qT/xOVLSh?= =?us-ascii?Q?pufIgmzO2/5GJL0WXViq3JaWHvOYWyMBVwKXUQbVNxxrlkEeWq8QRAkiJ2yF?= =?us-ascii?Q?OYvZxkS74zrLdy/aJZw1f917LT+L1EAh5UMJTMMP2+ALLD75gN9FELB2bG/M?= =?us-ascii?Q?+HXQNogtvrR/EzagRqScPUdqsCaX3Dqt5JAIAtDIYV36QCBrbD800unRX/Ks?= =?us-ascii?Q?5U7xaNhWCqRLlEEPY99md7n4y0vQNNv35lh/cuAINHbtXN3+nwAOpNXg8yRl?= =?us-ascii?Q?AWG/qgGaLxFZ8WRtfa9wHYHkIwSHmaCf2PUMQZCok1PzvIaX+wweKoysookE?= =?us-ascii?Q?sfG9TWY4wTigz1g/sAdrRPmSASxH8E3gjzg4Ia9ic0dKgfbw/5ydzYc1LVwW?= =?us-ascii?Q?h1rg3kv24DmG+0oedo32qDJhBhG+wVexd8okSXOauKc5pD2QCjwVjLCUjOl1?= =?us-ascii?Q?Wv427YMzjvCjBcLf8Ib1UMwTXgeNkpUp2qfeSSYhZyZC126116D3AmISregL?= =?us-ascii?Q?4qZJ2AL6WK3InNt2wnmxs4gmDW6YqBCgkq3+8/KNgvRoEIZeEByQXmdwgy+c?= =?us-ascii?Q?1DVR0z1op6PNsVJiNPCqw9kiMHy76X9lVnarYSzy1+xmfjW4970/6xsMTcOs?= =?us-ascii?Q?s6WoH/D8x6GJmy+gPXa13pkaJ4J8KLzK3rfXQ+yCc/ISzevj3QgH2fMVrx15?= =?us-ascii?Q?lV0JAhwoEc+uk9u+3TkGBabhlOE/7yhVi8q7JMjGoB8w2leKfK1DgIOK2ALr?= =?us-ascii?Q?hUuOmgmKAevBGEPmdZUERjGa1/QN/CkvtBBX23uIN63Mpd/6fl0k4qoDx/SU?= =?us-ascii?Q?EitJy2prsxew572M+cwnF8I5s2/cLCwX2ipHsgzF6Jyns0ciSA6El8LCxBGU?= =?us-ascii?Q?oNBFbwOsxERl4GuED7Zz6/fv/vdFnj3gZGChzUFVXYxzwBYMwGS3mqMqYkNM?= =?us-ascii?Q?4GN4hxvYhS5h2k6OKb8siC4f7YOiUqrb7dig4Y+5BRhTVwh9KQ6SQrxkTQ3+?= =?us-ascii?Q?efy06fBIQWdr1reMyGS3A6WcsZ4sUsS8SdtdTbYfc9+hERoSsup0W/zImKdk?= =?us-ascii?Q?EwhBpmmCyOSVr/KA3IQ12CjzOVe4gKW9l1uZW15yGzq/O4Gdy9ocNZKYJx7R?= =?us-ascii?Q?pM5SmhiST92cRD6Ek+iSsrmsJXkwrydLUtnZaP4OzWMzNW9JKOuwCLRRqjXU?= =?us-ascii?Q?pwvQ91Kl36k5eYkP6AjvEkXRDrdRnTNjG0Tye37vrax8TSqyiO2XrYdvbVp3?= =?us-ascii?Q?xgsfi+VeDYPxLZ53o8BMpkgPogoxl7zi3KlfPMlgqou887sBFTXe3hwDUT3B?= =?us-ascii?Q?VMPeLuoXkq11UmfAslP2PuqOiX32X/NnWIcXWbynipEr4o7g3GWVIkla+yQQ?= =?us-ascii?Q?REKIxoj7Tc4czxjxyiJaVWfsHsdb42s=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85c859f9-0256-4027-a1f7-08da4d8e1c38 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 22:43:18.2175 (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: +8aXgdMEBARvEZPoTdgMNE2PLiW5escM7pEoNs+edFpDPGZ4q3XlSAJDJBov9rjDLYgEFqp2DdXQ7Ga+x4p40zLJ5t0fXlwnKykwQbszkXg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3824 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-13_09:2022-06-13,2022-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206130087 X-Proofpoint-ORIG-GUID: 5E1ROhIepAPWslxXhXAC_YJIqGXY2xDG X-Proofpoint-GUID: 5E1ROhIepAPWslxXhXAC_YJIqGXY2xDG Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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. When loading the crash kernel via kexec_load or kexec_file_load, the elfcorehdr is identified at run time in crash_core:handle_hotplug_event(). 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=3D 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. The kexec_load is also supported, but also requires a corresponding change to userspace kexec-tools. Signed-off-by: Eric DeVolder --- arch/x86/Kconfig | 11 ++++ arch/x86/kernel/crash.c | 116 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 762a0b6ab8b6..e9eecff3b97d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2082,6 +2082,17 @@ config CRASH_DUMP (CONFIG_RELOCATABLE=3Dy). For more details see Documentation/admin-guide/kdump/kdump.rst =20 +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..b9cdf7a0d868 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -25,6 +25,7 @@ #include #include #include +#include =20 #include #include @@ -398,7 +399,17 @@ int crash_load_segments(struct kimage *image) image->elf_headers =3D kbuf.buffer; image->elf_headers_sz =3D kbuf.bufsz; =20 +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG) + /* Ensure elfcorehdr segment large enough for hotplug changes */ + kbuf.memsz =3D (CONFIG_NR_CPUS_DEFAULT + CONFIG_CRASH_MAX_MEMORY_RANGES) = * sizeof(Elf64_Phdr); + /* For marking as usable to crash kernel */ + image->elf_headers_sz =3D kbuf.memsz; + /* Record the index of the elfcorehdr segment */ + image->elfcorehdr_index =3D image->nr_segments; + image->elfcorehdr_index_valid =3D true; +#else kbuf.memsz =3D kbuf.bufsz; +#endif kbuf.buf_align =3D ELF_CORE_HEADER_ALIGN; kbuf.mem =3D KEXEC_BUF_MEM_UNKNOWN; ret =3D kexec_add_buffer(&kbuf); @@ -413,3 +424,108 @@ int crash_load_segments(struct kimage *image) return ret; } #endif /* CONFIG_KEXEC_FILE */ + +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG) +int crash_hotplug_support(void) { return 1; } +void *arch_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 =3D NULL; + + /* NOTE: requires arch_kexec_[un]protect_crashkres() for write access */ + if (size > 0) { + struct page *page =3D pfn_to_page(paddr >> PAGE_SHIFT); + + ptr =3D kmap(page); + } + + return ptr; +} + +void arch_unmap_crash_pages(void **ptr) +{ + if (ptr) { + if (*ptr) + kunmap(*ptr); + *ptr =3D 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=3D 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 =3D NULL; + unsigned long elfsz =3D 0; + void *elfbuf =3D NULL; + unsigned long mem, memsz; + + /* + * Elfcorehdr_index_valid checked in crash_core:handle_hotplug_event() + */ + ksegment =3D &image->segment[image->elfcorehdr_index]; + mem =3D ksegment->mem; + memsz =3D 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 =3D arch_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); + } + arch_unmap_crash_pages((void **)&ptr); + pr_debug("crash hp: re-loaded elfcorehdr at 0x%lx\n", mem); + +out: + if (elfbuf) + vfree(elfbuf); +} +#endif --=20 2.31.1