From nobody Fri Apr 17 21:03:49 2026 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 784EECCA485 for ; Thu, 21 Jul 2022 18:18:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232217AbiGUSSy (ORCPT ); Thu, 21 Jul 2022 14:18:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229693AbiGUSSv (ORCPT ); Thu, 21 Jul 2022 14:18:51 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99C418C74D for ; Thu, 21 Jul 2022 11:18:48 -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 26LIEmJM025437; Thu, 21 Jul 2022 18:18:15 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-2022-7-12; bh=/JvK+SdTxihqtBTQFphlWFKn0sxNjACbR/lXt8fOHbU=; b=1Y2Sn1dlUBI4SHbjCKLZ4Hg2Z3j5pyxt+Xuqtoi6d8muEq0pJZhJooi2auVB6uThi5Wb ULAMKZKcBzTbng08NhWhACnK56l4ULMeCPhHekRfe4SX4PRTz4T9tYinbDJmcU52VTt9 orphZ9nzV4xiRsmefGmBCbpmWWzLdfcCDA3CuaTy4izMHhdO2DpT5kgJuBYJ7QR0g2Lo G5a8OEOam7FCXFsGR2rHVJaOwoH2X0kOV9qU8JYkHKkY/8PFOfMsB2cfyKy63NoveksH goTP8PAOphP+rrq7DUaLwR//JR2BJrPGDek2OPtl/upzr9x44LtgaC2xcVHljZyz38a5 0Q== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbnvtndyv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:15 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26LH23f7039182; Thu, 21 Jul 2022 18:18:14 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1k70xdh-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HX2MBOOcGX1M/63C0EDQBnCK+f4Fi3aj6CSnD5xe2gheFw9TeHcz17qsYwH/qeyuwCJpsd5GWCjceKipeV2IgvcQLX0cyOQxrhUVldKj1Fjcj9cJp5PFx1jOE8Njh3OcGmCHYyJ4J/qukIGn/lGb9uFX+Y+GugWq9ICASYfd08dqq8Vr4iY/gZE6m/4iJ04csKvlix8T6jFxPKCK0O/zqLZ84OdgXt4U2zv8CH1t696FJ4krhzIGqo0tRDiYW6QZhwXnq42PXCM9XfsZbcj/O/dPNY6IR+hcM280d5UHDU8mN0ojw5MVLUfg4eXZeQJCLjuRCS6Y/nBOUuAjhHo/Lw== 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=/JvK+SdTxihqtBTQFphlWFKn0sxNjACbR/lXt8fOHbU=; b=CepQ2ATKo/bnnLRYlVLtw8tz54s9OyRqBnHHFRvaXRtEjEPDqxy1m0N8zIoXzr3w/+oJMuESscA2cB8m9fhVzXrD40uIADZPA/CcebJwdmnyZZhTcw6j+Ay5cZA/nZ8vjF6rDzQYodRcVaulgMo3XYZh3Uivmu+6ZEChiYmX9cKERd8W9nmsqJ2j1nvuoZBuwIeOgezqUCYi2hGmU5kzOZIDkHeQ7UzyaM7eaVW/oPrPuCWQubAt+yQZufQFndl7LV8CYJ4N9FQcnNKsyRj6PsJgZPYpSlDP1Uii6u2aey+oPC1CAf3igJSZ3wuoah05HNZ3knaMParrg2jXjnegwg== 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=/JvK+SdTxihqtBTQFphlWFKn0sxNjACbR/lXt8fOHbU=; b=M2sls0KYaR2CEgV0rqtaUGEc2mPrcOaKEmslbDQFOeLRNcNezhMnvuw7vupsSbmvp7J9TwPRyYofGCG5awPIRqSl1k2XX3NudrJI4X5zBmxywu+4EjOZaoDtQ5pi4tByUs5uFtQVj08JfOVelcCV+yxWqyg56yOfxbApbmtsM4s= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by CH0PR10MB4890.namprd10.prod.outlook.com (2603:10b6:610:c9::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.15; Thu, 21 Jul 2022 18:18:11 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d%3]) with mapi id 15.20.5458.019; Thu, 21 Jul 2022 18:18: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 v10 1/8] crash: introduce arch/*/asm/crash.h Date: Thu, 21 Jul 2022 14:17:40 -0400 Message-Id: <20220721181747.1640-2-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220721181747.1640-1-eric.devolder@oracle.com> References: <20220721181747.1640-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR03CA0189.namprd03.prod.outlook.com (2603:10b6:5:3b6::14) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28cb171d-e8db-4590-8b62-08da6b455ea5 X-MS-TrafficTypeDiagnostic: CH0PR10MB4890:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M1dALzPSkhsfSbKZEBxXnuhJqXD/EvKTif1a8gA/v59n2leAFlNBQp8PHDOY8DHfMQKyxzcJ2akHA4AxP8djjkmaQsje6T/9KylmWLOyVVJ/yQWb2NXJczS1jCACpE0o2W/JNz+XspQ0bD+deu7eWEc1EObeuk/5V4pHFeFvCWPBMcE8i78rrAEELOX+fSYHi4ML2MDUhHcB/s7snOTbcrAtSI6jj1lt3XWG3vRUa40gZCUMhB2egEd7rkbyGCLmUmP7LjrPOR9J9rOBrh5vP9Z2FyiCIzGzr8pQ5s6zf/EJ2i6gIa1l3UaPouRBEmulNgJE9JAtGzYKgFO2k5m5Q1N6tBpKGLB72J6lnaOmAud/y7M0rEHzSsXfpEikDheFPTwNiJ63ujHfQpYKlGvkgO9vBCWk42GLoWWDx32hFS9wB7FLWA8JikiofN3Q1N/J4A6pmR62AO/qV2YgCxYpKMzBmf8Zyjjv9yX76iPUErVIMEqPhkBG859kgmFDLN3Rb1+mZKWZkaOmsYeLa+DL03jPhRN+14fK3rB2MApBDznG2/GWNNa7eNPIbR6z3SpiZOS5kl4DSt2oougWwG6mmbslVPstZzFQZ+xlrfR2sEbsnsQNcblQniFW9UYrqBC+svWc9H//f+oEMtafMWZyaD2pM/9HTVwE2CLzK0KyTzdFIQmpoQhxZRFWx9TCAXIYdt7Si/7D3ECp3p0kAUjNnV8MGz/QhvK3EYdse5YUYOXZGLJ+tGi64HFVRXnCsfx4Zap6ZK9YuNlp2LBP+Z3xmZK41yPVfZJIomOvUTD2p1I= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4531.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(366004)(396003)(376002)(39860400002)(346002)(38350700002)(6512007)(316002)(8676002)(38100700002)(66556008)(66476007)(66946007)(4326008)(6486002)(41300700001)(1076003)(2906002)(52116002)(86362001)(478600001)(6666004)(83380400001)(7416002)(107886003)(186003)(8936002)(26005)(6506007)(5660300002)(2616005)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mbeLSbBX8vqesed9hxgOPqs439KA+CBRPDjHUQgLeTiSJMxyCg6cezJ2MwH1?= =?us-ascii?Q?kEc3UOduN+xq49fobQExBTv48RSV2HHOKfPyNjxAnYD6juLa3Hy3W6JGF3Fu?= =?us-ascii?Q?Q4irpmX4FQ2VAA0K3J7KkcPsqUt2EJ9cYfX8HJtUoeNPdyM8Ik5sWaAtyRtn?= =?us-ascii?Q?llnZIgPo+1PiPkCf2hoY5d3xwA8fHsEH3IksMXhw5568ioISDr7ONHPvyloI?= =?us-ascii?Q?GOfhKWwrcJgldFOFGyksQRX+GVXD6k3xoRmDY9mI9q5uVunInmZl8J7nQ8Vq?= =?us-ascii?Q?K35vLT6LXuKBkKT3gQERMoXO51+obSIm+3N13c0tJu0FfrtwBVPxF1r3uMfW?= =?us-ascii?Q?EmgnfAjilJXNZdyyCfpKE3aXetZ3N9VpBnbfm7q1TsQDKjg9p41qAfyYUEEy?= =?us-ascii?Q?2BwNXoBAIG/k8Gn+QtnjPzFfnRGWhTlXFrKtM72o1oaAjOyyA4eYJjHSUXV4?= =?us-ascii?Q?HwE7hcDfWLLzRmOusiQxduhCzlQheHEMdIW4rO4b+RQTqtuxkuZfPRcvHrBV?= =?us-ascii?Q?uQWamqQ2yFp31hX4qtCaeq4HSZnFxzjxugkx/OfGo1J9e3xs4RXY3DmDRa1M?= =?us-ascii?Q?kvLsNFTHAtsgpXw2ym0S2GHjDaYG2MUY9q3TOhayf7M2xUjOKvdgyIGK1JGi?= =?us-ascii?Q?uE8joqDFb/MaVVkZY31q6sHEDsYVd8DIYSWQoSngvIfUzuTdY9SZVT0Nlwmb?= =?us-ascii?Q?ehLs8CKKQmlLi7gJtLHpZ45mbJBuDmxKn0IlvYE0Lp914je6hg+wUI6HEd0q?= =?us-ascii?Q?0sbVFLvHSBrqBC4AKG6KkepDcCRPdh3XmTXD1t5YyKpjYm2ZntoAUYU36GcN?= =?us-ascii?Q?bKxXR0DUDAbYhp6FfoYyh16lcKF+cvuFjj4SUiP4ZRoMGmEUNvIJItxvcqeR?= =?us-ascii?Q?uNwcy6utu+98jLhoAazlyJr5aLzR84nYQZbhzwGk8F/pmT4JEw8KmCpOb3C9?= =?us-ascii?Q?OikqmwoL1ToWetpEQoeO2nbVGC5/mp4+AIlfVhPsbS5mb/qclMDF7+y+wZgs?= =?us-ascii?Q?mMwTreJ8uo4AbPbPG4wbnXNiMxxbyV5gsnmT+GZE4V9mvHWzK2wQtGO6Rlf1?= =?us-ascii?Q?6Wwoes1zA0qMxXG9SsI0iR/fr+aVja/F+BtjwPAKLZgH8ukIB99rBpBu5uOf?= =?us-ascii?Q?J+ymoz3YpV/cejDeOr9f3M2x5Jy/decAgGsIsG522JhHDYmXpW4pyeCLV+FO?= =?us-ascii?Q?CDIieEpoQPZaBOUrHe9VtN9qdOTdzHaOERDBwCuXQYS6fuoU62zawAZiyGKT?= =?us-ascii?Q?fICj31yfK5+OtMSCj7RNKidAcV8v6hLrx3txiokHiOMhAXEybnLnCCjJW+b6?= =?us-ascii?Q?wVufR2hq7RKTYyHPk6m+A7nAK5qbIVXEcMWh+ugQ/SKNVmXuBBOqPh5+hQIV?= =?us-ascii?Q?BZ0saabj/LI1MdZkBYAMZQtQIt91KaIFtK1IpedIAg6YqcrKjPrpHC0tYkmu?= =?us-ascii?Q?kTaAXgj5QLHTzCqJKzrAkq6aQcnQyF9Rom/FpWbLyeZZqjUFTX6W9+PtIoiM?= =?us-ascii?Q?TD1qQWDQAQBelyuzfr7ELBPxXy3nI6FiRIigyJo3+VdIxIMs0agEvb7ulUhu?= =?us-ascii?Q?QaKhP3VVWnldJkVSA07KlZKgmSOvahzHBs6pMA3NlUsKGxMCoNgkhzYCLK0v?= =?us-ascii?Q?4g=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28cb171d-e8db-4590-8b62-08da6b455ea5 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 18:18:11.3356 (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: ZQmNzffypYufgaNT1Bu/XMogtxXq1CKdKX3SxwzJHHIKQKdCOnx94YuqpMM1SB/mV2dG4uNgGtlxVloWo0yzjT7QfOl2DpBCGH74yEm3sPM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB4890 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-21_25,2022-07-21_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 mlxlogscore=896 malwarescore=0 adultscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207210074 X-Proofpoint-GUID: tZHN2NTcgqb57tRsoOwO23ootZoL3KV0 X-Proofpoint-ORIG-GUID: tZHN2NTcgqb57tRsoOwO23ootZoL3KV0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The use of __weak is being eliminated within kexec sources. The technique uses macros mapped onto inline functions in order to replace __weak. This patchset was using __weak and so in order to replace __weak, this patch introduces arch/*/asm/crash.h, patterned after how kexec is moving away from __weak and to the macro definitions. No functionality changed, yet. Signed-off-by: Eric DeVolder --- arch/arm/include/asm/crash.h | 5 +++++ arch/arm64/include/asm/crash.h | 5 +++++ arch/ia64/include/asm/crash.h | 5 +++++ arch/m68k/include/asm/crash.h | 5 +++++ arch/mips/include/asm/crash.h | 5 +++++ arch/parisc/include/asm/crash.h | 5 +++++ arch/powerpc/include/asm/crash.h | 5 +++++ arch/riscv/include/asm/crash.h | 5 +++++ arch/s390/include/asm/crash.h | 5 +++++ arch/sh/include/asm/crash.h | 5 +++++ include/linux/crash_core.h | 2 ++ 11 files changed, 52 insertions(+) create mode 100644 arch/arm/include/asm/crash.h create mode 100644 arch/arm64/include/asm/crash.h create mode 100644 arch/ia64/include/asm/crash.h create mode 100644 arch/m68k/include/asm/crash.h create mode 100644 arch/mips/include/asm/crash.h create mode 100644 arch/parisc/include/asm/crash.h create mode 100644 arch/powerpc/include/asm/crash.h create mode 100644 arch/riscv/include/asm/crash.h create mode 100644 arch/s390/include/asm/crash.h create mode 100644 arch/sh/include/asm/crash.h diff --git a/arch/arm/include/asm/crash.h b/arch/arm/include/asm/crash.h new file mode 100644 index 000000000000..385646957d60 --- /dev/null +++ b/arch/arm/include/asm/crash.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_ARM_CRASH_H +#define _ASM_ARM_CRASH_H + +#endif /* _ASM_ARM_CRASH_H */ diff --git a/arch/arm64/include/asm/crash.h b/arch/arm64/include/asm/crash.h new file mode 100644 index 000000000000..ec8870c1ea49 --- /dev/null +++ b/arch/arm64/include/asm/crash.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_ARM64_CRASH_H +#define _ASM_ARM64_CRASH_H + +#endif /* _ASM_ARM64_CRASH_H */ diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h new file mode 100644 index 000000000000..02a457cccda3 --- /dev/null +++ b/arch/ia64/include/asm/crash.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_IA64_CRASH_H +#define _ASM_IA64_CRASH_H + +#endif /* _ASM_IA64_CRASH_H */ diff --git a/arch/m68k/include/asm/crash.h b/arch/m68k/include/asm/crash.h new file mode 100644 index 000000000000..ba6e412a1267 --- /dev/null +++ b/arch/m68k/include/asm/crash.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_M68K_CRASH_H +#define _ASM_M68K_CRASH_H + +#endif /* _ASM_M68K_CRASH_H */ diff --git a/arch/mips/include/asm/crash.h b/arch/mips/include/asm/crash.h new file mode 100644 index 000000000000..35872522c574 --- /dev/null +++ b/arch/mips/include/asm/crash.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_MIPS_CRASH_H +#define _ASM_MIPS_CRASH_H + +#endif /* _ASM_MIPS_CRASH_H */ diff --git a/arch/parisc/include/asm/crash.h b/arch/parisc/include/asm/cras= h.h new file mode 100644 index 000000000000..96833b727179 --- /dev/null +++ b/arch/parisc/include/asm/crash.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_PARISC_CRASH_H +#define _ASM_PARISC_CRASH_H + +#endif /* _ASM_PARISC_CRASH_H */ diff --git a/arch/powerpc/include/asm/crash.h b/arch/powerpc/include/asm/cr= ash.h new file mode 100644 index 000000000000..40ce71e56ac1 --- /dev/null +++ b/arch/powerpc/include/asm/crash.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_POWERPC_CRASH_H +#define _ASM_POWERPC_CRASH_H + +#endif /* _ASM_POWERPC_CRASH_H */ diff --git a/arch/riscv/include/asm/crash.h b/arch/riscv/include/asm/crash.h new file mode 100644 index 000000000000..24f3aea99707 --- /dev/null +++ b/arch/riscv/include/asm/crash.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_RISCV_CRASH_H +#define _ASM_RISCV_CRASH_H + +#endif /* _ASM_RISCV_CRASH_H */ diff --git a/arch/s390/include/asm/crash.h b/arch/s390/include/asm/crash.h new file mode 100644 index 000000000000..0db16ad4c75f --- /dev/null +++ b/arch/s390/include/asm/crash.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_S390_CRASH_H +#define _ASM_S390_CRASH_H + +#endif /* _ASM_S390_CRASH_H */ diff --git a/arch/sh/include/asm/crash.h b/arch/sh/include/asm/crash.h new file mode 100644 index 000000000000..f54e12f88cae --- /dev/null +++ b/arch/sh/include/asm/crash.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_SH_CRASH_H +#define _ASM_SH_CRASH_H + +#endif /* _ASM_SH_CRASH_H */ diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h index de62a722431e..cb0f1916fbf5 100644 --- a/include/linux/crash_core.h +++ b/include/linux/crash_core.h @@ -6,6 +6,8 @@ #include #include =20 +#include + #define CRASH_CORE_NOTE_NAME "CORE" #define CRASH_CORE_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4) #define CRASH_CORE_NOTE_NAME_BYTES ALIGN(sizeof(CRASH_CORE_NOTE_NAME), 4) --=20 2.31.1 From nobody Fri Apr 17 21:03:49 2026 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 6548EC43334 for ; Thu, 21 Jul 2022 18:19:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233036AbiGUST3 (ORCPT ); Thu, 21 Jul 2022 14:19:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232615AbiGUSS6 (ORCPT ); Thu, 21 Jul 2022 14:18:58 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3788F8C75E for ; Thu, 21 Jul 2022 11:18:57 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26LIDuBb013157; Thu, 21 Jul 2022 18:18:17 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-2022-7-12; bh=j7CGjJc8BjCRKzMdNHifMeyWiucuIXD7idUNb89xLQU=; b=tKLOQbYotKjWKmrzII2s2YMDR3+v3OBTiLJriM2q/Zb8rbl8U+piCxGT26dPNTI2WI3W MUIbPJ6XPaBCfWLs9jo8yalc2jShTYZyy8gE1NJ9i7PY3PR4fjSUr/TSgq/irMOz/2Bi xIlmMGnh8whH9Xf22bL/rqVYus++KfpOc6puHBD3AtZuv0ErB5RWvTZehFlNDiFz0bb7 zO/RG7UOkcfoi+LuTHw9u3ET6CA7pxJ9UUNkkkcJHqkitBe7adwovL6BVD8cSTaUTJzX 3Wm7Dras5mXjrcRkOmqt1V8F3Le8Bzq1xErqUe6/vgQ2X3u/ERyF97dL/0+fdwhOtfok rQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbmxsdb8w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:17 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26LG8mas022180; Thu, 21 Jul 2022 18:18:16 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2040.outbound.protection.outlook.com [104.47.66.40]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1hu6mg6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FfZHPPPIT3X7me6PwJWlfkNrDLAyHsuvF24C7LELITlC0gUC6pWoxEF66t4eWNWrzWhzYbKXeM1KxDWTebTQ3LMERs52QEcz60wEA+y//12q7JYiDP5fPeA9xhtzYTB2Tebb79N1S2oOlnAUDsHc+UNIBAw6X9QyM4JQXWAQBdJSYl1RHQIQXo6tWq9Qe1r7JKo1l4HiDwT+NJP0jsbC8qO68K32xGXYy0Wo98ladYMa1kwf5jqQlajVusu6krWZhhugX6cKxE2f0FGH9lKd3RVqKFRdnHG2lK9Z3QlHSBtH0pRb5V+zm2E9FYulVKZEWBVcdZ1Nv2rHf5Gyza62jQ== 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=j7CGjJc8BjCRKzMdNHifMeyWiucuIXD7idUNb89xLQU=; b=hlfLzMYzfrtRd7hJJMSzE13TWGoxMvV6k+xJRFJPzNCXSGb892HWG325YMwcJBvact1lrGWwGCQbsnjatbRqs8Ub64zh+oWV1815YS8qKNK0JdGym6uSGZjSZsTxRkg5bkUwSJ9+67GjaRmA+F0rs5UiIdAhmalQgNk/iOcaWxl/Zv63azbD44r8EV/Hd0C2gLABW9mHr4hfJlwmtS3qWWKvsskLypNUyzjDK6vk0swJ6gi36fHO5EOPgmJ9bFDGsgFP3xwtGdnq4uk0JAc9g4B8yKCqm4Nw/0m/oDx7jjSimDVwJZC/py1/nZfYDtVbaf+3GhwYR64khG4/d50tcQ== 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=j7CGjJc8BjCRKzMdNHifMeyWiucuIXD7idUNb89xLQU=; b=A2VpdwmGXJ2STIYSB3UrnxlhkseQKzkuGtOBwPvR8NUS59Z/kkuyX7w/Ty/E0NzEq013Lsq24UKNXIN7fswCuhzH2UsnXw21uF1hjcEk51hV65dnEpwAJimAmoMzvmPSQ+O+dDGl4vgAKc+IcWhOwGwC6zEHplBj8yU8x31I40g= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by BY5PR10MB3986.namprd10.prod.outlook.com (2603:10b6:a03:1fb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Thu, 21 Jul 2022 18:18:14 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d%3]) with mapi id 15.20.5458.019; Thu, 21 Jul 2022 18:18: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 v10 2/8] crash: move crash_prepare_elf64_headers Date: Thu, 21 Jul 2022 14:17:41 -0400 Message-Id: <20220721181747.1640-3-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220721181747.1640-1-eric.devolder@oracle.com> References: <20220721181747.1640-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR03CA0189.namprd03.prod.outlook.com (2603:10b6:5:3b6::14) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a90e72c8-aadd-4956-9a1d-08da6b456020 X-MS-TrafficTypeDiagnostic: BY5PR10MB3986:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R3MEZM+drUd5YuOxLP9W8ZJOo5WxWjtRbUWmynueZ3wpbidzGn7//LiftmBgiIOlcsPRSj3/ihHU7XzdgztZamRUwyvaJv9SpiYdF/jq2OlA0/o/pNn7dYsV4Q9k4mvGPktgoo9ZK4vgP8MdZLVVhvuZOt4+pFiREXOCiG9EhJdGXHC8i6D7xS+/esqtonNmGAlSp7z46wlFRHcbZs/7PnGpPpSFdlUa+IePDsJJkQWO5PCkdAEC1iZKWcARZMSy16ZOPdhMycp0j3G18nI1ReiTL/4/bUYg47j2SkxS0s1pmns8+VCXQp0hnx3j0wNI3nT5r+GaGJLF7YgoCAjQAmf3adLPUIUI0/NFRbmsMk68uDqK3UerDBrZxmGJOSPxY8v1+zndER038yCIE54S5kfopBjlilAiK1TKlNZ6svAD+UH6uzSQe/19u2mPrNG+SfsMZtDa72ajVzrZfSHRd/alrAP3TXqkUmEJVSZp00NOuDvI7OnwhqTVHvInCQrlT1zTgPJSnUA647WlsoFtsHjaENMLqYCC8QYEyXuZ9lmg0LrAK/s3Hrkm+wq30J6fOmLwYLoGMHk+bcqozpsxmGWHMQCvqAMWsBkdczWPc79D0F/4bY8iDOXSsbvCaUkW7KHqXbQFgzIwg1JpuE33Swo3iyZZhFq3VuWMu8E97+tyCbbyhho6lXkRprY3YbIZ2Vuwq1MoeqVkfrPbi+k+559EOzgdwBb/Mx1s8UFL9bwZbWhhoDMgFefpAPVEFUyzTdJzwTuCUkkvZtsP698Gddpx82oFNuFSFwUDCobO6ac= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4531.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(136003)(396003)(376002)(366004)(346002)(6486002)(2906002)(6506007)(38100700002)(6666004)(38350700002)(66476007)(66946007)(52116002)(8676002)(86362001)(6512007)(66556008)(26005)(5660300002)(1076003)(107886003)(4326008)(8936002)(36756003)(83380400001)(316002)(186003)(478600001)(41300700001)(2616005)(7416002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0pt1DJK96vS+dI1xIxHbfc9QWoUVoSED3SkhdoDULPD/uPRMwLqtJ3Ptr0/5?= =?us-ascii?Q?x24Ewzj9qm6YKbB4qGPE+AlXUfyKgDfVNQCP0ES7vHCVS1TK8IEfTpTWtZnq?= =?us-ascii?Q?30HpqsS+OLD1yt/lTkhIlDdjWiJ90SkXs2OWljmzzmaNfLNyjuG4ze+EMaLi?= =?us-ascii?Q?n5LzgvdQAub6d/K3AxAcrOkPYybGySWWjrUi9mheC/eLATRwB9BA5wtsRtE8?= =?us-ascii?Q?7nAvdnfxCdG+Wpku6jtjGoQ3xlikXQ8vTk66ax5khROoCcBqc4a99SyRbmry?= =?us-ascii?Q?EijXn4QwLHSpjRgfBwiMyyAZjvcucKCBhAhwIsOWcoCbdzlqyQunv6cOhXC1?= =?us-ascii?Q?NuLEUVeoqrLktxgqU4IchV1CkAUJ/cCGed3pDk4buoVstJ8UHot4i7S2uA5M?= =?us-ascii?Q?FtBvLk9z10So9F+4MM5GfRqVwcSRY/oKwf7H3ifTOsD23EB2GXUq2MXDvbao?= =?us-ascii?Q?Ci74576TXfDBDUCVD4tc9cvmQi4cjaeso/GFTlQ9Lsipsw3sRUe5+cJAEABJ?= =?us-ascii?Q?zD5F2IeTfom3wSYDK6SRTKuKRypwLlu8HNKfJxWlYn1R91wzFgQQ+v3cicKy?= =?us-ascii?Q?lTP7lASvwq0Cz/JOAhF3WWKtxAtC1W0x4hOn83+zRUMwX5gjDQxvs3gT9p0I?= =?us-ascii?Q?nwQC+UDAF6YeuJkJjHMpqEXMg1BW205dx8wkWv2Ic4WjA/ZZ0Ev6j8jL4l9p?= =?us-ascii?Q?bdhbBYATnznqWbUTAfRFozLeKvSrI1FjLDPpCU91ORDZmWGBDmRnhMq317KC?= =?us-ascii?Q?9u+tYLaeDi3y6ranqMkI4DLMzCGTSDbx5ohBSCy/bRTfiTkmYCVDPwfo1Gjy?= =?us-ascii?Q?WDhg7vtVtitsf/gzK/GZbiKlNfgBxbLkkU9KYMl5SiJa1xJ2NhOM/X7RSdpS?= =?us-ascii?Q?dltKCDtJwBK0sVhs7JfXWNx/yBZ6vMKZ5D860lSif6betdQRC6DbuI5UrKf4?= =?us-ascii?Q?vzVTk2DAn8EkG6jR3OTDWdzYyNG36eWrKtUG+6VKGJ0ShrXSkyMAMuSG8MuL?= =?us-ascii?Q?XOfNkJGL5HncdQ8XmG+RAZS/ZlYszlf+T+r6usagx9N2mzjQ+cgowzugoC/N?= =?us-ascii?Q?to6jazeJbDVGjbiGlvVMaCXs1DGohTP4YGi0tj3Q0C3sbDGoTWCnTPtEnG0R?= =?us-ascii?Q?8IjBcA6MMnRbKt5S2mcj+cMaWpoQ7uFmNA7EyNBNq7UfmLwa11AWp/1m925A?= =?us-ascii?Q?y+8RcVurkCGbZ80wAT1Lxj+cwq9uGP1hBnszhmVRb/jlKwYBNL2FyieqiKj0?= =?us-ascii?Q?9t5/T5qi1GjfiMiLEj6KRwqXydFZKPwf5N7o+oBB6QqOq1DuYSTfZV5WZExk?= =?us-ascii?Q?RRlTIFrTAovbHMrLL2IbsswaRHz48clDSV8liUZ7yGrr+9z9FHkGe9j3h3IP?= =?us-ascii?Q?SuUIsIlu0hAzQ3E1/9pkosWhTOffXZOIOf0hb3gfhRWn+buABM3iBwtsUtNG?= =?us-ascii?Q?8Vw/Cbnxz4hGycUrMdz4dYaBZxMtFk1QNt/axkTnt0CGTqsqv4EEcyHsvq+H?= =?us-ascii?Q?SNZDtF8pSinkv0czhEZvtDCa0bN9G4itfTPksoXFBKC8YAFXaES/oXmxzJX9?= =?us-ascii?Q?xghKBRWgPRo8pRKP6/HvD1g01NZhOpYy+/ERdCLUqKdW+ds9RA4ZW7qZHu3b?= =?us-ascii?Q?aw=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a90e72c8-aadd-4956-9a1d-08da6b456020 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 18:18:13.8198 (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: 6Ps8DLZHAvpplPypgDVK1dp1bldHpEL8mxF4mXC2p2vjH+VTAWRsU/aJs5BfRzI0j7EJQARVUFNev76y3v0INpKQJ6000Eh+jMjMGVv7Z98= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3986 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-21_25,2022-07-21_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207210074 X-Proofpoint-GUID: 6x0v36L7GgHgy3kLOQBLCc1H1oQbAPcV X-Proofpoint-ORIG-GUID: 6x0v36L7GgHgy3kLOQBLCc1H1oQbAPcV 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 71122e01623c..cf273fd7c18b 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -9,6 +9,7 @@ #include #include #include +#include =20 #include #include @@ -302,6 +303,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 need_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 (need_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 f9261c07b048..fdad056d5938 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -1234,102 +1234,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 need_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 (need_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 Fri Apr 17 21:03:49 2026 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 96D19C43334 for ; Thu, 21 Jul 2022 18:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232655AbiGUSTC (ORCPT ); Thu, 21 Jul 2022 14:19:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230006AbiGUSSx (ORCPT ); Thu, 21 Jul 2022 14:18:53 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82CCE8C751 for ; Thu, 21 Jul 2022 11:18: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 26LIEuc3011725; Thu, 21 Jul 2022 18:18:19 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-2022-7-12; bh=aYsmt359NudaR+a45T2x0bA8pCU7wVEevghnKueNqJg=; b=OiyOPUgqI8qygBAsuHP8i+3U8uNxc+bBjtGH+0s43HjnHFVZygfvq+TjN8dJQRIfmrnB Q2Yn4GtRo4VbYJYhc88fd9/8nAyx+hofvyRiNp/32NdwudV9LHS5nXxXsQCnVOZNbNGR QYCJ6TmNV2TzCd6e+vEXG4Ush5FfXpfeSBEUCTg5NSAUnNSZ2TJjrXVl0XerTOy8YCKT OEF3WMtkvOZBknizsUeoKhRmtOmM3B0MwPXwNHtaLBmDtpibC0L7lca2jaEEgnNw3MDv j/J01/4qxM8sPoyKusdsQSdiFYYW5fDie47HfPOrXHjtL7K6B3DXDLap9epmYyocMb5x DQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbn7ad403-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:19 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26LHOcli009824; Thu, 21 Jul 2022 18:18:18 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1gjs2xf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xx6oKqVHIYla9GPPX0NeTTfWL5wo5kvk17qM2Kyj4PdGeJg9T+SXPPf7Mb/cXOy6X+XHxZQYmMPX7R3tfGuN9dMqlmTUXSSWlpvDaQpeQbhKHsBwwlUDaGSDhYqzGkfWkvAl0FyWw+DbNiaKovOUdUNTZXKH2RHPUELY6svEeeNug/+H+AclBZYTZEvz+gsub6JcAq9SaXvd/iidJivjT+0h5v5I9b0XnNFyNinwBPPgoY5t8N5n84iPJXmY30Mkfr4m9Kf2HM39lzirXxG+7jAupk6yBvrJ4m61vJa6GJ5AdXy9khg453aS+Ief0DY6aq4aRi0Ci/2NQSfEvobZ1Q== 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=aYsmt359NudaR+a45T2x0bA8pCU7wVEevghnKueNqJg=; b=F87rIfXnvK41Mjy7Wayx7VINLFdPHLwEwQi8nCLo2Y8bIDy6d2CEj4vm7SATwYGN3P3SPUiXc1oJ7Kjw/koKKoHtYyIRmB6ChmFQtMPrZ7we1zBTEqrI9jz05uFkX2nPNoNSSx64kCYPdaowhF41vJodlLij2JE3xkmTumx6X8klBDGSRAIdddMNVs9i3EsBWSlQLvr1nrrtQ6ILTR1t4V5emalMqYAOtac2Sx8Jw199aBDcWFHYwiWMKvdilPzMk02qQFPzmnlVjNaV0jG8p1wAug7dVF5gcQnHclMvZPZIud16p7JGb/UsmnzOiz55Azs3NK2fkWXoocYelLGDxA== 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=aYsmt359NudaR+a45T2x0bA8pCU7wVEevghnKueNqJg=; b=qJ+BAb5KAEiIFkGxkPtbuBMN6EZmQ9nJEWAfKZv6Wa7O4yUpXNp4c5iIlgPrKyoiTN98n28RUgTXj3Aqt6+wMqiEhWvmGQuoZWYFzMOzZLYY/1I8LwXBmel4Ql1F/lZCPKSX0ImnWJEI9gp8W6rFbGX9ZPjgZH6WObHXnJx5QW0= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by BY5PR10MB3986.namprd10.prod.outlook.com (2603:10b6:a03:1fb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Thu, 21 Jul 2022 18:18:16 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d%3]) with mapi id 15.20.5458.019; Thu, 21 Jul 2022 18:18:16 +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 v10 3/8] crash: prototype change for crash_prepare_elf64_headers Date: Thu, 21 Jul 2022 14:17:42 -0400 Message-Id: <20220721181747.1640-4-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220721181747.1640-1-eric.devolder@oracle.com> References: <20220721181747.1640-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR03CA0189.namprd03.prod.outlook.com (2603:10b6:5:3b6::14) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7bf0ddd2-7e45-4537-9d51-08da6b45619e X-MS-TrafficTypeDiagnostic: BY5PR10MB3986:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IV/iHgjpzoo+olOaoMZfhzIamewA2t3OE1L5YO8/zdSlAsslRkMrA9uF4HZJUWE0MlfSqsYoNxAMkXYjUACX5YmaaEODJrDBtYV5CX5zKm+uHcaDMTSlD9/b80WYZ31Xinr/qdH3jFzNvkvxye4wN6FHg+K6JeOnhWR7l1rANnOImj2hqU2tLvcKBBUC83Gyv+UZHxT1O+tbxMJevGcMaFl9bwIYf7AGF/0qSLqEKviwqSv/0p+IRaevb2nxoG7xjm7ZoJjh3cPJ9Q205ydEWY55PfHEMF1y618tAZ+kkVSzxH0x8I8sg3jFQMmXrzB1m1pOeVz9BU6hqVkLdg1fdXhTlZrKxq/S3I+e+H/ed7il5pIb5f2fHInXXJcHPH8xk1iKQaRlwGasiFQZ62KHLcKWUM7TyqyAFWCEG+8KHVCT7OQEXAqrpD6jok+g4LENOui80RUgW5CpKh8bQjR1jaNZ+ggwDTRjP1sROWBJba7Brxg6I/W0mesb1EnYeVqzAvb1apeOC26+H09ebEXXw+ngFQhHU3T5rqg8EvXkDXJ3h3m2qKS14HSyndRcc3g7/lt5r0295RruYrasStCHkyEYKs9GKMc5cC853/HOmaK0MHgncTHVLOcPpWDG3N9anbSQLSSS32NFh2swCCnrj2oqb1jInMQOBlzFYkcXVpfcx5QbfRUYNrbLYDEtVl8DFGkvUaq+t1J1d2pnJC2c/wCboonPxtRiEJfmsb7kPvnaff+FKwUcElWvyZNyzTZaJxK4ohhg0l1qR2Z6KUNm904Httb/8KCUW8qj/LxTy/c= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4531.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(136003)(396003)(376002)(366004)(346002)(6486002)(2906002)(6506007)(38100700002)(6666004)(38350700002)(66476007)(66946007)(52116002)(8676002)(86362001)(6512007)(66556008)(26005)(5660300002)(1076003)(107886003)(4326008)(8936002)(36756003)(83380400001)(316002)(186003)(478600001)(41300700001)(2616005)(7416002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UkdVwXI4G+floxdUzRPcSnvgtk8A4uEfTcbXdk08E8nJwRfpabduileLLDSE?= =?us-ascii?Q?q3lPCAVj1avm41AKcW7zcsYLSO6ASiRX31z2pdyPh/s2l8nhjBlIDxOmk6ih?= =?us-ascii?Q?MSZbcxOY/YHeyrsFgtO6IYg5bzYoJXqZ2qXiIu5jYmfRUBMMAjjXD+fdH9cM?= =?us-ascii?Q?vEzBk9CmGxVZ9WLUm2r+SIz8PSKJaB9gR7WpCS58xnbFAxr1wLLPej2MX4ir?= =?us-ascii?Q?CkyGcVmts4qJdlSgpzTeW3Z+EF1HuoyY902UrcxsAgfcfm2dSJC+v09ye1zf?= =?us-ascii?Q?tLD8Ct9i5lgqXC2dEnOi1L9ktaEg3ifFpKBk4HFI4Ngu/0Zj0PUKykPSYEfi?= =?us-ascii?Q?qSmhIZH2hB/tF2l4sPCjai2VJhIeo7sDWk6ENKCIyMEvsEYOGN4h48WXUJ1B?= =?us-ascii?Q?/V/Ze1Y/gon8foOoVMEUI/u+2Ud4W5C9x+ygroGVcfEw0j9VdK3Z3dj+ScQv?= =?us-ascii?Q?7BvFLQuFEzhyBMgUMadLrRTw9v1pEQiMjOmOp46LxqLt8hXjQzUGE26sXFPA?= =?us-ascii?Q?rElL3NeQzuxUaD4V0fN8HiaD7iNQpiLz3XaS4z7wTAL3z0LCtTCBcFtPoqzb?= =?us-ascii?Q?NtBU7mHROjllNqYoVm+yoFnmcCMn0mmgs+a+Edndzwp7XVTR/6l3htcpAqsZ?= =?us-ascii?Q?uUyH1e4iFwkjfYlFBK/w6NUBRtOH+SbUZPaYappyVjcmoN17F68tMDXkFc0u?= =?us-ascii?Q?eilQNeTPnwF+w44saY9g9LfjrxN4/BEz338xyqftz54k0E2xhW3i94qB4lvY?= =?us-ascii?Q?gJ+bmOgGSDP9fX+AzOuQd8N1RDJnktAilA3k5OyZKawL8wJQy+kJUkG4+g0P?= =?us-ascii?Q?avm3az1g1pgOR14/RZKpjOgs5Q3Xo8RxxH1pIvZpMuUV+JqKlr/iPV9HgLZD?= =?us-ascii?Q?sq/uakEnYWmv0/q8YwCbWzGxcXIWooyuhfV5e7QY2AUf9l+fioeymC/rSGQs?= =?us-ascii?Q?88CRuocvqjUVUN35+aHD/6Wn9nrO8oZRTz22rmtJexcHGwBr6dDsjOTPC5Xv?= =?us-ascii?Q?C3gaRQadiyz7+32rc4Jm1Z5bM3aPiFmXBC0KojzonL5AR9ZVeLgiRNN4HzzR?= =?us-ascii?Q?EkglgAr8RilunV6wlWfv2owxXM0X008a9ZXEWLpkhds4ecpOLIVTDbe3AH8X?= =?us-ascii?Q?lxHAKVaRqaCRX77Uo/8RbJ8VQi0QNpBSN704L14NzA0gn6BCZSAVAKCC1x7Q?= =?us-ascii?Q?0EYNmvyWdjudLIaN588/L98brbkrQqN9fMcnb3j1a1tu6qqCKuuBc3vvO6Vw?= =?us-ascii?Q?nI53k+V6Fg8eeNJJ+19Qc15Tvg1xyPSTmweCewfWC1MbaNc0jf5jCSVs7lqe?= =?us-ascii?Q?KWq24gb6t46TXTedbn36vDDl//zaqLOoxkIKwrxkSyVGdpmKKs5Y9MNZ3Lg1?= =?us-ascii?Q?L25Ax5bG9wkKsy4K9EEBmbVnw9u+y2mx6HZ0gEQQ9bCm8lWM67dj7zamdizp?= =?us-ascii?Q?TR2a5SAmS88CxO96O3I4osABc797lu3Ul0MuBUVTpQg5MhkA0GgkB+8qbZLd?= =?us-ascii?Q?oCKogQkm7ntf5RM+AfuSFB+g1PPANQ6FuT/9W4ybNlLMYtGsO2yLx8132AqE?= =?us-ascii?Q?8coIDCcIdBzngXrAwNCW/3us86DSxFz7Zcv76l6oKANqHbUCbAKulIALahQq?= =?us-ascii?Q?Rg=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7bf0ddd2-7e45-4537-9d51-08da6b45619e X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 18:18:16.3233 (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: aI+WTbwthaWMz6CdPEExUyuZwj5SwPfr8Badiw6JKHPvBHAsPVhWNVEUcCwiDP5b/cpm29BjXi/8fzV559VO7VazYWEj/zqIFooInkm0LFc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3986 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-21_25,2022-07-21_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207210074 X-Proofpoint-ORIG-GUID: QWwm9eC5P793vwf_igM9kv-AdjB6eNOT X-Proofpoint-GUID: QWwm9eC5P793vwf_igM9kv-AdjB6eNOT 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 | 2 +- include/linux/kexec.h | 7 +++++-- kernel/crash_core.c | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/mac= hine_kexec_file.c index 889951291cc0..7f5f8243928e 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; @@ -64,7 +64,7 @@ static int prepare_elf_headers(void **addr, unsigned long= *sz) } =20 /* Exclude crashkernel region */ - ret =3D crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); + ret =3D crash_exclude_mem_range(image, cmem, crashk_res.start, crashk_res= .end); if (ret) goto out; =20 @@ -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); 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..9ceb93c176a6 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -265,7 +265,7 @@ 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_6= 4), addr, sz); =20 out: vfree(cmem); diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 475683cd67f1..5f4969cf3f4e 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -219,8 +219,11 @@ 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 need_ker= nel_map, - void **addr, unsigned long *sz); +extern int crash_prepare_elf64_headers(struct kimage *image, + struct crash_mem *mem, + int need_kernel_map, + void **addr, + unsigned long *sz); =20 #ifndef arch_kexec_apply_relocations_add /* diff --git a/kernel/crash_core.c b/kernel/crash_core.c index cf273fd7c18b..212d4dad0ec7 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -303,8 +303,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 need_kernel_map, - void **addr, unsigned long *sz) +int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *me= m, + int need_kernel_map, void **addr, unsigned long *sz) { Elf64_Ehdr *ehdr; Elf64_Phdr *phdr; --=20 2.31.1 From nobody Fri Apr 17 21:03:49 2026 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 02BECCCA487 for ; Thu, 21 Jul 2022 18:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233007AbiGUSTL (ORCPT ); Thu, 21 Jul 2022 14:19:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232211AbiGUSSy (ORCPT ); Thu, 21 Jul 2022 14:18:54 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E29F379EC9 for ; Thu, 21 Jul 2022 11:18:53 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26LIDuBe013157; Thu, 21 Jul 2022 18:18:23 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-2022-7-12; bh=f+rVUJYklb83MeHY+n4N1syjQ6p7P4VbZlisOjpaAFk=; b=wDEj44d7dAGG9UE1NJjnjIoBW4wqtUXRj1lEK9Kt4O2M3uplE5MEZXqAf/DNH6Qbs2Zz 9Q24QKKWDImLYybHqofkkKd0+r6lbWUGdTKS0REENbNA2psStEJHKo/mcaqK7wqnMs2K 60nkan8Zt3oXboBjSku03PLonbYHw9czhdM3Jkfs+mFKYQDqXmTQCndcH8VmDlIkmAZx PXJ5TRtz6/jQ8ps8wEx0/sM/Pf0GGEzTTSKIMHeEJq3bmvDGelqzBTWAjqLBi00uQRcp 9x+KBBs+kj93XvybrZXvECfxfwg9RbRGeucXLxV2lEkaNu/jUXG0LQVZ2Haoit7IpPrG GA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbmxsdb95-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:22 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26LHrGG0007905; Thu, 21 Jul 2022 18:18:21 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2048.outbound.protection.outlook.com [104.47.66.48]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1k5n709-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O+qdeuL2RLEnSWGgpkJoO9OxkygILPQtY0fSeheIScHvrb6vaZwvn5ALjkerQ3Lzf7oDegF5GJQj7FqOMvpypicGchI2mfGgGDEwuOf0L1dDCvhocEmAnlAv7siCFFd1ttZf+K03MoXL7pMfKD6sQ25kn5RKxPSjQbl48g/8WjEv3Xg9Gfb2MuV1AVaTLta2QdRpswqwFhC2StC76/X6dB5/qzUSMr5WHJJiU8uAb4Ce4smpGCVhK5WkFHWrY9zRFHD9xGuIY9YvJJdmeaoCeFUuV5GnzU9KZWoPFkoQZK1NdV5YMaNXU3lmVE7Pf+TMVYZXifiopp5LKeldDA1aOg== 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=f+rVUJYklb83MeHY+n4N1syjQ6p7P4VbZlisOjpaAFk=; b=FpezG+bhf+5zL8oHHL/wMCADAq4Hbh3gXlCOWIjdHbLPsjITHHmPHydSSYk61zSirWzLOK0UneKMJTMIBmHiVmZvQaBkSQ6QTU9jfSl4M9two1dWGNexMQsf9bPBLcIWWCW7AhAx/lFtnz1BEtBULnNYblX8wSJP2GGrM1seeacIae1Pswgf2vgV8mH/Axio7Z3/tFdALTAJg798PFov96FRmNnYraftrBljKVrqOmjqaoovHfgV2WkFX/Vdn4kGB0RKSAOPp89kWcdUzk+Xh0aAZBo+eTuBOhk+9B2onASf5ddMKag5+9JGq1n07k8dVNerTQDpIncgPMsCCIyhzA== 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=f+rVUJYklb83MeHY+n4N1syjQ6p7P4VbZlisOjpaAFk=; b=VnuSg9/TsZDRxHrO8CgpZ8BDDyo+PzokpQlli10JbLWlrYRWWIbtaKzCdKhLkcgBfIcC2qRTuAR+OcP7kaTdrpXfSYNzHu4V0thX2qTE8AcVNIciOT+pYw1VFCKXcvuk00HcqKTrpT78ZBAMBNxEM77a4zyE7sdEogOAZab4e9I= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by BY5PR10MB3986.namprd10.prod.outlook.com (2603:10b6:a03:1fb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Thu, 21 Jul 2022 18:18:18 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d%3]) with mapi id 15.20.5458.019; Thu, 21 Jul 2022 18:18: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 v10 4/8] crash: add generic infrastructure for crash hotplug support Date: Thu, 21 Jul 2022 14:17:43 -0400 Message-Id: <20220721181747.1640-5-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220721181747.1640-1-eric.devolder@oracle.com> References: <20220721181747.1640-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR03CA0189.namprd03.prod.outlook.com (2603:10b6:5:3b6::14) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 902ad35b-8708-4bc0-bdb4-08da6b456315 X-MS-TrafficTypeDiagnostic: BY5PR10MB3986:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aBDatmgvAtKlLFpSK4yKSkzgMsSP5vszu3kGsKkCozJtYWYTnUKuxvE+hym6KXbWI1fD09iU0WmA/bpQ8KJLI+nTpgJ6ORw9HDtc7LZYETNZm2/Yam9GuFHPDP69SQ7FumZ412bLJaANCFOG9dveJ+cNNHNdxHIb+YOg7vINsQ4u8kXs/Uq/LqPy4X0vwo+34ltLhkUHcvX6SPK03LoKLMEhVpXknO8TVCLJ4GwZkm0SCiFyA7/PPfQzzveWPAcrYXVcSJph9aNmjyq04Nm4if3SADs+qNX8hCb5L63kOs9H6Thjsqs7nhLMDD3lBM/JxVmGg7mPjegNZuQmSYKnqJGuG9/ewwVNeAB1pic/cwiYWddW6lQdGaZ6HHO3OuKKm9jjC4QB/zZglE1FDz5MRJFWXFPkVi4FNATD5CTHqjdH6du7pMGlwLdBf0EEHXAkB7t0VwZoc7+zngcjX09K9vujIEdMtoybh43Ol4mVq2lFpn2HYYh1VGUxojsqlQBcNv40P5p9uRXFoL/VffToF5sclXFKcUXVCgIDgtUQ0fcmzgAH6zK0Y2qDt76q+9DEFLDC5DoI3qcyWBY48cQrq1f5rwCzk3eV6Q7tF7SsBL/g8q3K6aTfO/CV1tczFgIlYNoEVKK+CL1rSw/pU3YPFUWRJIH0eUHty3ur+h6e6fpyP/s2lzI+M6Ru+mJPXF4Jt1oP1013NE0oLZsKidZBzzUR0fV+vUAIDEG/Sl3WAf9N3v1QMElGQIuVbaxC98JyUo4LHJHKL++sDEII7W5xPUmWnOzBLAyGn5tvoYYIt41QrFScqx4GwOxyxHpefWw0 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4531.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(136003)(396003)(376002)(366004)(346002)(6486002)(2906002)(6506007)(38100700002)(6666004)(38350700002)(66476007)(66946007)(52116002)(8676002)(86362001)(6512007)(66556008)(26005)(5660300002)(1076003)(107886003)(4326008)(8936002)(36756003)(83380400001)(316002)(186003)(478600001)(41300700001)(2616005)(7416002)(41533002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IIuLXXdQTtYLjKQU5DXSvTfKxBsrC0TRyicPBAbKZRzA1HBy7WgFwxSLjnef?= =?us-ascii?Q?mSqFpKS8Rgto6ZhYBHYYgjvFIqML7CGQnhjutmcOTlfrJ68829cDx+ITLVHJ?= =?us-ascii?Q?oqwQFvEv7juxG7uklHnCJJiGyS6cmi1Iz1S/TPYkPwpyGjIQe9PsA14G4bNk?= =?us-ascii?Q?I3HMvJ0ptnPKWj8Stkbmwp1aY/3hLtwD0odqlXUfZu/eFzLnY+vUUXxhCOJH?= =?us-ascii?Q?jnI0WBjg45PvcO0vH6rr5PpogxeQffBsUe4H+pwkP+nCNKpnPCowYZOD96/M?= =?us-ascii?Q?ztJc/7hDcDu2IjCh8PmEXgBDeB8CYsqIEgp4YGZAR9NwFeoOF/IIBlqb2pw0?= =?us-ascii?Q?wphrL3OkTHXKCuIXEISTImjeI6TTeG2IpfvwkTx1myq8ArOtHKpgXpNEbpaW?= =?us-ascii?Q?0g1gfm0OMJJHMKgZAcRorXlFQxOK/EgfKVLXdJlJJYwPZUI53Lca8MwybNG9?= =?us-ascii?Q?NPjtDDCYaFbXbK/Sfj0mPS4QU7+BzaHOuhtbLLZIwtmWKQQcvfaHwLsYwFnK?= =?us-ascii?Q?Nltx5uE7Z56H29cdg6jDX4AO8m+s+gcZuAVgTPpm3q0phy8dhepLJSSLfMKX?= =?us-ascii?Q?lOW0CAaUROCFOTQQz1X8qfBkMA0SR+azbbmO3p3xuN1f5rAbRuSBqDLC052o?= =?us-ascii?Q?6VDd7WrwSckc9Om0iq4dDtlUhDClogLAlkK5pYaYKPrQeQr0DN0cm7Rbluia?= =?us-ascii?Q?RWYVIFW13ZslUzuezbqTb5n5NfeOguoEXeuHG3RTIGajsr44MDr9DEcWGJMv?= =?us-ascii?Q?hdhNcHHwb9FTTwUuZSpKUgB1thkdW1juIVbFhcDgOMqUmncFDaALGU+gDikY?= =?us-ascii?Q?5nJPlliKZCdB/Ff2mhpTMInRmp53VPoVfuWiJhRSjGQ//64kMfyHpJ/CXgvi?= =?us-ascii?Q?PqmksJgrllWMIxs3XrVYXB4rsGISbdpnpJKY32vYT4ZAa7Uz5c6Cqd75zP3b?= =?us-ascii?Q?Hm5ujll40WALBXpB0V/D76bNYE+7AwiCfTcCjkZFyKYroYYaKpWE3sMFM1fY?= =?us-ascii?Q?aii9q8grSkzhfMLpD2ahfnJ6+ADcxm0jF3oDjjdLxBjG8i2My8dc6rUhx9n9?= =?us-ascii?Q?UxENAy2V1lGVQtbMbtHiIItGpata6Uvbxbiw3ZVMRJirHRPuGkGAK3Ome863?= =?us-ascii?Q?rnjRFHTiFFCCed5fvlt5+4U1PNDRGvlaQ8oDXYcvB+0QSvceWVEXr9pwQmsy?= =?us-ascii?Q?INCQIqrgeLBrmHmVwUx1q+RgLmCaU2ipyqtyV7s8bpSBQA1c1689WWeuw3UJ?= =?us-ascii?Q?hBb+5wCjkqoa93GVIaZ5fTV8hzvC3CGjt3Copj2mLnBrQQBvipsXbfzxjKvK?= =?us-ascii?Q?zJNUNSa5PQuQ777sUq+VvzYSXWS7LWNC4soYRzofE+OvJvj71foGD/gtWQDs?= =?us-ascii?Q?+pTRSw0OKZXvahgytY4EXG82YlVlgbBTjWUA5E/bg5Zcx1FE2pq7a5g1RE16?= =?us-ascii?Q?3b6fJVpWQsGuSMT+c/KQgqQuGFWZScq7PZMa3e3onO0fLyv14r9YVk009Y9n?= =?us-ascii?Q?5Q0pGsau6CWrsAvdVBWl/jVqWubaiELI05YST3yguIUwU7a9lgHMNS6D/+GM?= =?us-ascii?Q?i8HGbJWJI0lAlB1qCDUD5aUGym4SXC9kLNIagXm0JAah9YuikwqC5+iEl745?= =?us-ascii?Q?Og=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 902ad35b-8708-4bc0-bdb4-08da6b456315 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 18:18:18.7505 (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: XW8DY4wZx/BmFV9hT6CttdCS76oT95OdaAKHUYbtRDWNrFf0ThRQdjlH6mLpCR6MzGwiJpgscufbac2kqfpvpOUx14FAMqRyAptveIdqcsU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3986 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-21_25,2022-07-21_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207210074 X-Proofpoint-GUID: xIz57JN0y6BDx9C9QZ16jpqdlN5psdWo X-Proofpoint-ORIG-GUID: xIz57JN0y6BDx9C9QZ16jpqdlN5psdWo 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() which performs needed tasks and then 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 | 24 ++++++++ include/linux/kexec.h | 7 +++ kernel/crash_core.c | 118 +++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+) diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h index cb0f1916fbf5..c9705b6872e7 100644 --- a/include/linux/crash_core.h +++ b/include/linux/crash_core.h @@ -86,4 +86,28 @@ 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; +#ifndef arch_map_crash_pages +static inline void *arch_map_crash_pages(unsigned long paddr, + unsigned long size) +{ + return NULL; +} +#endif +#ifndef arch_unmap_crash_pages +static inline void arch_unmap_crash_pages(void **ptr) { } +#endif +#ifndef arch_crash_handle_hotplug_event +static inline void arch_crash_handle_hotplug_event(struct kimage *image, + unsigned int hp_action, unsigned int cpu) +{ +} +#endif + #endif /* LINUX_CRASH_CORE_H */ diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 5f4969cf3f4e..7694aa77b92b 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -340,6 +340,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 212d4dad0ec7..154ef532d45a 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; @@ -587,3 +591,117 @@ static int __init crash_save_vmcoreinfo_init(void) } =20 subsys_initcall(crash_save_vmcoreinfo_init); + +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG) +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 Fri Apr 17 21:03:49 2026 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 E4797C433EF for ; Thu, 21 Jul 2022 18:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232731AbiGUSTH (ORCPT ); Thu, 21 Jul 2022 14:19:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231618AbiGUSSx (ORCPT ); Thu, 21 Jul 2022 14:18:53 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAF988C74D for ; Thu, 21 Jul 2022 11:18:52 -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 26LIEnox025443; Thu, 21 Jul 2022 18:18: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-2022-7-12; bh=pvpzRPUcjzD+1hPbi9dDepImbson8+sv+CQittspkE4=; b=xwQuDq1dXCshEA43Ls3U76qK2PW+9crc9zlCzjTHicAQg3gnK9BuRzWmAsuHhPZsa62e dkGGZPNudwiV4ByPekwRxtGwmWjClQbWRDRPHbru2ncFVkuG4ugROuLdtcfrltfl9Rl7 VO6t+1pZ4V4rgfA08byKlZ9bttkWXGpqGubx/NeYhuNpgC8T9cNHolYA1nB56da+Ul8a sllIIw49PZdwkb31wbXtwvyyyVppX5vnHQV1oNQzgQRoR202XDxDmYD8GAhMfZQvE0KY cPiA7wBq5TEQJ6tdLvuhugA1er/qpNc9pDWyL1p4rV6bz0JgFICi5gJDTV4TF80OREA8 Aw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbnvtne07-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:25 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26LHlfTu022155; Thu, 21 Jul 2022 18:18:23 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2048.outbound.protection.outlook.com [104.47.66.48]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1hu6mn6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JTD3xnJR3E5ah76QRVSHVZXNg7T9KJSqbAHVtaIhwlwPWH/p+l6YbcjzlySUXJyW+BLugrMHrA23m6744WVWNTkCYaNryirJRQ9l3LI2SVnai8ugzQV05ZNNSuFl5ZmEs9ZCTcSUzm3pKo+6oje7BPGt3D3gDds/lk4BMx4lNotzz7KibtaQXy+fnKjMAJc1zqHI31Iwm9Y8dG/QgFncI09C/V6H/wqDUyqksq9B2xM5MFta3iAtls8jXujVewB6emWiej1OWS89oFqrXixS4oNwP9V2gTlbHIrpfbnK+tI5nBOF3b/OAAfMPNacIbMJtS9Hqfl1dX1nHl0emT9FWg== 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=pvpzRPUcjzD+1hPbi9dDepImbson8+sv+CQittspkE4=; b=B3zp9WELT5briH6MVp6a/Q9qNgL2ExKLPRM1uBuO29S1vk5SlJpBowfxVVNLDG4eo6Hu4y8oIDv/7bHN2swWuQSj/vZVqS3bvQUb7E6VZy9WwkKqFVM9QhNbCMx+tAGycOs5koqG43ocKI7QL3o3yNrtwFPssjYhAhB+S6FIXQ187aAJGpL0i1ijl3VpuQQVKPaShtmXJhIW3iqHxgcIKqZ5i5gLz7OAu3sDZkHH0p7sPTeRhIv8S598RYuUAPBR1YLsp5iatjz6GPpopCM5mUEgwJAuixcO4hytfX3+DlboG/s6ToWQL9sW9PmZcvvk0wl/jMWkgQZWd2SzWHUvUw== 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=pvpzRPUcjzD+1hPbi9dDepImbson8+sv+CQittspkE4=; b=vMdurqAiJei1nv3enDEYH06my3cUHDIe+zS//3MS3LCkOfdIBhm+rMDZb1uWN5gyypEmFqL6/fqq2gafB0fd8/pKCjjTuS8QCHO2Ja2WaPUDLa6cB3ZbUkhZxEnH5s4YFc0QJ8Yveake8XwQJxSaEqloYZflhZOpDkd0aSPxN0Q= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by BY5PR10MB3986.namprd10.prod.outlook.com (2603:10b6:a03:1fb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Thu, 21 Jul 2022 18:18:21 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d%3]) with mapi id 15.20.5458.019; Thu, 21 Jul 2022 18:18:21 +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 v10 5/8] kexec: exclude elfcorehdr from the segment digest Date: Thu, 21 Jul 2022 14:17:44 -0400 Message-Id: <20220721181747.1640-6-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220721181747.1640-1-eric.devolder@oracle.com> References: <20220721181747.1640-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR03CA0189.namprd03.prod.outlook.com (2603:10b6:5:3b6::14) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5560c573-2336-434e-307e-08da6b45648c X-MS-TrafficTypeDiagnostic: BY5PR10MB3986:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XbuK0qSUeXInFsFneTjPtNXpBOMXfT7NDx9oagw4Lv/zGa0ZdDxAbGWp62nnvJnkAbEE55aJNVI1JySPbrP6lS+WOHAGSfTcFXIkTB7p4NhOmKdCn34m47gufeUz3BKP9vC+uKoBv2vnF6dk9ilin7rglEo+BF8v67V052dX+KvpDjeLxRgtaWRGM7HwQ7+VBy3iqXK6qgQbEJWm3K2pg7mImFBKo/rqltpNIzZ3CRn2+bGo7A3JGyixzir76CkhYdSVMBGIVdq/cZcx/aHBbTeKgBRX+Plyya5DjVMy1c29ygK7O9KczqNx+8i2pkNw+8os5yYb9kBVZQ0IoFVz0b+NyKzwSrV+7JED8E9q7yQr3doTjuGL9G8zFMmOJBFhSPhLCxGaDXCWGh8vxaklJcadJ85v115j/oSarMPKGiBwQHz0ilS3MU2EgUceMf5oiQUY10TMc3w+jNkkI+09fA6Rp9qqaZaKHUQQPWGz6YZEueGGLDLl1NwZBZpo1XWnU+kUT5uIhzd3bM4s2C5D5JA3fb9AkltzNFIyfsIMJzzjaWeF2/X4cE7lpn8Pdu1ViDpjQwFt4E5+KGjGQVNDJhIP9p9Ytyj5Ajjz3phq7SeHFRWTrftwG9GwNbeq7NZ2/Ii3COV8exZgTk6+HvJOUXq01klXi/NYLUm1Yaw7Qtqjgsdl5ZkhiqQDVig3oaLzCUm4fxzkxQNkqhbs6hl7AiqlaTDjeBggl3lCZ2g3aDnwmIraWj+9cT8E5fVR9CAkgx0I26HChIazv1TliUadoni+jbzudtVpa/N+n1IR7Y4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4531.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(136003)(396003)(376002)(366004)(346002)(6486002)(2906002)(6506007)(38100700002)(6666004)(38350700002)(66476007)(66946007)(52116002)(8676002)(86362001)(6512007)(66556008)(26005)(5660300002)(1076003)(107886003)(4326008)(8936002)(36756003)(316002)(186003)(478600001)(41300700001)(2616005)(7416002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aGZTePRUYx2edlOK12U6fbcw3OuBjTaki0WlzX9w3fjCNpXVT+xHzyklD9xl?= =?us-ascii?Q?mCt6hrs+J/CKHpXGnaocB9zZq/LO55ctGDs1pmj9sDSf3/OBB2ERyhAvLbin?= =?us-ascii?Q?8LyFgESdR8zZsjFKo6bCUeoYQZYVtXwPKUtgQhZwtCBPDF6tV8EVxPztWoui?= =?us-ascii?Q?jIhgsCqPLmNSkn/X/Pu515f4IPjKDjsJil6A0T/5m6xE2Q3aNiddo8FUIf0p?= =?us-ascii?Q?SOTt5YxaL5LPNfvcUJ+dfjtBvO79QtfQ+UjPGKTHBbbsKWZ7Db4B4VFo+taA?= =?us-ascii?Q?L3vOQ8GUtAASiBQVNu2n52e83v8hLPjikZLFs36p/+QCKN0+Onph9TgvNZSu?= =?us-ascii?Q?YVeIFhVlWoyRhFDFcC6oo1us1/fa9vsj2lFCyjEy1/tzft6YsMbDKpsBCWtx?= =?us-ascii?Q?2e2SJbbLTN9VFBPAVuEzJACQc6sBqnnaLMWDq0V7qo4G6F8hfqPt+NQq92ZP?= =?us-ascii?Q?85OPkf8CCkzyz4Bj4nAZtEsVr/HNhg04O0qOlDS1OdRvaYMBRIWURNn0VabS?= =?us-ascii?Q?U84UkeHaAYst8iJ78CYvDMAhC8kNbzE+ltUSIFPkSO/VFBmu4lEkvlNx6LTS?= =?us-ascii?Q?0bTDOkp+VzSh9NK32elygPQbp0TAWK4/JsO6fTspXB/FfzniZn1zELYwF9nl?= =?us-ascii?Q?U7+bLszOBA+p2+OZ5JugTyVaWPHRctJYXjuEfWmC05G9W6mGYXnjPMciuCx/?= =?us-ascii?Q?leId6YhqZ/vlJ3I23uaZHm9DjEVtVGiaNpiuftArAlr3T7RDf2JjuXvKESDC?= =?us-ascii?Q?+9tiPHLpy61CzwJ3wIctUKI2FnIAIbySIRq46XUDRLAUtx73kiv7zp5Wovyk?= =?us-ascii?Q?jrIdWHd8GpJWN7jsn7Lfxy8Rf4Lgubf0fTCUp35OrMPqpvb7CH4oeRCsfLlf?= =?us-ascii?Q?O3v4T+9/W0CRs8saUjhgwfgnUh6UY7tDG7AtuJIqN0iEaM2nRc6sTHgIE0rt?= =?us-ascii?Q?MXLcjA0kZYhpfesekjX8TlEtjBySEGqrkZl64DkU/w8/dKpnX6ZZFYjT/fCO?= =?us-ascii?Q?qAHumj08hm/TwqZas9xIggUgtWKQdufFgrMrakjPOJ+K/bX4JTwwSd4bnLaz?= =?us-ascii?Q?S9RiHVj7N8eH8l5yxFOXZP5Mc6HutRjQD7ne+xN4GWHcWTUNuSSurJL+aFPi?= =?us-ascii?Q?J27XhHMBWfaGpONiGPGJ7fi0lc5Yv7GBPINsIzfXEHwDJjki0ir+bN3XT9ze?= =?us-ascii?Q?0c/DvgKR+gKPsB4QyMCS7LZhVSOEFlx8+d2k/raGLxM51Da9/gkB7xO9P9ik?= =?us-ascii?Q?jUfFo9Nz+wMWmW3wY82hOU3IgDCD8nbvFr2v0bnVjv85BKdxthd6Whth5y92?= =?us-ascii?Q?OfObLdc3Y+BxkcB5JboJcFIo/OkqRgI/qK0mGIWbDZJuCK7znqqCfdy69482?= =?us-ascii?Q?F88zr1xgaZ/YufK1csKb4X/6RIIEzlJRgL+eu66s97EwCL53qVGYr/HnUe+I?= =?us-ascii?Q?JzqrSUr7aDyWcbfl/enbS0W+riFz1Ih3/aodDaTzXb1mKVclIG0mxQ/klnHJ?= =?us-ascii?Q?IKBG0fBzCfIcXSLHZzf1ZK58sICOIedhNzsL4CFgQezfg5H2tzyzVi91bbrf?= =?us-ascii?Q?xZ7d8VoYWda5RQOUR2118jiXs5btQPfVollpxD8RFr4D8tqxqY3bB4V0gODg?= =?us-ascii?Q?5A=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5560c573-2336-434e-307e-08da6b45648c X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 18:18:21.1889 (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: zBD3Ysi1K6pqyxcVEwgO+VYOXD5KS9xA1hzflnpEiuduVbVfSzhfyLW1thj4cMV0Cvxw1jlQhYsXFpagYJnOh1QGm3a6Pm3V4T7xF8d5LFY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3986 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-21_25,2022-07-21_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207210074 X-Proofpoint-GUID: aT46Ck9HfJSFJ8lL8g2_0N1gwX7Npyr2 X-Proofpoint-ORIG-GUID: aT46Ck9HfJSFJ8lL8g2_0N1gwX7Npyr2 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 fdad056d5938..73d81120c3eb 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -740,6 +740,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 Fri Apr 17 21:03:49 2026 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 60E4EC43334 for ; Thu, 21 Jul 2022 18:19:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232982AbiGUST0 (ORCPT ); Thu, 21 Jul 2022 14:19:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232582AbiGUSS6 (ORCPT ); Thu, 21 Jul 2022 14:18:58 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B357A8C76C for ; Thu, 21 Jul 2022 11:18:57 -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 26LIDtQF012515; Thu, 21 Jul 2022 18:18: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-2022-7-12; bh=BmQrU5p/PLs5hqIUHx9GkBTFNjhBQIJuRgS380i5Q9I=; b=NsUVtpon5sVSHvhfTAJPM77vDr1l4oNlauarhs7zF0MYJGYVTM7bgus6bYYa42hkudcd ovNdCIpotV/62DoyqTLnYG3jlyrwR/W123DMqohIj31o3q09XxH438A31VYeC/XgzwS9 gZkMxPua6RYuvomphOriIWPC7u1NiSe8JewNEeYLamBJ4YIEwW3r6O1zHo1ogvSZAsaI LG8cH1Xu0zWvD034rnw1XkddgH85u+vr0ZRN3NIfb0hJMFhxjxAy9P8cQjjknK8wGhjD jU1bZSqyPQ8hcijen0NnZPLY0aw0cvFRDBE/Kv1pD2lkx/1vH1TLC3o4GwShtcQ30GR1 HA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbm42ndfh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:27 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26LHps3R039297; Thu, 21 Jul 2022 18:18:26 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2044.outbound.protection.outlook.com [104.47.66.44]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1k70xqs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y4U4Mcwa9Z4txzTSvsjup5CvYo48WDV5tmiNsvL8NfYu+H8QV6xfNsXSXhvLVOwkefxKmnCTOcVVLCKmXUbRrvFup5uz/7Wn0rzcWBbTEWVuh4X0uWZdApC/Rymnv2jYqoDQ+N4rj3P3G2SZlot/caQP2r0sadWBW/Bw/Ng/doTdoXPygENmuyJixde4o4uP2UeXYTG8r6QL2792RAAptvyUY79whfDNh5cQ4sNXT96/A/zVnsqVTBEVOJlVv789bK+H7cMOY1lYWzEC/rJx7FiGdJvo81jl+7ZywM8SKLcBmXDyNfYec7K2K2RWuQoOlM3mRfWplmNGG+rxYnFtMg== 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=BmQrU5p/PLs5hqIUHx9GkBTFNjhBQIJuRgS380i5Q9I=; b=NmVwHcCyvJpH75oPSswCGfedCqEDho+Rv3kPjmefLuciBr9MAeY8yTRmIvCPXwy+PX1/sRk/D2VcQPn80FJ9NSIh1h/ZJpBGoCnsv7LTgwvHjyWn6eZR94nLszi0zfXLKJ0ZaglR1xD28DgIagjlyUjFF/Y33+lmeGwb9I90WLeWjL1j3SNnTses5y+dGBTY2puVz+y+XeajXYaeTJdy/nvrYEL9L7GrAJULa42yyBMtHU0FCEIjNpxXGqXfYhKanZjqEzP7959gQKBfqh1pE2Zt2ZUxsHIauDft8LjZM6s53mu3Cg43VEDWxYuSZ5MbfZxvJHpr9Dgmf9WFi7zYEw== 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=BmQrU5p/PLs5hqIUHx9GkBTFNjhBQIJuRgS380i5Q9I=; b=VF6Ttq/PhlLN5bjYN/QxaqZ/IfyzzzK8eclg6tH/4Gc9XS5lYXMkXLnJSFL1LNGs5eeiyC9mdrW2yrw6hGzTl/FgkZ3+KAebHNjT2dSlBhT/shlDmmqsn3XhbAYz+DwDa56w21a4bKo/6w+yDz0xvYl1cwVCCxvjhpISmKu8Mvc= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by BY5PR10MB3986.namprd10.prod.outlook.com (2603:10b6:a03:1fb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Thu, 21 Jul 2022 18:18:23 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d%3]) with mapi id 15.20.5458.019; Thu, 21 Jul 2022 18:18:23 +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 v10 6/8] kexec: exclude hot remove cpu from elfcorehdr notes Date: Thu, 21 Jul 2022 14:17:45 -0400 Message-Id: <20220721181747.1640-7-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220721181747.1640-1-eric.devolder@oracle.com> References: <20220721181747.1640-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR03CA0189.namprd03.prod.outlook.com (2603:10b6:5:3b6::14) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c55b6db6-194f-498b-421d-08da6b456600 X-MS-TrafficTypeDiagnostic: BY5PR10MB3986:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jAZVxOUacVPqeGxJqi970MIRppii44OsBafkoYeAtDGrVsywOhIKN+gzQvnTe40/1GPpVARBBvltNoiChIXigvChxlKz2h+EmsmmogtThXci4qNsl0RjRFc9Iu9cJzh7/pV9pjv/iYBWTDXfM6dbU/nbBhVzalvywqoj69TXc83+8f4wGivoKnAW8VsOfNaDcnh71PQAS1/vnJQpAUOpD/0qVQOCVvHS88FXIzqyX/x8ActkI+IbhsF4UraTCjl96eQhTxp4IkUBEAtYMU5FNzBmyRZx6WGC1+0/sXjk16v5yA2/Z40B0wbc4kC6j2Mthd9KnM62JtlUFu0UlSTV4WIbh+lTh3HdSy39tEmHn1a6PR+m5Ok54DYhmtyl+T4AbSjzcgGW5KowKpECbOg7smMhs/DmmqAhBY0PEKnjkTg6t8zXoGm+lopGBpEwrzZaSPsTBo8ndu5osETphQyteRWV9aOU+IBPuowAlxD9QwQ0TiTQY3/kO+owWH27/rNcePI1vwXamrznL2LgOfgWH1UAuDxk24Uysz+SscV2/Phn91OUxHrV2VQz++02fhQYgVHut+FxUOBFlA34Sve83KdXJQYx4wtveY58hstYoHzAGgw+PZdZ/c6omEykMkCecJ7DyrqQZ9OMJQcU3S4Ghq5VjRfaRnoBmnKqljq/KSqbvDHVYrFZsPavXO0u6Y9ieHgoJUbqNWDb+a77AJHIYjPY8U2mGHK6CwaFfPya4jE+5QlWHVI8y4NgkZO0H3P4iTeRdtat3rP5fNxhXRDdfJ1zboL2KZGUEHFEB4O/U9Q= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4531.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(136003)(396003)(376002)(366004)(346002)(6486002)(2906002)(6506007)(38100700002)(6666004)(38350700002)(66476007)(66946007)(52116002)(8676002)(86362001)(6512007)(66556008)(26005)(5660300002)(1076003)(107886003)(4326008)(8936002)(36756003)(83380400001)(316002)(186003)(478600001)(41300700001)(2616005)(7416002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RloSTocCfCMWlXvJI+hHKOXiBY/eIkST1Baw6yAI2t/898m5x/OLjyw5EqCp?= =?us-ascii?Q?zlDArWsuoLFN16uXVSb/bH33lmx7gnnfO8uSATX8ga/jLn+EIuBL9eHIXclI?= =?us-ascii?Q?lxoaSsdcTCXNOcom5Kh87OBp3M5XnTYnwY2/ClHIzPcCKbqTnVGXRq64S7QG?= =?us-ascii?Q?NWujK5t+4K3I8uxuLcdVVqH4jQXe4UWDQ8Dfyi9cIFGnhBb5gIibzR9+4NI/?= =?us-ascii?Q?f/MqJ2VvaA9dbPtBYegQiqN+33xSEtCH1AgP2vFFqV8iK2VGo1+zdu9Vjlzr?= =?us-ascii?Q?q3EB5OesAB367oTMiXPzv99xcc8ZyHfKlq+bczxE1rybwcOQ2aayKlQ1OXbw?= =?us-ascii?Q?16GYx1Bk65F6lwr4L0hh8ahVVO+LjH4SbDZb4e6q2Ladjayq0JevwknZnBYC?= =?us-ascii?Q?ok0rfRsUa3EZllHmj0da+1y2lLVPt5Btn9Px3h5eDfrSDweaxUZnfL0W5TL1?= =?us-ascii?Q?rH19JYdNYvmLOliJ9a6kU+ryPk9s0yuAhIOy01ZjRLUTOKW6k/sbzF6NZocb?= =?us-ascii?Q?7GsokQOfHE/PLN0objQ7D5mTEPkraITGpNwSprHEBli91Xsush1au9jX3q4G?= =?us-ascii?Q?yrOLttG5lQyphky347uN+APTmOKSYCc+KeEMfCRvfbUYak/WgHOaviWIyvgu?= =?us-ascii?Q?tN8uMTuV9VUJD26tVgXmjp0QOtzDQ4sGACinmqga4g1he48Qorc/exZLmcL/?= =?us-ascii?Q?HrLcr1JdUHkyckxyE5GZIxKX8xOIxskeOdjJ75D2nLwHQBwFP2rEl5P3OFqc?= =?us-ascii?Q?m63Hmyc2jdi+6mi6bixSaUJwCej8SlPmUtWWbrt22aINZj2FxlCMHghw/nbA?= =?us-ascii?Q?/vDkucto5jLWvpXiZ2mB+PeccJ93eaLzi5Xty0nHMhTX2Nr5fYnyubjmRWRx?= =?us-ascii?Q?b0vuab+cchBeC3W6Ib2r/+D8g4NRP62DntfY3mSbJlwXxrgNCuV1CvepkMok?= =?us-ascii?Q?nF1tMRjMKFJ8DaCqr/s7AyPmUcFY8t9nTaHSet9RCLGjrKjexfst4khNdMNt?= =?us-ascii?Q?djBWClSIHdkIQv69Io/8cEAmTXYXr6zl4Nt4foei5Ub7z6sBDZkkG88uFi9J?= =?us-ascii?Q?t8AOezlQsmMEDH2LkzusSWbliBjrILhWUf/EZA8uH+FIS/7ammP9SSgoSrhj?= =?us-ascii?Q?LP7ddPrnS1GOAT+lVz8E0pBAXhj7zXMqwbbtpDZEsXqBCnIx/t7t2ipb2Sh/?= =?us-ascii?Q?V3mG/owHTgFH6inJ73VjQnanHtAb4TXDLvWCrayaKtlGexrpYHTUgMVO8UsN?= =?us-ascii?Q?7EzxHtdpdjquo/yk7Zowq+MGJLBwRHX6x94ezFerihhfXUqVdOGCG6AW4FuL?= =?us-ascii?Q?9zJks6/pHIlq57zMMIWRo/BCYy92R6pXso0tb+VpzVCKvJOfHEEIVAB+046O?= =?us-ascii?Q?QZdInB5YLy2N1C4BqAbEbdvaiekqVy0BJ1146NdyfcMnObnvpEnXSPZ/f7zi?= =?us-ascii?Q?PwdGfUEuzSybgPIWmCkob6AP1hweUmq6mzk9Tm/Y8iNae31hdUdyPFk8c8hV?= =?us-ascii?Q?0Q8zzaaWmGCMMyxEdKBCmSgc0czrJvqJXxLGKRz6uDdxubvXBiKrXqlrNeLh?= =?us-ascii?Q?c25Dsv6ZEUWj3REGTQv1GtQiqavrkkZrhcAVX9VOjYhp2PXCbTQjIUKpKVkC?= =?us-ascii?Q?Cw=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c55b6db6-194f-498b-421d-08da6b456600 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 18:18:23.6106 (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: ffUrlVPjUNcIsndQo8s++iPoyA+FXmwG3XQqFad2WfbxuLiQA745/WF+1KDbfasWgILBACEJrgSm1PFXaU/vDurH5mFLCyTMBFO6Gf4VpSo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3986 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-21_25,2022-07-21_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207210074 X-Proofpoint-ORIG-GUID: SlYnd8HXhG70Vviw_reGeVOMaUZKuOdu X-Proofpoint-GUID: SlYnd8HXhG70Vviw_reGeVOMaUZKuOdu 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 154ef532d45a..77f5f3591760 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -355,6 +355,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; @@ -641,6 +646,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 Fri Apr 17 21:03:49 2026 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 41027C433EF for ; Thu, 21 Jul 2022 18:19:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232828AbiGUSTU (ORCPT ); Thu, 21 Jul 2022 14:19:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232508AbiGUSSz (ORCPT ); Thu, 21 Jul 2022 14:18:55 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44E948C74D for ; Thu, 21 Jul 2022 11:18:54 -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 26LIEm4Y025432; Thu, 21 Jul 2022 18:18:32 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-2022-7-12; bh=zrhAoquXqDnuqjTDDrnad7QTp0G6JFMJ0EmAzffxd5Y=; b=EUNhQqQKWqZphuQ7jirSnnaQEY0hcKfpB0e3+nwPQWvMleqTKCIwaPq2ezOCS3XMpNTP cqMsHGp28dDAvzk+hm8ev/K2l1djjCSbnhsOOtdP1EoTNJ1boUWjPGnxtKG81JjcHMdH ZBMLMZ7xYxpOb0FLEd2qyuXZmHmwhNrUdvxxHZ6p8hRYy9wgVHa3WPkHpEaVHgE7gGew Im8u/p+l1QjwJIKtKhkE79mLR4Rw0lyeYxq707FbBRZtCc6/pHN+Aj2Gy1QinOaPCf/h D+6KsOtYlRvafukjNL9NMmQ0kztHstvnCtBmTF85X7FMW6NQcz0f5t2tS74QT6CwuKp0 tA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbnvtne0e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:31 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26LGjMaq007889; Thu, 21 Jul 2022 18:18:30 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2044.outbound.protection.outlook.com [104.47.66.44]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1k5n75b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AyJKOa4qzX3zC8fgiPe8GsXRy1WCgc/gfZm2LpKH1NrNcmLFJ4xsfudMPBS4toAMvKpgmlbxV30OhwNaPWxWYXzLlF8Bml2RAl9EpkAzQHZlXIIGor26i6XYNprAuLXU5H14V8dBUrkWYi+/BFaPEBgIhqp0ea63Cyv6OlrhIByAN6iMnP2zRFVz/yDc03g8cNKGyquJbGCwWpjldVungH4gdo8JAB4FYKqiYombpMivRACTKrDi5zoPalhNMD6EK5hTqqO2f0G+gCGzvOMim2vrCRkipc2HzLfMfB32W9DN15mR6lzY/iaDUrBCnJnp4CIf6chnUDjerUyWM/Qpog== 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=zrhAoquXqDnuqjTDDrnad7QTp0G6JFMJ0EmAzffxd5Y=; b=ZKHrYSuVHGIZfXFzv8lCvE3JtELEuOMePIytqxzGzUJ8iWgD5YBVGRtYr9fpQ/WPT+1FuEZ76pxkePsXXmmhj6GtjeBSzsIFpWWkuXkiVoJOXbAeciRDQQ5Vsg0DbFwZCernIkP0Z+iVAbZx2Xf44jXDdTvhtiVDRHRxhIvQ1tMgcPM2npBoCtfL0Flqus9ElnT+tA6M6FEbb1T5UzxWWvVASc4nDkaOHI5dIVSZBlwPOFRbdIyxq2PnHKH0DncDdgon1qtiJyTURs/qR2UatzoGuYrfIhv6e/thPmKAkuVEE5ZdlxxR70d6EtCYDH0GeMc+1P+LgIKfX27dsezjKw== 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=zrhAoquXqDnuqjTDDrnad7QTp0G6JFMJ0EmAzffxd5Y=; b=krm4zocvCbr3ofkY0oEZZwvjfXnvAeVjNndoc98ToYkUQ2Ctwm3LUsiZ0og4fXSHGCHCPEmItETdorCZXAJ/C1TTfmcmpqOXv2Fn9rTjzjJK1FiSqIVVnsJhqK0lG+sdfYeULpAHN7pgPtOPucvASfR5yEZpSfzpPYXsvEgnZBI= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by BY5PR10MB3986.namprd10.prod.outlook.com (2603:10b6:a03:1fb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Thu, 21 Jul 2022 18:18:26 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d%3]) with mapi id 15.20.5458.019; Thu, 21 Jul 2022 18:18:26 +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 v10 7/8] crash: memory and cpu hotplug sysfs attributes Date: Thu, 21 Jul 2022 14:17:46 -0400 Message-Id: <20220721181747.1640-8-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220721181747.1640-1-eric.devolder@oracle.com> References: <20220721181747.1640-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR03CA0189.namprd03.prod.outlook.com (2603:10b6:5:3b6::14) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28a34b22-f5b9-4bc1-fcfa-08da6b4567ad X-MS-TrafficTypeDiagnostic: BY5PR10MB3986:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r9J9zeFV6fKohYPP/jgCJBbh+FfbqiQdw9eo13AVbbeGZXpo5WcCoAHOw/sOVmdTwUDEjQYVv6QhR/ds7tEITfw0OUx5rG6S7+LYpIkj5thY9/G0yBA4QIwVoT/rufSJNvHAJ5ZXz7sFGhlGtUdeJb67m0ne/t3Xhe9TUfCJ4z8WV/kv3hrk3mntD54Y/DvZCKhZKdNkBE6XGiMO46ES/zQnjiORY4YAnvrVYt0FWdR5akLECU/gJUAYXlNjFa3/U+6wLhN5kl0dcamgKB5P33OEOfT83BG6yAQpfBEVRLh85mtxDGoZYFKXApdaxunpdq2ICHKnmD5ZVTzrJ349YQwfttkJUVtJIl3/UizH6cyn3cipAasUCRt2FEtrlblh9/UAZxGOkDmJN90LHR4OlYdNZkddl7WUDGavSEFDuaNM6HW19BPJHY4s9gA/1I3wvRlOyHdWaPLEmzoLB6JP2yNyD84e6POo3+pOoq4mfPuTTn/ZfDp0Rqclncn2+4enIXZMOT7iK9qHvU3nwiM2hZHRwPq+d7xslTwwb2GDaP6teklJM6qI3Vg1U4zF4TO5smohMgDm6Fqlh/Oy2l1ZGSbZs6dkw8rW5e29jxad6CGivOn6t9hToC52XRs3quQ49f6U/Wc89hCC1XVV8erRg2ZLzLaEbrO79p4iw/fZPaSkrlLfPtqRw9MMCYyVRqthyvu7EwaN3QWiRwz+KRzuoZ8uOv3YI0iyNAjpG/SyeD3s5CocQZKhaUpaLMaLAqUGByZmmD4Dz575CsQ/NnfzkvU2ZUUUHJhCsJITq4S43gY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4531.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(136003)(396003)(376002)(366004)(346002)(6486002)(2906002)(6506007)(38100700002)(6666004)(38350700002)(66476007)(66946007)(52116002)(8676002)(86362001)(6512007)(66556008)(26005)(5660300002)(1076003)(107886003)(4326008)(8936002)(36756003)(83380400001)(316002)(186003)(478600001)(41300700001)(2616005)(7416002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/32Od0XFh7dv+tu08lWzPDeSi0Ipw6iP+b3yMiPrFUX5KfesTJ5h/cnAxJUa?= =?us-ascii?Q?x4hobSgO/mhpRcBIUNlzO7+SgygQxATaFNoh6swBt2y+Gr81e+4JtkihZbdd?= =?us-ascii?Q?9bPzDmuU0fspQbGDWdLl3CB7LJ9ZS+zP8uqSpVqf2zz0p6ulpzhJU0bRP68P?= =?us-ascii?Q?Gsj93SnZBNHyenQzDt3hVO3P4ds+lI3PXg2Ax+m1rqUzr79mk/O7XFPxl6Nr?= =?us-ascii?Q?edgOE4NafSYTfYag1bYARNo9tiY3ralrx5/W36PgNJQiOWURxtNTjcxrqfzf?= =?us-ascii?Q?+QFmn3tjnFpLw2Ao8a6ewcDWu+bqbGsJa2AKKH3AW61MWIM8w8NahoGs77Tr?= =?us-ascii?Q?YTYeIcy99I/geSObG4l9HzF8O06/RpEcK3dSWkifn35GuT4iF5gPTbv9Zyel?= =?us-ascii?Q?0L4Ido8c6K4mu5BeyndP1Gk8gSbrFae7VI45w6SIduAm1UaopzYcTQ/y3oSk?= =?us-ascii?Q?ZZfxFwE2ASYdCPyAvzJbmVB0PF7oDH2lAhVt+znhgGXP0gluEuxr5rjRfyx8?= =?us-ascii?Q?5U8SulKdjuijUiBPxKCvO6NcweLg5vxhdEIDjpJmb9GkcYFQx+by3UXgdWP9?= =?us-ascii?Q?i5wSermtmx5LVgJicdqOao1K6ylUmLjY6TRjwjXQ4DdXnQDrRCtP1sA/Gy1S?= =?us-ascii?Q?5++f5jFWXUhTMelH124r1CRmyUs37KP5YP9fpVVZW8FwK+xUgkeZRwqBXzhC?= =?us-ascii?Q?lzFS0Q75g6ZVh2m8H58qCAmBiK97G2x01aqgO9JzP/AevQ630hhtYJTCV9oU?= =?us-ascii?Q?mYj6MfSybBNt79ihGPB97I52/JTnZycVC131pDLbPDJEmlhMoxUm4/B6PMP5?= =?us-ascii?Q?QujMMRG0+i78eDkkrJLVdurSs2sRUQk9a9UjTmhV1+pOKCXYfNUrh2FDPYeG?= =?us-ascii?Q?i/mnyrtoCqbdTCx1ncBu51sXHA8TqMSIfnQSLXgVtsbUCG9lyZG+vcfvp1Ew?= =?us-ascii?Q?R5t+LnH1XDhIOSFB1FozxFKpMqxRdc4LVZ7RAE4xvRK6rRiCmUXn3XAhrThs?= =?us-ascii?Q?5RY/+ZSj+oHHEfARtHJYXH7aAgZl/pc037qBafUMHJiFhVVEGRa+tfsIw6pU?= =?us-ascii?Q?G5/c5DrvieWiSy5PXx9kICugNe2ARcXvis1lom6vZnKkMV+4VRD539QVHK73?= =?us-ascii?Q?OCQehx7Vz2sgl+yUk5twQ47xhcxas+aLHlrtg8ilAxzTHNggOCDE225LaFn3?= =?us-ascii?Q?JUIjr13UkcZ4YDC8Moxtviv9SYtHQMHnCKMpJg7DCWVJNAOsL5q4KsNhbF4f?= =?us-ascii?Q?sz7AiPWs0gMgeNp+F2iQG3oKgH5vfK2GN6saUQIQycFgmdBlh8kxXJzyhHWH?= =?us-ascii?Q?1+DImfbD0lfypyoaAZZsW+sLld1WVMe7vm27GUXd2etRfq2SqoYOZ83BdKMt?= =?us-ascii?Q?b/d+Sj02QUWld9LWC/xzVaxOa+/0N3jel/2Okk2qTT3rzvm5P3E9UyqOIx18?= =?us-ascii?Q?R1Wc3q/c+Z3h7d73C7zB2IWGy9TUeuOtGNw8wPXji7MiW0VkhWmux1iNV9t5?= =?us-ascii?Q?65hvBL4Df935HaV+6E8lRmXCh/X3W5c1fdJtUI58xdIJCyvTAOUan+3+wwzm?= =?us-ascii?Q?CUhLu6j2i32uafhudyLrY3DBuQTF00zB1P8nT3FjqW4IYtLRZzhU5jEvBnEi?= =?us-ascii?Q?kw=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28a34b22-f5b9-4bc1-fcfa-08da6b4567ad X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 18:18:26.5217 (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: mCwL8h+bivrfXOk4xFx2RfgdkKaFOhEeDIZ3pV+cwAWTfKYfC03Mb9cL/4GVW0ZjMfYw27zzbQv2e94nTRt6DgqrPIVwYjAt4BH+vXZ1JIY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3986 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-21_25,2022-07-21_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207210074 X-Proofpoint-GUID: TqhoZ-uPDHbiEAwpX5kUN-GZZqmzg540 X-Proofpoint-ORIG-GUID: TqhoZ-uPDHbiEAwpX5kUN-GZZqmzg540 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 Acked-by: Baoquan He --- .../admin-guide/mm/memory-hotplug.rst | 8 ++++++++ Documentation/core-api/cpu_hotplug.rst | 18 ++++++++++++++++++ drivers/base/cpu.c | 14 ++++++++++++++ drivers/base/memory.c | 13 +++++++++++++ include/linux/crash_core.h | 6 ++++++ 5 files changed, 59 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 4c98849577d4..bd470236d9a2 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -293,6 +293,17 @@ 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 +#include +static ssize_t crash_hotplug_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sprintf(buf, "%d\n", crash_hotplug_cpu_support()); +} +static DEVICE_ATTR_ADMIN_RO(crash_hotplug); +#endif + static void cpu_device_release(struct device *dev) { /* @@ -469,6 +480,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 bc60c9cd3230..63c1754a52b6 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_memory_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 @@ -887,6 +897,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/crash_core.h b/include/linux/crash_core.h index c9705b6872e7..3964e9924ea5 100644 --- a/include/linux/crash_core.h +++ b/include/linux/crash_core.h @@ -109,5 +109,11 @@ static inline void arch_crash_handle_hotplug_event(str= uct kimage *image, { } #endif +#ifndef crash_hotplug_cpu_support +static inline int crash_hotplug_cpu_support(void) { return 0; } +#endif +#ifndef crash_hotplug_memory_support +static inline int crash_hotplug_memory_support(void) { return 0; } +#endif =20 #endif /* LINUX_CRASH_CORE_H */ --=20 2.31.1 From nobody Fri Apr 17 21:03:49 2026 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 D3763C43334 for ; Thu, 21 Jul 2022 18:20:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232862AbiGUSUP (ORCPT ); Thu, 21 Jul 2022 14:20:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233270AbiGUST7 (ORCPT ); Thu, 21 Jul 2022 14:19:59 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD0048C8CD for ; Thu, 21 Jul 2022 11:19:53 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26LIF1cU023093; Thu, 21 Jul 2022 18:18:33 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-2022-7-12; bh=X/S6pKNrP4el80tjrrVfONEtmb7Ev2jNsZetiTysuHo=; b=tCicLtTsucVTEihYGLK8B8B6GPBTZ9EAWSDsk8XKOSSzCU/+p/4nKMCahGMPvG8XSQ6o FNEzWWUztAKxPwcAr+cZsLirEDjcz+HIOcx1PdIVAYSmXMz0uJYg39wnVGtgBFNzLVxe G444EMp90LelcpJOvtYGrwzaG7HDlt1otoFAzAowB9Ds6/lf55vE6hSxJ0zpeE6wXEET ea3RLzbyk8UtYf2mgac0Vj53dMMhhE3PJia15sYUZmvP51DiaqKUyE0NxjkS/tHn4JWl ITEzPgPt0ZvQ14S5ssEKiqeqlPp06RqPV7ZnkgBMiY3NLyEz3b1NXEyygkCbI1EaC2RT Bg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbkx15e1k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:33 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26LHHd9O010041; Thu, 21 Jul 2022 18:18:32 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2107.outbound.protection.outlook.com [104.47.70.107]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1gjs37v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2022 18:18:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eSAVYPWvPMb8vB5r7w9tTEqk92Tqqr+0I/HAhEjCrPZ20hR5wAQU+fPIeI1B+Y4EKuZ6wf3bXiQANg3o4RUhYd6TGprMjZ4dQvBz5risYfvgQrhxn7T6DXvjzav10w+RAJNLquUCfY8WY907hHAyRvuTCNdsZDsmO6tzfz6xBWq4M01GoPynY3pBJR1fnb5YQnvqeqKcm+CseGkyPmNH0aTlILei/OzQS5MSAtkNHS+ODmOVkVlKM4J7R9W+PqCnZ1VUzv+N6WyfdzfPq160GJ8vLHfv1xV43wIICQZmReQcT2D2rbfYDMIau4yZywdod8HrjdjppF2HNKcLBTMqew== 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=X/S6pKNrP4el80tjrrVfONEtmb7Ev2jNsZetiTysuHo=; b=eZtjYdnGyR6r+B+IH67bF47PT5HP5G8C/OCi8SKJmFfmktxUcBWWO3k45QQzQbIGYxkNu1Dfi0yveFHz3L/m/hMqRzqi6GTHpb35fBxfJ2RCga50BPupgajzqMjhy2ENnDoE0yJrWTCXfvZ6nodBfQBxXTH43iaIRtfJvsqEF21SKee92v2VG2p/PrRh0ljdUQnZ8v3K099kGGyaHwcivSB/F7RWtuH8HxZTiTEt7VLvmXn97vVbvpa6f8qa5SfioTOErLoOktcoY634v+qP83LGq4Y5ufg6uyADGwQCzw97lqEHPVXgWRpBPNanNJvf4S/K5yIliDlMVR3LXh3uLA== 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=X/S6pKNrP4el80tjrrVfONEtmb7Ev2jNsZetiTysuHo=; b=pHeI7HZqaWdDsba5esaquJxZ63F5vDlbyLM+iKNpowMqhHhBVuVikexPMCKprdWwXhfUo7f1Em5oAQG/C+vaNgRUR6jbIWROjoOtp2VZGKOrBy6DGNN8zS6mm/aHPVoY9FmfD5aJwGDgdhMe1d1TE+4dhWdMJNKmYiLpmPL1K44= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by SJ0PR10MB5517.namprd10.prod.outlook.com (2603:10b6:a03:3e5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Thu, 21 Jul 2022 18:18:29 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::747b:31f7:db5e:9e0d%3]) with mapi id 15.20.5458.019; Thu, 21 Jul 2022 18:18:29 +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 v10 8/8] x86/crash: Add x86 crash hotplug support Date: Thu, 21 Jul 2022 14:17:47 -0400 Message-Id: <20220721181747.1640-9-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220721181747.1640-1-eric.devolder@oracle.com> References: <20220721181747.1640-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR03CA0189.namprd03.prod.outlook.com (2603:10b6:5:3b6::14) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3387510d-92e9-4cba-dc94-08da6b456940 X-MS-TrafficTypeDiagnostic: SJ0PR10MB5517:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vUDb8suSWYBmcO2fUmybTGgMBlrmuBZ0qt3t1ORh3uyHwQSWfiVyZ19Ni59gxKSVYw+N8S2TzvTBhpo5wyOBielqBFhndn4vLWZ2C+fMGGu3+sCuzGELeU4xSOgBDDysWY1CB6kbaM1A30hqovqVbA3fp/2b44uwJRBUmDJo4b+Od71nwI1i+067IG9sSc/JU7z3s+yXLSbk07tX9L3vBZV796r2r4NZQgtZ8xDinJxi4PGqR2OZIbJbFTq5DTQAYVi/QXQ2SjXR6qxS0d69p+wSuKWFRQvpObm6XzAXwwVzSbv/VJI2TCCfAFTnzyqt1iU/mZ+uOv77w4zVSaMMMwqtr6VQX8dRFxTI+igldCy2o5/0RyWn4DsqMU7Cak/zjMECuZZng4X6hwcC/UyxM6EFFU2TY0zl8hJ6kB8QJwCi3U/UzMxdYkwAoEXOJGrp9ylS6tApFdpfLhFFPcduSx/luMuCR31og99kznPc689fhNtzIPy+fc4eCG60jnzQ+R1PHOfNRJr1MrHl8yJfIH7cf/gca8E1HgIfWDDgXbWe2ZyN5/g+j48zSuxDVm+Tkxl8gyx/DHLC0RQlsIcit8HElLDBh5GK80EiffSTEZ39s7uLJerTJx+JgH1zrfHN+Qc+aEnCdbqgrCN7+5LRUigxfN3//S29OOuwhYZc5ezrc4yGicmTwzWSGu2uog58zBELu7ldZtG2+R0uX1d8MACJpBHQy+Pq5qAVC78gGNHBRfmDfUJgshkt35Q7mGBIH+44DaNL1OztVoJ/aWg3Dq5yAHySdDdoo7jLjHJzFko= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4531.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(396003)(346002)(376002)(39860400002)(136003)(316002)(52116002)(6506007)(6486002)(6666004)(41300700001)(478600001)(2906002)(7416002)(8676002)(66476007)(66556008)(66946007)(4326008)(5660300002)(6512007)(38100700002)(8936002)(1076003)(107886003)(186003)(86362001)(38350700002)(2616005)(36756003)(26005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JMHa0vmrrxnM90b21nZxhhI38lZJWk7JXB92VC1njW9u3wLIYq5J1+NXzpGI?= =?us-ascii?Q?DQRYhK6KoSGUaIA2GlZmNe7zb912d9HDP+yR8fhzwcIfwcqoMIqh5yHHoNAh?= =?us-ascii?Q?2XWgbd+jp2A3UhF6FhCpDtwPlqN5UoEmD/xftwTxbH/eMM7fJm0BncXr+rvK?= =?us-ascii?Q?XzjktzkugpO0vYl7f484XvQFZvn9N3Q3j5Gf5zcW7fKC7+IIAgLtlPT2Euli?= =?us-ascii?Q?tgHa6UIdYmLLTDSxzzBQNDhbZmny4RE+vdZVbyDfudKLdpYxcDBMn5QAINF2?= =?us-ascii?Q?zSWrkL+6gzeP05K7oaZ8jz7lPre6fijLie6s7G+oY2h218GtJ3bBactub0g1?= =?us-ascii?Q?qPk8Kl8zUwYjOuAhwRvJeg0mGGljt5R2nalC8VyL5m7UqCcR1/oAe1WQbU0k?= =?us-ascii?Q?8W3V7UpWgMZiNVORgBs1bMhs3CF26Xt8fvSc9hrS0aef42x59Nm4UX6TD1L+?= =?us-ascii?Q?hiMho9vOAYx0ZG4ZhaCMTf4E/GvsQTxjeNk8XoguKo/sMFF1Ne32yTa//Auv?= =?us-ascii?Q?UrWxraTZzB9igc7zX4VPJb7+mbT4xUlTFT3Eqqv6KCUlLIZ4XyYsc41rSKAb?= =?us-ascii?Q?QbJwU4f8306PEiXt+3pzsyBSlTK6fmS154SLX0vP5akoWRM475vR3844FjIQ?= =?us-ascii?Q?bXbNrSxZB9/PdIyHiTjpN+UEwRMWprhOKJF3hpbovNKid3eBhP31iNrUKC3D?= =?us-ascii?Q?F+UEZM741WAgH3O8ofQySo1ON+TVsZvDtozDzAtP3rQXWqFRsi3luS+QEtdK?= =?us-ascii?Q?B0jz9uN6cmWrGj91q4PfXXn4A1il59+oWZcnudT8aUWeTB6UXR20xamqOtIu?= =?us-ascii?Q?KIjLOmZt2rKbcg3lKcUNQwc9SUfQzYkQe4OVmzSlJ0zud0IeUYDuboRx6KOw?= =?us-ascii?Q?zirGp4jvUEHni3lJUjqDKj2ElhA4uPbwm7AY41uhJP5SYnQJaHNxjtcA0UAm?= =?us-ascii?Q?afAeEHLHMrGcyGScXizIGdduhDMQDwdu6B1ENVqzcdXNIXy7hBNJ7j30iXvW?= =?us-ascii?Q?zYT7wib8P/aGAnrL0G4bSFTxkm1OpalyGJSZ78nxz6dchX0y8aCbr+mEXzT/?= =?us-ascii?Q?oTVcBH+wsg63sAVmNO7mkbOVTPGgXqqVgU/CA0x62TfJTQ5kCxfi3y5IZVj0?= =?us-ascii?Q?mAVYCfchIsOEQMCX969Vh0abAxT8TmISdmuUVM1sJZ35YDHf434mNEqSW1zD?= =?us-ascii?Q?X9QwFxG4jB9vgKxQRA0cc+ac5DxxiSdiuskkbRj9PEq/v/6eVYbRxPgk+2RV?= =?us-ascii?Q?9xXuRgIN5TwTqMULHBkxa6sJX70u5j4q2aiR3O75BW5Zt6x2J/vrYoM8mWoG?= =?us-ascii?Q?LnlJ/6OmtTXwEJcCd9LoSLc50VrjHnrsQqQZW0LjcbGhmxAtckCIpnHPD6PJ?= =?us-ascii?Q?73eJzTpY5ufYsq1L/jhjD18i3+kCCVdp42UupiFn2r6NG0geys9B0Qx8W1rA?= =?us-ascii?Q?LwN8wBDI6k2v+s0N37ygxFof/BtrbONZVE/FgLITxsJj9YDWACBnl/yd3pqW?= =?us-ascii?Q?TqekHTGesIQWVymsn1EmnIs0lSwpCFN8a2jz+aTY+5gl2RbQSapzebdKjf7e?= =?us-ascii?Q?Y/LMSv0fhc1XmaMg3uPu0LTQt1d+WW22PZaDJK5nsvSUkONU011vmtmUmjj9?= =?us-ascii?Q?dA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3387510d-92e9-4cba-dc94-08da6b456940 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 18:18:29.1307 (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: pTXzvYZDQ3DGuyR9XoVeZ+W5+ahKQqbpPwFA5qt+3NE/SsZ9NnOrfOaRGklks9af8ZKVwEnIhl92kyTymCQQRy5cB1WsRMPnjAjAGRjdgIo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5517 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-21_25,2022-07-21_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207210074 X-Proofpoint-GUID: C36tz-4g5glyxp9eensFvMOlOWbS4Icx X-Proofpoint-ORIG-GUID: C36tz-4g5glyxp9eensFvMOlOWbS4Icx 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/include/asm/crash.h | 20 ++++++ arch/x86/kernel/crash.c | 115 +++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e58798f636d4..bb59596c8bea 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2065,6 +2065,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/include/asm/crash.h b/arch/x86/include/asm/crash.h index 8b6bd63530dc..96051d8e4b45 100644 --- a/arch/x86/include/asm/crash.h +++ b/arch/x86/include/asm/crash.h @@ -9,4 +9,24 @@ int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params); void crash_smp_send_stop(void); =20 +void *arch_map_crash_pages(unsigned long paddr, unsigned long size); +#define arch_map_crash_pages arch_map_crash_pages + +void arch_unmap_crash_pages(void **ptr); +#define arch_unmap_crash_pages arch_unmap_crash_pages + +void arch_crash_handle_hotplug_event(struct kimage *image, + unsigned int hp_action, unsigned int cpu); +#define arch_crash_handle_hotplug_event arch_crash_handle_hotplug_event + +#ifdef CONFIG_HOTPLUG_CPU +static inline int crash_hotplug_cpu_support(void) { return 1; } +#define crash_hotplug_cpu_support crash_hotplug_cpu_support +#endif + +#ifdef CONFIG_MEMORY_HOTPLUG +static inline int crash_hotplug_memory_support(void) { return 1; } +#define crash_hotplug_memory_support crash_hotplug_memory_support +#endif + #endif /* _ASM_X86_CRASH_H */ diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 9ceb93c176a6..55dda4fcde6e 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -25,6 +25,7 @@ #include #include #include +#include =20 #include #include @@ -397,7 +398,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); @@ -412,3 +423,107 @@ int crash_load_segments(struct kimage *image) return ret; } #endif /* CONFIG_KEXEC_FILE */ + +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG) +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_local_page(page); + } + + return ptr; +} + +void arch_unmap_crash_pages(void **ptr) +{ + if (ptr) { + if (*ptr) + kunmap_local(*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