From nobody Mon May 11 05:34:35 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 7BF86C433F5 for ; Wed, 13 Apr 2022 16:43:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237009AbiDMQqI (ORCPT ); Wed, 13 Apr 2022 12:46:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236977AbiDMQpy (ORCPT ); Wed, 13 Apr 2022 12:45:54 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E54C967D21 for ; Wed, 13 Apr 2022 09:43:31 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23DFXJU2012784; Wed, 13 Apr 2022 16:42:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=ZgkuZ8r/VymLdhLJB2PMa9DE7jwyd1kzggyTkOXJs4M=; b=fgkcK0NyXPpEH2V9VpFCA1ccEUsofW/2j145eLTwY+u0UZf7DTmAjlerRcE9k2bsUGWk /wBUbD5J9rBxFmIsn2zUa4GvoI/z++spNg297z9Au9RRsqt03LBH9tnlDD6kuLb62vZe Yt7Ynqm0Oly46M99C4fBPYIBjKWjTgmcV9PeulsypKPeKlhR9Gzd/QYEdmKO3rnlfJch sFJc9cv8ucCmEXzEdojbtUlgM7PHqNohrNOR0BlFCg6Q1IXvbPJcwokSWPYgc/2yE0kb I6QHGBWx3ceGSXyV3A0DlmwZp687bKbte/493WD3zzcZYaFl1pRrg6dX6kI9YTtDbCEa YA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com with ESMTP id 3fb2pu2rax-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:42:58 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 23DGRQLC008425; Wed, 13 Apr 2022 16:42:56 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2109.outbound.protection.outlook.com [104.47.70.109]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fb0k45r31-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:42:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OBPC4XBOjQDesXd7S1tjl6GFAIdveYfA+IZoO8D+2+N9g2SQwsMkLDPNV7eoW91qs+cWJql9xtSrYu9w4N80U2KJZn7DJjm3pUgilpc3HOUj1Dz2WdP5iQ7fd10KI+hSu47uHbitUkg/b8bY6daKXeQK+K5F1RWxYiIbmBIrY6nsHqZQKyv2v6MTVVDZmXut5Qqm7E75WvnD9bTnJsgt6PMe1Ouij8uTHMEFdeX8wdP8qGAki4NGD6fepLcvQ8MC9g0ZxHYZun1+ZCsUcbELvEJH55XzEgK4LP7LMF3PIgi7D/U3D4lMKxtFNaoeAW9/eCcTpNIROHu4c8TnMmb//w== 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=ZgkuZ8r/VymLdhLJB2PMa9DE7jwyd1kzggyTkOXJs4M=; b=jOZ93g3FvlNZStN3rB0tZ7uEI/AOUmjDjOJqyMkw6y2LnD+BBx8pIjWpxFfKyQGqp1v3fYqQKB73PQk7lI6+dW4sM2CprBTtuS1WIGIopG9kXCc+ZDLZgr3lAT9mHQMCfgDcTucQFrVbRRZXZx5thu1nnvgMKLom+AXPnFN9Mw2qCFQKrEDntFulBCfBnLwlC1HAd8XFc+ZVsCMLX7ttwHY6a23qY0RCvdHr9PtTOMw37XqKJGVCOboT3CHtKG6jSqYF2uVhtLIpHaGEhlxJx4SP5nN0TOdx7HU4Ab6UVT4tllkwAXbaVcw2ZppwdgVi5TxiHGcx71gYM3KL9/x6pQ== 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=ZgkuZ8r/VymLdhLJB2PMa9DE7jwyd1kzggyTkOXJs4M=; b=uooCY0b022V/POSlpBjKRsvqE6BFKxWJzmKNa4Gr0fy2Ehg2XzVjC/cTiMK3dY4/Dgfhb336z800dDsHyxuYTauz9zHaUDXq+pmKyh6fK7+EtuNMuBeYA5xrWLURCdMvoQtZcHDHDgnD+TA+/oY1voSIimpUu52WZpFFoiW1CjQ= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by BYAPR10MB3560.namprd10.prod.outlook.com (2603:10b6:a03:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 16:42:54 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c%3]) with mapi id 15.20.5144.030; Wed, 13 Apr 2022 16:42:54 +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, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v7 1/8] x86/crash: fix minor typo/bug in debug message Date: Wed, 13 Apr 2022 12:42:30 -0400 Message-Id: <20220413164237.20845-2-eric.devolder@oracle.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com> References: <20220413164237.20845-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0024.namprd13.prod.outlook.com (2603:10b6:a03:2c0::29) 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: 1bd8d276-be0d-401a-c573-08da1d6ca81d X-MS-TrafficTypeDiagnostic: BYAPR10MB3560:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JERVDt3/ZY3xe5Xl7QfJv3SaDKV84DiInywtpRiQrlvSta5War3MYacrOJuC30fxdeWasnIR9CgvNUQVVLXhcDGSCx/srdWh4LG/5YO85zSlhPDdjXRY6S7c00mJbcsgTLhdRleBW0dx5UOH+o6FtU3xXgOR5nyR+wcO47oSapCi1o2u/LOaWjjljRI8PxWjQ/Lj9nAwHEPIxI1PjESHtEHkXpBDxSwSdrYuMGYesyFQiPyX0hhgbv8BfARm7gUnTdrt9M6o3WYaKPQxF1hNaO7nHBgr2/BBA5ZWZlr7+Er8FIbhokOsk3iBRvDP8c8E9gd42/hrGrLsGbbV037/UepywthPpj3z14ZVqs5if2GXQw/CqpA35jrgeNpOLJik/3t5Cqg/rTYTEjX1yqfykHLQRPcR9PhNpdnuUC7E7Ftx8iUIh/XEAiw11m0jVnzQFAHOOyvD6/Xf9TGlhQniki52TMydGyhc5QYISJTECT27kwHp5qddaWLLiVdVQPy7dVtSRs26Hg2K8H0+hH67y8j0RSMlgJOQr4ZEWAVblhar792SLAK7IqEGg3e5FspAygQJ3U2CeQlULXc7zXjtBtFjN6ocCz9wWOH+NI28wTyvKnk6ELzb4L4irkbQtFL5t/0PeSwNwd3RuByPx8y0Apu6NeI3/lSnejaXQdz4fibwNPS3r9+Fzh7qH09XoCe4pCDEj3zrlZ3hKs0PXyAa2Q== 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:(13230001)(366004)(6666004)(83380400001)(4744005)(38350700002)(66556008)(36756003)(2906002)(2616005)(6512007)(86362001)(52116002)(6506007)(38100700002)(6486002)(508600001)(66476007)(186003)(26005)(107886003)(1076003)(66946007)(316002)(7416002)(5660300002)(4326008)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TwVWrxPyCFyvbG6tHObRn5P3Zt8iipKzTLxXl+xNRxnTWvspR3lVo8scjikV?= =?us-ascii?Q?Yk2lgYHxfRbqfYNoWC5e0cW+7n/vlbnRvkIcH+VvNQqHWdV738QEUyR2N2Zq?= =?us-ascii?Q?ogV9+mj2Uuzod2rgL34DKxLG/85AACZmM27xSLL83iFuAaXkS3kDgC6r+7T+?= =?us-ascii?Q?jMXNsVhLioPaInm1tOx3x3wn9vG21OsSSCT2vInsc5Sc2CAC1I13c0A09b6N?= =?us-ascii?Q?a67GmsLC8f/ILQ+dqt7Pfg2/EaMH08Wk9JI5gGIGakEYjoXm6QxoYxfhhVhw?= =?us-ascii?Q?qrq+Ie+Mmlx3k3ROGJr153uL5xd+V2u+tE7+ylQY5MRXv+dKihRQLByfjxxO?= =?us-ascii?Q?1HbB0CelkCjl73NDzql3znUaZ+5+Hpx1qdFjdTVvPCLJDYl185rbAqHfvFI8?= =?us-ascii?Q?LvQHJjeEdGOtqEDK1uApbBF0oxySwRkNE1iDZHMJ2KzpclYFyMUODma4lrfz?= =?us-ascii?Q?uHEk73yUhSDgyZE+OrHBWfqt7NeGAntzz7DhPNkO7nD/qK/ARyVyhPX9DRqu?= =?us-ascii?Q?J85zG+hBGiQ63FPtMkvFaDyyRFmE10y0E99TXJkqVTPm85hbuT+2CyXPJbNP?= =?us-ascii?Q?Ci5KCeBT0M7mYJgtouuOaDFJemJSu3Imh9n9mHAh0TJWL8I5BzdmR+E6LAan?= =?us-ascii?Q?n26ti7BYcw88Tn/UyaLD/pZt4QnktksGGlLhHaf9BS/wTl9aASH3tUlOww2d?= =?us-ascii?Q?XJa8CDZ9JYO7reo4GzjgYOQRP0XLETnFRUHTJcZV2OBy3dMd250yfe83lQJz?= =?us-ascii?Q?X+L48Ldd8btf8db2hNRhBYSxeYVfyb7ZCGIhZ0iIZBW2RoCy6bKahOBMcis0?= =?us-ascii?Q?14gtEzYrwcw9hsODW89XCMtlwScBA6bSv1D/xK+4iS/9+OlaNLaUZgjUBBec?= =?us-ascii?Q?/S7M+aDlveAd1j+TW/KlBVXdwV+L4mmSScqJMK/2strlIZR04WlPnaGp+h6/?= =?us-ascii?Q?6lyqLQBfKjQ5QrOfooKgmRJcRT2oPYxnxRNAJATry/MttFx5sAoU1W7HmY93?= =?us-ascii?Q?zzuqn+tdiEfCOM8Hm7aX0MdiBEATkAGUnz48FUocabnvO7F/zTKhf3K1eaHi?= =?us-ascii?Q?Oz8xmZ7uz2FPemnIRcSShBsR03X25FnxRoRoHk7PAPt2+Y4a/kkqOaa7UpRi?= =?us-ascii?Q?iqgqfO9oegBkxGlGbeO54l2UkNl+2blExK5huubzIohHWDwNRknLBqHoOKwn?= =?us-ascii?Q?R9hJYTS41/b212V67bKBUDFb+16H5x5VY2j0/sCnhPNIytOljZkEZtCjgP3b?= =?us-ascii?Q?aSQ+/LgVIka80aqnA2OH8oIOOGR1b41cu0AeL7H+aK5dzGPprxx37ioqEHEZ?= =?us-ascii?Q?d42YDur41VtYOLuPBdk9zmMP5HaXjVR0goXAOcaUIk+KyRp4Fsq58WS4VbnF?= =?us-ascii?Q?vpFUo45IlPJJfMVuH7Ai5v+ZAmo/RrMoIzN55lSwb/c1Cw6kgT4GK560lEPc?= =?us-ascii?Q?1jm4Vd56W4en9gSwz8pgC2pkE3XA8lwb/OKsnV6s/NMc5RFWuY4P14IejI9r?= =?us-ascii?Q?pLYiSpG1yf99lYRXBgM+LOCPK1SrR/V2SOJGqwpxj+JRh9qNFQw23gUpBVjT?= =?us-ascii?Q?h051K8Ak9b796NLAuG/6OOtMqCgQH14WbzXma2Le3L+5L3aTstacQ7g5mhl4?= =?us-ascii?Q?5nSA0KcLeA2zCdcR9Z3fFqu0hUILHnyRrM0MNuS9OxvwGdYoPmjN15b0gqfT?= =?us-ascii?Q?8lYGWsSYxsjUMH1tqOE+pEcw7XLHqJO++u+qDrEArcRpMe9tOZsUk4NyBpVr?= =?us-ascii?Q?bHnwhxCKdl6+PIivOvPcuH48KUUm/V0=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bd8d276-be0d-401a-c573-08da1d6ca81d X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 16:42:54.2105 (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: L2aM/RV5AxW1wcgsM+vSzV6TNGm1M0Orc9Wzk84bwsUGPKzHJ04kzGKRLPTFJWa4BMVm8byw431+SSnzxBlmWxZwcyWYn74jLDisd3G84dE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3560 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-04-13_03:2022-04-13,2022-04-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204130085 X-Proofpoint-ORIG-GUID: vzi0pRSwzQwiflG9BNTHUKKkgvmNkE57 X-Proofpoint-GUID: vzi0pRSwzQwiflG9BNTHUKKkgvmNkE57 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The pr_debug() intends to display the memsz member, but the parameter is actually the bufsz member (which is already displayed). Correct this to display memsz value. Signed-off-by: Eric DeVolder Acked-by: Baoquan He Reviewed-by: David Hildenbrand --- arch/x86/kernel/crash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index e8326a8d1c5d..9730c88530fc 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -407,7 +407,7 @@ int crash_load_segments(struct kimage *image) } image->elf_load_addr =3D kbuf.mem; pr_debug("Loaded ELF headers at 0x%lx bufsz=3D0x%lx memsz=3D0x%lx\n", - image->elf_load_addr, kbuf.bufsz, kbuf.bufsz); + image->elf_load_addr, kbuf.bufsz, kbuf.memsz); =20 return ret; } --=20 2.27.0 From nobody Mon May 11 05:34:35 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 459C5C433F5 for ; Wed, 13 Apr 2022 16:43:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236984AbiDMQp4 (ORCPT ); Wed, 13 Apr 2022 12:45:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236963AbiDMQps (ORCPT ); Wed, 13 Apr 2022 12:45:48 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33BA066FB8 for ; Wed, 13 Apr 2022 09:43:25 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23DFO6kF001710; Wed, 13 Apr 2022 16:43:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=x3g7SBVWBsz4d5J/+85eJ8vNfcpZgP8i1ChIRu799hE=; b=h0jeOi1tmbfRuhLm18lxULS2M23QqUleuQg260usdGrThcQIwPo+UT5X/B3pPzzX2ndn VhTP4m0y4F7+o3z7Wft4XMRLR5k9SaSeDTPG0gK6lvUhwHIwkG1lQBldKSmSmu5Vwoam JL5qd6tGooqCu8ui7qH+0miRV7xsMpgbnOlonANAEY/DQUA5Szh1s/7fE3TiUzBWorW+ 7QTGFdZUEXEROqp06fNk+J44HgDtP7RZgfWw4D9u/I9uadN/dOCoamfqCODy2XLmeU51 rNG0aec+RgT1Et87lCVo0kxsX7IeC5F6JRH+jj7ifKqjAPrEfK4XPYVUEsSa/hM8Aapc Bw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com with ESMTP id 3fb0x2jjcy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:42:59 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 23DGRQGP008426; Wed, 13 Apr 2022 16:42:59 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2102.outbound.protection.outlook.com [104.47.70.102]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fb0k45r4n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:42:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T/QYNB9oHj5M/zefjoZE6jN5l0giMzJ+zWwb6yLGCmHLATFHYC/WGAWMmxeycMP1YBSiybsiAjbKgX+CGk5fIxraXFkbiCIO0pefoqT30uBOW2vpx7m7w7N7FqwBpy/1MSpQvC9keuWEhS2A38+/A8T/gblsvJ2R74f8SMYig1VVn253LHtBh5x0xPP013n+SI4AQC4KHQEwQ9JaMPs/o6sQFJoZFTNrAR6yM1rQO5vpXv3EWYM7llyHhYngwU+XpW/u/Lwu2tn96+rFYfSPJLDRFxVVkZGGezdIHtFyxNe3603yapcHJLEZa57AHKmzJCrDeSW773JIj9nwpK/Vsw== 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=x3g7SBVWBsz4d5J/+85eJ8vNfcpZgP8i1ChIRu799hE=; b=csqpB7yaUvV0Gbebq0lTs3wS/gTgISGklyB1uPq6TtBxGAVSG/60aFDEcqqSWXAVSVGzEM6CxPc7GiRa3EuPoVwe0TiwFx0P3vCmmPtn5NC8VX3oU/tQmtmnGOw6LoM4h6oruNxnrmPVaQEhmt/XVzjfIPr3O0y3esg5yrSD8BkLcNGEAHGxekqYziz1bPQCEMvzRA3CdmERP+vx6IFBxExnhoTywKId4U4utz5doZOaql2cmTiU2Tq972zEsKmru4CqQ7/E2BgJSSp+PY2smfyJbiE1mjppPBqatXEALPLO9hemSm+os7VjPbzy1dqubJEPSqrSiiKBS33krdKaGA== 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=x3g7SBVWBsz4d5J/+85eJ8vNfcpZgP8i1ChIRu799hE=; b=AI4HJfmVnWQ1C8lG9CPoQVvn27ubxD/0ZuqYaXt+gHkwD+ONd144EawUoqRF+PpDN5SYoiOXbqOXyRnC7H3d2zk898E+wOXgmB/hAZeDso3f20bTfBkA+UZV3sAFzETf8VMlD+QvfZqkycL+HXQu4OuAlShmicF5P0ZJ1FXaU2k= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by BYAPR10MB3560.namprd10.prod.outlook.com (2603:10b6:a03:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 16:42:57 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c%3]) with mapi id 15.20.5144.030; Wed, 13 Apr 2022 16:42:57 +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, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v7 2/8] x86/crash: Introduce new options to support cpu and memory hotplug Date: Wed, 13 Apr 2022 12:42:31 -0400 Message-Id: <20220413164237.20845-3-eric.devolder@oracle.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com> References: <20220413164237.20845-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0024.namprd13.prod.outlook.com (2603:10b6:a03:2c0::29) 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: 7daa0f9e-4da4-4d92-aad3-08da1d6ca9f6 X-MS-TrafficTypeDiagnostic: BYAPR10MB3560:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gulJ4lHNdU2CY7y6ZfIIqGZ0GB4hES5xlAagThTyB9712zAXwginTrEUqj8QRFSO9yeCft8jjVuQJq6+dvvVv8rok4jg23imrzP4YY8DdpElhQb+qezFb3kAC07BVS9tDUJoawIqpeNqJJR/tfkM/ojxSERTdaFOfPr2WFB3+GH9kxuYUsAAbGCjOZkhEfJjo8zalkY4H2xw5o9G3gdtc43H06werDbf4LnyVlmGYpAJuktOoiMtI/jIOdy2GGKu2TmWN40XhhKdWACwdpgsgLY8iuU4MvIcRnHRVkTbY9RMMXPuqe9He0upPw/YEslwiZLNULlrC4dV5mzVpV9aBUOn04dYpckzDw7VfbXh5fGvuUce/XyFeZuFTRqdUiRjjikhLneeRT6wpXVWfF7q55Gu3MTRthZl40hZ/hhN3YgCF9mdfvf7cf61F730FPyT52pFes+RXilV8qApRiazyT8BliU8YIJOqKQzc7tyK17dtBlSFDZPtby4UxAX2DGaWdWa4MSGg70GVTlkFZVT+n6vIh9W4i2UQNu3zKLEPDsDpXWb9bAyf3uK312vz+Z7ltgHYC4kOX6ZaEa4/ErUFaPzGM8CuK+AIZARAg4hmAjs4S/lKxhO29ABXZaA0PWOIelBBEG7kO/ioVldvOm4HLIU/+ePD2MTPaJn1MsKzvC+KZIi9Z6exjdtPxPxWw2ts9cpn5KUGRJ5gzGeWjRP+Q== 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:(13230001)(366004)(6666004)(83380400001)(38350700002)(66556008)(36756003)(2906002)(2616005)(6512007)(86362001)(52116002)(6506007)(38100700002)(6486002)(508600001)(66476007)(186003)(26005)(107886003)(1076003)(66946007)(316002)(7416002)(5660300002)(4326008)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dXKS5jihoVDRCQrWzmg9Nsw8waiZnW5V7FLn9/VWSav/kvw2+OcwbN+Qbd8x?= =?us-ascii?Q?k5vVy5CilDPF8r+JePLjdw6BJPFUerrUX6t2pV1K38hmaFAiNQ3djtkWrXkz?= =?us-ascii?Q?/vySC9VWHkUDETmy43+r19+/ddRMTY5pMONzYomU0v3tn3+Q8pS5e6lbaSgV?= =?us-ascii?Q?rkC/7Jufj6TYSdGIIu6Y0tihldaGGnIL0FK5qA1FtHYK+B/Mrwr3sFr6z+c5?= =?us-ascii?Q?1Zfm/M32fXaEs7HPelA4e96duT9mBNit9CxIGtwq4LYb3l/1QYMI3dey6Ydk?= =?us-ascii?Q?VYX4gYVn2LDVvGO3AaHJXVUvh7B3MEiD4kIptzKzZfo0SQudPg7g6dLO9Zx5?= =?us-ascii?Q?t16Zlnj239xiMsD56MYaVl+viQQylYys7WG04D/4tqo0ncG9b4W/+GXwgwbt?= =?us-ascii?Q?KIRpsllXhakY1URFtSEwXWHvBpLH4LLWJq4jnfUkt2rb+TJ0RC5DnH7FJZR+?= =?us-ascii?Q?YtXht/UqageRuqlL7p9efKJyvCrrG+o4iTRE49WGGXAbpXeLVMe4jAJUs1aa?= =?us-ascii?Q?w8wHS6DI8ROwsNc+y5M6WSVO1X/g29P5djz4B9nlvan0HU3ZQspz4wcadclK?= =?us-ascii?Q?s4zezvcKqDRY3jjkdLBv6cAzoItsBfZgi3gyMB+typUZf7a2Tp8NG28j809M?= =?us-ascii?Q?8QgJGt+uS2KVqLJeggqUbwbEyHJu0iYjx5iUAiHJkeQCx4dVajLoVWnZRznG?= =?us-ascii?Q?sUDNUyxxkreclU2h68o4/56HxFGKnwFbq6dSBCClExE9SsAPZ8oZedXxEJCU?= =?us-ascii?Q?OpyhgGi/vIJulZ5sqRGE1ethykd9b22trTQW0Qi65wg7P0J1ju2gC/Z0vO4t?= =?us-ascii?Q?gObfDwqeLjhT7X2i7sQDvF5xr14QsVjtJebDuhBy7fQPdsgTEsfB7mvjt4AS?= =?us-ascii?Q?BsKB2Ar3IfgyxAuG9yYwfBQK6SU3BQ2PZsXeWR/bNXedlkaMMgWmbJso3Ux2?= =?us-ascii?Q?jepVjjNaWsL5vPaDsihP86IeiBMg9K0q6EI2WSTF/sByfzeYDbZDAOeM/wk2?= =?us-ascii?Q?4xz8xK4nNv9NtsfNK9PTdlpt1943eGbgNWHcTkTnZk4d0UwWvRTK1kdFsSwv?= =?us-ascii?Q?Nv9nPlHktGgvOMtzSp82QfzO2ahSVthXPqA5KS9xx2ZsQrjXx9k/EG/3rde/?= =?us-ascii?Q?zN/se/IQ4lF26lWS6u/aAuQ0OrH/X/NOBbzE+fEZKAuIJEbUEzikNMhtpVNB?= =?us-ascii?Q?qOJ7iliLs4n356BjNSdQq9KeNtK6G8ElSKkdxdKlHnDqe8d9kPp0YXkM51cJ?= =?us-ascii?Q?2R5BR7xEWMmgNSXndo7fqQ1n0k061x1u6yKptwFByK3kUfoHZrz+9aUwojj6?= =?us-ascii?Q?GGWJ380vnxr2a0cp145rI3h/CK7jCwNGgI8NTzqcHy+fcnHHLGEXFCEpd7RB?= =?us-ascii?Q?8LECCsZJJOqZBz4Oj8RPj5rICPH7Qyx+0VK/Wl95gOj31kUS2T9I+sv6JRBv?= =?us-ascii?Q?TDFaQhTl45/gwgNxNJrnpt7X2MWaTp8XA5AR3XbQZzYKcrkr3H0eSjx//K41?= =?us-ascii?Q?sVH1ySU6FcUU8BziGF3FiR4106W0iIcz2XRIWSphOXbdmwMljxN8OA6yE49b?= =?us-ascii?Q?CsK2Pu6fC5Q4gQxqp4MZDhwjhANKHVgoj9VAAcZXItaQu6MC7GXnXAz3ANn2?= =?us-ascii?Q?dCNjx4oryGikocRv3UYeBIJ6eq5si40PQtn6M4qWHqtWkzmQBQK5YnQLvpqA?= =?us-ascii?Q?FX9aQq92O7Fp4JU2bCQiq/5koizcQvPJppS7xrn2/1EbdsRQfo6hCCB4IV9S?= =?us-ascii?Q?saXsJZMJIWyS0QkSY23Umdg3v+NMVQU=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7daa0f9e-4da4-4d92-aad3-08da1d6ca9f6 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 16:42:57.3565 (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: qVSccINGLeBnjLfUZGDbTdOPZoOb2SM8NR5bLezd12ucaarxwhv/TyaOzloHMo40nUsUJKi9x70jYBjUHE6lisPSs+qYi0hKyzbo/yEwus0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3560 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-04-13_03:2022-04-13,2022-04-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204130085 X-Proofpoint-ORIG-GUID: Snv5fQ201g4woth129-pXydFnZgGdjhO X-Proofpoint-GUID: Snv5fQ201g4woth129-pXydFnZgGdjhO Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" CRASH_HOTPLUG is to enable cpu and memory hotplug support of crash. CRASH_HOTPLUG_ELFCOREHDR_SZ is used to specify the maximum size of the elfcorehdr buffer/segment. This is a preparation for later usage. Signed-off-by: Eric DeVolder Acked-by: Baoquan He --- arch/x86/Kconfig | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b0142e01002e..f7b92ee1bcc7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2072,6 +2072,32 @@ config CRASH_DUMP (CONFIG_RELOCATABLE=3Dy). For more details see Documentation/admin-guide/kdump/kdump.rst =20 +config CRASH_HOTPLUG + bool "kernel updates of crash elfcorehdr" + depends on CRASH_DUMP && (HOTPLUG_CPU || MEMORY_HOTPLUG) && KEXEC_FILE + help + Enable the kernel to update the crash elfcorehdr (which contains + the list of CPUs and memory regions) directly when hot plug/unplug + of CPUs or memory. Otherwise userspace must monitor these hot + plug/unplug change notifications via udev in order to + unload-then-reload the crash kernel so that the list of CPUs and + memory regions is kept up-to-date. Note that the udev CPU and + memory change notifications still occur (however, userspace is not + required to monitor for crash dump purposes). + +config CRASH_HOTPLUG_ELFCOREHDR_SZ + depends on CRASH_HOTPLUG + int + default 131072 + help + Specify the maximum size of the elfcorehdr buffer/segment. + The 128KiB default is sized so that it can accommodate 2048 + Elf64_Phdr, where each Phdr represents either a CPU or a + region of memory. + For example, this size can accommodate a machine with up to 1024 + CPUs and up to 1024 memory regions, eg. as represented by the + 'System RAM' entries in /proc/iomem. + config KEXEC_JUMP bool "kexec jump" depends on KEXEC && HIBERNATION --=20 2.27.0 From nobody Mon May 11 05:34:35 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 70B64C433FE for ; Wed, 13 Apr 2022 16:45:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237014AbiDMQrZ (ORCPT ); Wed, 13 Apr 2022 12:47:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237018AbiDMQqs (ORCPT ); Wed, 13 Apr 2022 12:46:48 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DC6512AB1 for ; Wed, 13 Apr 2022 09:44:24 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23DFSURf006846; Wed, 13 Apr 2022 16:43:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=YxXZzc9NcifzyJJKkdbQviqwxZpGWXRW6ied8c1WuVQ=; b=A//cTzkeF1PdDgO5td4qSSPJn7Hfe0Dew9RHnD1Bk8BdYxiKtlip4LNz/A71HUuplY8P XJhlNUNasUS+OZ3XM9s1nAtUFPc2F+y2Tl48UQ1G90KrvXNOsVopKh4voL4ZXZVPniP3 QrtW9/88UTx6BLOLAYdXA9PEDYGv8z2XrELm3LDAqRsgirlb++tnhdPBuKagLPchn1Gg P+g1yWS1XOT3QMbWEOzPPcrmErzouMukxPWP5LYLvi086p2czO4nBbVTWQoF2IAfWUU8 x3b/zG+mOjKUxlseWab/rRy5TiQLVK/FBocL8SH0r3KYv+4sIkE3ke5W2QwTlftTuoKu hQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com with ESMTP id 3fb1rsam1e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:03 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 23DGQSx1031039; Wed, 13 Apr 2022 16:43:02 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2105.outbound.protection.outlook.com [104.47.70.105]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fck143gm9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P8dL2WlcNhDb4I/86AChF53zB+NIM7phM2u6ShVaQFqfXsQXMhTavGRfZL736oBOnMtYRE4j9JP+eU6u/sDJuTDcXqCpmEDtquUm7+3NHr3BDH2M1q5ui9lZSC1oA0v8q63WlNhFkUXGymmuJ2O/J6s9SkV40QQu4IYbQF1XeCznIGQ27yQ9zPufdJNhBYkC4q6RG3KaGMcpvtSp7w9COUrwzISeRKa3JQv5Oy56sa+doeNWzj5ENBvVqTR83FGBAHHfQwlDg+NI0Y/8f1sqMCGNtnIppTPupAx1CkbPVLIFqXTf5ZuHZAcUxSTLGCNvWpTbF/xWGkkYBhfh6gj7Tw== 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=YxXZzc9NcifzyJJKkdbQviqwxZpGWXRW6ied8c1WuVQ=; b=EKfnumbp6hOMGqZAC04TkApj7bxEF7FRe0NsuAGf/RDX2SBw/kc4rgv/7LGb2XChKX6LQAot5cpiUM1gnpuaydvn+T5MbaCbj8kFodcIP0cgyhiapNRJKdM9TJg6VG7aXE5NjfaCvQPb7QkFlxe27K3XZ284XARjUI7UtpPSl9fGiNzr4LUZYvNCBx2CMnm77vrfSnFqZ/aZyN1NIbX7etPktmiItJtk8j2yBf9Mlzsb/SJiYe7mSpyWCA7SHiEFLB9V4Z5QCSpETCvRagLi/vEdYagiDbWYrN16jawUPtsiZFKdAE2aJItkMFQvXcEHWyyohtWTbbBivElQeIrqPQ== 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=YxXZzc9NcifzyJJKkdbQviqwxZpGWXRW6ied8c1WuVQ=; b=dxZK1XOvMpLhoPEyhd8kL9nmEQnvRYZ68YiEeGckl/4xPtsvWTWr48RJ4W1KWD5pNXdyT84x4kvTctAtbBaNqG2Myhg97h8XzvJownOs523NMojMU3t0yKxg9B9B0OFwkJHSSGURM/WJpv9yf5rrOk9AtwU075jDkr0kwuh80mQ= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by BYAPR10MB3560.namprd10.prod.outlook.com (2603:10b6:a03:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 16:43:00 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c%3]) with mapi id 15.20.5144.030; Wed, 13 Apr 2022 16:43:00 +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, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v7 3/8] crash: prototype change for crash_prepare_elf64_headers Date: Wed, 13 Apr 2022 12:42:32 -0400 Message-Id: <20220413164237.20845-4-eric.devolder@oracle.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com> References: <20220413164237.20845-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0024.namprd13.prod.outlook.com (2603:10b6:a03:2c0::29) 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: 615bc69f-5047-4646-e485-08da1d6caba8 X-MS-TrafficTypeDiagnostic: BYAPR10MB3560:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xuOc+2J2WDeqam7RxUAEhI8YHW79rIE42oP+VtwAIiSJE+UBQwJ1noIRcuVYsNfQjYLzuPgBC9ltmw/PTrGJklGHpJHx/s0fzdvSt8uideFq+CyRsJPxcWJXAUFEBmsLbbCY5iS8yWFgEzZ00xLC9Ykn1X8l51ZghjmPJriXh/C9aV4siXgR8kuO4u6sC7kun8BkdnjcWt33kekJAHgpJUAeiUUEHW4Ah5DJzJVZmCzIT80SVG2CyDRLmyS6w/zcoEA1LSqsQ6n9Qw0xcsoddLulNzUt6W4xvpUyTLZssWunB0Znpl2cqVvA+onHYXm8nJmAODxnFKMScB4u3gMZr675QiXNDfSLoRlj8usRj3bb6KpsKYpEIWaBKnMau5gn5wFFsMyujLfK7gqjl4z0ylaihgHiwRYHrtY8a+gnK7LCOB2ER+2S0Yb0CtuRKEo8KuKB0jC/ISJdvq9up1WqpbYU+Up3MWygSTj9cYUJikRiw3jtDYhgD/yfwgbFnfroFVwUEuOLU+a/ZNtSJj1AzSqWloFa+BeB2ohUZQGePeiYG0FtV8HJiO8ldkuwwhacyPF9OQgxliUHtRml2ApWQhS26+BjQ3RPd9z8MEDCJexi3Oyy5xJK2eZlAq+OQixvRMrrKNl57NKfKe/28R+HZqDjkZGJtAjfjxF/eXT4Z0WJ3/HqpuRGcxcqn1miOr6tm5qKStjYTSAiQwEsLmNm1w== 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:(13230001)(366004)(6666004)(83380400001)(38350700002)(66556008)(36756003)(2906002)(2616005)(6512007)(86362001)(52116002)(6506007)(38100700002)(6486002)(508600001)(66476007)(186003)(26005)(107886003)(1076003)(66946007)(316002)(7416002)(5660300002)(4326008)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?19dBkwTkvalPJsQALyAkqo95FncDxXeBkJIxY1MvK2QrUcUYbioIE/975ihR?= =?us-ascii?Q?3OVWxjCfJNqnDkykoD82ZLw8p18aFCfv8749AtkJGeiBwpo+DHrRchKp43iI?= =?us-ascii?Q?wmq6yZz28AzupTfC7JNwEoQdVIdOcDCi+fSvhxqZbvX1BMXavOxc6u4DFC5D?= =?us-ascii?Q?ns4rMxmGmXXN+7h2O7eJROEladGhpUIlnhzhBkuk1Wd/9J2FCQTUKdatEQlh?= =?us-ascii?Q?dPZUvL2qWI0pqswMl6WBD7JUFVKqU8g44vU1hOlIHgu1e5Rku9XYrn6/jsaA?= =?us-ascii?Q?qkNB6qDqpggPt9ooVdRTaNo0U7VT7Rcvf5qomKot7saTnj53nIEPzHG3SdBZ?= =?us-ascii?Q?MCSIPe+nXhnsA78TNzNKQLSDbQzVtxksR28BQxLRlCklFSE8Nxk3Lb4+VJEb?= =?us-ascii?Q?oK0NY3nBqj9XaEGawqPHlbzC6+CFwLIB8hWTQWfKI2gaeTJ2lcR3OKi+1cm3?= =?us-ascii?Q?JmKqjP9SW39uYHdSaLlhYIcTYjJiab/u6IhAYqWa6ZfwSDzqH2UGd8gCDCaW?= =?us-ascii?Q?rZai09KHgzESwiYHKIF9zqwOzIzjEG6y7PCRwiUfCqFbX6NYyPMwnZIORlef?= =?us-ascii?Q?UrfpAoBRL5Fq6j5ifUDPcE5mUX1OeIPX8lOWo4JV2U0RyefgpptpbpJpTGsx?= =?us-ascii?Q?V0fH/nZQFr3/9imVG558EuKdoDS2VHTeRS3YuQvFY4y1O0826RflSTd434qY?= =?us-ascii?Q?iWoyHiolOxQMRjyHDL8muH4FDU4Cx91GgXW7CNFcJx1s8J83j7N/+OP1e6b+?= =?us-ascii?Q?+zPr2N8png680KZrsGJl5V3TIJozZDSXLX/61lZJHhquPIaTw56XrdJGJ01X?= =?us-ascii?Q?6EaauhW1Mmgaz0H/4efcMLMKxuH39tVLldZy1BqKysrmlVJUkgmO6jSWMmZ1?= =?us-ascii?Q?GddT19TGQ7mJQKs3o4aAFwoxlol8UPXEw+yxnUUWX0Esfvs2U39jxArQnzeL?= =?us-ascii?Q?EXU3RghPu1dGF/5Lm9vBxojOzI5b96krohfMrCWDFgt8qtOqHge23izf90yY?= =?us-ascii?Q?rAyX9wn2SmHvJNqAdtYCjBSNGdgmCKh0iNoz6T799bOiizZBmnf1yC6+3JX+?= =?us-ascii?Q?R03xS0/gVp1PCrb4eGushhDo21F+hgoXvoCnu1CakPRp2XUOzjG76yPkn7Ft?= =?us-ascii?Q?u6UQTNrDkmgPmmz5JP9O59sCfN6S2p4GdOK3eZd+e3V/Q6lIB6c5CZjKzlWL?= =?us-ascii?Q?gjOpMIRA3acFfqPND6j5OfOm4snj2iPi1CszDpdMYWZ7EmPlaxHbq2Z5Mjl3?= =?us-ascii?Q?h0DXydO7xaHJIEwgG9vEIpLI0MLVocBnA1fc4Q4Tmj9GlDIkSXE3m1Ddvqz5?= =?us-ascii?Q?2KvLvSM8kQUkYWM90SZdl67sp/G/B/2uinTBdi7K3jpzkNkVCS+f4mnXaDEf?= =?us-ascii?Q?/IVig3Xvxq5Vaaa6xVtgGtNGLWueBIKiy2LsL2xJpxSr5dsGU07yPmIMIiqQ?= =?us-ascii?Q?m6ij3PlyrrDTLb+7HQ5momEMR1+m7GDJtpUsrJ+v6tNgh0YQvxflifdcuDlX?= =?us-ascii?Q?17qhMjxXEHC1WjQWI89iRY6+rbur1Gfi9seUDHhQvcwFRe1JwAr25MrHAbJV?= =?us-ascii?Q?ET4o3kgZXIIpkZsLK4gZCn0pYbNc+7yMU88chIGYsGpK167Xi9z+uR9PvZTm?= =?us-ascii?Q?hne2Hl3oJnPISiTztMHHMghd3ppCCGmB9osiBu8Wq9UJIy8QZ+bu3l4FyQXt?= =?us-ascii?Q?hmQm5RAsvYClx79e4C/wpa2lfQ9qVlfVxyXaImSbpTOcqoh6WRK6736gdEOy?= =?us-ascii?Q?UAWo0kzi92H9zKzAvhcriDGV+lt+zQQ=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 615bc69f-5047-4646-e485-08da1d6caba8 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 16:43:00.1710 (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: r5+N0BpiIDT0qEQNGkdMkn/BkGJRHc7HS9W8VFfld3bjdiGuaG/58UEVwh5XyDpyKetYQnXphT52ZEi00d9+Ak6Gcza9wUPohUPY7nxK82k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3560 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-04-13_03:2022-04-13,2022-04-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 phishscore=0 mlxscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204130085 X-Proofpoint-ORIG-GUID: Rmjzp0uMTWQV8wKoTXupa56wqbeGW8mx X-Proofpoint-GUID: Rmjzp0uMTWQV8wKoTXupa56wqbeGW8mx 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(). This is preparation for later patch, no functionality change. Signed-off-by: Eric DeVolder Acked-by: Baoquan He --- arch/arm64/kernel/machine_kexec_file.c | 6 +++--- arch/powerpc/kexec/file_load_64.c | 2 +- arch/x86/kernel/crash.c | 3 ++- include/linux/kexec.h | 5 +++-- kernel/kexec_file.c | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/mac= hine_kexec_file.c index 59c648d51848..7dbafb42ecf2 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; @@ -67,7 +67,7 @@ static int prepare_elf_headers(void **addr, unsigned long= *sz) ret =3D crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); =20 if (!ret) - ret =3D crash_prepare_elf64_headers(cmem, true, addr, sz); + ret =3D crash_prepare_elf64_headers(image, cmem, true, addr, sz); =20 kfree(cmem); return ret; @@ -96,7 +96,7 @@ int load_other_segments(struct kimage *image, =20 /* load elf core header */ if (image->type =3D=3D KEXEC_TYPE_CRASH) { - ret =3D prepare_elf_headers(&headers, &headers_sz); + ret =3D prepare_elf_headers(image, &headers, &headers_sz); if (ret) { pr_err("Preparing elf core header failed\n"); goto out_err; diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_lo= ad_64.c index b4981b651d9a..07da6bf1cf24 100644 --- a/arch/powerpc/kexec/file_load_64.c +++ b/arch/powerpc/kexec/file_load_64.c @@ -797,7 +797,7 @@ static int load_elfcorehdr_segment(struct kimage *image= , struct kexec_buf *kbuf) goto out; =20 /* Setup elfcorehdr segment */ - ret =3D crash_prepare_elf64_headers(cmem, false, &headers, &headers_sz); + ret =3D crash_prepare_elf64_headers(image, cmem, false, &headers, &header= s_sz); if (ret) { pr_err("Failed to prepare elf headers for the core\n"); goto out; diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 9730c88530fc..9db41cce8d97 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -265,7 +265,8 @@ static int prepare_elf_headers(struct kimage *image, vo= id **addr, goto out; =20 /* By default prepare 64bit headers */ - ret =3D crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), add= r, sz); + ret =3D crash_prepare_elf64_headers(image, cmem, + IS_ENABLED(CONFIG_X86_64), addr, sz); =20 out: vfree(cmem); diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 58d1b58a971e..f93f2591fc1e 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -227,8 +227,9 @@ struct crash_mem { extern int crash_exclude_mem_range(struct crash_mem *mem, unsigned long long mstart, unsigned long long mend); -extern int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_m= ap, - void **addr, unsigned long *sz); +extern int crash_prepare_elf64_headers(struct kimage *image, + struct crash_mem *mem, int kernel_map, + void **addr, unsigned long *sz); #endif /* CONFIG_KEXEC_FILE */ =20 #ifdef CONFIG_KEXEC_ELF diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 8347fc158d2b..801d0d0a5012 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -1260,8 +1260,8 @@ int crash_exclude_mem_range(struct crash_mem *mem, return 0; } =20 -int crash_prepare_elf64_headers(struct crash_mem *mem, int kernel_map, - void **addr, unsigned long *sz) +int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *me= m, + int kernel_map, void **addr, unsigned long *sz) { Elf64_Ehdr *ehdr; Elf64_Phdr *phdr; --=20 2.27.0 From nobody Mon May 11 05:34:35 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 95412C433EF for ; Wed, 13 Apr 2022 16:43:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236990AbiDMQqC (ORCPT ); Wed, 13 Apr 2022 12:46:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236978AbiDMQpx (ORCPT ); Wed, 13 Apr 2022 12:45:53 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DB2167D2D for ; Wed, 13 Apr 2022 09:43:30 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23DFqIXv028053; Wed, 13 Apr 2022 16:43:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=jSI0Q4XRc8yQsgj8DRvg9GQS6O5v8SmKpNQ/Sgo04+o=; b=T2RbFeA+/GbRkyI8oZcHIMNa1ZGDOpLUDkWp5FfG5F6OofSxLsAer8jN4P0mKYCQuKhV dyotNwXJvE+Udh0gH+z5PwXMp4rUm9YPGmcvxOcIA822BgurwZ7wR3XkT83+pg6L22v5 To4r+hjhPZsn8mMm1YLxQqmi1SWPHotxJGsC7DuCx9vL9jLCdOyrRHWkhx9KOo4Q5XRz Qdef5UG9KP/h7Hk6oZtuBQpDsVB/Tk0EJPgszmpn8dTCCZ+7xeInWJ+gOiLMlc2VLEr3 k8SMgK8KxsaV0UiWHTnlFMkWH8aXS0Yvysle5VaVmCMsYAYqEnJiq7w+IEFabhZbKMUf Uw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com with ESMTP id 3fb21a256a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:07 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 23DGRRIX008545; Wed, 13 Apr 2022 16:43:06 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2109.outbound.protection.outlook.com [104.47.55.109]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fb0k45r6j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y8/xUh5dA9zqrDLmTkBjBx3Jnk65TmF/4rFzO8UkiVD+M15Pdo7sjkqxwRUF9ccPJ8uM0IVlkWsYgThZBlJICFGRBO0xiUh5mp2vRRbzoDRWbZfGt56knCgD3OZm+W1UafsEH5epDDIsuvLp6ut+/rp85326dSS8Q9dz1aJBjKxWLNQQtKQ9iORInJcOUfTTH08kxVw0a8LYbtXw6u7+3nQcwM0iMvv+Bn8uUh8FSkN8OSfqevCFn1vF+znE6Ng7qWuVqlU8pwarWfnceNUx9lrrtKGj2GKrS2pkT8IJNQBKCuHOyoXmfa2UxwfVE9YiFvnqv13dbzyuO0mog+rFtQ== 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=jSI0Q4XRc8yQsgj8DRvg9GQS6O5v8SmKpNQ/Sgo04+o=; b=OCk+KcgypCZ170VK+z9IYB3NFbQohukoqrR+VqbJ6ikRgRxJmHJg9mTSUlu/KEmefL81yM1ezaw/GY1t0ZScVbXlP8DYzLq1knDpnlBlLmsXA291RIp/bnspv7iHxX/telccLPQDkzdg6fErXN3U/7quXnBdKj9e+nctLXEkNF10aH5RDz8/n319F6VRn1/KpOcJ6dwYeRNnRSDiYBnUhw6QRAVjcszZ0bWh31EE/fLxVebT4s7e/LJvXtXKHr0gT8y7oOsxaeapgI+4OoBM7kLbnVkbwFzbtBHFAjiiH0HNJJDU2aJEr977Sox+wUaiMCxfoD9wuytgmJc/Db0mqg== 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=jSI0Q4XRc8yQsgj8DRvg9GQS6O5v8SmKpNQ/Sgo04+o=; b=W44PgHcZdqvfFnC7sB9EYjAnUMv0P2sqLiMyPgVbYT5Nxpz97ojLWXsRgNAihKTeYmqEl/+x3ZmXS137IVsd7scfSJQRUwsfeJNN+APvJ7SifX5hMd5IaVffg7bpGadAL6+g8WUhK4i/p3eXvOSDlD5Ci8yQywmhmR8l45g0peE= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by DM6PR10MB3562.namprd10.prod.outlook.com (2603:10b6:5:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 16:43:03 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c%3]) with mapi id 15.20.5144.030; Wed, 13 Apr 2022 16:43:03 +0000 From: Eric DeVolder To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v7 4/8] crash: add generic infrastructure for crash hotplug support Date: Wed, 13 Apr 2022 12:42:33 -0400 Message-Id: <20220413164237.20845-5-eric.devolder@oracle.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com> References: <20220413164237.20845-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0024.namprd13.prod.outlook.com (2603:10b6:a03:2c0::29) 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: 31beb45f-5de0-4479-5a94-08da1d6cad5d X-MS-TrafficTypeDiagnostic: DM6PR10MB3562:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PVpRbwj4Xjqynb4a44EAPzrBJWgxp3/oQCI+XKMZq3QCEL3IDexze18QTJalT0K8ggwJrqC9C2mTtS1Oyr9RsWumMmYrUl9NEx+MmsPAvLpg9TKISb0VW3be7ZqMDAsS8wYn08RUgH6kFIT/jRr7+tpGCbEVyuaL80MqHzlfZaOcA8DgB77YyRkYmRv5i2LW0WojbYzGfflJ7ttUCWc91zIaWGlATMKqKwz86Ats4qAGB1dVN4YMWbPGG6DKtnBRd+vRnX96SleWdZbPkkKi2tHjhG9sutDBCxI4creYWH/ajXtpOSOfis3DT7E9wRFCR4MRCvus15j2LAaWvav2Z6s3uODHpmTrhgJT41NjsXJQ7PCMUfnQul19QrZAtfoa4WatU029RNcRKoIaklSbaefFl/iVstYQkYZG5N4YOtLOUsKk02SmDKImgwIHcBpG6yXfqzK9qdC9ocCVPicj1HA4kv/2UqNXbonCRpfb65gOlnqV4nkIUtgjwE6HpfEgEkeQ5/0IXNWtJlof9IFPV/j8uKErjsnNnfzGz3KmCav5yXmiD0VQeKD5jZQ5zRXhcpjOefaN4+D3yeBllf9TfICHYFGfvoJeR6D++DoMPjhg/100YJqK9/ESezGl2wk+T/nVeeY+zvQ3rfyFMEHwpOFQbeuHQm2Dm0i1nKrdZpM+yn9PGg7GapfHe1rT9U48JQVAnfGXybfywb+xHog06CbR1mocqNcyaVqJsr3EgFU= 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:(13230001)(366004)(4326008)(86362001)(66476007)(66946007)(1076003)(66556008)(8676002)(8936002)(7416002)(52116002)(2906002)(6512007)(38100700002)(38350700002)(6666004)(6506007)(508600001)(316002)(5660300002)(2616005)(83380400001)(107886003)(36756003)(186003)(26005)(6486002)(41533002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?01zzCYtahWLx3XJNuErZr0S2kr9v89NJjMWdqOtVdBlNokMX4nSairloNBz0?= =?us-ascii?Q?fK1nsXDih8skgWjx730ynWDV4VF1gt05qGFXMo2F9lL2HVO1UrnfWHyMs2Vr?= =?us-ascii?Q?eLmK4Yynbgdyej4jzbds+yEZCbpL6yVgj9863yLDOuLYcGgpa47HQQvbRiqS?= =?us-ascii?Q?iuRPhiGrhGmb4g+YTMNtAqxDm19j1cpPnYXLxJAvpVehwZhtjDRTaOhOf3AM?= =?us-ascii?Q?U5EHRWGO0Awl4xtmUoDlXYR5H5tzyYDwVuKqgf9Qol7qDRea8kCFgK1ZDila?= =?us-ascii?Q?4b/pnHpdXbva5JdSqgKNBuzyoHOa7qxZurptCXlu3Q+NSSwTSw83LHjg3iGz?= =?us-ascii?Q?xREARWqo8RVAJ3NgX+Jx7lps1KUyrV5agxGpKiuRfEn7Bxz408LJHLWRG+MK?= =?us-ascii?Q?npW897BNGtYe8PCd956gSDQu+tpx/M7qg5TuVkYzdPlOE3H1/FHF4ERSBF1f?= =?us-ascii?Q?ewKZj5W82EtBIkflIAlxTWAuurTpp3bm6noKQMg+vU/kO/yUonLhw/sVXkdH?= =?us-ascii?Q?EBiCUrtMctrphBc/7ui/CSV7ZLC2+QjIos0KDuay1A1p60O55mpnqplSXmGa?= =?us-ascii?Q?z/UkJyh71L24H96K3yqHC2rFLGTpdp8YMjtVFDWikV5/gSgYmahV6Xcbk2Y2?= =?us-ascii?Q?SgdfU/ZKdJCtn1aezRLaujcWl1LwFfRYLrvmUFNwVpRPal2LOmlFPPhSeh7t?= =?us-ascii?Q?nYs2I1u2fqeUdppoeWUbJy00ViBBmsN9V9IsolsTL8NjYJEfZ2RmRQNtkv9t?= =?us-ascii?Q?+OzCEbHSmCJYkgmAYoicpCoi1RE1x0ayj48oKQ9jpKTDLeGsYPU40kDLuxdW?= =?us-ascii?Q?MIMeAXhLk/2a9reQIFEFC5A+mxp7gsmQ1owSV77ouPLaj5PZJm/wctjUdXB5?= =?us-ascii?Q?mt6LXkLhgyLeVCkZVg3KbK2k9447Q4vsPMyIUC89xklYPvzLD1JqBXbbK0Dl?= =?us-ascii?Q?2mo5ufheiOS+GZKMEgtFewK+HZzRh7v6r5c5bESpflnf+E4KcImESPjK48l3?= =?us-ascii?Q?rwvHmJVNyLmsqxTSgY3kKYjDMOv1ukXQmjfsQu5u+NcSSm/oWy06haOhgzzn?= =?us-ascii?Q?v1UKSZ7Dc406T3+VkKEQ+uOViBk+4aLsv+0RT0oNg69uFiNnuI7nmuODOVdt?= =?us-ascii?Q?LXjas41u3S6wFgx86P/9/QbqDtQCgpzHybsuZxEVq+hcMu0lSwIkbi7VpeSK?= =?us-ascii?Q?IRazFKQjX+IBkBtrtOa6DUACWk8cyD3T/VRYP9VF9ISmVxcPZMXDYeDW/2MU?= =?us-ascii?Q?CEYiXr62pgrvLvMde+WLOJJI7Ip/h1q17qJ8h08O1SBxe0mUDLOPLIK6R1I+?= =?us-ascii?Q?RPnb8siIUfT7rKc+yilTS6OS+uxnfkPVcb+xxS0pPVm4iUi/cnF7OxKh8e1t?= =?us-ascii?Q?BKBjrnrkdtjgXF2v6XHMqzOJvaEdwC7oCa8bP4kSIhWtsVEkFTLe9AsIf54y?= =?us-ascii?Q?u2jYFqBzNOV7x0AhTv3S3gRkZrJJ2ORr6LZ73B/j8M8wwWhwgbEMUpSvrCER?= =?us-ascii?Q?dERuB/NGdWzugMif9WGElYhIxKvCwbIvyDSJ3cFRhYPEsTTIONqwFj5A3o+W?= =?us-ascii?Q?Lz3iqlkBkgvUpf/F+kQOdtqHqhk2r6w11EmMCiw/d4D52TXVF77nlSE26KS6?= =?us-ascii?Q?CHrpwyFVILwUXzuiJkBHrjJ0NaQnbpXbNECv7T7c0LlCaCQN+BoWG4paLQuh?= =?us-ascii?Q?CkjtgxiYpd3ddHsfhoeBVI6YSi88cJAxrByXbvy57+e+laE22Xp9JLHIHI8Q?= =?us-ascii?Q?qLxjHEvoP4MI1wuumUS+ZhmexhVHbEY=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31beb45f-5de0-4479-5a94-08da1d6cad5d X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 16:43:03.0471 (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: gSk7JvTvqscS+HGZnTyjE8UDtCG33r4yZViltMdtGmbCdBiLnjxagddN4xKD/uSCM1ZVuoQrveK5BYLfP8m8cz5qQeBeysoaDH+VwI2fDQU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3562 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-04-13_03:2022-04-13,2022-04-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204130085 X-Proofpoint-GUID: BxdjslT_-LHJECkwZGGYGBaR23IghPun X-Proofpoint-ORIG-GUID: BxdjslT_-LHJECkwZGGYGBaR23IghPun Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Upon CPU and memory changes, a generic crash_hotplug_handler() dispatches the hot plug/unplug event to the architecture specific arch_crash_hotplug_handler(). During the process, the kexec_mutex is held. To support cpu hotplug, a callback is registered to capture the CPUHP_AP_ONLINE_DYN online and ofline 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 notifier then call crash_hotplug_handler() to handle the hot plug/unplug event. Signed-off-by: Eric DeVolder --- include/linux/kexec.h | 16 +++++++ kernel/crash_core.c | 101 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index f93f2591fc1e..02daff1f47dd 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -306,6 +306,13 @@ struct kimage { =20 /* Information for loading purgatory */ struct purgatory_info purgatory_info; + +#ifdef CONFIG_CRASH_HOTPLUG + bool hotplug_event; + unsigned int offlinecpu; + bool elfcorehdr_index_valid; + int elfcorehdr_index; +#endif #endif =20 #ifdef CONFIG_IMA_KEXEC @@ -322,6 +329,15 @@ struct kimage { unsigned long elf_load_addr; }; =20 +#ifdef CONFIG_CRASH_HOTPLUG +void arch_crash_hotplug_handler(struct kimage *image, + unsigned int hp_action, unsigned int cpu); +#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 +#endif /* CONFIG_CRASH_HOTPLUG */ + /* kexec interface functions */ extern void machine_kexec(struct kimage *image); extern int machine_kexec_prepare(struct kimage *image); diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 256cf6db573c..ecf746243ab2 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -9,12 +9,17 @@ #include #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; @@ -491,3 +496,99 @@ static int __init crash_save_vmcoreinfo_init(void) } =20 subsys_initcall(crash_save_vmcoreinfo_init); + +#ifdef CONFIG_CRASH_HOTPLUG +void __weak arch_crash_hotplug_handler(struct kimage *image, + unsigned int hp_action, unsigned int cpu) +{ + pr_warn("crash hp: %s not implemented", __func__); +} + +static void crash_hotplug_handler(unsigned int hp_action, + unsigned int cpu) +{ + /* Obtain lock while changing crash information */ + if (!mutex_trylock(&kexec_mutex)) + return; + + /* Check kdump is loaded */ + if (kexec_crash_image) { + pr_debug("crash hp: hp_action %u, cpu %u", hp_action, cpu); + + /* Needed in order for the segments to be updated */ + arch_kexec_unprotect_crashkres(); + + /* Flag to differentiate between normal load and hotplug */ + kexec_crash_image->hotplug_event =3D true; + + /* Now invoke arch-specific update handler */ + arch_crash_hotplug_handler(kexec_crash_image, hp_action, cpu); + + /* No longer handling a hotplug event */ + kexec_crash_image->hotplug_event =3D false; + + /* Change back to read-only */ + arch_kexec_protect_crashkres(); + } + + /* Release lock now that update complete */ + mutex_unlock(&kexec_mutex); +} + +#if defined(CONFIG_MEMORY_HOTPLUG) +static int crash_memhp_notifier(struct notifier_block *nb, + unsigned long val, void *v) +{ + struct memory_notify *mhp =3D v; + + switch (val) { + case MEM_ONLINE: + crash_hotplug_handler(KEXEC_CRASH_HP_ADD_MEMORY, -1U); + break; + + case MEM_OFFLINE: + crash_hotplug_handler(KEXEC_CRASH_HP_REMOVE_MEMORY, -1U); + break; + } + return NOTIFY_OK; +} + +static struct notifier_block crash_memhp_nb =3D { + .notifier_call =3D crash_memhp_notifier, + .priority =3D 0 +}; +#endif + +#if defined(CONFIG_HOTPLUG_CPU) +static int crash_cpuhp_online(unsigned int cpu) +{ + crash_hotplug_handler(KEXEC_CRASH_HP_ADD_CPU, cpu); + return 0; +} + +static int crash_cpuhp_offline(unsigned int cpu) +{ + crash_hotplug_handler(KEXEC_CRASH_HP_REMOVE_CPU, cpu); + return 0; +} +#endif + +static int __init crash_hotplug_init(void) +{ + int result =3D 0; + +#if defined(CONFIG_MEMORY_HOTPLUG) + register_memory_notifier(&crash_memhp_nb); +#endif + +#if defined(CONFIG_HOTPLUG_CPU) + result =3D cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, + "crash/cpuhp", + crash_cpuhp_online, crash_cpuhp_offline); +#endif + + return result; +} + +subsys_initcall(crash_hotplug_init); +#endif /* CONFIG_CRASH_HOTPLUG */ --=20 2.27.0 From nobody Mon May 11 05:34:35 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 AA565C433EF for ; Wed, 13 Apr 2022 16:43:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236976AbiDMQqF (ORCPT ); Wed, 13 Apr 2022 12:46:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236980AbiDMQpx (ORCPT ); Wed, 13 Apr 2022 12:45:53 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CB0C67D05 for ; Wed, 13 Apr 2022 09:43:31 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23DFNba1003034; Wed, 13 Apr 2022 16:43:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=o+Dqt0zbsENuTCOkZXMb7UtSXXrlQOB3YFbgnmTe+Lk=; b=ZxGnVYbAtH8I3JFcu6E3ksGbX37G1ZdcFH+9/S9ohbvnEZ9QT7fF97EMCNYRaGqWkwV0 X0GQJeAYyhCv9foMYMY8GukS6Gp/1FTHDWNJ0Md3dRBENvtLEpkoQeJYxzRRV9FPCK9W OIhIMxNGHBxr7u8Yzp3Ksv0QXkyPmahx/1sLHIMvHneVJjZRLU/UUt5bmqn+Qp1djYcr SY+VL/iBdCPi9cryzlhhb7lU5B1FfRKbFgg27ahvg2brFFvkE1j22N6kvybDXddMfDk6 krHCP+Wseg1ulH2p/V052LAhZZasFB81Cv0s6qvbqp+CQoTh+wd5blbVP6hY1ahLGTlG pw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com with ESMTP id 3fb0x2jjdk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:09 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 23DGPTw5020992; Wed, 13 Apr 2022 16:43:08 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2173.outbound.protection.outlook.com [104.47.59.173]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3fb0k4k9gg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LpD3cv5gR8C5kYpRQz6VvVX2WErQWpHYJws+uTzqEiczxl08dJpFsAYrd+7yzpfIkB5aUxbKXokSwhrSvikxe/wU0sOXi2s+DPCsRJMiU7gSx7hISUfpLX8SdsejSLbR/rDQcU7ju9JdFijsZill2Hnnz0RtPzW9Uv/zu7z/G7hAODZKRPXZNLnIuckE0oMJf5o+UopLp4t7UqP1EXwioDlgVm+BE1kt9ATw/eDmn20MYo7dmUedLCFcZ/yfvuqylvy/2jzcmUsxVleGHm90ntD8V6VLyvNee3+wXbEquwpKrVjTWWKok95NRNj5T4+GpR3q2/BBbdWxHujjhW0fHQ== 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=o+Dqt0zbsENuTCOkZXMb7UtSXXrlQOB3YFbgnmTe+Lk=; b=OvAor+9+Ft2e61FvIDkuF2it4m2/fcd5DJ90lHDUtiXReNWOfZv8zVgcxW44X3s7Fv0oTjWKU7EP3DOMAylgpaRy19eyGkqaN6dvhTVeFRCNIPlZiXfdbSpqSgQHyYwTevb6hGKPriQ0gCJuMWYCoIYUyfMe5YF/Z9CsgD86NNPlZZlQiem8Fcsdd1hyvNsv5/SOFaKWsF9Cle2gJGZF6to2EKpM5fAMUZOYUKax4hluTiojEHhEBlkEHhVAkHaL29okP0wAeh7eSt5210kO5OD4Iws5e9/1KxxA8im7rktDIXbCGIH/Kdo4cKsFoHlsU4iFgDxhwMf3lc3Rh2kXbw== 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=o+Dqt0zbsENuTCOkZXMb7UtSXXrlQOB3YFbgnmTe+Lk=; b=YvxXND7c9AgXBvzt6aezBXi74b6uBipw0Lo0t8b61OKBqmo9O05dWOfCYc4e+OCkeD00OFYJuVu2PsP8W0d5oyAiqZVxRhbpLK1S+36rhSBpssJZ8TVQXa0l7ZcQSBU8p0/Ebk7Y3YHPzq8L9+5rYQpFppyVGA7UssUgjPGgi8c= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by DM6PR10MB3562.namprd10.prod.outlook.com (2603:10b6:5:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 16:43:05 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c%3]) with mapi id 15.20.5144.030; Wed, 13 Apr 2022 16:43:05 +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, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v7 5/8] kexec: exclude elfcorehdr from the segment digest Date: Wed, 13 Apr 2022 12:42:34 -0400 Message-Id: <20220413164237.20845-6-eric.devolder@oracle.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com> References: <20220413164237.20845-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0024.namprd13.prod.outlook.com (2603:10b6:a03:2c0::29) 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: b3f385f5-d613-41bc-d3df-08da1d6caf0c X-MS-TrafficTypeDiagnostic: DM6PR10MB3562:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V7JdV5NM8GhejDV9ra738nhdBe8RElRqu7MpocfFEMGt/oh+mhG0rpMY86XqdKT3hIt1IkYRWgjiLbgVzBdVYN3PgaJ9LjdM56w6Q4YMQ3e6wW5Jvl6L3mJexCeAQALt7L6s1DvHhD77kkcuzEN7vDsPXh9EPnQAn1nV6ic+KAo4/ZzYvQ0d66/lbybL3Q1s5vd7qlJs0O5kqqgUPQS2+XZLDW1EWQm5amS3WhBAbM4LhQlhMQC35NXDAQsWhOlGO7Higc5q0j9HeQSUNJJy4yGB4VENNQ3dVnVUQiwKOGRzXKvFDPk6AYEb7fDuoj7hLubcxTd1XHa3h3xTEPd+B4G6DA0w+lRS41ial0fCL7gGpwQ+OUGf+qXyqXIBPgpSx6X30oSsOIGykhg+EnyNA0mlHtkYsNxeHWJtlDGwsm/bouDbySMEEOgT06IpjzpL6MGZ3/bMgzayhoOQh4u7aPqewjJKi2aqnxTcx/r9raSEU/Bhi5c4vb2EPYu45kUvn/kJyZm8yMPqW5c9qyqXJKZQGo2qGgsBh1DcA+bu22uqyzcqdsmjnb+iSwWMJR6N3WF7qtjvI1nCeI4VZIKxIcQpky8TFntzYWl8c5LemRoYOQByp+bfQu92o09Ix991fHh/jqoXQiPCOCiYZYZAvyWjWY0sCT+l9ahIavmeB3tGYZxj7ululV0WU1VGnb9wF8ZYwjJSu62nKkeqoGXmwQ== 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:(13230001)(366004)(4326008)(86362001)(66476007)(66946007)(1076003)(66556008)(8676002)(8936002)(7416002)(52116002)(2906002)(6512007)(38100700002)(38350700002)(6666004)(6506007)(508600001)(316002)(5660300002)(2616005)(107886003)(36756003)(186003)(26005)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Rur7qfEt8WF/5wwIyZHgUrsxirlS4267apwSVDdiq1hkte1EZpu1vL1U5z4H?= =?us-ascii?Q?ZtcEnLSq3/4WAiNdn/fYb5I9Tr/Okvj5douFjXhZRN0ka9kD/mQ7MeUn6Jn0?= =?us-ascii?Q?Me1EX4873vIZ3BXDVvfkn5//G2tcBIFVKOrp/K47F54J/FpXAhZoWLgx5R+X?= =?us-ascii?Q?bJRtKJ1kv2e7UIcvNpfhdabPFOofNoPn3CVy1p7WzxpBIAskbP8VZCneOSUD?= =?us-ascii?Q?sBOxhH6QQ/4TYO1Zu5WGsH1iMz/SQfumTaaOkpB+5blW+n7QSPDsBMpu0cfC?= =?us-ascii?Q?D1AuAUNCnHTW9EfSnmGLJwxE+SjhpqjQAbgUDPq3KnJ165vcak4XJnEWXQc9?= =?us-ascii?Q?2HU/p65ItqcO70Yhei4d/9M3Bu5B95770qHqS3dO9JZjAjpgIM9D74JxkvEv?= =?us-ascii?Q?DPshAmsNyuaopdakCnIO5Nt3Vm4vvbONoW3LtjJH1ovVcj9ZLnui6HDNIJKR?= =?us-ascii?Q?OGK8OYVucYjYwK4E9S6YiM095pM7j0dGWf+mrI20RgBS0aKGvMj/3cB2dJy5?= =?us-ascii?Q?kThq0K6O7j3lJ9eseQXt4c2X+doDWpNmdtmnHAk7SL0khIHJqB8nQz3d7Dxj?= =?us-ascii?Q?HAZj7BAK2mHCI5+I1wRkWFfXYQJ0nGzs5VW2a+Ir7GqdoOYuObUV2nzudYRb?= =?us-ascii?Q?R9FfloHUBv5PW9zmtKTlVpqX+K4rwLDLSV+2IoG1QQNRZiCo7x1oNz22hZpA?= =?us-ascii?Q?q2LPVGq2APBxu65ohVSMr1YFfeqI3bTU/IymvhMxVjNah8KHtU/lXX6Tfv/D?= =?us-ascii?Q?8XkKsdnkRhOLi69DkBRwauGBjeqLoUrVNYGNawsiVP5ONeu+RInGPD1QHEJJ?= =?us-ascii?Q?XfzcO9zy9gUeF7w88aow3n+XmhkWvLV4vopqWjXGii97TzMsYOlTDRGReVyR?= =?us-ascii?Q?iUBCev42B5WkiGSfo5wRqUtpm6ZgyhEt+GCxUymZl7hi8bH3jL2PGRlpKfF5?= =?us-ascii?Q?1i4e45zPLxYWmnQMQPhoimziVvuB6eedVDtQXoy+9f0gz5/1qHGszjj22Zcn?= =?us-ascii?Q?1+RBEpEv/NIvr8hDejYXJrAu51PFn9S07yL3OKjoaTRLWeidj6Y6nm2HuSH6?= =?us-ascii?Q?J9G2GcSY4nm1N8JEnzGuALpqadacODionjCkFz+CPmOeiZ2fkGJCRTo5xp8n?= =?us-ascii?Q?di0V8/HfAgw3nmtvuR3X3l0O0Dn4x8u7IxoqvtHgTFx1PJo/wRrGB5OB+6gJ?= =?us-ascii?Q?6K3NfVy2VY7VXLVMAktmFvfb9ljRWklSnBNt6EMVFZZGAXC3OMr+wM1vIOJA?= =?us-ascii?Q?uZ2fPLGB8XrXB7MRWaQjQkkfDZHnxNGHwVbsn2QfRT2I+dIgCEICx64/MkIB?= =?us-ascii?Q?Z9LjOritVsYsVZOGjchWlFnAiYVVcXaym1RNoxYwuKc1B5SCFYmgodPIeON5?= =?us-ascii?Q?ZqCBY5azqlssmmsQuoudVXVDB5ozYN05aIdCcwHiXsYX0QDqE/4tU3u9RFAu?= =?us-ascii?Q?H0YBs16hnXCAluCuQcAQLEErEXDYkJO26nr3E+9JiJ/dmEc+K1BwdSCzGYoU?= =?us-ascii?Q?KwiiOmPdXbnFIuwnKgCHDAWSjzm29hJHRdCf+wt7cEUSsqzZzud7SNxZwBrW?= =?us-ascii?Q?B2du8Ro4OfZMwdFB9LxMjBKjKOhJEgEyAqwFBJaUM0VVyP9QHPZ/VP3fyCWT?= =?us-ascii?Q?RXA+dB0GRpUvgaSAD3eXwTN0V3bm5eCbM4mItlro6+96V11awsE+c9HL8z5H?= =?us-ascii?Q?GJoDl4lfCAbVB/ZUMkPLvFpyLHmgCUzMu8yS2PmZrCh2LqR9zKC9kdSg1lUZ?= =?us-ascii?Q?H+Gbnx38pniJI6xgrT/i1mglVxozDYc=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3f385f5-d613-41bc-d3df-08da1d6caf0c X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 16:43:05.8435 (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: ZGdi8mB6N20u7f8u5X/TIsC5/VbN89hmvkiOnPR7QNgpVRyXKyT7Df33uRaw09dj4ME9cetgGIPhVa75SOOKxzPb0VTj+a3XLFrYUi2RnAk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3562 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-04-13_03:2022-04-13,2022-04-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204130085 X-Proofpoint-ORIG-GUID: i_7tCSfxVxUN08wDk0cIHZtmseFi0xtV X-Proofpoint-GUID: i_7tCSfxVxUN08wDk0cIHZtmseFi0xtV 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 801d0d0a5012..94a459209111 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -765,6 +765,12 @@ static int kexec_calculate_store_digests(struct kimage= *image) for (j =3D i =3D 0; i < image->nr_segments; i++) { struct kexec_segment *ksegment; =20 +#ifdef CONFIG_CRASH_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.27.0 From nobody Mon May 11 05:34:35 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 7B4FDC433EF for ; Wed, 13 Apr 2022 16:44:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237011AbiDMQqR (ORCPT ); Wed, 13 Apr 2022 12:46:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236992AbiDMQqD (ORCPT ); Wed, 13 Apr 2022 12:46:03 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37ADE67D05 for ; Wed, 13 Apr 2022 09:43:33 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23DF6wqS022836; Wed, 13 Apr 2022 16:43:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=zdn60HCWUbckAEvBqcTxt/oylx4crYgQGJY9dQMY98g=; b=wBRB1BryW0bvUFy/rnQMno3CFD88liBacUjj/+oaDJ23YwAY2iGTGGwSrhZNKCF5xXyB lhEPwHPgo1XOiI0kf92vsqAN0MP8T/Kvaq0giZvBlvbhZ5b9E/vW6m8xCYiVrgpkoTL4 INe/LVXy6Xy0HfWg6hzHBVb6rzTXh3kqz+AGkinmXX/kz/E5hCXzvD6W182TU4c/E/PF lHzLWftjdeDRxQGFBSOg++XA+/L4dQpjKR62+ndGsZ3MQXygC2/91rM4YsmktU9QGlHs cIDr1fHZUuTRb7/fRwsvR5o0v3Dg9GCluJFZhEq6LJfqHnbXTBrtymJsXRX7HAjtpTou HA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com with ESMTP id 3fb0jda8du-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:11 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 23DGPPno015228; Wed, 13 Apr 2022 16:43:10 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2172.outbound.protection.outlook.com [104.47.59.172]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fb0k3wt0m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ILBhECrnNWC9HTWmyyyOJwoPJ9Me8rqpvEq3p3vBGq6jRpy/oLjvLpjxCsjfvWcEkMPE1gq9kAfjNS0XiApLon5co1DNADX1XDk4jx/6jWf7/i+V07UtyU1fmiokN10zLXIY9Kba9YzG+VrKM3fY1QhtDm2P03eFdqnQqPDgDM7SILitNUOTfXeZK+eaMwMcZT9O1tR6+C1V/4fMuHe3zrNsejXGljxmgtET56iTplucnoWPThJfaVfgIvS73HB55Uc8srmv2C/szqO/OwGMz0yvBkA4gAv/XJyt75inLA8fObdZdcwhtDJnvBrr99PpSvjoFv+KitMr0NMcM4iQMA== 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=zdn60HCWUbckAEvBqcTxt/oylx4crYgQGJY9dQMY98g=; b=PEzXihq2e5FbIS1Xw8nNtpxuV0hb0rK1a8NEeuvBC/re0W00IisBWeI5ZkILr9m0sISwHIK7smqTxcEB7+TDjmnAO4Uitcez1ytEMzVBp+A/B3O0L1bCrFezz44hTcWgUo/KYJ9SJGX0aPsmpa4YpoYdh3UX4DxMshawyQSs+TkRT2HCI4JxybF28kOaK8AP0Xf2yUgUksD1y2M8gFtQmpMaO7OxlEXyhnuGZSww7FByKIfC1UPR5k2MIIBQUa9+RFRK5Q9T+N5LJ6h8qIBVTRZBP9fiBM7wHrQ22bDe3HajCtDdeWG9goXnC20PH8Gd1S53rC9XRNTpwiho0S7bEg== 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=zdn60HCWUbckAEvBqcTxt/oylx4crYgQGJY9dQMY98g=; b=P0QpSWRYDnFCpmtnp+lkuffA8n9zwoc6oPXFnp0LRSiHciISbMzrv2b2dCxoXejkoXXTJ+TIcRGB0jKyTkeXk45XpID6iFnoZR8+Jxdo2LLQsBG2Kd+NxSYFFdhlrFlxdkeer70EkzGkw7M25lNmnf/OK4gfYG5Ky03lpzBnTRY= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by DM6PR10MB3562.namprd10.prod.outlook.com (2603:10b6:5:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 16:43:08 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c%3]) with mapi id 15.20.5144.030; Wed, 13 Apr 2022 16:43:08 +0000 From: Eric DeVolder To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v7 6/8] kexec: exclude hot remove cpu from elfcorehdr notes Date: Wed, 13 Apr 2022 12:42:35 -0400 Message-Id: <20220413164237.20845-7-eric.devolder@oracle.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com> References: <20220413164237.20845-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0024.namprd13.prod.outlook.com (2603:10b6:a03:2c0::29) 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: 330f1a34-2d9c-42df-e983-08da1d6cb0b7 X-MS-TrafficTypeDiagnostic: DM6PR10MB3562:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 25KnZXxg9xLoW8onHnxELE4KQ6hx8EjQvExesXQhpIVr6fljnc2IMWNCJqKf0b4Xjbarn7kFvlKHuNJ/4OTX3gidC4ARSJAvUTmoMWHxguXjxeNuVlmKDTHWQcmrd7cSzxje+2J9IjInaPir712nExf0/EebLJPYonDuXlEv4ljhXPoRRhmvwXookVrznd0gDTxbXnvSwhm3m9E/qjsFJ5qFHSDmTk4k0yftIQ/YrLdKdvh7JxhIxrXj7+nhAuSOkyShO1WBDqcElEGAJZghu2SvssVmkDVVuUFFi562/DHzO/6dOzFM9OuYN/Tu4aL8C+yuQnmHGkh2XnAG2wdl6bt26rvHKNd+mhZiCzqB2dB2soOAwhZWfubOTGMq1qWTvuGij6C0U5ebq06quppoYWpj+zsDbyK2rOKSWD1gVHNHX9Q6OfN1nMf53v6y2Pkx3Fg/cHrhgmgzk6KP7ekkE63w4MMqnNpgHO295VvJoTcW+sLc0KWy+RO3e+Tz2J3yxEdag9IzNuhmuQMGDvEc346fBlNLtNH9g4+LWNhXM/7Jfn6n7jABi1VZVFafHarwq3xd7InlFMhHk/6ucviqPEGbAMsN01L+LCkmoLpcCllQNJQe3k6weVoy76L4Y2oEpz1bIp8pJXQzbvUz2Q1qlL9M5rmsBLjFoVreocVWZSrLjliAm5pt50mB7gUTUyMu0Kdw+gE9c1y91kpH4yfVbg== 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:(13230001)(366004)(4326008)(86362001)(66476007)(66946007)(1076003)(66556008)(8676002)(8936002)(7416002)(52116002)(2906002)(6512007)(38100700002)(38350700002)(6666004)(6506007)(508600001)(316002)(5660300002)(2616005)(83380400001)(107886003)(36756003)(186003)(26005)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OGrxUIqcaOJhbUQOv84Vc/CrqmDnejDISEH5vypjIRHj4GziPK4rdR1sqqsI?= =?us-ascii?Q?+wZIF3ZH/kETRSIZGrkFWIbYS2ZBTXKhOTg3Gvbi/73LTFAIgDuS4pXYt+9q?= =?us-ascii?Q?uOdnNg1eayjPfa50xNDV+zPw2QAjqvfLugQc5W8SRULz89P1NIfC+M6KYM28?= =?us-ascii?Q?+mvjiC+LG4+6miMD/oXGPUg+8kJdJZhtMKUQpoXaUNSpcFew1VGr3oJdc6Lq?= =?us-ascii?Q?Ln5Me0UI+UDl8QszeFzjmpkl8hNVaGsw5hqonoPa9kBz+Mwl3G7rnpKMuz8k?= =?us-ascii?Q?NfFzxwKWL/aS0OrV8/dyx6dqU9aEdsf4yGM66WTAAEvm/7iA8Z0mwkUTNppM?= =?us-ascii?Q?67csdtyAQxm9ebRV8F5xHulgVNaM0Hcp3FawxwvWya6Em6X2j0PeWds6VR79?= =?us-ascii?Q?bFryAQusfaNOftYSEf4tp1XRKrQPSaUT/EVyQBihDDDQky7V593lLaBr/cVb?= =?us-ascii?Q?l5eY8a9bOAVVBiI4MiLZRcF1RBYgylD5oyfPyBBI/QojmbqrlkVlDh+Z4lhd?= =?us-ascii?Q?5UUqO9ajml8BVBz1vd0+0rnJ+aH4iV91m/uuUwkiPamEBdZewUY3QIBr6PMv?= =?us-ascii?Q?GJ5bMr73qORx73c6nh94Xmuxdzh7lTt5qVwOGWnG5TAUIpMlb5xiQ4HcGeIm?= =?us-ascii?Q?WAChGFbseNaLOPcKqmg14XJQbzSw3DU1uPZeIVvabTxyCT6+Pi4GeB+1dIF9?= =?us-ascii?Q?XQO8us4wA0TvqKBhx7yJmHkm1MyEO4EjOK24Jk1Bq1CUYRcsHSDjN/YLwBKh?= =?us-ascii?Q?OCReiGFVXEr5N+G0342jV9+jeSqzCNIl7lHBLhYsEOsmqH31v2+HlWULzyF4?= =?us-ascii?Q?ySebc55i85M+B+cgp6ltpPyZOr0fMXuPSGDh9VCGM+YexuAot6PDFdC4isYr?= =?us-ascii?Q?hVFTniP/bjqtpUJZcNW3Ty3bXJagnhUmTjX91zAZkcMJL63Fsd9lOxMihkB4?= =?us-ascii?Q?oJ/caL/W7Jm5jxDMX2IOvog/t+FeOeONZBjMHhFJmCXl1jLWoGZOm7BnV4jR?= =?us-ascii?Q?2SLpRxaVYUVSp22a7x2ZH9FikllhXrJtmXReOv6kzUt8Yef69UHjUoOYpxWM?= =?us-ascii?Q?F6WE9f3n9FJyHpQKQTBYcbKK0sE+NwXuu8/QrqIgUkb9wTT6qnvNdOqe/irP?= =?us-ascii?Q?NNMxdCLGjHf/xAi+OhZXTjmnl+khf3PAcNhjljdJY10JOyz3qC7Omg/EPpq2?= =?us-ascii?Q?g1kY1s4wb9athI6R78H2b4wBce0/yVFkEOD6TZscSzxgZuDQsOkUTAtw9coA?= =?us-ascii?Q?Iv7qtM/Xrr4aE1/PfKG633sMx65uFH0/8dxVVdlIncmhueEac0sJ5VrP9N30?= =?us-ascii?Q?DRKKDqwP3cI1ELW7bV+pxFfn8jDJB7k9/NfDy4I+EpuC26IZHDIgoRpiJYqW?= =?us-ascii?Q?SmFx7QczB3AQix7maP/4SKLpffA7HJcg/PsJkm7JXSSL+x4ZTv64Uxr2eJxt?= =?us-ascii?Q?asim011kcszziFlPDbaEmuMES6eSpPiFm6sbuWTPQLpqlx/4BIpLDTH6BHeK?= =?us-ascii?Q?q2jFHO2NAdsxsyQPzar1xJAH1HV15P+FHz8FgDi8tLq1zYvQBZV3hCyp+hND?= =?us-ascii?Q?MU/jaD8/eN8h4u6Bp5NyNioot7uNzgU2m8zBNOJO8SQKmuUo/4cCNpzACy1i?= =?us-ascii?Q?SFFqgRZUQeLb+QUyeURKdCPq+ifQEbVXS6PnNCid4Fftq9tLQGQklK17L7oQ?= =?us-ascii?Q?xFhy2LSkEyvKdwymbT/u+3Yb5+QaF0tusrjSkQkSOSlVIXBvMT43wzPA6Z4T?= =?us-ascii?Q?+2H0oQd8tnvLU1tgVo/WwEpzFXEEGzQ=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 330f1a34-2d9c-42df-e983-08da1d6cb0b7 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 16:43:08.6737 (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: AyReFIk1qOafXwHefamp9kGH80/gXTaUQnTmyYRWD4J+DwaYKkSAlSeqrYVXgTGRBise7xLrs0F7pVQOA4JuMzx/2NYq6F9KbmlOPwt101I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3562 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-04-13_03:2022-04-13,2022-04-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 mlxscore=0 bulkscore=0 phishscore=0 spamscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204130085 X-Proofpoint-ORIG-GUID: YHzokLuWxaRzDY_gjJehJ-X7lS8hIrFY X-Proofpoint-GUID: YHzokLuWxaRzDY_gjJehJ-X7lS8hIrFY 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 crash_hotplug_handler(). Thus the CPU must be explicitly excluded when building the new list of CPUs. This change identifies in crash_hotplug_handler() 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 | 9 +++++++++ kernel/kexec_file.c | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/kernel/crash_core.c b/kernel/crash_core.c index ecf746243ab2..036243b1f252 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -521,6 +521,15 @@ static void crash_hotplug_handler(unsigned int hp_acti= on, /* Flag to differentiate between normal load and hotplug */ kexec_crash_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. + */ + kexec_crash_image->offlinecpu =3D + (hp_action =3D=3D KEXEC_CRASH_HP_REMOVE_CPU) ? cpu : ~0U; + /* Now invoke arch-specific update handler */ arch_crash_hotplug_handler(kexec_crash_image, hp_action, cpu); =20 diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 94a459209111..9d5c4eea0179 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -1314,6 +1314,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) { +#ifdef CONFIG_CRASH_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; --=20 2.27.0 From nobody Mon May 11 05:34:35 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 DC458C433F5 for ; Wed, 13 Apr 2022 16:44:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237055AbiDMQqY (ORCPT ); Wed, 13 Apr 2022 12:46:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237015AbiDMQqL (ORCPT ); Wed, 13 Apr 2022 12:46:11 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92B9768F90 for ; Wed, 13 Apr 2022 09:43:37 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23DG8P02018418; Wed, 13 Apr 2022 16:43: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-2021-07-09; bh=JsVCsZ+KCmGDzN0ep+0qbdTruMs46F34lLVnEpsGBsI=; b=ttVtbZWv1Q32wvO7Z2W5e49T8Zzo2O7gsEd6VxzTFkZjrqYFzgYTrL4IlqTDYAG+zUxL rMH0tJQiYya9jh+WI2gdjQr3Y7LeAxMUcWjfutTAUlcrAJMZ+i5B0Q+xWfMcJeOpibXj 9LaqXLt6JywP8B8ZB8a5vqsbPVZoUSMD0HEYQA6YEHqEuEr4S3etvlVxlp8PsfgAuunJ Qq8XmZJL0dK5DvGU56/4ew1TS7MwYj4Nv6u70puGAdqGCwwWZQt225x+6FFD5tP+1cAo /cjoe/U2MPBzG+eJsnVPbTWW8eK+Awb86jOI4IUkuenuuI0NzMqmOXkZdn3Gcdll2MWk Lg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com with ESMTP id 3fb0r1jkf1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:14 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 23DGQLw5001321; Wed, 13 Apr 2022 16:43:14 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2105.outbound.protection.outlook.com [104.47.70.105]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3fcg9jw4pq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZOArOSNcymRypEEIFKTtcESrYHW/n8KAVTyE+WsL2E7gvuNCLn5fiYpM95O/6f+5ZU6MTErMYlsveeNbYo0Sa06kS+EvrHK31gqt+x6wyBJa7HFrPDEnuvFG8xzK031nI4rIAUCPu5yTwVRNwE/MUwY2U3EGbfPE/4e5oM6+vIUWls9WTbuFYB32gkuPYaY/4Ybu94sWwfmZ1bbBTW8aKx2N8KB8uxBN2YDAXelT5fGpjexTSkCdrcd8t9kvIjZoBjhYIvNvZWpYbUaNpukClzacXXfzjbsroBaWHRYGEim3DHqnVHN0USkR8y+8Ji7Fu1YbISoUsY7o86Jl2FfqMA== 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=JsVCsZ+KCmGDzN0ep+0qbdTruMs46F34lLVnEpsGBsI=; b=WryFXG2qllc4wPbv0j7U4LUgwaQNF9aE24O9XW7GtwRlSJ1f3EqMPElJDmpcttHNm3VWZcVpVYLfodwa5SkLTwDNuuOKnhc5PkCuauiPcAFbexfUNk4zeNB+5nbhX/3zGFnJv6/AbaZKV2f2MsrMx2yOqDwCByDK5xZtmb2gmoynQu5i9o24KJbDEoF+5YmYA65+Z5eTeqlZrl9P3GFNA67bcEX6VFTreIjS+0kewmP2dVaBFsDZ/u3Shxil2IsoiW7YaZ8q2/FXFzBqU13dJmVxgXYxB3CHcBv+mmyQhpLGmBScdRzn4rvUJMpuuDMqKGBtqcFM3fitDVApa/ceEA== 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=JsVCsZ+KCmGDzN0ep+0qbdTruMs46F34lLVnEpsGBsI=; b=yP+3aaHHrM8FV4H62roqMH7a49a5UIJl4kyARiKQJ3CTnzXaK9AR1iJQZ+nICx9NTfCTS1/S/jJoPBn92lUnDD9VqF12bjYNDu2gxobpj0bb9FP1v0yKGMpVYurOCQjvqXBKCQPhubBc6BBdjE7OsQcaV4bNCWbt/5W8quzvaBs= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by BYAPR10MB3560.namprd10.prod.outlook.com (2603:10b6:a03:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 16:43:11 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c%3]) with mapi id 15.20.5144.030; Wed, 13 Apr 2022 16:43:11 +0000 From: Eric DeVolder To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v7 7/8] x86/crash: Add x86 crash hotplug support for kexec_file_load Date: Wed, 13 Apr 2022 12:42:36 -0400 Message-Id: <20220413164237.20845-8-eric.devolder@oracle.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com> References: <20220413164237.20845-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0024.namprd13.prod.outlook.com (2603:10b6:a03:2c0::29) 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: 0871425d-a461-45b7-c268-08da1d6cb267 X-MS-TrafficTypeDiagnostic: BYAPR10MB3560:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X8FV8RChnJJ2wq41nTD0KuYluESCWq4dJCG3KcLqvKjVbJcVNq9EYtxQ6Y5AKIBMetWKIOdG2RWJMtaPnc4u/oAtYXM1qbfSvPcKQCVej32M/R1AbJ21Yk9EAbWcic2sdD/QB1KpVmry5DN9lsGi9ztXDYyZAF743vyYn/cBm6SdCaBgvzWzS9s1vfwLY/rK3tD0URSZnz/hwfiWhcuCc/ZJ+ybNQJFv4vve2KQURlY8CxX0ppeTTXEieeJnoXwvqLEdxqKN2PJ5wiVMgvVpLTc58L1yj4pAtSxRX2hvUYWwXoC9QuyZug6IUU8w5Nm7olJyI7QkW9skBNRvJzl94ohhxBGOYmAN3ML1JT9muhZmqe25x6U+/uzXZ9Uj5os2IZuDspO/0ZXwlQBpAL8xONy405Ri5i79nFwSR76cSNFRlOTFOlBAVJV3Bv9+im+Vs9navmuqBscCNURi574uLxk/iF+eQqaoq8W7cL0IFXqnMrs+OuPlkomEde8wohJZvUUZywAvHSJe0wS1BQtYdq+WGCCOxAo+1CagekgtfSAsBHAMtRzXSrGOduYRBYJDVwwhrBTdmkBIC0BhVAIMMnmnXWzPcKAWTqwTJobvoQ3Dpxhb64s4fNtp9jVoGAnD4rQ7JLMRdTABP+T6HKqtNed44WuYvTd8lwEkKGztTrvVvdWLWZwUOFDLKnQqMomfudrr6zC6EeyWw6mrajgLrQ== 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:(13230001)(366004)(6666004)(83380400001)(38350700002)(66556008)(36756003)(2906002)(2616005)(6512007)(86362001)(52116002)(6506007)(38100700002)(6486002)(508600001)(66476007)(186003)(26005)(107886003)(1076003)(66946007)(316002)(7416002)(5660300002)(4326008)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?x9X8EZvVk56MVmwRNG7uFfEzGFmtYkVKKppX2agrYrZPBkqT8/AtyW5lTFO2?= =?us-ascii?Q?nYPwpIk3TH+gxxH29lRGXjUx8++aDmbGIwn/QaHQLJleZErYvWVamVYwE2CR?= =?us-ascii?Q?rIuzm+58AuUgkuuvm6RuCbfUPgtg36D6WIVcnpC36+M8PPfE5scmSbL9UVCN?= =?us-ascii?Q?7YhRfoC1HgCtYi9a/fBWqPHsGGaQQTh0mYEhaEFB+8FPUu68iaCsseeuTDa4?= =?us-ascii?Q?PBvYkvdq24IN6fILsXoa9iizhxrjQaajdrhPH0zNWJJkMqhDODQVRNl73TLP?= =?us-ascii?Q?kNjrGjGvI4/k+JZWtrfx4M7z1MH6kHJStjrEAURgSYu5EHWgiIO1SOCCwtLr?= =?us-ascii?Q?byQxZgV8z04SSjaGzCCazSVNemUxieeiDVmfr4/xnMKDVmeGHoXyDUyvtbbe?= =?us-ascii?Q?CZtORGCvnqj1gvnT90kHLNiIgR5g2fm6MLWJnDMabolpD5DGydf1kp8Z/BNO?= =?us-ascii?Q?bP5H6LHtQjqGPVXw2CC1bMx/ip5ZJ7UPFhxr74/L851ZLVHYlMJmpvY2HnIJ?= =?us-ascii?Q?8QeM8FzwYc/TYjo8sAQkmJK9jGmLjZ7HnAmbjZpFHlXc82fbr3ccmZGDpE5H?= =?us-ascii?Q?v4naB/g+SQMbecBghvzotpw327YU/x1/pISwLeol01q3Y64PDi3rPruxDO2B?= =?us-ascii?Q?X2R+Tbb4kh1IjYdGnj2sbcaKPSmZ6daKQZdHK+B1NCAgmQOnGGIp6KGWFrZc?= =?us-ascii?Q?2sMiTKoWMjSHaxcawyOeQgfCbVqq9SqmQQQhZVe5s4mCur7bXrD8kdTmvucu?= =?us-ascii?Q?XpMWEX62Ad5NbHdjBvKV4pKlsq6/ldjCf/DmaluWRNJl/RdP9aQ3MkMNVWZD?= =?us-ascii?Q?HyqGv7yf438oaPq8MdvNtAi+4alvke+ectu5kE5fcG2ct96QpNR3VNETkv6c?= =?us-ascii?Q?CWx1S96PPVRXrFnt5HclsFb76q/u3psZFnW246ab+sb4ytoC0A2RC9MgUUDw?= =?us-ascii?Q?pXrPHuzqFutCLf7GQD+n37m+LhLFWTUsIFGgVFQ4gJ3As8Fw7ynNRlFfWRh0?= =?us-ascii?Q?8kG12q/j9KmGWVZJZI1XNVK/v87vrLiUGwDTnEq18G6QfH9fT//VGoaOV7pA?= =?us-ascii?Q?U9Qlx6HnN9NhjO/A4qvCqZfm5qAoIEMV35ZUEwuECbV63YiVjiBi9u+qpdmr?= =?us-ascii?Q?sDotY64+HCU0Ke198DtAWXa5LwJ+IBnm2u+7QZ44q0CYVm+7RYbkfYV7r90c?= =?us-ascii?Q?JqW/9n/yR2mNSp5M/c8O2CkEixoSnz1mVB5nZwodTnDvBYFjTouYrthcDa+D?= =?us-ascii?Q?tXYLqxCtpIq8Ngsd9gLz6/MMGkIbS2Od69U5n60yBpEF0zAX52NuXTq5bWaB?= =?us-ascii?Q?pYVEtZzBrcaiPODdh5p6FDLNRmEC6+LgO/yx8UmrEUupHYJ7o6AaWZ6DX1qL?= =?us-ascii?Q?opzMBUMOanBwpIPUKAH48f7caQBfUgDK+fy0mxKZ5MeLNkI6Uiww1OThKYjb?= =?us-ascii?Q?KIimrdJGM9FCAWeI6sW2xqGwvpW2I6VtrE1Nk4lwtPcU2ckblpnlwxsK0hHG?= =?us-ascii?Q?g6rJ9aJGVCpHt/V0QJPr/mcV1N7raHs64Y6fk2Sb08mWwRW+9YIqWMWEXf1l?= =?us-ascii?Q?tC+3sjnG6JAHxVBOd6WKouQHbYTyE95xYBf/JsSjR9LiEBit/UFkTiqegruQ?= =?us-ascii?Q?XkPwA/2KkPUI6mWLVoTvylVhIRz9rCE4+uGpLZq01N4ryoyjBfmci850lDy6?= =?us-ascii?Q?4x0nirJQD9G30r0S0x5W5pIrTHICizCNIp71WP6uyjTUBjEkHyx4U0x5DubS?= =?us-ascii?Q?Xov08iBSs9P4aGSiFe9omleBKDX5jOE=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0871425d-a461-45b7-c268-08da1d6cb267 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 16:43:11.5077 (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: rCCpkeLCjcgIM4ADV65iARSZz2PflyjhRlxZrXGDRQxBWo8p6mNNxtHb+2qazxkGrgNdV8y+/5De2wc0C36ClLJrN3eo55YhkdkNg/gmCpQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3560 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-04-13_03:2022-04-13,2022-04-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 spamscore=0 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204130085 X-Proofpoint-GUID: Ed8Jo6AoVuRwsv0ZbqM2E-ei--hyIUGP X-Proofpoint-ORIG-GUID: Ed8Jo6AoVuRwsv0ZbqM2E-ei--hyIUGP 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. 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_HOTPLUG_ELFCOREHDR_SZ configure item. With this change, crash hotplug for kexec_file_load syscall is supported. When loading the crash kernel via kexec_file_load, the elfcorehdr is identified at load time in crash_load_segments(). Signed-off-by: Eric DeVolder --- arch/x86/kernel/crash.c | 117 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 9db41cce8d97..47adf69c9f71 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -25,6 +25,7 @@ #include #include #include +#include =20 #include #include @@ -398,7 +399,17 @@ int crash_load_segments(struct kimage *image) image->elf_headers =3D kbuf.buffer; image->elf_headers_sz =3D kbuf.bufsz; =20 +#ifdef CONFIG_CRASH_HOTPLUG + /* Ensure elfcorehdr segment large enough for hotplug changes */ + kbuf.memsz =3D CONFIG_CRASH_HOTPLUG_ELFCOREHDR_SZ; + /* For marking as usable to crash kernel */ + image->elf_headers_sz =3D kbuf.memsz; + /* Record the index of the elfcorehdr segment */ + image->elfcorehdr_index =3D image->nr_segments; + image->elfcorehdr_index_valid =3D true; +#else kbuf.memsz =3D kbuf.bufsz; +#endif kbuf.buf_align =3D ELF_CORE_HEADER_ALIGN; kbuf.mem =3D KEXEC_BUF_MEM_UNKNOWN; ret =3D kexec_add_buffer(&kbuf); @@ -413,3 +424,109 @@ int crash_load_segments(struct kimage *image) return ret; } #endif /* CONFIG_KEXEC_FILE */ + +#ifdef CONFIG_CRASH_HOTPLUG +static void *map_crash_pages(unsigned long paddr, unsigned long size) +{ + /* + * NOTE: The addresses and sizes passed to this routine have + * already been fully aligned on page boundaries. There is no + * need for massaging the address or size. + */ + void *ptr =3D NULL; + + /* NOTE: requires arch_kexec_[un]protect_crashkres() for write access */ + if (size > 0) { + struct page *page =3D pfn_to_page(paddr >> PAGE_SHIFT); + + ptr =3D kmap(page); + } + + return ptr; +} + +static void unmap_crash_pages(void **ptr) +{ + if (ptr) { + if (*ptr) + kunmap(*ptr); + *ptr =3D NULL; + } +} + +/** + * arch_crash_hotplug_handler() - Handle hotplug elfcorehdr changes + * @image: the active struct kimage + * @hp_action: the hot un/plug action being handled + * @cpu: when hp_action is KEXEC_CRASH_HP_ADD|REMOVE_CPU, the affected cpu + * + * 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 + * CONFIG_CRASH_HOTPLUG_ELFCOREHDR_SZ. + * 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_hotplug_handler(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; + + if (!image->elfcorehdr_index_valid) { + pr_err("crash hp: unable to locate elfcorehdr segment"); + goto out; + } + + 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 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); + } + unmap_crash_pages((void **)&ptr); + pr_debug("crash hp: re-loaded elfcorehdr at 0x%lx\n", mem); + +out: + if (elfbuf) + vfree(elfbuf); +} +#endif /* CONFIG_CRASH_HOTPLUG */ --=20 2.27.0 From nobody Mon May 11 05:34:35 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 44C05C433EF for ; Wed, 13 Apr 2022 16:44:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237064AbiDMQql (ORCPT ); Wed, 13 Apr 2022 12:46:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237024AbiDMQqL (ORCPT ); Wed, 13 Apr 2022 12:46:11 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86BA968FB2 for ; Wed, 13 Apr 2022 09:43:40 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23DGRiu9018439; Wed, 13 Apr 2022 16:43:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=x3TulyQm3Ik2coGCKeCYOQNjm9LxJfcaSfr652uYxP8=; b=XIMkf2R44N0G2E9NC1v6Uyn70mAM23gUoYGxGRrvD+1xmMv2pBpThMd+bYzCCPVj9HeS kzNits6QGsJfwp97NBU6Nffo/T68dgBz7UEboWYYttz3CG44GGeJLFakSTqEHCN/Rhwu R2UiPmL0Nf48RDgMAnDPdMKspGIu8bGo/QNl2TqHtCdakbHEBeCxogHUpDvt5Ul7grIj 0oTBMkHCIPC4JwS8GTfnv94d43MZJCdkhjIqbOpMKTF8cM3F6ufwbBHWr2+4GtiU8tWP 2NPmHFSZtZz4u1xMTGMDFpbQSbiDaKTL/HG8GGVgCnBV8Hhqib8onknp/J9MDDzpENMm LQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com with ESMTP id 3fb0r1jkf7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:17 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 23DGPTcx020981; Wed, 13 Apr 2022 16:43:16 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2106.outbound.protection.outlook.com [104.47.55.106]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3fb0k4k9ma-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Apr 2022 16:43:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FEnGVNn9Gs88wf9fw6kNNM/m0s/l1PtDyEtIxPKxeUxndi1LErrM5DFFRw/GI2zABn+3Px36QjbobXsLAs+rEzIZ2zHi+NJnjPHeRIs4JNc423AJ/hX8IJYTsxq0LRfHRGxRpDN6HMt8S2PMSHPQNhvHZL3lJKWvnEOHna1hjo/us4w7W/M6+bmHw/z03LxF0Bf6IBQD6IPKyFV2m1m0SozPpeYcy09fR/HNLcLbAi3ezCR1WDu00eecFbdNMfAfDpSs/tO8elqMWiYvnsVHGlbu776mMA1rzLayP7t/asWH+e75u8dCvjZ15kjPH5MipY4MHncsPdWpY8hTAT4vKg== 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=x3TulyQm3Ik2coGCKeCYOQNjm9LxJfcaSfr652uYxP8=; b=aa+HBdCMdl061JU8kEC1Biyuwq0zgh8nJqn85Bv9uBkdpRjnDZK/XG3rnXUClzFAtP/t1Wx2SmlpQOal6Ct1eLV0I1w5LxQqGlzC1DcYxICpgR7FpzEyOnPz5k7RG1Ngbtfc0x5oZc6x67LUmWDT3jyWfMqiXmC0UnQXKpFufNJgHBJ8Sm7eDtY8P4nwB/uWKvn1+2nOZbG1TDQ5jMIQyKF5/zLsXAZeHvNE1A7usWNsMzKAJ+t9M0VVnW2QQtgrGPVT78wtGASghUcwbAmoID9+avGoB/KpDPV/aI5m4FsY3aUC1niY0JfutXOQ+wCLjiXfrPstEYVzjmbCz21cbg== 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=x3TulyQm3Ik2coGCKeCYOQNjm9LxJfcaSfr652uYxP8=; b=vThac6WCSUQV3il5iGVo5KYKTyxc8Nes3W+k451WAK3VXGhcGFqyKTG7/Bp20T/Y1J6bR3IBfP6MX48HgfIP/bTNH78ARNOurZTUsJPvBNlgCeE/8UtpKRWSJP0fMfyLL92LQlcqSKFHXBX0GdJVSUsRHjhRSLAgOtju0q4I0wM= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by DM6PR10MB3562.namprd10.prod.outlook.com (2603:10b6:5:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 16:43:14 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::65fa:78de:f4d:1a5c%3]) with mapi id 15.20.5144.030; Wed, 13 Apr 2022 16:43:14 +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, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v7 8/8] x86/crash: Add x86 crash hotplug support for kexec_load Date: Wed, 13 Apr 2022 12:42:37 -0400 Message-Id: <20220413164237.20845-9-eric.devolder@oracle.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220413164237.20845-1-eric.devolder@oracle.com> References: <20220413164237.20845-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0024.namprd13.prod.outlook.com (2603:10b6:a03:2c0::29) 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: 738ad679-4d54-400f-c5e1-08da1d6cb445 X-MS-TrafficTypeDiagnostic: DM6PR10MB3562:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MQiN4Xrn+ZgTB70H9yZwHiL1kemr7XzoxBhOTUI2UfVKaJcQBalgV4pE06V2Kxjf9jI748757scrsUJzzZRmUgclTyjfaZwyk3CP9jfbssCe7iG74h79wwo5zNdyVgKRfy69D1Cmvd1LHXLE1rAfESfoHfwD9doWjJNe1pNDzpQ9fvuRgc5DFO+p6VvfvgTolNNE2M9cgztmeyz2tpfGq1EKYwr86bxb504Z22V9SLU74/COyph9VZIsJ7fqFXBk5X3fMdP8HnUe5TzlfUhcMlijXexdDjcbJdC4VTsvQlEU9e07DiLNz4/u19NZ9rSgYoEQDM9JwHl8WxHdUi6zpeCzCfzvxahDdxL7TDvlBq5WQqI/Sggh3XZMRzNxpLzhWN7yX6OqpnRP8Rk7dVvCjCT2nVOQOEP6Xs8SBfYuRGGSUSzbmWX8C8TDFvne5Xv80+UIgjPGCS0FXcNUDTL89kweklhImBP+oMAHyJqEwzW8AYM60rojSzXRyPRrry9iqkyV/SsST+r52Ou0S8NheBMcOjDU4C20SyPD1f9WfIA0K6rAUuOO+tC/IEsQvWYcY1q1WDCNilZLHO+lHDqdq5qN6rWQ3XQzzyiDfxar2J/QRC4sY4Rz6S1OH5K26+cfoBstdS9MQKTRp1k6iJKShyUyjmp+QNee1wkXm8d72bmqt/xONGXvpWCL0tIoBl49N7PS5srOyO2YnRmUFCpK7w== 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:(13230001)(366004)(4326008)(86362001)(66476007)(66946007)(1076003)(66556008)(8676002)(8936002)(7416002)(52116002)(2906002)(6512007)(38100700002)(38350700002)(6666004)(6506007)(508600001)(316002)(5660300002)(2616005)(107886003)(36756003)(186003)(26005)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2Xa86XEnbOaiB3ogIwK5KLBZV9PsRvkLIliJ7f/dPyhzt2MGW2bQO1vTRjqI?= =?us-ascii?Q?6DE2i2QWOTrLiB3w4eJAwvl7sTsFVJXWzFDWyqVFWAl9v+IhNPJoSiv1PK2r?= =?us-ascii?Q?TfnZcWogwY393LGn5fujMuKZ7kGimRN3FoiiggbZ5wHQnnzs+46rQtUcNhxn?= =?us-ascii?Q?tawF41oj+0YnZxTC9froSGXpWHZvSOvK2uij9xelvKaMGvsq3WU+HqjE23Zr?= =?us-ascii?Q?axvYyPhhtCW3W++KjksBIw70sb31D0i+w+UhZ4eNIMbRZO8lce8LcE60qS1n?= =?us-ascii?Q?bJoOlTYdpK6H+DryCVg76LCV3nl1uguCkUPgwPccdyW6AYPqgSYSmgcUVid4?= =?us-ascii?Q?xjSQ2itLfsltkJ787aVDYNihe/DVGSf3GVTqK5BdGP1lGg1bDxHtkuRsLcv/?= =?us-ascii?Q?Rp2NFya3OiZcQ2G7XfUmSOVlnZ6HImnzfom+CLg4cmeYtqs2Fpywd2HEY5TZ?= =?us-ascii?Q?ELYmEwU9A7hmD45RPsiZoKUPC7wCIvnbn9HjUegEUN1n8OZoe+IrqSgRsEBE?= =?us-ascii?Q?yZeUsjRrykBwl4hjzhbk5OdypzQVe1aNc5R3scJ3wZyyOFf0ZNWcaRk7XJC9?= =?us-ascii?Q?o/va1AB4Op4AzEKYfeF9y19CpAFk0T+FOww+dehN5+UOlZWxywOobY2ZietX?= =?us-ascii?Q?xMQtZp//zbVmV53zMIousBplx9oizSoV9Pmn6mRqgDM/mRJ92qFh/eXHW9LM?= =?us-ascii?Q?nDwIUpnyipUnZPeIvw+PtES4Ek03FuliNkWWJj10LGGlBg9fXfwfuSvdKCYJ?= =?us-ascii?Q?mZsEVOhE7rIW1C2lWbStqIkozH9Fufr6/GHAJ7aigX+1SFqa4xXpEStFR+rp?= =?us-ascii?Q?4B6NGjOpEZwJwL//daIDsYj1LUdMTD9SacREHLT90rvL2kAlLMKaU3RT9mgV?= =?us-ascii?Q?aYHFZvALr594ExTKG3Fx+XLdoFycgI0sPgdw840CyB+B6+JsqWuLo55RnN1l?= =?us-ascii?Q?hVPmWgUQMCFrni8g1yYt6UIdbcSfVB53tDaHh45AxktoNQkX6rXgaKCyhqLr?= =?us-ascii?Q?bDY42RmGEnT1nVhR7ZzrkGotpOtD+WMZxXatA892pp6+ejTv8ASrtKAE9POV?= =?us-ascii?Q?k8+6YRM3QMIxQa6BXLjtepM91BZYM8QKODxoVIa0dA3kVVooXnqx+NBdtV4u?= =?us-ascii?Q?cN05C2jZDN+3oaCJ03Lnn1+OKRdyfwhoIdbt6ZSVTCQY+7UPggLh6YUXk34l?= =?us-ascii?Q?qXipQqEWq/1BBBmuyYBeQQGVAOvJXS1TCq4sND9h+YoHoPKFz3Hqr+AfxjQY?= =?us-ascii?Q?6BxVDiGusWIenDthufeQVPj/33mHBjSB7mTuE6N7ntoWcrq7/84Bzih/qND6?= =?us-ascii?Q?DFl/wDXdr7CUT5ag4gSfbo3vDEWPBrgQGA+xsErF7AZBug/hVoFig38dw1o8?= =?us-ascii?Q?5PSCqMfmZHE9TDRNQYOdPLuMwlCfs06/ESem+79qxH3G1f3RndWU9S2qx0g9?= =?us-ascii?Q?tVVNg8r8r19TUVJC0Bp1NdyRf8TyODNTI/ZIn8vcUFn6NLNcgqWFeKu/YayU?= =?us-ascii?Q?aNdr8qIwJVelGdV9SxAjw8q6i5QVHrRiEMetHASwWLl401IptCvpxZ4ftRSf?= =?us-ascii?Q?97HQfKmIoxU+WKFi79bz/8UX1kGzrDdmgi9Rm8bXRRGkyjxiuWnWAf592gv3?= =?us-ascii?Q?6fR/puzZ7LFBzGTuUjOCBZUPeRiGRDrq0Y55WTCphAeTAgOtPaWLVFLJiN9P?= =?us-ascii?Q?aLM9DwI1QLypQWaR3uPwzzsHpxC4ZLTekLiDTenMMEo96YFtBP4N4MVrV+6n?= =?us-ascii?Q?o43vkeglrrhMLi5uM0x2qM1blOpjVDw=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 738ad679-4d54-400f-c5e1-08da1d6cb445 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 16:43:14.6819 (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: AKPVykerY6vNeflr24ZBzk7KRB4Wb70zNIk1nREXcLQFZpcOoGmEk3wyOjpksveh6r7ZdFb7jIVNTnvn5YgHmZaT0OD1FOLKY5NpqMHeQ98= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3562 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-04-13_03:2022-04-13,2022-04-13 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 adultscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204130085 X-Proofpoint-GUID: c4AKapGgLogrlKJYropA2lvGsNRnRDte X-Proofpoint-ORIG-GUID: c4AKapGgLogrlKJYropA2lvGsNRnRDte Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" For kexec_file_load support, the loading of the crash kernel occurs entirely within the kernel, and as such the elfcorehdr is readily identified (so that it can be modified upon hotplug events). This change enables support for kexec_load by identifying the elfcorehdr segment in the arch_crash_hotplug_handler(), if it has not already been identified. Signed-off-by: Eric DeVolder Acked-by: Baoquan He --- arch/x86/kernel/crash.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 47adf69c9f71..aa2d9680431a 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -485,6 +485,30 @@ void arch_crash_hotplug_handler(struct kimage *image, void *elfbuf =3D NULL; unsigned long mem, memsz; =20 + /* + * When the struct kimage is alloced, it is wiped to zero, so + * the elfcorehdr_index_valid defaults to false. It is set on the + * kexec_file_load path, or here for kexec_load, if not already + * identified. + */ + if (!image->elfcorehdr_index_valid) { + 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 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; + } + } + unmap_crash_pages((void **)&ptr); + } + } + if (!image->elfcorehdr_index_valid) { pr_err("crash hp: unable to locate elfcorehdr segment"); goto out; --=20 2.27.0