Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Eric DeVolder <eric.devolder@oracle.com>
To:     linux-kernel@vger.kernel.org, x86@kernel.org,
        kexec@lists.infradead.org, ebiederm@xmission.com,
        dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com
Cc:     tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
        dave.hansen@linux.intel.com, hpa@zytor.com,
        nramas@linux.microsoft.com, thomas.lendacky@amd.com,
        robh@kernel.org, efault@gmx.de, rppt@kernel.org,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com,
        eric.devolder@oracle.com
Subject: [PATCH v4 08/10] crash hp: exclude hot remove cpu from elfcorehdr notes
Date:   Wed,  9 Feb 2022 14:57:04 -0500
Message-Id: <20220209195706.51522-9-eric.devolder@oracle.com>
In-Reply-To: <20220209195706.51522-1-eric.devolder@oracle.com>
References: <20220209195706.51522-1-eric.devolder@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6KYyXj230yqRCMnssrKn3Twdy0JqNceuNPuHcZJRcg/+zj/m7dUt8yrhxhqq?=
 =?us-ascii?Q?kOqEFwPYWw+rJEXCa4Ni6YgasSbj8dvdQMKhcUYvTeXs9UJ4FT6/lG3hzfbR?=
 =?us-ascii?Q?IKKTcudMTd3orQqR8nkhr0j6ESNBa7SiYKNMVtwHSw3tiNDByCe7535cDNDW?=
 =?us-ascii?Q?TSDPoTsTqxJ8GoE562QQabaCuAgopVUmIN7Y0EIkYCTXCrOANap/3ujqLg/m?=
 =?us-ascii?Q?OnjgaAuhS1TUGpkfvQFtVKEGseEmJZ9VFqjvYyfmaWBIdTB1bUpXraGvqRRe?=
 =?us-ascii?Q?XnCdNgToa8k7rTR+shPhw4oHq3OvpGdznYPTJ/7cybJsUqLjCQfWztWbMjiZ?=
 =?us-ascii?Q?oBCQ2LG3UmggutKSFLAWKQ52anVH3pfSugIG2NYQEdR1QsjbDrhmwPrK8YTu?=
 =?us-ascii?Q?poOgwFO2c6qTQ3OF5vkHFIIrfryITulkHxwnc0pJ4KZlB5CzBTvSAdgvnHqC?=
 =?us-ascii?Q?vYBcvYhN+ih+QROFKzPMvlZOUUhwBbItoWBxJv+6caFC9zqWeSwXCN1dVrSc?=
 =?us-ascii?Q?D7SFO2rVWw/8xviHJym2zZujOabBZvbyor0VRhzYTvrk+HazVR0kP11mmSzV?=
 =?us-ascii?Q?iSMnAApId8EM3JbQwxNsX5nthdPREG8Zd324s5nZbvbBMsrXSlK3bKqr/Zkj?=
 =?us-ascii?Q?RizYq+EG2XHCYGuc67/6FfqNWYJuSqzR54/H+t0IGDML8YtsbG3dGdlnDRG9?=
 =?us-ascii?Q?JWs5BGEay40ONy/pJzKveOJcBqiyL/gjyFCQYrD+4SXnL5QHsekgiGzJ7+1D?=
 =?us-ascii?Q?5Pi2C1JWZC/iFISOPWfLAUc2W/FkLqUFB/MvhkhrhlQjLJznLZx2RBjiGjF6?=
 =?us-ascii?Q?1WbsuRhxHv5r9zbqinyBfPvBOOhxm0bjV+oz7gdSWjJukblgO2fAphRt27Ex?=
 =?us-ascii?Q?Y/o4hq9l89LUc9EXwGd5L8PARm/H/VUJnXogmau47dDnvX5cbmRPPLSc++44?=
 =?us-ascii?Q?Kz/ttYPZB1Xativ43sygnMH0OScxkJ3llTwMwjDX/QJpkqOrYWos+snjvkCK?=
 =?us-ascii?Q?aZ+a5cIERgQZS9I843T6N8s6gBtyLbxTKmqWtZBqAZcRd6v8VVZ9eBmLkJmE?=
 =?us-ascii?Q?7m1tdCSXN7D3Ixu8IXPNrNAIVs3HUdT5tkhRI25UvWxz3DJcpZrNXp5JuaAB?=
 =?us-ascii?Q?kf+amAZYBWtpb+gRs1xhRYPPk736dIhGYQQJnJolCXGS9+/6Y+r9yJkSOGLP?=
 =?us-ascii?Q?Qb7UIpLvPDOcAsWy6gY1rB4SVq7xImNvEiLAVdl344ZMZYhGejTsYZlKrtAe?=
 =?us-ascii?Q?LCnKtbQ28SSEqJAzYVOE7ZzUidz20K6E97relBqE71hEjTniVmy1epNs401K?=
 =?us-ascii?Q?GOt7doeaNfDjsQy3Wk3ZY+PdF/rDP/+2xWK+b+9CjfuGTpidvfy4gzvKEIMz?=
 =?us-ascii?Q?Qriha7bbqKhfdXW7tEmZMBiUcLe3/HnjpRAb9z4GaY1AJfhLr/dsAIxWFtoh?=
 =?us-ascii?Q?O0Mh5PvWHKsBucW+vLt60uetu9oXIZmV1/VbalC3WJbQjKqaqBgwtFAh29tV?=
 =?us-ascii?Q?1m+SZklFG3UKrPPQMBXRqt18nGb1TjKFuFvCDpy9S16UwOWDDcU6V3oHw4Ln?=
 =?us-ascii?Q?Q1DXMd9jn7DvbjfhUN/ucP95Hr1JLsx7sn/eb4RmWxgl971jnJxGsfE3U8uu?=
 =?us-ascii?Q?C46zpjedrhPF0cZMo+JZyUJ8fsFYOH+dM4gt65J80JgSPJ/ZRxOhH+dIgXdl?=
 =?us-ascii?Q?UyOGCw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b8b46b2a-fd5b-4d97-6361-08d9ec066c5b
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 19:57:38.3397
 (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: TvGw0BX9N0t2HSImwDuFlYfKyDAAzEaJMPu3ql++LHkLa+8Af8Ub/aIB7kCa15SSWy0H+eaERA395btHb7HF33IjYtBVfsWQQUT1JLNjtqc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5701
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10253 signatures=673431
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 suspectscore=0
 mlxlogscore=999 mlxscore=0 adultscore=0 malwarescore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202090106
X-Proofpoint-GUID: PdR-rPKa7d-YNBkx2VOW40srg98kJ-Iq
X-Proofpoint-ORIG-GUID: PdR-rPKa7d-YNBkx2VOW40srg98kJ-Iq
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Due to use of CPUHP_AP_ONLINE_DYN, upon CPU unplug, the CPU is
still in the for_each_present_cpu() list when within the
crash_hotplug_handler(). Thus the CPU must be explicitly excluded
when building the new list of CPUs.

This change identifies in crash_hotplug_handler() the CPU to be
excluded, and the check for excluding the CPU in
crash_prepare_elf64_headers().

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
---
 kernel/crash_core.c | 10 ++++++++++
 kernel/kexec_file.c |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 524470e18883..b6942e04a188 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -550,6 +550,16 @@ static void crash_hotplug_handler(unsigned int hp_action,
 		/* Flag to differentiate between normal load and hotplug */
 		kexec_crash_image->hotplug_event = true;
 
+		/*
+		 * Due to use of CPUHP_AP_ONLINE_DYN, upon unplug and during
+		 * this callback, the CPU is still in the for_each_present_cpu()
+		 * list. Must explicitly look to exclude this CPU when building
+		 * new list.
+		 */
+		kexec_crash_image->offlinecpu =
+			(hp_action == KEXEC_CRASH_HP_REMOVE_CPU) ?
+				(unsigned int)a : ~0U;
+
 		/* Now invoke arch-specific update handler */
 		arch_crash_hotplug_handler(kexec_crash_image, hp_action, a, b);
 
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 93bb0c0ce66c..339995d42169 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -1314,6 +1314,11 @@ int crash_prepare_elf64_headers(struct kimage *image, struct crash_mem *mem,
 
 	/* Prepare one phdr of type PT_NOTE for each present CPU */
 	for_each_present_cpu(cpu) {
+#ifdef CONFIG_CRASH_HOTPLUG
+		/* Skip the soon-to-be offlined cpu */
+		if (image->hotplug_event && (cpu == image->offlinecpu))
+			continue;
+#endif
 		phdr->p_type = PT_NOTE;
 		notes_addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu));
 		phdr->p_offset = phdr->p_paddr = notes_addr;
-- 
2.27.0