From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE2AD14A4CA for ; Mon, 25 Mar 2024 10:40:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711363223; cv=none; b=ZcAvSuoY90icKPHHlk1Rzs8Bd0fqHNVVXIQ9b01D2+oIGprLkW6eV76sIoEc8TM4EgV4u2EsNzGljqTaGUZPZR4sm2pFI3L1UvlVNWU7NqnKpv0/Lx4jTwUUbqqEVUC4JBgupBkTnT/WqCd08hQJViRQ0DYpGzaRTJ8NMzTnwQc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711363223; c=relaxed/simple; bh=afEHAj6Ona/U1R3Hzh9Y6aqHqs5rMx6ECTCC4WyRrfQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bF6YmHW5Rt4Zs5O/bnmVywrViP6jzHVL3GpNAvXx1hE+TpEmlznk1hYS3lBaKxERdZw1z+LONRtBD1f6LXtkx1/ATsQwFLF/MBfJ346Q/F8PTQeKVZa8TRj/fQn5uW3q5TyKo/3XSclGFiOsfpVHPd4IBR2SEZFac/OxGHNtID0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.helo=mgamail.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=VK4CJNTw; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.helo=mgamail.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="VK4CJNTw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711363220; x=1742899220; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=afEHAj6Ona/U1R3Hzh9Y6aqHqs5rMx6ECTCC4WyRrfQ=; b=VK4CJNTwL6dv0K7mdgZDpsU5gkdQyAK7pOkIvHG+stjQg+VLlXl8/Tj1 PkfFK5my+pbPpyszfxEe9LOifxR2fXZHQbqZiAuVoBgumc4iNtgznQB/d bH2puFuQR8W5yUWSs61KpDrJOqIvE5mSp9ufFpQztOI209sa2nKD01yKK zSh2XPMUxiVJJa6Zornqj+m0mLFW2V149nNQNEQkcqNsC/rv9SavZVSw7 Pi6987YdxrQoaaFUtf5ZY/WBnBT58C2EUW6v6l0FwAcfPiELKe7RISyNS 0N4NEN5AZ8bOKD6Cw32RWdOdguCpM9O0MF0RlA3TFU5LQ/CxEEk78v7Lt w==; X-IronPort-AV: E=McAfee;i="6600,9927,11023"; a="6561398" X-IronPort-AV: E=Sophos;i="6.07,152,1708416000"; d="scan'208";a="6561398" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2024 03:40:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11023"; a="937070157" X-IronPort-AV: E=Sophos;i="6.07,152,1708416000"; d="scan'208";a="937070157" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 25 Mar 2024 03:40:12 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id A40251026; Mon, 25 Mar 2024 12:40:05 +0200 (EET) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , "Kalra, Ashish" , Sean Christopherson , "Huang, Kai" , Baoquan He , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv9 14/17] x86/smp: Add smp_ops.stop_this_cpu() callback Date: Mon, 25 Mar 2024 12:39:08 +0200 Message-ID: <20240325103911.2651793-15-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240325103911.2651793-1-kirill.shutemov@linux.intel.com> References: <20240325103911.2651793-1-kirill.shutemov@linux.intel.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit If the helper is defined, it is called instead of halt() to stop the CPU at the end of stop_this_cpu() and on crash CPU shutdown. ACPI MADT will use it to hand over the CPU to BIOS in order to be able to wake it up again after kexec. Signed-off-by: Kirill A. Shutemov Acked-by: Kai Huang Reviewed-by: Thomas Gleixner --- arch/x86/include/asm/smp.h | 1 + arch/x86/kernel/process.c | 7 +++++++ arch/x86/kernel/reboot.c | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index a35936b512fe..ca073f40698f 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -35,6 +35,7 @@ struct smp_ops { int (*cpu_disable)(void); void (*cpu_die)(unsigned int cpu); void (*play_dead)(void); + void (*stop_this_cpu)(void); void (*send_call_func_ipi)(const struct cpumask *mask); void (*send_call_func_single_ipi)(int cpu); diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index b8441147eb5e..f63f8fd00a91 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -835,6 +835,13 @@ void __noreturn stop_this_cpu(void *dummy) */ cpumask_clear_cpu(cpu, &cpus_stop_mask); +#ifdef CONFIG_SMP + if (smp_ops.stop_this_cpu) { + smp_ops.stop_this_cpu(); + unreachable(); + } +#endif + for (;;) { /* * Use native_halt() so that memory contents don't change diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 1ec478f40963..293ded05a4b0 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -880,6 +880,12 @@ static int crash_nmi_callback(unsigned int val, struct pt_regs *regs) cpu_emergency_disable_virtualization(); atomic_dec(&waiting_for_crash_ipi); + + if (smp_ops.stop_this_cpu) { + smp_ops.stop_this_cpu(); + unreachable(); + } + /* Assume hlt works */ halt(); for (;;) -- 2.43.0