From nobody Sun Sep 14 18:42:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91167C38147 for ; Wed, 18 Jan 2023 21:36:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229929AbjARVgk (ORCPT ); Wed, 18 Jan 2023 16:36:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229515AbjARVgY (ORCPT ); Wed, 18 Jan 2023 16:36:24 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAE5D62D13 for ; Wed, 18 Jan 2023 13:36:22 -0800 (PST) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30IKnG7X008508; Wed, 18 Jan 2023 21:35: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-2022-7-12; bh=9/bVpuk+uMb1Bj437tZwCfjxm5pp41gQevBuBX5gnVU=; b=tFjtHm4Fh4ToI7ZKgMsKsMndeittouwmQpDu/Ks2Jd/BlSQ36xczYr67gnmGrcVgozv1 6waEqUz47ndBSbZBxVyNWi1I+3aGwrDsRAMPwVFZ1KBmE+2GUn+mQ20mOuG/V7YP2Kpc mi7lEM/AANpmVAF45jwdhSsLxbAdwcOcC9P9tY8EP+62cJC7mII2UeJ12jMzO/gCDsWs P+KaG8liovY1kECVxR78Wmie7rpQeVU3CxclxHfwtI56qM3dRyLFZP8a75pOLWANNOC3 XsBMh9bJjsiu44uBWYOmO5MNvsQ3mcMuFw2PKVdoaUHqsQ8RO0QYjakgPROuvu7vY+bY 2A== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n3mxt8r31-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:35:58 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30IKSq4Z028461; Wed, 18 Jan 2023 21:35:57 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n6quftm68-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:35:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fP5AkssXGR5Hw8qQ2IxUyJHmlAqRipHI+ohbCGRCt8gTU/4+/9ZUkeW8faJ7XZXUVoz0hs5Hvgn33UTfAgfxHtA5hbhkrEfhJzXNzC26gAN0ywuhyfAnQ+FsMPrbMZBhNwoy8Zub0O50SXnN3gIRvOyTpaLE8iHG/BATKNLzMSvOu/XsjeHwejP7YjnntCDaHjMGiKZQNm1UF02DYg36bIAVpkumtHPt8/JER/5FrTnyNrUUgwogndtRp48Eu+3TkNYqu0nKABJ3+lKbJbXj7lU9NzbBQ9aINOmDtRe+M+ZvvH/+ZMmlmBhuiVmwnboqqoGZ+OhyQ1IUMTO+0yowyg== 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=9/bVpuk+uMb1Bj437tZwCfjxm5pp41gQevBuBX5gnVU=; b=PNySnz0UTdY/LWqGhSx4QRtS/OZG/+7gWD82hNR2Oo36SR+kmr4VwWM9VRJXf7GMoVXx9faS8+pQ+2K8SQM+mtZjb/IwSWM9ny3sNqglNRgrM9hG+5AwUTp/XZEMMrkHSD77avdpoI8DIBMzAPc67OefCDm7/BkBfF+wkOIHCmTQZIYY66jgqrOJGxHvJYAPgu7C44KrmbHnWRsf1bLlFjK75taGzbgMdYErlJoz8yp516mtMzfIPjlmb5jh6L2l9G9bB74+GazLT9u12ItCuCbYGMerg3GjC7IPh7pQNJzrefIaXHlQtq9mIlLN3L3QtCE2xorcSnm67eIy4DEKeA== 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=9/bVpuk+uMb1Bj437tZwCfjxm5pp41gQevBuBX5gnVU=; b=ZfEYPzOuqKWvYg1V/IEGlHoeOeSN/VxiqgMhZJtkFcYZxEOPNN5QD7nCfq14c276gWkk1N9W3TWRo/ZyylHlVFBMFHkjRl97+tNZO4BpHFRIYxjCrODiTJMTsscOVqgpwPvXrZibkDlFjApDLV9njp2Q/BT1U44Mp4UWRCS0jlU= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by SA1PR10MB5710.namprd10.prod.outlook.com (2603:10b6:806:231::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.11; Wed, 18 Jan 2023 21:35:55 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a%4]) with mapi id 15.20.6002.024; Wed, 18 Jan 2023 21:35:55 +0000 From: Eric DeVolder To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v17 1/6] crash: move a few code bits to setup support of crash hotplug Date: Wed, 18 Jan 2023 16:35:39 -0500 Message-Id: <20230118213544.2128-2-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230118213544.2128-1-eric.devolder@oracle.com> References: <20230118213544.2128-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR05CA0093.namprd05.prod.outlook.com (2603:10b6:a03:e0::34) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR10MB4531:EE_|SA1PR10MB5710:EE_ X-MS-Office365-Filtering-Correlation-Id: e15d2aad-a547-4fcc-2fb5-08daf99bfacc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8T9ac6n8SG585o9dQmv81DWAuG4Z9ES1PJekU74m7NTrbquF8B+J9JKzJTLuqz3X/tBRdtfw7lAzP2XYCFArjUqR3L4UWxAPTBE4k05l7k5jizVrn1bbcxjNphdD0LcnE07NIFyaDEGGgTvPYfjdD63SI25JYyT1Chcaye2oqbvapFeDK0mPXXMfpYQQELwUJJTWPe8SC/De1ZG8KfBzFAUqp0MOKVxgjiqymkN/EaA+/FKkH3u6Qid4v9X3V94RQiIMebTcZzf0vwh8MStwIkJuxaPkV7Sw1dlsdwnMaoD4PFlFm0tqElDGfDaPqZ6OJ6arJUJFIcAHyjIBithx9Fv0NOVBBkZAYtR00CJd6L+zTWMxd4U9CmM0PStnFrIwi41h0kfgDkgc4B8gU8JUrLLXE/weYA4VC12iob6/sBH0G1aNhdYY6TOwyPlA4n/OEtx0bgUTpHDNnTrDKF0db86vYaJYfwl7VfcnDiN2HQDGC91FodWqK/L4rrxSw0avr77vwSMuZGoZvNDWGbrxBf8qH8rbKt1P0oPUfSXRpsqxk2Dc8ehcY/RQZciFF8sxXRXfGpMpReOetkmUJqQgYt0NtxgcXjn00DK8Ly3cXP7JMKXhNUXkByd75YpBpKvaALYEWrpd/QQesSEo/FKdrQ== 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:(13230022)(136003)(366004)(396003)(346002)(39860400002)(376002)(451199015)(36756003)(86362001)(316002)(66946007)(4326008)(66556008)(66476007)(8676002)(6486002)(41300700001)(7416002)(8936002)(5660300002)(478600001)(30864003)(2906002)(83380400001)(38100700002)(186003)(26005)(6506007)(6512007)(6666004)(107886003)(2616005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Xr0H6H+ovbcyh0SdiwDEMS7B0Eu8oqqW8QemvE6ls+eYeYxfVQy0uNbk4Zv4?= =?us-ascii?Q?J2JZlX9k4Lc7cEznkohVhuNDMmpWmK6/ebzAnmhZgRFsDrD7choxPZmYRwqo?= =?us-ascii?Q?BQripHB3LlHqWnxLdqclfodOE2iA6Ku4KCGhCSLvtwLckkZG5YDvW7zbwo/9?= =?us-ascii?Q?w0aqrtSyxLAvymBl5y3gLceXYNVP0fch3rfHr+1jOUyW9QLWUQe3k92FvIH8?= =?us-ascii?Q?9etVy+Al50dJ4Hjl7OZVNixFzOEz/75Cfn9EssDKajCzUvjkb7yby1IEfFS1?= =?us-ascii?Q?FAYPgTSMT+HHCfrZyHlyfrwkkbZ9CgfybF2vkHZDuwikxL37Rnz+cZ5Jrhsp?= =?us-ascii?Q?UmagdenACW9RuI+OHkXO4xw75uberTIWi6BI9pLqd6z5odpHoy6/K5RTz2ra?= =?us-ascii?Q?8cqmLtHHmI2iMFgUkANyapMNGdtHWU80Km09/9LLFJ4TBmS4uLYQ824ThHcE?= =?us-ascii?Q?gnuya+Pkcvc/t0Q1JVi6rfc5oSWy986ODKPz4rDJmIjuTvkrVquoTaAIK1JC?= =?us-ascii?Q?QUogxqICimcV6kkI6HLf+PCFc35jbAyYTmIGRl4/4Aez93aGtePOjdTgvz9U?= =?us-ascii?Q?bCjGhrQvb8Rf+uuqRoFejTJrrF6F8nfKdJdThznrtTciee7lT1U2rneqHDqV?= =?us-ascii?Q?NuZ1zI+Cekr3eBdQvVGba71oxnSWHlArftqVTIwce8DqIJIiRfVHmW/xPyo8?= =?us-ascii?Q?Ew6k0HCqAiHaOcfJqjz78tCnkoA2VRdfRqgQsNLPIe0beV8ulwubqXI/kyDr?= =?us-ascii?Q?ywuxd+VpwKdYguSVmOQhCJLPFAQsTxeOFa3KnODLvxj08ECCVBPpppFji0NR?= =?us-ascii?Q?ZCh/qV7YGI9KwkOpANXMKb3UGnQor4b/UKttbeTB0NCfJ0YMpyZ558R+Nsx3?= =?us-ascii?Q?TwhGBHC4mBtOJc6VmWOdvlYACZR7K67udgrlkO8rIIYK/ka3ivrzeYY7JGW+?= =?us-ascii?Q?db8Vrak0RifNONeyrYRekf2bZYvHt+XtjZTDin+pUCvv7DcKc/15aBFHNRWX?= =?us-ascii?Q?r8XGRPy/+bbHLMcPclme7KROOL1QTH7U0Ll7OiK5jFJ8RpUYTGuhX43llbyE?= =?us-ascii?Q?LDo7jHF+rVmWUmgWUlGSYZX4J0E7Ia5/IKxppFzbjtHwYkV2GxehVZP7Qnn+?= =?us-ascii?Q?Mn18wdLR/wyMBWcpjYEOy4d60GwAsSi2fI0uZCBZW8KTDdStTtYA75mv8GTv?= =?us-ascii?Q?EGmgkGJr/b+ahxxq46y/ZVGi2Q5kOVKmLeQyHj4fUCHoKr3FI8sDRv1bdz+Q?= =?us-ascii?Q?325zPa0rlJuw8i1jVIAalySNKjHjtuQetww6FPukodkuLqYsgoJ5rYKlrfvE?= =?us-ascii?Q?KE+K5TwGR/mVGooq4C9+BLtpSPnT0EsV6PqkCmQ0Ssf7NBe42QAGBsSym+DO?= =?us-ascii?Q?6FwsQCm3fzz2eS9h76QlU1WTZyXJ7QpMlQAUVrCpbP3WaVhbqT4GRI74RtPu?= =?us-ascii?Q?Q7n2EvKv9K7nQ5lCS0fsUyYbx+oiB9WA82s0mGMvujuL9kTpgRBufTtSVYxL?= =?us-ascii?Q?7rXYtodljULTwpHV+lw/kIDbov3Pt33lCouHS9bYCIWu0u74z16LkWNI/p2H?= =?us-ascii?Q?Vxnib8C6/1hUtbc1XmWvPu3rgiVOuNzmWIEbJeS6KJtkx7/W0G6LSvCbZk0y?= =?us-ascii?Q?kg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?xirXBkNd7UpbD7593Q1GIrhFaALXvotAOexIEylmYs10lOFkfmMnxapFLBi/?= =?us-ascii?Q?pAMQt9U6iSsAAF8k5f3YTlr6sCNFgmA9sFO/MSIqVKcmxx0d3a3A8RfSwAhv?= =?us-ascii?Q?FgHZoABw/GfljmivZISL9ubb5pSKmw1+csKWwA6Jf94fPgMyUdK20b3b1GFt?= =?us-ascii?Q?JtP9ZM/D8Wn0DpauMgIE5mHethgQRd6fQsIH9Rljr+cop1u5VKGtowkaW/du?= =?us-ascii?Q?lr2hmS3ucnFLa8WXCBrg9UiMCY3Cgo6+YXy92GoU3pWxH1XJb7PBPjc5V3jp?= =?us-ascii?Q?zPlJvAK1XeIEhjWoOvxLPav3YvOUGPpWAj5qTXp5YawKTqc3JYfjSuklQbZ7?= =?us-ascii?Q?0UET7QBOVEdhA63SewJDgDOeRlWPDPEW7+SkKa0EET8tKGgYpiHfc8OcXyQu?= =?us-ascii?Q?+th8Oy/aTMqXFq7vxDl+RvNt+0U6TZEHvUhVU65uE0V/J8MovxAYb8XYMKZe?= =?us-ascii?Q?Iry91M0ZqMBgW9DZx1Yy1aMka3ss52tn05DHTXcR5dz7NlSt/VCM4ngkvvl4?= =?us-ascii?Q?EAMzCr30bobCDzh6cx44hMtaJFGkqObHeJDwSRuq7CjMA1UlIgByeCfgkzay?= =?us-ascii?Q?vwt7nMXn5WuddBJkZQp2YaK3qLW4Ow7ecyZAnbXEvC31aE0BuyXUvWNEA6dq?= =?us-ascii?Q?7V5wyWa1A/gIzVgKAk0wGTTCGW729HbyAljlTAaKuy0G6m+smG4BmphYkl1v?= =?us-ascii?Q?vKXE79NRnWKDiD62VnUo3+vsmEs98JMe7s35Fw8hh+cHV/uK1crFcIIZ69Ni?= =?us-ascii?Q?w6fhE04xHNNoYSd43LmsMGwtU8T+BZxXoMwxkD93gQy1R4CXaUD117XYTUqB?= =?us-ascii?Q?eNPwYT3T9W7VQw3D5cP+dQ1wz5QCsgnrc4LAQHAHQpvUucqrFGy8CpImmiOs?= =?us-ascii?Q?O05/V+emfRfo5cr1XUCtUXYyKTG9WtqMTVA0S0Mc/2ZzyAvRgnbOA03tiGkd?= =?us-ascii?Q?MXIPJJHWr6v21HFO7Q5Wn1ywuoWVXaJv011dYyukERGsaD8drTpP9zUP/j6M?= =?us-ascii?Q?/auHAQj+PGfM6GbHYY8YceLDGg8vHVeJY0608n13PuO8d7tlTBeK7w6MG23m?= =?us-ascii?Q?VtY5mz1Ff82UClh7A+HMM0S2e3jzYMfuKqROfVmD2wIK0OtnxFngGflOiY0D?= =?us-ascii?Q?yK9ifKETJn5InFbJJIVpyVn2ZLNDs72RIC7o65LDd9m3ZGYC81khShE=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e15d2aad-a547-4fcc-2fb5-08daf99bfacc X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 21:35:55.1778 (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: 5GzIDmFz9xkc5RqHd3ZHqCYGZMnb61edbIqLcyM8m2Uy4ntR65nuJmvx7Bf/yqcI0JlIwEdbTi7MyZ45CNqYZubpjGKnsH91VN5GFx8MwSk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5710 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-18_05,2023-01-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 mlxscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301180180 X-Proofpoint-GUID: mt64nRicdjY4YcNgftTJHCo4b5LDXYkt X-Proofpoint-ORIG-GUID: mt64nRicdjY4YcNgftTJHCo4b5LDXYkt Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The crash hotplug support leans on the work for the kexec_file_load() syscall. To support crash hotplug for the kexec_load() syscall, a few bits of code need to be move outside of CONFIG_KEXEC_FILE. The crash_prepare_elf64_headers() and crash_exclude_mem_range() functions, as well as the struct crash_mem are needed for support of crash hotplug on the kexec_load() path, as well as kexec_file_load(). As such, need to move these bits out of kexec_file.c and into a common location crash_core.c. No functionality change. Signed-off-by: Eric DeVolder --- include/linux/kexec.h | 30 +++---- kernel/crash_core.c | 182 ++++++++++++++++++++++++++++++++++++++++++ kernel/kexec_file.c | 181 ----------------------------------------- 3 files changed, 197 insertions(+), 196 deletions(-) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 5dd4343c1bbe..582ea213467a 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -105,6 +105,21 @@ struct compat_kexec_segment { }; #endif =20 +/* Alignment required for elf header segment */ +#define ELF_CORE_HEADER_ALIGN 4096 + +struct crash_mem { + unsigned int max_nr_ranges; + unsigned int nr_ranges; + struct range ranges[]; +}; + +extern int crash_exclude_mem_range(struct crash_mem *mem, + unsigned long long mstart, + unsigned long long mend); +extern int crash_prepare_elf64_headers(struct crash_mem *mem, int need_ker= nel_map, + void **addr, unsigned long *sz); + #ifdef CONFIG_KEXEC_FILE struct purgatory_info { /* @@ -238,21 +253,6 @@ static inline int arch_kexec_locate_mem_hole(struct ke= xec_buf *kbuf) } #endif =20 -/* Alignment required for elf header segment */ -#define ELF_CORE_HEADER_ALIGN 4096 - -struct crash_mem { - unsigned int max_nr_ranges; - unsigned int nr_ranges; - struct range ranges[]; -}; - -extern int crash_exclude_mem_range(struct crash_mem *mem, - unsigned long long mstart, - unsigned long long mend); -extern int crash_prepare_elf64_headers(struct crash_mem *mem, int need_ker= nel_map, - void **addr, unsigned long *sz); - #ifndef arch_kexec_apply_relocations_add /* * arch_kexec_apply_relocations_add - apply relocations of type RELA diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 87ef6096823f..8a439b6d723b 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -10,6 +10,7 @@ #include #include #include +#include =20 #include #include @@ -314,6 +315,187 @@ static int __init parse_crashkernel_dummy(char *arg) } early_param("crashkernel", parse_crashkernel_dummy); =20 +int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map, + void **addr, unsigned long *sz) +{ + Elf64_Ehdr *ehdr; + Elf64_Phdr *phdr; + unsigned long nr_cpus =3D num_possible_cpus(), nr_phdr, elf_sz; + unsigned char *buf; + unsigned int cpu, i; + unsigned long long notes_addr; + unsigned long mstart, mend; + + /* extra phdr for vmcoreinfo ELF note */ + nr_phdr =3D nr_cpus + 1; + nr_phdr +=3D mem->nr_ranges; + + /* + * kexec-tools creates an extra PT_LOAD phdr for kernel text mapping + * area (for example, ffffffff80000000 - ffffffffa0000000 on x86_64). + * I think this is required by tools like gdb. So same physical + * memory will be mapped in two ELF headers. One will contain kernel + * text virtual addresses and other will have __va(physical) addresses. + */ + + nr_phdr++; + elf_sz =3D sizeof(Elf64_Ehdr) + nr_phdr * sizeof(Elf64_Phdr); + elf_sz =3D ALIGN(elf_sz, ELF_CORE_HEADER_ALIGN); + + buf =3D vzalloc(elf_sz); + if (!buf) + return -ENOMEM; + + ehdr =3D (Elf64_Ehdr *)buf; + phdr =3D (Elf64_Phdr *)(ehdr + 1); + memcpy(ehdr->e_ident, ELFMAG, SELFMAG); + ehdr->e_ident[EI_CLASS] =3D ELFCLASS64; + ehdr->e_ident[EI_DATA] =3D ELFDATA2LSB; + ehdr->e_ident[EI_VERSION] =3D EV_CURRENT; + ehdr->e_ident[EI_OSABI] =3D ELF_OSABI; + memset(ehdr->e_ident + EI_PAD, 0, EI_NIDENT - EI_PAD); + ehdr->e_type =3D ET_CORE; + ehdr->e_machine =3D ELF_ARCH; + ehdr->e_version =3D EV_CURRENT; + ehdr->e_phoff =3D sizeof(Elf64_Ehdr); + ehdr->e_ehsize =3D sizeof(Elf64_Ehdr); + ehdr->e_phentsize =3D sizeof(Elf64_Phdr); + + /* Prepare one phdr of type PT_NOTE for each present CPU */ + for_each_present_cpu(cpu) { + phdr->p_type =3D PT_NOTE; + notes_addr =3D per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu)); + phdr->p_offset =3D phdr->p_paddr =3D notes_addr; + phdr->p_filesz =3D phdr->p_memsz =3D sizeof(note_buf_t); + (ehdr->e_phnum)++; + phdr++; + } + + /* Prepare one PT_NOTE header for vmcoreinfo */ + phdr->p_type =3D PT_NOTE; + phdr->p_offset =3D phdr->p_paddr =3D paddr_vmcoreinfo_note(); + phdr->p_filesz =3D phdr->p_memsz =3D VMCOREINFO_NOTE_SIZE; + (ehdr->e_phnum)++; + phdr++; + + /* Prepare PT_LOAD type program header for kernel text region */ + if (need_kernel_map) { + phdr->p_type =3D PT_LOAD; + phdr->p_flags =3D PF_R|PF_W|PF_X; + phdr->p_vaddr =3D (unsigned long) _text; + phdr->p_filesz =3D phdr->p_memsz =3D _end - _text; + phdr->p_offset =3D phdr->p_paddr =3D __pa_symbol(_text); + ehdr->e_phnum++; + phdr++; + } + + /* Go through all the ranges in mem->ranges[] and prepare phdr */ + for (i =3D 0; i < mem->nr_ranges; i++) { + mstart =3D mem->ranges[i].start; + mend =3D mem->ranges[i].end; + + phdr->p_type =3D PT_LOAD; + phdr->p_flags =3D PF_R|PF_W|PF_X; + phdr->p_offset =3D mstart; + + phdr->p_paddr =3D mstart; + phdr->p_vaddr =3D (unsigned long) __va(mstart); + phdr->p_filesz =3D phdr->p_memsz =3D mend - mstart + 1; + phdr->p_align =3D 0; + ehdr->e_phnum++; + pr_debug("Crash PT_LOAD ELF header. phdr=3D%p vaddr=3D0x%llx, paddr=3D0x= %llx, sz=3D0x%llx e_phnum=3D%d p_offset=3D0x%llx\n", + phdr, phdr->p_vaddr, phdr->p_paddr, phdr->p_filesz, + ehdr->e_phnum, phdr->p_offset); + phdr++; + } + + *addr =3D buf; + *sz =3D elf_sz; + return 0; +} + +int crash_exclude_mem_range(struct crash_mem *mem, + unsigned long long mstart, unsigned long long mend) +{ + int i, j; + unsigned long long start, end, p_start, p_end; + struct range temp_range =3D {0, 0}; + + for (i =3D 0; i < mem->nr_ranges; i++) { + start =3D mem->ranges[i].start; + end =3D mem->ranges[i].end; + p_start =3D mstart; + p_end =3D mend; + + if (mstart > end || mend < start) + continue; + + /* Truncate any area outside of range */ + if (mstart < start) + p_start =3D start; + if (mend > end) + p_end =3D end; + + /* Found completely overlapping range */ + if (p_start =3D=3D start && p_end =3D=3D end) { + mem->ranges[i].start =3D 0; + mem->ranges[i].end =3D 0; + if (i < mem->nr_ranges - 1) { + /* Shift rest of the ranges to left */ + for (j =3D i; j < mem->nr_ranges - 1; j++) { + mem->ranges[j].start =3D + mem->ranges[j+1].start; + mem->ranges[j].end =3D + mem->ranges[j+1].end; + } + + /* + * Continue to check if there are another overlapping ranges + * from the current position because of shifting the above + * mem ranges. + */ + i--; + mem->nr_ranges--; + continue; + } + mem->nr_ranges--; + return 0; + } + + if (p_start > start && p_end < end) { + /* Split original range */ + mem->ranges[i].end =3D p_start - 1; + temp_range.start =3D p_end + 1; + temp_range.end =3D end; + } else if (p_start !=3D start) + mem->ranges[i].end =3D p_start - 1; + else + mem->ranges[i].start =3D p_end + 1; + break; + } + + /* If a split happened, add the split to array */ + if (!temp_range.end) + return 0; + + /* Split happened */ + if (i =3D=3D mem->max_nr_ranges - 1) + return -ENOMEM; + + /* Location where new range should go */ + j =3D i + 1; + if (j < mem->nr_ranges) { + /* Move over all ranges one slot towards the end */ + for (i =3D mem->nr_ranges - 1; i >=3D j; i--) + mem->ranges[i + 1] =3D mem->ranges[i]; + } + + mem->ranges[j].start =3D temp_range.start; + mem->ranges[j].end =3D temp_range.end; + mem->nr_ranges++; + return 0; +} + Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type, void *data, size_t data_len) { diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index dd5983010b7b..ead3443e7f9d 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -1135,184 +1135,3 @@ int kexec_purgatory_get_set_symbol(struct kimage *i= mage, const char *name, return 0; } #endif /* CONFIG_ARCH_HAS_KEXEC_PURGATORY */ - -int crash_exclude_mem_range(struct crash_mem *mem, - unsigned long long mstart, unsigned long long mend) -{ - int i, j; - unsigned long long start, end, p_start, p_end; - struct range temp_range =3D {0, 0}; - - for (i =3D 0; i < mem->nr_ranges; i++) { - start =3D mem->ranges[i].start; - end =3D mem->ranges[i].end; - p_start =3D mstart; - p_end =3D mend; - - if (mstart > end || mend < start) - continue; - - /* Truncate any area outside of range */ - if (mstart < start) - p_start =3D start; - if (mend > end) - p_end =3D end; - - /* Found completely overlapping range */ - if (p_start =3D=3D start && p_end =3D=3D end) { - mem->ranges[i].start =3D 0; - mem->ranges[i].end =3D 0; - if (i < mem->nr_ranges - 1) { - /* Shift rest of the ranges to left */ - for (j =3D i; j < mem->nr_ranges - 1; j++) { - mem->ranges[j].start =3D - mem->ranges[j+1].start; - mem->ranges[j].end =3D - mem->ranges[j+1].end; - } - - /* - * Continue to check if there are another overlapping ranges - * from the current position because of shifting the above - * mem ranges. - */ - i--; - mem->nr_ranges--; - continue; - } - mem->nr_ranges--; - return 0; - } - - if (p_start > start && p_end < end) { - /* Split original range */ - mem->ranges[i].end =3D p_start - 1; - temp_range.start =3D p_end + 1; - temp_range.end =3D end; - } else if (p_start !=3D start) - mem->ranges[i].end =3D p_start - 1; - else - mem->ranges[i].start =3D p_end + 1; - break; - } - - /* If a split happened, add the split to array */ - if (!temp_range.end) - return 0; - - /* Split happened */ - if (i =3D=3D mem->max_nr_ranges - 1) - return -ENOMEM; - - /* Location where new range should go */ - j =3D i + 1; - if (j < mem->nr_ranges) { - /* Move over all ranges one slot towards the end */ - for (i =3D mem->nr_ranges - 1; i >=3D j; i--) - mem->ranges[i + 1] =3D mem->ranges[i]; - } - - mem->ranges[j].start =3D temp_range.start; - mem->ranges[j].end =3D temp_range.end; - mem->nr_ranges++; - return 0; -} - -int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map, - void **addr, unsigned long *sz) -{ - Elf64_Ehdr *ehdr; - Elf64_Phdr *phdr; - unsigned long nr_cpus =3D num_possible_cpus(), nr_phdr, elf_sz; - unsigned char *buf; - unsigned int cpu, i; - unsigned long long notes_addr; - unsigned long mstart, mend; - - /* extra phdr for vmcoreinfo ELF note */ - nr_phdr =3D nr_cpus + 1; - nr_phdr +=3D mem->nr_ranges; - - /* - * kexec-tools creates an extra PT_LOAD phdr for kernel text mapping - * area (for example, ffffffff80000000 - ffffffffa0000000 on x86_64). - * I think this is required by tools like gdb. So same physical - * memory will be mapped in two ELF headers. One will contain kernel - * text virtual addresses and other will have __va(physical) addresses. - */ - - nr_phdr++; - elf_sz =3D sizeof(Elf64_Ehdr) + nr_phdr * sizeof(Elf64_Phdr); - elf_sz =3D ALIGN(elf_sz, ELF_CORE_HEADER_ALIGN); - - buf =3D vzalloc(elf_sz); - if (!buf) - return -ENOMEM; - - ehdr =3D (Elf64_Ehdr *)buf; - phdr =3D (Elf64_Phdr *)(ehdr + 1); - memcpy(ehdr->e_ident, ELFMAG, SELFMAG); - ehdr->e_ident[EI_CLASS] =3D ELFCLASS64; - ehdr->e_ident[EI_DATA] =3D ELFDATA2LSB; - ehdr->e_ident[EI_VERSION] =3D EV_CURRENT; - ehdr->e_ident[EI_OSABI] =3D ELF_OSABI; - memset(ehdr->e_ident + EI_PAD, 0, EI_NIDENT - EI_PAD); - ehdr->e_type =3D ET_CORE; - ehdr->e_machine =3D ELF_ARCH; - ehdr->e_version =3D EV_CURRENT; - ehdr->e_phoff =3D sizeof(Elf64_Ehdr); - ehdr->e_ehsize =3D sizeof(Elf64_Ehdr); - ehdr->e_phentsize =3D sizeof(Elf64_Phdr); - - /* Prepare one phdr of type PT_NOTE for each present CPU */ - for_each_present_cpu(cpu) { - phdr->p_type =3D PT_NOTE; - notes_addr =3D per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu)); - phdr->p_offset =3D phdr->p_paddr =3D notes_addr; - phdr->p_filesz =3D phdr->p_memsz =3D sizeof(note_buf_t); - (ehdr->e_phnum)++; - phdr++; - } - - /* Prepare one PT_NOTE header for vmcoreinfo */ - phdr->p_type =3D PT_NOTE; - phdr->p_offset =3D phdr->p_paddr =3D paddr_vmcoreinfo_note(); - phdr->p_filesz =3D phdr->p_memsz =3D VMCOREINFO_NOTE_SIZE; - (ehdr->e_phnum)++; - phdr++; - - /* Prepare PT_LOAD type program header for kernel text region */ - if (need_kernel_map) { - phdr->p_type =3D PT_LOAD; - phdr->p_flags =3D PF_R|PF_W|PF_X; - phdr->p_vaddr =3D (unsigned long) _text; - phdr->p_filesz =3D phdr->p_memsz =3D _end - _text; - phdr->p_offset =3D phdr->p_paddr =3D __pa_symbol(_text); - ehdr->e_phnum++; - phdr++; - } - - /* Go through all the ranges in mem->ranges[] and prepare phdr */ - for (i =3D 0; i < mem->nr_ranges; i++) { - mstart =3D mem->ranges[i].start; - mend =3D mem->ranges[i].end; - - phdr->p_type =3D PT_LOAD; - phdr->p_flags =3D PF_R|PF_W|PF_X; - phdr->p_offset =3D mstart; - - phdr->p_paddr =3D mstart; - phdr->p_vaddr =3D (unsigned long) __va(mstart); - phdr->p_filesz =3D phdr->p_memsz =3D mend - mstart + 1; - phdr->p_align =3D 0; - ehdr->e_phnum++; - pr_debug("Crash PT_LOAD ELF header. phdr=3D%p vaddr=3D0x%llx, paddr=3D0x= %llx, sz=3D0x%llx e_phnum=3D%d p_offset=3D0x%llx\n", - phdr, phdr->p_vaddr, phdr->p_paddr, phdr->p_filesz, - ehdr->e_phnum, phdr->p_offset); - phdr++; - } - - *addr =3D buf; - *sz =3D elf_sz; - return 0; -} --=20 2.31.1 From nobody Sun Sep 14 18:42:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1AE0C32793 for ; Wed, 18 Jan 2023 21:36:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229769AbjARVgs (ORCPT ); Wed, 18 Jan 2023 16:36:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229870AbjARVgd (ORCPT ); Wed, 18 Jan 2023 16:36:33 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAEA564D83 for ; Wed, 18 Jan 2023 13:36:31 -0800 (PST) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30IKmkKE029504; Wed, 18 Jan 2023 21:36:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=DvuQcDsnckvmVGNILjIjL44xiJ7gNogghIQftN3NIJI=; b=wPvd7rgd2CkG32i/iHGtaxg7bcz/HOGRE6PPcA9rw5xWnC2bToqUBekBtkMFyeHvKUwi qZPmYqCyY9UZsEB8xYJqYFUcVXgG4tyOePvrVtMOvViV/RVJhcg5gyIbfDvrCX1kj/HD uDB6dg85DMmiEKA8/BAaGIzgvJcdTnkVrF7D35niv9EsUOyh7K601EBXBS+KRcJXzaDi oR0MV5sM+yXJ66XPBT52rv1O39VRqS3wvmpOkQXxi0i+tcFY6FhcnGBK8LsNyFQZbDJo 01t8i/k0yVX8w/zTXaZ/naSsePpF8wp8hVZaBdEEGQwksBQuRIA1u1lNM/CNC99OfUtb ug== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n3m0trpuc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:36:01 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30ILVkZC009793; Wed, 18 Jan 2023 21:36:00 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2046.outbound.protection.outlook.com [104.47.73.46]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n6qmcu8p2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:36:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EjPjfDB0rRaC2d+QLnyMVIxHk74F/TBBzSBVRZMt5AGIDFq0YEgQU8waZShrksa54MOao0+ZZ21Nqg/FKRdak19Iq710oOOm6KuFRi/tTTp0DMI6FnkOfdVYfcJK3BbFrxDax3n96Jd7oxOEl94eHHxvM03oBzbyuf7S/Xy26DXiqtlsORBr17PITXdehSMs08qPCrULwT+Cofu4rJ7KXkAjnjRi2tAp7HVu/i24H5Dczak0zmrlh6K6qs/q69kTYQWwB3OxxUNCAXbjuopPViXkpbZG0iiKYKfGrilWfhKf2NGqdJdWjbzN/otnH9NWczvQwOfuLQKdnaJzuKErYw== 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=DvuQcDsnckvmVGNILjIjL44xiJ7gNogghIQftN3NIJI=; b=JjwLB7ICGNrqOnnWXAyy1CFQNZjLvp9B0U7jzk2WBZe6zlASPHX8O6HoNUfwOqRFW2fvqRZBsA+Hfbrt+Vk+T4mWo7zJMrzGWHq0HuUKH+gghPs8Aq4n8h8GReKITW4M/ZhSuSkMron2NxI70gsX8nfgUbI86yMyayH3GMo8WEQHDCvAxoX0HhY4Ywr68qK2MhHBfpR/MForVeHNGiuYCuMznNv0QnsfO+o3aD+v/LHRCRuYPcxInFhMo707qKmnofPkIlbQ06V2aMxVQPGbJxEobsJJyH3nRpjPctAqSagcyxRPIiwEsRvQWDfgI/2SVlW6sshKAZEfONMJ/fh/oA== 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=DvuQcDsnckvmVGNILjIjL44xiJ7gNogghIQftN3NIJI=; b=uHwU35XwVj68si3cOUhL5JdAsUg4lGbdwpl4KOSC7JQX/OJls2UHhRWWNgKcGOhgclR2zF91x54HNdMxAyORYBxLQR+9fXfFXDCd+OVy9VxrDGIvIzduZMSys3WyxFtdVhBaeaVdbOIXwPDwOTZNy2/keYeNMDMn0hhvEaYgZto= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by DS7PR10MB5214.namprd10.prod.outlook.com (2603:10b6:5:3a0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.24; Wed, 18 Jan 2023 21:35:58 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a%4]) with mapi id 15.20.6002.024; Wed, 18 Jan 2023 21:35:58 +0000 From: Eric DeVolder To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v17 2/6] crash: prototype change for crash_prepare_elf64_headers() Date: Wed, 18 Jan 2023 16:35:40 -0500 Message-Id: <20230118213544.2128-3-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230118213544.2128-1-eric.devolder@oracle.com> References: <20230118213544.2128-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR05CA0103.namprd05.prod.outlook.com (2603:10b6:a03:e0::44) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR10MB4531:EE_|DS7PR10MB5214:EE_ X-MS-Office365-Filtering-Correlation-Id: a233ebe9-cf05-4106-ab34-08daf99bfc98 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oaIYwkmiYkXNCLlRzezxE7WXk7YvMeGG9GruZZnPS9In3LLmMeBzUL6Qae9sILryYP1x3pXPn7yxfDRaVCjHueauE5KEabjQzTc/BUv5jsharzXuS7o+2a38pqUk1ZFKQD09frLT8PsrxNIGVr8ZPO8rhL6xNDe/YaFveepqrJ4dhQhwVpKGlq37i6jrzAgewM8fDvB2rB58Hn/WVaio5MY5R4f3b3NqHy99l+FI0yvCVZC+ujDxSurvyB+WkqJYfa18SxYGANZqs+KHsKYCvdoZSRJ0yhDlTHJXj0sbN39IYL7OueRRtuyE1pDbWfqOvLEpomsgQ0PmF4YXDktyLF5+q3mDTwcSdyIdOxWf8Orcopb8N2BXTpcXwoUZYIVQD8xbbSfcbT9aowJ4hjowJAblIWj3kbAs7YZzfWcOoI/tItS3em3jXGKVDwtXdGmcWjuZYuReluvW0BucJp45MdSySz00Xw21br0cDst5PeO38FWmnM/jFEuA4GpdOqupPpmWmzx4QxcAlrlDIf9GHgxHsbkmE5/xe2ijYbI5Vxtlqc0ErodZvBQgqsP5csH1AYhrQeD9jW1nEIdP+l806wZfl+tsSZdfpC8mFrI9NtCZpOcDPO6ZONZk5Y6SMG7ryjnee9nxMfO3A+iF+f2srA== 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:(13230022)(396003)(376002)(136003)(346002)(366004)(39860400002)(451199015)(66476007)(66946007)(66556008)(4326008)(8676002)(36756003)(41300700001)(83380400001)(86362001)(316002)(1076003)(2616005)(2906002)(38100700002)(8936002)(7416002)(5660300002)(186003)(478600001)(6512007)(6486002)(26005)(107886003)(6666004)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BMzvsufwjwBgSAnF3rK5nf/H+M3EUIfbOfQUZdWHg9PYHQnqaQ8c5CDNuRJh?= =?us-ascii?Q?sHNpe7Rj6VoYHTYrXxwnJO9lCmrMu018pQTDZp2RSDfVAZOujs/Ztu/bt0IT?= =?us-ascii?Q?HK/yweZugnwRm57Cz9XzTh79BolIhyUyzdpDDN5k/3AYmkvlQVIkwFL3flCp?= =?us-ascii?Q?5Pbp2INRqUBnGN327JUx1uUnSwjuuCaeyEorAs/uYKajFj/Pe3IIwgTDwui0?= =?us-ascii?Q?p3lSs352ps5o/Lsq40pqZFSN6mKORwggM0b/b4vnh/ouRVhFIg5UzMcoapf1?= =?us-ascii?Q?swy8nsMY4KVMMDzwaVDQg+xBJmlFheanYuwKyeOFYZffnNxh+YbEfi9l91PA?= =?us-ascii?Q?0biNiQsWkV5pu4rtj9JLReQmcBnNHgT8KrAkD4s0rncLse7qQsXIg4wn6KYv?= =?us-ascii?Q?EkEJ284n19+9CNUweZBKH1R7TR5UXQ4fm8IcUsUqOmFhGAOj/1pBEXPmbZGa?= =?us-ascii?Q?ONfWFTPWIIGFRPDr5zmy27K47u9K7G+6GIkd9YtSjUpp4IxiWHwJ9msxG6Ij?= =?us-ascii?Q?bRHsr4qU873hgIswOH8KAbGYVMk7hl512roVX6RgmrprCBJH8r2b8tBIJgbp?= =?us-ascii?Q?WIwgbRQ21WNQqPyueLIM1QHKCQDUrRb96qIbW996WjskrtsHjW3VG8kiOqxN?= =?us-ascii?Q?rSlkFsrcZ7UdetZfT7W894OdQY5TiDQJJXZG/z3FlsAF7V/1DIPvdGgNqcZ1?= =?us-ascii?Q?M8OFaziXwjMYWfIiKwljyoLaCS8FEdl35pia3+quYiK8UIm3UKtqCMaI2W/5?= =?us-ascii?Q?hGmh9yI3laUG8lil8rbFnXdQOGYwEsQcAjAN8OTa/2SIhyl+C38HBa4neolC?= =?us-ascii?Q?vRanko/xPN5QllDsYQ/gf5PuMHZ02O/iNHDkO4pNmFlxuzaS/jVguhO/x0ca?= =?us-ascii?Q?cmCAFheBENqCaWp4PW819h0xnq/JQktG2iTJkNefUAEJAz3JL4Iwb63rrG5T?= =?us-ascii?Q?5qPJYB461em8TfQxDzSGH0pwYUHyGmYRv0hNvf4LfF0TvhVOgz66eIpf7qCR?= =?us-ascii?Q?VS4xX49Dcp6xS7kZdYs/DmiHfdbGCH99/G/cUths3oGkwrjbQiV23jfQ13MW?= =?us-ascii?Q?uYi3KQCKprIauYuMzZMO5d611XUCzNqvIuyakrCIbknVDCMARXJ1C8CZWjyZ?= =?us-ascii?Q?GU3/okDX+EfIEesNNDBR5Wh/yKBOIqVkg4VwZ7oV/LscoDJBKA7ZsN89j44s?= =?us-ascii?Q?BqqZoGgSZYZkwG//YKwo2YxHc4DgKTTI5KKtH+zA29kPvaF2TFLaJMXd4uP4?= =?us-ascii?Q?P0lEl4HRIqrevUCFArbhZefJV9DnVSNUCygTiR2HqtrMcCjWUXdSUIif90Zl?= =?us-ascii?Q?ZCXFDuBfR1Y94MfJO3qglRCrHd5C3xIMSOovdFP+3NYD20wscXYrmuvfr25u?= =?us-ascii?Q?+DfLl5CcAoxJ2qa8Y8Im3hTMrLlhbpM+CgXK8YHGEbqJzifavGWteQS17PlY?= =?us-ascii?Q?GiFWIcssOW+vX9Ttsp3rlPHzZAHKvHwI9/KixoV8t9VnpcbafRy47pC+P5Xl?= =?us-ascii?Q?/p0ErHhojo2jYchFNzDhRd4haqrH8/vGzSEPFUxKhd6/IwWRxdxXTCqDKtlP?= =?us-ascii?Q?B0RDnkc6v9+H0wVChs37+Va6RThadZnujIkaNb+0l5ExiN4YFgvUJUOsOlwS?= =?us-ascii?Q?2w=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?CQWweTHbtaIMQm7ca2rrzybuMWmDQudyERSi/Fn61mPc3IuKQKFrxKB5TdKI?= =?us-ascii?Q?9WqvU9inDrse3WVbCoitmRLhwn0tYkVrfu5adBnsFB7ORFjhaROHSEU1+vd9?= =?us-ascii?Q?IYQQrXhPKvM/lPEx+cIc4yyTqQtmxzEva/5Ji65I66XCqjZh264BUT7UC4Bw?= =?us-ascii?Q?un+eeGBjtQox+l8TqoWTXcLHW8n5buDF/s+T6bUwShzWqKf7c+0VgsEARes4?= =?us-ascii?Q?de4h9nwFcwE7XMlklF8cA4vph02q9fOHS09Hm/KCYHQzt7e4DQa6hJPw46CA?= =?us-ascii?Q?OtA3WXMaY2ADrgk6AlzOEcoYqZyxZitBOJud7c3GHXhNTsmZuxFlSEWL/+mB?= =?us-ascii?Q?PwNNk7ENFOJH99JmYmw2ZufZQaLsSYz3q/VLWHfPVZC5innpEJc9sdMudglm?= =?us-ascii?Q?sUsv3rZ3zy7EKUQJ2MYVj9i8gUPfq6EH32OImVPxSovNdj/ZmmfFOWWspGoN?= =?us-ascii?Q?7S96aEXvgTtkI4kELxmh73rY8zMGCmRsZnuT5j69uOvbZE1MHoI/VWbc7tyw?= =?us-ascii?Q?33XLOkm1p0GubzSnC23Cbf/2u0YJuZLgLkEjRQbeXTJCfZgWUT8cwVtcBFEF?= =?us-ascii?Q?METtm+HU8TBTI7nUlfg/i5Pj7SQ9pc2mwDoFdTRuxzr2gm0qe3JF11PhOjml?= =?us-ascii?Q?F3BHEhvkJvsIUiMK+lI6/1YYiehikuJMOHy7N8QNpDmRBOcCa6IQ3EyLeIhX?= =?us-ascii?Q?W8+kY/R/+N42g8B2wppr5vd2bjOhsvOGm9H08A45pw3oKdNA9wKPtOjpKuNy?= =?us-ascii?Q?TSrFADKGGgelLADL2UsWFeP4jjifavqevLR+EWQ4yjJpZSOhdrxXbkLncCCD?= =?us-ascii?Q?CrB9bYRjk9wtgzUTPLVt4aiPIPnpGUUSIA5zYAo+vHjJ0suxUWEdcLWak6TJ?= =?us-ascii?Q?U/PeNpiOPDs0yKJX+NDptKCBFDKm7dGwGYRlJdWttlP4UGLXtO1H+Q+n4V/Q?= =?us-ascii?Q?/h/SWqEIWf5xPrk91jlc9EShIfgbp67Xu8gTKAGKTbflCH8QZppP9AwDoVgC?= =?us-ascii?Q?qZHCC/erQoeJ1lbPzPrXo58EVUIitsJ5nW1nZ8C4I5pNBNX7AEgq8Q7SK7+i?= =?us-ascii?Q?Ur4n6PCSDFmTPjHHaWvv7WIeDuTUdhZ+0vjpNaa00/IX9nMB1pJdGaLD4ILC?= =?us-ascii?Q?2qmAT4rHsZq7L2CDq9qXEysX/7PFDklayqgEjW8hpQcJ789dGtYpUe0=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a233ebe9-cf05-4106-ab34-08daf99bfc98 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 21:35:58.1331 (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: l0N9bo9Xf2UN/aGBnXJnbJcD4YmZ5zA3VZjTINH0PNKVkAUyiDtJodzeXRdnhzU2AR0jgpLkzyVaOcecsYFjVu2uPr0GasQkh4xDo2hxdIY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5214 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-18_05,2023-01-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301180180 X-Proofpoint-GUID: GIJgoJuvIb82DNaBuRyALJPnmxL-WiQS X-Proofpoint-ORIG-GUID: GIJgoJuvIb82DNaBuRyALJPnmxL-WiQS Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From within crash_prepare_elf64_headers() there is a need to reference the struct kimage hotplug members. As such, this change passes the struct kimage as a parameter to the crash_prepare_elf64_headers(). The hotplug members are added in "crash: add generic infrastructure for crash hotplug support". This is preparation for later patch, no functionality change. Signed-off-by: Eric DeVolder Acked-by: Baoquan He Acked-by: David Hildenbrand --- arch/arm64/kernel/machine_kexec_file.c | 6 +++--- arch/powerpc/kexec/file_load_64.c | 2 +- arch/riscv/kernel/elf_kexec.c | 7 ++++--- arch/x86/kernel/crash.c | 2 +- include/linux/kexec.h | 7 +++++-- kernel/crash_core.c | 4 ++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/mac= hine_kexec_file.c index a11a6e14ba89..2f7b773a83bb 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -39,7 +39,7 @@ int arch_kimage_file_post_load_cleanup(struct kimage *ima= ge) return kexec_image_post_load_cleanup_default(image); } =20 -static int prepare_elf_headers(void **addr, unsigned long *sz) +static int prepare_elf_headers(struct kimage *image, void **addr, unsigned= long *sz) { struct crash_mem *cmem; unsigned int nr_ranges; @@ -64,7 +64,7 @@ static int prepare_elf_headers(void **addr, unsigned long= *sz) } =20 /* Exclude crashkernel region */ - ret =3D crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); + ret =3D crash_exclude_mem_range(image, cmem, crashk_res.start, crashk_res= .end); if (ret) goto out; =20 @@ -74,7 +74,7 @@ static int prepare_elf_headers(void **addr, unsigned long= *sz) goto out; } =20 - ret =3D crash_prepare_elf64_headers(cmem, true, addr, sz); + ret =3D crash_prepare_elf64_headers(image, cmem, true, addr, sz); =20 out: kfree(cmem); diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_lo= ad_64.c index af8854f9eae3..e51d8059535b 100644 --- a/arch/powerpc/kexec/file_load_64.c +++ b/arch/powerpc/kexec/file_load_64.c @@ -799,7 +799,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/riscv/kernel/elf_kexec.c b/arch/riscv/kernel/elf_kexec.c index 5372b708fae2..8bb2233bd5bb 100644 --- a/arch/riscv/kernel/elf_kexec.c +++ b/arch/riscv/kernel/elf_kexec.c @@ -130,7 +130,8 @@ static int prepare_elf64_ram_headers_callback(struct re= source *res, void *arg) return 0; } =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; @@ -152,7 +153,7 @@ static int prepare_elf_headers(void **addr, unsigned lo= ng *sz) /* Exclude crashkernel region */ ret =3D crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); if (!ret) - ret =3D crash_prepare_elf64_headers(cmem, true, addr, sz); + ret =3D crash_prepare_elf64_headers(image, cmem, true, addr, sz); =20 out: kfree(cmem); @@ -224,7 +225,7 @@ static void *elf_kexec_load(struct kimage *image, char = *kernel_buf, =20 /* Add elfcorehdr */ 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; diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 305514431f26..8a9bc9807813 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -265,7 +265,7 @@ static int prepare_elf_headers(struct kimage *image, vo= id **addr, goto out; =20 /* By default prepare 64bit headers */ - ret =3D crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), add= r, sz); + ret =3D crash_prepare_elf64_headers(image, cmem, IS_ENABLED(CONFIG_X86_6= 4), addr, sz); =20 out: vfree(cmem); diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 582ea213467a..27ef420c7a45 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -117,8 +117,11 @@ struct crash_mem { extern int crash_exclude_mem_range(struct crash_mem *mem, unsigned long long mstart, unsigned long long mend); -extern int crash_prepare_elf64_headers(struct crash_mem *mem, int need_ker= nel_map, - void **addr, unsigned long *sz); +extern int crash_prepare_elf64_headers(struct kimage *image, + struct crash_mem *mem, + int need_kernel_map, + void **addr, + unsigned long *sz); =20 #ifdef CONFIG_KEXEC_FILE struct purgatory_info { diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 8a439b6d723b..a3b7b60b63f1 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -315,8 +315,8 @@ static int __init parse_crashkernel_dummy(char *arg) } early_param("crashkernel", parse_crashkernel_dummy); =20 -int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map, - void **addr, unsigned long *sz) +int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *me= m, + int need_kernel_map, void **addr, unsigned long *sz) { Elf64_Ehdr *ehdr; Elf64_Phdr *phdr; --=20 2.31.1 From nobody Sun Sep 14 18:42:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31135C32793 for ; Wed, 18 Jan 2023 21:36:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230379AbjARVgy (ORCPT ); Wed, 18 Jan 2023 16:36:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230136AbjARVge (ORCPT ); Wed, 18 Jan 2023 16:36:34 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 506E564D83 for ; Wed, 18 Jan 2023 13:36:33 -0800 (PST) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30IKmlEu018138; Wed, 18 Jan 2023 21:36:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=e0yADqJ81jLTv0pyZxCiQ3ni7M2ufBxAvQM4Z/Yavws=; b=I2FQD5pgOxjMdb6JwQ0dcWdun4A9n9AUxLR2FjR/JA7YsrQ8Osqqe/tBqAyU0/2Ai4rs 3A+o5A/+E40KdgT8vq+sCVvV+BpWa5+oFve28jDhSIJSgmvSgMZaXpcLQ+RLzBpUzFVO OL4m2O5Oigv1PBVz0CmNpSd1e6aOzizPh2VS1omunBZTpJ3Cg1bI3GraN59KopF+r4PN maheotfjmRh7Aq0YRTKwryS2P8fYmWpKCXvqbpYCINwYf3UbEmATYOUjiZn1++Zr0a4R jnVcEzY8EMElf881WvAe/MAL5EPfgLtwcIiV+5TU7DDyP+nRzVHIWSmmrX/sabC/j2D+ ZQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n3k6c8qts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:36:04 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30IKwdfE016614; Wed, 18 Jan 2023 21:36:03 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2043.outbound.protection.outlook.com [104.47.73.43]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3n6r9e1f20-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:36:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N0CmyXCfCbpc0H+Ahi2sZp/lt1E/29Rd0gVE4cUvXRwe1WImFjOrdJFcFUxu/hPrKuT1BgztroxQxhSOpPw4io/HfKwKyPJHcI/n7oGf4E36wt+Qz/LBlX/7hfUK83zoiserlFJejWuOP1NhUTVlRmPfV9uOUX7n4awjI/ZjWlBSfz7MejCTaB0QDzlg9vRBI3cLUMDVBrZTHbz8HmO/52ULj2EliuHasNVoCGfyOU0opXArEeodQivHN1Mmo365l1c5M3XN17ifAeMuV9SzhEN8Aqlk6S8MHWKNY4i7E7SyFn4CN8DeXgGwFsU2e4QsEcnJ9s3CE0o4lnN7BsIK8A== 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=e0yADqJ81jLTv0pyZxCiQ3ni7M2ufBxAvQM4Z/Yavws=; b=H3xLdgmbiQuBvLZ+zuXxy1kSCFtiBI5C+Ob0QgFGJg0QTVbafnAQAsZEyZmhNaa77S6dXTc+V2d5IgW8FZ+DJo92tCOjvqmhA98V8URCKRFI5chgCXCzLu8gaJaetJo1TWLU6b+G1Utzkcq4qnOi0GLtfJhtLpDr3tgY+hVIaZE+IWZ6aOdgpwjB9ebHf+3BVhXOVFPHZ3ttjTZuINgrXCxKaau/4EphatLALfM8ZyptgSeMtA8T/0c9bKCNUBAsl4ndbcD1V5MrgMsCYe4Y52dWSp+7kYPB/O5WsWdH9V4DqTYq85gCyxLOvF6HglW/GYOD8kPOmIIjJH/6c6anlA== 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=e0yADqJ81jLTv0pyZxCiQ3ni7M2ufBxAvQM4Z/Yavws=; b=p9EnabMG6iPoupDBBcPlNflsHyAjOtEUemU8Gq/qP9W58KdWzE3t/nZFq7dQrYCULzypbrqyK7nq4QtbC/gI5feZfcfqU2NnwXuTvSP8+Rb6wJ+PKQe1O+EAN+hkDz6lmLHoIbX5PIA0s5JhwujhueWSVRelyMxmWt8QFnbC1Q8= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by DS7PR10MB5214.namprd10.prod.outlook.com (2603:10b6:5:3a0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.24; Wed, 18 Jan 2023 21:36:01 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a%4]) with mapi id 15.20.6002.024; Wed, 18 Jan 2023 21:36:01 +0000 From: Eric DeVolder To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v17 3/6] crash: add generic infrastructure for crash hotplug support Date: Wed, 18 Jan 2023 16:35:41 -0500 Message-Id: <20230118213544.2128-4-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230118213544.2128-1-eric.devolder@oracle.com> References: <20230118213544.2128-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR05CA0100.namprd05.prod.outlook.com (2603:10b6:a03:e0::41) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR10MB4531:EE_|DS7PR10MB5214:EE_ X-MS-Office365-Filtering-Correlation-Id: a18ec4f6-0e0a-44ba-e044-08daf99bfe40 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A2xzfS6gqmZy5wKEs/+prZc5CWg3QCstRerBjiNzxbzGFqg4R6A/Dh0bEeLYjMuXEvzk0Dkz0YaY7NwAIP5tLtYk9pyfC9vazV5w8Rna5KpEIf1bZ2rREIxNUiC5PGB0XzfUGTStSkseEI2RP7TIiR2juqVnUX0NsW9x9+HrgBZcGf7etStTuq5Zf0u0dwP/qhph9Y/h1olhIk3t1L7K6KGABbtkNiiedxpSakZqBxRlDX1T+qicpRxvS7F1JtDAKZPi5E3jT13KaSg7e7AebrdXfFCegCYgOCfJJvh8/giJm2/1gMqVkeytP+OnKhKaOuXUSsgw8PjzqMyTks1JB4zUoZeQMvdlhrftgeZlYVviRZpel0UbGo1lr96dK6vuUDsgecE6bGo9t/Q+hmZjuxLc7wvOIDfkqcD7Qn1XzmsJM3QHaodk3p7gp4FktRLoOKF/ayt4qGKL00QkY9NifB0DL6TC9R+s/Xd/ihEo/PkenGm4RYYweBpd9AlYejff0W3R+vTXkiCMa8lWUFLkVw9817CELmlbpYd+uywgidQUVzrntUcf/0eCsUh/pnC7L8w/dqbrSYIENWFIWlVDu+DV6+J3KZgKYTE4fA1glNLK3C/7fu6CY0u3x83XYterRxjNcvZFu7OT/C0NWxVdx2QXIUEc8Xe/XUbMs4l4HnZNqRakwHapxy+CzK/W5WII 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:(13230022)(396003)(376002)(136003)(346002)(366004)(39860400002)(451199015)(66476007)(66946007)(66556008)(4326008)(8676002)(36756003)(41300700001)(83380400001)(86362001)(316002)(1076003)(2616005)(2906002)(38100700002)(8936002)(7416002)(5660300002)(186003)(478600001)(6512007)(6486002)(26005)(107886003)(6666004)(6506007)(41533002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?w8pHIs/YzT+IGXnZVMg8Ic2ZrsjnLo5gAeY5Mgm2vlCFYPQXEIkIZ9ZzU2Ix?= =?us-ascii?Q?+e0ECJ+cjxD1xmOPicnEHLQNPOvv9WTd9mAyziDryqdobmD/yHEKN8sFeRwc?= =?us-ascii?Q?T4iRBqBld58HbS259gqAosAsToIXa7pVWKDF5FWJN9iReBETlPoOQS8XVrZB?= =?us-ascii?Q?WTzDoHP2jB9iGo0PVcxJa3u0dmC4wovF1suEIAYvBykXMOFc0irEkvuRe8Dm?= =?us-ascii?Q?vM3Qqzb9rMti3iEFmrdyhq5qmSyagITiP08JvBx+ZgmuxyJwTGHoOiqjA9wZ?= =?us-ascii?Q?tRINYmHTM+amoutDIqMe7iY9yFOoYGu2BW3yGEYCMMgIg3um32uFf7NFe+ZX?= =?us-ascii?Q?djoDnloFEwOlcyoq/P3A6jGR/HjlJ4VgGjQI6vLbM9+rR84FGTAhwO54JIQb?= =?us-ascii?Q?QjIDoLKP3iUSiVtZm26VdKpW4EsQj6cmQgGj7daZDNygNioLb6ubpD3QHR4T?= =?us-ascii?Q?/axvuYkqv0w64DrLSmGafr9M7Ns9YxpiCH2jdHVRGJy74G8geH+zDz1laNgO?= =?us-ascii?Q?go67tN6Je2j2KkhwlfSULlFcX9wTqMfs6Cl0PnJ/kHlLOjf/SLGLwWGYmErH?= =?us-ascii?Q?PAyZYR2NXunUu4Q3Asusld9PINvjHwusKG31RiQyNHPob+Wg2Y5lgdODvo5a?= =?us-ascii?Q?6niP2pHgxg+kcznfcxq19muDJV1sMtk8d463T7/dJlcPqiHjsTxQVgvV6Bm+?= =?us-ascii?Q?CvuKfefF2g1Jth9XXuahxov2CZK2HhulzJZn4qkokFFCEbvsNs2n6DwjZ5TE?= =?us-ascii?Q?LqLK0YQtPt6WtuCqmYOSsOqi+GfkWX6upwwlyNCajEOJN4oRQyJbF+Hq4C3Q?= =?us-ascii?Q?pmWl7HNarUcAqc3RktbU1P1hD5VXvPCo3HWcI3gc+7vPC/J3znvDo8MxrNPJ?= =?us-ascii?Q?bMcglu5XC1loXxvvv0a5u2/QAeTAhjxZkUb+qPAPVHnufC+g9ri7wHxrP76M?= =?us-ascii?Q?3UkoSQAQ8aT77F9VukYeH6VRJFCyWJYMA6LOutrutTdlir7Iu8sakvLdvIlu?= =?us-ascii?Q?Hjr2qqhz0gYV0FqxP4ygdBGrXSF097swcxlgSHRixtTb6k7QoDHD7mF3Hqfp?= =?us-ascii?Q?zVVi8i/ZkzA8F/2sq1BT7eFe3DbhLygy9KgdlblLlCaudpjxK7/73sPfc+/V?= =?us-ascii?Q?/O5ea8HaxeH7/oKXMpQ+faaQ1rDJXlf9IqstwC02aUWnYDFizpnjJ6A0BMF/?= =?us-ascii?Q?cGJfjnrm/eKrMjlFKqjwecqw2yMy7y1BSyxOgYmMZYUCLz7/HY1xKjUXTg5x?= =?us-ascii?Q?DU8BASjug1CsagaAjCjO1yTBz1WnQIyJ10VYmcMFUF9F9E7OMrjiQuajA4GQ?= =?us-ascii?Q?UlTeUxEiMdsaFt9oKY2XnNJFoI0hH/mX3351uXrSqX1FDVXod8JVqM08UCT+?= =?us-ascii?Q?UH4f9Ge/n1JV5+rFiktbvqAFGfwG7mBqvMclWObx0XpWn8EG0q8OuSg99fPO?= =?us-ascii?Q?2RvDOW17AA4LkqB1KGuMyzZXbrgok5nOH2beDlHaX3iIpDRHNdt0krepHrAk?= =?us-ascii?Q?u5GRTJFmsY76KgA/qhZX7roTtP677MBklJpZRTU45Wp2YeGB9whylCndoYfY?= =?us-ascii?Q?IgzqiCxPHxSQzOxBxEQsqLhNwgz3jlZE5djxXpB7QpBBeh0hrVOKu1V4A2Ul?= =?us-ascii?Q?sw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?daOEC8p7K9+Sq7NY0s2K3yyzSlfCU+yjBCnslOOK/YaliLx+zDtBVI2Ispyv?= =?us-ascii?Q?jD+2V3sy68w/b0ldck/6ROtL+p9LwtFteEgEv/yNpoazA5SHAraUdPHbYVOi?= =?us-ascii?Q?XXNhgloBTRGMAHA2lCfe8165Z38I144jobum7nIFR7N/mN2kti2DNBmAZHiL?= =?us-ascii?Q?YV7hW/IFVncJhr5LXuf/u0AyS9xrtly7HJHDCRxIsIb4Mr4BnXk+8ypguHeQ?= =?us-ascii?Q?JWhMIteywLibLaOGfajmdJQsShGuu1LUWgatsz3vVIMQHJqzB+X8Utzq6dIQ?= =?us-ascii?Q?E2yI584zp9Nl08hlTK5L75gvfj/WEmPolTAf849UyYzrM742zalO7YCwZr8c?= =?us-ascii?Q?jrEzjiDOGvZ/zx4onYwggQhi5mascSPUEoDc2RE8FO7qafac2bJ7w0bcUR11?= =?us-ascii?Q?SnmmNWiELTPhQalX6TeFhluwRuCveHi0+9F1efJynsPz89RoU/oF60I8LFBR?= =?us-ascii?Q?alsbILQTtTyYt4OrsW/2phC9jZ3n2MicQI28yjY8C8sGUCAAvX4rOEQCoVmb?= =?us-ascii?Q?7C1j4LJdGySfF9N90aE90CI5LM3W4MBxpW3LG8v1546OkxUlIgtQB0m8+7rp?= =?us-ascii?Q?WrPjqoy/uz9ziM9ApnTX3LN+H0EMqzkZgKaV0/ams2ODhlavxH5VaAOb/WHs?= =?us-ascii?Q?2xnN30xB6p1FIzDH8KMvwmxgYvE5ShDjvvAiHsT3KQLTHqObH3epylad5/Rl?= =?us-ascii?Q?TGZ52Ni4xUVZCBvYO/Q8pha2hOcc4XDm0ypKoMJSzkWagLu5NZdaqhrGoxYl?= =?us-ascii?Q?G5Mp9m/E1DSGPkSgaoVZrIb5aEIP1VuJAynGD/W0JqdtnvtqrR9VvsjcLJvk?= =?us-ascii?Q?XRMjU0pRq8oLyenqr8DL3xIQpag2wVK3c47MHNuHIQlZRn4K4slZzw2FNzl/?= =?us-ascii?Q?mPnTVJxUYeZipSfFQdMUkXn5I7qn+j9EQcNn3b21b3l8UzOlhVdaoaOzOW/K?= =?us-ascii?Q?yRBBXC7goZ4gP69lB4rDtdtPixD9mWg5VLa0alGZTC+PrszxVLmsO+Iu4Oeo?= =?us-ascii?Q?uWZ5vhlTAIKlXQLTAwwG91YEdIGiDD3Kh/72baitdndh91+Es4uuHLZIQLji?= =?us-ascii?Q?YwrqHOe9uSTM6ZKBeC7a0OHchPgVjkVu/mndrNcy5xwrYk+WzOlfI8hSfiyy?= =?us-ascii?Q?TuJ4XrD/hvRzVU87awurdYkX2DEulwN1k92OP5A12snrK17oRrsYMqE=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a18ec4f6-0e0a-44ba-e044-08daf99bfe40 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 21:36:00.9913 (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: IAmYmtxwxUUnwriVOuFEEOJBBSioHyR+/aR7OVLavP7kqtPwCgwvXtTymfc9P/EyJxOymoi1zQ9XcNVg33tgig/7rtqugXQnmH2eLuI7sMM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5214 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-18_05,2023-01-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301180180 X-Proofpoint-GUID: hLgdDf8pfsyBGpYSSTNcGOPCBoDONCLP X-Proofpoint-ORIG-GUID: hLgdDf8pfsyBGpYSSTNcGOPCBoDONCLP Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" CPU and memory change notifications are received in order to regenerate the elfcorehdr. To support cpu hotplug, a callback is registered to capture the CPUHP_AP_ONLINE_DYN online and offline events via cpuhp_setup_state_nocalls(). To support memory hotplug, a notifier is registered to capture the MEM_ONLINE and MEM_OFFLINE events via register_memory_notifier(). The cpu callback and memory notifiers call handle_hotplug_event() which performs needed tasks and then dispatches the event to the architecture specific arch_crash_handle_hotplug_event(). During the process, the kexec_lock is held. Signed-off-by: Eric DeVolder Acked-by: Baoquan He --- include/linux/crash_core.h | 8 +++ include/linux/kexec.h | 12 ++++ kernel/crash_core.c | 138 +++++++++++++++++++++++++++++++++++++ 3 files changed, 158 insertions(+) diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h index de62a722431e..a270f8660538 100644 --- a/include/linux/crash_core.h +++ b/include/linux/crash_core.h @@ -84,4 +84,12 @@ int parse_crashkernel_high(char *cmdline, unsigned long = long system_ram, int parse_crashkernel_low(char *cmdline, unsigned long long system_ram, unsigned long long *crash_size, unsigned long long *crash_base); =20 +#define KEXEC_CRASH_HP_REMOVE_CPU 0 +#define KEXEC_CRASH_HP_ADD_CPU 1 +#define KEXEC_CRASH_HP_REMOVE_MEMORY 2 +#define KEXEC_CRASH_HP_ADD_MEMORY 3 +#define KEXEC_CRASH_HP_INVALID_CPU -1U + +struct kimage; + #endif /* LINUX_CRASH_CORE_H */ diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 27ef420c7a45..881e8a43db89 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -33,6 +33,7 @@ extern note_buf_t __percpu *crash_notes; #include #include #include +#include #include =20 /* Verify architecture specific macros are defined */ @@ -371,6 +372,13 @@ struct kimage { struct purgatory_info purgatory_info; #endif =20 +#ifdef CONFIG_CRASH_HOTPLUG + bool hotplug_event; + unsigned int offlinecpu; + bool elfcorehdr_index_valid; + int elfcorehdr_index; +#endif + #ifdef CONFIG_IMA_KEXEC /* Virtual address of IMA measurement buffer for kexec syscall */ void *ima_buffer; @@ -500,6 +508,10 @@ static inline int arch_kexec_post_alloc_pages(void *va= ddr, unsigned int pages, g static inline void arch_kexec_pre_free_pages(void *vaddr, unsigned int pag= es) { } #endif =20 +#ifndef arch_crash_handle_hotplug_event +static inline void arch_crash_handle_hotplug_event(struct kimage *image) {= } +#endif + #else /* !CONFIG_KEXEC_CORE */ struct pt_regs; struct task_struct; diff --git a/kernel/crash_core.c b/kernel/crash_core.c index a3b7b60b63f1..ab074a706e55 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -11,6 +11,8 @@ #include #include #include +#include +#include =20 #include #include @@ -18,6 +20,7 @@ #include =20 #include "kallsyms_internal.h" +#include "kexec_internal.h" =20 /* vmcoreinfo stuff */ unsigned char *vmcoreinfo_data; @@ -697,3 +700,138 @@ static int __init crash_save_vmcoreinfo_init(void) } =20 subsys_initcall(crash_save_vmcoreinfo_init); + +#ifdef CONFIG_CRASH_HOTPLUG +#undef pr_fmt +#define pr_fmt(fmt) "crash hp: " fmt +/* + * 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. + * + * In order to make changes to elfcorehdr, two conditions are needed: + * First, the segment containing the elfcorehdr must be large enough + * to permit a growing number of resources; the elfcorehdr memory size + * is based on NR_CPUS_DEFAULT and CRASH_MAX_MEMORY_RANGES. + * 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). + */ +static void handle_hotplug_event(unsigned int hp_action, unsigned int cpu) +{ + /* Obtain lock while changing crash information */ + if (kexec_trylock()) { + + /* Check kdump is loaded */ + if (kexec_crash_image) { + struct kimage *image =3D kexec_crash_image; + + if (hp_action =3D=3D KEXEC_CRASH_HP_ADD_CPU || + hp_action =3D=3D KEXEC_CRASH_HP_REMOVE_CPU) + pr_debug("hp_action %u, cpu %u\n", hp_action, cpu); + else + pr_debug("hp_action %u\n", hp_action); + + /* + * When the struct kimage is allocated, it is wiped to zero, so + * the elfcorehdr_index_valid defaults to false. Find the + * segment containing the elfcorehdr, if not already found. + * This works for both the kexec_load and kexec_file_load paths. + */ + if (!image->elfcorehdr_index_valid) { + unsigned long mem; + unsigned char *ptr; + unsigned int n; + + for (n =3D 0; n < image->nr_segments; n++) { + mem =3D image->segment[n].mem; + ptr =3D kmap_local_page(pfn_to_page(mem >> PAGE_SHIFT)); + 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; + } + kunmap_local(ptr); + } + } + } + + if (!image->elfcorehdr_index_valid) { + pr_err("unable to locate elfcorehdr segment"); + goto out; + } + + /* Needed in order for the segments to be updated */ + arch_kexec_unprotect_crashkres(); + + /* Flag to differentiate between normal load and hotplug */ + image->hotplug_event =3D true; + + /* Now invoke arch-specific update handler */ + arch_crash_handle_hotplug_event(image); + + /* No longer handling a hotplug event */ + image->hotplug_event =3D false; + + /* Change back to read-only */ + arch_kexec_protect_crashkres(); + } + +out: + /* Release lock now that update complete */ + kexec_unlock(); + } +} + +static int crash_memhp_notifier(struct notifier_block *nb, unsigned long v= al, void *v) +{ + switch (val) { + case MEM_ONLINE: + handle_hotplug_event(KEXEC_CRASH_HP_ADD_MEMORY, + KEXEC_CRASH_HP_INVALID_CPU); + break; + + case MEM_OFFLINE: + handle_hotplug_event(KEXEC_CRASH_HP_REMOVE_MEMORY, + KEXEC_CRASH_HP_INVALID_CPU); + break; + } + return NOTIFY_OK; +} + +static struct notifier_block crash_memhp_nb =3D { + .notifier_call =3D crash_memhp_notifier, + .priority =3D 0 +}; + +static int crash_cpuhp_online(unsigned int cpu) +{ + handle_hotplug_event(KEXEC_CRASH_HP_ADD_CPU, cpu); + return 0; +} + +static int crash_cpuhp_offline(unsigned int cpu) +{ + handle_hotplug_event(KEXEC_CRASH_HP_REMOVE_CPU, cpu); + return 0; +} + +static int __init crash_hotplug_init(void) +{ + int result =3D 0; + + if (IS_ENABLED(CONFIG_MEMORY_HOTPLUG)) + register_memory_notifier(&crash_memhp_nb); + + if (IS_ENABLED(CONFIG_HOTPLUG_CPU)) + result =3D cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, + "crash/cpuhp", + crash_cpuhp_online, + crash_cpuhp_offline); + + return result; +} + +subsys_initcall(crash_hotplug_init); +#endif --=20 2.31.1 From nobody Sun Sep 14 18:42:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D221C32793 for ; Wed, 18 Jan 2023 21:36:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230084AbjARVge (ORCPT ); Wed, 18 Jan 2023 16:36:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229593AbjARVgY (ORCPT ); Wed, 18 Jan 2023 16:36:24 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74DAD630B1 for ; Wed, 18 Jan 2023 13:36:23 -0800 (PST) Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30IKnKJL001433; Wed, 18 Jan 2023 21:36:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=hjA8LtzxdRdzjixqkYOUgiBezHcVOhJoacVpmeuNeag=; b=FA13uOTOm2ykaE/cPVYfAom5AH+zwMei0POo5xmpNYEe8lXY595mV+EMUTINcTW5g0bW CEOSnLWgoUnDJICKXceHRi9MmehgapsbKvzknuJKCH+u0HzekM61HTw1IMC9FOsHI0qd nx6ScwkYejgvG37d6eCz2qnY0Ypq4fiHNBDACgZ4NPlpHohHNoQH9djNLxxaRjsp/T/1 uVfQUBkIf7w2pYmPq2Q4m67X1OTmgi59O/YxqJWatMWZvZYbolDsPQDl1pKTjGHLxRAt GZOfgC1dpgMQMKvN/l7It6JzcgC3jDFA8Ekx33nRC/lmYKTZT93vV+EXCXFn7olshWxQ fg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n3kaagsnf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:36:06 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30IKDhFi009445; Wed, 18 Jan 2023 21:36:05 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2042.outbound.protection.outlook.com [104.47.51.42]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n6qmcu8s1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:36:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d7nuj8LvVqJ0TP0QMHBE5l6wUKIJ5E5+gU1NkGJKBl5bYLyiVQpGkwhlJItonNggjx4pusE/vlk4AWPfDw2WNihc3aQxSOK810b2ko/riUfP3JI+608UCoMzbgK5XUkL5ls+/NHU8BQP7CZxVhBNLkbD2tVAHfKOMJJ1Z0TYQ8ntuQf6Kt+YDmz7L+RlAy/DZnhk2eQQV9+yxxEtWMmK8+y5UXkUlydSeYpVaDaV/AXC0YmbO05YaJJb+xEIAqcyOtpwGxlv0cEsvfly/UhlZ4CZABxJirSQznh6AJFuiUCsi8m8SbFFEAkgc4zNeyIl4Y0/rx9soGD4TL1J3dje5A== 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=hjA8LtzxdRdzjixqkYOUgiBezHcVOhJoacVpmeuNeag=; b=b+4CCqkveX9md9rY0XTnF4+wEuZpKmcyr0A87dPlRTKgHCwb8UttHVYDbXpN06nmlmjqO7pdQtBWoOoPJp/zTE9F3WjGXZuOBU73o78w84ikg09mXZ3TJIT/7XEN1cj2s0CvoAb3qp9ZTjUIJso2cJ/7P8IXTRBqsKqfNWI/k8B2n0tHPukklGzs/2jWdQzu/mAg8dX1eVb3dfrXHcINc8zNVmACPYu/tBdxfxTnA/9qDSiwM/B2H5lcR5wBbVUqgMacsIbHpzN512xL4kzBbls/qkfdDs3FA3QbunQXs3T2I5QfvD8iNIXjzROLvhFhObR2UJh88eGRVNh8wW8R8g== 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=hjA8LtzxdRdzjixqkYOUgiBezHcVOhJoacVpmeuNeag=; b=a547fEAn/0ae2gFySTSxHWWEGlL3W1/OFXCS+hZTbf9RTD/ceaCzMJ5XK4zJEfMSuXUj/NaxQQc0R3OglghWPyN60o/LRzUwBKb+woE6RNLMNFtlllUWGK1wWJjE1q+uadxT7x2iOYP/xHCYzPG/9AJnr/AA5yWP6XR+LXGaiBE= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by DS7PR10MB5056.namprd10.prod.outlook.com (2603:10b6:5:3aa::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.24; Wed, 18 Jan 2023 21:36:03 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a%4]) with mapi id 15.20.6002.024; Wed, 18 Jan 2023 21:36:03 +0000 From: Eric DeVolder To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v17 4/6] kexec: exclude elfcorehdr from the segment digest Date: Wed, 18 Jan 2023 16:35:42 -0500 Message-Id: <20230118213544.2128-5-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230118213544.2128-1-eric.devolder@oracle.com> References: <20230118213544.2128-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR06CA0057.namprd06.prod.outlook.com (2603:10b6:a03:14b::34) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR10MB4531:EE_|DS7PR10MB5056:EE_ X-MS-Office365-Filtering-Correlation-Id: 7dc41809-2555-4574-05f9-08daf99bffe5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b/Dz5woe2EIOIZwGvL3jieVJOVtjcKNl7WqiuZF+sf3UeeKZe8Cws6snj2DTxUIP4isaubIQ0L6yaGOK9ANvjWcb3KzA4k9gnycaxzTgbz0RjyojqyLMChPfb5rSyQmFLySsh/e36yPLx0IrY69Wu/f/JXLwBfIID2fUaB4wLL5QxjKyR5FTtyqYPQF2MXeFiqqa6jyHMkDLbVCxQP4e5EUaQzTV54zGDVW9bMmLt9TlAkAFvTDjgQIplb1IdNZ0YoyWJmueyVbSdgvjEMC31CF+bib/QNVfqNmV2L6jsdWzvIW6wMXavdXAEPdOY3AeWkFroLimen8nSiX/u/s3UCRr8Hegw2kRUeNu7xElSzVPk9hEVrIIX+QlumBPtXrkh1Y4eMLsrJHFhU0WDmF5rwxifwslq9zswpedfv/Biz7JlpXograx96Ve7LqgJuBKIKwotMjtCWDz3GzWFIdnsFHntOYw5Rlgb5tkWynYhbxT2z6WQydyNCAtt7palD9MWlGtft9BvL69MacZf4KrfcAS3e2HE/5hBpGM9G/t6sjb43VsXdjgA9wG/XciNThckANCjVeQlY8oN4miDMH0LGYSkyCS8HHzK2e2uAedVu7kv1PtpdmIyK9zeOUZVvNK5nR+YRD9X4Jgg2fca6TTIg== 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:(13230022)(346002)(136003)(396003)(376002)(366004)(39860400002)(451199015)(38100700002)(36756003)(86362001)(316002)(66476007)(66946007)(186003)(26005)(4326008)(66556008)(8676002)(6486002)(6512007)(478600001)(2616005)(1076003)(2906002)(6506007)(8936002)(41300700001)(107886003)(6666004)(7416002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?otsTjMd3UOp/U+dSCcPlIIPAkSHzMBnCxD6MEEKaK35U5vgeP5PFoKedG2Xe?= =?us-ascii?Q?KMPtqrylyaatG1KkGHIRji+6Eu0O5YW7UFiIvNyQDzjsbg1+LKWxMg8NDOUV?= =?us-ascii?Q?85wkvTq6MFXutbl+q6BhkYDcmKPtEJFuCu3f1/EpXqOsGpmqAZFtUWh+p2+S?= =?us-ascii?Q?ARcpnvikaU/XzYrXluEeuiWZJV1pETIgCBLg8NL3IIHvOKns9JNk8JEuY6Ki?= =?us-ascii?Q?+72M/gemGbtYsDpIxq7wHQvXZ+BXgFn5xj96K5ovq6QuKzhuzsffgA9eOnp0?= =?us-ascii?Q?Rl/IK1NAQ6xKsK33d4THqe+J70NtMT/13qgL2o+a1XD1bXA0q9EcXVFNd9NM?= =?us-ascii?Q?GWfPk+1LaW7VaYylyr7TV6sGgAQOtTESQQcHbwq1D1ynOPi33nDjSh20gc3J?= =?us-ascii?Q?PIVl0W6OJYm5wnOtRB9x90GrAeWoUHJc8GsYz+SueBluSKv5tNPftmBFdBsj?= =?us-ascii?Q?BZaqaUsQ8ILS/tVC8dOVKFHtVNARJQN7onC5zrVHB7V7VnebEo+zaJ88DZWu?= =?us-ascii?Q?HRPQye/kxRWavVN32igYdSgCS/hB9PTwclbKnTQLtFC2beovOHYGYf4f2CYF?= =?us-ascii?Q?APzp0xZOA2XhlTJwCtlQ7dhCx/e+vbJKqnTU6WjORbCQyYrrQcpyrPLQnGxh?= =?us-ascii?Q?BZcUX+oK2gwva8sXCmNgWkFMExGxhKB111L0F2KM8p0iLdnSJTqBVjOCfeoS?= =?us-ascii?Q?vbFDf4qyetrwME06NQXrsuaGwWPjjgwtPi7Hvby/YSuZRj7F/r2k8tinOD5B?= =?us-ascii?Q?lMcbn+cYGw1fc8ipDF51hSWtaFY8aM7XvmJWnZk7ucqMF9y4rYEVmwjrENle?= =?us-ascii?Q?D4w0ClcY+78bdkzFbzhkaRWZGbKs7rGm8mnS9+aklLEIfnMS6ig4MNk5vXg9?= =?us-ascii?Q?qHZom2ybzCwdKuWYK8SBoNBGVTGQSZeZNRSdkZg7kQSlCf5lbWntj4/SE1EQ?= =?us-ascii?Q?UgQ1wnHoLeZPpECSdqoJtZQDoYF0OIYqR6zYmajS9GuysgtMoajfsUb+40dA?= =?us-ascii?Q?0JysY0OhUPkOA9ESCoYvDUEIJpwVEm3gLmG3Q6WwHEtdAVCIrVNczLmLb95W?= =?us-ascii?Q?XWp0FfydbNbHI0RKz0gnplWNCFTgGJRRJax3R3xWhIUalTYBESH8bKHdtngK?= =?us-ascii?Q?H2hXyiNQ9CvfJ2AQphNY7WswQicMKx1AEAr2BxFM+gkDf9e/JDJyLtrortHy?= =?us-ascii?Q?DRo/zDJyFF1C06Hz7LxoHMvfDkix4Jy6bZ05bLf5laABgvq95tE+u4xdb8my?= =?us-ascii?Q?PzJNSDF+A1eFLWzJHwu+cIdBA4I6WvLCj18uKZW6nG+7uV2WmzgjtM9nPGhi?= =?us-ascii?Q?OCLv5hTkJaKJ2FdcFAvdarZaDJljdR25m2hXWpZHCa+nLaK4+ljcNn27b9Uh?= =?us-ascii?Q?w06gG+9iR3oHT2+MOquTqsLQmNfjnSj6Yns6EjV6nXbbjICDcwrvRtma02mN?= =?us-ascii?Q?pviRelrzkT4gF5n4GllzAP6TgfrlOyCgyTTH+EklJvF2Co525nQFIPF21hHY?= =?us-ascii?Q?RNOnKeR1FDTJEjTgwm8IxML7daCgT9mZBT7yklBpdM7H4P6OIxKdHa4D15R3?= =?us-ascii?Q?vjXatxd+VvePhvB3GnrWGJEuT3OYqBzFcee1DaziRuWD2V8tGxDxiyqNPkGb?= =?us-ascii?Q?OQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?M/ruLzGwaT+auMPphHWC458Zn8doWXHcI8upJHC0d0/ggI9uzCkRfHzsuoJc?= =?us-ascii?Q?DpkS8K3qY+D23xvD+/xMYH1myuYtn7/r/QTRubBKOoizZ9WGsnifd3cZmEE/?= =?us-ascii?Q?ZSX5cTJAEkufOQeVcaOVBKXlo1VZr5wzpeOfsmi6msqa4vD9NtOzi9Bv/PhD?= =?us-ascii?Q?H56uJUqQ3LU+UYk3DsJHzDa4/PYVf+bWmWrtO4b9Nqgd6V+q9AqWxbcj4HKS?= =?us-ascii?Q?7vwxYy+11HyZ/Ea7XKQdORFPIqt09hW4O7tpwDSNOEL2PXiHk+vRJ8ExqfHc?= =?us-ascii?Q?THY+UH03AR5lJzaVUyQFLif77Xqc4jIq0zX8inFRVEVDBbjqyB0bT8A9v0lk?= =?us-ascii?Q?32NGRsO8ZWHZETQjrrjeIEynjJJVO4mLAn0bZijpXvXaZ8KPJhPfjivDkBuS?= =?us-ascii?Q?w4+s6nUdLEIKr7ObD0koo9gFaWagDNhw09gNjp76t7YYD/bJzeUdzn7zbeXS?= =?us-ascii?Q?P4DGtd41/cRkMcnOs+HrGYA6siEO+xRKTzLjdo/odTLjcgLPeUXuQZwU6TtX?= =?us-ascii?Q?RnGsU7O3IZPy95LRoLXXHhfWlAAjQGzVMrk6Ts6HO0Fa29q51WDwHOJQtGiq?= =?us-ascii?Q?hzRSaWg2f3nrLtoVnCPlA3soJvlgLzJQoEGaN3HVQt2hz8lA0NP4LjY6+CvR?= =?us-ascii?Q?viyXVGNewujtYByF/zQHXcdR7ncu431Acda2MXNpcIy84xrBy4N9xJYMdo/+?= =?us-ascii?Q?uepSG8xz2TQrlZPxVNriPmd7ec+aFGNS/1yjb6Z5SCVuu/JMwqvtF2H3TxrX?= =?us-ascii?Q?gczS1SKwB4WeTiiIsreKoyvV12AY4rPEvb1avYTBPG3Iu1Ap2uTvRrtlt6Yk?= =?us-ascii?Q?uxZn4BlRE8i/Irr+sRfAj/ZRyC67X97AeZL+8rLqoBYLEIdBgu9bYG8nU8v6?= =?us-ascii?Q?jPDtW3uHOA6fgBPCoXuOnJDS+Kf/eEEsBs5FS/GrufhfsM7BFEwVS+BZArN7?= =?us-ascii?Q?+VMz4eRebkezDpuaSDFSw4iwcRgFhP2YLfZP7KqaQdUoSUWsjJWtQ6BXSHSM?= =?us-ascii?Q?YLaIFQ5QHgLtzr9jmtn1tuV3iNo8RmzZ12DHDSnjdAtOkqohiolmdHL7se48?= =?us-ascii?Q?RUv7zT8Wj2rYeUovm6fUOaLweSKtIkQShB5OTygcUm6lfCh+2xGfp8gEDaxJ?= =?us-ascii?Q?gchHLMKxckQve6Egryr1VaYtCTZkMl96fH31f1PFdAIcfPCVM5rkhx0=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7dc41809-2555-4574-05f9-08daf99bffe5 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 21:36:03.6668 (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: rrEeb/YpJsv4Q87rWJbMjIJYtQcF9yVs0Z2skIu6vNEiJOGLTzUZ76nsnrz8Ye3mLCqfEsrwluGmMvX6RSrSOcMuO2GquQe1Z4g0bSNQxIA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5056 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-18_05,2023-01-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301180180 X-Proofpoint-GUID: Xgalic_tRCTEpC57pixzS6nw4i7w10Qk X-Proofpoint-ORIG-GUID: Xgalic_tRCTEpC57pixzS6nw4i7w10Qk 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 ead3443e7f9d..2f3b20b52e5d 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -723,6 +723,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 + /* Exclude elfcorehdr segment to allow future changes via hotplug */ + if (image->elfcorehdr_index_valid && (j =3D=3D image->elfcorehdr_index)) + continue; +#endif + ksegment =3D &image->segment[i]; /* * Skip purgatory as it will be modified once we put digest --=20 2.31.1 From nobody Sun Sep 14 18:42:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EBAEC32793 for ; Wed, 18 Jan 2023 21:37:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230397AbjARVhB (ORCPT ); Wed, 18 Jan 2023 16:37:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230156AbjARVge (ORCPT ); Wed, 18 Jan 2023 16:36:34 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5163646BB for ; Wed, 18 Jan 2023 13:36:33 -0800 (PST) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30IKmmRC018177; Wed, 18 Jan 2023 21:36: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-2022-7-12; bh=fd5q0t4KYkyFNurH7Nydv5I9kT0Rxu2wQStQGSToUBc=; b=UR63z7HiAlp18rljmU+6+JWa+K+RkYUrleehjegcYfomwSiDBLSMT1S+mOBBzShRVE5g XfvFgvaDB2lRPxENYG0TseDwX1+pm8JvazIjyZQbbLP6VUNoaz7eCUcGWnfik02T8oOK I5v7RT+PkUaODjlUzJwObP9BZuWO32r3yxv8zOz2pMYlvjWB+71VH4+HdU7Weopre8At 1S2bZImOkva/mJynK/vcPmdr1qDV9VvPMYnc/qrUbx+q+HUIcmSkQ2o9mge+pXw+qiHw hIkaYez1XS+mYa2FuqYu94ETYeBqBWAdt5njYtzGoqpRgYtpqMJkUby1KDDaWTCDz1n7 2A== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n3k6c8qu0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:36:09 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30IKDhFl009445; Wed, 18 Jan 2023 21:36:08 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2041.outbound.protection.outlook.com [104.47.51.41]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n6qmcu8tc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:36:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ayiCosJ5v47O/JS/8Hiz98TaH3uE/OCjiX+1tNZnJSzJdx9GNUaK+Qli2yGf0ZHyes8p/mxh4FW6usYS+7acMYirNbthdbLONE4RXXSz58VQ6KEQHZBmjxWjGw7vbjej6ufs0MjPVTvPa2RQtQmimoIc1utohRHZ9z2GnCjCZDA1fQwRGg59ScpENVqXwAOzIg9Xm7kZxlTyFjDqwr2mof/zXh4UxX6g6kfFjlI7CY3MvdfDNWfGLz3OfvivV0EDXUtu0JoP11vQv11GMKybZX8socLrAJsM+yjLcFuP0wnjMEZ8dsDZUswW7+fza2t62AZ3PkYc9AxbfkMOAY6GZw== 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=fd5q0t4KYkyFNurH7Nydv5I9kT0Rxu2wQStQGSToUBc=; b=fajSb91kMQ/955YvEBTWSTFXoMpJOk8Hah/alSsBeHyMszFxP8j+liDN3aOco0scPNYLKqPuhC/k3zx+ixBC6h6LG7i24fzcww2bPAYeYpli3YqzXrIu/qdYPc1x05WKbWeZec88FgGfc5xlfH7QLys4cTD6HTWgy8Dm4d4HJozo+G8z9I6reor2d135c6oiN7adtSbnqe97cvrRZycpOx9xg8ODRrXPr7s8yIvXoyL90gXmkm2cLuUjFwKOUK7QdO2YNx1it++WMrKOICGn6q9/VUEm551nGCumRcI7gzyCfX89ba1Xl/HEhRri/d53Z9Y0JVAuzVKvv0GNYLxWjQ== 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=fd5q0t4KYkyFNurH7Nydv5I9kT0Rxu2wQStQGSToUBc=; b=SoGMaWaG2XSYJuzCKRSmQUSOfrGiRdmGqK8eVAZx9icwrCIfkVLOF4wlkx43EtNQGC4R034jLse3AsSg4ZFz2eVds0a+L+AuYgQq9/J6NjzyMXwoMsqOgT83oSYIfh/YKz3NtjvQ9p5uXkX+3wArt67ZxCb2tI4mt0AEo29Qse0= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by DS7PR10MB5056.namprd10.prod.outlook.com (2603:10b6:5:3aa::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.24; Wed, 18 Jan 2023 21:36:06 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a%4]) with mapi id 15.20.6002.024; Wed, 18 Jan 2023 21:36:06 +0000 From: Eric DeVolder To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v17 5/6] kexec: exclude hot remove cpu from elfcorehdr notes Date: Wed, 18 Jan 2023 16:35:43 -0500 Message-Id: <20230118213544.2128-6-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230118213544.2128-1-eric.devolder@oracle.com> References: <20230118213544.2128-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BY3PR04CA0002.namprd04.prod.outlook.com (2603:10b6:a03:217::7) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR10MB4531:EE_|DS7PR10MB5056:EE_ X-MS-Office365-Filtering-Correlation-Id: fac02528-9590-4682-0457-08daf99c0192 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Eqen7a9zYC0xnwKwoPESgDBZkT4pCkXO3E56DrXQ/hyOWYsMQoEhyykVbG24LOnRYKqRzFRvqEW8sv2n9Pf0TH8KH8ckim/eFJ/PIho5ejA/e0svf7XV8iF42BQyMtsjNS2Tj6kFNjp7RanR4EwxsPk5CAhnsYCQxBXky4EX99VqVoU/RsG99YCIFn4gEBypoXFkWV/1l1MTYATw6SQqZm+lZ64GwErek6WMYzmTmKPcx1KTVlgk+4sNhAA0RykwlFbOQGpoqZ2HyvpdbUeNvwOnZzwl7l8uoXwWlVLDWldUjk8HeUmpvpGQYWsVPMZW22PfRuE4Lw4S9MuCc2YNW5jqiWuH6GCF/92IBSwU/D/XpipNjPRVcrqnVNDrKOyv6W2pbpai00JhFFUtRoYu5eyv5hwY84lvjQLxuJQ7QoFYviZAmfhzLTFpfx8aNOJwXXUUZicyhSVTp0lzBQBwTBMtxJvz+pVx3y5HD8aWDT8fD6UdKSsWoRAaHa0d9lyrM+2fVfES865eI55PzKXAc8qszzc187yG6gwxjkbBeqVDZVrx7DxUCC6zBp275jv6/8b22e/YzJLN3ghwN3xV34e2MzudFzgtXjc79LRrRLaqR2T6bXFNulpa1XlL6Dzb 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:(13230022)(346002)(136003)(396003)(376002)(366004)(39860400002)(451199015)(38100700002)(36756003)(86362001)(316002)(66476007)(66946007)(186003)(26005)(4326008)(66556008)(8676002)(6486002)(6512007)(478600001)(2616005)(1076003)(2906002)(6506007)(8936002)(83380400001)(41300700001)(107886003)(6666004)(7416002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dv3ScGxDiteuYpIpldIH8luAJM6Di2CvSEMAoGsp8he3muuJaEC6yKXtvSdq?= =?us-ascii?Q?f2I240vcfYl6QEkLqCydRJgZUA1PwtWY7FGJBICTEUCSN0GS6Njb/JzAfD08?= =?us-ascii?Q?LlEQaES5HI3STWyZ1P9V+fUa5i9uCE7QgY3wUUY+Sb+jDf1fuJwym+sqZC4J?= =?us-ascii?Q?N8LgpTiBxuF4oIhbN5dS1RunBgayhGKr1cXH78dd+VBsQOdhsJp/0wS81V7V?= =?us-ascii?Q?Mt+2dxxBgNH5Xh0VA0tLQIVo4ZrzUAxlCcJoj6ekY55x1nn5SKyBjSM0NbH3?= =?us-ascii?Q?L7hRvTW70+SXrGggLF6huxACvwTJyZ42b7y+8k7uaODGsIz2346JvBMmomJ5?= =?us-ascii?Q?csPr7ySwQ6Alg74HHMrWpJMXgAaHUrdbH3eihOpKUsoMuezdca+wTQFYdRhM?= =?us-ascii?Q?kHeNN7ytVPlcRRNYQogV0yP2k/CJCk3/76IqYW+IwwmoiPnQ+oc2S3FU5Wd4?= =?us-ascii?Q?ibDJV0uP7ihS8nM3lK4vz9iX8GQecvaeXv3YmBoCFwCqftc1LeMVhKjBSIyH?= =?us-ascii?Q?fEQgBoCfqWoEyNllh9ylcYbiPcuovk0MfrDitC4vmN1zP5WQsXJxGbVgxGN1?= =?us-ascii?Q?5dEwrRFOt3rY8wKiim14eesSu33IVXHdWCp7APZ0C1kHguKpS4bBOnXLK4GL?= =?us-ascii?Q?WR+59QksviOtfDYUhP2ucXCkaXvmGRBUenc9/VUl698FiH3COUO2RGUQBiP3?= =?us-ascii?Q?BCJ4XgX9tjBqaFm/3HpcXw81m+645lw6ZVhgOZlb9+G12VomLmwzTCKM7KLf?= =?us-ascii?Q?AicfDNDR8k3YsMxqvMSn75s1ST9KvwEzm6BUPUwUDheSYLnoWCIyblGlUTfn?= =?us-ascii?Q?0kUd0CS5/yEIwZCETA7EOYBllWmux6GNILTjMCP6tK8+V2y5whh2Ykarxnl8?= =?us-ascii?Q?ZTFvBC6xMAB2f8faX41SbXehLn6yrmf2h/8WhsWkkhSSF4hBslpbFI1/N5PS?= =?us-ascii?Q?xWDGB6mkamZUMvZt5Gqh3TUOz5JDKH2Fpl+f12QzkymdaQpe6UFjHEdxuakS?= =?us-ascii?Q?SBq2i9rmUWHw52vs3gDk3HdjIoc3tWYNmkNN36Vksip2ava1mjCx+s9/wkT2?= =?us-ascii?Q?yy5m/YH1z5tprlL0HDN97XY3KyecwajnjfT282iNChLdMXGtf66dK4H8P71P?= =?us-ascii?Q?V2MkuZvlYoNf77sKndVt1rPqE5yDQhu21WJtZ1PDY4yncoc3onmvubL/bUpl?= =?us-ascii?Q?fKJOyCqtInSgGidxiLlmnwVy0HXb6UMsZktQo7ZrZ6/Oc4DN8ZX5UYD+3T7k?= =?us-ascii?Q?8hBNHbaYF31LOWMXWD3130u0c+vur1P3Csx8J7P1J9/zKCLEgSzgR2gWvjfJ?= =?us-ascii?Q?Rz/tBpnk3CEKKFLahPZB78uhXWSbEkgWVtF0fAy9fdhbGBrK5ECxbuvlWdmF?= =?us-ascii?Q?BChs6j2LgKPU5ZyndzLiEqFT+sVml8Q5wRE3qPB2tUa+bzSHXTp50y+TgjHb?= =?us-ascii?Q?h98LMwNcuZPo90rmQ0gL++qLhBfF7Cwc6Q0IR761pGtLaWOuu019gwPP9auo?= =?us-ascii?Q?lKm+OfBbKyrYCMSnHHqMHMJSfZmST92I5hvO6jnUGVTrNmUbmVWchHKGZAvo?= =?us-ascii?Q?I0COvoAju6dajNt9SvDkJOmiUYVijkqBmaVVar2V0b+6ejUAGCVXe5uAUrR1?= =?us-ascii?Q?FQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?QEg1E6vGJea0wA42l0cR8FjdVKekv6cIIx0vI0yhjPH2vEWICRDDPIVxBbJ+?= =?us-ascii?Q?TyXfobhPl6T0DieXY9waxNNBkSIxpIgNBvp0YKpPcztbvJJ8JDWJOH3HPF9p?= =?us-ascii?Q?FzazJUjvwMQ63HnFUTmxg/UMuzfS8oXATfH2C8LFXHmVoRzqWssCFL2u/diR?= =?us-ascii?Q?QE05AoiAo0fI1DZb6oNkoHZpXoDimPYbpiGIl1yL02AunZ6w9kfsxM2z6hQT?= =?us-ascii?Q?MTgoAa3xbWnD3D3duYBbkVwEBYZDZCKr8vDUO5+EIZp/xpkVklaoQ5CwYAGu?= =?us-ascii?Q?wva9soPx+AAbnvZXiHuyXg6bu8jDSIMzoEXcQqb4IEK9w49QIWsdkLV8VN6g?= =?us-ascii?Q?grNkAJ0FaEP0hxrFzzYD+mUzOOeFru3PZDTO+ZCKMGIMSzmS6ybBDAZkdURs?= =?us-ascii?Q?O6bhw8+Yc+gYgj1YdCYjYJx0fHPPR7djzDDFdB8e3fiGEK6l/OWatKFcoKB5?= =?us-ascii?Q?4pSwzDgbiqpluQCmH73hVo9m9frbXjomHglgCTnOZ1x5vHNaO60u0AYghEKN?= =?us-ascii?Q?RGUm4GrjmMOGVP5DwX7QA35oDaVxKpnt+ycbmzL/tzWGb2Jno7ZrtHg5kHab?= =?us-ascii?Q?EcWGGnXlLpRdKEKxm7Js3YuujL7YhPpgpaRNBSbEGB7/etuGrs8u8iQr8NvE?= =?us-ascii?Q?BuotzA4dgeUzFcxffxbr4IrywZYNonDbVv/Elz0NcCtcwZvJ/MCvvmZt8IfQ?= =?us-ascii?Q?rE/20pV1Y91QDT0TnYIna1pR+NNJzl37Vok+q3MgZ4gsE3Rho3g4Cwk6Xje3?= =?us-ascii?Q?wpqaBmfvCZJDZfPvRUd8X4PlGF3oFOhsbS3y8yPsvZLSYP8wY6kpmx4eOirj?= =?us-ascii?Q?njqvUhOpsfw/dt7d1pqWvs2ijiTonHgoq047WwfmMFqNUoHq2OTLAanX3eR5?= =?us-ascii?Q?EvfUFVYamOUX00SjHrlurgENQL8TRIk2IJKVwBgIai8JBybQeFHo8aFWBRwV?= =?us-ascii?Q?JxJE4D4eojPJYn1+fkWyNXNMD7YH8KAZ86gdfUM7t6uNBtYtvDbjizUypvXv?= =?us-ascii?Q?2Z0xddJE6RMJucEbYhbEvVL46Rm6Cyc5tWfLuoN6G1esg46Yds+b1YDsBbHU?= =?us-ascii?Q?d2xtW8I0XvuAT9FxWSmS1RaOsup1n4x9Z+s7OrJ9xGkTDkOYg9WRCCtYzKRQ?= =?us-ascii?Q?14Rum5TBXFRcDj5qovs/F22DjwFOBxRtJmpv/n4s2hgfMuccEEq/HR0=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: fac02528-9590-4682-0457-08daf99c0192 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 21:36:06.4938 (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: 9Pd9BTN9WnR5eJwCd/IeMcSDSGcgzuKSptpwETWnJZ/7WHSmBV1MMW2N+fI34OGykB2u9U46Lj14rgDDdlPaoiJScwQlJEmTRJBiN+c49QQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5056 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-18_05,2023-01-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301180180 X-Proofpoint-GUID: zkT2FgEHtUfxLfNAygIL3DFC4TqMkM5n X-Proofpoint-ORIG-GUID: zkT2FgEHtUfxLfNAygIL3DFC4TqMkM5n Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Due to use of CPUHP_AP_ONLINE_DYN, upon CPU unplug, the CPU is still in the for_each_present_cpu() list when within the handle_hotplug_event(). Thus the CPU must be explicitly excluded when building the new list of CPUs. This change identifies in handle_hotplug_event() the CPU to be excluded, and the check for excluding the CPU in crash_prepare_elf64_headers(). Signed-off-by: Eric DeVolder Acked-by: Baoquan He --- kernel/crash_core.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/kernel/crash_core.c b/kernel/crash_core.c index ab074a706e55..37c594858fd5 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -366,6 +366,13 @@ 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 + if (IS_ENABLED(CONFIG_HOTPLUG_CPU)) { + /* 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; @@ -768,6 +775,16 @@ static void handle_hotplug_event(unsigned int hp_actio= n, unsigned int cpu) /* Flag to differentiate between normal load and hotplug */ image->hotplug_event =3D true; =20 + /* + * Due to use of CPUHP_AP_ONLINE_DYN, upon unplug and during + * this callback, the CPU is still in the for_each_present_cpu() + * list. Must explicitly look to exclude this CPU when building + * new list. + */ + image->offlinecpu =3D + (hp_action =3D=3D KEXEC_CRASH_HP_REMOVE_CPU) ? + cpu : KEXEC_CRASH_HP_INVALID_CPU; + /* Now invoke arch-specific update handler */ arch_crash_handle_hotplug_event(image); =20 --=20 2.31.1 From nobody Sun Sep 14 18:42:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C77B7C38147 for ; Wed, 18 Jan 2023 21:36:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230006AbjARVgo (ORCPT ); Wed, 18 Jan 2023 16:36:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229932AbjARVgc (ORCPT ); Wed, 18 Jan 2023 16:36:32 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A03AF63E17 for ; Wed, 18 Jan 2023 13:36:31 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30IKnDFa002415; Wed, 18 Jan 2023 21:36:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=f6UdExf1TKM8GUOVAAnj9buuvcJy94WdoCzKS2kMVAo=; b=rGAnPudw36n0GN0wiWEHkCR96+OXh2ZzsW6fNX0dWHfa4M06Y4pSBVU23lcUelF9JHII 3O2Yl7fe8gptAxndVwO9etOA0hON9Kt8ZI85kv6wS+/mqSkyb99GuGMAULkXtMY2Rev7 DNrAI9THNtLVgcUCHPj+XM/UM3Wtrh9V5Tj6PGkOt31GQsEI0Dj/sfJlTjNfPymvgGBQ dYAdRc/2eLA6Nqb7ce3wc1SYEi6NuIFa54AlzktQF8RtZgTHWhLkT++CTV0LX7r/eCF3 PAD7BBDVem5gEHgHBUcVLGtUlu+2rgfkdQO3r9muVeZUhkByxt2V5MYO6pN5owbnHEHM Qw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n3k010t89-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:36:12 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30ILDROl033460; Wed, 18 Jan 2023 21:36:12 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2045.outbound.protection.outlook.com [104.47.51.45]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3n6rgc8tb7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jan 2023 21:36:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k1MODJtXnMXH7aHVTcjqpq/pmu9y5wyDQ/sADLmpyMdstL2gDVrgI7OkrLV/ewBWTRcmDVGhLaN3n7a2I0hjm4qgdjkSp+14qEqm1RChMTv0RleHOsetqMP4XoAIfV/LW2FafO76eEZTz1+KLQW8cI+aN0hfHKWHbz7RMu10n153YFkzB7Vi1/MG/Fa2Pa2m9Yp8h1l41gQcZdEoSYEIBft+pHr21ljuUBlgNuYpPu2pDmvLqvGikET6H325cb0a1dVbyjyWKQIjXWYYF+JCNWSnmvcI32Eip54QPnPRcTgQ+BYfvYDvFgwBs/5o/30V74ULdUelLvA9I9MgKIICfA== 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=f6UdExf1TKM8GUOVAAnj9buuvcJy94WdoCzKS2kMVAo=; b=gy9pNNUqwQN+Xru7V8UE1MLRwTXI4Z9xnzTwk/d3qXAJ8i3CI+iWQA93rdGPSTEggg92i3MFtu0oN989dyFOYQvGo29jNSYj330PiUl8XdERoKZRPYPDgBGKvtQw3816AoFZ1AcVmwzFLFEu1lk2qrFO1VMvg1dKoeDgUbtod7UnOfJ+BYVgkA3T1Ehq6d3rc00O5Gjy6gVc5Mc5BQANxBIdYOrsicTsPomhEGTTr3CBsgFzCNB7vH/wVwib7ktlebdwtwFFE7JP5UldYsEQITm3CktM9jl8TJOS8aTRb01PFSvrRpyUdLlewgjQUEtvvyhlrymmu1MzAv7XZ8OTVw== 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=f6UdExf1TKM8GUOVAAnj9buuvcJy94WdoCzKS2kMVAo=; b=moy/RY3RF1ZN1B7xol6Y2gsRwsAD2kzoDgx/OLtD9MOj36Q2+/Bk9jSeQ4KMnxPwbS0L4z4PSgXLfj+7ojUz+1FxUFM7NG8J5PVGBudhafgclCNsGFQ6B3HJYjISGG5Ug0VSwWB14+yNpX2p+SgeVBxj0htdykZ7VSaq1CmNQZw= Received: from CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) by DS7PR10MB5056.namprd10.prod.outlook.com (2603:10b6:5:3aa::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.24; Wed, 18 Jan 2023 21:36:09 +0000 Received: from CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a]) by CO1PR10MB4531.namprd10.prod.outlook.com ([fe80::e301:fde6:85e5:b45a%4]) with mapi id 15.20.6002.024; Wed, 18 Jan 2023 21:36:09 +0000 From: Eric DeVolder To: linux-kernel@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, ebiederm@xmission.com, dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com, robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com, sourabhjain@linux.ibm.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, eric.devolder@oracle.com Subject: [PATCH v17 6/6] x86/crash: add x86 crash hotplug support Date: Wed, 18 Jan 2023 16:35:44 -0500 Message-Id: <20230118213544.2128-7-eric.devolder@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230118213544.2128-1-eric.devolder@oracle.com> References: <20230118213544.2128-1-eric.devolder@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BY3PR04CA0030.namprd04.prod.outlook.com (2603:10b6:a03:217::35) To CO1PR10MB4531.namprd10.prod.outlook.com (2603:10b6:303:6c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR10MB4531:EE_|DS7PR10MB5056:EE_ X-MS-Office365-Filtering-Correlation-Id: a477b4c6-a27d-49bd-998b-08daf99c030f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qn5KgznBrTdchz6IpNuNBVJiv/466ys0F4bs0YAtfmgEXdi4VUUc6zp6ieBfw9ePFfIU4vubjTJflXSfdD8JmjSwwsONOfMtN78A1AVinkIC73M7HGM2EtLU1eE7sUmJlgIS2esPnNHk4Arf71Q9PEiB/2dDX3KAjSjT/rOqqsUrZoScHA9a7Uz4gDF6SnMib7MNuEoEdj3bv8QlQdPEp7NNqZ54X0xLy7PPd/0LVCvv2FTXfJOKmgI+0st+BQCgwSpT22BLio1mW38QBDv3sYNkcpRK+5PaqqIkhThS5z+/lEXd62EWzHUB8AiL43vqSlmdOXLY2yDhJyb/OH2DrALX3zHTMBHljhoo1i9mDsGfthqNwcfjCvKhsHavdRsizKYEWlTCa1SRKUE0HRpDER/62Hj2VoWtkbouQATRi8opCE2SbfACB61wMpzWy1UMPJCqrlYzA8N2bBUkizJMXNvpeBIeZbbLJ5R+FYsJ6GygMAsHXFgKkpose6WArQUNdr4ebraGpjUXBtAG0nF6tC576JNMRcAQ0uT2W675hqlslPl9633xml/EKjs4Yw8uhcm7yF7tscuUJG3MrizrX0kvgbL6vWYH63BVKsEYYd94kq2XgPWpD/Jh0NYR75Crqb9YjW/K0oePpKXsA+PLUw== 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:(13230022)(346002)(136003)(396003)(376002)(366004)(39860400002)(451199015)(38100700002)(36756003)(86362001)(316002)(66476007)(66946007)(186003)(26005)(4326008)(66556008)(8676002)(6486002)(6512007)(478600001)(2616005)(1076003)(2906002)(6506007)(8936002)(83380400001)(41300700001)(107886003)(6666004)(7416002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/to+1Kk5oc8DtTn0xl0gQO35O3GQPdv+JyzWe9rRFUoxvevkoihxcW6VGFpU?= =?us-ascii?Q?uZAAREzyI/b3/l9qrCtVPc4eRql3yvy7srlfeyBuot+LUElJN6wEf2Y19STa?= =?us-ascii?Q?tnuuDJ4DbTyugTL5Z6hij5dgD1PRs4gUOcZNlnDAJugOIxojrBfe8EUxw+wT?= =?us-ascii?Q?2FfdSOQ6otXXdJfRoNYdsREQSyJTqtQV0kiOV4WYYkh9GcYwLmYEcyx5F4VC?= =?us-ascii?Q?DB4JjtCBoo6/1BM6MIjzLa1/9FaMxu0fBer7trEFPR5nP4NzjBMbOPybh6Ua?= =?us-ascii?Q?cPYlSX/UzyJYjaX/aKg7LPcSGsVBP7BZXqUDO9knH/XxrMXJMG41d3PD2QcF?= =?us-ascii?Q?9qWYxP217/T/VONxnT/cbrcFUYRBexvfJ8vsE7B2VaV+WvSlSlOI1rD4kXtv?= =?us-ascii?Q?5OP/cq2/vG3LSWgWHJ/yhcnxbBEfyUEmYRhA/AxayacKdqFk/NJkUzIRmWi2?= =?us-ascii?Q?zbsn8WpN9CMg38CATwWNylIeVDf27GLOSjIVacCjfDyCbWREQeZ1xh4YXVls?= =?us-ascii?Q?NlW+j34rR1c06mxpvz627cFliI/sayfgfv/UI2QbDdnA+AZdVNjI++rQebUq?= =?us-ascii?Q?TEgHfjY+TagtQPUBKLkIpwZHPZUSevksUCJAfeimf5vig6hpioPCVIQxgcPJ?= =?us-ascii?Q?ANAwpN7pNPx1N4LLlM5rw8RvCFZOhEg4U3/KRwA1+DKAXBzKtiwDzk1GB278?= =?us-ascii?Q?mQMWGVp9qTX2jumDHo0KlaK8VWsorRqUKi8Sc3WJC5oH+WFfO0z2SfTWOK39?= =?us-ascii?Q?sZ5CRIWOEGnC6LbB2Q1Rg5d6ZSOfLATvopcrIma1VPRQFgpYbW3PNG2VOhXw?= =?us-ascii?Q?GXvbdn8WnXytw+cPV8rpPS8ZDsVx5xWT5eexRdAJdYZtJCHZyxqYtr7W0EY7?= =?us-ascii?Q?xfIN0CJLQZPPIytRMLd8cM+IQ6JM/2x7L2RUvT4/oFMvGXQciPVr0Xzc+VL/?= =?us-ascii?Q?Rs86Yh+4kLqLbZqiv1Vy40yhzPQpSfZT891NUbPzRQRF87rk2YdBbAr5JRob?= =?us-ascii?Q?PuSKdgyBbnZIjc/nrTFTiftrCOeSQ5H6wSXOcF7rjlaR2CiqbDeWKUJalN5u?= =?us-ascii?Q?JpbweHezdUeyIkBOopIVmHVB0VFprOsgvMnA5L5Pm1iD30pEdfZGaALllLQe?= =?us-ascii?Q?tVVO5w7ztDm/0PNE9QI3GjaYZvPsPXd2icuALrMBEjXCPK/ah55TJkrz3vUZ?= =?us-ascii?Q?gZ9LX6TC3nItoxANzJaTOvML3xF6/wDepJMWFin1cLjPe3A8IFmShhqrCyGm?= =?us-ascii?Q?ac7DNvaS7i9xAukJvUHLqxwZ+VlL+QKN1+95SMFOp3/RxkH24jRZUOGcP5Fw?= =?us-ascii?Q?JfM4bPmk9LPtYHTkfT9CsVfo4UTuGlpyJBk/zI3B5kIx9DKpkXdymw5h5iP1?= =?us-ascii?Q?sW1AQ5ss2lQmpbLAVaNLN2XvMlsbGGyNYsf9qCXnloCMMrsp1zW5KNulREdn?= =?us-ascii?Q?jJWeU5E0y4rTmfbFLuhbXWmfz8jGBTgN77VQQkezOf1a9xLPLkwUEsJkyMHM?= =?us-ascii?Q?HSYT7NFWYQP6zO4M9oznqJ7oD/VochFpQHyk3aMmdtzSWpZMZ7vETKiFPB/y?= =?us-ascii?Q?jqoU4GJMguWuxm2eHcCDdm0meXDh89iF/qqCSno2yKwhy/B885l6zBgu/5U5?= =?us-ascii?Q?kA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?mBPM0BLqpN5XIgd/J+9ZlisJ+mmbBcjUbxJoISoZ/sAox9ChLQu+tJyFjDYG?= =?us-ascii?Q?+QGOTBs5IByBgkxm0ZBXq0xGxJ4TqGIz/rBvp1oRmzdCEck889przRaUWZBt?= =?us-ascii?Q?VcjJzeP16S84rQQZyPV8iuEsJ7iyD1V6Qf97FOmrmdNHzI7xD69EHvM4ACpM?= =?us-ascii?Q?6hSkQFNH+prn/Y9XnNym+EHtyXfs1PITKbjhlg6FuY9QLT29U85NJz5GhKC8?= =?us-ascii?Q?WWPvg/GjkqP3aF2vKaISh9+kL6ui9HYR5oS1qx8VkF0wpR9V8J3OR5QNxJrz?= =?us-ascii?Q?xtE1VKffkXOf++b97zpaGzP+EreX5LWZWxDbkujhlSGWUxJ2PoR9WjIz847S?= =?us-ascii?Q?fcP46oEhMTn+qy91ZWRRilSDBW3Xd7JSSSFoBeb4ZtO5Vb3iTIQaBn/nHCCY?= =?us-ascii?Q?UMFEPhDp1n9RHHzk8ycBx/Nh7Uv7N28oDM0aGJtDxCPX2fBZHz0lU2vfEgTR?= =?us-ascii?Q?l247QZVJaj9sqTWNRWOiD+E9JzIjEjE8Bj5U4HsPjKDf1Q6haX9a0AZGrhfu?= =?us-ascii?Q?8sVCFSRvQnbkULcerREi2K6Oi8duqcNu9YIlQ1+vhdEdwJa6LDhd5f+CL/vr?= =?us-ascii?Q?JmBGoE6pQpPRKSexg1zbsP7cj9rTc7EAdM7npt3/vnhPjr+lZTyIqE3S/cEI?= =?us-ascii?Q?qbijeNnMtvOW0zYFmcNlBr7bBlxYIw+TCWyt2Lf2418UazbGboCAdyLjFaVL?= =?us-ascii?Q?ZJjitvEENJyKiMWl37gmxdLSG2kS6qT1SKERXdMvw+pEbFQhYWm9uxl4Z+ke?= =?us-ascii?Q?Uhf+F1jWT4HdYq93KINvvK/BBEbJiX9wzT/RirPr6Qu5o+Lk/1EsIBqZbk22?= =?us-ascii?Q?1T8OdaL+IsTpZsPsc5o37nwUoFlMCtQvzaMY18/hmmNtESsp4wOk/ynFHo9V?= =?us-ascii?Q?AnagkP6nRQTl0hnxkG0E7MLsxz/pQiY3rhRpYuGONUH/S8aki4iM3U3MHg0o?= =?us-ascii?Q?zmsAksz4fL/WyZltz9mEsRL2O+W6W0eOd09WZI4XNeMCkye8sqJfu2CJDXQ6?= =?us-ascii?Q?EtflN1/EelvX0vvwNOB8Acmo378uddNUMmGNEXNFyav03tt9KwQSu5btA98s?= =?us-ascii?Q?LATmBS+MUmTxLbez7VzQDvroU11mFBCWzPoJRUsgVhkwR+aGobOvT2y8kpB3?= =?us-ascii?Q?YXfDnPu6wwef5EPdpMzzrsnnPaIcAwfN0ghgJ/Wej3iwXVlM436gecI=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a477b4c6-a27d-49bd-998b-08daf99c030f X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2023 21:36:09.1114 (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: S8nyeIOTH6hHAd+LTwEacU7qXmdX6D8KRbxIYEw1Ls0IQigSGjsQf3UmsxbvzIfIHxaC+UV45qhp8fhqPDWoxhCCBveBqM2bEYJQTOOvBuY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5056 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-18_05,2023-01-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 mlxscore=0 malwarescore=0 spamscore=0 bulkscore=0 adultscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301180180 X-Proofpoint-GUID: Dys_SDOHcN9352GpjbvQwddgzo8jdTl- X-Proofpoint-ORIG-GUID: Dys_SDOHcN9352GpjbvQwddgzo8jdTl- Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When CPU or memory is hot un/plugged, the crash elfcorehdr, which describes the CPUs and memory in the system, must also be updated. A new elfcorehdr is generated from the available CPUs and memory into a buffer, and then installed over the top of the existing elfcorehdr. The segment containing the elfcorehdr is identified at run time in crash_core:handle_hotplug_event(), which works for both the kexec_load() and kexec_file_load() syscalls. In the patch 'kexec: exclude elfcorehdr from the segment digest' the need to update purgatory due to the change in elfcorehdr was eliminated. As a result, no changes to purgatory or boot_params (as the elfcorehdr=3D kernel command line parameter pointer remains unchanged and correct) are needed, just elfcorehdr. To accommodate a growing number of resources via hotplug, the elfcorehdr segment must be sufficiently large enough to accommodate changes, see the CRASH_MAX_MEMORY_RANGES description. Signed-off-by: Eric DeVolder --- arch/x86/Kconfig | 12 ++++ arch/x86/include/asm/kexec.h | 15 +++++ arch/x86/kernel/crash.c | 123 +++++++++++++++++++++++++++++++++-- 3 files changed, 143 insertions(+), 7 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3604074a878b..09e9b7a091ed 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2119,6 +2119,18 @@ config CRASH_DUMP (CONFIG_RELOCATABLE=3Dy). For more details see Documentation/admin-guide/kdump/kdump.rst =20 +config CRASH_HOTPLUG + bool "Update the crash elfcorehdr on system configuration changes" + default n + depends on CRASH_DUMP && (HOTPLUG_CPU || MEMORY_HOTPLUG) + help + Enable direct update to the crash elfcorehdr (which contains + the list of CPUs and memory regions to be dumped upon a crash) + in response to hot plug/unplug of CPUs or memory. This is a much + more advanced approach than userspace attempting that. + + If unsure, say Y. + config KEXEC_JUMP bool "kexec jump" depends on KEXEC && HIBERNATION diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h index a3760ca796aa..1bc852ce347d 100644 --- a/arch/x86/include/asm/kexec.h +++ b/arch/x86/include/asm/kexec.h @@ -212,6 +212,21 @@ typedef void crash_vmclear_fn(void); extern crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss; extern void kdump_nmi_shootdown_cpus(void); =20 +#ifdef CONFIG_CRASH_HOTPLUG +void arch_crash_handle_hotplug_event(struct kimage *image); +#define arch_crash_handle_hotplug_event arch_crash_handle_hotplug_event + +#ifdef CONFIG_HOTPLUG_CPU +static inline int crash_hotplug_cpu_support(void) { return 1; } +#define crash_hotplug_cpu_support crash_hotplug_cpu_support +#endif + +#ifdef CONFIG_MEMORY_HOTPLUG +static inline int crash_hotplug_memory_support(void) { return 1; } +#define crash_hotplug_memory_support crash_hotplug_memory_support +#endif +#endif + #endif /* __ASSEMBLY__ */ =20 #endif /* _ASM_X86_KEXEC_H */ diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 8a9bc9807813..ba11c7e70edb 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -42,6 +42,21 @@ #include #include =20 +/* + * For the kexec_file_load() syscall path, specify the maximum number of + * memory regions that the elfcorehdr buffer/segment can accommodate. + * These regions are obtained via walk_system_ram_res(); eg. the + * 'System RAM' entries in /proc/iomem. + * This value is combined with NR_CPUS_DEFAULT and multiplied by + * sizeof(Elf64_Phdr) to determine the final elfcorehdr memory buffer/ + * segment size. + * The value 8192, for example, covers a (sparsely populated) 1TiB system + * consisting of 128MiB memblocks, while resulting in an elfcorehdr + * memory buffer/segment size under 1MiB. This represents a sane choice + * to accommodate both baremetal and virtual machine configurations. + */ +#define CRASH_MAX_MEMORY_RANGES 8192 + /* Used while preparing memory map entries for second kernel */ struct crash_memmap_data { struct boot_params *params; @@ -173,8 +188,6 @@ void native_machine_crash_shutdown(struct pt_regs *regs) crash_save_cpu(regs, safe_smp_processor_id()); } =20 -#ifdef CONFIG_KEXEC_FILE - static int get_nr_ram_ranges_callback(struct resource *res, void *arg) { unsigned int *nr_ranges =3D arg; @@ -246,7 +259,7 @@ static int prepare_elf64_ram_headers_callback(struct re= source *res, void *arg) =20 /* Prepare elf headers. Return addr and size */ static int prepare_elf_headers(struct kimage *image, void **addr, - unsigned long *sz) + unsigned long *sz, unsigned long *nr_mem_ranges) { struct crash_mem *cmem; int ret; @@ -264,6 +277,9 @@ static int prepare_elf_headers(struct kimage *image, vo= id **addr, if (ret) goto out; =20 + /* Return the computed number of memory ranges, for hotplug usage */ + *nr_mem_ranges =3D cmem->nr_ranges; + /* By default prepare 64bit headers */ ret =3D crash_prepare_elf64_headers(image, cmem, IS_ENABLED(CONFIG_X86_6= 4), addr, sz); =20 @@ -272,6 +288,7 @@ static int prepare_elf_headers(struct kimage *image, vo= id **addr, return ret; } =20 +#ifdef CONFIG_KEXEC_FILE static int add_e820_entry(struct boot_params *params, struct e820_entry *e= ntry) { unsigned int nr_e820_entries; @@ -386,18 +403,45 @@ int crash_setup_memmap_entries(struct kimage *image, = struct boot_params *params) int crash_load_segments(struct kimage *image) { int ret; + unsigned long nr_mem_ranges; struct kexec_buf kbuf =3D { .image =3D image, .buf_min =3D 0, .buf_max =3D ULONG_MAX, .top_down =3D false }; =20 /* Prepare elf headers and add a segment */ - ret =3D prepare_elf_headers(image, &kbuf.buffer, &kbuf.bufsz); + ret =3D prepare_elf_headers(image, &kbuf.buffer, &kbuf.bufsz, &nr_mem_ran= ges); if (ret) return ret; =20 - image->elf_headers =3D kbuf.buffer; - image->elf_headers_sz =3D kbuf.bufsz; + image->elf_headers =3D kbuf.buffer; + image->elf_headers_sz =3D kbuf.bufsz; + kbuf.memsz =3D kbuf.bufsz; + + if (IS_ENABLED(CONFIG_CRASH_HOTPLUG)) { + /* + * Ensure the elfcorehdr segment large enough for hotplug changes. + * Start with VMCOREINFO and kernel_map and maximum CPUs. + */ + unsigned long pnum =3D 2 + CONFIG_NR_CPUS_DEFAULT; + + if (IS_ENABLED(CONFIG_MEMORY_HOTPLUG)) + pnum +=3D CRASH_MAX_MEMORY_RANGES; + else + pnum +=3D nr_mem_ranges; + + if (pnum < (unsigned long)PN_XNUM) { + kbuf.memsz =3D pnum * sizeof(Elf64_Phdr); + kbuf.memsz +=3D sizeof(Elf64_Ehdr); + + image->elfcorehdr_index =3D image->nr_segments; + image->elfcorehdr_index_valid =3D true; + + /* Mark as usable to crash kernel, else crash kernel fails on boot */ + image->elf_headers_sz =3D kbuf.memsz; + } else { + pr_err("number of Phdrs %lu exceeds max\n", pnum); + } + } =20 - kbuf.memsz =3D kbuf.bufsz; kbuf.buf_align =3D ELF_CORE_HEADER_ALIGN; kbuf.mem =3D KEXEC_BUF_MEM_UNKNOWN; ret =3D kexec_add_buffer(&kbuf); @@ -410,3 +454,68 @@ int crash_load_segments(struct kimage *image) return ret; } #endif /* CONFIG_KEXEC_FILE */ + +#ifdef CONFIG_CRASH_HOTPLUG + +#undef pr_fmt +#define pr_fmt(fmt) "crash hp: " fmt + +/** + * arch_crash_handle_hotplug_event() - Handle hotplug elfcorehdr changes + * @image: the active struct kimage + * + * To accurately reflect hot un/plug changes, the new elfcorehdr + * is prepared in a kernel buffer, and then it is written on top + * of the existing/old elfcorehdr. + */ +void arch_crash_handle_hotplug_event(struct kimage *image) +{ + void *elfbuf =3D NULL, *old_elfcorehdr; + unsigned long nr_mem_ranges; + unsigned long mem, memsz; + unsigned long elfsz =3D 0; + + /* + * Create the new elfcorehdr reflecting the changes to CPU and/or + * memory resources. + */ + if (prepare_elf_headers(image, &elfbuf, &elfsz, &nr_mem_ranges)) { + pr_err("unable to prepare elfcore headers"); + goto out; + } + + /* + * Obtain address and size of the elfcorehdr segment, and + * check it against the new elfcorehdr buffer. + */ + mem =3D image->segment[image->elfcorehdr_index].mem; + memsz =3D image->segment[image->elfcorehdr_index].memsz; + if (elfsz > memsz) { + pr_err("update elfcorehdr elfsz %lu > memsz %lu", + elfsz, memsz); + goto out; + } + + /* + * Copy new elfcorehdr over the old elfcorehdr at destination. + */ + old_elfcorehdr =3D kmap_local_page(pfn_to_page(mem >> PAGE_SHIFT)); + if (!old_elfcorehdr) { + pr_err("updating elfcorehdr failed\n"); + goto out; + } + + /* + * Temporarily invalidate the crash image while the + * elfcorehdr is updated. + */ + xchg(&kexec_crash_image, NULL); + memcpy_flushcache(old_elfcorehdr, elfbuf, elfsz); + xchg(&kexec_crash_image, image); + kunmap_local(old_elfcorehdr); + pr_debug("updated elfcorehdr\n"); + +out: + vfree(elfbuf); +} +#endif --=20 2.31.1